Merge pull request #350 from Twinsteak/dev

[release] v1.1.0
Twinsteak · Aug 15, 2024 · 1fcf32b · 1fcf32b
2 parents a9a76e0 + c4ba936
commit 1fcf32b
Show file tree

Hide file tree

Showing 176 changed files with 7,139 additions and 4,434 deletions.
diff --git a/.github/workflows/aws-deploy.yml b/.github/workflows/aws-deploy.yml
@@ -9,30 +9,30 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 21
       - uses: aws-actions/setup-sam@v2
-      - uses: aws-actions/configure-aws-credentials@v1
+      - uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-northeast-2
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
-          version: 7
+          version: 9
           run_install: false
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
       - name: Setup pnpm cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
@@ -45,6 +45,6 @@ jobs:
       - name: Build
         run: pnpm build
       - name: Deploy server
-        run: pnpm -r --filter=server run deploy --parameter-overrides "JwtSecret=\"${{ secrets.JWT_SECRET }}\""
+        run: pnpm -r --filter=server run deploy --parameter-overrides "JwtSecret=\"${{ secrets.JWT_SECRET }}\" SsutodaySecret=\"${{ secrets.SSUTODAY_SECRET }}\""
       - name: Deploy client
         run: pnpm -r --filter=client run deploy
diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml
@@ -7,42 +7,40 @@ jobs:
   check:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 21
+      - name: Enable corepack
+        run: corepack enable
       - name: Install pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
-          version: 7
+          version: 9
           run_install: false
       - name: Get pnpm store directory
         id: pnpm-cache
         run: |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
       - name: Setup pnpm cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
+      - name: Build client
+        run: pnpm -r --filter=client build
       - name: Run prettier check
         run: pnpm -r prettier
       - name: Run eslint in server and types
         run: pnpm -r --filter=!client lint
       - name: Run eslint on changed files in client
-        uses: tj-actions/eslint-changed-files@v13.3
+        uses: tj-actions/eslint-changed-files@v25
         with:
           path: "./packages/client"
-          file_extensions: |
-            **/*.ts
-            **/*.svelte
-            **/*.js
-            **/*.json
-      - name: Build client
-        run: pnpm -r --filter=client build
+          file_extensions: "**/*.{ts, svelte}"
       - name: Run svelte-check
         run: pnpm -r check
diff --git a/.github/workflows/openapi-gen.yml b/.github/workflows/openapi-gen.yml
@@ -8,16 +8,17 @@ on:
 jobs:
   openapi-gen:
     runs-on: ubuntu-22.04
+    permissions: write-all
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Generate Swagger UI
         uses: Legion2/swagger-ui-action@v1
         with:
           output: swagger-ui
           spec-file: "packages/server/api.yaml"
       - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: swagger-ui
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "eslint.workingDirectories": [
+      "packages/client",
+      "packages/server",
+      "packages/types"
+    ],
+    "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "svelte"]
+  }
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 <h1 align="center">숭실대학교 사물함 예약 시스템</h1>
 <p align="center">숭실대학교 학생들의 사물함 예약을 편리하게 하기 위한 예약 시스템입니다.</p>
 <p align="center">
