Ignore:
Timestamp:
03/10/23 21:43:30 (16 months ago)
Author:
SazdovaEkaterina <sazdovaekaterina@…>
Branches:
main
Children:
104185f
Parents:
b46d1f2 (diff), c3278ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

resolve merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Prototype Application/Paw5/src/main/java/finki/paw5/web/controllers/HomeController.java

    rb46d1f2 r0078d84  
    11package finki.paw5.web.controllers;
    22
     3import jakarta.servlet.http.HttpServletRequest;
    34import org.springframework.stereotype.Controller;
    45import org.springframework.web.bind.annotation.GetMapping;
     
    1011
    1112    @GetMapping
    12     public String getHomePage(){
     13    public String getHomePage(HttpServletRequest request) {
     14        if(request.getSession().getAttribute("user")==null){
     15            return "redirect:/login";
     16        }
    1317        return "home";
    1418    }
     19
    1520    @GetMapping("/aboutUs")
    1621    public String getAboutUsPage(){
Note: See TracChangeset for help on using the changeset viewer.