carteronm/Knots-Front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MathieuCarteron
2026-04-28 08:30:04 +02:00
parent daf08994ea 5f0c435a43
commit df8e929723
12 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.html
View File

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

4
src/app/app.component.ts
View File

@@ -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'
})

8
src/app/app.routes.ts
View File

@@ -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)
},
];

0
src/app/login-form/login-form.component.css
View File

17
src/app/login-form/login-form.component.html
View File

@@ -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>

3
src/app/pages/login-form/login-form.component.css Normal file
View File

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

17
src/app/pages/login-form/login-form.component.html Normal file
View File

@@ -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>

0
src/app/login-form/login-form.component.ts → src/app/pages/login-form/login-form.component.ts
View File

1
src/index.html
View File

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

1
src/main.ts
View File

@@ -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));