Landing header

drizzle/meta/0001_snapshot.json

@@ -1,8 +1,13 @@
 {
 	"version": "6",
 	"dialect": "sqlite",
+<<<<<<< HEAD
+	"id": "8471d8f4-154a-4347-ac12-fa7a223cfb38",
+	"prevId": "818c640b-29b0-4c20-8eb8-191759e45ae4",
+=======
 	"id": "a0792537-466a-438d-8edf-153ad1fd6489",
 	"prevId": "50492699-bfc7-4f37-ac2f-b2bdb3cb7e8d",
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 	"tables": {
 		"email_addresses": {
 			"name": "email_addresses",
@@ -69,6 +74,8 @@
 					"notNull": true,
 					"autoincrement": false
 				},
+<<<<<<< HEAD
+=======
 				"state": {
 					"name": "state",
 					"type": "text",
@@ -90,18 +97,27 @@
 					"notNull": true,
 					"autoincrement": false
 				},
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				"iv": {
 					"name": "iv",
 					"type": "blob",
 					"primaryKey": false,
+<<<<<<< HEAD
+					"notNull": true,
+=======
 					"notNull": false,
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 					"autoincrement": false
 				},
 				"blob": {
 					"name": "blob",
 					"type": "blob",
 					"primaryKey": false,
+<<<<<<< HEAD
+					"notNull": true,
+=======
 					"notNull": false,
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 					"autoincrement": false
 				}
 			},
@@ -115,6 +131,8 @@
 					"columnsTo": ["kid"],
 					"onDelete": "cascade",
 					"onUpdate": "no action"
+<<<<<<< HEAD
+=======
 				},
 				"encrypted_blobs_owner_users_id_fk": {
 					"name": "encrypted_blobs_owner_users_id_fk",
@@ -124,6 +142,7 @@
 					"columnsTo": ["id"],
 					"onDelete": "cascade",
 					"onUpdate": "no action"
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"compositePrimaryKeys": {},
@@ -153,13 +172,16 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
+<<<<<<< HEAD
+=======
 				},
 				"connection_user_name": {
 					"name": "connection_user_name",
 					"type": "text",
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"indexes": {},
@@ -178,6 +200,43 @@
 			"uniqueConstraints": {},
 			"checkConstraints": {}
 		},
