Merge pull request #372 from ungdev/dev

Merge master
ungdev · Sep 5, 2024 · d302bc6 · d302bc6
2 parents 67890cb + 7cd2434
commit d302bc6
Show file tree

Hide file tree

Showing 87 changed files with 10,018 additions and 10,029 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,9 @@ jobs:
         node-version: [18]
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 8
+          version: 9
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -39,9 +39,9 @@ jobs:
         node-version: [18]
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
-          version: 8
+          version: 9
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

diff --git a/.storybook/preview-body.html b/.storybook/preview-body.html
@@ -1,7 +1,7 @@
 <style>
     :root {
-        --font-montserrat: 'Montserrat', sans-serif;
-        --font-lexend: 'Lexend', sans-serif;
+        --font-agenor: 'agenor', sans-serif;
+        --font-kanit: 'kanit', sans-serif;
     }
 
     .icon {

diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -1,2 +1,3 @@
-<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Lexend&family=Montserrat:wght@400;600;700&display=swap" />
+<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Kanit:wght@400;600;700&display=swap" />
+<link rel="stylesheet" href="public/fonts/AgenorNeue-Regular.otf" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/modern-normalize/2.0.0/modern-normalize.min.css" />
diff --git a/package.json b/package.json
@@ -21,49 +21,48 @@
     "defaults"
   ],
   "dependencies": {
-    "@react-spring/web": "^9.7.3",
-    "@reduxjs/toolkit": "^1.9.7",
-    "modern-normalize": "^2.0.0",
-    "next": "^13.5.6",
+    "@react-spring/web": "^9.7.4",
+    "@reduxjs/toolkit": "^2.2.7",
+    "modern-normalize": "^3.0.0",
+    "next": "^14.2.7",
     "qr-scanner": "^1.4.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-image-crop": "^10.1.8",
-    "react-redux": "^8.1.3",
-    "react-toastify": "^9.1.3",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-image-crop": "^11.0.6",
+    "react-redux": "^9.1.2",
+    "react-toastify": "^10.0.5",
     "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.4.2",
-    "sharp": "^0.32.6"
+    "redux-thunk": "^3.1.0",
+    "sharp": "^0.33.5"
   },
   "devDependencies": {
-    "@storybook/addon-a11y": "^7.5.3",
-    "@storybook/addon-essentials": "^7.5.3",
-    "@storybook/addon-interactions": "^7.5.3",
-    "@storybook/addon-coverage": "^0.0.9",
-    "@types/testing-library__jest-dom": "^5.14.9",
-    "@storybook/addon-links": "^7.5.3",
-    "@storybook/blocks": "^7.5.3",
-    "@storybook/jest": "^0.1.0",
-    "@storybook/nextjs": "^7.5.3",
-    "@storybook/react": "^7.5.3",
-    "@storybook/test-runner": "^0.11.0",
+    "@storybook/addon-a11y": "^8.2.9",
+    "@storybook/addon-coverage": "^1.0.4",
+    "@storybook/addon-essentials": "^8.2.9",
+    "@storybook/addon-interactions": "^8.2.9",
+    "@storybook/addon-links": "^8.2.9",
+    "@storybook/blocks": "^8.2.9",
+    "@storybook/jest": "^0.2.3",
+    "@storybook/nextjs": "^8.2.9",
+    "@storybook/react": "^8.2.9",
+    "@storybook/test-runner": "^0.19.1",
     "@storybook/testing-library": "^0.2.2",
-    "@testing-library/dom": "^9.3.3",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@types/node": "20.4.4",
-    "@types/react": "^18.2.37",
-    "@types/react-dom": "^18.2.15",
-    "@types/redux-logger": "^3.0.12",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
-    "eslint": "^8.54.0",
-    "eslint-config-next": "^13.5.6",
-    "eslint-config-prettier": "^8.10.0",
-    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-storybook": "^0.6.15",
-    "nyc": "^15.1.0",
-    "sass": "^1.69.5",
-    "storybook": "^7.5.3",
-    "typescript": "^5.2.2"
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@types/node": "22.5.2",
+    "@types/react": "^18.3.5",
+    "@types/react-dom": "^18.3.0",
+    "@types/redux-logger": "^3.0.13",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "eslint": "^8.57.0",
+    "eslint-config-next": "^14.2.7",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-storybook": "^0.8.0",
+    "nyc": "^17.0.0",
+    "sass": "^1.77.8",
+    "storybook": "^8.2.9",
+    "typescript": "^5.5.4"
   }
 }