Merge branch 'develop' into feature/#1

Qfeed-Dev · Aug 5, 2023 · bb0acb5 · bb0acb5
2 parents c60690a + 77af446
commit bb0acb5
Show file tree

Hide file tree

Showing 35 changed files with 1,099 additions and 393 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,24 +11,25 @@
         "build-storybook": "storybook build"
     },
     "dependencies": {
+        "@reduxjs/toolkit": "^1.9.5",
         "@tanstack/react-query": "^4.32.1",
         "@types/node": "20.4.1",
         "@types/react": "18.2.14",
         "@types/react-dom": "18.2.6",
+        "@types/react-redux": "^7.1.25",
         "@types/styled-components": "^5.1.26",
         "autoprefixer": "10.4.14",
         "axios": "^1.4.0",
         "eslint": "8.44.0",
         "eslint-config-next": "13.4.9",
         "next": "13.4.9",
+        "next-redux-wrapper": "^8.1.0",
         "postcss": "8.4.25",
         "react": "18.2.0",
         "react-cookie": "^4.1.1",
         "react-dom": "18.2.0",
+        "react-stack-grid": "^0.7.1",
         "styled-components": "^5.3.10",
-        "@reduxjs/toolkit": "^1.9.5",
-        "@types/react-redux": "^7.1.25",
-        "next-redux-wrapper": "^8.1.0",
         "tailwindcss": "3.3.2",
         "ts-pattern": "^5.0.4",
         "typescript": "5.1.6"
@@ -48,6 +49,7 @@
         "@storybook/nextjs": "^7.1.0",
         "@storybook/react": "^7.1.0",
         "@storybook/testing-library": "^0.2.0",
+        "@types/react-stack-grid": "^0.7.3",
         "eslint-plugin-storybook": "^0.6.13",
         "storybook": "^7.1.0"
     }