Merge branch 'hr/favicons' into 'master'

Add favicons Closes #147 See merge request !303

Merge branch 'hr/favicons' into 'master'
15feaa7b · Hamza Remmal · d9e0510a · f71a71fc · 15feaa7b · 15feaa7b
Commit 15feaa7b authored 5 months ago by Hamza Remmal
--- a/autograde-service/src/main/java/ch/epfl/autograde/config/SecurityConfig.java
+++ b/autograde-service/src/main/java/ch/epfl/autograde/config/SecurityConfig.java
@@ -103,7 +103,7 @@ public class SecurityConfig {
                .sessionManagement(AbstractHttpConfigurer::disable)
                .formLogin(AbstractHttpConfigurer::disable)
                .authorizeHttpRequests(auth -> {
-                    auth.requestMatchers("/error", "/css/error-pages.css").permitAll();
+                    auth.requestMatchers("/error", "/css/error-pages.css", "/images/favicons/**").permitAll();
                    auth.anyRequest().hasAuthority(AutogradeAuthorities.SYSTEM_ACCESS.getAuthority());
                })
                .build();

--- a/autograde-service/src/main/resources/static/images/favicons/android-chrome-192x192.png
+++ b/autograde-service/src/main/resources/static/images/favicons/android-chrome-192x192.png
--- a/autograde-service/src/main/resources/static/images/favicons/android-chrome-512x512.png
+++ b/autograde-service/src/main/resources/static/images/favicons/android-chrome-512x512.png
--- a/autograde-service/src/main/resources/static/images/favicons/apple-touch-icon.png
+++ b/autograde-service/src/main/resources/static/images/favicons/apple-touch-icon.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-120.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-120.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-128.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-128.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-152.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-152.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-16.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-16.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-180.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-180.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-228.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-228.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-32.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-32.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-57.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-57.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-76.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-76.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon-96.png
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon-96.png
--- a/autograde-service/src/main/resources/static/images/favicons/favicon.ico
+++ b/autograde-service/src/main/resources/static/images/favicons/favicon.ico
--- a/autograde-service/src/main/resources/templates/error/4xx.html
+++ b/autograde-service/src/main/resources/templates/error/4xx.html
@@ -5,6 +5,26 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="stylesheet" th:href="@{/css/error-pages.css}">
+    <!-- FAVICONS EXTRACTED FROM https://epfl.ch-->
+    <link rel="shortcut icon"    th:href="@{/images/favicons/favicon.ico}">
+    <link rel="apple-touch-icon-precomposed" th:href="@{/images/favicons/favicon-152.png}">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-16.png}" sizes="16x16">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-32.png}" sizes="32x32">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-57.png}" sizes="57x57">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-76.png}" sizes="76x76">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-96.png}" sizes="96x96">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-120.png}" sizes="120x120">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-128.png}" sizes="128x128">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-152.png}" sizes="152x152">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-180.png}" sizes="180x180">
+    <link rel="shortcut icon"    th:href="@{/images/favicons/android-chrome-192x192.png}" sizes="192x192">
+    <link rel="shortcut icon"    th:href="@{/images/favicons/android-chrome-512x512.png}" sizes="512x512">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-228.png}" sizes="228x228">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/apple-touch-icon.png}">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/favicon-152.png}" sizes="152x152">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/favicon-180.png}" sizes="180x180">
  </head>
  <body>
    <div class="error-page">

--- a/autograde-service/src/main/resources/templates/error/5xx.html
+++ b/autograde-service/src/main/resources/templates/error/5xx.html
@@ -5,6 +5,26 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="stylesheet" th:href="@{/css/error-pages.css}">
+    <!-- FAVICONS EXTRACTED FROM https://epfl.ch-->
+    <link rel="shortcut icon"    th:href="@{/images/favicons/favicon.ico}">
+    <link rel="apple-touch-icon-precomposed" th:href="@{/images/favicons/favicon-152.png}">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-16.png}" sizes="16x16">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-32.png}" sizes="32x32">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-57.png}" sizes="57x57">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-76.png}" sizes="76x76">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-96.png}" sizes="96x96">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-120.png}" sizes="120x120">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-128.png}" sizes="128x128">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-152.png}" sizes="152x152">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-180.png}" sizes="180x180">
+    <link rel="shortcut icon"    th:href="@{/images/favicons/android-chrome-192x192.png}" sizes="192x192">
+    <link rel="shortcut icon"    th:href="@{/images/favicons/android-chrome-512x512.png}" sizes="512x512">
+    <link rel="icon"             th:href="@{/images/favicons/favicon-228.png}" sizes="228x228">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/apple-touch-icon.png}">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/favicon-152.png}" sizes="152x152">
+    <link rel="apple-touch-icon" th:href="@{/images/favicons/favicon-180.png}" sizes="180x180">
  </head>
  <body>
    <div class="error-page">