Merge branch 'main' into blog-page-redesign

.eslintrc.cjs

@@ -4,8 +4,14 @@ module.exports = {
     es2021: true,
     node: true,
   },
-  extends: "airbnb",
-  plugins: ["prettier"],
+  extends: [
+    "airbnb",
+    "airbnb/hooks",
+    "eslint:recommended",
+    // "plugin:prettier/recommended",
+    "plugin:react/recommended",
+  ],
+  plugins: ["react", "prettier"],
   overrides: [
     {
       env: {
@@ -24,8 +30,30 @@ module.exports = {
   rules: {
     semi: 0,
     "comma-dangle": 0,
-    "prettier/prettier": "error",
     "react/jsx-filename-extension": [1, { extensions: [".js", ".jsx"] }],
     quotes: ["error", "double"],
+    "linebreak-style": ["error", "unix"],
+    "no-console": "error",
+    "react/react-in-jsx-scope": 0,
+    "import/order": [
+      "error",
+      {
+        groups: [
+          "builtin",
+          "external",
+          "internal",
+          "parent",
+          "sibling",
+          "index",
+        ],
+        alphabetize: { order: "asc", caseInsensitive: true },
+      },
+    ],
+    "prettier/prettier": [
+      "error",
+      {
+        endOfLine: "auto",
+      },
+    ],
   },
 };

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

package.json

@@ -12,7 +12,8 @@
     "start": "react-scripts start",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "pretty": "prettier --write ."
+    "pretty": "prettier --write .",
+    "knip": "knip"
   },
   "dependencies": {
     "@coreui/react": "^4.11.1",
@@ -33,7 +34,6 @@
     "react-fast-marquee": "^1.6.2",
     "react-hook-form": "^7.48.2",
     "react-photo-album": "^2.3.0",
-    "react-query": "^3.39.3",
     "react-router-dom": "^6.11.2",
     "react-share": "^5.1.0",
     "react-simple-wysiwyg": "^2.2.5",
@@ -53,13 +53,12 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.3.4",
     "husky": "^8.0.0",
-    "lint-staged": "^13.2.2",
+    "knip": "^4.3.1",
     "postcss": "^8.4.23",
     "prettier": "^2.8.8",
     "tailwindcss": "^3.3.2",
-    "vite": "^4.3.2"
+    "vite": "^4.5.1"
   },
   "lint-staged": {
     "**/*.{js,jsx}": [

src/APP/components/Footer2.jsx

@@ -95,7 +95,10 @@ function Footer2() {
                   <Link to="/community">Community</Link>
                 </li>
                 <li>
-                  <a href="/products">Products</a>
+                  <Link to="/products">Products</Link>
+                </li>
+                <li>
+                  <Link to="/shop">Shop</Link>
                 </li>
               </ul>
             </div>
@@ -128,7 +131,6 @@ function Footer2() {
                     Gallery
                   </a>
                 </li>
-
               </ul>
             </div>
 
@@ -160,7 +162,6 @@ function Footer2() {
                   special offers
                 </p>
 
-
                 <form className="flex items-center">
                   <input
                     type="email"
@@ -170,15 +171,13 @@ function Footer2() {
                   <button
                     type="submit"
                     className="rounded-r-lg px-2 md:px-4 py-3 flex-auto font-semibold text-white transition-all duration-200 bg-primary border border-transparent hover:bg-gray-700 focus:ring-2 focus:ring-offset-2 focus:ring-gray-900"
-
                   >
                     Subscribe
                   </button>
                 </form>
               </div>
             </div>
           </div>
-
         </div>
 
         <div className="sm:mt-14 mt-10">

src/ADMIN/components/AdminHeader.jsx → src/APP/components/admin/AdminHeader.jsx

@@ -1,8 +1,8 @@
 /* eslint-disable react/react-in-jsx-scope */
 import { Link } from "react-router-dom";
-import logo from "../../assets/images/sytLogo.png";
-import bell from "../../assets/images/icons/bell-icon.svg";
-import profile from "../../assets/images/adminPage/profile-pic.png";
+import logo from "../../../assets/images/sytLogo.png";
+import bell from "../../../assets/images/icons/bell-icon.svg";
+import profile from "../../../assets/images/adminPage/profile-pic.png";
 
 function AdminHeader() {
   return (

src/ADMIN/components/events/EventsTable.jsx → src/APP/components/admin/events/EventsTable.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import SearchIcon from "../../../assets/images/icons/search-icon.svg";
+import SearchIcon from "../../../../assets/images/icons/search-icon.svg";
 
 const initialData = [
   {