bump angulara

dodanie isPublic w grupach i logika na froncie do tego

Dockerfile

@@ -2,4 +2,4 @@ FROM arm64v8/amazoncorretto:21-alpine-jdk
 MAINTAINER [email protected]
 VOLUME /tmp
 COPY target/komornik-0.0.1-SNAPSHOT.jar app.jar
-ENTRYPOINT ["java","-jar","/app.jar"]
+ENTRYPOINT ["java","-jar","/app.jar"]

src/main/frontend/package.json

@@ -10,17 +10,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^18.0.4",
-    "@angular/cdk": "^18.0.4",
-    "@angular/common": "^18.0.4",
-    "@angular/compiler": "^18.0.4",
-    "@angular/core": "^18.0.4",
-    "@angular/forms": "^18.0.4",
-    "@angular/material": "^18.0.4",
-    "@angular/platform-browser": "^18.0.4",
-    "@angular/platform-browser-dynamic": "^18.0.4",
-    "@angular/router": "^18.0.4",
-    "@angular/service-worker": "^18.0.4",
+    "@angular/animations": "^18.0.6",
+    "@angular/cdk": "^18.0.6",
+    "@angular/common": "^18.0.6",
+    "@angular/compiler": "^18.0.6",
+    "@angular/core": "^18.0.6",
+    "@angular/forms": "^18.0.6",
+    "@angular/material": "^18.0.6",
+    "@angular/platform-browser": "^18.0.6",
+    "@angular/platform-browser-dynamic": "^18.0.6",
+    "@angular/router": "^18.0.6",
+    "@angular/service-worker": "^18.0.6",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@material/density": "^15.0.0-canary.a246a4439.0",
     "bootstrap": "^5.0.2",
@@ -30,9 +30,9 @@
     "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.0.5",
-    "@angular/cli": "~18.0.5",
-    "@angular/compiler-cli": "^18.0.4",
+    "@angular-devkit/build-angular": "^18.0.7",
+    "@angular/cli": "~18.0.7",
+    "@angular/compiler-cli": "^18.0.6",
     "@types/jasmine": "~4.3.0",
     "jasmine-core": "~4.5.0",
     "karma": "~6.4.0",

src/main/frontend/src/app/component/group/add-group/add-group.component.html

@@ -25,6 +25,7 @@
                   }
                 </mat-select>
               </mat-form-field>
+              <mat-checkbox formControlName="isPublic">podsumowanie publiczne</mat-checkbox>
               <button (click)="onAddUser()" class="float-end" mat-raised-button style="width: 150px" type="button">Add
                 user
               </button>

src/main/frontend/src/app/component/group/add-group/add-group.component.ts

@@ -23,13 +23,14 @@ import {MatIcon} from '@angular/material/icon';
 import {MatFormField, MatLabel, MatPrefix} from '@angular/material/form-field';
 import {AsyncPipe, NgFor, NgIf} from '@angular/common';
 import {DataSharingService} from "../../../service/data-sharing.service";
+import {MatCheckbox} from "@angular/material/checkbox";
 
 @Component({
   selector: 'add-group',
   templateUrl: './add-group.component.html',
   styleUrls: ['./add-group.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, MatFormField, MatIcon, MatPrefix, MatLabel, MatInput, MatSelect, NgFor, MatOption, MatButton, MatAutocompleteTrigger, MatAutocomplete, RouterLink, AsyncPipe]
+  imports: [NgIf, FormsModule, ReactiveFormsModule, MatFormField, MatIcon, MatPrefix, MatLabel, MatInput, MatSelect, NgFor, MatOption, MatButton, MatAutocompleteTrigger, MatAutocomplete, RouterLink, AsyncPipe, MatCheckbox]
 })
 export class AddGroupComponent implements OnInit {
   @Input() groupId: number;
@@ -74,6 +75,7 @@ export class AddGroupComponent implements OnInit {
   onSubmit() {
     const data = this.groupForm.value;
     let newGroup: Group = {
+      isPublic: data.isPublic,
       description: data.description,
       users: data.users,
       groupName: data.groupName,
@@ -155,14 +157,16 @@ export class AddGroupComponent implements OnInit {
       groupName: new FormControl(null, Validators.required),
       defaultCurrency: new FormControl(null),
       groupIconName: new FormControl(null),
-      users: groupUsers
+      users: groupUsers,
+      isPublic: new FormControl(false)
     });
     if (this.editMode) {
       this.groupService.findById(this.groupId).subscribe({
         next: (group) => {
           this.isUserInGroup = group.users.map(user => user.id).includes(this.currentUser.id);
           this.groupForm.get('groupName')?.patchValue(group.groupName);
           this.groupForm.get('defaultCurrency')?.patchValue(group.defaultCurrency);
+          this.groupForm.get('isPublic')?.patchValue(group.isPublic);
           if (group.users) {
             for (let user of group.users) {
               groupUsers.push(

src/main/frontend/src/app/component/group/group-summary/group-summary.component.html

@@ -1,6 +1,9 @@
 <h1>{{ (group$ | async)?.groupName }}</h1>
+
 <div class="button-container">
-  <button (click)="editExpense()" color="primary" mat-raised-button>Dodaj nowy wydatek</button>
+  @if (!(group$ | async)?.isPublic) {
+    <button (click)="editExpense()" color="primary" mat-raised-button>Dodaj nowy wydatek</button>
+  }
   <button (click)="settle()" color="primary" mat-raised-button>Rozlicz wydatki</button>
 </div>
 @for (expense of expenses | keyvalue: reverseKeyOrder; track expense.key) {

src/main/frontend/src/app/component/group/group-summary/group-summary.component.ts

@@ -23,7 +23,7 @@ import {MatIcon} from "@angular/material/icon";
 })
 export class GroupSummaryComponent implements OnInit {
   expenses: Map<string, Expense[]> = new Map<string, Expense[]>();
-
+  isPublic: boolean;
   groupId: number;
   group$: Observable<Group>;
 

src/main/frontend/src/app/model/group.ts

@@ -6,5 +6,6 @@ export interface Group {
   description: string,
   defaultCurrency?: string,
   groupIconName?: string,
-  users: User[]
+  users: User[],
+  isPublic: boolean
 }

src/main/java/pl/janis/komornik/dto/GroupDto.java

@@ -13,5 +13,6 @@ public record GroupDto(Integer id,
                        String description,
                        String defaultCurrency,
                        String groupIconName,
+                       boolean isPublic,
                        List<UserDto> users) implements Serializable {
 }

src/main/java/pl/janis/komornik/entities/Group.java

@@ -32,6 +32,9 @@ public class Group extends BaseEntity {
     @Column(name = "group_icon_name")
     private String groupIconName;
 
+    @Column(name = "is_public")
+    private boolean isPublic;
+
     @OneToMany(mappedBy = "group")
     @JsonManagedReference
     @ToString.Exclude