Skip to content

Commit

Permalink
Merge pull request #446 from NoroffFEU/393-fix-warning-in-dev-mode
Browse files Browse the repository at this point in the history 
changed the path for assets that made an error message in terminal
  • Loading branch information
@Bjonne696
Bjonne696 authored Dec 17, 2023
2 parents 54172bf + ea2f740 commit 3b85d94
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 24 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ <h2 class="d-md-none fw-bold">Your direct access to Noroff's best candidates</h2
</section>
</main>
<footer></footer>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>

</body>
</html>
4 changes: 2 additions & 2 deletions pages/TBD/listings.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ <h1 class="text-center">Job Listings</h1>
<input class="form-control" type="search" placeholder="Search Listings..." id="searchListing" data-search-listings />
<span class="input-group-append">
<button class="btn ms-n5" type="button">
<img src="/public/assets/icons/search.svg" alt="Search icon" class="icon-sm" />
<img src="/assets/icons/search.svg" alt="Search icon" class="icon-sm" />
</button>
</span>
</div>
</div>
<div class="dropdown">
<button class="btn" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
<img src="/public/assets/icons/filter.svg" alt="Search icon" class="icon-sm" />
<img src="/assets/icons/filter.svg" alt="Search icon" class="icon-sm" />
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
<li><a class="dropdown-item" href="#">Action</a></li>
Expand Down
22 changes: 11 additions & 11 deletions pages/admin/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ <h1 class="text-center py-5 m-0 fw-bold">Admin</h1>
<form id="usersSearchForm" class="d-flex" role="search" aria-label="search" data-auth="search">
<div class="form-floating">
<input type="search" placeholder="Search.." minlength="3" name="term" class="adminSearchField py-3 form-control border-0 rounded-5 ps-5 text-bg-light" />
<label class="form-label py-1"><img src="/public/assets/icons/search.svg" class="searchIcon ps-1" /></label>
<label class="form-label py-1"><img src="/assets/icons/search.svg" class="searchIcon ps-1" /></label>
</div>
</form>
<label class="d-flex justify-content-center ms-1"><img src="/public/assets/icons/sliders.svg" /></label>
<label class="d-flex justify-content-center ms-1"><img src="/assets/icons/sliders.svg" /></label>
</div>
</div>
<!-- Users goes here -->
Expand All @@ -72,10 +72,10 @@ <h1 class="text-center py-5 m-0 fw-bold">Admin</h1>
<form id="usersSearchForm" class="d-flex" role="search" aria-label="search" data-auth="search">
<div class="form-floating">
<input type="search" placeholder="Search.." minlength="3" name="term" class="adminSearchField py-3 form-control border-0 rounded-5 ps-5 text-bg-light" />
<label class="form-label py-1"><img src="/public/assets/icons/search.svg" class="searchIcon ps-1" /></label>
<label class="form-label py-1"><img src="/assets/icons/search.svg" class="searchIcon ps-1" /></label>
</div>
</form>
<label class="d-flex justify-content-center ms-1"><img src="/public/assets/icons/sliders.svg" /></label>
<label class="d-flex justify-content-center ms-1"><img src="/assets/icons/sliders.svg" /></label>
</div>
</div>
<!-- Listings goes here -->
Expand All @@ -101,10 +101,10 @@ <h1 class="text-center py-5 m-0 fw-bold">Admin</h1>
<form id="usersSearchForm" class="d-flex" role="search" aria-label="search" data-auth="search">
<div class="form-floating">
<input type="search" placeholder="Search.." minlength="3" name="term" class="adminSearchField py-3 form-control border-0 rounded-5 ps-5 text-bg-light" />
<label class="form-label py-1"><img src="/public/assets/icons/search.svg" class="searchIcon ps-1" /></label>
<label class="form-label py-1"><img src="/assets/icons/search.svg" class="searchIcon ps-1" /></label>
</div>
</form>
<label class="d-flex justify-content-center ms-1"><img src="/public/assets/icons/sliders.svg" /></label>
<label class="d-flex justify-content-center ms-1"><img src="/assets/icons/sliders.svg" /></label>
</div>
</div>
<!-- Offers goes here -->
Expand All @@ -123,23 +123,23 @@ <h1 class="text-center py-5 m-0 fw-bold">Admin</h1>
<td>Lenovo AS</td>
<td>#-123456</td>
<td>
<button class="btn btn-sm"><img src="/public/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
<button class="btn btn-sm"><img src="/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
</td>
</tr>
<tr>
<th scope="row">Leo Andersen</th>
<td>Lenovo AS</td>
<td>#-457811</td>
<td>
<button class="btn btn-sm"><img src="/public/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
<button class="btn btn-sm"><img src="/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
</td>
</tr>
<tr>
<th scope="row">Thomas Drink</th>
<td>Lenovo AS</td>
<td>#-457812</td>
<td>
<button class="btn btn-sm"><img src="/public/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
<button class="btn btn-sm"><img src="/assets/icons/delete-black.svg" alt="Delete button" class="footerIcon" /></button>
</td>
</tr>
</tbody>
Expand All @@ -153,10 +153,10 @@ <h1 class="text-center py-5 m-0 fw-bold">Admin</h1>
<form id="usersSearchForm" class="d-flex" role="search" aria-label="search" data-auth="search">
<div class="form-floating">
<input type="search" placeholder="Search.." minlength="3" name="term" class="adminSearchField py-3 form-control border-0 rounded-5 ps-5 text-bg-light" />
<label class="form-label py-1"><img src="/public/assets/icons/search.svg" class="searchIcon ps-1" /></label>
<label class="form-label py-1"><img src="/assets/icons/search.svg" class="searchIcon ps-1" /></label>
</div>
</form>
<label class="d-flex justify-content-center ms-1"><img src="/public/assets/icons/sliders.svg" /></label>
<label class="d-flex justify-content-center ms-1"><img src="/assets/icons/sliders.svg" /></label>
</div>
</div>
<!-- Applications goes here -->
Expand Down
4 changes: 2 additions & 2 deletions pages/auth/register/applicant/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h1 class="fw-bold">Register For Applicant</h1>
<option value="">Other</option>
</select>
</div>
<button id="showMore" class="btn border-0" type="button" data-bs-toggle="collapse" data-bs-target="#hiddenInput"><img class="icon-sm" src="../../../../public/assets/icons/plus.svg" alt="" /></button>
<button id="showMore" class="btn border-0" type="button" data-bs-toggle="collapse" data-bs-target="#hiddenInput"><img class="icon-sm" src="/assets/icons/plus.svg" alt="" /></button>
<div class="error"></div>
</div>
<div class="d-grid gap-2 col-md-6 mx-auto">
Expand All @@ -111,7 +111,7 @@ <h1 class="fw-bold">Register For Applicant</h1>
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<form class="modal-dialog" id="add-image">
<div class="modal-content d-flex">
<button type="button" class="button-close align-self-end" data-bs-dismiss="modal" aria-label="Close"><img class="icon" src="../../../../public/assets/icons/close.svg" alt="" /></button>
<button type="button" class="button-close align-self-end" data-bs-dismiss="modal" aria-label="Close"><img class="icon" src="/assets/icons/close.svg" alt="" /></button>
<div class="px-4 pb-4">
<div class="modal-header border-0">
<h1 class="modal-title fs-5 fw-bold" id="exampleModalLabel">Add image</h1>
Expand Down
22 changes: 17 additions & 5 deletions pages/listings/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<header></header>
<!--Main content on page-->
<main class="bg-theme-new-grey shadow">
<div class="container w-75 d-flex flex-column gap-5 bg-theme-grey my-5 p-5">
<div class="container w-75 d-flex flex-column gap-5 bg-theme-grey my-5 p-5">
<!--Top of listings container-->
<section class="d-flex justify-content-center">
<div class="mt-5">
Expand All @@ -28,10 +28,22 @@ <h1 class="mt-2 py-1 text-center fw-bold">Job Listings</h1>
<label for="searchListing"></label>
<input class="form-control" type="search" placeholder="Search Listings..." id="searchListing" data-search-listings />
<span class="input-group-append">
<button class="btn ms-n5" type="button">
<img src="/public/assets/icons/search.svg" alt="Search icon" class="icon-sm" />
</button>
</span>
<button class="btn ms-n5" type="button">
<img src="/assets/icons/search.svg" alt="Search icon" class="icon-sm" />
</button>
</span>
</div>
</div>
<div class="dropdown">
<button class="btn" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
<img src="/assets/icons/filter.svg" alt="Search icon" class="icon-sm" />
</button>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
<li><a class="dropdown-item" href="#">All</a></li>
<li><a class="dropdown-item" href="#">Latest</a></li>
<li><a class="dropdown-item" href="#">Last 14 days</a></li>
<li><a class="dropdown-item" href="#">Last 30 days</a></li>
</ul>
</div>
</div>
<div class="dropdown">
Expand Down
4 changes: 2 additions & 2 deletions src/js/ui/footer/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export const footer = () => {
<li class="list-group-item text-white">4612 Kristiansand S</li>
</ul>
<div class="d-flex flex-column gap-1">
<a href="tel:38000000" class="nav-link text-white" id="navlink-footer-id"><img src="/public/assets/icons/phone.svg" class="footerIcon"/> 38000000</a>
<a href="mailto:utdanning@noroff.no" class="nav-link text-white" id="navlink-footer-id"><img src="/public/assets/icons/mail.svg" class="footerIcon" id="navlink-footer-id"/> utdanning@noroff.no</a>
<a href="tel:38000000" class="nav-link text-white" id="navlink-footer-id"><img src="/assets/icons/phone.svg" class="footerIcon"/> 38000000</a>
<a href="mailto:utdanning@noroff.no" class="nav-link text-white" id="navlink-footer-id"><img src="/assets/icons/mail.svg" class="footerIcon" id="navlink-footer-id"/> utdanning@noroff.no</a>
</div>
</div>
<div class="col" data-footer-col>
Expand Down
2 changes: 1 addition & 1 deletion src/js/ui/header/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const header = () => {
<div class="mx-0 mx-md-5 px-0 px-md-3 container-fluid">
<a class="navbar-brand ms-5 me-0 p-0" href="/">
<div class="d-flex gap-2">
<img src="/public/assets/icons/noroff-logo.svg" class="Logo-noroff my-auto" style="width: 40px;height: 56px" />
<img src="/assets/icons/noroff-logo.svg" class="Logo-noroff my-auto" style="width: 40px;height: 56px" />
<div class="d-flex flex-column">
<span class="company_name fs-4 fw-semibold text-white" style="height: 28px">Noroff</span>
<span class="company_branch fs-6 text-white">Job Agency</span>
Expand Down

0 comments on commit 3b85d94

Please sign in to comment.