Updating to latest jquery and bootstrap

surajcm · Aug 1, 2023 · 27cfd1e · 27cfd1e
1 parent 7febb1d
commit 27cfd1e
Show file tree

Hide file tree

Showing 32 changed files with 44 additions and 59 deletions.
diff --git a/gradle/staticCodeAnalysis.gradle b/gradle/staticCodeAnalysis.gradle
@@ -73,7 +73,7 @@ jacocoTestCoverageVerification {
     violationRules {
         rule {
             limit {
-                minimum = 0.31
+                minimum = 0.30
             }
         }
     }

diff --git a/src/main/resources/static/scripts/core/bootstrap-5.3.1/bootstrap.min.js b/src/main/resources/static/scripts/core/bootstrap-5.3.1/bootstrap.min.js
diff --git a/src/main/resources/static/scripts/core/bootstrap-5.3.1/bootstrap.min.js.map b/src/main/resources/static/scripts/core/bootstrap-5.3.1/bootstrap.min.js.map
diff --git a/src/main/resources/static/scripts/core/bootstrap-5.min.js b/src/main/resources/static/scripts/core/bootstrap-5.min.js
diff --git a/src/main/resources/static/scripts/core/bootstrap.min.js b/src/main/resources/static/scripts/core/bootstrap.min.js
diff --git a/src/main/resources/static/scripts/core/bootstrap.min.js.map b/src/main/resources/static/scripts/core/bootstrap.min.js.map
diff --git a/src/main/resources/static/scripts/core/jquery-3.2.1.slim.min.js b/src/main/resources/static/scripts/core/jquery-3.2.1.slim.min.js
diff --git a/src/main/resources/static/scripts/core/jquery-3.7.0.min.js b/src/main/resources/static/scripts/core/jquery-3.7.0.min.js
diff --git a/src/main/resources/static/styles/core/bootstrap-5.3.1/bootstrap.min.css b/src/main/resources/static/styles/core/bootstrap-5.3.1/bootstrap.min.css
diff --git a/src/main/resources/static/styles/core/bootstrap-5.3.1/bootstrap.min.css.map b/src/main/resources/static/styles/core/bootstrap-5.3.1/bootstrap.min.css.map
diff --git a/src/main/resources/static/styles/core/bootstrap-5.min.css b/src/main/resources/static/styles/core/bootstrap-5.min.css
diff --git a/src/main/resources/static/styles/core/bootstrap.4.5.0.min.css b/src/main/resources/static/styles/core/bootstrap.4.5.0.min.css
diff --git a/src/main/resources/static/styles/core/bootstrap.min.css.map b/src/main/resources/static/styles/core/bootstrap.min.css.map
diff --git a/src/main/resources/static/styles/darkhold-styles.css b/src/main/resources/static/styles/darkhold-styles.css
@@ -1,5 +1,5 @@
 @import url('core/audiowide.css');
-@import url('core/bootstrap-5.min.css');
+@import url('core/bootstrap-5.3.1/bootstrap.min.css');
 @import url('core/font-awesome-all.5.15.4.min.css');
 body {
     background-image: url("../images/funky-lines.png");

diff --git a/src/main/resources/templates/challenge/createchallenge.html b/src/main/resources/templates/challenge/createchallenge.html
@@ -75,6 +75,6 @@
         </main>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/challenge/preview.html b/src/main/resources/templates/challenge/preview.html
@@ -49,6 +49,6 @@ <h1 th:inline="text" class="text-green mb-4 text-center">[[${previewInfo.challen
     </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/challenge/publish.html b/src/main/resources/templates/challenge/publish.html
@@ -54,6 +54,6 @@ <h1 class="display-2 text-dark mb-2 mt-5" id="head_msg">There are no active chal
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/challenge/viewchallenges.html b/src/main/resources/templates/challenge/viewchallenges.html
@@ -78,8 +78,8 @@ <h4 class="modal-title w-100" id="confirmModalLabel">Are you sure?</h4>
             </div>
         </form>
     </section>
-    <script type="text/javascript" src="/scripts/core/jquery-3.2.1.slim.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/jquery-3.7.0.min.js"></script>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/finalscore.html b/src/main/resources/templates/finalscore.html
@@ -35,6 +35,6 @@
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/game.html b/src/main/resources/templates/game.html
@@ -85,9 +85,9 @@ <h4>[[${challenge.QuestionSet.answer4}]]</h4>
             </div>
         </div>
     </form>
-    <script type="text/javascript" src="/scripts/core/jquery-3.2.1.slim.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/jquery-3.7.0.min.js"></script>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
     <script type="text/javascript" src="/scripts/core/flipclock.js"></script>
     <script type="text/javascript" src="/scripts/game-scripts.js"></script>
     <script type="text/javascript" src="/scripts/core/sockjs.min.js"></script>

diff --git a/src/main/resources/templates/game/gameManagement.html b/src/main/resources/templates/game/gameManagement.html
@@ -25,8 +25,8 @@ <h1 style="font-weight:bold;font-size:34px;">Game Management</h1>
             </div>
         </div>
     </form>
-    <script type="text/javascript" src="/scripts/core/jquery-3.2.1.slim.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/jquery-3.7.0.min.js"></script>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/game/gamewait.html b/src/main/resources/templates/game/gamewait.html
@@ -46,8 +46,8 @@ <h1 class="display-2 text-dark mb-2 mt-5" id="head_msg">Your Quiz PIN is : <stro
             </div>
         </div>
     </form>
-    <script type="text/javascript" src="/scripts/core/jquery-3.2.1.slim.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/jquery-3.7.0.min.js"></script>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -38,6 +38,6 @@ <h1 class="display-2  text-dark mb-2 mt-5" id="head_msg"><strong>Enter Quiz PIN<
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/interstitial.html b/src/main/resources/templates/interstitial.html
@@ -33,6 +33,6 @@
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
@@ -58,6 +58,6 @@ <h1 class="mb-0 h3">Sign in</h1>
         </section>
     </main>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/myprofile.html b/src/main/resources/templates/myprofile.html
@@ -11,6 +11,6 @@
     <div th:insert="~{navbar :: navbar}"></div>
     <p th:text="'Hello, lets wait here for the my profile!'" />
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/navbar.html b/src/main/resources/templates/navbar.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div th:fragment="navbar" >
-    <nav class="navbar transparent navbar-inverse">
+    <nav class="navbar transparent navbar-inverse navbar-expand-lg">
         <div class="container-fluid" sec:authorize="isAuthenticated()">
             <div class="icon-bar" onclick="toHome();">
                 <a class="active" href="#"><i class="fas fa-home"></i></a>
@@ -22,7 +22,7 @@
         <div class="navbar-nav ms-auto mb-2 mb-lg-0" sec:authorize="isAnonymous()">
             <button class="btn btn-lg btn-rised align-middle btn-primary ml-auto mr-3 order-lg-last" type="button" onclick="logMeIn()" >LogIn / SignUp</button>
         </div>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown"
                 aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>

diff --git a/src/main/resources/templates/options/options.html b/src/main/resources/templates/options/options.html
@@ -52,6 +52,6 @@ <h3>Game Management</h3>
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/question.html b/src/main/resources/templates/question.html
@@ -24,6 +24,6 @@
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/registration.html b/src/main/resources/templates/registration.html
@@ -65,6 +65,6 @@ <h1 class="mb-0 h3">Registration</h1>
         </section>
     </main>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/scoreboard.html b/src/main/resources/templates/scoreboard.html
@@ -46,6 +46,6 @@
         </div>
     </form>
     <script type="text/javascript" src="/scripts/core/popper.min.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </body>
 </html>
diff --git a/src/main/resources/templates/user/usermanagement.html b/src/main/resources/templates/user/usermanagement.html
@@ -7,14 +7,16 @@
     <link href="/styles/error-styles.css" rel="stylesheet" />
     <script type="text/javascript" src="/scripts/common-scripts.js"></script>
     <script type="text/javascript" src="/scripts/user-management-scripts.js"></script>
-    <script type="text/javascript" src="/scripts/core/bootstrap-5.min.js"></script>
+    <script type="text/javascript" src="/scripts/core/bootstrap-5.3.1/bootstrap.min.js"></script>
 </head>
 <body>
     <div th:insert="~{navbar :: navbar}"></div>
     <div>
         <h2>Manage Users</h2>
     </div>
     <div>
+        <form action="#" method="post">
+        </form>
         <table class="table table-bordered table-striped table-hover table-responsive-xl">
             <thead class="thead-dark">
                 <tr>