From 316a185c6fb21d5296b9d6323b35cb1e6cbc2976 Mon Sep 17 00:00:00 2001 From: ExostFlash Date: Sun, 9 Mar 2025 15:03:13 +0100 Subject: [PATCH 1/4] modif name --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 3c6dff3..d67d74a 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - Angular + Angular Covid -- 2.45.3 From 63e74a83033627d11f6124ab47a8172a0a03ff0c Mon Sep 17 00:00:00 2001 From: ExostFlash Date: Mon, 31 Mar 2025 19:43:59 +0200 Subject: [PATCH 2/4] Add service, move component --- src/app/app-routing.module.ts | 15 ++--- src/app/app.module.ts | 40 +++++++++--- src/app/blog/blog.component.html | 1 - src/app/blog/blog.component.ts | 11 ---- .../blogs/blogs.component.css} | 0 src/app/component/blogs/blogs.component.html | 1 + .../blogs/blogs.component.spec.ts} | 12 ++-- src/app/component/blogs/blogs.component.ts | 11 ++++ .../contact/contact.component.css | 0 .../contact/contact.component.html | 0 .../contact/contact.component.spec.ts | 0 .../contact/contact.component.ts | 0 .../essential}/footer/footer.component.css | 0 .../essential}/footer/footer.component.html | 0 .../footer/footer.component.spec.ts | 0 .../essential}/footer/footer.component.ts | 0 .../essential}/nav-bar/nav-bar.component.css | 0 .../essential}/nav-bar/nav-bar.component.html | 21 +++---- .../nav-bar/nav-bar.component.spec.ts | 0 .../essential}/nav-bar/nav-bar.component.ts | 2 +- .../home-accueil/home-accueil.component.css} | 0 .../home-accueil/home-accueil.component.html | 10 +++ .../home-accueil.component.spec.ts | 23 +++++++ .../home-accueil/home-accueil.component.ts | 11 ++++ .../home-symptoms.component.css} | 0 .../home-symptoms.component.html | 18 ++++++ .../home-symptoms.component.spec.ts | 23 +++++++ .../home-symptoms/home-symptoms.component.ts | 17 +++++ src/app/component/home/home.component.css | 0 src/app/component/home/home.component.html | 4 ++ .../home/home.component.spec.ts | 0 .../{ => component}/home/home.component.ts | 0 .../component/symptoms/symptoms.component.css | 0 .../symptoms/symptoms.component.html | 1 + .../symptoms/symptoms.component.spec.ts} | 12 ++-- .../component/symptoms/symptoms.component.ts | 11 ++++ src/app/home/home.component.html | 63 ------------------- .../all/address/address.service.spec.ts | 16 +++++ .../service/all/address/address.service.ts | 19 ++++++ src/app/service/all/blog/blog.service.spec.ts | 16 +++++ src/app/service/all/blog/blog.service.ts | 19 ++++++ .../all/symptom/symptom.service.spec.ts | 16 +++++ .../service/all/symptom/symptom.service.ts | 19 ++++++ src/app/service/data.service.spec.ts | 16 +++++ src/app/service/data.service.ts | 29 +++++++++ src/app/symptome/symptome.component.html | 1 - src/app/symptome/symptome.component.ts | 11 ---- tsconfig.json | 6 +- 48 files changed, 346 insertions(+), 129 deletions(-) delete mode 100644 src/app/blog/blog.component.html delete mode 100644 src/app/blog/blog.component.ts rename src/app/{blog/blog.component.css => component/blogs/blogs.component.css} (100%) create mode 100644 src/app/component/blogs/blogs.component.html rename src/app/{blog/blog.component.spec.ts => component/blogs/blogs.component.spec.ts} (55%) create mode 100644 src/app/component/blogs/blogs.component.ts rename src/app/{ => component}/contact/contact.component.css (100%) rename src/app/{ => component}/contact/contact.component.html (100%) rename src/app/{ => component}/contact/contact.component.spec.ts (100%) rename src/app/{ => component}/contact/contact.component.ts (100%) rename src/app/{ => component/essential}/footer/footer.component.css (100%) rename src/app/{ => component/essential}/footer/footer.component.html (100%) rename src/app/{ => component/essential}/footer/footer.component.spec.ts (100%) rename src/app/{ => component/essential}/footer/footer.component.ts (100%) rename src/app/{ => component/essential}/nav-bar/nav-bar.component.css (100%) rename src/app/{ => component/essential}/nav-bar/nav-bar.component.html (53%) rename src/app/{ => component/essential}/nav-bar/nav-bar.component.spec.ts (100%) rename src/app/{ => component/essential}/nav-bar/nav-bar.component.ts (99%) rename src/app/{home/home.component.css => component/home/all/home-accueil/home-accueil.component.css} (100%) create mode 100644 src/app/component/home/all/home-accueil/home-accueil.component.html create mode 100644 src/app/component/home/all/home-accueil/home-accueil.component.spec.ts create mode 100644 src/app/component/home/all/home-accueil/home-accueil.component.ts rename src/app/{symptome/symptome.component.css => component/home/all/home-symptoms/home-symptoms.component.css} (100%) create mode 100644 src/app/component/home/all/home-symptoms/home-symptoms.component.html create mode 100644 src/app/component/home/all/home-symptoms/home-symptoms.component.spec.ts create mode 100644 src/app/component/home/all/home-symptoms/home-symptoms.component.ts create mode 100644 src/app/component/home/home.component.css create mode 100644 src/app/component/home/home.component.html rename src/app/{ => component}/home/home.component.spec.ts (100%) rename src/app/{ => component}/home/home.component.ts (100%) create mode 100644 src/app/component/symptoms/symptoms.component.css create mode 100644 src/app/component/symptoms/symptoms.component.html rename src/app/{symptome/symptome.component.spec.ts => component/symptoms/symptoms.component.spec.ts} (53%) create mode 100644 src/app/component/symptoms/symptoms.component.ts delete mode 100644 src/app/home/home.component.html create mode 100644 src/app/service/all/address/address.service.spec.ts create mode 100644 src/app/service/all/address/address.service.ts create mode 100644 src/app/service/all/blog/blog.service.spec.ts create mode 100644 src/app/service/all/blog/blog.service.ts create mode 100644 src/app/service/all/symptom/symptom.service.spec.ts create mode 100644 src/app/service/all/symptom/symptom.service.ts create mode 100644 src/app/service/data.service.spec.ts create mode 100644 src/app/service/data.service.ts delete mode 100644 src/app/symptome/symptome.component.html delete mode 100644 src/app/symptome/symptome.component.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index f185c47..53c95df 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,16 +1,17 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { HomeComponent } from './home/home.component'; -import { ContactComponent } from './contact/contact.component'; -import { SymptomeComponent } from './symptome/symptome.component'; -import { BlogComponent } from './blog/blog.component'; + +import { HomeComponent } from './component/home/home.component'; +import { SymptomsComponent } from './component/symptoms/symptoms.component'; +import { BlogsComponent } from './component/blogs/blogs.component'; +import { ContactComponent } from './component/contact/contact.component'; const routes: Routes = [ { path: '', component: HomeComponent }, { path: 'home', component: HomeComponent }, - { path: 'contacts', component: ContactComponent }, - { path: 'symptômes', component: SymptomeComponent }, - { path: 'blog', component: BlogComponent }, + { path: 'symptoms', component: SymptomsComponent }, + { path: 'blogs', component: BlogsComponent }, + { path: 'contact', component: ContactComponent }, ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 70b0e22..d878e3d 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,23 +4,43 @@ import { BrowserModule } from '@angular/platform-browser'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { NavBarComponent } from './nav-bar/nav-bar.component'; -import { HomeComponent } from './home/home.component'; -import { FooterComponent } from './footer/footer.component'; -import { SymptomeComponent } from './symptome/symptome.component'; -import { ContactComponent } from './contact/contact.component'; -import { BlogComponent } from './blog/blog.component'; + +/* Essential */ +import { NavBarComponent } from './component/essential/nav-bar/nav-bar.component'; +import { FooterComponent } from './component/essential/footer/footer.component'; + +/* Home */ +import { HomeComponent } from './component/home/home.component'; +import { HomeAccueilComponent } from './component/home/all/home-accueil/home-accueil.component'; +import { HomeSymptomsComponent } from './component/home/all/home-symptoms/home-symptoms.component'; + +/* Symptoms */ +import { SymptomsComponent } from './component/symptoms/symptoms.component'; + +/* Blogs */ +import { BlogsComponent } from './component/blogs/blogs.component'; + +/* Contact */ +import { ContactComponent } from './component/contact/contact.component'; + @NgModule({ declarations: [ AppComponent, + /* Essential */ NavBarComponent, - HomeComponent, FooterComponent, - SymptomeComponent, - ContactComponent, - BlogComponent + /* Home */ + HomeComponent, + HomeAccueilComponent, + HomeSymptomsComponent, + /* Symptoms */ + SymptomsComponent, + /* Blogs */ + BlogsComponent, + /* Contact */ + ContactComponent ], imports: [ BrowserModule, diff --git a/src/app/blog/blog.component.html b/src/app/blog/blog.component.html deleted file mode 100644 index ff0c151..0000000 --- a/src/app/blog/blog.component.html +++ /dev/null @@ -1 +0,0 @@ -

blog works!

diff --git a/src/app/blog/blog.component.ts b/src/app/blog/blog.component.ts deleted file mode 100644 index 65310b0..0000000 --- a/src/app/blog/blog.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-blog', - standalone: false, - templateUrl: './blog.component.html', - styleUrl: './blog.component.css' -}) -export class BlogComponent { - -} diff --git a/src/app/blog/blog.component.css b/src/app/component/blogs/blogs.component.css similarity index 100% rename from src/app/blog/blog.component.css rename to src/app/component/blogs/blogs.component.css diff --git a/src/app/component/blogs/blogs.component.html b/src/app/component/blogs/blogs.component.html new file mode 100644 index 0000000..11235a6 --- /dev/null +++ b/src/app/component/blogs/blogs.component.html @@ -0,0 +1 @@ +

blogs works!

diff --git a/src/app/blog/blog.component.spec.ts b/src/app/component/blogs/blogs.component.spec.ts similarity index 55% rename from src/app/blog/blog.component.spec.ts rename to src/app/component/blogs/blogs.component.spec.ts index ac14310..86eb3a5 100644 --- a/src/app/blog/blog.component.spec.ts +++ b/src/app/component/blogs/blogs.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { BlogComponent } from './blog.component'; +import { BlogsComponent } from './blogs.component'; -describe('BlogComponent', () => { - let component: BlogComponent; - let fixture: ComponentFixture; +describe('BlogsComponent', () => { + let component: BlogsComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [BlogComponent] + declarations: [BlogsComponent] }) .compileComponents(); - fixture = TestBed.createComponent(BlogComponent); + fixture = TestBed.createComponent(BlogsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/component/blogs/blogs.component.ts b/src/app/component/blogs/blogs.component.ts new file mode 100644 index 0000000..779af6a --- /dev/null +++ b/src/app/component/blogs/blogs.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-blogs', + standalone: false, + templateUrl: './blogs.component.html', + styleUrl: './blogs.component.css' +}) +export class BlogsComponent { + +} diff --git a/src/app/contact/contact.component.css b/src/app/component/contact/contact.component.css similarity index 100% rename from src/app/contact/contact.component.css rename to src/app/component/contact/contact.component.css diff --git a/src/app/contact/contact.component.html b/src/app/component/contact/contact.component.html similarity index 100% rename from src/app/contact/contact.component.html rename to src/app/component/contact/contact.component.html diff --git a/src/app/contact/contact.component.spec.ts b/src/app/component/contact/contact.component.spec.ts similarity index 100% rename from src/app/contact/contact.component.spec.ts rename to src/app/component/contact/contact.component.spec.ts diff --git a/src/app/contact/contact.component.ts b/src/app/component/contact/contact.component.ts similarity index 100% rename from src/app/contact/contact.component.ts rename to src/app/component/contact/contact.component.ts diff --git a/src/app/footer/footer.component.css b/src/app/component/essential/footer/footer.component.css similarity index 100% rename from src/app/footer/footer.component.css rename to src/app/component/essential/footer/footer.component.css diff --git a/src/app/footer/footer.component.html b/src/app/component/essential/footer/footer.component.html similarity index 100% rename from src/app/footer/footer.component.html rename to src/app/component/essential/footer/footer.component.html diff --git a/src/app/footer/footer.component.spec.ts b/src/app/component/essential/footer/footer.component.spec.ts similarity index 100% rename from src/app/footer/footer.component.spec.ts rename to src/app/component/essential/footer/footer.component.spec.ts diff --git a/src/app/footer/footer.component.ts b/src/app/component/essential/footer/footer.component.ts similarity index 100% rename from src/app/footer/footer.component.ts rename to src/app/component/essential/footer/footer.component.ts diff --git a/src/app/nav-bar/nav-bar.component.css b/src/app/component/essential/nav-bar/nav-bar.component.css similarity index 100% rename from src/app/nav-bar/nav-bar.component.css rename to src/app/component/essential/nav-bar/nav-bar.component.css diff --git a/src/app/nav-bar/nav-bar.component.html b/src/app/component/essential/nav-bar/nav-bar.component.html similarity index 53% rename from src/app/nav-bar/nav-bar.component.html rename to src/app/component/essential/nav-bar/nav-bar.component.html index b0488a8..08409f1 100644 --- a/src/app/nav-bar/nav-bar.component.html +++ b/src/app/component/essential/nav-bar/nav-bar.component.html @@ -8,23 +8,22 @@ diff --git a/src/app/nav-bar/nav-bar.component.spec.ts b/src/app/component/essential/nav-bar/nav-bar.component.spec.ts similarity index 100% rename from src/app/nav-bar/nav-bar.component.spec.ts rename to src/app/component/essential/nav-bar/nav-bar.component.spec.ts diff --git a/src/app/nav-bar/nav-bar.component.ts b/src/app/component/essential/nav-bar/nav-bar.component.ts similarity index 99% rename from src/app/nav-bar/nav-bar.component.ts rename to src/app/component/essential/nav-bar/nav-bar.component.ts index a1e7892..b480d74 100644 --- a/src/app/nav-bar/nav-bar.component.ts +++ b/src/app/component/essential/nav-bar/nav-bar.component.ts @@ -13,7 +13,7 @@ export class NavBarComponent { isHomeActive(): boolean { return this.router.url === '/' || this.router.url === '/home'; } - + isHomeActiveBool(): boolean { if (this.router.url != '/home') { return true diff --git a/src/app/home/home.component.css b/src/app/component/home/all/home-accueil/home-accueil.component.css similarity index 100% rename from src/app/home/home.component.css rename to src/app/component/home/all/home-accueil/home-accueil.component.css diff --git a/src/app/component/home/all/home-accueil/home-accueil.component.html b/src/app/component/home/all/home-accueil/home-accueil.component.html new file mode 100644 index 0000000..bede297 --- /dev/null +++ b/src/app/component/home/all/home-accueil/home-accueil.component.html @@ -0,0 +1,10 @@ +
+
+

Ensemble. Luttons.

+

Lorem, ipsum dolor, sit amet consectetur adipisicing elit...

+ +
+
+ Illustration Covid +
+
\ No newline at end of file diff --git a/src/app/component/home/all/home-accueil/home-accueil.component.spec.ts b/src/app/component/home/all/home-accueil/home-accueil.component.spec.ts new file mode 100644 index 0000000..fd36295 --- /dev/null +++ b/src/app/component/home/all/home-accueil/home-accueil.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeAccueilComponent } from './home-accueil.component'; + +describe('HomeAccueilComponent', () => { + let component: HomeAccueilComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HomeAccueilComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeAccueilComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/component/home/all/home-accueil/home-accueil.component.ts b/src/app/component/home/all/home-accueil/home-accueil.component.ts new file mode 100644 index 0000000..64792e1 --- /dev/null +++ b/src/app/component/home/all/home-accueil/home-accueil.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-home-accueil', + standalone: false, + templateUrl: './home-accueil.component.html', + styleUrl: './home-accueil.component.css' +}) +export class HomeAccueilComponent { + +} diff --git a/src/app/symptome/symptome.component.css b/src/app/component/home/all/home-symptoms/home-symptoms.component.css similarity index 100% rename from src/app/symptome/symptome.component.css rename to src/app/component/home/all/home-symptoms/home-symptoms.component.css diff --git a/src/app/component/home/all/home-symptoms/home-symptoms.component.html b/src/app/component/home/all/home-symptoms/home-symptoms.component.html new file mode 100644 index 0000000..775870f --- /dev/null +++ b/src/app/component/home/all/home-symptoms/home-symptoms.component.html @@ -0,0 +1,18 @@ +
+

Symptôme du Coronavirus

+

Lorem, ipsum dolor sit amet consectetur...

+
+ +
+
+
+
+ +
+
{{ symptom.title }}
+

{{ symptom.description }}

+
+
+
+
+
\ No newline at end of file diff --git a/src/app/component/home/all/home-symptoms/home-symptoms.component.spec.ts b/src/app/component/home/all/home-symptoms/home-symptoms.component.spec.ts new file mode 100644 index 0000000..6171b5a --- /dev/null +++ b/src/app/component/home/all/home-symptoms/home-symptoms.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeSymptomsComponent } from './home-symptoms.component'; + +describe('HomeSymptomsComponent', () => { + let component: HomeSymptomsComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HomeSymptomsComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeSymptomsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/component/home/all/home-symptoms/home-symptoms.component.ts b/src/app/component/home/all/home-symptoms/home-symptoms.component.ts new file mode 100644 index 0000000..e4b0871 --- /dev/null +++ b/src/app/component/home/all/home-symptoms/home-symptoms.component.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + +import { DataService } from '@services/data.service'; + +@Component({ + selector: 'app-home-symptoms', + standalone: false, + templateUrl: './home-symptoms.component.html', + styleUrl: './home-symptoms.component.css' +}) +export class HomeSymptomsComponent { + constructor(private dataService: DataService) {} + + get symptoms() { + return this.dataService.getSymptoms(); + } +} diff --git a/src/app/component/home/home.component.css b/src/app/component/home/home.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/component/home/home.component.html b/src/app/component/home/home.component.html new file mode 100644 index 0000000..0696d1b --- /dev/null +++ b/src/app/component/home/home.component.html @@ -0,0 +1,4 @@ +
+ + +
\ No newline at end of file diff --git a/src/app/home/home.component.spec.ts b/src/app/component/home/home.component.spec.ts similarity index 100% rename from src/app/home/home.component.spec.ts rename to src/app/component/home/home.component.spec.ts diff --git a/src/app/home/home.component.ts b/src/app/component/home/home.component.ts similarity index 100% rename from src/app/home/home.component.ts rename to src/app/component/home/home.component.ts diff --git a/src/app/component/symptoms/symptoms.component.css b/src/app/component/symptoms/symptoms.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/component/symptoms/symptoms.component.html b/src/app/component/symptoms/symptoms.component.html new file mode 100644 index 0000000..639f503 --- /dev/null +++ b/src/app/component/symptoms/symptoms.component.html @@ -0,0 +1 @@ +

symptoms works!

diff --git a/src/app/symptome/symptome.component.spec.ts b/src/app/component/symptoms/symptoms.component.spec.ts similarity index 53% rename from src/app/symptome/symptome.component.spec.ts rename to src/app/component/symptoms/symptoms.component.spec.ts index d1e0d3e..8c0faa0 100644 --- a/src/app/symptome/symptome.component.spec.ts +++ b/src/app/component/symptoms/symptoms.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { SymptomeComponent } from './symptome.component'; +import { SymptomsComponent } from './symptoms.component'; -describe('SymptomeComponent', () => { - let component: SymptomeComponent; - let fixture: ComponentFixture; +describe('SymptomsComponent', () => { + let component: SymptomsComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [SymptomeComponent] + declarations: [SymptomsComponent] }) .compileComponents(); - fixture = TestBed.createComponent(SymptomeComponent); + fixture = TestBed.createComponent(SymptomsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/component/symptoms/symptoms.component.ts b/src/app/component/symptoms/symptoms.component.ts new file mode 100644 index 0000000..4edac18 --- /dev/null +++ b/src/app/component/symptoms/symptoms.component.ts @@ -0,0 +1,11 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-symptoms', + standalone: false, + templateUrl: './symptoms.component.html', + styleUrl: './symptoms.component.css' +}) +export class SymptomsComponent { + +} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html deleted file mode 100644 index 559963e..0000000 --- a/src/app/home/home.component.html +++ /dev/null @@ -1,63 +0,0 @@ -
-
-
-

Ensemble. Luttons.

-

Lorem, ipsum dolor, sit amet consectetur adipisicing elit...

- -
-
- Illustration Covid -
-
- -
-

Symptôme du Coronavirus

-

Lorem, ipsum dolor sit amet consectetur...

-
- -
-
-
-
- Forte fièvre -
-
Forte fièvre
-

Lorem ipsum dolor sit amet...

-
-
-
-
-
-
-
- Toux -
-
Toux
-

Lorem ipsum dolor sit amet...

-
-
-
-
-
-
-
- Gorge irritée -
-
Gorge irritée
-

Lorem ipsum dolor sit amet...

-
-
-
-
-
-
-
- Migraine -
-
Migraine
-

Lorem ipsum dolor sit amet...

-
-
-
-
-
\ No newline at end of file diff --git a/src/app/service/all/address/address.service.spec.ts b/src/app/service/all/address/address.service.spec.ts new file mode 100644 index 0000000..f0cd890 --- /dev/null +++ b/src/app/service/all/address/address.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { AddressService } from './address.service'; + +describe('AddressService', () => { + let service: AddressService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(AddressService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/service/all/address/address.service.ts b/src/app/service/all/address/address.service.ts new file mode 100644 index 0000000..615fdb9 --- /dev/null +++ b/src/app/service/all/address/address.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class AddressService { + constructor() { } + + private addresses = [ + { title: "Adresse 1", type: "Dépistage", address: "39 Rue Albert 75013 Paris" }, + { title: "Adresse 2", type: "Vaccination", address: "10 Rue de la Huchette 75005 Paris" }, + { title: "Adresse 3", type: "Dépistage", address: "29 Rue de Caumartin 75009 Paris" }, + { title: "Adresse 4", type: "Dépistage & Vaccination", address: "4 Villa Monceau 75017 Paris" } + ]; + + getAddresses() { + return this.addresses; + } +} diff --git a/src/app/service/all/blog/blog.service.spec.ts b/src/app/service/all/blog/blog.service.spec.ts new file mode 100644 index 0000000..64866b7 --- /dev/null +++ b/src/app/service/all/blog/blog.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { BlogService } from './blog.service'; + +describe('BlogService', () => { + let service: BlogService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(BlogService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/service/all/blog/blog.service.ts b/src/app/service/all/blog/blog.service.ts new file mode 100644 index 0000000..589e94b --- /dev/null +++ b/src/app/service/all/blog/blog.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class BlogService { + constructor() { } + + private blogs = [ + { title: "Blog 1", date: "2022-03-19", text: "Contenu..." }, + { title: "Blog 2", date: "2022-12-14", text: "Contenu..." }, + { title: "Blog 3", date: "2022-05-16", text: "Contenu..." }, + { title: "Blog 4", date: "2022-05-04", text: "Contenu..." } + ]; + + getBlogs() { + return this.blogs; + } +} diff --git a/src/app/service/all/symptom/symptom.service.spec.ts b/src/app/service/all/symptom/symptom.service.spec.ts new file mode 100644 index 0000000..ea676e9 --- /dev/null +++ b/src/app/service/all/symptom/symptom.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { SymptomService } from './symptom.service'; + +describe('SymptomService', () => { + let service: SymptomService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(SymptomService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/service/all/symptom/symptom.service.ts b/src/app/service/all/symptom/symptom.service.ts new file mode 100644 index 0000000..52ca34b --- /dev/null +++ b/src/app/service/all/symptom/symptom.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class SymptomService { + constructor() { } + + private symptoms = [ + { title: "Toux", imageName: "/assets/toux.png", description: "Lorem ipsum dolor sit amet..." }, + { title: "Fièvre", imageName: "/assets/fievre.png", description: "Lorem ipsum dolor sit amet..." }, + { title: "Migraine", imageName: "/assets/migraine.png", description: "Lorem ipsum dolor sit amet..." }, + { title: "Mal de gorge", imageName: "/assets/gorge.png", description: "Lorem ipsum dolor sit amet..." } + ]; + + getSymptoms() { + return this.symptoms; + } +} diff --git a/src/app/service/data.service.spec.ts b/src/app/service/data.service.spec.ts new file mode 100644 index 0000000..38e8d9e --- /dev/null +++ b/src/app/service/data.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DataService } from './data.service'; + +describe('DataService', () => { + let service: DataService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DataService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/service/data.service.ts b/src/app/service/data.service.ts new file mode 100644 index 0000000..f35d00a --- /dev/null +++ b/src/app/service/data.service.ts @@ -0,0 +1,29 @@ +import { Injectable } from '@angular/core'; + +import { SymptomService } from './all/symptom/symptom.service'; +import { BlogService } from './all/blog/blog.service'; +import { AddressService } from './all/address/address.service'; + +@Injectable({ + providedIn: 'root' +}) +export class DataService { + + constructor( + private symptomService: SymptomService, + private blogService: BlogService, + private addressService: AddressService + ) {} + + getSymptoms() { + return this.symptomService.getSymptoms(); + } + + getBlogs() { + return this.blogService.getBlogs(); + } + + getAddresses() { + return this.addressService.getAddresses(); + } +} diff --git a/src/app/symptome/symptome.component.html b/src/app/symptome/symptome.component.html deleted file mode 100644 index 1e0558d..0000000 --- a/src/app/symptome/symptome.component.html +++ /dev/null @@ -1 +0,0 @@ -

symptome works!

diff --git a/src/app/symptome/symptome.component.ts b/src/app/symptome/symptome.component.ts deleted file mode 100644 index c8e9850..0000000 --- a/src/app/symptome/symptome.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-symptome', - standalone: false, - templateUrl: './symptome.component.html', - styleUrl: './symptome.component.css' -}) -export class SymptomeComponent { - -} diff --git a/tsconfig.json b/tsconfig.json index 5525117..1686a50 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,11 @@ "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", - "module": "ES2022" + "module": "ES2022", + "baseUrl": "./src", + "paths": { + "@services/*": ["app/service/*"] + } }, "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, -- 2.45.3 From 1f5890b4ff40631667417c878ada4d13fecbe0ce Mon Sep 17 00:00:00 2001 From: ExostFlash Date: Mon, 31 Mar 2025 21:58:44 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Add=20donn=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/component/blogs/blogs.component.ts | 6 +++ .../component/contact/contact.component.ts | 8 +++- .../home-symptoms.component.html | 4 +- .../symptoms/symptoms.component.html | 19 +++++++- .../component/symptoms/symptoms.component.ts | 6 +++ .../service/all/address/address.service.ts | 8 ++-- src/app/service/all/blog/blog.service.ts | 24 ++++++++-- .../service/all/symptom/symptom.service.ts | 44 ++++++++++++++++-- src/assets/what.avif | Bin 0 -> 12835 bytes 9 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 src/assets/what.avif diff --git a/src/app/component/blogs/blogs.component.ts b/src/app/component/blogs/blogs.component.ts index 779af6a..7c77df9 100644 --- a/src/app/component/blogs/blogs.component.ts +++ b/src/app/component/blogs/blogs.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; +import { DataService } from '@services/data.service'; + @Component({ selector: 'app-blogs', standalone: false, @@ -7,5 +9,9 @@ import { Component } from '@angular/core'; styleUrl: './blogs.component.css' }) export class BlogsComponent { + constructor(private dataService: DataService) {} + get blogs() { + return this.dataService.getBlogs(); + } } diff --git a/src/app/component/contact/contact.component.ts b/src/app/component/contact/contact.component.ts index 4a8c27e..13a545d 100644 --- a/src/app/component/contact/contact.component.ts +++ b/src/app/component/contact/contact.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; +import { DataService } from '@services/data.service'; + @Component({ selector: 'app-contact', standalone: false, @@ -7,5 +9,9 @@ import { Component } from '@angular/core'; styleUrl: './contact.component.css' }) export class ContactComponent { - + constructor(private dataService: DataService) {} + + get addresses() { + return this.dataService.getAddresses(); + } } diff --git a/src/app/component/home/all/home-symptoms/home-symptoms.component.html b/src/app/component/home/all/home-symptoms/home-symptoms.component.html index 775870f..28830f8 100644 --- a/src/app/component/home/all/home-symptoms/home-symptoms.component.html +++ b/src/app/component/home/all/home-symptoms/home-symptoms.component.html @@ -4,10 +4,10 @@
-
+
- +
{{ symptom.title }}

{{ symptom.description }}

diff --git a/src/app/component/symptoms/symptoms.component.html b/src/app/component/symptoms/symptoms.component.html index 639f503..70cc473 100644 --- a/src/app/component/symptoms/symptoms.component.html +++ b/src/app/component/symptoms/symptoms.component.html @@ -1 +1,18 @@ -

symptoms works!

+
+

Symptôme du Coronavirus

+

Lorem, ipsum dolor sit amet consectetur...

+
+ +
+
+
+
+ +
+
{{ symptom.title }}
+

{{ symptom.description }}

+
+
+
+
+
\ No newline at end of file diff --git a/src/app/component/symptoms/symptoms.component.ts b/src/app/component/symptoms/symptoms.component.ts index 4edac18..bfcd0f1 100644 --- a/src/app/component/symptoms/symptoms.component.ts +++ b/src/app/component/symptoms/symptoms.component.ts @@ -1,5 +1,7 @@ import { Component } from '@angular/core'; +import { DataService } from '@services/data.service'; + @Component({ selector: 'app-symptoms', standalone: false, @@ -7,5 +9,9 @@ import { Component } from '@angular/core'; styleUrl: './symptoms.component.css' }) export class SymptomsComponent { + constructor(private dataService: DataService) {} + get symptoms() { + return this.dataService.getSymptoms(); + } } diff --git a/src/app/service/all/address/address.service.ts b/src/app/service/all/address/address.service.ts index 615fdb9..f0c77d9 100644 --- a/src/app/service/all/address/address.service.ts +++ b/src/app/service/all/address/address.service.ts @@ -7,10 +7,10 @@ export class AddressService { constructor() { } private addresses = [ - { title: "Adresse 1", type: "Dépistage", address: "39 Rue Albert 75013 Paris" }, - { title: "Adresse 2", type: "Vaccination", address: "10 Rue de la Huchette 75005 Paris" }, - { title: "Adresse 3", type: "Dépistage", address: "29 Rue de Caumartin 75009 Paris" }, - { title: "Adresse 4", type: "Dépistage & Vaccination", address: "4 Villa Monceau 75017 Paris" } + { title: "Centre de Dépistage - Laboratoire Biomédical", type: "Dépistage", address: "15 Rue de la Colombette, 31000 Toulouse" }, + { title: "Centre de Vaccination Municipal Toulouse La Daurade", type: "Vaccination", address: "17 Place de la Daurade, 31000 Toulouse" }, + { title: "Pharmacie des Pyrénées", type: "Dépistage", address: "77 Boulevard de Strasbourg, 31000 Toulouse" }, + { title: "Centre de Vaccination - CHU Toulouse Purpan", type: "Dépistage & Vaccination", address: "1 Place du Docteur Joseph Baylac, 31300 Toulouse" } ]; getAddresses() { diff --git a/src/app/service/all/blog/blog.service.ts b/src/app/service/all/blog/blog.service.ts index 589e94b..961ab60 100644 --- a/src/app/service/all/blog/blog.service.ts +++ b/src/app/service/all/blog/blog.service.ts @@ -7,10 +7,26 @@ export class BlogService { constructor() { } private blogs = [ - { title: "Blog 1", date: "2022-03-19", text: "Contenu..." }, - { title: "Blog 2", date: "2022-12-14", text: "Contenu..." }, - { title: "Blog 3", date: "2022-05-16", text: "Contenu..." }, - { title: "Blog 4", date: "2022-05-04", text: "Contenu..." } + { + title: "Déclaration de la pandémie par l'OMS", + date: "2020-03-11", + text: "L'Organisation mondiale de la santé (OMS) a déclaré le COVID-19 comme une pandémie mondiale, soulignant la gravité et la rapidité de la propagation du virus." + }, + { + title: "Premier confinement en France", + date: "2020-03-17", + text: "La France a instauré un confinement national strict pour limiter la propagation du virus, entraînant la fermeture des écoles, des commerces non essentiels et des restrictions de déplacement." + }, + { + title: "Début de la campagne de vaccination en France", + date: "2020-12-27", + text: "La France a lancé sa campagne de vaccination contre le COVID-19, en commençant par les populations les plus vulnérables." + }, + { + title: "Levée progressive des restrictions sanitaires", + date: "2021-06-09", + text: "La France a entamé une levée progressive des restrictions, avec la réouverture des restaurants, des lieux culturels et l'assouplissement du couvre-feu." + } ]; getBlogs() { diff --git a/src/app/service/all/symptom/symptom.service.ts b/src/app/service/all/symptom/symptom.service.ts index 52ca34b..3fa1656 100644 --- a/src/app/service/all/symptom/symptom.service.ts +++ b/src/app/service/all/symptom/symptom.service.ts @@ -7,10 +7,46 @@ export class SymptomService { constructor() { } private symptoms = [ - { title: "Toux", imageName: "/assets/toux.png", description: "Lorem ipsum dolor sit amet..." }, - { title: "Fièvre", imageName: "/assets/fievre.png", description: "Lorem ipsum dolor sit amet..." }, - { title: "Migraine", imageName: "/assets/migraine.png", description: "Lorem ipsum dolor sit amet..." }, - { title: "Mal de gorge", imageName: "/assets/gorge.png", description: "Lorem ipsum dolor sit amet..." } + { + title: "Toux", + imageName: "/assets/toux.png", + description: "Une toux sèche et persistante est l'un des premiers symptômes du COVID-19. Elle peut être accompagnée de difficultés respiratoires." + }, + { + title: "Fièvre", + imageName: "/assets/fievre.png", + description: "Une fièvre supérieure à 38°C est un symptôme courant du COVID-19, indiquant que le corps combat une infection." + }, + { + title: "Fatigue", + imageName: "/assets/what.avif", + description: "Un état de fatigue intense, même sans activité physique, est fréquemment observé chez les personnes atteintes du virus." + }, + { + title: "Perte du goût et de l'odorat", + imageName: "/assets/what.avif", + description: "L'anosmie (perte de l'odorat) et l'agueusie (perte du goût) sont des symptômes spécifiques souvent signalés par les patients atteints du COVID-19." + }, + { + title: "Difficultés respiratoires", + imageName: "/assets/what.avif", + description: "Une sensation d'essoufflement ou une difficulté à respirer peut indiquer une forme plus grave de l'infection nécessitant une prise en charge médicale." + }, + { + title: "Maux de gorge", + imageName: "/assets/gorge.png", + description: "Un mal de gorge accompagné d'une sensation de brûlure ou de picotements peut être un signe d'infection par le virus." + }, + { + title: "Maux de tête", + imageName: "/assets/migraine.png", + description: "Des céphalées intenses et persistantes sont rapportées par de nombreux patients atteints du COVID-19." + }, + { + title: "Douleurs musculaires", + imageName: "/assets/what.avif", + description: "Des douleurs musculaires généralisées peuvent accompagner l'infection, similaires à celles observées lors d'une grippe." + } ]; getSymptoms() { diff --git a/src/assets/what.avif b/src/assets/what.avif new file mode 100644 index 0000000000000000000000000000000000000000..703664aebdcd980ec8c0fb97a22676f9815c3578 GIT binary patch literal 12835 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 literal 0 HcmV?d00001 -- 2.45.3 From f0fd146c547723d5d5923433a34f8132eb147287 Mon Sep 17 00:00:00 2001 From: ExostFlash Date: Tue, 1 Apr 2025 15:11:17 +0200 Subject: [PATCH 4/4] Add API, and object Article for api --- package-lock.json | 7 ++ package.json | 1 + src/app/app.module.ts | 9 ++- src/app/component/blogs/blogs.component.css | 58 +++++++++++++++ src/app/component/blogs/blogs.component.html | 17 ++++- src/app/component/blogs/blogs.component.ts | 13 ++-- .../component/contact/contact.component.css | 32 +++++++++ .../component/contact/contact.component.html | 71 ++++++++++++++++++- .../essential/footer/footer.component.html | 4 +- .../all/home-actu/home-actu.component.css | 54 ++++++++++++++ .../all/home-actu/home-actu.component.html | 41 +++++++++++ .../all/home-actu/home-actu.component.spec.ts | 23 ++++++ .../home/all/home-actu/home-actu.component.ts | 22 ++++++ src/app/component/home/home.component.html | 1 + src/app/interface/news.ts | 21 ++++++ src/app/service/all/news/news.service.spec.ts | 16 +++++ src/app/service/all/news/news.service.ts | 44 ++++++++++++ src/app/service/data.service.ts | 8 ++- tsconfig.json | 3 +- 19 files changed, 432 insertions(+), 13 deletions(-) create mode 100644 src/app/component/home/all/home-actu/home-actu.component.css create mode 100644 src/app/component/home/all/home-actu/home-actu.component.html create mode 100644 src/app/component/home/all/home-actu/home-actu.component.spec.ts create mode 100644 src/app/component/home/all/home-actu/home-actu.component.ts create mode 100644 src/app/interface/news.ts create mode 100644 src/app/service/all/news/news.service.spec.ts create mode 100644 src/app/service/all/news/news.service.ts diff --git a/package-lock.json b/package-lock.json index f89f351..0aabb3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "@angular/router": "^19.2.0", "bootstrap": "^5.3.3", "bootstrap-icons": "^1.11.3", + "file-saver": "^2.0.5", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.15.0" @@ -7737,6 +7738,12 @@ "node": ">=0.8.0" } }, + "node_modules/file-saver": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", + "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==", + "license": "MIT" + }, "node_modules/fill-range": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", diff --git a/package.json b/package.json index 6408a0c..9f33136 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@angular/router": "^19.2.0", "bootstrap": "^5.3.3", "bootstrap-icons": "^1.11.3", + "file-saver": "^2.0.5", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.15.0" diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d878e3d..45ea6c1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,6 +4,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { HttpClientModule } from '@angular/common/http'; /* Essential */ import { NavBarComponent } from './component/essential/nav-bar/nav-bar.component'; @@ -11,6 +12,7 @@ import { FooterComponent } from './component/essential/footer/footer.component'; /* Home */ import { HomeComponent } from './component/home/home.component'; +import { HomeActuComponent } from './component/home/all/home-actu/home-actu.component'; import { HomeAccueilComponent } from './component/home/all/home-accueil/home-accueil.component'; import { HomeSymptomsComponent } from './component/home/all/home-symptoms/home-symptoms.component'; @@ -24,7 +26,6 @@ import { BlogsComponent } from './component/blogs/blogs.component'; import { ContactComponent } from './component/contact/contact.component'; - @NgModule({ declarations: [ AppComponent, @@ -33,6 +34,7 @@ import { ContactComponent } from './component/contact/contact.component'; FooterComponent, /* Home */ HomeComponent, + HomeActuComponent, HomeAccueilComponent, HomeSymptomsComponent, /* Symptoms */ @@ -40,13 +42,14 @@ import { ContactComponent } from './component/contact/contact.component'; /* Blogs */ BlogsComponent, /* Contact */ - ContactComponent + ContactComponent ], imports: [ BrowserModule, AppRoutingModule, FormsModule, - ReactiveFormsModule + ReactiveFormsModule, + HttpClientModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/component/blogs/blogs.component.css b/src/app/component/blogs/blogs.component.css index e69de29..eefda9f 100644 --- a/src/app/component/blogs/blogs.component.css +++ b/src/app/component/blogs/blogs.component.css @@ -0,0 +1,58 @@ +/* Card Image */ +.card-img-top { + height: 200px; + object-fit: cover; + width: 100%; + } + + /* Assurer une taille uniforme pour les cards */ + .card { + display: flex; + flex-direction: column; + height: 100%; + } + + /* Body de la card pour avoir une hauteur fixe et uniforme */ + .card-body { + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 1.25rem; + height: 100%; + } + + /* Titre de la card (limiter la taille du texte si trop long) */ + .card-title { + font-size: 1.2rem; + font-weight: bold; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + max-height: 2.5em; /* Limite la hauteur du titre */ + margin-bottom: 1rem; + } + + /* Description de la card (maximiser l'espace disponible pour la description) */ + .card-text { + font-size: 0.9rem; + color: #6c757d; + flex-grow: 1; /* Permet à la description de prendre l'espace restant */ + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + margin-bottom: 1.5rem; /* Espacement entre la description et le bouton */ + } + + /* Bouton */ + .btn-primary { + background-color: #007bff; + border-color: #007bff; + text-align: center; + } + + .btn-primary:hover { + background-color: #0056b3; + border-color: #0056b3; + } + \ No newline at end of file diff --git a/src/app/component/blogs/blogs.component.html b/src/app/component/blogs/blogs.component.html index 11235a6..626840e 100644 --- a/src/app/component/blogs/blogs.component.html +++ b/src/app/component/blogs/blogs.component.html @@ -1 +1,16 @@ -

blogs works!

+
+
+
+ Article image +
+
{{ article.title }}
+

{{ article.description }}

+ Lire l'article +
+
+
+
+ + \ No newline at end of file diff --git a/src/app/component/blogs/blogs.component.ts b/src/app/component/blogs/blogs.component.ts index 7c77df9..27dc0f4 100644 --- a/src/app/component/blogs/blogs.component.ts +++ b/src/app/component/blogs/blogs.component.ts @@ -1,6 +1,7 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { DataService } from '@services/data.service'; +import { Article } from '@interface/news'; @Component({ selector: 'app-blogs', @@ -8,10 +9,14 @@ import { DataService } from '@services/data.service'; templateUrl: './blogs.component.html', styleUrl: './blogs.component.css' }) -export class BlogsComponent { +export class BlogsComponent implements OnInit { + articles: Article[] = []; + constructor(private dataService: DataService) {} - get blogs() { - return this.dataService.getBlogs(); + ngOnInit(): void { + this.dataService.getNews().subscribe((response) => { + this.articles = response.articles; + }); } } diff --git a/src/app/component/contact/contact.component.css b/src/app/component/contact/contact.component.css index e69de29..ea16378 100644 --- a/src/app/component/contact/contact.component.css +++ b/src/app/component/contact/contact.component.css @@ -0,0 +1,32 @@ +/* Amélioration du formulaire */ +.custom-input { + border: 1px solid #ced4da; + border-radius: 8px; + padding: 10px; + transition: border-color 0.3s ease-in-out, box-shadow 0.2s ease-in-out; +} + +.custom-input:focus { + border-color: #007bff; + box-shadow: 0 0 5px rgba(0, 123, 255, 0.2); + outline: none; +} + +/* Bouton amélioré */ +.btn-primary { + background-color: #007bff; + border: none; + font-weight: 500; + transition: background 0.3s ease, transform 0.2s ease-in-out; +} + +.btn-primary:hover { + background-color: #0056b3; + transform: scale(1.02); +} + +/* Liste des centres */ +.contact-card { + background: #f8f9fa; + border-radius: 10px; +} diff --git a/src/app/component/contact/contact.component.html b/src/app/component/contact/contact.component.html index 9cae746..4b2fb60 100644 --- a/src/app/component/contact/contact.component.html +++ b/src/app/component/contact/contact.component.html @@ -1 +1,70 @@ -

contact works!

+
+
+

Contactez-nous

+

Vous avez une question ? Contactez-nous via le formulaire ou rendez-vous dans l'un de nos centres.

+
+ +
+ +
+
+
+

Nos Centres

+
    +
  • + +
    +
    {{ address.title }}
    +

    Type : {{ address.type }}

    +

    Adresse : {{ address.address }}

    +
    +
    • +
+
+
+
+ + +
+
+
+

Laissez-nous un message

+
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ + +
+ + +
+
+
+
+
+
diff --git a/src/app/component/essential/footer/footer.component.html b/src/app/component/essential/footer/footer.component.html index 8f79ba5..8853338 100644 --- a/src/app/component/essential/footer/footer.component.html +++ b/src/app/component/essential/footer/footer.component.html @@ -19,8 +19,8 @@ Mentions légales Cookies Accessibilité - Nous contacter - Presse + Nous contacter + Presse
diff --git a/src/app/component/home/all/home-actu/home-actu.component.css b/src/app/component/home/all/home-actu/home-actu.component.css new file mode 100644 index 0000000..4d0ecd9 --- /dev/null +++ b/src/app/component/home/all/home-actu/home-actu.component.css @@ -0,0 +1,54 @@ +#newsCarousel { + position: relative; + } + + .carousel-item img { + width: 100%; + height: 350px; /* Ajuste la hauteur de l'image pour avoir une vue cohérente */ + object-fit: cover; + border-radius: 10px; + } + + .carousel-caption { + position: absolute; + bottom: 20px; + background-color: rgba(13, 110, 253, 0.7); /* Légère transparence pour le fond */ + padding: 15px; + border-radius: 5px; + color: white; + } + + .carousel-caption h5 { + font-size: 1.5rem; + font-weight: bold; + } + + .carousel-caption p { + font-size: 1rem; + margin-top: 10px; + } + + .carousel-caption .btn { + margin-top: 10px; + } + + .carousel-control-prev, + .carousel-control-next { + background-color: transparent; /* Pas de fond sombre */ + border-radius: 50%; /* Forme ronde */ + border: none; /* Retirer la bordure */ + } + + .carousel-control-prev:hover, + .carousel-control-next:hover { + background-color: transparent; /* Pas de changement de fond au survol */ + } + + .carousel-control-next-icon-new svg { + transform: rotate(180deg); /* Rotation de 180° */ + } + + .carousel-control-prev-icon-new svg, + .carousel-control-next-icon-new svg { + fill: #0d95fd; /* Couleur de l'icône */ + } \ No newline at end of file diff --git a/src/app/component/home/all/home-actu/home-actu.component.html b/src/app/component/home/all/home-actu/home-actu.component.html new file mode 100644 index 0000000..745189e --- /dev/null +++ b/src/app/component/home/all/home-actu/home-actu.component.html @@ -0,0 +1,41 @@ + + \ No newline at end of file diff --git a/src/app/component/home/all/home-actu/home-actu.component.spec.ts b/src/app/component/home/all/home-actu/home-actu.component.spec.ts new file mode 100644 index 0000000..4097df3 --- /dev/null +++ b/src/app/component/home/all/home-actu/home-actu.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeActuComponent } from './home-actu.component'; + +describe('HomeActuComponent', () => { + let component: HomeActuComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [HomeActuComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(HomeActuComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/component/home/all/home-actu/home-actu.component.ts b/src/app/component/home/all/home-actu/home-actu.component.ts new file mode 100644 index 0000000..dea9ee0 --- /dev/null +++ b/src/app/component/home/all/home-actu/home-actu.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; + +import { DataService } from '@services/data.service'; +import { Article } from '@interface/news'; + +@Component({ + selector: 'app-home-actu', + standalone: false, + templateUrl: './home-actu.component.html', + styleUrls: ['./home-actu.component.css'] // Correction ici : styleUrls (pluriel) +}) +export class HomeActuComponent implements OnInit { + articles: Article[] = []; + + constructor(private dataService: DataService) {} + + ngOnInit(): void { + this.dataService.getNews().subscribe((response) => { + this.articles = response.articles.slice(0, 5); + }); + } +} diff --git a/src/app/component/home/home.component.html b/src/app/component/home/home.component.html index 0696d1b..bb4d98d 100644 --- a/src/app/component/home/home.component.html +++ b/src/app/component/home/home.component.html @@ -1,4 +1,5 @@
+
\ No newline at end of file diff --git a/src/app/interface/news.ts b/src/app/interface/news.ts new file mode 100644 index 0000000..faf1ef8 --- /dev/null +++ b/src/app/interface/news.ts @@ -0,0 +1,21 @@ +export interface Source { + id: string | null; + name: string; +} + +export interface Article { + source: Source; + author: string; + title: string; + description: string; + url: string; + urlToImage: string; + publishedAt: string; + content: string; +} + +export interface NewsResponse { + status: string; + totalResults: number; + articles: Article[]; +} \ No newline at end of file diff --git a/src/app/service/all/news/news.service.spec.ts b/src/app/service/all/news/news.service.spec.ts new file mode 100644 index 0000000..d129c15 --- /dev/null +++ b/src/app/service/all/news/news.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { NewsService } from './news.service'; + +describe('NewsService', () => { + let service: NewsService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(NewsService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/service/all/news/news.service.ts b/src/app/service/all/news/news.service.ts new file mode 100644 index 0000000..a666e80 --- /dev/null +++ b/src/app/service/all/news/news.service.ts @@ -0,0 +1,44 @@ +import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { NewsResponse } from '@interface/news'; // Assure-toi que le chemin est correct +import { tap } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root' +}) +export class NewsService { + private apiKey: string = 'e9bb2770d3374edea421bcadbecdca5c'; + private apiUrl: string = `https://newsapi.org/v2/everything?q=covid&language=fr&apiKey=${this.apiKey}`; + private storageKey: string = 'newsData'; // Clé utilisée pour le localStorage + private lastUpdateKey: string = 'lastUpdate'; // Clé pour stocker la date de la dernière mise à jour + private cacheDuration: number = 60 * 60 * 1000; // Durée en millisecondes (par exemple, 1 heure) + + constructor(private http: HttpClient) {} + + // Méthode pour récupérer les articles de l'API ou du localStorage + getNews(): Observable { + const storedData = localStorage.getItem(this.storageKey); + const lastUpdate = localStorage.getItem(this.lastUpdateKey); + + // Vérifie si les données existent et si elles sont encore valides + const currentTime = new Date().getTime(); + + if (storedData && lastUpdate && (currentTime - Number(lastUpdate)) < this.cacheDuration) { + // Si les données sont présentes et récentes (moins de 1 heure par exemple), on les retourne + return new Observable(observer => { + observer.next(JSON.parse(storedData)); // On envoie les données stockées + observer.complete(); + }); + } else { + // Sinon, on effectue la requête à l'API + return this.http.get(this.apiUrl).pipe( + tap(response => { + // On stocke la réponse dans le localStorage et la date de mise à jour + localStorage.setItem(this.storageKey, JSON.stringify(response)); + localStorage.setItem(this.lastUpdateKey, currentTime.toString()); // On enregistre l'heure de la mise à jour + }) + ); + } + } +} \ No newline at end of file diff --git a/src/app/service/data.service.ts b/src/app/service/data.service.ts index f35d00a..3ff8296 100644 --- a/src/app/service/data.service.ts +++ b/src/app/service/data.service.ts @@ -3,6 +3,7 @@ import { Injectable } from '@angular/core'; import { SymptomService } from './all/symptom/symptom.service'; import { BlogService } from './all/blog/blog.service'; import { AddressService } from './all/address/address.service'; +import { NewsService } from './all/news/news.service'; @Injectable({ providedIn: 'root' @@ -12,7 +13,8 @@ export class DataService { constructor( private symptomService: SymptomService, private blogService: BlogService, - private addressService: AddressService + private addressService: AddressService, + private newsService: NewsService ) {} getSymptoms() { @@ -26,4 +28,8 @@ export class DataService { getAddresses() { return this.addressService.getAddresses(); } + + getNews() { + return this.newsService.getNews(); + } } diff --git a/tsconfig.json b/tsconfig.json index 1686a50..8fdd6ae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,8 @@ "module": "ES2022", "baseUrl": "./src", "paths": { - "@services/*": ["app/service/*"] + "@services/*": ["app/service/*"], + "@interface/*": ["app/interface/*"] } }, "angularCompilerOptions": { -- 2.45.3