From fb705396345f75861a5039390cb4b9266a1024a4 Mon Sep 17 00:00:00 2001 From: Thomas Boksberger Date: Fri, 26 Nov 2021 17:42:11 +0100 Subject: [PATCH] BOXIT-63: style task --- deploy/localDev/boxit/apacheOIDC/apache2.conf | 2 +- frontend/src/app/app-routing.module.ts | 12 ++-- frontend/src/app/app.module.ts | 58 ++++++++-------- .../{ => item}/folder/Accent.model.ts | 0 .../{ => item}/folder/Background.model.ts | 0 .../{ => item}/folder/FolderOverview.model.ts | 0 .../business/{ => item}/folder/ViewCache.ts | 0 .../{ => item}/folder/folder.mapper.ts | 10 +-- .../{ => item}/folder/folder.model.ts | 0 .../{ => item}/folder/folder.service.ts | 14 ++-- .../{ => item}/folder/noteOverview.model.ts | 0 .../{ => item}/folder/overviewItem.model.ts | 0 .../{ => item}/folder/taskOverview.model.ts | 0 .../{ => item}/folder/viewMode.model.ts | 0 .../business/{ => item}/note/note.mapper.ts | 6 +- .../business/{ => item}/note/note.model.ts | 6 +- .../app/business/item/task/priority.model.ts | 29 ++++++++ .../business/{ => item}/task/task.mapper.ts | 11 ++-- .../business/{ => item}/task/task.model.ts | 11 ++-- .../edit/attachment-list-edit.component.html | 0 .../edit/attachment-list-edit.component.scss | 0 .../edit/attachment-list-edit.component.ts | 6 +- .../show/attachment-list.component.html | 0 .../show/attachment-list.component.scss | 0 .../show/attachment-list.component.ts | 2 +- .../show/attachment/attachment.component.html | 0 .../show/attachment/attachment.component.scss | 0 .../show/attachment/attachment.component.ts | 6 +- .../show/diashow/diashow.component.html | 0 .../show/diashow/diashow.component.scss | 0 .../show/diashow/diashow.component.ts | 2 +- .../gui/common/dropdown/dropdown.component.ts | 2 +- .../app/gui/common/modal/modal.component.ts | 2 +- .../folderitem-listview.component.scss | 1 - .../noteitem-listview.component.scss | 1 - .../task-item-listview.component.scss | 1 - .../src/app/gui/header/header.component.ts | 2 +- .../folder-edit/folder-edit.component.html | 0 .../folder-edit/folder-edit.component.scss | 0 .../folder-edit/folder-edit.component.ts | 16 ++--- .../folder-name/folder-name.component.html | 0 .../folder-name/folder-name.component.scss | 0 .../folder-name/folder-name.component.ts | 2 +- .../folder-path/folder-path.component.html | 0 .../folder-path/folder-path.component.scss | 0 .../folder-path/folder-path.component.ts | 4 +- .../folder-sidebar.component.html | 0 .../folder-sidebar.component.scss | 0 .../folder-sidebar.component.ts | 12 ++-- .../folder/view/folder.component.html | 0 .../folder/view/folder.component.scss | 0 .../folder/view/folder.component.ts | 16 ++--- .../folder-item.box-view.component.html | 0 .../folder-item.box-view.component.scss | 2 +- .../folder-item.box-view.component.ts | 2 +- .../note-item-box-view.component.html | 0 .../note-item-box-view.component.scss | 2 +- .../note-item-box-view.component.ts | 2 +- .../folder/view/item/boxview/shared.scss | 0 .../task-item-box-view.component.html | 0 .../task-item-box-view.component.scss | 2 +- .../task-item-box-view.component.ts | 2 +- .../folderitem-listview.component.html | 0 .../folderitem-listview.component.scss | 1 + .../folderitem-listview.component.ts | 2 +- .../noteitem-listview.component.html | 0 .../noteitem-listview.component.scss | 1 + .../noteitem-listview.component.ts | 2 +- .../folder/view/item/listview/shared.scss | 0 .../task-item-listview.component.html | 0 .../task-item-listview.component.scss | 1 + .../task-item-listview.component.ts | 2 +- .../note/note-edit/auto-grow.directive.ts | 0 .../note/note-edit/note-edit.component.html | 0 .../note/note-edit/note-edit.component.scss | 0 .../note/note-edit/note-edit.component.ts | 6 +- .../note-header/note-header.component.html | 0 .../note-header/note-header.component.scss | 0 .../note/note-header/note-header.component.ts | 15 +++-- .../note/note-view/note-view.component.html | 0 .../note/note-view/note-view.component.scss | 0 .../note/note-view/note-view.component.ts | 4 +- .../app/gui/{ => item}/note/note.component.ts | 10 +-- .../app/gui/{ => item}/note/note.service.ts | 10 +-- .../task/task-edit/task-edit.component.html | 0 .../task/task-edit/task-edit.component.scss | 0 .../task/task-edit/task-edit.component.ts | 0 .../task-header/task-header.component.html | 45 +++++++++++++ .../task-header/task-header.component.scss | 25 +++++++ .../task/task-header/task-header.component.ts | 61 +++++++++++++++++ .../task/task-view/task-view.component.html | 34 ++++++++++ .../task/task-view/task-view.component.scss | 66 +++++++++++++++++++ .../task/task-view/task-view.component.ts | 4 +- .../app/gui/{ => item}/task/task.component.ts | 10 +-- .../app/gui/{ => item}/task/task.service.ts | 10 +-- .../edit/location-edit.component.html | 0 .../edit/location-edit.component.scss | 0 .../location/edit/location-edit.component.ts | 6 +- .../location/map/map.component.html | 0 .../location/map/map.component.scss | 0 .../{note => }/location/map/map.component.ts | 2 +- .../view/location-view.component.html | 2 +- .../view/location-view.component.scss | 0 .../location/view/location-view.component.ts | 2 +- .../not-allowed-page.component.ts | 2 +- .../not-found-page.component.ts | 2 +- .../task/task-view/task-view.component.html | 7 -- .../task/task-view/task-view.component.scss | 0 frontend/src/assets/i18n/de.json | 20 +++++- frontend/src/assets/i18n/en.json | 22 ++++++- 110 files changed, 458 insertions(+), 162 deletions(-) rename frontend/src/app/business/{ => item}/folder/Accent.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/Background.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/FolderOverview.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/ViewCache.ts (100%) rename frontend/src/app/business/{ => item}/folder/folder.mapper.ts (89%) rename frontend/src/app/business/{ => item}/folder/folder.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/folder.service.ts (87%) rename frontend/src/app/business/{ => item}/folder/noteOverview.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/overviewItem.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/taskOverview.model.ts (100%) rename frontend/src/app/business/{ => item}/folder/viewMode.model.ts (100%) rename frontend/src/app/business/{ => item}/note/note.mapper.ts (80%) rename frontend/src/app/business/{ => item}/note/note.model.ts (87%) create mode 100644 frontend/src/app/business/item/task/priority.model.ts rename frontend/src/app/business/{ => item}/task/task.mapper.ts (75%) rename frontend/src/app/business/{ => item}/task/task.model.ts (82%) rename frontend/src/app/gui/{note => }/attachment-list/edit/attachment-list-edit.component.html (100%) rename frontend/src/app/gui/{note => }/attachment-list/edit/attachment-list-edit.component.scss (100%) rename frontend/src/app/gui/{note => }/attachment-list/edit/attachment-list-edit.component.ts (85%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment-list.component.html (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment-list.component.scss (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment-list.component.ts (95%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment/attachment.component.html (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment/attachment.component.scss (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/attachment/attachment.component.ts (88%) rename frontend/src/app/gui/{note => }/attachment-list/show/diashow/diashow.component.html (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/diashow/diashow.component.scss (100%) rename frontend/src/app/gui/{note => }/attachment-list/show/diashow/diashow.component.ts (95%) delete mode 100644 frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss delete mode 100644 frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss delete mode 100644 frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss rename frontend/src/app/gui/{ => item}/folder/folder-edit/folder-edit.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/folder-edit/folder-edit.component.scss (100%) rename frontend/src/app/gui/{ => item}/folder/folder-edit/folder-edit.component.ts (87%) rename frontend/src/app/gui/{ => item}/folder/folder-name/folder-name.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/folder-name/folder-name.component.scss (100%) rename frontend/src/app/gui/{ => item}/folder/folder-name/folder-name.component.ts (86%) rename frontend/src/app/gui/{ => item}/folder/folder-path/folder-path.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/folder-path/folder-path.component.scss (100%) rename frontend/src/app/gui/{ => item}/folder/folder-path/folder-path.component.ts (85%) rename frontend/src/app/gui/{ => item}/folder/view/folder-sidebar/folder-sidebar.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/view/folder-sidebar/folder-sidebar.component.scss (100%) rename frontend/src/app/gui/{ => item}/folder/view/folder-sidebar/folder-sidebar.component.ts (68%) rename frontend/src/app/gui/{ => item}/folder/view/folder.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/view/folder.component.scss (100%) rename frontend/src/app/gui/{ => item}/folder/view/folder.component.ts (77%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss (89%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts (79%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss (87%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts (79%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/shared.scss (100%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.html (100%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss (88%) rename frontend/src/app/gui/{ => item}/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts (79%) rename frontend/src/app/gui/{ => item}/folder/view/item/listview/folderitem-listview/folderitem-listview.component.html (100%) create mode 100644 frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss rename frontend/src/app/gui/{ => item}/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts (79%) rename frontend/src/app/gui/{ => item}/folder/view/item/listview/noteitem-listview/noteitem-listview.component.html (100%) create mode 100644 frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss rename frontend/src/app/gui/{ => item}/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts (79%) rename frontend/src/app/gui/{ => item}/folder/view/item/listview/shared.scss (100%) rename frontend/src/app/gui/{ => item}/folder/view/item/listview/taskitem-listview/task-item-listview.component.html (100%) create mode 100644 frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss rename frontend/src/app/gui/{ => item}/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts (79%) rename frontend/src/app/gui/{ => item}/note/note-edit/auto-grow.directive.ts (100%) rename frontend/src/app/gui/{ => item}/note/note-edit/note-edit.component.html (100%) rename frontend/src/app/gui/{ => item}/note/note-edit/note-edit.component.scss (100%) rename frontend/src/app/gui/{ => item}/note/note-edit/note-edit.component.ts (86%) rename frontend/src/app/gui/{ => item}/note/note-header/note-header.component.html (100%) rename frontend/src/app/gui/{ => item}/note/note-header/note-header.component.scss (100%) rename frontend/src/app/gui/{ => item}/note/note-header/note-header.component.ts (70%) rename frontend/src/app/gui/{ => item}/note/note-view/note-view.component.html (100%) rename frontend/src/app/gui/{ => item}/note/note-view/note-view.component.scss (100%) rename frontend/src/app/gui/{ => item}/note/note-view/note-view.component.ts (82%) rename frontend/src/app/gui/{ => item}/note/note.component.ts (84%) rename frontend/src/app/gui/{ => item}/note/note.service.ts (83%) rename frontend/src/app/gui/{ => item}/task/task-edit/task-edit.component.html (100%) rename frontend/src/app/gui/{ => item}/task/task-edit/task-edit.component.scss (100%) rename frontend/src/app/gui/{ => item}/task/task-edit/task-edit.component.ts (100%) create mode 100644 frontend/src/app/gui/item/task/task-header/task-header.component.html create mode 100644 frontend/src/app/gui/item/task/task-header/task-header.component.scss create mode 100644 frontend/src/app/gui/item/task/task-header/task-header.component.ts create mode 100644 frontend/src/app/gui/item/task/task-view/task-view.component.html create mode 100644 frontend/src/app/gui/item/task/task-view/task-view.component.scss rename frontend/src/app/gui/{ => item}/task/task-view/task-view.component.ts (82%) rename frontend/src/app/gui/{ => item}/task/task.component.ts (84%) rename frontend/src/app/gui/{ => item}/task/task.service.ts (83%) rename frontend/src/app/gui/{note => }/location/edit/location-edit.component.html (100%) rename frontend/src/app/gui/{note => }/location/edit/location-edit.component.scss (100%) rename frontend/src/app/gui/{note => }/location/edit/location-edit.component.ts (68%) rename frontend/src/app/gui/{note => }/location/map/map.component.html (100%) rename frontend/src/app/gui/{note => }/location/map/map.component.scss (100%) rename frontend/src/app/gui/{note => }/location/map/map.component.ts (98%) rename frontend/src/app/gui/{note => }/location/view/location-view.component.html (68%) rename frontend/src/app/gui/{note => }/location/view/location-view.component.scss (100%) rename frontend/src/app/gui/{note => }/location/view/location-view.component.ts (82%) delete mode 100644 frontend/src/app/gui/task/task-view/task-view.component.html delete mode 100644 frontend/src/app/gui/task/task-view/task-view.component.scss diff --git a/deploy/localDev/boxit/apacheOIDC/apache2.conf b/deploy/localDev/boxit/apacheOIDC/apache2.conf index a797e75..42a3aa4 100644 --- a/deploy/localDev/boxit/apacheOIDC/apache2.conf +++ b/deploy/localDev/boxit/apacheOIDC/apache2.conf @@ -250,7 +250,7 @@ ServerName ${SERVER_NAME} base-uri 'self'; \ form-action 'self'; \ frame-ancestors 'none'; \ - img-src 'self' data:; \ + img-src 'self' api.mapbox.com data:; \ #upgrade-insecure-requests" "expr=%{CONTENT_TYPE} =~ m#text\/(html|javascript)|application\/pdf|xml#i" Header always append X-Frame-Options SAMEORIGIN Header always set X-Content-Type-Options nosniff diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index fa08558..150b178 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -1,13 +1,13 @@ import {PreloadAllModules, RouterModule, Routes} from '@angular/router'; import {NgModule} from '@angular/core'; -import {NoteViewComponent} from './gui/note/note-view/note-view.component'; -import {NoteEditComponent} from './gui/note/note-edit/note-edit.component'; -import {FolderComponent} from './gui/folder/view/folder.component'; -import {FolderEditComponent} from './gui/folder/folder-edit/folder-edit.component'; +import {NoteViewComponent} from './gui/item/note/note-view/note-view.component'; +import {NoteEditComponent} from './gui/item/note/note-edit/note-edit.component'; +import {FolderComponent} from './gui/item/folder/view/folder.component'; +import {FolderEditComponent} from './gui/item/folder/folder-edit/folder-edit.component'; import {NotFoundPageComponent} from './gui/page/not-found-page/not-found-page.component'; import {NotAllowedPageComponent} from "./gui/page/not-allowed-page/not-allowed-page.component"; -import {TaskViewComponent} from './gui/task/task-view/task-view.component'; -import {TaskEditComponent} from './gui/task/task-edit/task-edit.component'; +import {TaskViewComponent} from './gui/item/task/task-view/task-view.component'; +import {TaskEditComponent} from './gui/item/task/task-edit/task-edit.component'; const appRoutes: Routes = [ {path: '', redirectTo: 'folder', pathMatch: 'full'}, diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 3d47cb2..76ad40a 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -8,28 +8,28 @@ import {MarkdownModule} from 'ngx-markdown'; import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http'; import {TranslateLoader, TranslateModule} from '@ngx-translate/core'; import {TranslateHttpLoader} from '@ngx-translate/http-loader'; -import {MapComponent} from './gui/note/location/map/map.component'; -import {LocationViewComponent} from './gui/note/location/view/location-view.component'; -import {LocationEditComponent} from './gui/note/location/edit/location-edit.component'; -import {AttachmentComponent} from './gui/note/attachment-list/show/attachment/attachment.component'; -import {DiashowComponent} from './gui/note/attachment-list/show/diashow/diashow.component'; -import {AttachmentListComponent} from './gui/note/attachment-list/show/attachment-list.component'; -import {NoteViewComponent} from './gui/note/note-view/note-view.component'; -import {NoteEditComponent} from './gui/note/note-edit/note-edit.component'; -import {AutoGrowDirective} from './gui/note/note-edit/auto-grow.directive'; -import {AttachmentListEditComponent} from './gui/note/attachment-list/edit/attachment-list-edit.component'; -import {NoteHeaderComponent} from './gui/note/note-header/note-header.component'; +import {MapComponent} from './gui/location/map/map.component'; +import {LocationViewComponent} from './gui/location/view/location-view.component'; +import {LocationEditComponent} from './gui/location/edit/location-edit.component'; +import {AttachmentComponent} from './gui/attachment-list/show/attachment/attachment.component'; +import {DiashowComponent} from './gui/attachment-list/show/diashow/diashow.component'; +import {AttachmentListComponent} from './gui/attachment-list/show/attachment-list.component'; +import {NoteViewComponent} from './gui/item/note/note-view/note-view.component'; +import {NoteEditComponent} from './gui/item/note/note-edit/note-edit.component'; +import {AutoGrowDirective} from './gui/item/note/note-edit/auto-grow.directive'; +import {AttachmentListEditComponent} from './gui/attachment-list/edit/attachment-list-edit.component'; +import {NoteHeaderComponent} from './gui/item/note/note-header/note-header.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; -import {NoteService} from './gui/note/note.service'; -import {FolderComponent} from './gui/folder/view/folder.component'; -import {FolderEditComponent} from './gui/folder/folder-edit/folder-edit.component'; -import {FolderPathComponent} from './gui/folder/folder-path/folder-path.component'; -import {FolderSidebarComponent} from './gui/folder/view/folder-sidebar/folder-sidebar.component'; -import {FolderItemBoxViewComponent} from './gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component'; -import {NoteItemBoxViewComponent} from './gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component'; -import {NoteitemListviewComponent} from './gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component'; -import {FolderitemListview} from './gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component'; -import {FolderNameComponent} from './gui/folder/folder-name/folder-name.component'; +import {NoteService} from './gui/item/note/note.service'; +import {FolderComponent} from './gui/item/folder/view/folder.component'; +import {FolderEditComponent} from './gui/item/folder/folder-edit/folder-edit.component'; +import {FolderPathComponent} from './gui/item/folder/folder-path/folder-path.component'; +import {FolderSidebarComponent} from './gui/item/folder/view/folder-sidebar/folder-sidebar.component'; +import {FolderItemBoxViewComponent} from './gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component'; +import {NoteItemBoxViewComponent} from './gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component'; +import {NoteitemListviewComponent} from './gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component'; +import {FolderitemListview} from './gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component'; +import {FolderNameComponent} from './gui/item/folder/folder-name/folder-name.component'; import {ImageCropperModule} from 'ngx-image-cropper'; import {CommonModule} from '@angular/common'; import {DropdownComponent} from './gui/common/dropdown/dropdown.component'; @@ -42,13 +42,14 @@ import {ToastrModule} from "ngx-toastr"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; import {ScrollingModule} from '@angular/cdk/scrolling'; import { VirtualListComponent } from './gui/common/virtual-list/virtual-list.component'; -import {TaskItemBoxViewComponent} from './gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component'; -import {TaskItemListviewComponent} from './gui/folder/view/item/listview/taskitem-listview/task-item-listview.component'; -import { TaskViewComponent } from './gui/task/task-view/task-view.component'; -import { TaskEditComponent } from './gui/task/task-edit/task-edit.component'; -import {TaskService} from "./gui/task/task.service"; -import {FolderService} from "./business/folder/folder.service"; +import {TaskItemBoxViewComponent} from './gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component'; +import {TaskItemListviewComponent} from './gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component'; +import { TaskViewComponent } from './gui/item/task/task-view/task-view.component'; +import { TaskEditComponent } from './gui/item/task/task-edit/task-edit.component'; +import {TaskService} from "./gui/item/task/task.service"; +import {FolderService} from "./business/item/folder/folder.service"; import {HeaderComponent} from './gui/header/header.component'; +import { TaskHeaderComponent } from './gui/item/task/task-header/task-header.component'; @NgModule({ declarations: [ @@ -82,7 +83,8 @@ import {HeaderComponent} from './gui/header/header.component'; NotAllowedPageComponent, VirtualListComponent, TaskViewComponent, - TaskEditComponent + TaskEditComponent, + TaskHeaderComponent ], imports: [ CommonModule, diff --git a/frontend/src/app/business/folder/Accent.model.ts b/frontend/src/app/business/item/folder/Accent.model.ts similarity index 100% rename from frontend/src/app/business/folder/Accent.model.ts rename to frontend/src/app/business/item/folder/Accent.model.ts diff --git a/frontend/src/app/business/folder/Background.model.ts b/frontend/src/app/business/item/folder/Background.model.ts similarity index 100% rename from frontend/src/app/business/folder/Background.model.ts rename to frontend/src/app/business/item/folder/Background.model.ts diff --git a/frontend/src/app/business/folder/FolderOverview.model.ts b/frontend/src/app/business/item/folder/FolderOverview.model.ts similarity index 100% rename from frontend/src/app/business/folder/FolderOverview.model.ts rename to frontend/src/app/business/item/folder/FolderOverview.model.ts diff --git a/frontend/src/app/business/folder/ViewCache.ts b/frontend/src/app/business/item/folder/ViewCache.ts similarity index 100% rename from frontend/src/app/business/folder/ViewCache.ts rename to frontend/src/app/business/item/folder/ViewCache.ts diff --git a/frontend/src/app/business/folder/folder.mapper.ts b/frontend/src/app/business/item/folder/folder.mapper.ts similarity index 89% rename from frontend/src/app/business/folder/folder.mapper.ts rename to frontend/src/app/business/item/folder/folder.mapper.ts index dcb88fe..96d7646 100644 --- a/frontend/src/app/business/folder/folder.mapper.ts +++ b/frontend/src/app/business/item/folder/folder.mapper.ts @@ -1,15 +1,15 @@ -import {FolderDto} from "../../api/dto/folder/folder.dto"; +import {FolderDto} from "../../../api/dto/folder/folder.dto"; import {Folder} from "./folder.model"; import {Accent} from "./Accent.model"; import {Background} from "./Background.model"; -import {NoteOverviewDto} from "../../api/dto/note/noteOverview.dto"; +import {NoteOverviewDto} from "../../../api/dto/note/noteOverview.dto"; import {NoteOverview} from "./noteOverview.model"; -import {OverviewItemDto} from "../../api/dto/note/overviewItem.dto"; +import {OverviewItemDto} from "../../../api/dto/note/overviewItem.dto"; import {OverviewItem} from "./overviewItem.model"; -import {FolderOverviewDto} from "../../api/dto/folder/folderOverview.dto"; +import {FolderOverviewDto} from "../../../api/dto/folder/folderOverview.dto"; import {FolderOverview} from "./FolderOverview.model"; import {ViewMode} from "./viewMode.model"; -import {TaskOverviewDto} from '../../api/dto/task/taskOverview.dto'; +import {TaskOverviewDto} from '../../../api/dto/task/taskOverview.dto'; import {TaskOverview} from './taskOverview.model'; export class FolderMapper { diff --git a/frontend/src/app/business/folder/folder.model.ts b/frontend/src/app/business/item/folder/folder.model.ts similarity index 100% rename from frontend/src/app/business/folder/folder.model.ts rename to frontend/src/app/business/item/folder/folder.model.ts diff --git a/frontend/src/app/business/folder/folder.service.ts b/frontend/src/app/business/item/folder/folder.service.ts similarity index 87% rename from frontend/src/app/business/folder/folder.service.ts rename to frontend/src/app/business/item/folder/folder.service.ts index daf6088..fc05885 100644 --- a/frontend/src/app/business/folder/folder.service.ts +++ b/frontend/src/app/business/item/folder/folder.service.ts @@ -1,19 +1,19 @@ import {map} from 'rxjs/operators'; import {Injectable, OnInit} from "@angular/core"; -import {BoxitApi} from "../../api/boxit.api"; +import {BoxitApi} from "../../../api/boxit.api"; import {Observable, Subject} from "rxjs"; import {Folder} from "./folder.model"; -import {FolderDto} from "../../api/dto/folder/folder.dto"; +import {FolderDto} from "../../../api/dto/folder/folder.dto"; import {FolderMapper} from "./folder.mapper"; import {OverviewItem} from "./overviewItem.model"; -import {OverviewItemDto} from "../../api/dto/note/overviewItem.dto"; +import {OverviewItemDto} from "../../../api/dto/note/overviewItem.dto"; import {ViewCache} from "./ViewCache"; import {ViewMode} from "./viewMode.model"; -import {Pair} from "../../common/Pair"; -import {NotificationService} from "../notification.service"; -import {Paged} from '../../api/dto/paging/paged'; -import {Pagination} from '../../api/dto/paging/pagination'; +import {Pair} from "../../../common/Pair"; +import {NotificationService} from "../../notification.service"; +import {Paged} from '../../../api/dto/paging/paged'; +import {Pagination} from '../../../api/dto/paging/pagination'; @Injectable() export class FolderService implements OnInit { diff --git a/frontend/src/app/business/folder/noteOverview.model.ts b/frontend/src/app/business/item/folder/noteOverview.model.ts similarity index 100% rename from frontend/src/app/business/folder/noteOverview.model.ts rename to frontend/src/app/business/item/folder/noteOverview.model.ts diff --git a/frontend/src/app/business/folder/overviewItem.model.ts b/frontend/src/app/business/item/folder/overviewItem.model.ts similarity index 100% rename from frontend/src/app/business/folder/overviewItem.model.ts rename to frontend/src/app/business/item/folder/overviewItem.model.ts diff --git a/frontend/src/app/business/folder/taskOverview.model.ts b/frontend/src/app/business/item/folder/taskOverview.model.ts similarity index 100% rename from frontend/src/app/business/folder/taskOverview.model.ts rename to frontend/src/app/business/item/folder/taskOverview.model.ts diff --git a/frontend/src/app/business/folder/viewMode.model.ts b/frontend/src/app/business/item/folder/viewMode.model.ts similarity index 100% rename from frontend/src/app/business/folder/viewMode.model.ts rename to frontend/src/app/business/item/folder/viewMode.model.ts diff --git a/frontend/src/app/business/note/note.mapper.ts b/frontend/src/app/business/item/note/note.mapper.ts similarity index 80% rename from frontend/src/app/business/note/note.mapper.ts rename to frontend/src/app/business/item/note/note.mapper.ts index 422e7fb..ed71ba6 100644 --- a/frontend/src/app/business/note/note.mapper.ts +++ b/frontend/src/app/business/item/note/note.mapper.ts @@ -1,7 +1,7 @@ -import {NoteDto} from '../../api/dto/note/note.dto'; +import {NoteDto} from '../../../api/dto/note/note.dto'; import {Note} from './note.model'; -import {LocationMapper} from "../location/location.mapper"; -import {AttachmentMapper} from "../attachment/attachment.mapper"; +import {LocationMapper} from "../../location/location.mapper"; +import {AttachmentMapper} from "../../attachment/attachment.mapper"; export class NoteMapper { public static mapDto(note: NoteDto): Note { diff --git a/frontend/src/app/business/note/note.model.ts b/frontend/src/app/business/item/note/note.model.ts similarity index 87% rename from frontend/src/app/business/note/note.model.ts rename to frontend/src/app/business/item/note/note.model.ts index 85fc81b..7b6c9f5 100644 --- a/frontend/src/app/business/note/note.model.ts +++ b/frontend/src/app/business/item/note/note.model.ts @@ -1,6 +1,6 @@ -import {Attachment} from "../attachment/Attachment.model"; -import {Location} from "../location/Location.model"; -import {Nullable} from "../Nullable.model"; +import {Attachment} from "../../attachment/Attachment.model"; +import {Location} from "../../location/Location.model"; +import {Nullable} from "../../Nullable.model"; export class Note extends Nullable{ diff --git a/frontend/src/app/business/item/task/priority.model.ts b/frontend/src/app/business/item/task/priority.model.ts new file mode 100644 index 0000000..c1a9239 --- /dev/null +++ b/frontend/src/app/business/item/task/priority.model.ts @@ -0,0 +1,29 @@ +export class Priority { + public static readonly LOWEST = new Priority('LOWEST', '#FF0000', 'fas fa-angle-double-down'); + public static readonly LOW = new Priority('LOW', '#FF6200', 'fas fa-angle-down'); + public static readonly NORMAL = new Priority('NORMAL', '#1A9600', 'fas fa-grip-lines'); + public static readonly HIGH = new Priority('HIGH', '#0062FF', 'fas fa-angle-up'); + public static readonly HIGHEST = new Priority('HIGHEST', '#0000FF', 'fas fa-angle-double-up'); + + public static readonly ALL = [ + Priority.LOWEST, + Priority.LOW, + Priority.NORMAL, + Priority.HIGH, + Priority.HIGHEST + ]; + + constructor( + readonly name: string, + readonly color: string, + readonly fontAwesomeClass: string + ) {} + + public static valueOf(name: string): Priority { + const priority = Priority.ALL.find(p => p.name === name); + if (priority === undefined) { + throw 'No Priority named "' + name + '" found!'; + } + return priority; + } +} diff --git a/frontend/src/app/business/task/task.mapper.ts b/frontend/src/app/business/item/task/task.mapper.ts similarity index 75% rename from frontend/src/app/business/task/task.mapper.ts rename to frontend/src/app/business/item/task/task.mapper.ts index a7a9f28..675c273 100644 --- a/frontend/src/app/business/task/task.mapper.ts +++ b/frontend/src/app/business/item/task/task.mapper.ts @@ -1,7 +1,8 @@ import {Task} from "./task.model"; -import {TaskDto} from "../../api/dto/task/task.dto"; -import {LocationMapper} from "../location/location.mapper"; -import {AttachmentMapper} from "../attachment/attachment.mapper"; +import {TaskDto} from "../../../api/dto/task/task.dto"; +import {LocationMapper} from "../../location/location.mapper"; +import {AttachmentMapper} from "../../attachment/attachment.mapper"; +import {Priority} from './priority.model'; export class TaskMapper { public static map(dto: TaskDto): Task { @@ -17,7 +18,7 @@ export class TaskMapper { dto.title, dto.description, LocationMapper.map(dto.location), - dto.priority, + Priority.valueOf(dto.priority), dto.state, dto.startAt, dto.dueAt, @@ -36,7 +37,7 @@ export class TaskMapper { task.title, task.description, LocationMapper.unmap(task.location), - task.priority, + task.priority.name, task.state, task.startAt, task.dueAt, diff --git a/frontend/src/app/business/task/task.model.ts b/frontend/src/app/business/item/task/task.model.ts similarity index 82% rename from frontend/src/app/business/task/task.model.ts rename to frontend/src/app/business/item/task/task.model.ts index b0c8126..188a545 100644 --- a/frontend/src/app/business/task/task.model.ts +++ b/frontend/src/app/business/item/task/task.model.ts @@ -1,6 +1,7 @@ -import {Nullable} from "../Nullable.model"; -import {Location} from "../location/Location.model"; -import {Attachment} from "../attachment/Attachment.model"; +import {Nullable} from "../../Nullable.model"; +import {Location} from "../../location/Location.model"; +import {Attachment} from "../../attachment/Attachment.model"; +import {Priority} from './priority.model'; export class Task extends Nullable { constructor( @@ -12,7 +13,7 @@ export class Task extends Nullable { public title: string, public description: string, public location: Location, - public priority: string, + public priority: Priority, public state: string, public startAt: Date, public dueAt: Date, @@ -30,7 +31,7 @@ export class Task extends Nullable { '', '', null, - 'NORMAL', + Priority.NORMAL, 'BACKLOG', null, null, diff --git a/frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.html b/frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.html similarity index 100% rename from frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.html rename to frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.html diff --git a/frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.scss b/frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.scss similarity index 100% rename from frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.scss rename to frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.scss diff --git a/frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.ts b/frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.ts similarity index 85% rename from frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.ts rename to frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.ts index 78846d5..aa0cc37 100644 --- a/frontend/src/app/gui/note/attachment-list/edit/attachment-list-edit.component.ts +++ b/frontend/src/app/gui/attachment-list/edit/attachment-list-edit.component.ts @@ -1,7 +1,7 @@ import {Component, Input, OnInit} from '@angular/core'; -import {Attachment} from "../../../../business/attachment/Attachment.model"; -import {Folder} from "../../../../business/folder/folder.model"; -import {FolderService} from "../../../../business/folder/folder.service"; +import {Attachment} from "../../../business/attachment/Attachment.model"; +import {Folder} from "../../../business/item/folder/folder.model"; +import {FolderService} from "../../../business/item/folder/folder.service"; @Component({ selector: 'app-attachment-list-edit', diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment-list.component.html b/frontend/src/app/gui/attachment-list/show/attachment-list.component.html similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/attachment-list.component.html rename to frontend/src/app/gui/attachment-list/show/attachment-list.component.html diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment-list.component.scss b/frontend/src/app/gui/attachment-list/show/attachment-list.component.scss similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/attachment-list.component.scss rename to frontend/src/app/gui/attachment-list/show/attachment-list.component.scss diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment-list.component.ts b/frontend/src/app/gui/attachment-list/show/attachment-list.component.ts similarity index 95% rename from frontend/src/app/gui/note/attachment-list/show/attachment-list.component.ts rename to frontend/src/app/gui/attachment-list/show/attachment-list.component.ts index b83a223..07063d5 100644 --- a/frontend/src/app/gui/note/attachment-list/show/attachment-list.component.ts +++ b/frontend/src/app/gui/attachment-list/show/attachment-list.component.ts @@ -2,7 +2,7 @@ import {Component, Input, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren} import {Subscription} from "rxjs"; import {DiashowComponent} from "./diashow/diashow.component"; import {AttachmentComponent} from "./attachment/attachment.component"; -import {Attachment} from "../../../../business/attachment/Attachment.model"; +import {Attachment} from "../../../business/attachment/Attachment.model"; @Component({ selector: 'app-attachment-list', diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.html b/frontend/src/app/gui/attachment-list/show/attachment/attachment.component.html similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.html rename to frontend/src/app/gui/attachment-list/show/attachment/attachment.component.html diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.scss b/frontend/src/app/gui/attachment-list/show/attachment/attachment.component.scss similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.scss rename to frontend/src/app/gui/attachment-list/show/attachment/attachment.component.scss diff --git a/frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.ts b/frontend/src/app/gui/attachment-list/show/attachment/attachment.component.ts similarity index 88% rename from frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.ts rename to frontend/src/app/gui/attachment-list/show/attachment/attachment.component.ts index ae278eb..6af671a 100644 --- a/frontend/src/app/gui/note/attachment-list/show/attachment/attachment.component.ts +++ b/frontend/src/app/gui/attachment-list/show/attachment/attachment.component.ts @@ -1,8 +1,8 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {FormControl, FormGroup, Validators} from '@angular/forms'; -import {Folder} from "../../../../../business/folder/folder.model"; -import {Attachment} from "../../../../../business/attachment/Attachment.model"; -import {FolderService} from "../../../../../business/folder/folder.service"; +import {Folder} from "../../../../business/item/folder/folder.model"; +import {Attachment} from "../../../../business/attachment/Attachment.model"; +import {FolderService} from "../../../../business/item/folder/folder.service"; @Component({ selector: 'app-attachment', diff --git a/frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.html b/frontend/src/app/gui/attachment-list/show/diashow/diashow.component.html similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.html rename to frontend/src/app/gui/attachment-list/show/diashow/diashow.component.html diff --git a/frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.scss b/frontend/src/app/gui/attachment-list/show/diashow/diashow.component.scss similarity index 100% rename from frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.scss rename to frontend/src/app/gui/attachment-list/show/diashow/diashow.component.scss diff --git a/frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.ts b/frontend/src/app/gui/attachment-list/show/diashow/diashow.component.ts similarity index 95% rename from frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.ts rename to frontend/src/app/gui/attachment-list/show/diashow/diashow.component.ts index 85330af..1c5c981 100644 --- a/frontend/src/app/gui/note/attachment-list/show/diashow/diashow.component.ts +++ b/frontend/src/app/gui/attachment-list/show/diashow/diashow.component.ts @@ -1,5 +1,5 @@ import {Component, HostListener, Input, OnInit} from '@angular/core'; -import {Attachment} from "../../../../../business/attachment/Attachment.model"; +import {Attachment} from "../../../../business/attachment/Attachment.model"; @Component({ selector: 'app-diashow', diff --git a/frontend/src/app/gui/common/dropdown/dropdown.component.ts b/frontend/src/app/gui/common/dropdown/dropdown.component.ts index bb664b8..7c1c802 100644 --- a/frontend/src/app/gui/common/dropdown/dropdown.component.ts +++ b/frontend/src/app/gui/common/dropdown/dropdown.component.ts @@ -1,6 +1,6 @@ import {Component, ElementRef, Input, OnInit, Renderer2, ViewChild} from '@angular/core'; import {DropdownItem} from './data/dropdown.item'; -import {Accent} from "../../../business/folder/Accent.model"; +import {Accent} from "../../../business/item/folder/Accent.model"; @Component({ selector: 'app-dropdown', diff --git a/frontend/src/app/gui/common/modal/modal.component.ts b/frontend/src/app/gui/common/modal/modal.component.ts index f5ff83b..65f0769 100644 --- a/frontend/src/app/gui/common/modal/modal.component.ts +++ b/frontend/src/app/gui/common/modal/modal.component.ts @@ -1,6 +1,6 @@ import {AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock'; -import {Accent} from "../../../business/folder/Accent.model"; +import {Accent} from "../../../business/item/folder/Accent.model"; @Component({ selector: 'app-modal', diff --git a/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss b/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss deleted file mode 100644 index aa92a07..0000000 --- a/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import "src/app/gui/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss b/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss deleted file mode 100644 index aa92a07..0000000 --- a/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import "src/app/gui/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss b/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss deleted file mode 100644 index aa92a07..0000000 --- a/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import "src/app/gui/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/header/header.component.ts b/frontend/src/app/gui/header/header.component.ts index 50018d6..52e288f 100644 --- a/frontend/src/app/gui/header/header.component.ts +++ b/frontend/src/app/gui/header/header.component.ts @@ -3,7 +3,7 @@ import {AuthService} from '../../auth/auth.service'; import {DropdownItem} from '../common/dropdown/data/dropdown.item'; import {DropdownActionItem} from '../common/dropdown/data/dropdown.action-item'; import {DropdownDivider} from '../common/dropdown/data/dropdown.divider'; -import {Accent} from "../../business/folder/Accent.model"; +import {Accent} from "../../business/item/folder/Accent.model"; @Component({ selector: 'app-header', diff --git a/frontend/src/app/gui/folder/folder-edit/folder-edit.component.html b/frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.html similarity index 100% rename from frontend/src/app/gui/folder/folder-edit/folder-edit.component.html rename to frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.html diff --git a/frontend/src/app/gui/folder/folder-edit/folder-edit.component.scss b/frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.scss similarity index 100% rename from frontend/src/app/gui/folder/folder-edit/folder-edit.component.scss rename to frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.scss diff --git a/frontend/src/app/gui/folder/folder-edit/folder-edit.component.ts b/frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.ts similarity index 87% rename from frontend/src/app/gui/folder/folder-edit/folder-edit.component.ts rename to frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.ts index 48f4401..7af542b 100644 --- a/frontend/src/app/gui/folder/folder-edit/folder-edit.component.ts +++ b/frontend/src/app/gui/item/folder/folder-edit/folder-edit.component.ts @@ -1,13 +1,13 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Params, Router} from '@angular/router'; -import {ModalComponent} from "../../common/modal/modal.component"; -import {Folder} from "../../../business/folder/folder.model"; -import {FolderService} from "../../../business/folder/folder.service"; -import {AuthService} from "../../../auth/auth.service"; -import {User} from "../../../business/user/user.model"; -import {Accent} from "../../../business/folder/Accent.model"; -import {Background} from "../../../business/folder/Background.model"; -import {ViewMode} from "../../../business/folder/viewMode.model"; +import {ModalComponent} from "../../../common/modal/modal.component"; +import {Folder} from "../../../../business/item/folder/folder.model"; +import {FolderService} from "../../../../business/item/folder/folder.service"; +import {AuthService} from "../../../../auth/auth.service"; +import {User} from "../../../../business/user/user.model"; +import {Accent} from "../../../../business/item/folder/Accent.model"; +import {Background} from "../../../../business/item/folder/Background.model"; +import {ViewMode} from "../../../../business/item/folder/viewMode.model"; import {ImageCroppedEvent} from "ngx-image-cropper"; @Component({ diff --git a/frontend/src/app/gui/folder/folder-name/folder-name.component.html b/frontend/src/app/gui/item/folder/folder-name/folder-name.component.html similarity index 100% rename from frontend/src/app/gui/folder/folder-name/folder-name.component.html rename to frontend/src/app/gui/item/folder/folder-name/folder-name.component.html diff --git a/frontend/src/app/gui/folder/folder-name/folder-name.component.scss b/frontend/src/app/gui/item/folder/folder-name/folder-name.component.scss similarity index 100% rename from frontend/src/app/gui/folder/folder-name/folder-name.component.scss rename to frontend/src/app/gui/item/folder/folder-name/folder-name.component.scss diff --git a/frontend/src/app/gui/folder/folder-name/folder-name.component.ts b/frontend/src/app/gui/item/folder/folder-name/folder-name.component.ts similarity index 86% rename from frontend/src/app/gui/folder/folder-name/folder-name.component.ts rename to frontend/src/app/gui/item/folder/folder-name/folder-name.component.ts index 8e70178..881e5fd 100644 --- a/frontend/src/app/gui/folder/folder-name/folder-name.component.ts +++ b/frontend/src/app/gui/item/folder/folder-name/folder-name.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {Folder} from "../../../business/folder/folder.model"; +import {Folder} from "../../../../business/item/folder/folder.model"; @Component({ selector: 'app-folder-name', diff --git a/frontend/src/app/gui/folder/folder-path/folder-path.component.html b/frontend/src/app/gui/item/folder/folder-path/folder-path.component.html similarity index 100% rename from frontend/src/app/gui/folder/folder-path/folder-path.component.html rename to frontend/src/app/gui/item/folder/folder-path/folder-path.component.html diff --git a/frontend/src/app/gui/folder/folder-path/folder-path.component.scss b/frontend/src/app/gui/item/folder/folder-path/folder-path.component.scss similarity index 100% rename from frontend/src/app/gui/folder/folder-path/folder-path.component.scss rename to frontend/src/app/gui/item/folder/folder-path/folder-path.component.scss diff --git a/frontend/src/app/gui/folder/folder-path/folder-path.component.ts b/frontend/src/app/gui/item/folder/folder-path/folder-path.component.ts similarity index 85% rename from frontend/src/app/gui/folder/folder-path/folder-path.component.ts rename to frontend/src/app/gui/item/folder/folder-path/folder-path.component.ts index 99f254a..4f60fd0 100644 --- a/frontend/src/app/gui/folder/folder-path/folder-path.component.ts +++ b/frontend/src/app/gui/item/folder/folder-path/folder-path.component.ts @@ -1,6 +1,6 @@ import {Component, Input, OnInit} from '@angular/core'; -import {FolderService} from "../../../business/folder/folder.service"; -import {Folder} from "../../../business/folder/folder.model"; +import {FolderService} from "../../../../business/item/folder/folder.service"; +import {Folder} from "../../../../business/item/folder/folder.model"; @Component({ selector: 'app-folder-path', diff --git a/frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.html b/frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.html rename to frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.html diff --git a/frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.scss b/frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.scss similarity index 100% rename from frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.scss rename to frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.scss diff --git a/frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.ts b/frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.ts similarity index 68% rename from frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.ts rename to frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.ts index bc0ae8d..94f1959 100644 --- a/frontend/src/app/gui/folder/view/folder-sidebar/folder-sidebar.component.ts +++ b/frontend/src/app/gui/item/folder/view/folder-sidebar/folder-sidebar.component.ts @@ -1,11 +1,11 @@ import {Component, Input, OnInit} from '@angular/core'; -import {DropdownItem} from '../../../common/dropdown/data/dropdown.item'; -import {DropdownActionItem} from '../../../common/dropdown/data/dropdown.action-item'; +import {DropdownItem} from '../../../../common/dropdown/data/dropdown.item'; +import {DropdownActionItem} from '../../../../common/dropdown/data/dropdown.action-item'; import {Router} from '@angular/router'; -import {DropdownDivider} from '../../../common/dropdown/data/dropdown.divider'; -import {Folder} from "../../../../business/folder/folder.model"; -import {FolderService} from "../../../../business/folder/folder.service"; -import {ViewMode} from "../../../../business/folder/viewMode.model"; +import {DropdownDivider} from '../../../../common/dropdown/data/dropdown.divider'; +import {Folder} from "../../../../../business/item/folder/folder.model"; +import {FolderService} from "../../../../../business/item/folder/folder.service"; +import {ViewMode} from "../../../../../business/item/folder/viewMode.model"; @Component({ selector: 'folder-sidebar', diff --git a/frontend/src/app/gui/folder/view/folder.component.html b/frontend/src/app/gui/item/folder/view/folder.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/folder.component.html rename to frontend/src/app/gui/item/folder/view/folder.component.html diff --git a/frontend/src/app/gui/folder/view/folder.component.scss b/frontend/src/app/gui/item/folder/view/folder.component.scss similarity index 100% rename from frontend/src/app/gui/folder/view/folder.component.scss rename to frontend/src/app/gui/item/folder/view/folder.component.scss diff --git a/frontend/src/app/gui/folder/view/folder.component.ts b/frontend/src/app/gui/item/folder/view/folder.component.ts similarity index 77% rename from frontend/src/app/gui/folder/view/folder.component.ts rename to frontend/src/app/gui/item/folder/view/folder.component.ts index be06c86..3cc01ac 100644 --- a/frontend/src/app/gui/folder/view/folder.component.ts +++ b/frontend/src/app/gui/item/folder/view/folder.component.ts @@ -1,14 +1,14 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {ActivatedRoute, Params, Router} from "@angular/router"; -import {Pair} from "../../../common/Pair"; -import {DataLoader} from '../../common/virtual-list/rest-datasource/data.loader'; -import {Pagination} from '../../../api/dto/paging/pagination'; +import {Pair} from "../../../../common/Pair"; +import {DataLoader} from '../../../common/virtual-list/rest-datasource/data.loader'; +import {Pagination} from '../../../../api/dto/paging/pagination'; import {Observable, Subscription} from 'rxjs'; -import {Paged} from '../../../api/dto/paging/paged'; -import {Folder} from "../../../business/folder/folder.model"; -import {ViewMode} from "../../../business/folder/viewMode.model"; -import {OverviewItem} from "../../../business/folder/overviewItem.model"; -import {FolderService} from "../../../business/folder/folder.service"; +import {Paged} from '../../../../api/dto/paging/paged'; +import {Folder} from "../../../../business/item/folder/folder.model"; +import {ViewMode} from "../../../../business/item/folder/viewMode.model"; +import {OverviewItem} from "../../../../business/item/folder/overviewItem.model"; +import {FolderService} from "../../../../business/item/folder/folder.service"; @Component({ selector: 'app-box', diff --git a/frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.html b/frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.html rename to frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.html diff --git a/frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss b/frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss similarity index 89% rename from frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss rename to frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss index 071942a..4753b16 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss +++ b/frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.scss @@ -1,4 +1,4 @@ -@import "src/app/gui/folder/view/item/boxview/shared"; +@import "src/app/gui/item/folder/view/item/boxview/shared"; .accent { width: 10px; diff --git a/frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts b/frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts rename to frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts index ce53b5f..ad1bf7b 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/boxview/folder-item-box-view/folder-item.box-view.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {FolderOverview} from "../../../../../../business/folder/FolderOverview.model"; +import {FolderOverview} from "../../../../../../../business/item/folder/FolderOverview.model"; @Component({ selector: 'folderitem-boxview', diff --git a/frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.html b/frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.html rename to frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.html diff --git a/frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss b/frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss similarity index 87% rename from frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss rename to frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss index c7399bd..6f710ce 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss +++ b/frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.scss @@ -1,4 +1,4 @@ -@import "src/app/gui/folder/view/item/boxview/shared"; +@import "src/app/gui/item/folder/view/item/boxview/shared"; @import "src/styles/styles"; .note-box .title { diff --git a/frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts b/frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts rename to frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts index 2fa1af5..f34a232 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/boxview/note-item-box-view/note-item-box-view.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {NoteOverview} from "../../../../../../business/folder/noteOverview.model"; +import {NoteOverview} from "../../../../../../../business/item/folder/noteOverview.model"; @Component({ selector: 'noteitem-boxview', diff --git a/frontend/src/app/gui/folder/view/item/boxview/shared.scss b/frontend/src/app/gui/item/folder/view/item/boxview/shared.scss similarity index 100% rename from frontend/src/app/gui/folder/view/item/boxview/shared.scss rename to frontend/src/app/gui/item/folder/view/item/boxview/shared.scss diff --git a/frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.html b/frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.html rename to frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.html diff --git a/frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss b/frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss similarity index 88% rename from frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss rename to frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss index 42652de..56a870e 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss +++ b/frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.scss @@ -1,4 +1,4 @@ -@import "src/app/gui/folder/view/item/boxview/shared"; +@import "src/app/gui/item/folder/view/item/boxview/shared"; @import "src/styles/styles"; .note-box .title { diff --git a/frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts b/frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts rename to frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts index b31488f..1c482c5 100644 --- a/frontend/src/app/gui/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/boxview/task-item-box-view/task-item-box-view.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {TaskOverview} from "../../../../../../business/folder/taskOverview.model"; +import {TaskOverview} from "../../../../../../../business/item/folder/taskOverview.model"; @Component({ selector: 'taskitem-boxview', diff --git a/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.html b/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.html rename to frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.html diff --git a/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss b/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss new file mode 100644 index 0000000..5c9985d --- /dev/null +++ b/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.scss @@ -0,0 +1 @@ +@import "src/app/gui/item/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts b/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts rename to frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts index 02e7413..edcd448 100644 --- a/frontend/src/app/gui/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/listview/folderitem-listview/folderitem-listview.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {FolderOverview} from "../../../../../../business/folder/FolderOverview.model"; +import {FolderOverview} from "../../../../../../../business/item/folder/FolderOverview.model"; @Component({ selector: 'folderitem-listview', diff --git a/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.html b/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.html rename to frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.html diff --git a/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss b/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss new file mode 100644 index 0000000..5c9985d --- /dev/null +++ b/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.scss @@ -0,0 +1 @@ +@import "src/app/gui/item/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts b/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts rename to frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts index ef492ae..4934419 100644 --- a/frontend/src/app/gui/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/listview/noteitem-listview/noteitem-listview.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {NoteOverview} from "../../../../../../business/folder/noteOverview.model"; +import {NoteOverview} from "../../../../../../../business/item/folder/noteOverview.model"; @Component({ selector: 'noteitem-listview', diff --git a/frontend/src/app/gui/folder/view/item/listview/shared.scss b/frontend/src/app/gui/item/folder/view/item/listview/shared.scss similarity index 100% rename from frontend/src/app/gui/folder/view/item/listview/shared.scss rename to frontend/src/app/gui/item/folder/view/item/listview/shared.scss diff --git a/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.html b/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.html similarity index 100% rename from frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.html rename to frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.html diff --git a/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss b/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss new file mode 100644 index 0000000..5c9985d --- /dev/null +++ b/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.scss @@ -0,0 +1 @@ +@import "src/app/gui/item/folder/view/item/listview/shared"; diff --git a/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts b/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts similarity index 79% rename from frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts rename to frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts index 1046864..a4186b5 100644 --- a/frontend/src/app/gui/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts +++ b/frontend/src/app/gui/item/folder/view/item/listview/taskitem-listview/task-item-listview.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {TaskOverview} from "../../../../../../business/folder/taskOverview.model"; +import {TaskOverview} from "../../../../../../../business/item/folder/taskOverview.model"; @Component({ selector: 'task-item-listview', diff --git a/frontend/src/app/gui/note/note-edit/auto-grow.directive.ts b/frontend/src/app/gui/item/note/note-edit/auto-grow.directive.ts similarity index 100% rename from frontend/src/app/gui/note/note-edit/auto-grow.directive.ts rename to frontend/src/app/gui/item/note/note-edit/auto-grow.directive.ts diff --git a/frontend/src/app/gui/note/note-edit/note-edit.component.html b/frontend/src/app/gui/item/note/note-edit/note-edit.component.html similarity index 100% rename from frontend/src/app/gui/note/note-edit/note-edit.component.html rename to frontend/src/app/gui/item/note/note-edit/note-edit.component.html diff --git a/frontend/src/app/gui/note/note-edit/note-edit.component.scss b/frontend/src/app/gui/item/note/note-edit/note-edit.component.scss similarity index 100% rename from frontend/src/app/gui/note/note-edit/note-edit.component.scss rename to frontend/src/app/gui/item/note/note-edit/note-edit.component.scss diff --git a/frontend/src/app/gui/note/note-edit/note-edit.component.ts b/frontend/src/app/gui/item/note/note-edit/note-edit.component.ts similarity index 86% rename from frontend/src/app/gui/note/note-edit/note-edit.component.ts rename to frontend/src/app/gui/item/note/note-edit/note-edit.component.ts index 9d0908b..704e327 100644 --- a/frontend/src/app/gui/note/note-edit/note-edit.component.ts +++ b/frontend/src/app/gui/item/note/note-edit/note-edit.component.ts @@ -2,9 +2,9 @@ import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {NoteService} from "../note.service"; import {NoteComponent} from "../note.component"; -import {AuthService} from "../../../auth/auth.service"; -import {Note} from "../../../business/note/note.model"; -import {FolderService} from "../../../business/folder/folder.service"; +import {AuthService} from "../../../../auth/auth.service"; +import {Note} from "../../../../business/item/note/note.model"; +import {FolderService} from "../../../../business/item/folder/folder.service"; @Component({ selector: 'app-note-edit', diff --git a/frontend/src/app/gui/note/note-header/note-header.component.html b/frontend/src/app/gui/item/note/note-header/note-header.component.html similarity index 100% rename from frontend/src/app/gui/note/note-header/note-header.component.html rename to frontend/src/app/gui/item/note/note-header/note-header.component.html diff --git a/frontend/src/app/gui/note/note-header/note-header.component.scss b/frontend/src/app/gui/item/note/note-header/note-header.component.scss similarity index 100% rename from frontend/src/app/gui/note/note-header/note-header.component.scss rename to frontend/src/app/gui/item/note/note-header/note-header.component.scss diff --git a/frontend/src/app/gui/note/note-header/note-header.component.ts b/frontend/src/app/gui/item/note/note-header/note-header.component.ts similarity index 70% rename from frontend/src/app/gui/note/note-header/note-header.component.ts rename to frontend/src/app/gui/item/note/note-header/note-header.component.ts index b7c8801..daa531d 100644 --- a/frontend/src/app/gui/note/note-header/note-header.component.ts +++ b/frontend/src/app/gui/item/note/note-header/note-header.component.ts @@ -1,12 +1,12 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core'; -import {DropdownItem} from "../../common/dropdown/data/dropdown.item"; -import {DropdownActionItem} from "../../common/dropdown/data/dropdown.action-item"; -import {DropdownDivider} from "../../common/dropdown/data/dropdown.divider"; -import {ModalComponent} from "../../common/modal/modal.component"; +import {DropdownItem} from "../../../common/dropdown/data/dropdown.item"; +import {DropdownActionItem} from "../../../common/dropdown/data/dropdown.action-item"; +import {DropdownDivider} from "../../../common/dropdown/data/dropdown.divider"; +import {ModalComponent} from "../../../common/modal/modal.component"; import {ActivatedRoute, Router} from "@angular/router"; import {NoteService} from "../note.service"; -import {Note} from "../../../business/note/note.model"; -import {Folder} from "../../../business/folder/folder.model"; +import {Note} from "../../../../business/item/note/note.model"; +import {Folder} from "../../../../business/item/folder/folder.model"; @Component({ selector: 'app-note-header', @@ -28,6 +28,9 @@ export class NoteHeaderComponent implements OnInit { new DropdownActionItem('fa fa-pencil', 'Edit', () => { this.router.navigate(['/note/' + this.note.id + '/edit']); }), + new DropdownActionItem('fas fa-times-circle', 'Close', () => { + this.router.navigate(['/folder/' + this.folder.id]); + }), new DropdownDivider(), new DropdownActionItem('fas fa-trash-alt', 'Delete this', () => { this.deleteDialog.show(); diff --git a/frontend/src/app/gui/note/note-view/note-view.component.html b/frontend/src/app/gui/item/note/note-view/note-view.component.html similarity index 100% rename from frontend/src/app/gui/note/note-view/note-view.component.html rename to frontend/src/app/gui/item/note/note-view/note-view.component.html diff --git a/frontend/src/app/gui/note/note-view/note-view.component.scss b/frontend/src/app/gui/item/note/note-view/note-view.component.scss similarity index 100% rename from frontend/src/app/gui/note/note-view/note-view.component.scss rename to frontend/src/app/gui/item/note/note-view/note-view.component.scss diff --git a/frontend/src/app/gui/note/note-view/note-view.component.ts b/frontend/src/app/gui/item/note/note-view/note-view.component.ts similarity index 82% rename from frontend/src/app/gui/note/note-view/note-view.component.ts rename to frontend/src/app/gui/item/note/note-view/note-view.component.ts index 0aa70ff..8842b83 100644 --- a/frontend/src/app/gui/note/note-view/note-view.component.ts +++ b/frontend/src/app/gui/item/note/note-view/note-view.component.ts @@ -2,8 +2,8 @@ import {Component} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {NoteService} from "../note.service"; import {NoteComponent} from "../note.component"; -import {AuthService} from "../../../auth/auth.service"; -import {FolderService} from "../../../business/folder/folder.service"; +import {AuthService} from "../../../../auth/auth.service"; +import {FolderService} from "../../../../business/item/folder/folder.service"; @Component({ selector: 'app-note-view', diff --git a/frontend/src/app/gui/note/note.component.ts b/frontend/src/app/gui/item/note/note.component.ts similarity index 84% rename from frontend/src/app/gui/note/note.component.ts rename to frontend/src/app/gui/item/note/note.component.ts index 39ae349..3c6cfcc 100644 --- a/frontend/src/app/gui/note/note.component.ts +++ b/frontend/src/app/gui/item/note/note.component.ts @@ -1,11 +1,11 @@ import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Params, Router} from '@angular/router'; -import {AuthService} from "../../auth/auth.service"; +import {AuthService} from "../../../auth/auth.service"; import {NoteService} from "./note.service"; -import {User} from "../../business/user/user.model"; -import {Folder} from "../../business/folder/folder.model"; -import {Note} from "../../business/note/note.model"; -import {FolderService} from "../../business/folder/folder.service"; +import {User} from "../../../business/user/user.model"; +import {Folder} from "../../../business/item/folder/folder.model"; +import {Note} from "../../../business/item/note/note.model"; +import {FolderService} from "../../../business/item/folder/folder.service"; @Component({ selector: 'app-abstract-note', diff --git a/frontend/src/app/gui/note/note.service.ts b/frontend/src/app/gui/item/note/note.service.ts similarity index 83% rename from frontend/src/app/gui/note/note.service.ts rename to frontend/src/app/gui/item/note/note.service.ts index e17f47c..b5178a4 100644 --- a/frontend/src/app/gui/note/note.service.ts +++ b/frontend/src/app/gui/item/note/note.service.ts @@ -1,10 +1,10 @@ import {map} from 'rxjs/operators'; import {Injectable} from '@angular/core'; -import {BoxitApi} from '../../api/boxit.api'; -import {NoteDto} from '../../api/dto/note/note.dto'; -import {NotificationService} from "../../business/notification.service"; -import {Note} from "../../business/note/note.model"; -import {NoteMapper} from "../../business/note/note.mapper"; +import {BoxitApi} from '../../../api/boxit.api'; +import {NoteDto} from '../../../api/dto/note/note.dto'; +import {NotificationService} from "../../../business/notification.service"; +import {Note} from "../../../business/item/note/note.model"; +import {NoteMapper} from "../../../business/item/note/note.mapper"; @Injectable() export class NoteService { diff --git a/frontend/src/app/gui/task/task-edit/task-edit.component.html b/frontend/src/app/gui/item/task/task-edit/task-edit.component.html similarity index 100% rename from frontend/src/app/gui/task/task-edit/task-edit.component.html rename to frontend/src/app/gui/item/task/task-edit/task-edit.component.html diff --git a/frontend/src/app/gui/task/task-edit/task-edit.component.scss b/frontend/src/app/gui/item/task/task-edit/task-edit.component.scss similarity index 100% rename from frontend/src/app/gui/task/task-edit/task-edit.component.scss rename to frontend/src/app/gui/item/task/task-edit/task-edit.component.scss diff --git a/frontend/src/app/gui/task/task-edit/task-edit.component.ts b/frontend/src/app/gui/item/task/task-edit/task-edit.component.ts similarity index 100% rename from frontend/src/app/gui/task/task-edit/task-edit.component.ts rename to frontend/src/app/gui/item/task/task-edit/task-edit.component.ts diff --git a/frontend/src/app/gui/item/task/task-header/task-header.component.html b/frontend/src/app/gui/item/task/task-header/task-header.component.html new file mode 100644 index 0000000..81c9d97 --- /dev/null +++ b/frontend/src/app/gui/item/task/task-header/task-header.component.html @@ -0,0 +1,45 @@ +
+ + + + + / {{task.title}} +
+
+ + + + + + + + +
+
+ + + +
+

+ Id: {{task.id ? task.id : 'n/a'}}
+ Owner: {{task.ownerId}}
+ Created: {{task.createdAt | date:'yyyy.MM.dd HH:mm'}}
+ Edited: {{task.editedLastAt | date:'yyyy.MM.dd HH:mm'}}
+

+
+ + + + +
+

Are you sure you want delete this note?

+
+
+ + +
+ diff --git a/frontend/src/app/gui/item/task/task-header/task-header.component.scss b/frontend/src/app/gui/item/task/task-header/task-header.component.scss new file mode 100644 index 0000000..b982d37 --- /dev/null +++ b/frontend/src/app/gui/item/task/task-header/task-header.component.scss @@ -0,0 +1,25 @@ +@import "src/styles/styles"; + +.img-thumbnail { + grid-area: avatar; + @extend .circle; + padding: 0px; + border: 2px solid white; + margin-top: -7px; + margin-bottom: -8px; +} + +.header-folder-name { + grid-area: folderName; + margin-left: 0.5em; + margin-right: 0.5em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.leftSide { + .fas { + margin-left: $spacing-small; + } +} diff --git a/frontend/src/app/gui/item/task/task-header/task-header.component.ts b/frontend/src/app/gui/item/task/task-header/task-header.component.ts new file mode 100644 index 0000000..ddd12eb --- /dev/null +++ b/frontend/src/app/gui/item/task/task-header/task-header.component.ts @@ -0,0 +1,61 @@ +import {Component, Input, OnInit, ViewChild} from '@angular/core'; +import {Folder} from '../../../../business/item/folder/folder.model'; +import {ModalComponent} from '../../../common/modal/modal.component'; +import {DropdownItem} from '../../../common/dropdown/data/dropdown.item'; +import {DropdownActionItem} from '../../../common/dropdown/data/dropdown.action-item'; +import {DropdownDivider} from '../../../common/dropdown/data/dropdown.divider'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Task} from '../../../../business/item/task/task.model'; +import {TaskService} from '../task.service'; + +@Component({ + selector: 'app-task-header', + templateUrl: './task-header.component.html', + styleUrls: ['./task-header.component.scss'] +}) +export class TaskHeaderComponent implements OnInit { + + @Input() public task: Task; + @Input() public folder: Folder; + + @ViewChild('infoDialog', {read: false}) + private infoDialog: ModalComponent; + + @ViewChild('deleteDialog', {read: false}) + private deleteDialog: ModalComponent; + + hamburgerEntries: DropdownItem[] = [ + new DropdownActionItem('fa fa-pencil', 'Edit', () => { + this.router.navigate(['/task/' + this.task.id + '/edit']); + }), + new DropdownActionItem('fas fa-times-circle', 'Close', () => { + this.router.navigate(['/folder/' + this.folder.id]); + }), + new DropdownDivider(), + new DropdownActionItem('fas fa-trash-alt', 'Delete this', () => { + this.deleteDialog.show(); + }) + ]; + + constructor(private router: Router, + private route: ActivatedRoute, + private taskService: TaskService) { + } + + ngOnInit() { + } + + public avatarUrl() { + return `/api/user/${this.task.ownerId}/avatar`; + } + + public onInfo() { + this.infoDialog.show(); + } + + public onDelete() { + this.taskService.delete(this.task).then((ok: any) => { + this.router.navigate(['/folder/' + this.task.folderId]); + }); + } +} diff --git a/frontend/src/app/gui/item/task/task-view/task-view.component.html b/frontend/src/app/gui/item/task/task-view/task-view.component.html new file mode 100644 index 0000000..592d365 --- /dev/null +++ b/frontend/src/app/gui/item/task/task-view/task-view.component.html @@ -0,0 +1,34 @@ + +
+ +
+ +
+
+ +
+
+
+
+
Priority:
+
{{'item.task.priority.' + task.priority.name | translate}}
+
State:
+
{{'item.task.state.' + task.state | translate}}
+
Start:
+
+
Due:
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
diff --git a/frontend/src/app/gui/item/task/task-view/task-view.component.scss b/frontend/src/app/gui/item/task/task-view/task-view.component.scss new file mode 100644 index 0000000..c324cdd --- /dev/null +++ b/frontend/src/app/gui/item/task/task-view/task-view.component.scss @@ -0,0 +1,66 @@ +@import "src/styles/styles"; + +.mainView { + padding: $spacing-extra-large $spacing-large; + display: flex; + justify-content: center; + align-items: flex-start; + + height: calc(100vh - #{$header-high}); + overflow-x: hidden; + overflow-y: auto; +} + +hr { + height: 0; + border: 0; + border-bottom: 1px solid $color-hr; + margin-bottom: $spacing-large; + margin-top: $spacing-large; +} + +@include tablet-up { + .fields { + grid-template-columns: max-content auto max-content auto; + grid-template-rows: auto auto; + grid-template-areas: + "LabelPriority ValuePriority LabelStart ValueStart" + "LabelState ValueState LabelDue ValueDue"; + } +} + +@include phablet-down { + .fields { + grid-template-columns: max-content auto; + grid-template-rows: auto auto auto auto; + grid-template-areas: + "LabelPriority ValuePriority" + "LabelState ValueState" + "LabelStart ValueStart" + "LabelDue ValueDue"; + } +} + +.fields { + display: grid; + grid-column-gap: $spacing-large; + grid-row-gap: $spacing-small; + + .label-priority { grid-area: LabelPriority} + .value-priority { grid-area: ValuePriority} + .label-state { grid-area: LabelState } + .value-state { grid-area: ValueState } + .label-start { grid-area: LabelStart } + .value-start { grid-area: ValueStart } + .label-due { grid-area: LabelDue } + .value-due { grid-area: ValueDue } + + .label { + @extend .font; + font-weight: bold; + } +} + +article { + color: $color-font-dark; +} diff --git a/frontend/src/app/gui/task/task-view/task-view.component.ts b/frontend/src/app/gui/item/task/task-view/task-view.component.ts similarity index 82% rename from frontend/src/app/gui/task/task-view/task-view.component.ts rename to frontend/src/app/gui/item/task/task-view/task-view.component.ts index c9e2ace..86c09c0 100644 --- a/frontend/src/app/gui/task/task-view/task-view.component.ts +++ b/frontend/src/app/gui/item/task/task-view/task-view.component.ts @@ -1,9 +1,9 @@ import {Component} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; -import {AuthService} from "../../../auth/auth.service"; +import {AuthService} from "../../../../auth/auth.service"; import {TaskService} from "../task.service"; import {TaskComponent} from "../task.component"; -import {FolderService} from "../../../business/folder/folder.service"; +import {FolderService} from "../../../../business/item/folder/folder.service"; @Component({ selector: 'app-task-view', diff --git a/frontend/src/app/gui/task/task.component.ts b/frontend/src/app/gui/item/task/task.component.ts similarity index 84% rename from frontend/src/app/gui/task/task.component.ts rename to frontend/src/app/gui/item/task/task.component.ts index 42b195b..efe3759 100644 --- a/frontend/src/app/gui/task/task.component.ts +++ b/frontend/src/app/gui/item/task/task.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import {ActivatedRoute, Params, Router} from "@angular/router"; import {TaskService} from "./task.service"; -import {AuthService} from "../../auth/auth.service"; -import {User} from "../../business/user/user.model"; -import {Task} from "../../business/task/task.model"; -import {Folder} from "../../business/folder/folder.model"; -import {FolderService} from "../../business/folder/folder.service"; +import {AuthService} from "../../../auth/auth.service"; +import {User} from "../../../business/user/user.model"; +import {Task} from "../../../business/item/task/task.model"; +import {Folder} from "../../../business/item/folder/folder.model"; +import {FolderService} from "../../../business/item/folder/folder.service"; @Component({ selector: 'app-task', diff --git a/frontend/src/app/gui/task/task.service.ts b/frontend/src/app/gui/item/task/task.service.ts similarity index 83% rename from frontend/src/app/gui/task/task.service.ts rename to frontend/src/app/gui/item/task/task.service.ts index 47096f2..229e09c 100644 --- a/frontend/src/app/gui/task/task.service.ts +++ b/frontend/src/app/gui/item/task/task.service.ts @@ -1,10 +1,10 @@ -import {BoxitApi} from "../../api/boxit.api"; -import {NotificationService} from "../../business/notification.service"; +import {BoxitApi} from "../../../api/boxit.api"; +import {NotificationService} from "../../../business/notification.service"; import {Injectable} from "@angular/core"; import {map} from "rxjs/operators"; -import {TaskDto} from "../../api/dto/task/task.dto"; -import {Task} from "../../business/task/task.model"; -import {TaskMapper} from "../../business/task/task.mapper"; +import {TaskDto} from "../../../api/dto/task/task.dto"; +import {Task} from "../../../business/item/task/task.model"; +import {TaskMapper} from "../../../business/item/task/task.mapper"; @Injectable() export class TaskService { diff --git a/frontend/src/app/gui/note/location/edit/location-edit.component.html b/frontend/src/app/gui/location/edit/location-edit.component.html similarity index 100% rename from frontend/src/app/gui/note/location/edit/location-edit.component.html rename to frontend/src/app/gui/location/edit/location-edit.component.html diff --git a/frontend/src/app/gui/note/location/edit/location-edit.component.scss b/frontend/src/app/gui/location/edit/location-edit.component.scss similarity index 100% rename from frontend/src/app/gui/note/location/edit/location-edit.component.scss rename to frontend/src/app/gui/location/edit/location-edit.component.scss diff --git a/frontend/src/app/gui/note/location/edit/location-edit.component.ts b/frontend/src/app/gui/location/edit/location-edit.component.ts similarity index 68% rename from frontend/src/app/gui/note/location/edit/location-edit.component.ts rename to frontend/src/app/gui/location/edit/location-edit.component.ts index 68eb05a..cb745e0 100644 --- a/frontend/src/app/gui/note/location/edit/location-edit.component.ts +++ b/frontend/src/app/gui/location/edit/location-edit.component.ts @@ -1,7 +1,7 @@ import {Component, Input, OnInit} from '@angular/core'; -import {Folder} from "../../../../business/folder/folder.model"; -import {Coordinates} from "../../../../business/location/Coordinates.model"; -import {Location} from "../../../../business/location/Location.model"; +import {Folder} from "../../../business/item/folder/folder.model"; +import {Coordinates} from "../../../business/location/Coordinates.model"; +import {Location} from "../../../business/location/Location.model"; @Component({ selector: 'app-location-edit', diff --git a/frontend/src/app/gui/note/location/map/map.component.html b/frontend/src/app/gui/location/map/map.component.html similarity index 100% rename from frontend/src/app/gui/note/location/map/map.component.html rename to frontend/src/app/gui/location/map/map.component.html diff --git a/frontend/src/app/gui/note/location/map/map.component.scss b/frontend/src/app/gui/location/map/map.component.scss similarity index 100% rename from frontend/src/app/gui/note/location/map/map.component.scss rename to frontend/src/app/gui/location/map/map.component.scss diff --git a/frontend/src/app/gui/note/location/map/map.component.ts b/frontend/src/app/gui/location/map/map.component.ts similarity index 98% rename from frontend/src/app/gui/note/location/map/map.component.ts rename to frontend/src/app/gui/location/map/map.component.ts index 3f46d15..16b04ee 100644 --- a/frontend/src/app/gui/note/location/map/map.component.ts +++ b/frontend/src/app/gui/location/map/map.component.ts @@ -1,6 +1,6 @@ import {AfterViewInit, Component, DoCheck, EventEmitter, Input, OnChanges, OnInit, Output} from '@angular/core'; import * as L from 'leaflet'; -import {Coordinates} from "../../../../business/location/Coordinates.model"; +import {Coordinates} from "../../../business/location/Coordinates.model"; @Component({ selector: 'bmap', diff --git a/frontend/src/app/gui/note/location/view/location-view.component.html b/frontend/src/app/gui/location/view/location-view.component.html similarity index 68% rename from frontend/src/app/gui/note/location/view/location-view.component.html rename to frontend/src/app/gui/location/view/location-view.component.html index a8f024b..3958264 100644 --- a/frontend/src/app/gui/note/location/view/location-view.component.html +++ b/frontend/src/app/gui/location/view/location-view.component.html @@ -1,7 +1,7 @@ Location: {{location.address}}
- CoordinatesModel: {{location.coordinates.longitude}}, {{location.coordinates.latitude}}
+ Coordinates: {{location.coordinates.longitude}}, {{location.coordinates.latitude}}
 diff --git a/frontend/src/app/gui/note/location/view/location-view.component.scss b/frontend/src/app/gui/location/view/location-view.component.scss similarity index 100% rename from frontend/src/app/gui/note/location/view/location-view.component.scss rename to frontend/src/app/gui/location/view/location-view.component.scss diff --git a/frontend/src/app/gui/note/location/view/location-view.component.ts b/frontend/src/app/gui/location/view/location-view.component.ts similarity index 82% rename from frontend/src/app/gui/note/location/view/location-view.component.ts rename to frontend/src/app/gui/location/view/location-view.component.ts index 306ff67..9ee0906 100644 --- a/frontend/src/app/gui/note/location/view/location-view.component.ts +++ b/frontend/src/app/gui/location/view/location-view.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {Location} from "../../../../business/location/Location.model"; +import {Location} from "../../../business/location/Location.model"; @Component({ selector: 'app-location-view', diff --git a/frontend/src/app/gui/page/not-allowed-page/not-allowed-page.component.ts b/frontend/src/app/gui/page/not-allowed-page/not-allowed-page.component.ts index 168f3cf..26b454a 100644 --- a/frontend/src/app/gui/page/not-allowed-page/not-allowed-page.component.ts +++ b/frontend/src/app/gui/page/not-allowed-page/not-allowed-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {Accent} from "../../../business/folder/Accent.model"; +import {Accent} from "../../../business/item/folder/Accent.model"; @Component({ selector: 'app-not-allowed-page', diff --git a/frontend/src/app/gui/page/not-found-page/not-found-page.component.ts b/frontend/src/app/gui/page/not-found-page/not-found-page.component.ts index ce0d7e4..dbffcd0 100644 --- a/frontend/src/app/gui/page/not-found-page/not-found-page.component.ts +++ b/frontend/src/app/gui/page/not-found-page/not-found-page.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {Accent} from "../../../business/folder/Accent.model"; +import {Accent} from "../../../business/item/folder/Accent.model"; @Component({ selector: 'app-not-found-page', diff --git a/frontend/src/app/gui/task/task-view/task-view.component.html b/frontend/src/app/gui/task/task-view/task-view.component.html deleted file mode 100644 index 8b9d8f9..0000000 --- a/frontend/src/app/gui/task/task-view/task-view.component.html +++ /dev/null @@ -1,7 +0,0 @@ -

- ID:{{task.id}}
- Title:{{task.title}}
- Description:{{task.description}}
- State:{{task.state}}
- Prio:{{task.priority}}
-

diff --git a/frontend/src/app/gui/task/task-view/task-view.component.scss b/frontend/src/app/gui/task/task-view/task-view.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/assets/i18n/de.json b/frontend/src/assets/i18n/de.json index b5cfbe1..561266b 100644 --- a/frontend/src/assets/i18n/de.json +++ b/frontend/src/assets/i18n/de.json @@ -6,5 +6,23 @@ "TEXT": "Text", "LOCATION": "Ort", - "ATTACHMENT": "Anhang" + "ATTACHMENT": "Anhang", + + "item": { + "task": { + "priority": { + "LOWEST": "Sehr Tief", + "LOW": "Tief", + "NORMAL": "Mittel", + "HIGH": "Hoch", + "HIGHEST": "Sehr Hoch" + }, + "state": { + "BACKLOG": "Backlog", + "READY": "Bereit", + "IN_PROGRESS": "In Bearbeitung", + "DONE": "Erledigt" + } + } + } } diff --git a/frontend/src/assets/i18n/en.json b/frontend/src/assets/i18n/en.json index c55685b..4697d27 100644 --- a/frontend/src/assets/i18n/en.json +++ b/frontend/src/assets/i18n/en.json @@ -5,6 +5,24 @@ }, "TEXT": "Text", - "LOCATION": "Ort", - "ATTACHMENT": "Anhang" + "LOCATION": "Location", + "ATTACHMENT": "Attachment", + + "item": { + "task": { + "priority": { + "LOWEST": "Lowest", + "LOW": "Low", + "NORMAL": "Medium", + "HIGH": "High", + "HIGHEST": "Highest" + }, + "state": { + "BACKLOG": "Backlog", + "READY": "Ready", + "IN_PROGRESS": "Working on", + "DONE": "Done" + } + } + } }