Changeset aad0fb3


Ignore:
Timestamp:
01/09/23 23:00:44 (21 months ago)
Author:
Bojan <bojantrpeski123@…>
Branches:
main
Children:
3179a2c
Parents:
5168b2e
Message:

Listing for categories that supplier supplies added and links in navbar added

Location:
FullyStocked/src/main
Files:
1 added
32 edited

Legend:

Unmodified
Added
Removed

  • FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java

    r5168b2e raad0fb3  
    3535    @NotEmpty(message = "Supplier must have street city")
    3636    private String city;
    37     @ManyToMany
     37    @ManyToMany(fetch = FetchType.EAGER)
    3838    @JoinTable(name = "supplier_supplies_category",
    3939            joinColumns = @JoinColumn(name = "userid"),

  • FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java

    r5168b2e raad0fb3  
    22
    33import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException;
     4import com.bazi.fullystocked.Models.Exceptions.UserNotFoundException;
    45import com.bazi.fullystocked.Models.Managers;
    56import com.bazi.fullystocked.Models.Suppliers;
    … …  
    6061            return "redirect:/home";
    6162        }
    62         catch (Exception exception) {
     63        catch (InvalidUserCredentialsException exception) {
    6364            model.addAttribute("hasError", true);
    6465            model.addAttribute("error", exception.getMessage());
    6566
    66             return "login";
     67            return "redirect:/login";
    6768        }
    6869    }

  • FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java

    r5168b2e raad0fb3  
    11package com.bazi.fullystocked.Web.Controller;
    22
     3import com.bazi.fullystocked.Models.Categories;
     4import com.bazi.fullystocked.Models.Suppliers;
    35import org.springframework.stereotype.Controller;
     6import org.springframework.ui.Model;
    47import org.springframework.web.bind.annotation.GetMapping;
    58import org.springframework.web.bind.annotation.RequestMapping;
     9
     10import javax.servlet.http.HttpServletRequest;
     11import java.util.List;
    612
    713@Controller
    … …  
    1420        return "homeSupplier";
    1521    }
     22    @GetMapping("/categories")
     23    public String getSupplierCategories(HttpServletRequest request, Model m)
     24    {
     25        Suppliers s= (Suppliers) request.getSession().getAttribute("user");
     26        List<Categories> categoriesList=s.getCategoryList();
     27        m.addAttribute("categoires",categoriesList);
     28        return "supplierCategories";
     29    }
    1630}

  • FullyStocked/src/main/resources/templates/AskAQuestionSingle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/addArticleCategory.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2626        <li class="nav-item m-auto">
    2727          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     28        </li>
     29        <li class="nav-item m-auto">
     30          <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2831        </li>
    2932      </ul>

  • FullyStocked/src/main/resources/templates/addInvoiceArticle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/addOrderArticle.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/articles.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/askAQuestion.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/createAnswer.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2626        <li class="nav-item m-auto">
    2727          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     28        </li>
     29        <li class="nav-item m-auto">
     30          <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2831        </li>
    2932      </ul>

  • FullyStocked/src/main/resources/templates/createArticle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2626        <li class="nav-item m-auto">
    2727          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     28        </li>
     29        <li class="nav-item m-auto">
     30          <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2831        </li>
    2932      </ul>

  • FullyStocked/src/main/resources/templates/createInv.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/createOffer.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/supplier">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2020            <ul class="navbar-nav m-auto">
    2121                <li class="nav-item m-auto">
    22                     <a class="nav-link active" href="#">Нарачки</a>
     22                    <a class="nav-link active" href="/orders/supplier/list">Нарачки</a>
    2323                </li>
    2424                <li class="nav-item m-auto">
    25                     <a class="nav-link active" href="#">Категории</a>
     25                    <a class="nav-link active" href="/supplier/categories">Категории</a>
    2626                </li>
    2727            </ul>

  • FullyStocked/src/main/resources/templates/createOrder.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/deliveredArticles.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/detailsArticle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/homeManager.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212  <div class="container">
    13     <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727        <li class="nav-item m-auto">
    2828          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29        </li>
     30        <li class="nav-item m-auto">
     31          <a class="nav-link active" href="/articles/category/add">Додај категорија на производ</a>
    2932        </li>
    3033      </ul>

  • FullyStocked/src/main/resources/templates/homeSupplier.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212  <div class="container">
    13     <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
     13    <a class="navbar-brand" href="/supplier">FULLYSTOCKED</a>
    1414    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2020      <ul class="navbar-nav m-auto">
    2121        <li class="nav-item m-auto">
    22           <a class="nav-link active" href="#">Нарачки</a>
     22          <a class="nav-link active" href="/orders/supplier/list">Нарачки</a>
    2323        </li>
    2424        <li class="nav-item m-auto">
    25           <a class="nav-link active" href="#">Категории</a>
     25          <a class="nav-link active" href="/supplier/categories">Категории</a>
    2626        </li>
    2727      </ul>

  • FullyStocked/src/main/resources/templates/homeWorker.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212  <div class="container">
    13     <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     13    <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1414    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/managerOrderDetails.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/managerOrders.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/managerQuestionDetails.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/managerQuestions.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/noLocWorkers.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212  <div class="container">
    13     <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13    <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727        <li class="nav-item m-auto">
    2828          <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29        </li>
     30        <li class="nav-item m-auto">
     31          <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932        </li>
    3033      </ul>

  • FullyStocked/src/main/resources/templates/selectInvArticle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/selectOrderArticle.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/manager">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2727                <li class="nav-item m-auto">
    2828                    <a class="nav-link active" href="/articles/create">Внеси нови артикли</a>
     29                </li>
     30                <li class="nav-item m-auto">
     31                    <a class="nav-link active" href="/articles/category/add">Додај категорија на артикл</a>
    2932                </li>
    3033            </ul>

  • FullyStocked/src/main/resources/templates/selectQuestionArticle.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/suppOrderDetails.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/supplier">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2020            <ul class="navbar-nav m-auto">
    2121                <li class="nav-item m-auto">
    22                     <a class="nav-link active" href="#">Нарачки</a>
     22                    <a class="nav-link active" href="/orders/supplier/list">Нарачки</a>
    2323                </li>
    2424                <li class="nav-item m-auto">
    25                     <a class="nav-link active" href="#">Категории</a>
     25                    <a class="nav-link active" href="/supplier/categories">Категории</a>
    2626                </li>
    2727            </ul>

  • FullyStocked/src/main/resources/templates/supplierOrders.html

    r5168b2e raad0fb3  
    1111<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1212    <div class="container">
    13         <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
     13        <a class="navbar-brand" href="/supplier">FULLYSTOCKED</a>
    1414        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1515                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
    … …  
    2020            <ul class="navbar-nav m-auto">
    2121                <li class="nav-item m-auto">
    22                     <a class="nav-link active" href="#">Нарачки</a>
     22                    <a class="nav-link active" href="/orders/supplier/list">Нарачки</a>
    2323                </li>
    2424                <li class="nav-item m-auto">
    25                     <a class="nav-link active" href="#">Категории</a>
     25                    <a class="nav-link active" href="/supplier/categories">Категории</a>
    2626                </li>
    2727            </ul>

  • FullyStocked/src/main/resources/templates/workerOrders.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/workerQuestionDetails.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111  <div class="container">
    12     <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12    <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414            aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

  • FullyStocked/src/main/resources/templates/workerQuestions.html

    r5168b2e raad0fb3  
    1010<nav class="navbar navbar-expand-md navbar-dark bg-dark">
    1111    <div class="container">
    12         <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     12        <a class="navbar-brand" href="/worker">FULLYSTOCKED</a>
    1313        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
    1414                aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
Note: See TracChangeset for help on using the changeset viewer.