Commit 57baa40e authored by roxane.carraux's avatar roxane.carraux
Browse files

fix all method with session and fix index page

parent f0cd04ee

src/main/java/com/example/demo/HelpPropositionController.java

+3 −4
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ public class HelpPropositionController { 
	public String insertHelpProposition(@ModelAttribute HelpProposition helpProposition, Model model, HttpSession session, Principal principal) {



		String email = SecurityContextHolder.getContext().getAuthentication().getName();

		System.out.println(email);

		User user = userService.findByEmail(email);

		System.out.println(email);





		helpProposition.setMentor(user);
@@ -53,7 +52,7 @@ public class HelpPropositionController { 
	}



	@GetMapping("/allPropositionByMentor")

	public String getallPropositionByMentor(Map<String, Object> model) {

	public String getallPropositionByMentor(Map<String, Object> model, HttpSession session, Principal principal) {



		String email = SecurityContextHolder.getContext().getAuthentication().getName();

		User user = userService.findByEmail(email);
@@ -63,7 +62,7 @@ public class HelpPropositionController { 
	}



	@GetMapping("/editProposition/{id}")

	public String editProposition(@PathVariable("id") Integer helpId, Model model) {

	public String editProposition(@PathVariable("id") Integer helpId, Model model, HttpSession session, Principal principal) {

		HelpProposition helpProposition = helpPropositionRepository.findById(helpId);

		

	   	String email = SecurityContextHolder.getContext().getAuthentication().getName();

src/main/java/com/example/demo/HelpRequestController.java

+10 −5
Original line number Diff line number Diff line 
package com.example.demo;



import java.security.Principal;

import java.util.Map;



import javax.servlet.http.HttpSession;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.core.context.SecurityContextHolder;

import org.springframework.stereotype.Controller;
@@ -21,6 +24,8 @@ import com.example.demo.service.UserServiceInterface; 
public class HelpRequestController {

    @Autowired 

	HelpRequestRepository helpRequestRepository;

	

	@Autowired 

	private UserServiceInterface userService;
@@ -37,7 +42,7 @@ public class HelpRequestController { 
	}

	

	@PostMapping("/insertHelpRequest")

	public String insertHelpRequest(@ModelAttribute HelpRequest helpRequest, Model model) {

	public String insertHelpRequest(@ModelAttribute HelpRequest helpRequest, Model model, HttpSession session, Principal principal) {

		String email = SecurityContextHolder.getContext().getAuthentication().getName();

        User user = userService.findByEmail(email);

		helpRequest.setPoulain(user);
@@ -46,7 +51,7 @@ public class HelpRequestController { 
		return "formHelpRequest";

	}

	@GetMapping("/allRequestByPoulain")

	public String getallPropositionByPoulain(Map<String, Object> model) {

	public String getallPropositionByPoulain(Map<String, Object> model, HttpSession session, Principal principal) {

		String email = SecurityContextHolder.getContext().getAuthentication().getName();

        User user = userService.findByEmail(email);

		model.put("helpRequests", helpRequestRepository.findByPoulain(user));
@@ -54,7 +59,7 @@ public class HelpRequestController { 
	}

	

	@PostMapping("/acceptRequest")

	public String acceptRequest(@ModelAttribute HelpRequest helpRequest, Model model) {

	public String acceptRequest(@ModelAttribute HelpRequest helpRequest, Model model, HttpSession session, Principal principal) {

		String email = SecurityContextHolder.getContext().getAuthentication().getName();

        User user = userService.findByEmail(email);

		helpRequest.setMentor(user);
@@ -63,7 +68,7 @@ public class HelpRequestController { 
	}



	@GetMapping("/editRequest/{id}")

	public String editRequest(@PathVariable("id") Integer helpId, Model model) {

	public String editRequest(@PathVariable("id") Integer helpId, Model model, HttpSession session, Principal principal) {

		HelpRequest helpRequest = helpRequestRepository.findById(helpId);

			

		String email = SecurityContextHolder.getContext().getAuthentication().getName();

src/main/resources/templates/index.html

+3 −13
Original line number Diff line number Diff line
@@ -2,23 +2,13 @@ 
<html>

    <head>

        <meta charset="ISO-8859-1">

        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/css/materialize.min.css">

<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/js/materialize.min.js"></script>

    <title>MentorArc</title>

    </head>

    <body>

        <header th:insert="nav.html :: header"> </header>

        <h2 th:text="${session.username}"></h2>

        <p>This is the home page.</p>

        <ul>

            <li><a href="/login">login</a></li>

            <li><a href="/register">register</a></li>

            <li><a href="/logout">logout</a></li>

            <li><a href="/admin">admin</a> If this link works it means that you're logged as an admin</li>

            <li><a href="/member">member</a> If this link works it means that you're logged as a member (poulain or mentor).</li>

            <li><a href="/allMentor">allMentor</a></li>

            <li><a href="/formMentor">formMentor</a></li>

            <li><a href="/allPoulain">allPoulain</a></li>

            <li><a href="/formPoulain">formPoulain</a></li>

            <li><a href="/allHelpRequest">allHelpRequest</a></li>

            <li><a href="/formHelpRequest">formHelpRequest</a> - for POULAIN only</li>

        </ul>

    </body>

</html>
 
 No newline at end of file

src/main/resources/templates/nav.html

+2 −4
Original line number Diff line number Diff line
@@ -13,14 +13,12 @@ 
                <ul id="nav-mobile" class="right hide-on-med-and-down">

                <li><a href="/allHelpRequest">AllHelpRequest</a></li>

                <li><a href="/allHelpProposition">AllHelpProposition</a></li>

                <li><a href="/allPoulain">AllPoulain</a></li>

                <li><a href="/allMentor">AllMentor</a></li>

                <li><a href="/formMentor">formMentor</a></li>

                <li><a href="/formPoulain">formPoulain</a></li>

                <li><a href="/formHelpProposition">formHelpProposition</a></li>

                <li><a href="/formHelpRequest">formHelpRequest</a></li>

                <li><a href="/allPropositionByMentor">Your Proposition</a></li>

                <li><a href="/allRequestByPoulain">Your Request</a></li>

                <li><a href="/admin">Admin</a></li>

                <li><a href="/logout">Logout</a></li>

                </ul>

            </div>

        </nav>