diff --git a/src/app/app.module.ts b/src/app/app.module.ts index dcbf3e8..23fb0d4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,35 +5,24 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { NavBarComponent } from './header/components/nav-bar/nav-bar.component'; import { SearchBarComponent } from './header/components/search-bar/search-bar.component'; -import { PriceRestoComponent } from './filter/components/price-resto/price-resto.component'; -import { DistanceRestoComponent } from './filter/components/distance-resto/distance-resto.component'; -import { SurPlaceAEmporterComponent } from './filter/components/sur-place-a-emporter/sur-place-a-emporter.component'; -import { PmrRestoComponent } from './filter/components/pmr-resto/pmr-resto.component'; -import { AvisRestoComponent } from './filter/components/avis-resto/avis-resto.component'; import { CardCategoryComponent } from './card-category/card-category.component'; import { CardRestoComponent } from './card-resto/card-resto.component'; import { FooterComponent } from './footer/footer.component'; import { HomePageComponent } from './pages/home-page/home-page.component'; import { HttpClientModule } from '@angular/common/http'; import { ListCategoriesComponent } from './pages/list-categories/list-categories.component'; -import { FavorisUserComponent } from './pages/favoris-user/favoris-user.component'; + @NgModule({ declarations: [ AppComponent, NavBarComponent, SearchBarComponent, - PriceRestoComponent, - DistanceRestoComponent, - SurPlaceAEmporterComponent, - PmrRestoComponent, - AvisRestoComponent, CardCategoryComponent, CardRestoComponent, FooterComponent, HomePageComponent, - ListCategoriesComponent, - FavorisUserComponent + ListCategoriesComponent ], imports: [ BrowserModule, diff --git a/src/app/filter/components/avis-resto/avis-resto.component.scss b/src/app/filter/components/avis-resto/avis-resto.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/filter/components/avis-resto/avis-resto.component.spec.ts b/src/app/filter/components/avis-resto/avis-resto.component.spec.ts deleted file mode 100644 index 32f9cd0..0000000 --- a/src/app/filter/components/avis-resto/avis-resto.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AvisRestoComponent } from './avis-resto.component'; - -describe('AvisRestoComponent', () => { - let component: AvisRestoComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ AvisRestoComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(AvisRestoComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/filter/components/avis-resto/avis-resto.component.ts b/src/app/filter/components/avis-resto/avis-resto.component.ts deleted file mode 100644 index 79dbc67..0000000 --- a/src/app/filter/components/avis-resto/avis-resto.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-avis-resto', - templateUrl: './avis-resto.component.html', - styleUrls: ['./avis-resto.component.scss'] -}) -export class AvisRestoComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/filter/components/distance-resto/distance-resto.component.html b/src/app/filter/components/distance-resto/distance-resto.component.html deleted file mode 100644 index efefaae..0000000 --- a/src/app/filter/components/distance-resto/distance-resto.component.html +++ /dev/null @@ -1 +0,0 @@ -

distance-resto works!

diff --git a/src/app/filter/components/distance-resto/distance-resto.component.scss b/src/app/filter/components/distance-resto/distance-resto.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/filter/components/distance-resto/distance-resto.component.spec.ts b/src/app/filter/components/distance-resto/distance-resto.component.spec.ts deleted file mode 100644 index 5adf5a2..0000000 --- a/src/app/filter/components/distance-resto/distance-resto.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { DistanceRestoComponent } from './distance-resto.component'; - -describe('DistanceRestoComponent', () => { - let component: DistanceRestoComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ DistanceRestoComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(DistanceRestoComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/filter/components/distance-resto/distance-resto.component.ts b/src/app/filter/components/distance-resto/distance-resto.component.ts deleted file mode 100644 index 7931ea6..0000000 --- a/src/app/filter/components/distance-resto/distance-resto.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-distance-resto', - templateUrl: './distance-resto.component.html', - styleUrls: ['./distance-resto.component.scss'] -}) -export class DistanceRestoComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/filter/components/pmr-resto/pmr-resto.component.html b/src/app/filter/components/pmr-resto/pmr-resto.component.html deleted file mode 100644 index 8817505..0000000 --- a/src/app/filter/components/pmr-resto/pmr-resto.component.html +++ /dev/null @@ -1 +0,0 @@ -

pmr-resto works!

diff --git a/src/app/filter/components/pmr-resto/pmr-resto.component.scss b/src/app/filter/components/pmr-resto/pmr-resto.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/filter/components/pmr-resto/pmr-resto.component.spec.ts b/src/app/filter/components/pmr-resto/pmr-resto.component.spec.ts deleted file mode 100644 index 0ef798b..0000000 --- a/src/app/filter/components/pmr-resto/pmr-resto.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PmrRestoComponent } from './pmr-resto.component'; - -describe('PmrRestoComponent', () => { - let component: PmrRestoComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ PmrRestoComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PmrRestoComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/filter/components/pmr-resto/pmr-resto.component.ts b/src/app/filter/components/pmr-resto/pmr-resto.component.ts deleted file mode 100644 index 0b9cc94..0000000 --- a/src/app/filter/components/pmr-resto/pmr-resto.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-pmr-resto', - templateUrl: './pmr-resto.component.html', - styleUrls: ['./pmr-resto.component.scss'] -}) -export class PmrRestoComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/filter/components/price-resto/price-resto.component.html b/src/app/filter/components/price-resto/price-resto.component.html deleted file mode 100644 index fd5680c..0000000 --- a/src/app/filter/components/price-resto/price-resto.component.html +++ /dev/null @@ -1 +0,0 @@ -

price-resto works!

diff --git a/src/app/filter/components/price-resto/price-resto.component.scss b/src/app/filter/components/price-resto/price-resto.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/filter/components/price-resto/price-resto.component.spec.ts b/src/app/filter/components/price-resto/price-resto.component.spec.ts deleted file mode 100644 index d304971..0000000 --- a/src/app/filter/components/price-resto/price-resto.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { PriceRestoComponent } from './price-resto.component'; - -describe('PriceRestoComponent', () => { - let component: PriceRestoComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ PriceRestoComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(PriceRestoComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/filter/components/price-resto/price-resto.component.ts b/src/app/filter/components/price-resto/price-resto.component.ts deleted file mode 100644 index b34f12e..0000000 --- a/src/app/filter/components/price-resto/price-resto.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-price-resto', - templateUrl: './price-resto.component.html', - styleUrls: ['./price-resto.component.scss'] -}) -export class PriceRestoComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.html b/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.html deleted file mode 100644 index c2d8664..0000000 --- a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.html +++ /dev/null @@ -1 +0,0 @@ -

sur-place-a-emporter works!

diff --git a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.scss b/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.spec.ts b/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.spec.ts deleted file mode 100644 index a8ba1ad..0000000 --- a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SurPlaceAEmporterComponent } from './sur-place-a-emporter.component'; - -describe('SurPlaceAEmporterComponent', () => { - let component: SurPlaceAEmporterComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ SurPlaceAEmporterComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(SurPlaceAEmporterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.ts b/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.ts deleted file mode 100644 index 6fff16d..0000000 --- a/src/app/filter/components/sur-place-a-emporter/sur-place-a-emporter.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-sur-place-a-emporter', - templateUrl: './sur-place-a-emporter.component.html', - styleUrls: ['./sur-place-a-emporter.component.scss'] -}) -export class SurPlaceAEmporterComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/header/components/nav-bar/nav-bar.component.scss b/src/app/header/components/nav-bar/nav-bar.component.scss index 1a0ee39..aa8c545 100644 --- a/src/app/header/components/nav-bar/nav-bar.component.scss +++ b/src/app/header/components/nav-bar/nav-bar.component.scss @@ -1,9 +1,9 @@ #image-header{ display: flex; justify-content: center; - margin: auto; - padding-bottom: 5%; + padding-bottom: 3%; filter: drop-shadow(0 0 0.30rem black); + width: auto; } @@ -11,3 +11,4 @@ color: red !important; } + diff --git a/src/app/header/components/search-bar/search-bar.component.html b/src/app/header/components/search-bar/search-bar.component.html index f171926..5e7fb3d 100644 --- a/src/app/header/components/search-bar/search-bar.component.html +++ b/src/app/header/components/search-bar/search-bar.component.html @@ -2,12 +2,10 @@
logo
- +
-
-
- diff --git a/src/app/header/components/search-bar/search-bar.component.scss b/src/app/header/components/search-bar/search-bar.component.scss index 1dd095f..1520771 100644 --- a/src/app/header/components/search-bar/search-bar.component.scss +++ b/src/app/header/components/search-bar/search-bar.component.scss @@ -3,7 +3,7 @@ padding-top: 2%; width : 100%; margin: auto; - padding-bottom: 2%; + padding-bottom: 0,5%; padding-left: 0; padding-right: 0; max-height: 20%; @@ -15,6 +15,7 @@ width: 100%; height: 30px; border-bottom: 2px solid red; + position: relative; } @@ -23,10 +24,17 @@ img{ } -h5{ - margin:0; - padding:0; - text-align:center; + +p{ + background-color: white; position: absolute; + top: 15px; + left: 130px; + padding : 0 10px 0 10px; + font-weight: bolder; + color: grey; } +// .form-control{ +// } + diff --git a/src/assets/images-header/fond.png b/src/assets/images-header/fond.png index fbd2d6c..f417d33 100644 Binary files a/src/assets/images-header/fond.png and b/src/assets/images-header/fond.png differ diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 170a57c..a0c2872 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiUrl: "http://localhost:3000", + apiUrl: "http://localhost:8080", }; /*