version updates

strmark · Oct 25, 2023 · cdf31b1 · cdf31b1
1 parent 8c4790f
commit cdf31b1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/back/pom.xml b/back/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5</version>
         <relativePath/>
     </parent>
     <groupId>nl.oradev</groupId>
@@ -14,7 +14,7 @@
 
     <properties>
         <java.version>17</java.version>
-        <spring.version>3.1.4</spring.version>
+        <spring.version>3.1.5</spring.version>
         <h2.version>2.2.224</h2.version>
         <snake.version>2.2</snake.version>
         <swagger.version>2.2.0</swagger.version>

diff --git a/front/angular.json b/front/angular.json
@@ -25,7 +25,9 @@
             "styles": [
               "src/styles.css",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/font-awesome/css/font-awesome.css"
+              "node_modules/@fortawesome/fontawesome-free/css/fontawesome.css",
+              "node_modules/@fortawesome/fontawesome-free/css/solid.css",
+              "node_modules/@fortawesome/fontawesome-free/css/brands.css"
             ],
             "scripts": [],
             "aot": false,

diff --git a/front/package.json b/front/package.json
@@ -10,30 +10,31 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/schematics": "^16.2.3",
-    "@angular/animations": "^16.2.6",
-    "@angular/common": "^16.2.6",
-    "@angular/compiler": "^16.2.6",
-    "@angular/core": "^16.2.6",
-    "@angular/forms": "^16.2.6",
-    "@angular/localize": "^16.2.6",
-    "@angular/platform-browser": "^16.2.6",
-    "@angular/platform-browser-dynamic": "^16.2.6",
-    "@angular/router": "^16.2.6",
-    "@ng-bootstrap/ng-bootstrap": "^15.1.1",
+    "@angular-devkit/schematics": "^16.2.8",
+    "@angular/animations": "^16.2.10",
+    "@angular/common": "^16.2.10",
+    "@angular/compiler": "^16.2.10",
+    "@angular/core": "^16.2.10",
+    "@angular/forms": "^16.2.10",
+    "@angular/localize": "^16.2.10",
+    "@angular/platform-browser": "^16.2.10",
+    "@angular/platform-browser-dynamic": "^16.2.10",
+    "@angular/router": "^16.2.10",
+    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@ng-bootstrap/ng-bootstrap": "^15.1.2",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.2",
-    "core-js": "^3.32.2",
+    "core-js": "^3.33.1",
     "ng2-file-upload": "^5.0.0",
     "rxjs": "~7.8.1",
     "tslib": "^2.6.2",
     "zone.js": "~0.13.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.2.3",
-    "@angular/cli": "~16.2.3",
-    "@angular/compiler-cli": "^16.2.6",
-    "@types/jasmine": "~4.3.6",
+    "@angular-devkit/build-angular": "^16.2.8",
+    "@angular/cli": "~16.2.8",
+    "@angular/compiler-cli": "^16.2.10",
+    "@types/jasmine": "~5.1.1",
     "jasmine-core": "~5.1.1",
     "karma": "^6.4.2",
     "karma-chrome-launcher": "~3.2.0",

diff --git a/front/src/app/app.component.html b/front/src/app/app.component.html
@@ -6,22 +6,26 @@ <h1>
 </div>
 <nav class="navbar navbar-expand-md navbar-light">
   <a class="navbar-brand" routerLink="homepage">Piclodio</a>
-  <button class="navbar-toggler" type="button" (click)="isNavbarCollapsed = !isNavbarCollapsed" >
+  <button class="navbar-toggler" type="button" (click)="isNavbarCollapsed = !isNavbarCollapsed">
     <span class="navbar-toggler-icon"></span>
   </button>
   <div [ngbCollapse]="!isNavbarCollapsed" class="collapse navbar-collapse" id="collapsibleNavbar">
     <ul class="navbar-nav">
       <li class="nav-item">
-        <a class="nav-link fa fa-home" routerLink="/homepage" routerLinkActive="active"> Homepage</a>
+        <i class="fa-solid fa-home"></i>
+        <a class="nav-link fa-solid" routerLink="/homepage" routerLinkActive="active"> Homepage</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link fa fa-music" routerLink="/webradio" routerLinkActive="active"> Internet Radio</a>
+        <i class="fa-solid fa-music"></i>
+        <a class="nav-link fa-solid" routerLink="/webradio" routerLinkActive="active"> Internet Radio</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link fa fa-bell" routerLink="/alarm" routerLinkActive="active"> Alarm</a>
+        <i class="fa-solid fa-bell"></i>
+        <a class="nav-link fa-solid" routerLink="/alarm" routerLinkActive="active"> Alarm</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link fa fa-cog" routerLink="/option" routerLinkActive="active"> Option</a>
+        <i class="fa-solid fa-cog"></i>
+        <a class="nav-link fa-solid" routerLink="/option" routerLinkActive="active"> Option</a>
       </li>
     </ul>
   </div>