please just let me commit

d3rpp-dev · Nov 19, 2024 · 545da60 · 545da60
2 parents 417afe7 + fc290d0
commit 545da60
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 108 deletions.
diff --git a/drizzle/meta/0001_snapshot.json b/drizzle/meta/0001_snapshot.json
@@ -1,13 +1,8 @@
 {
 	"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",
@@ -74,8 +69,6 @@
 					"notNull": true,
 					"autoincrement": false
 				},
-<<<<<<< HEAD
-=======
 				"state": {
 					"name": "state",
 					"type": "text",
@@ -97,27 +90,18 @@
 					"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
 				}
 			},
@@ -131,8 +115,6 @@
 					"columnsTo": ["kid"],
 					"onDelete": "cascade",
 					"onUpdate": "no action"
-<<<<<<< HEAD
-=======
 				},
 				"encrypted_blobs_owner_users_id_fk": {
 					"name": "encrypted_blobs_owner_users_id_fk",
@@ -142,7 +124,6 @@
 					"columnsTo": ["id"],
 					"onDelete": "cascade",
 					"onUpdate": "no action"
->>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"compositePrimaryKeys": {},
@@ -172,16 +153,13 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
-<<<<<<< HEAD
-=======
 				},
 				"connection_user_name": {
 					"name": "connection_user_name",
 					"type": "text",
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
->>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"indexes": {},
@@ -200,43 +178,6 @@
 			"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": {
@@ -322,8 +263,6 @@
 			"uniqueConstraints": {},
 			"checkConstraints": {}
 		},
-<<<<<<< HEAD
-=======
 		"reserved_kids": {
 			"name": "reserved_kids",
 			"columns": {
@@ -358,7 +297,6 @@
 			"uniqueConstraints": {},
 			"checkConstraints": {}
 		},
->>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 		"sessions": {
 			"name": "sessions",
 			"columns": {
@@ -464,16 +402,13 @@
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
-<<<<<<< HEAD
-=======
 				},
 				"alias_timestamp": {
 					"name": "alias_timestamp",
 					"type": "integer",
 					"primaryKey": false,
 					"notNull": true,
 					"autoincrement": false
->>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
 				}
 			},
 			"indexes": {},

diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
@@ -5,28 +5,13 @@
 		{
 			"idx": 0,
 			"version": "6",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 46ed1164eb2a5d4f64630e0c44a5619ba80e742b
-			"when": 1729459339411,
-			"tag": "0000_quiet_iron_man",
-			"breakpoints": true
+			"when": 1731012522719,
+			"tag": "0000_salty_red_shift"
 		},
 		{
 			"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
 		}
 	]

diff --git a/src/routes/(app)/app/account/create_key_dialog.svelte b/src/routes/(app)/app/account/create_key_dialog.svelte
@@ -7,16 +7,8 @@
 	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";
@@ -164,26 +156,12 @@
 			<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"
@@ -238,9 +216,6 @@
 					</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
@@ -325,7 +300,6 @@
 						Download Key
 					{/if}
 				</Button>
->>>>>>> cd6736bb39d0423671ae1834afa4f5a47e45f3a7
 			</Tabs.Content>
 		</Tabs.Root>
 	</AlertDialog.Content>