From 448962334f69c74f9a0b2972ee3fa66cde569b38 Mon Sep 17 00:00:00 2001
From: httpjamesm <github@httpjames.space>
Date: Sat, 9 Dec 2023 23:45:15 -0500
Subject: [PATCH] feat: docker with static deploy

---
 .gitignore                   |  2 ++
 Dockerfile                   | 13 +++++++++++++
 docker-compose.example.yml   | 11 +++++++++++
 package.json                 |  2 +-
 src/routes/+layout.server.ts |  2 ++
 src/routes/v/+page.svelte    | 10 ++++++----
 svelte.config.js             |  2 +-
 yarn.lock                    |  5 +++++
 8 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.example.yml
 create mode 100644 src/routes/+layout.server.ts

diff --git a/.gitignore b/.gitignore
index 6635cf5..37f581e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ node_modules
 !.env.example
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+
+docker-compose.yml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..15d9f7b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:18-alpine AS builder
+WORKDIR /app
+COPY package.json .
+COPY yarn.lock .
+RUN yarn install --frozen-lockfile
+COPY . .
+RUN yarn build
+
+# Serve static
+FROM nginx:stable-alpine
+COPY --from=builder /app/build /usr/share/nginx/html
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
new file mode 100644
index 0000000..ce332cb
--- /dev/null
+++ b/docker-compose.example.yml
@@ -0,0 +1,11 @@
+version: '3.8'
+
+services:
+  frontend:
+    container_name: carbon-paper-app
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - 80
+    env_file: .env
diff --git a/package.json b/package.json
index c90f467..51da53f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 		"format": "prettier --plugin-search-dir . --write ."
 	},
 	"devDependencies": {
-		"@sveltejs/adapter-auto": "^2.0.0",
+		"@sveltejs/adapter-static": "^2.0.3",
 		"@sveltejs/kit": "^1.20.4",
 		"@types/libsodium-wrappers-sumo": "^0.7.8",
 		"@types/qrcode": "^1.5.5",
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
new file mode 100644
index 0000000..89da957
--- /dev/null
+++ b/src/routes/+layout.server.ts
@@ -0,0 +1,2 @@
+export const ssr = false;
+export const prerender = true;
diff --git a/src/routes/v/+page.svelte b/src/routes/v/+page.svelte
index 3c05ce6..bc4be57 100644
--- a/src/routes/v/+page.svelte
+++ b/src/routes/v/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { page } from '$app/stores';
 	import { PUBLIC_API_URL } from '$env/static/public';
 	import PasteViewer from './PasteViewer.svelte';
 	import type { PasteRequestBody } from '$lib/types/pasteCreation';
@@ -11,7 +10,6 @@
 	import Alert from '$lib/components/Alert.svelte';
 	import Logo from '$lib/components/Logo.svelte';
 
-	const pasteId = $page.url.searchParams.get('id');
 	let password = '';
 	let requestPassword = false;
 
@@ -30,10 +28,12 @@
 	let errorMessage = '';
 
 	const getPasteMetadata = async () => {
+		const searchParams = new URLSearchParams(window.location.search);
+
 		let res: Response;
 
 		try {
-			res = await fetch(`${PUBLIC_API_URL}/metadata/${pasteId}`);
+			res = await fetch(`${PUBLIC_API_URL}/metadata/${searchParams.get('id')}`);
 		} catch (err) {
 			throw err;
 		}
@@ -54,7 +54,9 @@
 	};
 
 	const getPasteData = async (kekHash?: string) => {
-		let url = `${PUBLIC_API_URL}/data/${pasteId}`;
+		const searchParams = new URLSearchParams(window.location.search);
+
+		let url = `${PUBLIC_API_URL}/data/${searchParams.get('id')}`;
 
 		if (kekHash) {
 			url += `?passwordHash=${kekHash}`;
diff --git a/svelte.config.js b/svelte.config.js
index 1cf26a0..1f68cd2 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,4 +1,4 @@
-import adapter from '@sveltejs/adapter-auto';
+import adapter from '@sveltejs/adapter-static';
 import { vitePreprocess } from '@sveltejs/kit/vite';
 
 /** @type {import('@sveltejs/kit').Config} */
diff --git a/yarn.lock b/yarn.lock
index bd33c62..c8d42c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -246,6 +246,11 @@
   dependencies:
     import-meta-resolve "^4.0.0"
 
+"@sveltejs/adapter-static@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-2.0.3.tgz#616836c30bdce4d673a2e26c0f5ffbd5c1bc7c67"
+  integrity sha512-VUqTfXsxYGugCpMqQv1U0LIdbR3S5nBkMMDmpjGVJyM6Q2jHVMFtdWJCkeHMySc6mZxJ+0eZK3T7IgmUCDrcUQ==
+
 "@sveltejs/kit@^1.20.4":
   version "1.27.5"
   resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.27.5.tgz#df0521cb4f4f8c2cad612ee2587a4dc4f4fcdb7c"