MERGE: Dev to Master

.eslintrc.json

@@ -1,99 +1,98 @@
 {
-    "root": true,
-    "env": {
-      "browser": true,
-      "commonjs": true,
-      "es6": true,
-      "node": true,
-      "es2021": true
+  "root": true,
+  "env": {
+    "browser": true,
+    "commonjs": true,
+    "es6": true,
+    "node": true,
+    "es2021": true
+  },
+  "extends": ["airbnb", "prettier", "plugin:react-hooks/recommended"],
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
     },
-    "extends": ["airbnb", "prettier", "plugin:react-hooks/recommended"],
-    "globals": {
-      "Atomics": "readonly",
-      "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-      "ecmaFeatures": {
-        "jsx": true
-      },
-      "ecmaVersion": 2021,
-      "sourceType": "module"
-    },
-    "plugins": ["prettier", "react", "react-hooks", "jsx-a11y", "check-file"],
-    "settings": {
-      "react": {
-        "version": "detect"
+    "ecmaVersion": 2021,
+    "sourceType": "module"
+  },
+  "plugins": ["prettier", "react", "react-hooks", "jsx-a11y", "check-file"],
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "ignorePatterns": [
+    "node_modules/",
+    "routes.jsx",
+    "dist/",
+    "src/main.jsx",
+    "src/**/index.jsx"
+  ],
+  "rules": {
+    "arrow-body-style": 0,
+    "class-methods-use-this": 0,
+    "import/imports-first": 0,
+    "import/newline-after-import": 0,
+    "import/no-dynamic-require": 0,
+    "import/no-named-as-default": 0,
+    "import/no-unresolved": 0,
+    "import/no-webpack-loader-syntax": 0,
+    "import/prefer-default-export": 0,
+    "max-len": 0,
+    "newline-per-chained-call": 0,
+    "no-confusing-arrow": 0,
+    "no-console": 1,
+    "no-unused-vars": 2,
+    "no-use-before-define": 0,
+    "no-restricted-syntax": 0,
+    "no-nested-ternary": 0,
+    "prefer-template": 2,
+    "react/destructuring-assignment": 0,
+    "react/require-default-props": 0,
+    "react/require-extension": 0,
+    "react/self-closing-comp": 0,
+    "react/sort-comp": 0,
+    "react/prop-types": 0,
+    "react/jsx-closing-tag-location": 0,
+    "react/jsx-first-prop-new-line": [2, "multiline"],
+    // "react/jsx-filename-extension": 0,
+    "react/jsx-props-no-spreading": 0,
+    "react/jsx-no-target-blank": 0,
+    "react/react-in-jsx-scope": 0,
+    "react/jsx-uses-vars": 2,
+    "react/function-component-definition": [1, { "namedComponents": "arrow-function" }],
+    "react/button-has-type": 0,
+    "jsx-a11y/aria-props": 2,
+    "jsx-a11y/heading-has-content": 0,
+    "jsx-a11y/label-has-associated-control": [
+      2,
+      {
+        "controlComponents": ["Input"]
       }
-    },
-    "ignorePatterns": [
-      "node_modules/",
-      "routes.jsx",
-      "dist/",
-      "src/main.jsx",
-      "src/**/index.jsx"
     ],
-    "rules": {
-      "arrow-body-style": 0,
-      "class-methods-use-this": 0,
-      "import/imports-first": 0,
-      "import/newline-after-import": 0,
-      "import/no-dynamic-require": 0,
-      "import/no-named-as-default": 0,
-      "import/no-unresolved": 0,
-      "import/no-webpack-loader-syntax": 0,
-      "import/prefer-default-export": 0,
-      "max-len": 0,
-      "newline-per-chained-call": 0,
-      "no-confusing-arrow": 0,
-      "no-console": 1,
-      "no-unused-vars": 2,
-      "no-use-before-define": 0,
-      "no-restricted-syntax": 0,
-      "no-nested-ternary": 0,
-      "prefer-template": 2,
-      "react/destructuring-assignment": 0,
-      "react/require-default-props": 0,
-      "react/require-extension": 0,
-      "react/self-closing-comp": 0,
-      "react/sort-comp": 0,
-      "react/prop-types": 0,
-      "react/jsx-closing-tag-location": 0,
-      "react/jsx-first-prop-new-line": [2, "multiline"],
-      // "react/jsx-filename-extension": 0,
-      "react/jsx-props-no-spreading": 0,
-      "react/jsx-no-target-blank": 0,
-      "react/react-in-jsx-scope": 0,
-      "react/jsx-uses-vars": 2,
-      "react/function-component-definition": [1, { "namedComponents": "arrow-function" }],
-      "react/button-has-type": 0,
-      "jsx-a11y/aria-props": 2,
-      "jsx-a11y/heading-has-content": 0,
-      "jsx-a11y/label-has-associated-control": [
-        2,
-        {
-          "controlComponents": ["Input"]
-        }
-      ],
-      "jsx-a11y/click-events-have-key-events": 0,
-      "jsx-a11y/no-static-element-interactions": 0,
-      "jsx-a11y/label-has-for": 0,
-      "jsx-a11y/mouse-events-have-key-events": 2,
-      "jsx-a11y/role-has-required-aria-props": 2,
-      "jsx-a11y/role-supports-aria-props": 2,
-      "react-hooks/rules-of-hooks": 2,
-      "check-file/filename-naming-convention": [
-        2,
-        {
-          "src/**/*.jsx": "PASCAL_CASE",
-          "src/**/*.js": "CAMEL_CASE"
-        }
-      ],
-      "check-file/folder-naming-convention": [
-        2,
-        {
-          "src/**/": "PASCAL_CASE"
-        }
-      ]
-    }
+    "jsx-a11y/click-events-have-key-events": 0,
+    "jsx-a11y/no-static-element-interactions": 0,
+    "jsx-a11y/label-has-for": 0,
+    "jsx-a11y/mouse-events-have-key-events": 2,
+    "jsx-a11y/role-has-required-aria-props": 2,
+    "jsx-a11y/role-supports-aria-props": 2,
+    "react-hooks/rules-of-hooks": 2,
+    "check-file/filename-naming-convention": [
+      2,
+      {
+        "src/**/*.jsx": "PASCAL_CASE",
+        "src/**/*.js": "CAMEL_CASE"
+      }
+    ],
+    "check-file/folder-naming-convention": [
+      2,
+      {
+        "src/**/": "PASCAL_CASE"
+      }
+    ]
   }
-  
+}

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+package-lock.json
 
 # Editor directories and files
 .vscode/*

.prettierrc.json

@@ -1,8 +1,7 @@
 {
-    "printWidth": 90,
-    "semi": true,
-    "singleQuote": false,
-    "trailingComma": "es5",
-    "bracketSameLine": false
-  }
-
+  "printWidth": 90,
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "es5",
+  "bracketSameLine": false
+}

index.html

@@ -2,11 +2,55 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+
+    <!-- Developed by Posua Website Team -->
+
+    <!--Fonts
+    -->
+
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+    <!-- Alata Font -->
+    <link
+      href="https://fonts.googleapis.com/css2?family=Alata&display=swap"
+      rel="stylesheet"
+    />
+
+    <link
+      href="https://fonts.googleapis.com/css2?family=Abril+Fatface&family=Alata&family=DM+Serif+Display:ital@0;1&family=Outfit:wght@100..900&display=swap"
+      rel="stylesheet"
+    />
+
+    <!-- DM SERIF DISPLAY FONT -->
+    <link
+      href="https://fonts.googleapis.com/css2?family=DM+Serif+Display&display=swap"
+      rel="stylesheet"
+    />
+
+    <!-- DM Serif text font -->
+    <link
+      href="https://fonts.googleapis.com/css2?family=DM+Serif+Text&display=swap"
+      rel="stylesheet"
+    />
+
+    <!-- Philospher font -->
+    <link
+      href="https://fonts.googleapis.com/css2?family=Philosopher&display=swap"
+      rel="stylesheet"
+    />
+
+    <!---->
+    <link
+      rel="icon"
+      type="icon"
+      href="https://res.cloudinary.com/dp92qug2f/image/upload/v1711288702/rangoli_404_posua_d0je3u.png"
+    />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>UC Official Website</title>
+    <meta name="description" content="Posua 2024" />
+    <title>POSUA</title>
   </head>
-  <body>
+
+  <body style="min-height: 100vh">
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
   </body>

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "uc_website",
+  "name": "posua",
   "private": true,
   "version": "1.0.0",
   "type": "module",
@@ -14,20 +14,22 @@
     "prepare": "simple-git-hooks"
   },
   "dependencies": {
+    "@lottiefiles/react-lottie-player": "^3.5.3",
     "@vitejs/plugin-react": "^4.0.4",
     "axios": "^1.6.2",
     "js-cookie": "^3.0.5",
     "lottie-react": "^2.4.0",
-    "pnpm": "^8.14.1",
+    "pnpm": "^8.15.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "react-icons": "^4.12.0",
+    "react-lottie-player": "^2.0.0",
     "react-query": "^3.39.3",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.21.3",
     "react-top-loading-bar": "^2.3.1",
     "sonner": "^1.3.1",
-    "swiper": "^11.0.5",
+    "swiper": "^11.0.7",
     "vite": "^4.4.9"
   },
   "devDependencies": {
@@ -63,4 +65,4 @@
       "pnpm pretty"
     ]
   }
-}
+}