Skip to content
Snippets Groups Projects
Commit ee3b6984 authored by Nicolas Dausque's avatar Nicolas Dausque
Browse files

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

parents 7c0b5059 10f3e387
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 27 additions and 49 deletions
tpkotlin/src/main/java/com/tpKotlin/glhf/tpkotlin/controller/SimpleController.java
+ 2
− 19
View file @ ee3b6984
......@@ -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();
ModelAndView mav = new ModelAndView("ex3");
mav.addObject("dirfav", s );
return mav;
return new ModelAndView("ex3");
}
@RequestMapping("/ex4")
......@@ -57,9 +45,4 @@ public class SimpleController {
mav.addObject("dirfav", s );
return mav;
}
@RequestMapping("/ex5")
public ModelAndView exo5() {
return new ModelAndView("ex5");
}
}
tpkotlin/src/main/webapp/WEB-INF/jsp/ex1.jsp
+ 5
− 5
View file @ ee3b6984
......@@ -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">
......
tpkotlin/src/main/webapp/WEB-INF/jsp/ex2.jsp
+ 2
− 2
View file @ ee3b6984
......@@ -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>
......
tpkotlin/src/main/webapp/WEB-INF/jsp/ex3.jsp
+ 9
− 14
View file @ ee3b6984
<%@ 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">Exercice 1 : Vue propre </h1>
<br>
<br>
<div class="row">
<div class="offset-sm-1 col-sm-10">
<h2>Mon Repo Favoris :</h2>
<br>
<br>
<c:forTokens items="${dirfav}" delims="&&&" var="name">
<img src="${name}" />
</c:forTokens>
<h1 class="content-title">Etape 3 : File Management</h1>
<br><br>
<div class="container">
<div class="row justify-content-center">
Désolé Billy, on dirait que cette étape se passe uniquement en Back.<br>
Si tu veux voir le résultat de ce que tu viens de faire: Go to Etape 1.
</div>
</div>
</body>
......
tpkotlin/src/main/webapp/WEB-INF/jsp/ex4.jsp
+ 2
− 2
View file @ ee3b6984
......@@ -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">
......
tpkotlin/src/main/webapp/WEB-INF/jsp/header.jsp
+ 4
− 5
View file @ ee3b6984
......@@ -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="/ex2">Exercice 2</a></br><p>TBD</p></div>
<div class="onglet"><a href="/ex3">Exercice 3</a></br><p>Null Safety</p></div>
<div class="onglet"><a href="/ex4">Exercice 4</a></br><p>Les Coroutines</p></div>
<div class="onglet"><a href="/ex5">Exercice 5</a></br><p></p></div>
<div class="onglet"><a href="/ex1">Etape 1 :</a><span> Singleton</span></div>
<div class="onglet"><a href="/ex2">Etape 2 :</a><span> Gestion de Liste</span></div>
<div class="onglet"><a href="/ex3">Etape 3 :</a><span> File Management</span></div>
<div class="onglet"><a href="/ex4">Etape 4 :</a><span> Null Safety</span></div>
</div>
</nav>
<br>
\ No newline at end of file
tpkotlin/src/main/webapp/WEB-INF/jsp/index.jsp
+ 2
− 1
View file @ ee3b6984
......@@ -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>
......
tpkotlin/src/main/webapp/css/header.css
+ 1
− 1
View file @ ee3b6984
......@@ -26,7 +26,7 @@
}
.onglet {
margin-top: 1.5%;
margin-top: 2.5%;
display: inline-block !important;
color: #6e8a99;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment