Merge branch 'dev' of github.com:Fuma1322/property-hive-frontend into…

… dev
InternPulse · Oct 9, 2024 · 2f9bd1c · 2f9bd1c
2 parents f50bfae + 1d0d86d
commit 2f9bd1c
Show file tree

Hide file tree

Showing 123 changed files with 6,372 additions and 857 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "plugins": ["prettier-plugin-tailwindcss"]
+}
diff --git a/components.json b/components.json
@@ -1,12 +1,14 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
   "style": "default",
+  "style": "new-york",
   "rsc": false,
   "tsx": false,
   "tailwind": {
     "config": "tailwind.config.js",
     "css": "src/index.css",
     "baseColor": "neutral",
+    "baseColor": "zinc",
     "cssVariables": true,
     "prefix": ""
   },
@@ -17,4 +19,13 @@
     "lib": "@/lib",
     "hooks": "@/hooks"
   }
-}
+}
+
+    "components": "@/src/components",
+    "utils": "@/lib/utils",
+    "ui": "@/src/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  }
+}
+
diff --git a/src/assets/Frame 1000010090.png → dist/assets/Frame 1000010090-Dyb9KrU1.png b/src/assets/Frame 1000010090.png → dist/assets/Frame 1000010090-Dyb9KrU1.png
diff --git a/dist/assets/index-BRZrMAgV.css b/dist/assets/index-BRZrMAgV.css
diff --git a/dist/index.html b/dist/index.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
+    <title>Vite + React</title>
+    <script type="module" crossorigin src="/assets/index-BxLGTrYl.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BRZrMAgV.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/dist/user-auth-images/Frame 1.png b/dist/user-auth-images/Frame 1.png
diff --git a/dist/user-auth-images/Frame1.png b/dist/user-auth-images/Frame1.png
diff --git a/dist/user-auth-images/Logo.png b/dist/user-auth-images/Logo.png
diff --git a/dist/user-auth-images/SignInPrompt.png b/dist/user-auth-images/SignInPrompt.png
diff --git a/dist/user-auth-images/company1.png b/dist/user-auth-images/company1.png
diff --git a/public/vite.svg → dist/vite.svg b/public/vite.svg → dist/vite.svg
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,38 +1,39 @@
-import js from '@eslint/js'
-import globals from 'globals'
-import react from 'eslint-plugin-react'
-import reactHooks from 'eslint-plugin-react-hooks'
-import reactRefresh from 'eslint-plugin-react-refresh'
+import js from "@eslint/js";
+import react from "eslint-plugin-react";
+import reactHooks from "eslint-plugin-react-hooks";
+import reactRefresh from "eslint-plugin-react-refresh";
+import globals from "globals";
 
 export default [
-  { ignores: ['dist'] },
+  { ignores: ["dist"] },
   {
-    files: ['**/*.{js,jsx}'],
+    files: ["**/*.{js,jsx}"],
     languageOptions: {
       ecmaVersion: 2020,
       globals: globals.browser,
       parserOptions: {
-        ecmaVersion: 'latest',
+        ecmaVersion: "latest",
         ecmaFeatures: { jsx: true },
-        sourceType: 'module',
+        sourceType: "module",
       },
     },
-    settings: { react: { version: '18.3' } },
+    settings: { react: { version: "18.3" } },
     plugins: {
       react,
-      'react-hooks': reactHooks,
-      'react-refresh': reactRefresh,
+      "react-hooks": reactHooks,
+      "react-refresh": reactRefresh,
     },
     rules: {
       ...js.configs.recommended.rules,
       ...react.configs.recommended.rules,
-      ...react.configs['jsx-runtime'].rules,
+      ...react.configs["jsx-runtime"].rules,
       ...reactHooks.configs.recommended.rules,
-      'react/jsx-no-target-blank': 'off',
-      'react-refresh/only-export-components': [
-        'warn',
+      "react/jsx-no-target-blank": "off",
+      "react/prop-types": "off",
+      "react-refresh/only-export-components": [
+        "warn",
         { allowConstantExport: true },
       ],
     },
   },
-]
+];
diff --git a/index.html b/index.html
@@ -1,16 +1,48 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/public/Logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
-    <title>Vite + React</title>
+    <title>Property Hive</title>
   </head>
   <body>
     <div id="root"></div>
     <script type="module" src="/src/main.jsx"></script>
   </body>
+
+	<head>
+		<meta charset="UTF-8" />
+		<link
+			rel="icon"
+			type="image/svg+xml"
+			href="/vite.svg"
+		/>
+		<meta
+			name="viewport"
+			content="width=device-width, initial-scale=1.0"
+		/>
+		<link
+			rel="preconnect"
+			href="https://fonts.googleapis.com"
+		/>
+		<link
+			rel="preconnect"
+			href="https://fonts.gstatic.com"
+			crossorigin
+		/>
+		<link
+			href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap"
+			rel="stylesheet"
+		/>
+		<title>Property Hive</title>
+	</head>
+	<body>
+		<div id="root"></div>
+		<script
+			type="module"
+			src="/src/main.jsx"
+		></script>
+	</body>
+
 </html>
diff --git a/jsconfig.json b/jsconfig.json
@@ -13,6 +13,12 @@
       "paths": {
         "@/*": ["./src/*"]
       }
+    },
+      "compilerOptions": {
+    "paths": {
+      "@/*": ["./*"]
     }
   }
-
+  }
+
+
diff --git a/lib/utils.js b/lib/utils.js
@@ -0,0 +1,6 @@
+import { clsx } from "clsx";
+import { twMerge } from "tailwind-merge"
+
+export function cn(...inputs) {
+  return twMerge(clsx(inputs));
+}