Merge branch 'dev' into paul

This commit is contained in:
Your Name 2022-01-21 09:14:56 +01:00
commit 77131ede13
11 changed files with 214 additions and 1 deletions

View File

@ -5,15 +5,19 @@ import { HomePageComponent } from './pages/home-page/home-page.component';
import { ListCategoriesComponent } from './pages/list-categories/list-categories.component'; import { ListCategoriesComponent } from './pages/list-categories/list-categories.component';
import { RestoPageComponent } from './pages/resto-page/resto-page.component'; import { RestoPageComponent } from './pages/resto-page/resto-page.component';
import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component'; import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component';
import { FiltersPageComponent } from './pages/filters-page/filters-page.component';
import { SigninComponent } from './pages/signin/signin.component';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'home', pathMatch: 'full' }, { path: '', redirectTo: 'home', pathMatch: 'full' },
{ path: 'home', component: HomePageComponent }, { path: 'home', component: HomePageComponent },
{ path: 'categories', component: ListCategoriesComponent }, { path: 'categories', component: ListCategoriesComponent },
{ path: 'favoris', component: FavorisUserComponent }, { path: 'favoris', component: FavorisUserComponent },
{ path: 'filters', component: FiltersPageComponent },
{ path: 'Deconnexion', redirectTo: 'home'}, { path: 'Deconnexion', redirectTo: 'home'},
{path: 'restaurants',component: RestoPageComponent}, {path: 'restaurants',component: RestoPageComponent},
{path: 'page-not-found',component: PageNotFoundComponent}, {path: 'page-not-found',component: PageNotFoundComponent},
{path: 'signin', component: SigninComponent},
{path: '**', redirectTo: 'page-not-found' } {path: '**', redirectTo: 'page-not-found' }
]; ];

View File

@ -14,6 +14,7 @@ import { ListCategoriesComponent } from './pages/list-categories/list-categories
import { RestoPageComponent } from './pages/resto-page/resto-page.component'; import { RestoPageComponent } from './pages/resto-page/resto-page.component';
import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component'; import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component';
import { FiltersPageComponent } from './pages/filters-page/filters-page.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -26,7 +27,8 @@ import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.com
HomePageComponent, HomePageComponent,
ListCategoriesComponent, ListCategoriesComponent,
RestoPageComponent, RestoPageComponent,
PageNotFoundComponent PageNotFoundComponent,
FiltersPageComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,

View File

@ -0,0 +1,73 @@
<h2 class="titre ">Filtres :</h2>
<div class="separation"></div>
<div class="accordion">
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseOne">
<p style="font-size: 20px;">Distance</p>
</button>
</h2>
<div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show" aria-labelledby="panelsStayOpen-headingOne">
<div class="accordion-body">
<label for="price-min">Price:</label>
<input type="range" name="price-min" id="price-min" value="200" min="0" max="1000">
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingTwo">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseTwo">
<p style="font-size: 20px;">Prix</p>
</button>
</h2>
<div id="panelsStayOpen-collapseTwo" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-headingTwo">
<div class="accordion-body">
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingThree">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseThree">
<p style="font-size: 20px;">Sur Place / A Emporter</p>
</button>
</h2>
<div id="panelsStayOpen-collapseThree" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-headingThree">
<div class="accordion-body">
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingFour">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseFour">
<p style="font-size: 20px;">Accès PMR</p>
</button>
</h2>
<div id="panelsStayOpen-collapseFour" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-headingFour">
<div class="accordion-body">
</div>
</div>
</div>
<div class="accordion-item">
<h2 class="accordion-header" id="panelsStayOpen-headingFive">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#panelsStayOpen-collapseFive">
<p style="font-size: 20px;">Avis</p>
</button>
</h2>
<div id="panelsStayOpen-collapseFive" class="accordion-collapse collapse" aria-labelledby="panelsStayOpen-headingFive">
<div class="accordion-body">
</div>
</div>
</div>
</div>
<button class="btn-search btn-primary" type="button">LANCER LA RECHERCHE</button>

View File

@ -0,0 +1,53 @@
.separation{
display: flex;
justify-content: flex-start;
border-bottom: 2px solid #CE0000;
max-width: 83%;
}
.titre{
display: flex;
justify-content: flex-start;
margin: 0 0 0.5em 8.2em;
color: #CE0000;
}
.accordion{
padding-top: 100px;
max-width: 30%;
margin : 0 auto;
margin-bottom: 100px;
}
.accordion-body{
background-color: #F5F3F3;
}
.accordion-item{
margin-bottom: 70px;
}
.accordion-button{
background-color: #CE0000;
color: white;
font-family: cursive;
filter: drop-shadow(0 0 0.2rem grey);
}
.btn-search{
background-color: #CE0000;
text-align: center;
margin: 100px auto;
border-radius: 20px;
display: block;
height: 75px;
width: 300px;
font-size: 20px;
}

View File

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FiltersPageComponent } from './filters-page.component';
describe('FiltersPageComponent', () => {
let component: FiltersPageComponent;
let fixture: ComponentFixture<FiltersPageComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ FiltersPageComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(FiltersPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-filters-page',
templateUrl: './filters-page.component.html',
styleUrls: ['./filters-page.component.scss']
})
export class FiltersPageComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -0,0 +1 @@
<p>signin works!</p>

View File

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { SigninComponent } from './signin.component';
describe('SigninComponent', () => {
let component: SigninComponent;
let fixture: ComponentFixture<SigninComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ SigninComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(SigninComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-signin',
templateUrl: './signin.component.html',
styleUrls: ['./signin.component.scss']
})
export class SigninComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

BIN
src/assets/fond_signin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB