Merge pull request #14 from BaptisteBuvron/api_fix

Fix: api filter and closed </ul> header
BaptisteBuvron · Jun 15, 2023 · 43ccc0b · 43ccc0b
2 parents 7e81206 + 9d47aa1
commit 43ccc0b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/app/controllers/ApiController.ts b/app/controllers/ApiController.ts
@@ -8,7 +8,10 @@ export class ApiController {
         //get filters from request
         let minSalary = req.query.salary;
         let region = req.query.region;
-        let filterOffer = new FilterOffer(Number(minSalary), region ? String(region) : undefined);
+        let filterOffer;
+        if (minSalary || region) {
+            filterOffer = new FilterOffer(Number(minSalary), region ? String(region) : undefined);
+        }
         OfferRepository.getAll(filterOffer).then((offers: OffreDePoste[]) => {
             res.json(offers);
         });

diff --git a/app/views/partials/adminHeader.ejs b/app/views/partials/adminHeader.ejs
@@ -21,24 +21,25 @@
         <div class="collapse navbar-collapse" id="navbarTogglerDemo03">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item">
-                    <a class="nav-link <%= (title == 'Home') ? 'active' :'' %>" aria-current="page" href="/admin">Accueil</a>
+                    <a class="nav-link <%= (title == 'Home') ? 'active' : '' %>" aria-current="page" href="/admin">Accueil</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link <%= (title == 'Utilisateurs') ? 'active' :'' %>" href="/admin/utilisateurs">Utilisateurs</a>
+                    <a class="nav-link <%= (title == 'Utilisateurs') ? 'active' : '' %>" href="/admin/utilisateurs">Utilisateurs</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link <%= (title == 'Demandes') ? 'active' :'' %>" href="/admin/demandes">Demandes</a>
+                    <a class="nav-link <%= (title == 'Demandes') ? 'active' : '' %>" href="/admin/demandes">Demandes</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link <%= (title == 'Offres') ? 'active' :'' %>" href="/admin/offres">Offres d'emploi</a>
+                    <a class="nav-link <%= (title == 'Offres') ? 'active' : '' %>" href="/admin/offres">Offres
+                        d'emploi</a>
                 </li>
             </ul>
         </div>
         <ul class="navbar-nav mb-2 my-lg-0">
             <% if(typeof user !== 'undefined' && user){ %>
-                 <li class="m-2"><%= user.nom%> <%= user.prenom%> </li>
-                 <a href="/logout" class="btn btn-primary">Déconnexion</a>
-            <% }%>
-        <ul>
-        </div>
+                <li class="m-2"><%= user.nom %> <%= user.prenom %> </li>
+                <a href="/logout" class="btn btn-primary">Déconnexion</a>
+            <% } %>
+        </ul>
+    </div>
 </nav>
diff --git a/app/views/partials/header.ejs b/app/views/partials/header.ejs
@@ -31,11 +31,11 @@
                 </li>
             </ul>
             <ul class="navbar-nav mb-2 my-lg-0">
-            <% if(typeof user !== 'undefined' && user){ %>
-                 <li class="m-2"><%= user.nom%> <%= user.prenom%> </li>
-                 <a href="/logout" class="btn btn-primary">Déconnexion</a>
-            <% }%>
-            <ul>
+                <% if(typeof user !== 'undefined' && user){ %>
+                    <li class="m-2"><%= user.nom %> <%= user.prenom %> </li>
+                    <a href="/logout" class="btn btn-primary">Déconnexion</a>
+                <% } %>
+            </ul>
         </div>
     </div>
 </nav>

diff --git a/app/views/partials/recruteurHeader.ejs b/app/views/partials/recruteurHeader.ejs
@@ -35,12 +35,12 @@
                 </li>
             </ul>
             <ul class="navbar-nav mb-2 my-lg-0">
-            <% if(typeof user !== 'undefined' && user){ %>
-                 <li class="m-2"><%= user.nom%> <%= user.prenom%> </li>
-                 <a href="/logout" class="btn btn-primary">Déconnexion</a>
-            <% }%>
-            <ul>
-            </div>
+                <% if(typeof user !== 'undefined' && user){ %>
+                    <li class="m-2"><%= user.nom %> <%= user.prenom %> </li>
+                    <a href="/logout" class="btn btn-primary">Déconnexion</a>
+                <% } %>
+            </ul>
+        </div>
     </div>
 </nav>