chore: add utility npm run dev

betagouv · Dec 22, 2023 · 82c4b3f · 82c4b3f
1 parent 4b1c44a
commit 82c4b3f
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 24 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/README.md b/README.md
@@ -18,22 +18,11 @@ Install locally the application:
 git clone [email protected]:betagouv/espace-partenaire.git
 ```
 
-Copy back .env
-
-```
-cp back/.env.dist back/.env
-```
-
-Copy front .env
-
-```
-cp front/.env.dist front/.env
-```
-
-Install project:
-
-```
-make i
+```sh
+$ npm install
+$ npm dev # will do a docker compose up !
+$ npm build
+$ npm start
 ```
 
 ## Start backend
@@ -43,13 +32,15 @@ Launch backend
 ```
 make sb
 ```
+
 You can access the project here : http://localhost:3000/welcome
 
 If you want to launch a the front served by the backend:
 
 ```
 make f
 ```
+
 You can see the static front on http://localhost:3000
 
 ## Start front end for dev
@@ -59,8 +50,8 @@ Launch the project with another node server locally (not on docker this time):
 ```
 make sf
 ```
-You can access it on http://localhost:3001/ :
 
+You can access it on http://localhost:3001/ :
 
 ## Global Architecture
 

diff --git a/front/index.html b/front/index.html
@@ -10,17 +10,17 @@
     <link rel="icon" href="./dsfr/favicon/favicon.svg" type="image/svg+xml" />
     <link
       rel="shortcut icon"
-      href="./dsfr/favicon/favicon.ico"
+      href="/dsfr/favicon/favicon.ico"
       type="image/x-icon"
     />
     <link
       rel="manifest"
-      href="./favicon/manifest.webmanifest"
+      href="/favicon/manifest.webmanifest"
       crossorigin="use-credentials"
     />
 
-    <link rel="stylesheet" href="./dsfr/utility/icons/icons.min.css" />
-    <link rel="stylesheet" href="./dsfr/dsfr.min.css" />
+    <link rel="stylesheet" href="/dsfr/utility/icons/icons.min.css" />
+    <link rel="stylesheet" href="/dsfr/dsfr.min.css" />
   </head>
 
   <body>

diff --git a/front/package.json b/front/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite build --watch",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",

diff --git a/front/src/routes/Router.tsx b/front/src/routes/Router.tsx
@@ -72,9 +72,10 @@ const router = createBrowserRouter([
     path: '/dashboard/new',
     element: (
       <PageLayout>
-        <OidcClientFormProvider>
+        <>test</>
+        {/* <OidcClientFormProvider>
           <EspaceConnected />
-        </OidcClientFormProvider>
+        </OidcClientFormProvider> */}
       </PageLayout>
     ),
   },

diff --git a/package.json b/package.json
@@ -6,6 +6,10 @@
   },
   "private": true,
   "scripts": {
+    "dev": "npx npm-run-all --parallel dev:*",
+    "dev:front": "npm run dev --workspace front",
+    "dev:back": "npm run start:dev --workspace back",
+    "dev:database": "docker compose up",
     "build": "npm run build --workspaces",
     "start": "npm run start --workspace back"
   },