Merge pull request #16 from SRGSSR/develop

Inverse apps order for update - Fix css
SRGSSR · Dec 20, 2018 · 0d59518 · 0d59518
2 parents b3f517f + 58f0e95
commit 0d59518
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.example</groupId>
 	<artifactId>pfff</artifactId>
-	<version>5</version>
+	<version>6</version>
 	<packaging>jar</packaging>
 
 	<name>pfff</name>
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>font-awesome</artifactId>
-			<version>5.0.10</version>
+			<version>5.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>

diff --git a/portal-app/src/favicon.ico b/portal-app/src/favicon.ico
diff --git a/portal-app/src/index.html b/portal-app/src/index.html
@@ -12,7 +12,7 @@
   <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/css/bootstrap.min.css"/>
   <script type="text/javascript" src="/webjars/jquery/jquery.min.js"></script>
   <script type="text/javascript" src="/webjars/bootstrap/js/bootstrap.min.js"></script>
-  <link rel="stylesheet" href="/webjars/font-awesome/css/font-awesome.min.css"/>
+  <link rel="stylesheet" href="/webjars/font-awesome/css/fontawesome.min.css"/>
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>

diff --git a/src/main/java/com/example/pfff/config/AuthenticationConfig.java b/src/main/java/com/example/pfff/config/AuthenticationConfig.java
@@ -38,7 +38,7 @@ public AuthenticationConfig(
     protected void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()
-                .antMatchers("/api/v1/update/check", "/api/v1/whatisnew/text", "/api/v1/whatisnew/html", "/api/v1/version", "/api/v*/playlist/recommendation/**").permitAll()
+                .antMatchers("/api/v1/update/check", "/api/v1/whatisnew/text", "/api/v1/whatisnew/html", "/api/v1/version", "/api/v*/playlist/recommendation/**", "/webjars/bootstrap/**", "/webjars/bootstrap/**", "/webjars/jquery/**", "/webjars/font-awesome/**").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .formLogin()

diff --git a/src/main/java/com/example/pfff/controller/UpdateController.java b/src/main/java/com/example/pfff/controller/UpdateController.java
@@ -73,7 +73,7 @@ public ResponseEntity<Update> delete(@PathVariable("id") int id) {
     }
 
     @GetMapping("/api/v1/update")
-    public ResponseEntity<Iterable<Update>> findAll() {
-        return new ResponseEntity<>(updateService.findAll(), HttpStatus.OK);
+    public ResponseEntity<Iterable<Update>> findAllDesc() {
+        return new ResponseEntity<>(updateService.findAllDesc(), HttpStatus.OK);
     }
 }
diff --git a/src/main/java/com/example/pfff/repository/UpdateRepository.java b/src/main/java/com/example/pfff/repository/UpdateRepository.java
@@ -15,4 +15,6 @@ public interface UpdateRepository extends CrudRepository<Update, Long> {
     List<Update> removeByPackageNameAndVersion(String packageName, String version);
 
     List<Update> findByPackageNameAndVersion(String packageName, String version);
+
+    List<Update> findAllByOrderByIdDesc();
 }
diff --git a/src/main/java/com/example/pfff/service/UpdateService.java b/src/main/java/com/example/pfff/service/UpdateService.java
@@ -64,4 +64,8 @@ public Update delete(long id) {
     public Iterable<Update> findAll() {
         return repository.findAll();
     }
+
+    public Iterable<Update> findAllDesc() {
+        return repository.findAllByOrderByIdDesc();
+    }
 }
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -7,7 +7,7 @@
     <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/css/bootstrap.min.css"/>
     <script type="text/javascript" src="/webjars/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="/webjars/bootstrap/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="/webjars/font-awesome/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="/webjars/font-awesome/css/fontawesome.min.css"/>
 </head>
 
 <body>