Merge branch 'master' of https://gitlab.univ-lille.fr/valentin.degauchy.etu/tp_kotlin_1920

ee3b6984 · Nicolas Dausque · 7c0b5059 · 10f3e387 · ee3b6984 · ee3b6984
Commit ee3b6984 authored 5 years ago by Nicolas Dausque
--- a/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java
+++ b/tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java
@@ -2,11 +2,7 @@ package com.tpKotlin.glhf.tpkotlin.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-//import org.springframework.ui.ModelMap;
-//import org.springframework.validation.BindingResult;
-//import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 import com.tpKotlin.glhf.tpkotlin.entity.FavDir;
@@ -24,11 +20,6 @@ public class SimpleController {
 		return new ModelAndView("index", "msg", "Bienvenue !");
 	}
-//	@RequestMapping("/indexsubmit")
-//	public ModelAndView indexsubmit(@ModelAttribute("bidon")Bidon b, BindingResult result, ModelMap map) {
-//		return new ModelAndView("index", "msg", "Bienvenue "+b.getNom()+" !");
-//	}
 	@RequestMapping("/ex1")
 	public ModelAndView exo1() {
 		String s = FavDir.affiche();
@@ -44,10 +35,7 @@ public class SimpleController {
 	@RequestMapping("/ex3")
 	public ModelAndView exo3() {
-		String s = dfs.getAllImagesFromFav();
+		return new ModelAndView("ex3");
-		ModelAndView mav = new ModelAndView("ex3");
-		mav.addObject("dirfav", s );
-		return mav;
 	}
 	@RequestMapping("/ex4")
@@ -57,9 +45,4 @@ public class SimpleController {
 		mav.addObject("dirfav", s );
 		return mav;
 	}
-	@RequestMapping("/ex5")
-	public ModelAndView exo5() {
-		return new ModelAndView("ex5");
-	}
 }
--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex1.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex1.jsp
@@ -6,10 +6,10 @@
 <head>
 <meta charset="UTF-8">
 <c:import url="/WEB-INF/jsp/header.jsp" />
-<title>${msg}</title>
+<title>Etape 1</title>
 </head>
 <body>
-	<h1 class="content-title">Exercice 1 : Singleton</h1>
+	<h1 class="content-title">Etape 1 : Singleton</h1>
 	<br>
 	<br>
 	<div class="row">

--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex2.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex2.jsp
@@ -7,10 +7,10 @@
 	<head>
 		<meta charset="UTF-8">
 		<c:import url="/WEB-INF/jsp/header.jsp" />
-		<title>Exercice 2</title>
+		<title>Etape 2</title>
 	</head>
 	<body>
-		<h1 class="content-title">Exercice 2 : TBD</h1>
+		<h1 class="content-title">Etape 2 : Gestion de Liste</h1>
 		<br>
 		<h3 class="content-sub-title">Saisie d'un nouveau Meme : </h3>
 		<br><br>

--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex3.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex3.jsp
 <%@ page language="java" contentType="text/html; charset=UTF-8"
    pageEncoding="UTF-8"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
 <!DOCTYPE html>
 <html>
 	<head>
 		<meta charset="UTF-8">
 		<c:import url="/WEB-INF/jsp/header.jsp" />
-		<title>Exercice 3</title>
+		<title>Etape 3</title>
 	</head>
 	<body>
-		<c:import url="/WEB-INF/jsp/footer.jsp" />
+		<h1 class="content-title">Etape 3 : File Management</h1>
-		<h1 class="content-title">Exercice 1 : Vue propre </h1>
+		<br><br>
-	<br>
+		<div class="container">
-	<br>
+			<div class="row justify-content-center">
-	<div class="row">
+				Désolé Billy, on dirait que cette étape se passe uniquement en Back.<br>
-		<div class="offset-sm-1 col-sm-10">
+				Si tu veux voir le résultat de ce que tu viens de faire: Go to Etape 1.
-			<h2>Mon Repo Favoris :</h2>
-			<br>
-			<br>
-			<c:forTokens items="${dirfav}" delims="&&&" var="name">
-				<img src="${name}" />
-			</c:forTokens>
 			</div>
 		</div>
 	</body>

--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
@@ -6,10 +6,10 @@
 	<head>
 		<meta charset="UTF-8">
 		<c:import url="/WEB-INF/jsp/header.jsp" />
-		<title>Exercice 4</title>
+		<title>Etape 4</title>
 	</head>
 	<body>
-		<h1 class="content-title">Exercice 4 : Coroutines</h1>
+		<h1 class="content-title">Etape 4 : Coroutines</h1>
 	<br>
 	<br>
 	<div class="row">

--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -12,11 +12,10 @@
 				TP Kotlin
 			</p>
 		</div>
-		<div class="onglet"><a href="/ex1">Exercice 1</a></br><p>Singleton</p></div>
+		<div class="onglet"><a href="/ex1">Etape 1 :</a><span> Singleton</span></div>
-		<div class="onglet"><a href="/ex2">Exercice 2</a></br><p>TBD</p></div>
+		<div class="onglet"><a href="/ex2">Etape 2 :</a><span> Gestion de Liste</span></div>
-		<div class="onglet"><a href="/ex3">Exercice 3</a></br><p>Null Safety</p></div>
+		<div class="onglet"><a href="/ex3">Etape 3 :</a><span> File Management</span></div>
-		<div class="onglet"><a href="/ex4">Exercice 4</a></br><p>Les Coroutines</p></div>
+		<div class="onglet"><a href="/ex4">Etape 4 :</a><span> Null Safety</span></div>
-		<div class="onglet"><a href="/ex5">Exercice 5</a></br><p></p></div>
 	</div>
 </nav>
 <br>
\ No newline at end of file
--- a/tpkotlin/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/tpkotlin/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -37,7 +37,8 @@
 				<div class="row justify-content-center">
 					<div class="col-md-8">
 						<p class="center">
-							Maintenant on vous laisse commencer avec le premier exercice (regarde, le lien est dans la NavBar).
+							Maintenant on vous laisse commencer avec le premier exercice. Tout est dans le Readme.<br>
+							On vous laisse à disposition ce Front pour tester.
 						</p>
 					</div>
 				</div>

--- a/tpkotlin/src/main/webapp/css/header.css
+++ b/tpkotlin/src/main/webapp/css/header.css
@@ -26,7 +26,7 @@
 }
 .onglet {
-	margin-top: 1.5%;
+	margin-top: 2.5%;
 	display: inline-block !important;
 	color: #6e8a99;
 }