-   <a href="https://github.com/EATSTEAK/lockerweb/releases"><img alt="Version" src="https://img.shields.io/github/package-json/v/EATSTEAK/lockerweb?style=for-the-badge"></a>
-   <a href="https://github.com/EATSTEAK/lockerweb/LICENSE.md"><img alt="License" src="https://img.shields.io/github/license/EATSTEAK/lockerweb?style=for-the-badge"></a>
-   <a href="https://eatsteak.github.io/lockerweb"><img alt="API Docs" src="https://img.shields.io/badge/API%20Docs-v1-%2389bf04?style=for-the-badge&logo=Swagger"></a>
-   <a href="https://ssuitlocker.com"><img alt="Website" src="https://img.shields.io/website?down_color=red&down_message=%EC%A0%91%EC%86%8D%20%EB%B6%88%EA%B0%80&label=IT%EB%8C%80%ED%95%99%20%EC%82%AC%EB%AC%BC%ED%95%A8%20%EC%98%88%EC%95%BD%20%EC%8B%9C%EC%8A%A4%ED%85%9C&style=for-the-badge&up_color=%2300a3c9&up_message=%EC%A0%91%EC%86%8D%20%EA%B0%80%EB%8A%A5&url=https%3A%2F%2Fssuitlocker.com"></a>
-   <a href="https://github.com/EATSTEAK/lockerweb/actions/workflows/aws-deploy.yml"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/EATSTEAK/lockerweb/Deploy%20to%20AWS?label=Deploy&logo=github&style=for-the-badge"></a>
+   <a href="https://github.com/Twinsteak/lockerweb/releases"><img alt="Version" src="https://img.shields.io/github/package-json/v/Twinsteak/lockerweb?style=for-the-badge"></a>
+   <a href="https://github.com/Twinsteak/lockerweb/LICENSE.md"><img alt="License" src="https://img.shields.io/github/license/Twinsteak/lockerweb?style=for-the-badge"></a>
+   <a href="https://twinsteak.github.io/lockerweb"><img alt="API Docs" src="https://img.shields.io/badge/API%20Docs-v1-%2389bf04?style=for-the-badge&logo=Swagger"></a>
+   <a href="https://locker.soongsil.media"><img alt="Website" src="https://img.shields.io/website?down_color=red&down_message=%EC%A0%91%EC%86%8D%20%EB%B6%88%EA%B0%80&label=IT%EB%8C%80%ED%95%99%20%EC%82%AC%EB%AC%BC%ED%95%A8%20%EC%98%88%EC%95%BD%20%EC%8B%9C%EC%8A%A4%ED%85%9C&style=for-the-badge&up_color=%2300a3c9&up_message=%EC%A0%91%EC%86%8D%20%EA%B0%80%EB%8A%A5&url=https%3A%2F%2Fssuitlocker.com"></a>
+   <a href="https://github.com/Twinsteak/lockerweb/actions/workflows/aws-deploy.yml"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/Twinsteak/lockerweb/aws-deploy.yml?branch=main&label=Deploy&logo=github&style=for-the-badge"></a>
 </p>
 
 -----

diff --git a/package.json b/package.json
@@ -5,9 +5,10 @@
   "private": true,
   "scripts": {
     "build": "concurrently -p \"[{name} / {time}]\" -c \"green,magenta\" -n \"client,server\" \"pnpm run -r --filter=client build \" \"pnpm run -r -filter=server build\"",
-    "dev": "concurrently -p \"[{name} / {time}]\" -c \"green,magenta\" -n \"client,server\" \"pnpm run -r --filter=client dev \" \"pnpm run -r -filter=server dev\"",
+    "dev": "concurrently -p \"[{name} / {time}]\" -c \"green,blue,magenta\" -n \"client,server(tsc),server\" \"pnpm run -r --filter=client dev \" \"pnpm run -r --filter=server watch\" \"pnpm run -r -filter=server dev\"",
     "delete": "pnpm run --filter=client delete && pnpm run --filter=server delete",
-    "deploy": "node ./scripts/deploy.js"
+    "deploy": "node ./scripts/deploy.js",
+    "cf-invalidate": "node ./scripts/cf-invalidate.js"
   },
   "repository": {
     "type": "git",
@@ -23,7 +24,7 @@
   },
   "homepage": "https://github.com/EATSTEAK/lockerweb",
   "devDependencies": {
-    "concurrently": "^7.3.0",
-    "lint-staged": "^13.0.3"
+    "concurrently": "^8.2.1",
+    "lint-staged": "^15.2.8"
   }
 }
