diff --git a/autograde-service/src/main/java/ch/epfl/autograde/config/SecurityConfig.java b/autograde-service/src/main/java/ch/epfl/autograde/config/SecurityConfig.java index dfcd2b73a3d9689d9dd17a3a8977b6cef72318df..66e0ee38554e2279556f368533debff2ef9a3624 100644 --- 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(); diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..5926013400203af684ce3ef315f2fcb8e245c3ee Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/android-chrome-192x192.png differ diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..d661705cd9f9325fcc65c822ee94d6c15e703dcc Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/android-chrome-512x512.png differ diff --git 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 new file mode 100644 index 0000000000000000000000000000000000000000..8d2e0b73a90fffa9c0b344a5e3b392ada793efd3 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/apple-touch-icon.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-120.png b/autograde-service/src/main/resources/static/images/favicons/favicon-120.png new file mode 100644 index 0000000000000000000000000000000000000000..e923f2d7f4ad95445e54b9cc27c4be4fee556b14 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-120.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-128.png b/autograde-service/src/main/resources/static/images/favicons/favicon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..8e793c3c1c932073709989b4a1130e21de899bcb Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-128.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-152.png b/autograde-service/src/main/resources/static/images/favicons/favicon-152.png new file mode 100644 index 0000000000000000000000000000000000000000..a180a6f4b17ee75b677801f50a8defe9d9b469c8 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-152.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-16.png b/autograde-service/src/main/resources/static/images/favicons/favicon-16.png new file mode 100644 index 0000000000000000000000000000000000000000..2b73142eaf898ff019462b828ca90393090dd02a Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-16.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-180.png b/autograde-service/src/main/resources/static/images/favicons/favicon-180.png new file mode 100644 index 0000000000000000000000000000000000000000..301120d34d5d7936f33c3b9263728d3fc7e237e9 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-180.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-228.png b/autograde-service/src/main/resources/static/images/favicons/favicon-228.png new file mode 100644 index 0000000000000000000000000000000000000000..8cc8d19a64eab4ae8f59af6c560bb31cfd6dee07 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-228.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-32.png b/autograde-service/src/main/resources/static/images/favicons/favicon-32.png new file mode 100644 index 0000000000000000000000000000000000000000..1db16314e4565f8c80bd617146658d0224895064 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-32.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-57.png b/autograde-service/src/main/resources/static/images/favicons/favicon-57.png new file mode 100644 index 0000000000000000000000000000000000000000..7a6521242ca40b9b16227ae176e0eb5b8f8dd9d3 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-57.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-76.png b/autograde-service/src/main/resources/static/images/favicons/favicon-76.png new file mode 100644 index 0000000000000000000000000000000000000000..37a35c74a07f0a276820ead19640ddc6a8e10274 Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-76.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon-96.png b/autograde-service/src/main/resources/static/images/favicons/favicon-96.png new file mode 100644 index 0000000000000000000000000000000000000000..44e042030dd3693bf8686fd734f317b46b65abce Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon-96.png differ diff --git a/autograde-service/src/main/resources/static/images/favicons/favicon.ico b/autograde-service/src/main/resources/static/images/favicons/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d5f51c1f3bd1eac0a7d135342d27f3d1e73f027a Binary files /dev/null and b/autograde-service/src/main/resources/static/images/favicons/favicon.ico differ diff --git a/autograde-service/src/main/resources/templates/error/4xx.html b/autograde-service/src/main/resources/templates/error/4xx.html index 2fcb34ca62213577e9b72b7f12ed177638cce3b9..a232ac92a1247352d72b2054789d37fe70e58650 100644 --- 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"> diff --git a/autograde-service/src/main/resources/templates/error/5xx.html b/autograde-service/src/main/resources/templates/error/5xx.html index 96134cb4833311370f3e7a0f72f79ab72178a9ae..9b45e1abf627efe19388c5b4248e947f505a9d96 100644 --- 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">