Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev

parceque

src/app/app-routing.module.ts

@@ -5,6 +5,7 @@ import { HomePageComponent } from './pages/home-page/home-page.component';
 import { ListCategoriesComponent } from './pages/list-categories/list-categories.component';
 import { RestoPageComponent } from './pages/resto-page/resto-page.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 = [
@@ -12,6 +13,7 @@ const routes: Routes = [
     { path: 'home', component: HomePageComponent },
     { path: 'categories', component: ListCategoriesComponent },
     { path: 'favoris', component: FavorisUserComponent },
+    { path: 'filters', component: FiltersPageComponent },
     { path: 'Deconnexion', redirectTo: 'home'},
     {path: 'restaurants',component: RestoPageComponent},
     {path: 'page-not-found',component: PageNotFoundComponent},

src/app/app.module.ts

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

src/app/card-resto/card-resto.component.html

@@ -1 +1,27 @@
-<p>card-resto works!</p>
+<div class="container position-relative shadow p-0 mb-5 bg-body rounded rounded  m-5 rounded-top "  style="width: 18rem;" >
+      <img class="card-img-top " src="assets/ImagesRestos/photo.jpg" alt="Card image cap">
+    <div class="card-body rounded-bottom">
+        <h3 class="titre-resto d-flex justify-content-center d-flex align-items-center" style="font-size: 24px;">NOM RESTAURANT</h3>
+
+          <div class="accordion" id="accordionExample">
+            
+              <h2 class="accordion-header" id="headingOne">
+            <button class="btn" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+              PLUS D'INFOS
+            </button>
+          </h2>
+          
+          <div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
+            <div class=" body accordion-body pt-5">
+              <strong>This is the first item's accordion body.</strong>
+              <ul>
+                <li><i class="far fa-star"></i></li>
+                <li><i class="far fa-star"></i></li>
+              </ul>
+            </div>
+          
+        </div>
+    </div>
+</div>
+
+

src/app/card-resto/card-resto.component.scss

@@ -0,0 +1,21 @@
+.titre-resto{
+    margin-bottom: 0.9rem;
+}
+.btn{
+    position: absolute;
+    background-color: #CE0000;
+    color: #fff;
+    width: 100%;
+    right: 0;
+    border-radius: 0 0 0.25rem 0.25rem;
+    padding: 1.375rem 0.75rem;
+    
+    
+}
+.accordion .btn:focus{
+    box-shadow: none;
+}
+
+
+
+

src/app/footer/footer.component.html

@@ -1,6 +1,6 @@
 <footer class="d-flex">
 
-<div class = "logo d-inline-flex align-items-center">
+<div class = "logo d-inline-flex align-items-center p-4">
     <img src="../../assets/Logo_footer.png">
 </div>
 

src/app/footer/footer.component.scss

@@ -2,6 +2,7 @@ footer {
   width: 100%;
   height: 113px;
   background-color: #CE0000;
+  margin-top: 4em;
 }
 
 .liens{
@@ -9,6 +10,7 @@ footer {
 }
 
 h5{
-  padding-right: 50px;
+  padding-right: 4em;
   color: white;
+  font-weight: lighter;
 }

src/app/header/components/nav-bar/nav-bar.component.html

@@ -11,18 +11,20 @@
       </button>
       <div class="collapse navbar-collapse justify-content-end" id="nav">
           <div class="navbar-nav ">
-              <a routerLink="home" routerLinkActive="active-custom" class="nav-link p-5 " style="font-size: 25px;">Accueil</a>
+              <a routerLink="home" routerLinkActive="active-custom" class="nav-link p-4 pe-5 " style="font-size: 21px;">Accueil</a>
-              <a routerLink="categories" routerLinkActive="active-custom" class="nav-link p-5" style="font-size: 25px;">Categories</a>
+              <a routerLink="categories" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Categories</a>
-              <a routerLink="filtres" routerLinkActive="active-custom" class="nav-link p-5" style="font-size: 25px;">Filtres</a>
+              <a routerLink="filtres" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Filtres</a>
-              <a routerLink="favoris" routerLinkActive="active-custom" class="nav-link p-5" style="font-size: 25px;">Mes favoris</a>
+              <a routerLink="favoris" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Mes favoris</a>
-              <a routerLink="deconnexion" routerLinkActive="active-custom" class="nav-link p-5" style="font-size: 25px;">Deconnexion</a>
+              <a routerLink="deconnexion" routerLinkActive="active-custom" class="nav-link p-4 pe-5" style="font-size: 21px;">Deconnexion</a>
+          </div>
       </div>
     </div>
     <div id="image-header">
       <img src="assets/images-header/fond.png" alt="fond_header">
     </div>
-  </div>
+    
 </nav>
 
 
 
+

src/app/header/components/nav-bar/nav-bar.component.scss

@@ -1,14 +1,25 @@
+
+
 #image-header{
   display: flex;
   justify-content: center;
-  padding-bottom: 3%;
-  filter: drop-shadow(0 0 0.30rem black);
-  width: auto;
-
 }
 
+img{
+  width: 100%;
+  display: block;
+  margin: 0 auto;
+  padding: 0;
+  margin: 0.5em 0 0 0;
+  // filter: drop-shadow(0 0 0.30rem rgb(165, 165, 165));
+}
+
+
 .active-custom {
-  color: red !important;
+  color:#CE0000 !important;
+  font-weight: bold;
 }
 
 
+
+

src/app/header/components/search-bar/search-bar.component.html

@@ -1,8 +1,8 @@
 <nav class="navbar navbar-light">
   <div class="container-fluid">
 <img src="assets/images-header/logo.png" alt="logo">
-    <form style="width: 20%;" class="d-flex">
+    <form style="width: 30%;" class="d-flex">
-      <input class="form-control me-2" type="search" placeholder="Trouver votre SIMPL'EAT..." aria-label="Search">
+      <input class="form-control me-5" type="search" placeholder="Trouver votre SIMPL'EAT..." aria-label="Search">
     </form>
     <div class="trait">
       <p>LE BON PLAN POUR MANGER</p>

src/app/header/components/search-bar/search-bar.component.scss

@@ -14,7 +14,7 @@
 
   width: 100%;
   height: 30px;
-  border-bottom: 2px solid red;
+  border-bottom: 2px solid #CE0000;
   position: relative;
 
 }

