From 591204484366898a41d4f530838056f358a5a560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 8 Nov 2024 14:16:11 +0100 Subject: [PATCH] angular directory cleanup --- src/main/angular/src/app/api/group/Group.ts | 4 ++-- src/main/angular/src/app/api/group/group.service.ts | 4 ++-- .../src/app/api/group/requests/GroupUserRequest.ts | 2 +- .../api/{Notification => notification}/Notification.ts | 0 .../notification.service.ts | 0 .../src/app/api/tools/{Numbers => numbers}/Numbers.ts | 4 ++-- .../src/app/api/tools/{Numbers => numbers}/NumbersLot.ts | 4 ++-- .../app/api/tools/{Numbers => numbers}/numbers.service.ts | 2 +- src/main/angular/src/app/api/{User => user}/UserCommon.ts | 0 .../angular/src/app/api/{User => user}/UserPrivate.ts | 0 src/main/angular/src/app/api/{User => user}/UserPublic.ts | 0 .../src/app/api/{User => user}/events/UserLogoutEvent.ts | 0 .../app/api/{User => user}/requests/UserLoginRequest.ts | 0 .../angular/src/app/api/{User => user}/user.service.ts | 2 +- src/main/angular/src/app/app.component.ts | 4 ++-- src/main/angular/src/app/app.routes.ts | 2 +- src/main/angular/src/app/pages/admin/admin.component.ts | 4 ++-- .../angular/src/app/pages/group/group/group.component.ts | 8 ++++---- .../src/app/pages/group/groups/groups.component.ts | 2 +- .../pages/group/shared/group-list/group-list.component.ts | 2 +- src/main/angular/src/app/pages/login/login.component.ts | 4 ++-- .../email-confirmation/email-confirmation.component.html | 0 .../email-confirmation/email-confirmation.component.less | 0 .../email-confirmation/email-confirmation.component.ts | 4 ++-- .../angular/src/app/pages/profile/profile.component.ts | 2 +- .../src/app/pages/tools/numbers/numbers.component.ts | 6 +++--- src/main/angular/src/app/pages/user/user.component.ts | 4 ++-- 27 files changed, 32 insertions(+), 32 deletions(-) rename src/main/angular/src/app/api/{Notification => notification}/Notification.ts (100%) rename src/main/angular/src/app/api/{Notification => notification}/notification.service.ts (100%) rename src/main/angular/src/app/api/tools/{Numbers => numbers}/Numbers.ts (93%) rename src/main/angular/src/app/api/tools/{Numbers => numbers}/NumbersLot.ts (83%) rename src/main/angular/src/app/api/tools/{Numbers => numbers}/numbers.service.ts (96%) rename src/main/angular/src/app/api/{User => user}/UserCommon.ts (100%) rename src/main/angular/src/app/api/{User => user}/UserPrivate.ts (100%) rename src/main/angular/src/app/api/{User => user}/UserPublic.ts (100%) rename src/main/angular/src/app/api/{User => user}/events/UserLogoutEvent.ts (100%) rename src/main/angular/src/app/api/{User => user}/requests/UserLoginRequest.ts (100%) rename src/main/angular/src/app/api/{User => user}/user.service.ts (98%) rename src/main/angular/src/app/pages/{ => profile}/email-confirmation/email-confirmation.component.html (100%) rename src/main/angular/src/app/pages/{ => profile}/email-confirmation/email-confirmation.component.less (100%) rename src/main/angular/src/app/pages/{ => profile}/email-confirmation/email-confirmation.component.ts (90%) diff --git a/src/main/angular/src/app/api/group/Group.ts b/src/main/angular/src/app/api/group/Group.ts index 9447004..a9ab689 100644 --- a/src/main/angular/src/app/api/group/Group.ts +++ b/src/main/angular/src/app/api/group/Group.ts @@ -1,6 +1,6 @@ -import {UserPublic} from "../User/UserPublic"; +import {UserPublic} from "../user/UserPublic"; import {validateDate, validateList, validateString} from "../common/validators"; -import {UserPrivate} from "../User/UserPrivate"; +import {UserPrivate} from "../user/UserPrivate"; import {GroupUuid} from "./GroupUuid"; export class Group extends GroupUuid { diff --git a/src/main/angular/src/app/api/group/group.service.ts b/src/main/angular/src/app/api/group/group.service.ts index ea1a9c7..1e9b28b 100644 --- a/src/main/angular/src/app/api/group/group.service.ts +++ b/src/main/angular/src/app/api/group/group.service.ts @@ -2,10 +2,10 @@ import {ApiService} from "../common/api.service"; import {Next} from "../common/types"; import {Group} from "./Group"; import {Router} from "@angular/router"; -import {UserService} from "../User/user.service"; +import {UserService} from "../user/user.service"; import {validateBoolean} from "../common/validators"; import {Injectable} from "@angular/core"; -import {UserPublic} from "../User/UserPublic"; +import {UserPublic} from "../user/UserPublic"; import {GroupUserRequest} from "./requests/GroupUserRequest"; import {GroupChangeTitleRequest} from "./requests/GroupChangeTitleRequest"; import {GroupChangePasswordRequest} from "./requests/GroupChangePasswordRequest"; diff --git a/src/main/angular/src/app/api/group/requests/GroupUserRequest.ts b/src/main/angular/src/app/api/group/requests/GroupUserRequest.ts index f4c536b..69bcbf5 100644 --- a/src/main/angular/src/app/api/group/requests/GroupUserRequest.ts +++ b/src/main/angular/src/app/api/group/requests/GroupUserRequest.ts @@ -1,5 +1,5 @@ import {Group} from "../Group"; -import {UserPublic} from "../../User/UserPublic"; +import {UserPublic} from "../../user/UserPublic"; export class GroupUserRequest { diff --git a/src/main/angular/src/app/api/Notification/Notification.ts b/src/main/angular/src/app/api/notification/Notification.ts similarity index 100% rename from src/main/angular/src/app/api/Notification/Notification.ts rename to src/main/angular/src/app/api/notification/Notification.ts diff --git a/src/main/angular/src/app/api/Notification/notification.service.ts b/src/main/angular/src/app/api/notification/notification.service.ts similarity index 100% rename from src/main/angular/src/app/api/Notification/notification.service.ts rename to src/main/angular/src/app/api/notification/notification.service.ts diff --git a/src/main/angular/src/app/api/tools/Numbers/Numbers.ts b/src/main/angular/src/app/api/tools/numbers/Numbers.ts similarity index 93% rename from src/main/angular/src/app/api/tools/Numbers/Numbers.ts rename to src/main/angular/src/app/api/tools/numbers/Numbers.ts index ce409f0..d317663 100644 --- a/src/main/angular/src/app/api/tools/Numbers/Numbers.ts +++ b/src/main/angular/src/app/api/tools/numbers/Numbers.ts @@ -1,8 +1,8 @@ import {Group} from "../../group/Group"; import {validateDate, validateList, validateString} from "../../common/validators"; import {NumbersLot} from "./NumbersLot"; -import {UserPrivate} from "../../User/UserPrivate"; -import {UserPublic} from "../../User/UserPublic"; +import {UserPrivate} from "../../user/UserPrivate"; +import {UserPublic} from "../../user/UserPublic"; export class Numbers { diff --git a/src/main/angular/src/app/api/tools/Numbers/NumbersLot.ts b/src/main/angular/src/app/api/tools/numbers/NumbersLot.ts similarity index 83% rename from src/main/angular/src/app/api/tools/Numbers/NumbersLot.ts rename to src/main/angular/src/app/api/tools/numbers/NumbersLot.ts index 953490b..a1aefee 100644 --- a/src/main/angular/src/app/api/tools/Numbers/NumbersLot.ts +++ b/src/main/angular/src/app/api/tools/numbers/NumbersLot.ts @@ -1,6 +1,6 @@ -import {UserPublic} from "../../User/UserPublic"; +import {UserPublic} from "../../user/UserPublic"; import {validateBoolean, validateNumberOrNull} from "../../common/validators"; -import {UserPrivate} from "../../User/UserPrivate"; +import {UserPrivate} from "../../user/UserPrivate"; export class NumbersLot { diff --git a/src/main/angular/src/app/api/tools/Numbers/numbers.service.ts b/src/main/angular/src/app/api/tools/numbers/numbers.service.ts similarity index 96% rename from src/main/angular/src/app/api/tools/Numbers/numbers.service.ts rename to src/main/angular/src/app/api/tools/numbers/numbers.service.ts index 02d8964..0e0bda1 100644 --- a/src/main/angular/src/app/api/tools/Numbers/numbers.service.ts +++ b/src/main/angular/src/app/api/tools/numbers/numbers.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {ApiService} from "../../common/api.service"; import {Router} from "@angular/router"; -import {UserService} from "../../User/user.service"; +import {UserService} from "../../user/user.service"; import {Next} from "../../common/types"; import {Numbers} from "./Numbers"; import {validateBoolean, validateString} from "../../common/validators"; diff --git a/src/main/angular/src/app/api/User/UserCommon.ts b/src/main/angular/src/app/api/user/UserCommon.ts similarity index 100% rename from src/main/angular/src/app/api/User/UserCommon.ts rename to src/main/angular/src/app/api/user/UserCommon.ts diff --git a/src/main/angular/src/app/api/User/UserPrivate.ts b/src/main/angular/src/app/api/user/UserPrivate.ts similarity index 100% rename from src/main/angular/src/app/api/User/UserPrivate.ts rename to src/main/angular/src/app/api/user/UserPrivate.ts diff --git a/src/main/angular/src/app/api/User/UserPublic.ts b/src/main/angular/src/app/api/user/UserPublic.ts similarity index 100% rename from src/main/angular/src/app/api/User/UserPublic.ts rename to src/main/angular/src/app/api/user/UserPublic.ts diff --git a/src/main/angular/src/app/api/User/events/UserLogoutEvent.ts b/src/main/angular/src/app/api/user/events/UserLogoutEvent.ts similarity index 100% rename from src/main/angular/src/app/api/User/events/UserLogoutEvent.ts rename to src/main/angular/src/app/api/user/events/UserLogoutEvent.ts diff --git a/src/main/angular/src/app/api/User/requests/UserLoginRequest.ts b/src/main/angular/src/app/api/user/requests/UserLoginRequest.ts similarity index 100% rename from src/main/angular/src/app/api/User/requests/UserLoginRequest.ts rename to src/main/angular/src/app/api/user/requests/UserLoginRequest.ts diff --git a/src/main/angular/src/app/api/User/user.service.ts b/src/main/angular/src/app/api/user/user.service.ts similarity index 98% rename from src/main/angular/src/app/api/User/user.service.ts rename to src/main/angular/src/app/api/user/user.service.ts index 5b1087b..a57fdb2 100644 --- a/src/main/angular/src/app/api/User/user.service.ts +++ b/src/main/angular/src/app/api/user/user.service.ts @@ -7,7 +7,7 @@ import {Router} from "@angular/router"; import {filter, map, Subject, Subscription} from "rxjs"; import {Group} from "../group/Group"; import {StompService} from "@stomp/ng2-stompjs"; -import {Numbers} from "../tools/Numbers/Numbers"; +import {Numbers} from "../tools/numbers/Numbers"; import {GroupDeletedEvent} from "../group/events/GroupDeletedEvent"; import {GroupLeftEvent} from "../group/events/GroupLeftEvent"; import {UserLogoutEvent} from "./events/UserLogoutEvent"; diff --git a/src/main/angular/src/app/app.component.ts b/src/main/angular/src/app/app.component.ts index 6564760..a489ffe 100644 --- a/src/main/angular/src/app/app.component.ts +++ b/src/main/angular/src/app/app.component.ts @@ -1,9 +1,9 @@ import {AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {Router, RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router'; import {JsonPipe, NgForOf, NgIf, NgTemplateOutlet} from "@angular/common"; -import {UserService} from "./api/User/user.service"; +import {UserService} from "./api/user/user.service"; import {Subscription, timer} from "rxjs"; -import {NotificationService} from "./api/Notification/notification.service"; +import {NotificationService} from "./api/notification/notification.service"; @Component({ selector: 'app-root', diff --git a/src/main/angular/src/app/app.routes.ts b/src/main/angular/src/app/app.routes.ts index e35d65a..070e679 100644 --- a/src/main/angular/src/app/app.routes.ts +++ b/src/main/angular/src/app/app.routes.ts @@ -7,7 +7,7 @@ import {UserComponent} from "./pages/user/user.component"; import {GroupsComponent} from "./pages/group/groups/groups.component"; import {GroupComponent} from "./pages/group/group/group.component"; import {NumbersComponent} from "./pages/tools/numbers/numbers.component"; -import {EmailConfirmationComponent} from "./pages/email-confirmation/email-confirmation.component"; +import {EmailConfirmationComponent} from "./pages/profile/email-confirmation/email-confirmation.component"; import {LoginComponent} from "./pages/login/login.component"; import {AdminComponent} from "./pages/admin/admin.component"; diff --git a/src/main/angular/src/app/pages/admin/admin.component.ts b/src/main/angular/src/app/pages/admin/admin.component.ts index dcdca7e..415582f 100644 --- a/src/main/angular/src/app/pages/admin/admin.component.ts +++ b/src/main/angular/src/app/pages/admin/admin.component.ts @@ -2,8 +2,8 @@ import {Component, OnInit} from '@angular/core'; import {NgForOf} from "@angular/common"; import {Page} from "../../api/common/Page"; import {PaginationComponent} from "../../shared/pagination/pagination.component"; -import {UserService} from "../../api/User/user.service"; -import {UserPrivate} from "../../api/User/UserPrivate"; +import {UserService} from "../../api/user/user.service"; +import {UserPrivate} from "../../api/user/UserPrivate"; import {RelativePipe} from "../../shared/relative.pipe"; @Component({ diff --git a/src/main/angular/src/app/pages/group/group/group.component.ts b/src/main/angular/src/app/pages/group/group/group.component.ts index ec6368a..194c568 100644 --- a/src/main/angular/src/app/pages/group/group/group.component.ts +++ b/src/main/angular/src/app/pages/group/group/group.component.ts @@ -4,17 +4,17 @@ import {FormsModule, ReactiveFormsModule} from "@angular/forms"; import {TextComponent} from "../../../shared/text/text.component"; import {ActivatedRoute, Router} from "@angular/router"; import {GroupService} from "../../../api/group/group.service"; -import {UserService} from "../../../api/User/user.service"; +import {UserService} from "../../../api/user/user.service"; import {Group} from "../../../api/group/Group"; -import {NumbersService} from "../../../api/tools/Numbers/numbers.service"; +import {NumbersService} from "../../../api/tools/numbers/numbers.service"; import {PasswordTileComponent} from "../../../shared/password-tile/password-tile.component"; -import {Numbers} from "../../../api/tools/Numbers/Numbers"; +import {Numbers} from "../../../api/tools/numbers/Numbers"; import {Page} from "../../../api/common/Page"; import {RelativePipe} from "../../../shared/relative.pipe"; import {Subscription, timer} from "rxjs"; import {GroupDeletedEvent} from "../../../api/group/events/GroupDeletedEvent"; import {GroupLeftEvent} from "../../../api/group/events/GroupLeftEvent"; -import {UserPublic} from "../../../api/User/UserPublic"; +import {UserPublic} from "../../../api/user/UserPublic"; @Component({ selector: 'app-group', diff --git a/src/main/angular/src/app/pages/group/groups/groups.component.ts b/src/main/angular/src/app/pages/group/groups/groups.component.ts index 58c6024..6576d77 100644 --- a/src/main/angular/src/app/pages/group/groups/groups.component.ts +++ b/src/main/angular/src/app/pages/group/groups/groups.component.ts @@ -1,6 +1,6 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {GroupListComponent} from "../shared/group-list/group-list.component"; -import {UserService} from "../../../api/User/user.service"; +import {UserService} from "../../../api/user/user.service"; import {NgIf} from "@angular/common"; import {GroupService} from "../../../api/group/group.service"; import {Group} from "../../../api/group/Group"; diff --git a/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.ts b/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.ts index f3269ec..f8048ff 100644 --- a/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.ts +++ b/src/main/angular/src/app/pages/group/shared/group-list/group-list.component.ts @@ -1,5 +1,5 @@ import {Component, Input} from '@angular/core'; -import {UserService} from "../../../../api/User/user.service"; +import {UserService} from "../../../../api/user/user.service"; import {Group} from "../../../../api/group/Group"; import {DatePipe, NgForOf} from "@angular/common"; import {GroupService} from "../../../../api/group/group.service"; diff --git a/src/main/angular/src/app/pages/login/login.component.ts b/src/main/angular/src/app/pages/login/login.component.ts index 36f70cf..767355b 100644 --- a/src/main/angular/src/app/pages/login/login.component.ts +++ b/src/main/angular/src/app/pages/login/login.component.ts @@ -1,7 +1,7 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; -import {UserService} from "../../api/User/user.service"; +import {UserService} from "../../api/user/user.service"; import {Subscription} from "rxjs"; -import {UserPrivate} from "../../api/User/UserPrivate"; +import {UserPrivate} from "../../api/user/UserPrivate"; import {FormsModule} from "@angular/forms"; @Component({ diff --git a/src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.html b/src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.html similarity index 100% rename from src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.html rename to src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.html diff --git a/src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.less b/src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.less similarity index 100% rename from src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.less rename to src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.less diff --git a/src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.ts b/src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.ts similarity index 90% rename from src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.ts rename to src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.ts index f46e595..5ac8e64 100644 --- a/src/main/angular/src/app/pages/email-confirmation/email-confirmation.component.ts +++ b/src/main/angular/src/app/pages/profile/email-confirmation/email-confirmation.component.ts @@ -1,8 +1,8 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {Subscription} from "rxjs"; import {ActivatedRoute, Router} from "@angular/router"; -import {GroupService} from "../../api/group/group.service"; -import {UserService} from "../../api/User/user.service"; +import {GroupService} from "../../../api/group/group.service"; +import {UserService} from "../../../api/user/user.service"; import {NgIf} from "@angular/common"; @Component({ diff --git a/src/main/angular/src/app/pages/profile/profile.component.ts b/src/main/angular/src/app/pages/profile/profile.component.ts index 887f989..007e9fb 100644 --- a/src/main/angular/src/app/pages/profile/profile.component.ts +++ b/src/main/angular/src/app/pages/profile/profile.component.ts @@ -1,6 +1,6 @@ import {Component, ElementRef, ViewChild} from '@angular/core'; import {NgForOf, NgIf} from "@angular/common"; -import {UserService} from "../../api/User/user.service"; +import {UserService} from "../../api/user/user.service"; import {FormsModule} from "@angular/forms"; import {TextComponent} from "../../shared/text/text.component"; import {GroupListComponent} from "../group/shared/group-list/group-list.component"; diff --git a/src/main/angular/src/app/pages/tools/numbers/numbers.component.ts b/src/main/angular/src/app/pages/tools/numbers/numbers.component.ts index 21200b6..d398b3a 100644 --- a/src/main/angular/src/app/pages/tools/numbers/numbers.component.ts +++ b/src/main/angular/src/app/pages/tools/numbers/numbers.component.ts @@ -1,12 +1,12 @@ import {Component, HostListener, OnDestroy, OnInit} from '@angular/core'; -import {Numbers} from "../../../api/tools/Numbers/Numbers"; +import {Numbers} from "../../../api/tools/numbers/Numbers"; import {ActivatedRoute} from "@angular/router"; -import {NumbersService} from "../../../api/tools/Numbers/numbers.service"; +import {NumbersService} from "../../../api/tools/numbers/numbers.service"; import {NgForOf, NgIf} from "@angular/common"; import {FormsModule} from "@angular/forms"; import {PasswordTileComponent} from "../../../shared/password-tile/password-tile.component"; import {GroupService} from "../../../api/group/group.service"; -import {UserService} from "../../../api/User/user.service"; +import {UserService} from "../../../api/user/user.service"; import {RelativePipe} from "../../../shared/relative.pipe"; import {Subscription, timer} from "rxjs"; import {Group} from "../../../api/group/Group"; diff --git a/src/main/angular/src/app/pages/user/user.component.ts b/src/main/angular/src/app/pages/user/user.component.ts index 2da3184..93be116 100644 --- a/src/main/angular/src/app/pages/user/user.component.ts +++ b/src/main/angular/src/app/pages/user/user.component.ts @@ -3,9 +3,9 @@ import {NgForOf, NgIf} from "@angular/common"; import {ActivatedRoute} from "@angular/router"; import {GroupListComponent} from "../group/shared/group-list/group-list.component"; import {GroupService} from "../../api/group/group.service"; -import {UserService} from "../../api/User/user.service"; +import {UserService} from "../../api/user/user.service"; import {Group} from "../../api/group/Group"; -import {UserPublic} from "../../api/User/UserPublic"; +import {UserPublic} from "../../api/user/UserPublic"; import {ReactiveFormsModule} from "@angular/forms"; import {TextComponent} from "../../shared/text/text.component"; import {Subscription} from "rxjs";