Merge branch 'development' into feat/development/16-Nav

.gitignore

@@ -34,3 +34,5 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+.env

.husky/commit-msg

@@ -1,3 +1,23 @@
-#!/usr/bin/env sh
+# #!/usr/bin/env sh
 
-npx --no-install commitlint --edit "$1"
+# PKG_MGRS="pnpm yarn npm"
+# NODE_GLOBALS="node bun $PKG_MGRS npx"
+
+# NVM_DIR="$HOME/.nvm"
+
+# if [ -d "$NVM_DIR" ]; then
+#     _load_nvm() {
+#         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+#         node --version >/dev/null
+#         npx --version >/dev/null
+#     }
+
+#     for cmd in $NODE_GLOBALS; do
+#         eval "$cmd(){ unset -f $NODE_GLOBALS; _load_nvm; unset -f _load_nvm; $cmd \$@; }"
+#     done
+
+#     unset -f "$NODE_GLOBALS"
+# fi
+
+# npx --no-install commitlint --edit "$1"

.husky/pre-commit

@@ -1,3 +1,31 @@
-#!/usr/bin/env sh
+# #!/usr/bin/env sh
 
-yarn build
+# PKG_MGRS="pnpm yarn npm"
+# NODE_GLOBALS="node bun $PKG_MGRS npx"
+
+# NVM_DIR="$HOME/.nvm"
+
+# if [ -d "$NVM_DIR" ]; then
+#     _load_nvm() {
+#         [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+
+#         node --version >/dev/null
+#         npx --version >/dev/null
+#     }
+
+#     for cmd in $NODE_GLOBALS; do
+#         eval "$cmd(){ unset -f $NODE_GLOBALS; _load_nvm; unset -f _load_nvm; $cmd \$@; }"
+#     done
+
+#     unset -f "$NODE_GLOBALS"
+# fi
+
+# RUNNERS="prettier build"
+# for pm in $PKG_MGRS; do
+#     if command -v "$pm" >/dev/null; then
+#         for X in $RUNNERS; do
+#             eval "$pm run $X"
+#         done
+#         break
+#     fi
+# done

components.json

@@ -14,4 +14,4 @@
     "components": "@/components",
     "utils": "@/lib/utils"
   }
-}
+}

next.config.mjs

@@ -1,14 +1,14 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  // async redirects() {
-  //   return [
-  //     {
-  //       source: "/",
-  //       destination: "/underdev",
-  //       permanent: false,
-  //     },
-  //   ];
-  // },
+  async redirects() {
+    return [
+      {
+        source: "/underdev",
+        destination: "/",
+        permanent: false,
+      },
+    ];
+  },
 };
 
 export default nextConfig;

package.json

@@ -7,19 +7,29 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "prepare": "husky"
+    "prepare": "husky",
+    "prettier": "prettier --write ."
   },
   "dependencies": {
+    "@headlessui/react": "^2.0.3",
+    "@headlessui/tailwindcss": "^0.2.0",
     "@hookform/resolvers": "^3.3.4",
+    "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-toast": "^1.1.5",
     "@reduxjs/toolkit": "^2.2.3",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@remixicon/react": "^4.2.0",
+    "@tremor/react": "^3.16.3",
     "axios": "^1.6.8",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "lucide-react": "^0.376.0",
     "next": "14.2.3",
+    "prettier": "^3.2.5",
+    "prettier-plugin-css-order": "^2.1.2",
+    "prettier-plugin-tailwindcss": "^0.5.14",
     "react": "^18",
     "react-dom": "^18",
     "react-fast-marquee": "^1.6.4",
@@ -34,6 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
+    "@tailwindcss/forms": "^0.5.7",
     "@types/axios": "^0.14.0",
     "@types/node": "^20",
     "@types/react": "^18",
@@ -43,7 +54,7 @@
     "eslint-config-next": "14.2.3",
     "husky": "^9.0.11",
     "postcss": "^8",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.3",
     "typescript": "^5"
   }
 }