Merge remote-tracking branch 'origin/develop' into develop

angular.json

@@ -130,5 +130,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }

package-lock.json

@@ -6115,6 +6115,16 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/http-errors": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",
@@ -6230,6 +6240,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/sockjs": {
       "version": "0.3.36",
       "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
@@ -6708,6 +6725,26 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/autoprefixer": {
       "version": "10.4.20",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
@@ -13730,6 +13767,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",

src/app/app.component.html

@@ -1 +1 @@
-<app-messages-main></app-messages-main>
+<router-outlet></router-outlet>

src/app/app.component.ts

@@ -1,13 +1,13 @@
 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
-import {LoginFormComponent} from "./login-form/login-form.component";
+import {LoginFormComponent} from "./pages/login-form/login-form.component";
 import {MessagesInfoUser} from "./pages/messages/messages-infouser/messages-infouser.component";
 import {MessagesMain} from "./pages/messages/messages-main/messages-main.component";
 
 
 @Component({
   selector: 'app-root',
-  imports: [MessagesMain],
+  imports: [RouterOutlet],
   templateUrl: './app.component.html',
   styleUrl: './app.component.css'
 })

src/app/app.routes.ts

@@ -17,7 +17,7 @@ export const routes: Routes = [
 
             {
                 path:'messages',
-                loadComponent: () => import('./pages/messages/messages-menu/messages-menu.component').then(x => x.MessagesMenu)
+                loadComponent: () => import('./pages/messages/messages-main/messages-main.component').then(x => x.MessagesMain)
             },
             {
                 path:'menu',
@@ -29,5 +29,9 @@ export const routes: Routes = [
                 loadComponent: () => import('./pages/parameters/parameters.component').then(x => x.Parameters)
             }*/
         ]
-    }
+    },
+    {
+        path:'login',
+        loadComponent: () => import('./pages/login-form/login-form.component').then(x => x.LoginFormComponent)
+    },
 ];

src/app/login-form/login-form.component.html

@@ -1,17 +0,0 @@
-<ion-card>
-    <ion-card-header>
-        <ion-card-title>Login</ion-card-title><br><br>
-        <ion-card-subtitle>Connectez-vous à Knots !</ion-card-subtitle><br><br>
-    </ion-card-header>
-
-    <ion-card-content>
-        Login
-        <br>
-        <input type="text">
-        <br>
-        Mot de Passe
-    </ion-card-content><br>
-
-    <ion-button fill="clear">Action 1</ion-button>
-    <ion-button fill="clear">Action 2</ion-button>
-</ion-card>

src/app/pages/login-form/login-form.component.css

@@ -0,0 +1,3 @@
+ion-card{
+    justify-content: center;
+}

src/app/pages/login-form/login-form.component.html

@@ -0,0 +1,17 @@
+<ion-card>
+    <ion-card-header>
+        <ion-card-title>Connectez-vous à Knots !</ion-card-title><br><br>
+    </ion-card-header>
+
+    <ion-card-content>
+        Login
+        <br>
+        <input type="text">
+        <br>
+        Mot de Passe
+        <br>
+        <input type="password">
+    </ion-card-content><br>
+
+    <ion-button fill="clear">Se connecter</ion-button>
+</ion-card>

src/index.html

@@ -9,6 +9,5 @@
 </head>
 <body>
   <app-root></app-root>
-    <login-form></login-form>
 </body>
 </html>

src/main.ts

@@ -1,7 +1,6 @@
 import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
-import { LoginFormComponent } from './app/login-form/login-form.component'
 
 bootstrapApplication(AppComponent, appConfig)
   .catch((err) => console.error(err));