Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"private": true,
"dependencies": {
"@angular/animations": "^19.0.0",
"@angular/cdk": "^19.1.5",
"@angular/common": "^19.0.0",
"@angular/compiler": "^19.0.0",
"@angular/core": "^19.0.0",
Expand All @@ -39,7 +40,8 @@
"@angular/router": "^19.0.0",
"@ngrx/store": "^19.0.1",
"@primeng/themes": "^19.0.6",
"primeng": "^19.0.6",
"primeicons": "^7.0.0",
"primeng": "^19.0.8",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.15.0"
Expand Down
Binary file modified public/LogoALAsso.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/app/app.routes.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { Routes } from '@angular/router';
import { ActivitiesHomeComponent } from './features/activity/pages/activities-home/activities-home.component';
import { DemoComponent } from './features/activity/pages/demo/demo.component';

export const routes: Routes = [
{
path: '',
component: ActivitiesHomeComponent,
},
{
path: 'demo',
component: DemoComponent,
},
];
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<p-floatlabel [variant]="variant">
@if (type === 'date') {
<p-calendar [inputId]="'input_' + (label | lowercase)" [(ngModel)]="value" [disabled]="disabled" dateFormat="dd.mm.yy"> </p-calendar>
} @else {
<input pInputText [id]="'input_' + (label | lowercase)" [(ngModel)]="value" [type]="type" [disabled]="disabled" autocomplete="off" />
}

<label [for]="'input_' + (label | lowercase)">{{ label }}</label>
</p-floatlabel>
27 changes: 27 additions & 0 deletions src/app/common/components/input-field/input-field.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
p-floatlabel {
input,
::ng-deep p-calendar span input {
width: 100%;
font-size: 16px;
background-color: var(--background-color-light);
border: var(--grey-border);
border-radius: 8px;
transition: border-color 0.3s ease-in-out;
color: black;

&:focus,
&:hover,
&:active {
border-color: var(--primary-light-color) !important;
outline: none;
~ label {
color: var(--primary-light-color);
}
}

label {
transition: all 0.3s ease-in-out;
color: var(--primary-light-color);
}
}
}
21 changes: 21 additions & 0 deletions src/app/common/components/input-field/input-field.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Component, Input } from '@angular/core';
import { CommonModule } from '@angular/common';
import { InputTextModule } from 'primeng/inputtext';
import { FloatLabelModule } from 'primeng/floatlabel';
import { FormsModule } from '@angular/forms';
import { CalendarModule } from 'primeng/calendar';

@Component({
selector: 'app-input-field',
standalone: true,
imports: [CommonModule, InputTextModule, FloatLabelModule, CalendarModule, FormsModule],
templateUrl: './input-field.component.html',
styleUrls: ['./input-field.component.scss'],
})
export class InputFieldComponent {
@Input() label: string = '';
@Input() type: string = 'text';
@Input() disabled: boolean = false;
@Input() variant: 'in' | 'on' = 'in';
value: string = '';
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<app-activity-card [activity]="activity"></app-activity-card>
}
</div>
<div class="map-activities" [ngClass]="chosenNavigation !== 'Carte' ? 'hidden' : ''">
<!--TODO: rajouter ici composant map pour la page activities-->
</div>
</div>
<div class="map-activities" [ngClass]="chosenNavigation !== 'Carte' ? 'hidden' : ''">
<!--TODO: rajouter ici composant map pour la page activities-->
</div>

<div class="switch-map">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AsyncPipe, NgClass } from '@angular/common';
import { Component, inject, OnInit } from '@angular/core';
import { ActivityCardComponent } from '../../components/activity-card/activity-card.component';
import { ActivityFacadeService } from '../../services/activity-facade.service';
import { Activity } from '../../models/activity.model';
import { Observable } from 'rxjs';
import { AsyncPipe, NgClass } from '@angular/common';
import { ToggleMenuComponent } from '../../../../common/components/toggle-menu/toggle-menu.component';
import { ActivityCardComponent } from '../../components/activity-card/activity-card.component';
import { Activity } from '../../models/activity.model';
import { ActivityFacadeService } from '../../services/activity-facade.service';

@Component({
selector: 'app-activities-home',
Expand Down
7 changes: 7 additions & 0 deletions src/app/features/activity/pages/demo/demo.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<div class="input-demo">
<h3>Single Input Demo</h3>
<app-input-field label="Nom" type="text"></app-input-field>
<app-input-field label="Email" type="email"></app-input-field>
<app-input-field label="Mot de passe" type="password"></app-input-field>
<app-input-field label="Date de naissance" type="date"></app-input-field>
</div>
12 changes: 12 additions & 0 deletions src/app/features/activity/pages/demo/demo.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.input-demo {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
height: 100%;
margin: 50px 0;

h3 {
color: var(--primary-light-color);
}
}
11 changes: 11 additions & 0 deletions src/app/features/activity/pages/demo/demo.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
import { InputFieldComponent } from 'src/app/common/components/input-field/input-field.component';

@Component({
selector: 'app-demo',
standalone: true,
imports: [InputFieldComponent],
templateUrl: './demo.component.html',
styleUrl: './demo.component.scss',
})
export class DemoComponent {}
1 change: 0 additions & 1 deletion src/app/features/footer/footer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Component } from '@angular/core';

@Component({
selector: 'app-footer',
imports: [],
templateUrl: './footer.component.html',
styleUrl: './footer.component.scss',
})
Expand Down
1 change: 0 additions & 1 deletion src/app/features/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Component } from '@angular/core';

@Component({
selector: 'app-header',
imports: [],
templateUrl: './header.component.html',
styleUrl: './header.component.scss',
})
Expand Down