src/app/pages/filters-page/filters-page.component.html

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

src/app/pages/filters-page/filters-page.component.scss

@@ -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;
+
+}

src/app/pages/filters-page/filters-page.component.spec.ts

@@ -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();
+  });
+});

src/app/pages/filters-page/filters-page.component.ts

@@ -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 {
+  }
+
+}

src/app/pages/home-page/home-page.component.html

@@ -5,3 +5,4 @@
     <app-card-category [categoryData]="category"></app-card-category>
     </div>
 </div>
+

src/app/pages/home-page/home-page.component.scss

@@ -14,7 +14,7 @@
     
     display: flex;
     justify-content: flex-start;
-    margin: 0 0 0.5em 8.2em;
+    margin: 2.5em 0 0.5em 8.2em;
     color: #CE0000;
     
 }

src/app/pages/resto-page/resto-page.component.html

@@ -1,3 +1,11 @@
-<h2 class="titre ">Catégories :</h2>
+
-<div class="separation"></div>
+    <h2 class="titre ">Résultats :</h2>
+        <div class="separation"></div>
+        <div class="parent d-flex justify-content-center align-items-center flex-wrap flex-row  ">
+            <div>
+                <app-card-resto></app-card-resto>
+            </div>
+        </div>
+    
+
 

src/app/pages/resto-page/resto-page.component.scss

@@ -1,3 +1,5 @@
+
+
 .separation{
     display: flex;
     justify-content: flex-start;
@@ -9,7 +11,8 @@
     
     display: flex;
     justify-content: flex-start;
-    margin: 0 0 0.5em 8.2em;
+    margin: 2.5em 0 0.5em 8.2em;
     color: #CE0000;
     
 }
+

src/index.html

@@ -6,6 +6,7 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.2/font/bootstrap-icons.css">
 </head>
 <body>
   <app-root></app-root>