diff --git a/packages/client/.eslintrc.cjs b/packages/client/.eslintrc.cjs
@@ -1,13 +1,35 @@
 module.exports = {
   root: true,
-  extends: ['plugin:import/recommended', 'eslint:recommended'],
-  plugins: ['svelte3', '@typescript-eslint', 'tailwindcss'],
-  ignorePatterns: ['*.cjs'],
+  extends: ['plugin:import/recommended', 'eslint:recommended', 'plugin:svelte/recommended'],
+  plugins: ['@typescript-eslint', 'tailwindcss'],
+  ignorePatterns: ['*.cjs', '*.js'],
+  parserOptions: {
+    project: 'tsconfig.json',
+    sourceType: 'module',
+    ecmaVersion: 2020,
+    extraFileExtensions: ['.svelte'],
+  },
+  env: {
+    browser: true,
+    es2017: true,
+    node: true,
+  },
+  settings: {
+    svelte: {
+      kit: {
+        files: {
+          routes: 'src/routes',
+        },
+      },
+    },
+  },
   overrides: [
     {
       files: ['*.svelte'],
-      processor: 'svelte3/svelte3',
-      parser: '@typescript-eslint/parser',
+      parser: 'svelte-eslint-parser',
+      parserOptions: {
+        parser: '@typescript-eslint/parser',
+      },
       extends: [
         'plugin:import/typescript',
         'airbnb-typescript/base',
@@ -17,6 +39,11 @@ module.exports = {
       ],
       rules: {
         '@typescript-eslint/indent': 'off',
+        '@typescript-eslint/no-throw-literal': 'off',
+        'import/no-extraneous-dependencies': 'off',
+        'import/extensions': 'off',
+        'import/no-unresolved': 'off',
+        'no-undef': 'off',
       },
     },
     {
@@ -30,20 +57,11 @@ module.exports = {
       ],
       rules: {
         '@typescript-eslint/indent': 'off',
+        '@typescript-eslint/no-throw-literal': 'off',
+        'import/no-extraneous-dependencies': 'off',
+        'import/extensions': 'off',
+        'import/no-unresolved': 'off',
       },
     },
   ],
-  settings: {
-    'svelte3/typescript': () => require('typescript'),
-  },
-  parserOptions: {
-    project: 'tsconfig.json',
-    sourceType: 'module',
-    ecmaVersion: 2020,
-  },
-  env: {
-    browser: true,
-    es2017: true,
-    node: true,
-  },
 };
diff --git a/packages/client/.prettierrc b/packages/client/.prettierrc
@@ -2,5 +2,6 @@
   "singleQuote": true,
   "trailingComma": "all",
   "printWidth": 100,
-  "bracketSameLine": true
+  "bracketSameLine": true,
+  "plugins": ["prettier-plugin-tailwindcss"]
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,50 +1,54 @@
 {
   "name": "client",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "scripts": {
-    "dev": "cross-env VITE_BASE_URL=http://localhost:3000 vite dev --port 5002 --host 0.0.0.0",
-    "build": "vite build",
+    "dev": "vite dev --port 5002 --host 0.0.0.0",
+    "build": "cross-env VITE_BASE_URL= vite build",
     "package": "svelte-kit package",
     "preview": "vite preview",
     "check": "svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
-    "prettier": "prettier --check --plugin-search-dir=. . ",
+    "prettier": "prettier --check . ",
     "lint": "eslint .",
-    "format": "eslint . --fix && prettier --write --plugin-search-dir=. .",
+    "format": "eslint . --fix && prettier --write .",
     "delete": "node ./scripts/delete.js",
     "deploy": "node ./scripts/deploy.js"
   },
   "devDependencies": {
-    "@sveltejs/adapter-auto": "1.0.0-next.65",
-    "@sveltejs/adapter-static": "1.0.0-next.39",
-    "@sveltejs/kit": "1.0.0-next.431",
-    "@tailwindcss/forms": "^0.5.2",
-    "@types/lodash.isequal": "^4.5.6",
-    "@typescript-eslint/eslint-plugin": "^5.27.0",
-    "@typescript-eslint/parser": "^5.27.0",
-    "autoprefixer": "^10.4.7",
+    "@sveltejs/adapter-auto": "3.2.3",
+    "@sveltejs/adapter-static": "3.0.3",
+    "@sveltejs/kit": "^2.5.21",
+    "@sveltejs/vite-plugin-svelte": "^3.1.1",
+    "@tailwindcss/forms": "^0.5.7",
+    "@types/lodash.isequal": "^4.5.8",
+    "@typescript-eslint/eslint-plugin": "^7.0.0",
+    "@typescript-eslint/parser": "^7.0.0",
+    "autoprefixer": "^10.4.19",
     "cross-env": "^7.0.3",
-    "eslint": "^8.16.0",
-    "eslint-config-airbnb-typescript": "^16.2.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-svelte3": "^4.0.0",
-    "eslint-plugin-tailwindcss": "^3.6.0",
-    "postcss": "^8.4.14",
-    "postcss-load-config": "^4.0.1",
-    "prettier": "^2.6.2",
-    "prettier-plugin-tailwindcss": "^0.1.13",
-    "svelte": "^3.44.0",
-    "svelte-check": "^2.7.1",
-    "svelte-preprocess": "^4.10.7",
-    "tailwindcss": "^3.1.5",
-    "tslib": "^2.3.1",
-    "typescript": "^4.7.4",
-    "vite": "^3.0.0",
-    "zod": "^3.18.0"
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-svelte": "^2.42.0",
+    "eslint-plugin-tailwindcss": "^3.17.4",
+    "konva": "^9.3.13",
+    "postcss": "^8.4.39",
+    "postcss-load-config": "^5.1.0",
+    "prettier": "^3.3.3",
+    "prettier-plugin-tailwindcss": "^0.6.6",
+    "svelte": "^4.2.18",
+    "svelte-check": "^3.8.4",
+    "svelte-konva": "^0.3.1",
+    "svelte-preprocess": "^6.0.2",
+    "tailwindcss": "^3.4.5",
+    "tslib": "^2.6.3",
+    "typescript": "^5.5.3",
+    "vite": "^5.4.0",
+    "zod": "^3.23.8"
   },
   "type": "module",
   "dependencies": {
+    "canvas": "^2.11.2",
     "lodash.isequal": "^4.5.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.18.10/xlsx-0.18.10.tgz"
   }

diff --git a/packages/client/prettier.config.cjs b/packages/client/prettier.config.cjs
diff --git a/packages/client/src/app.css b/packages/client/src/app.css
@@ -14,9 +14,22 @@ html {
 }
 
 :root {
-  font-family: 'Pretendard Variable', Pretendard, -apple-system, BlinkMacSystemFont, system-ui,
-    Roboto, 'Helvetica Neue', 'Segoe UI', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic',
-    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', sans-serif;
+  font-family:
+    'Pretendard Variable',
+    Pretendard,
+    -apple-system,
+    BlinkMacSystemFont,
+    system-ui,
+    Roboto,
+    'Helvetica Neue',
+    'Segoe UI',
+    'Apple SD Gothic Neo',
+    'Noto Sans KR',
+    'Malgun Gothic',
+    'Apple Color Emoji',
+    'Segoe UI Emoji',
+    'Segoe UI Symbol',
+    sans-serif;
   @apply text-gray-700;
 }
 

diff --git a/packages/client/src/app.html b/packages/client/src/app.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/packages/client/src/components/atom/Button.svelte b/packages/client/src/components/atom/Button.svelte
@@ -20,8 +20,8 @@
   on:mouseenter
   on:mouseleave
   on:keydown
-  on:keypress
   on:keyup
+  role="button"
   {href}
   tabindex="0"
   class="{clazz} flex flex-shrink-0