Added favicon, fixed the sonar qube error, upgraded spring boot

surajcm · Feb 25, 2024 · 6315d9f · 6315d9f
1 parent 8613c05
commit 6315d9f
Show file tree

Hide file tree

Showing 27 changed files with 26 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 plugins {
 	id 'java'
 	id 'idea'
-	id 'org.springframework.boot' version '3.2.2'
+	id 'org.springframework.boot' version '3.2.3'
 	id 'io.spring.dependency-management' version '1.1.4'
 	id 'net.ltgt.errorprone' version '3.1.0'
 	id 'com.github.spotbugs' version '6.0.7' apply false
@@ -43,5 +43,4 @@ test {
 test.dependsOn checkstyleMain
 test.dependsOn checkstyleTest
 bootRun.dependsOn checkstyleMain
-
 check.dependsOn(cpdCheck, pmdMain)
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
-
 <!DOCTYPE suppressions PUBLIC
         "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
         "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-
 <!--
 NOTES:
 Refer to Checkstyle Filters page given below to learn more about suppression filter.
@@ -18,6 +16,5 @@ WHAT AND WHY CHECKS SUPPRESSED
 <suppressions>
     <suppress files="ChallengeService.java" checks="MethodLength"/>
     <suppress files="SecurityConfig.java" checks="MethodLength"/>
-    <suppress files="SecurityConfig.java" checks="IllegalCatch"/>
     <suppress files="RegistrationController.java" checks="MethodLength"/>
 </suppressions>
diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+systemProp.sonar.gradle.skipCompile=true
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'darkhold'
+rootProject.name = 'darkhold'
diff --git a/src/main/java/com/quiz/darkhold/init/SecurityConfig.java b/src/main/java/com/quiz/darkhold/init/SecurityConfig.java
@@ -45,12 +45,7 @@ public SecurityFilterChain filterChain(final HttpSecurity http,
         }
         http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated());
         http.formLogin((formLogin) -> {
-            try {
-                formLogin.defaultSuccessUrl("/", true).permitAll();
-            } catch (Exception ex) {
-                //todo : clean up
-                throw new RuntimeException(ex);
-            }
+            formLogin.defaultSuccessUrl("/", true).permitAll();
         });
         http.logout((logout) -> logout.logoutSuccessUrl("/")
                 .invalidateHttpSession(true)

diff --git a/src/main/java/com/quiz/darkhold/user/controller/RegistrationController.java b/src/main/java/com/quiz/darkhold/user/controller/RegistrationController.java
@@ -42,7 +42,6 @@ public String registration(final Model model,
                                @ModelAttribute("user") final User user,
                                final BindingResult bindingResult) {
         logger.info("Inside the registration post method");
-        //userValidator.validate(userForm, bindingResult);
         if (bindingResult.hasErrors()) {
             logger.info(String.valueOf(bindingResult.getAllErrors().get(0)));
             return "login";

diff --git a/src/main/java/com/quiz/darkhold/user/repository/UserRepository.java b/src/main/java/com/quiz/darkhold/user/repository/UserRepository.java
@@ -7,6 +7,8 @@
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
     User findByEmail(String email);
+
+    Long countById(Long id);
 }
 
 
diff --git a/src/main/resources/static/images/favicon.png b/src/main/resources/static/images/favicon.png
diff --git a/src/main/resources/templates/challenge/createchallenge.html b/src/main/resources/templates/challenge/createchallenge.html
@@ -6,6 +6,7 @@
     <meta name="_csrf" content="${_csrf.token}"/>
     <meta name="_csrf_header" content="${_csrf.headerName}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/create-challenge-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/create-challenge-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/challenge/preview.html b/src/main/resources/templates/challenge/preview.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/preview-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/preview-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/challenge/publish.html b/src/main/resources/templates/challenge/publish.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/publish-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/core/sockjs.min.js"></script>
     <script type="text/javascript" src="/scripts/core/stomp.min.js"></script>

diff --git a/src/main/resources/templates/challenge/viewchallenges.html b/src/main/resources/templates/challenge/viewchallenges.html
@@ -5,7 +5,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <script type="text/javascript" src="/scripts/view-challenges-scripts.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="stylesheet" href="styles/challenge-styles.css" />
+    <link rel="shortcut icon" href="/images/favicon.png">
+    <link rel="stylesheet" href="/styles/challenge-styles.css" />
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" >
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
@@ -10,6 +10,7 @@
     <title>Error occurred: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/error-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
     <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>

diff --git a/src/main/resources/templates/finalscore.html b/src/main/resources/templates/finalscore.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/darkhold-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/game.html b/src/main/resources/templates/game.html
@@ -4,6 +4,7 @@
     <title>Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link rel="stylesheet" href="/styles/game-styles.css"  />
     <link rel="stylesheet" href="/styles/core/flipclock.css" />
     <link rel="stylesheet" href="/styles/game-flipclock-custom.css" />

diff --git a/src/main/resources/templates/game/gameManagement.html b/src/main/resources/templates/game/gameManagement.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/error-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/game/gamewait.html b/src/main/resources/templates/game/gamewait.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/join-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/core/sockjs.min.js"></script>
     <script type="text/javascript" src="/scripts/core/stomp.min.js"></script>

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -5,6 +5,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/homepage.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/home-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/interstitial.html b/src/main/resources/templates/interstitial.html
@@ -5,6 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="/styles/interstitial-styles.css" rel="stylesheet" />
+    <link rel="shortcut icon" href="/images/favicon.png">
     <script type="text/javascript">
         function loading() {
             setTimeout(function(){ askQuestion(); }, 5000);

diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -5,6 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="/styles/login.css" rel="stylesheet" />
+    <link rel="shortcut icon" href="/images/favicon.png">
 </head>
 <body>
     <main>

diff --git a/src/main/resources/templates/myprofile.html b/src/main/resources/templates/myprofile.html
@@ -5,6 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <link href="/styles/error-styles.css" rel="stylesheet" />
+    <link rel="shortcut icon" href="/images/favicon.png">
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
 </head>
 <body>

diff --git a/src/main/resources/templates/options/options.html b/src/main/resources/templates/options/options.html
@@ -4,6 +4,7 @@
     <title>Home: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link rel="stylesheet" href="/styles/option-styles.css"  />
     <script type="text/javascript" src="/scripts/options-scripts.js"></script>
 </head>

diff --git a/src/main/resources/templates/question.html b/src/main/resources/templates/question.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/question-styles.css" rel="stylesheet" />
     <link href="/styles/animate.min.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/core/sockjs.min.js"></script>

diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html
@@ -10,6 +10,7 @@
     <title>Registration: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/login.css" rel="stylesheet" />
 </head>
 <body>

diff --git a/src/main/resources/templates/scoreboard.html b/src/main/resources/templates/scoreboard.html
@@ -4,6 +4,7 @@
     <title>Getting Started: Darkhold classroom quiz experience</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/homepage.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/core/sockjs.min.js"></script>
     <script type="text/javascript" src="/scripts/core/stomp.min.js"></script>

diff --git a/src/main/resources/templates/user/user_form.html b/src/main/resources/templates/user/user_form.html
@@ -8,6 +8,7 @@
         <meta name="description" content="darkhold create user page" />
         <meta name="author" content="Suraj" />
         <title>Getting Started: Darkhold classroom quiz experience</title>
+        <link rel="shortcut icon" href="/images/favicon.png">
         <link href="/styles/error-styles.css" rel="stylesheet" />
         <link href="/styles/core/fontawesome-6.2.1/css/all.min.css" rel="stylesheet">
         <script type="text/javascript" src="/scripts/common-scripts.js"></script>

diff --git a/src/main/resources/templates/user/usermanagement.html b/src/main/resources/templates/user/usermanagement.html
@@ -4,6 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Getting Started: Darkhold classroom quiz experience</title>
+    <link rel="shortcut icon" href="/images/favicon.png">
     <link href="/styles/error-styles.css" rel="stylesheet" />
     <link href="/styles/core/fontawesome-6.2.1/css/all.min.css" rel="stylesheet">
     <link href="/styles/icon-styles.css" rel="stylesheet">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rootProject.name = 'darkhold'
		rootProject.name = 'darkhold'