Merge pull request #14 from sartek430/dev

added vite & bug fixe input password color
sartek430 · Oct 7, 2023 · 3d7ef11 · 3d7ef11
2 parents ffab4a7 + 66d717e
commit 3d7ef11
Show file tree

Hide file tree

Showing 17 changed files with 7,898 additions and 4,879 deletions.
diff --git a/frontend/public/index.html → frontend/index.html b/frontend/public/index.html → frontend/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -13,7 +13,7 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -38,5 +38,6 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+    <script type="module" src="/src/index.jsx"></script>
   </body>
 </html>
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -12,6 +12,7 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "@vitejs/plugin-react": "^4.1.0",
     "eslint": "^8.7.0",
     "framer-motion": "^10.12.18",
     "prettier": "^2.5.1",
@@ -27,10 +28,9 @@
   "scripts": {
     "predeploy": "npm run build",
     "deploy": "gh-pages -d build",
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "start": "vite",
+    "build": "vite build",
+    "test": "cypress open"
   },
   "eslintConfig": {
     "extends": [
@@ -52,7 +52,10 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+    "@vitejs/plugin-react-refresh": "^1.3.6",
+    "create-vite": "^4.4.1",
     "cypress": "^12.16.0",
-    "gh-pages": "^6.0.0"
+    "gh-pages": "^6.0.0",
+    "vite": "^4.4.11"
   }
 }
diff --git a/frontend/src/App.js → frontend/src/App.jsx b/frontend/src/App.js → frontend/src/App.jsx
diff --git a/frontend/src/components/Bubble.js → frontend/src/components/Bubble.jsx b/frontend/src/components/Bubble.js → frontend/src/components/Bubble.jsx
diff --git a/...nd/src/components/FreelanceHelperTitle.js → ...d/src/components/FreelanceHelperTitle.jsx b/...nd/src/components/FreelanceHelperTitle.js → ...d/src/components/FreelanceHelperTitle.jsx
diff --git a/...d/src/components/ToggleColorModeButton.js → .../src/components/ToggleColorModeButton.jsx b/...d/src/components/ToggleColorModeButton.js → .../src/components/ToggleColorModeButton.jsx
diff --git a/frontend/src/config/supabaseClient.js → frontend/src/config/supabaseClient.jsx b/frontend/src/config/supabaseClient.js → frontend/src/config/supabaseClient.jsx
diff --git a/frontend/src/contexts/ThemeContext.js → frontend/src/contexts/ThemeContext.jsx b/frontend/src/contexts/ThemeContext.js → frontend/src/contexts/ThemeContext.jsx
diff --git a/frontend/src/index.js → frontend/src/index.jsx b/frontend/src/index.js → frontend/src/index.jsx
diff --git a/frontend/src/pages/Dashboard.js → frontend/src/pages/Dashboard.jsx b/frontend/src/pages/Dashboard.js → frontend/src/pages/Dashboard.jsx
diff --git a/frontend/src/pages/Login.js → frontend/src/pages/Login.jsx b/frontend/src/pages/Login.js → frontend/src/pages/Login.jsx
diff --git a/frontend/src/pages/NotFound.js → frontend/src/pages/NotFound.jsx b/frontend/src/pages/NotFound.js → frontend/src/pages/NotFound.jsx
diff --git a/frontend/src/pages/Overview.js → frontend/src/pages/Overview.jsx b/frontend/src/pages/Overview.js → frontend/src/pages/Overview.jsx
diff --git a/frontend/src/pages/Signup.js → frontend/src/pages/Signup.jsx b/frontend/src/pages/Signup.js → frontend/src/pages/Signup.jsx
@@ -190,15 +190,17 @@ const Signup = () => {
                   type={showPassword ? "text" : "password"}
                   placeholder="Password"
                   onChange={handlePasswordChange}
-                  // Affiche une bordure rouge si le mot de passe est faible et verte s'il est fort et blanc s'il est vide
-                  {...(passwordStrengthScore <= 3 && password !== ""
-                    ? { focusBorderColor: "#B7133A", borderColor: "#B7133A" }
-                    : passwordStrengthScore > 3
-                    ? { focusBorderColor: "green", borderColor: "green" }
-                    : {
-                        focusBorderColor: "gray.500",
-                        borderColor: "gray.500",
-                      })}
+                  // Affiche une bordure rouge si le mot de passe est faible et verte s'il est fort
+                  borderColor={
+                    passwordStrengthScore <= 3 ? "red.500" : "green.500"
+                  }
+                  focusBorderColor={
+                    passwordStrengthScore <= 3 ? "red.500" : "green.500"
+                  }
+                  _hover={{
+                    borderColor:
+                      passwordStrengthScore <= 3 ? "red.500" : "green.500",
+                  }}
                 />
                 {/* affiche un bouton qui affiche ou non le mot de passe */}
                 <InputRightElement width="auto" m="5px">

diff --git a/frontend/src/themes/theme.js → frontend/src/themes/theme.jsx b/frontend/src/themes/theme.js → frontend/src/themes/theme.jsx
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
@@ -0,0 +1,14 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig({
+  // depending on your application, base can also be "/"
+  base: "/freelanceHelper",
+  plugins: [react()],
+  server: {
+    // this ensures that the browser opens upon server start
+    open: true,
+    // this sets a default port to 3000
+    port: 3000,
+  },
+});