From 661e7a33de2a867d6391230afdf424727e51d8a2 Mon Sep 17 00:00:00 2001
From: static <kmc7468@naver.com>
Date: Tue, 7 Jan 2025 01:25:14 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=EA=B0=80=20=EC=99=84=EB=A3=8C=EB=90=9C=20=ED=9B=84?=
 =?UTF-8?q?=EC=97=90=20=ED=8C=8C=EC=9D=BC/=EB=94=94=EB=A0=89=ED=84=B0?=
 =?UTF-8?q?=EB=A6=AC=20=EB=AA=A9=EB=A1=9D=EC=9D=B4=20=EA=B0=B1=EC=8B=A0?=
 =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EA=B5=AC=ED=98=84=EB=90=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=ED=83=AD=20=EC=9E=84=EC=8B=9C?=
 =?UTF-8?q?=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(fullscreen)/auth/login/+page.server.ts   |  2 +-
 .../(fullscreen)/client/pending/+page.ts      |  2 +-
 src/routes/(fullscreen)/key/generate/+page.ts |  2 +-
 src/routes/(main)/BottomBar.svelte            |  6 +-
 src/routes/(main)/category/+page.svelte       |  3 +
 .../DirectoryEntries/DirectoryEntries.svelte  |  2 +-
 src/routes/(main)/directory/[[id]]/service.ts | 61 +++++++++++--------
 src/routes/(main)/favorite/+page.svelte       |  3 +
 src/routes/(main)/home/+page.svelte           |  3 +
 src/routes/(main)/menu/+page.svelte           |  3 +
 src/routes/+page.svelte                       |  2 -
 src/routes/+server.ts                         |  6 ++
 12 files changed, 61 insertions(+), 34 deletions(-)
 create mode 100644 src/routes/(main)/category/+page.svelte
 create mode 100644 src/routes/(main)/favorite/+page.svelte
 create mode 100644 src/routes/(main)/home/+page.svelte
 create mode 100644 src/routes/(main)/menu/+page.svelte
 delete mode 100644 src/routes/+page.svelte
 create mode 100644 src/routes/+server.ts

