diff options
| author | Fuwn <[email protected]> | 2023-08-27 00:48:50 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2023-08-27 00:48:50 -0700 |
| commit | 0693e3319aa0393ce8a52d8d00c618c780d87865 (patch) | |
| tree | aa5da31a957004444aabe5434b0ef15f29da2a9b | |
| parent | feat(svelte): remove adapter (diff) | |
| download | due.moe-0693e3319aa0393ce8a52d8d00c618c780d87865.tar.xz due.moe-0693e3319aa0393ce8a52d8d00c618c780d87865.zip | |
ci(docker): dockerise
| -rw-r--r-- | .dockerignore | 27 | ||||
| -rw-r--r-- | Dockerfile | 21 | ||||
| -rw-r--r-- | src/routes/+layout.svelte | 4 | ||||
| -rw-r--r-- | src/routes/oauth/callback/+server.ts | 10 |
4 files changed, 55 insertions, 7 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..ced480f7 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,27 @@ +# Misc. +.DS_Store + +# Node.js +node_modules + +# SvelteKit +/build +/.svelte-kit +/package + +# Development +.env +.env.* +!.env.example + +# PNPM +pnpm-lock.yaml + +# NPM +package-lock.json + +# Yarn +yarn.lock + +# Visual Studio Code +.vscode diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..a905fa2f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM node:18.16-alpine as build + +WORKDIR /due + +COPY package.json ./ + +RUN yarn install + +COPY ./ ./ + +RUN yarn run build + +FROM node:18.16-alpine + +WORKDIR /due + +COPY --from=build /due . + +EXPOSE 4173 + +CMD ["yarn", "run", "preview", "--", "--host", "0.0.0.0"]
\ No newline at end of file diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 2445967e..d4a62fb8 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1,5 +1,5 @@ <script> - import { PUBLIC_ANILIST_CLIENT_ID, PUBLIC_ANILIST_REDIRECT_URI } from '$env/static/public'; + import { env } from '$env/dynamic/public'; import { userIdentity } from '$lib/AniList/identity'; import { onMount } from 'svelte'; import { lastActivityDate } from '$lib/AniList/activity'; @@ -25,7 +25,7 @@ {#if data.user === undefined} <a - href={`https://anilist.co/api/v2/oauth/authorize?client_id=${PUBLIC_ANILIST_CLIENT_ID}&redirect_uri=${PUBLIC_ANILIST_REDIRECT_URI}&response_type=code`} + href={`https://anilist.co/api/v2/oauth/authorize?client_id=${env.PUBLIC_ANILIST_CLIENT_ID}&redirect_uri=${env.PUBLIC_ANILIST_REDIRECT_URI}&response_type=code`} >Log in with AniList</a > {:else} diff --git a/src/routes/oauth/callback/+server.ts b/src/routes/oauth/callback/+server.ts index 8dd8cd5a..1874f695 100644 --- a/src/routes/oauth/callback/+server.ts +++ b/src/routes/oauth/callback/+server.ts @@ -1,15 +1,15 @@ import { dev } from '$app/environment'; -import { ANILIST_CLIENT_SECRET } from '$env/static/private'; -import { PUBLIC_ANILIST_CLIENT_ID, PUBLIC_ANILIST_REDIRECT_URI } from '$env/static/public'; +import { env } from '$env/dynamic/private'; +import { env as env2 } from '$env/dynamic/public'; import { redirect } from '@sveltejs/kit'; export const GET = async ({ url, cookies }) => { const formData = new FormData(); formData.append('grant_type', 'authorization_code'); - formData.append('client_id', PUBLIC_ANILIST_CLIENT_ID); - formData.append('client_secret', ANILIST_CLIENT_SECRET); - formData.append('redirect_uri', PUBLIC_ANILIST_REDIRECT_URI); + formData.append('client_id', env2.PUBLIC_ANILIST_CLIENT_ID); + formData.append('client_secret', env.ANILIST_CLIENT_SECRET); + formData.append('redirect_uri', env2.PUBLIC_ANILIST_REDIRECT_URI); formData.append('code', url.searchParams.get('code') || 'null'); cookies.set( 'user', |