+<<<<<<< HEAD
+		"passwords": {
+			"name": "passwords",
+			"columns": {
+				"user_id": {
+					"name": "user_id",
+					"type": "text",
+					"primaryKey": true,
+					"notNull": true,
+					"autoincrement": false
+				},
+				"password_hash": {
+					"name": "password_hash",
+					"type": "text",
+					"primaryKey": false,
+					"notNull": true,
+					"autoincrement": false
+				}
+			},
+			"indexes": {},
+			"foreignKeys": {
+				"passwords_user_id_users_id_fk": {
+					"name": "passwords_user_id_users_id_fk",
+					"tableFrom": "passwords",
+					"tableTo": "users",
+					"columnsFrom": ["user_id"],
+					"columnsTo": ["id"],
+					"onDelete": "cascade",
+					"onUpdate": "no action"
+				}
+			},
+			"compositePrimaryKeys": {},
+			"uniqueConstraints": {},
+			"checkConstraints": {}
+		},
+=======
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 		"public_assets": {
 			"name": "public_assets",
 			"columns": {
@@ -263,6 +322,8 @@
 			"uniqueConstraints": {},
 			"checkConstraints": {}
 		},
+<<<<<<< HEAD
+=======
 		"reserved_kids": {
 			"name": "reserved_kids",
 			"columns": {
@@ -297,6 +358,7 @@
 			"uniqueConstraints": {},
 			"checkConstraints": {}
 		},
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 		"sessions": {
 			"name": "sessions",
 			"columns": {
@@ -402,13 +464,16 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
+<<<<<<< HEAD
+=======
 				},
 				"alias_timestamp": {
 					"name": "alias_timestamp",
 					"type": "integer",
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"indexes": {},

drizzle/meta/_journal.json

@@ -5,15 +5,28 @@
 		{
 			"idx": 0,
 			"version": "6",
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 			"when": 1729459339411,
 			"tag": "0000_quiet_iron_man",
 			"breakpoints": true
 		},
 		{
 			"idx": 1,
 			"version": "6",
+<<<<<<< HEAD
+			"when": 1730326915116,
+			"tag": "0001_noisy_lady_deathstrike",
+=======
+			"when": 1731012522719,
+			"tag": "0000_salty_red_shift",
+>>>>>>> cd6736bb39d0423671ae1834afa4f5a47e45f3a7
+=======
 			"when": 1731834716676,
 			"tag": "0001_productive_shadowcat",
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 			"breakpoints": true
 		}
 	]

src/lib/components/headers/app-header.svelte

@@ -16,12 +16,12 @@
 	const isProfilePage = derived(
 		page,
 		($page) =>
-			$page.url.pathname === "/src/routes/(app)/app/account/page.svelte",
+			$page.url.pathname === "/app/account",
 	);
 </script>
 
 <header
-	class="sticky top-0 z-50 w-full border-b border-border/40 bg-[#373737] backdrop-blur supports-[backdrop-filter]:bg-[#373737]"
+	class="sticky top-0 z-50 w-full bg-[#202020]"
 >
 	<div
 		class="container mx-auto flex h-24 max-w-screen-2xl items-center px-4 2xl:px-0"
@@ -35,12 +35,12 @@
 					class="h-16"
 				/>
 
-				<h1
-					class="ml-4"
-					style="font-family: futura, sans-serif; font-weight: 600; font-style: normal; font-size: 3rem;"
-				>
-					JailBird
-				</h1>
+				<img 
+				src="src/lib/logos/JailBirdText.svg"
+				alt=""
+				class="h-16 pl-4"
+				/>
+
 			</div>
 		</a>
 

src/lib/components/headers/landing-header.svelte

@@ -4,93 +4,21 @@
 	import { page } from "$app/stores";
 	import { derived } from "svelte/store";
 
-	import LogoGreen from "$lib//logos/Logo-Green.svg";
+	import LogoGreen from "$lib//logos/Logo-GreenWithText.svg";
 
 	interface Props {
 		user: User | null;
 	}
 
 	const { user }: Props = $props();
 
-	//need to add pathways for each page
-	const isHomePage = derived(page, ($page) => $page.url.pathname === "/");
-	const isUploadPage = derived(page, ($page) => $page.url.pathname === "/");
-	const isProfilePage = derived(
-		page,
-		($page) =>
-			$page.url.pathname === "/src/routes/(app)/app/account/page.svelte",
-	);
 </script>
 
 <header
-	class="sticky top-0 z-50 w-full border-b border-border/40 bg-[#373737] backdrop-blur supports-[backdrop-filter]:bg-[#373737]"
+	class="sticky top-0 z-50 w-full bg-[#202020] shadow-lg"
 >
-	<div class="container mx-auto flex h-24 max-w-screen-2xl items-center px-4">
-		<div class="flex items-center md:mr-4">
-			<img src={LogoGreen} alt="JailBird Green" class="h-20" />
-
-			<h1 class="">JailBird</h1>
-		</div>
-
-		<div
-			class="hidden flex-1 items-center justify-between space-x-40 md:flex md:justify-end"
-		>
-			<AccountHeaderComponent {user} />
-
-			<!-- Menu icons -->
-
-			<div>
-				<a href="/" class="flex flex-col items-center">
-					<img
-						src={$isHomePage
-							? "src/lib/menuIcons/homeGreen.svg"
-							: "src/lib/menuIcons/homeWhite.svg"}
-						alt="Home Icon"
-						style="height: 40px;"
-						class:active-icon={$isHomePage}
-					/>
-
-					<p class:active-text={$isHomePage}>Home</p>
-				</a>
-			</div>
-
-			<div>
-				<a href="/" class="flex flex-col items-center">
-					<img
-						src={$isUploadPage
-							? "src/lib/menuIcons/uploadGreen.svg"
-							: "src/lib/menuIcons/uploadWhite.svg"}
-						alt="Upload File Icon"
-						style="height: 40px;"
-					/>
-
-					<p class:active-text={$isUploadPage}>Upload Files</p>
-				</a>
-			</div>
-
-			<div>
-				<a href="/" class="flex flex-col items-center">
-					<img
-						src={$isProfilePage
-							? "src/lib/menuIcons/accountGreen.svg"
-							: "src/lib/menuIcons/accountWhite.svg"}
-						alt="Account Icon"
-						style="height: 40px;"
-					/>
-
-					<p class:active-text={$isProfilePage}>Profile</p>
-				</a>
-			</div>
-		</div>
+	<div class="items-center justify-center flex flex-row px-20 py-2">
+		<img src={LogoGreen} alt="JailBird Green" class="h-28 " />
 	</div>
-</header>
 
-<style>
-	p {
-		color: white;
-	}
-
-	.active-text {
-		color: #6cff96;
-	}
-</style>
+</header>

src/lib/components/main.svelte

@@ -15,6 +15,6 @@
 	usable and can be expanded later to also work on mobile.
 -->
 
-<main class={cn("mx-auto max-w-screen-2xl px-4 py-4 2xl:px-0", className)}>
+<main class={cn("mx-auto max-w-screen-2xl px-4 py-4 2xl:px-0 ", className)}>
 	{@render children?.()}
 </main>

src/routes/(app)/app/account/create_key_dialog.svelte

@@ -7,9 +7,16 @@
 	import { Label } from "@/ui/label";
 	import { Input } from "@/ui/input";
 	import * as Select from "@/ui/select";
+<<<<<<< HEAD
+<<<<<<< HEAD
+	import { Button } from "@/ui/button";
+=======
+=======
 
+>>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 	import { Button, buttonVariants } from "@/ui/button";
 	import InlineCodeBlock from "@/inline-codeblock.svelte";
+>>>>>>> cd6736bb39d0423671ae1834afa4f5a47e45f3a7
 
 	import { Plus } from "lucide-svelte";
 	import AnimatedLoading from "$lib/icons/AnimatedLoading.svelte";
@@ -157,12 +164,26 @@
 			<AlertDialog.Title>Create Key</AlertDialog.Title>
 		</AlertDialog.Header>
 		<Tabs.Root value={tabs_value}>
+<<<<<<< HEAD
+			<Tabs.List class="w-full">
+				<Tabs.Trigger class="w-full" value="create" disabled>
+					Create
+				</Tabs.Trigger>
+				<Tabs.Trigger class="w-full" value="download" disabled>
+					Download
+				</Tabs.Trigger>
+			</Tabs.List>
+			<Tabs.Content value="create" class="flex flex-col gap-4 px-4 pt-8">
+				<div class="flex flex-col gap-2">
+					<Label for="friendly_name">Name</Label>
+=======
 			<Tabs.Content value="create">
 				<div class="flex flex-col">
 					<Label class="mb-2" for="friendly_name">
 						Name
 						<span class="align-super text-destructive">*</span>
 					</Label>
+>>>>>>> cd6736bb39d0423671ae1834afa4f5a47e45f3a7
 					<Input
 						id="friendly_name"
 						type="text"
@@ -217,6 +238,9 @@
 					</span>
 				</div>
 
+<<<<<<< HEAD
+				<Button class="mt-4"><Plus class="mr-2" />Create Key</Button>
+=======
 				<div class="flex flex-col gap-2">
 					<Label for="modulus">
 						Modulus
@@ -301,6 +325,7 @@
 						Download Key
 					{/if}
 				</Button>
+>>>>>>> cd6736bb39d0423671ae1834afa4f5a47e45f3a7
 			</Tabs.Content>
 		</Tabs.Root>
 	</AlertDialog.Content>