diff --git a/src/routes/(fullscreen)/auth/login/+page.server.ts b/src/routes/(fullscreen)/auth/login/+page.server.ts
index 874e1be..da7da9c 100644
--- a/src/routes/(fullscreen)/auth/login/+page.server.ts
+++ b/src/routes/(fullscreen)/auth/login/+page.server.ts
@@ -2,7 +2,7 @@ import { redirect } from "@sveltejs/kit";
 import type { PageServerLoad } from "./$types";
 
 export const load: PageServerLoad = async ({ url, cookies }) => {
-  const redirectPath = url.searchParams.get("redirect") || "/";
+  const redirectPath = url.searchParams.get("redirect") || "/home";
 
   const accessToken = cookies.get("accessToken");
   if (accessToken) {
diff --git a/src/routes/(fullscreen)/client/pending/+page.ts b/src/routes/(fullscreen)/client/pending/+page.ts
index 626d2e0..455f322 100644
--- a/src/routes/(fullscreen)/client/pending/+page.ts
+++ b/src/routes/(fullscreen)/client/pending/+page.ts
@@ -1,6 +1,6 @@
 import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async ({ url }) => {
-  const redirectPath = url.searchParams.get("redirect") || "/";
+  const redirectPath = url.searchParams.get("redirect") || "/home";
   return { redirectPath };
 };
diff --git a/src/routes/(fullscreen)/key/generate/+page.ts b/src/routes/(fullscreen)/key/generate/+page.ts
index 626d2e0..455f322 100644
--- a/src/routes/(fullscreen)/key/generate/+page.ts
+++ b/src/routes/(fullscreen)/key/generate/+page.ts
@@ -1,6 +1,6 @@
 import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async ({ url }) => {
-  const redirectPath = url.searchParams.get("redirect") || "/";
+  const redirectPath = url.searchParams.get("redirect") || "/home";
   return { redirectPath };
 };
diff --git a/src/routes/(main)/BottomBar.svelte b/src/routes/(main)/BottomBar.svelte
index 611649b..0e4cbda 100644
--- a/src/routes/(main)/BottomBar.svelte
+++ b/src/routes/(main)/BottomBar.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { goto } from "$app/navigation";
   import { page } from "$app/state";
   import { AdaptiveDiv } from "$lib/components/divs";
 
@@ -26,7 +27,10 @@
     <div class="flex w-full justify-evenly px-4 py-2">
       {#each pages as { path, label, icon: Icon }}
         {@const textColor = !page.url.pathname.startsWith(path) ? "text-gray-600" : ""}
-        <button class="w-16 active:rounded-xl active:bg-gray-100 {textColor}">
+        <button
+          onclick={() => goto(path)}
+          class="w-16 active:rounded-xl active:bg-gray-100 {textColor}"
+        >
           <div class="gap-y flex flex-col items-center gap-y-1 p-1 transition active:scale-95">
             <Icon class="text-xl" fill="0" />
             <p class="text-sm">{label}</p>
diff --git a/src/routes/(main)/category/+page.svelte b/src/routes/(main)/category/+page.svelte
new file mode 100644
index 0000000..493a2ce
--- /dev/null
+++ b/src/routes/(main)/category/+page.svelte
@@ -0,0 +1,3 @@
+<div class="flex h-full items-center justify-center py-4">
+  <p class="text-gray-500">아직 개발 중이에요.</p>
+</div>
diff --git a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
index f852afb..b3cd2dd 100644
--- a/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
+++ b/src/routes/(main)/directory/[[id]]/DirectoryEntries/DirectoryEntries.svelte
@@ -52,6 +52,6 @@
   </div>
 {:else}
   <div class="my-4 flex flex-grow items-center justify-center">
-    <p class="text-gray-500">폴더가 비어있어요.</p>
+    <p class="text-gray-500">폴더가 비어 있어요.</p>
   </div>
 {/if}
diff --git a/src/routes/(main)/directory/[[id]]/service.ts b/src/routes/(main)/directory/[[id]]/service.ts
index 7fdb1df..2d5c86a 100644
--- a/src/routes/(main)/directory/[[id]]/service.ts
+++ b/src/routes/(main)/directory/[[id]]/service.ts
@@ -39,35 +39,42 @@ export const requestDirectoryCreation = async (
   });
 };
 
-export const requestFileUpload = async (
-  file: File,
-  parentId: "root" | number,
-  masterKey: MasterKey,
-) => {
-  const { dataKey, dataKeyVersion } = await generateDataKey();
-  const fileEncrypted = await encryptData(await file.arrayBuffer(), dataKey);
-  const nameEncrypted = await encryptString(file.name, dataKey);
+export const requestFileUpload = (file: File, parentId: "root" | number, masterKey: MasterKey) => {
+  return new Promise<void>(async (resolve, reject) => {
+    const { dataKey, dataKeyVersion } = await generateDataKey();
+    const fileEncrypted = await encryptData(await file.arrayBuffer(), dataKey);
+    const nameEncrypted = await encryptString(file.name, dataKey);
 
-  const form = new FormData();
-  form.set(
-    "metadata",
-    JSON.stringify({
-      parentId,
-      mekVersion: masterKey.version,
-      dek: await wrapDataKey(dataKey, masterKey.key),
-      dekVersion: dataKeyVersion,
-      contentType: file.type,
-      contentIv: fileEncrypted.iv,
-      name: nameEncrypted.ciphertext,
-      nameIv: nameEncrypted.iv,
-    } satisfies FileUploadRequest),
-  );
-  form.set("content", new Blob([fileEncrypted.ciphertext]));
+    const form = new FormData();
+    form.set(
+      "metadata",
+      JSON.stringify({
+        parentId,
+        mekVersion: masterKey.version,
+        dek: await wrapDataKey(dataKey, masterKey.key),
+        dekVersion: dataKeyVersion,
+        contentType: file.type,
+        contentIv: fileEncrypted.iv,
+        name: nameEncrypted.ciphertext,
+        nameIv: nameEncrypted.iv,
+      } satisfies FileUploadRequest),
+    );
+    form.set("content", new Blob([fileEncrypted.ciphertext]));
 
-  // TODO: Progress, Scheduling, ...
-  const xhr = new XMLHttpRequest();
-  xhr.open("POST", "/api/file/upload");
-  xhr.send(form);
+    // TODO: Progress, Scheduling, ...
+    const xhr = new XMLHttpRequest();
+
+    xhr.addEventListener("load", () => {
+      if (xhr.status === 200) {
+        resolve();
+      } else {
+        reject(new Error(xhr.responseText));
+      }
+    });
+
+    xhr.open("POST", "/api/file/upload");
+    xhr.send(form);
+  });
 };
 
 export const requestDirectoryEntryRename = async (
diff --git a/src/routes/(main)/favorite/+page.svelte b/src/routes/(main)/favorite/+page.svelte
new file mode 100644
index 0000000..493a2ce
--- /dev/null
+++ b/src/routes/(main)/favorite/+page.svelte
@@ -0,0 +1,3 @@
+<div class="flex h-full items-center justify-center py-4">
+  <p class="text-gray-500">아직 개발 중이에요.</p>
+</div>
diff --git a/src/routes/(main)/home/+page.svelte b/src/routes/(main)/home/+page.svelte
new file mode 100644
index 0000000..493a2ce
--- /dev/null
+++ b/src/routes/(main)/home/+page.svelte
@@ -0,0 +1,3 @@
+<div class="flex h-full items-center justify-center py-4">
+  <p class="text-gray-500">아직 개발 중이에요.</p>
+</div>
diff --git a/src/routes/(main)/menu/+page.svelte b/src/routes/(main)/menu/+page.svelte
new file mode 100644
index 0000000..493a2ce
--- /dev/null
+++ b/src/routes/(main)/menu/+page.svelte
@@ -0,0 +1,3 @@
+<div class="flex h-full items-center justify-center py-4">
+  <p class="text-gray-500">아직 개발 중이에요.</p>
+</div>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
deleted file mode 100644
index cc88df0..0000000
--- a/src/routes/+page.svelte
+++ /dev/null
@@ -1,2 +0,0 @@
-<h1>Welcome to SvelteKit</h1>
-<p>Visit <a href="https://svelte.dev/docs/kit">svelte.dev/docs/kit</a> to read the documentation</p>
diff --git a/src/routes/+server.ts b/src/routes/+server.ts
new file mode 100644
index 0000000..e02bb98
--- /dev/null
+++ b/src/routes/+server.ts
@@ -0,0 +1,6 @@
+import { redirect } from "@sveltejs/kit";
+import type { RequestHandler } from "./$types";
+
+export const GET: RequestHandler = () => {
+  redirect(302, "/home");
+};