Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@dysTOS
dysTOS committed Jan 11, 2024
1 parent 74d873e commit 9dcf899
Show file tree
Hide file tree
Showing 53 changed files with 693 additions and 1,478 deletions.
14 changes: 7 additions & 7 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"normalize.css": "^8.0.1",
"primeflex": "3.3",
"primeicons": "^6.0.1",
"primeng": "^17.0.0",
"primeng": "^17.3.0",
"prismjs": "^1.27.0",
"rxjs": "^7.4.0",
"subsink": "^1.0.2",
Expand Down
44 changes: 20 additions & 24 deletions src/app/app-routing.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,20 @@ import { AppInvoiceComponent } from "./pages/app.invoice.component";
import { AppHelpComponent } from "./pages/app.help.component";
import { AusrueckungSingleComponent } from "./components/ausrueckungen/ausrueckung-single/ausrueckung-single.component";
import { RouteGuard } from "./guards/route.guard";
import { MitgliederDetailsComponent } from "./components/mitglieder/mitglieder-single/mitglieder-details.component";
import { MitgliederEditComponent } from "./components/mitglieder/mitglieder-edit/mitglieder-edit.component";
import { NotenOverviewComponent } from "./components/archiv/noten/noten-overview/noten-overview.component";
import { NotenmappenOverviewComponent } from "./components/archiv/notenmappen/notenmappen-overview/notenmappen-overview.component";
import { NotenmappeEditComponent } from "./components/archiv/notenmappen/notenmappe-edit/notenmappe-edit.component";
import { KassabuecherComponent } from "./components/finanzen/kassabuecher-overview/kassabuecher-overview.component";
import { ArchivWrapperComponent } from "./components/archiv/archiv-wrapper.component";
import { AusrueckungenWrapperComponent } from "./components/ausrueckungen/ausrueckungen-wrapper.component";
import { environment } from "src/environments/environment";
import { KalenderaboComponent } from "./components/ausrueckungen/kalenderabo/kalenderabo.component";
import { AusrueckungenAktuellComponent } from "./components/ausrueckungen/ausrueckungen-aktuell/ausrueckungen-aktuell.component";
import { KalenderaboComponent } from "./components/termine/kalenderabo/kalenderabo.component";
import { TermineOverviewComponent } from "./components/termine/termine-overview/termine-overview.component";
import { GlobalRouteGuard } from "./guards/global-route.guard";
import { AusrueckungEditorComponent } from "./components/ausrueckungen/ausrueckung-editor/ausrueckung-editor.component";
import { TerminEditComponent } from "./components/termine/termin-edit/termin-edit.component";
import { EditDeactivateGuard } from "./guards/edit-deactivate.guard";
import { MitgliederWrapperComponent } from "./components/mitglieder/mitglieder-wrapper.component";
import { GruppenOverviewComponent } from "./components/gruppen/gruppen-overview/gruppen-overview.component";
import { MitgliederListComponent } from "./components/mitglieder/mitglied-list/mitglieder-list.component";
import { MitgliederOverviewComponent } from "./components/mitglieder/mitglied-overview/mitglieder-overview.component";
import { GruppeEditComponent } from "./components/gruppen/gruppe-edit/gruppe-edit.component";
import { EinstellungenWrapperComponent } from "./components/einstellungen/einstellungen-wrapper.component";
import { MitgliedPersonalEditComponent } from "./components/einstellungen/mitglied-personal-edit/mitglied-personal-edit.component";
import { RollenEditComponent } from "./components/einstellungen/rollen-edit/rollen-edit.component";
import { LokaleEinstellungenComponent } from "./components/einstellungen/lokale-einstellungen/lokale-einstellungen.component";
Expand All @@ -39,12 +35,12 @@ import { InstrumenteOverviewComponent } from "./components/archiv/instrumente/in
import { InstrumenteEditorComponent } from "./components/archiv/instrumente/instrumente-editor/instrumente-editor.component";
import { MkjChangeLogsComponent } from "./pages/change-logs/change-logs.component";
import { GlobaleEinstellungenComponent } from "./components/einstellungen/globale-einstellungen/globale-einstellungen.component";
import { FinanzenWrapperComponent } from "./components/finanzen/finanzen-wrapper.component";
import { KassabuchDetailsComponent } from "./components/finanzen/kassabuch-details/kassabuch-details.component";
import { KassabuchEditComponent } from "./components/finanzen/kassabuch-edit/kassabuch-edit.component";
import { KassabuchungEditComponent } from "./components/finanzen/kassabuchung-edit/kassabuchung-edit.component";
import { AnschriftenOverviewComponent as AnschriftOverviewComponent } from "./components/anschriften/anschriften-overview/anschriften-overview.component";
import { AnschriftEditComponent as AnschriftEditComponent } from "./components/anschriften/anschriften-edit/anschriften-edit.component";
import { RouterOutletWrapperComponent } from "./components/router-outlet-wrapper.component";

@NgModule({
imports: [
Expand Down Expand Up @@ -74,13 +70,13 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "ausrueckungen",
component: AusrueckungenWrapperComponent,
component: RouterOutletWrapperComponent,
canActivate: [RouteGuard],
title: environment.appTitle + " - TERMINE",
children: [
{
path: "aktuell",
component: AusrueckungenAktuellComponent,
component: TermineOverviewComponent,
canActivate: [RouteGuard],
},
{
Expand All @@ -90,13 +86,13 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "neu",
component: AusrueckungEditorComponent,
component: TerminEditComponent,
canActivate: [RouteGuard],
canDeactivate: [EditDeactivateGuard],
},
{
path: ":id",
component: AusrueckungEditorComponent,
component: TerminEditComponent,
canActivate: [RouteGuard],
canDeactivate: [EditDeactivateGuard],
},
Expand All @@ -114,15 +110,10 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "mitglieder",
component: MitgliederWrapperComponent,
component: RouterOutletWrapperComponent,
canActivate: [RouteGuard],
title: environment.appTitle + " - MITGLIEDER",
children: [
{
path: "liste",
component: MitgliederListComponent,
canActivate: [RouteGuard],
},
{
path: "gruppen",
component: GruppenOverviewComponent,
Expand All @@ -134,9 +125,14 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
canActivate: [RouteGuard],
canDeactivate: [EditDeactivateGuard],
},
{
path: "liste",
component: MitgliederOverviewComponent,
canActivate: [RouteGuard],
},
{
path: ":id",
component: MitgliederDetailsComponent,
component: MitgliederEditComponent,
canActivate: [RouteGuard],
canDeactivate: [EditDeactivateGuard],
},
Expand All @@ -149,7 +145,7 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "archiv",
component: ArchivWrapperComponent,
component: RouterOutletWrapperComponent,
canActivate: [RouteGuard],
title: environment.appTitle + " - ARCHIV",
children: [
Expand Down Expand Up @@ -197,7 +193,7 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "finanzen",
component: FinanzenWrapperComponent,
component: RouterOutletWrapperComponent,
canActivate: [RouteGuard],
title: environment.appTitle + " - FINANZEN",
children: [
Expand Down Expand Up @@ -238,7 +234,7 @@ import { AnschriftEditComponent as AnschriftEditComponent } from "./components/a
},
{
path: "einstellungen",
component: EinstellungenWrapperComponent,
component: RouterOutletWrapperComponent,
canActivate: [RouteGuard],
title: environment.appTitle + " - EINSTELLUNGEN",

Expand Down
36 changes: 13 additions & 23 deletions src/app/app.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,32 +110,28 @@ import { TriStateCheckboxModule } from "primeng/tristatecheckbox";
import { environment } from "src/environments/environment";
import { AatestComponent } from "./components/aatest/aatest.component";
import { TestApiComponent } from "./components/aatest/test-api/test-api.component";
import { ArchivWrapperComponent } from "./components/archiv/archiv-wrapper.component";
import { InstrumenteEditorComponent } from "./components/archiv/instrumente/instrumente-editor/instrumente-editor.component";
import { InstrumenteOverviewComponent } from "./components/archiv/instrumente/instrumente-overview/instrumente-overview.component";
import { NotenCardComponent } from "./components/archiv/noten/noten-card/noten-card.component";
import { NotenEditorComponent } from "./components/archiv/noten/noten-editor/noten-editor.component";
import { NotenOverviewComponent } from "./components/archiv/noten/noten-overview/noten-overview.component";
import { NotenmappeEditComponent } from "./components/archiv/notenmappen/notenmappe-edit/notenmappe-edit.component";
import { NotenmappenOverviewComponent } from "./components/archiv/notenmappen/notenmappen-overview/notenmappen-overview.component";
import { AusrueckungEditorComponent } from "./components/ausrueckungen/ausrueckung-editor/ausrueckung-editor.component";
import { TerminEditComponent } from "./components/termine/termin-edit/termin-edit.component";
import { AnwesenheitsListeComponent } from "./components/ausrueckungen/ausrueckung-single/anwesenheits-liste/anwesenheits-liste.component";
import { AusrueckungSingleComponent } from "./components/ausrueckungen/ausrueckung-single/ausrueckung-single.component";
import { TeilnahmenOverviewComponent } from "./components/ausrueckungen/ausrueckung-single/teilnahmen-overview/teilnahmen-overview.component";
import { AusrueckungenAktuellComponent } from "./components/ausrueckungen/ausrueckungen-aktuell/ausrueckungen-aktuell.component";
import { AusrueckungenWrapperComponent } from "./components/ausrueckungen/ausrueckungen-wrapper.component";
import { KalenderaboComponent } from "./components/ausrueckungen/kalenderabo/kalenderabo.component";
import { TermineOverviewComponent } from "./components/termine/termine-overview/termine-overview.component";
import { KalenderaboComponent } from "./components/termine/kalenderabo/kalenderabo.component";
import { TerminCardComponent } from "./components/ausrueckungen/termin-card/termin-card.component";
import { EinstellungenWrapperComponent } from "./components/einstellungen/einstellungen-wrapper.component";
import { LokaleEinstellungenComponent } from "./components/einstellungen/lokale-einstellungen/lokale-einstellungen.component";
import { MitgliedPersonalEditComponent } from "./components/einstellungen/mitglied-personal-edit/mitglied-personal-edit.component";
import { RollenEditComponent } from "./components/einstellungen/rollen-edit/rollen-edit.component";
import { GruppeEditComponent } from "./components/gruppen/gruppe-edit/gruppe-edit.component";
import { GruppenOverviewComponent } from "./components/gruppen/gruppen-overview/gruppen-overview.component";
import { MitgliederListComponent } from "./components/mitglieder/mitglied-list/mitglieder-list.component";
import { MitgliedRolesPickerComponent } from "./components/mitglieder/mitglieder-single/mitglied-roles-picker/mitglied-roles-picker.component";
import { MitgliederDetailsComponent } from "./components/mitglieder/mitglieder-single/mitglieder-details.component";
import { MitgliederWrapperComponent } from "./components/mitglieder/mitglieder-wrapper.component";
import { MitgliederOverviewComponent } from "./components/mitglieder/mitglied-overview/mitglieder-overview.component";
import { MitgliedRolesPickerComponent } from "./components/mitglieder/mitglied-roles-picker/mitglied-roles-picker.component";
import { MitgliederEditComponent } from "./components/mitglieder/mitglieder-edit/mitglieder-edit.component";
import { MkjDashboardComponent } from "./components/mkj-dashboard/mkj-dashboard.component";
import { NextGeburtstagComponent } from "./components/mkj-dashboard/next-geburtstag/next-geburtstag.component";
import { NextTerminComponent } from "./components/mkj-dashboard/next-termin/next-termin.component";
Expand All @@ -159,7 +155,6 @@ import { MkjTextTransformPipe } from "./pipes/mkj-text-transform.pipe";
import { mkjAppInitializer } from "./providers/mkj-app-initializer";
import { MenuService } from "./services/menu.service";
import { AusrueckungFormComponent } from "./utilities/form-components/ausrueckung-form/ausrueckung-form.component";
import { MitgliedFormComponent } from "./utilities/form-components/mitglied-form/mitglied-form.component";
import { MkjBooleanInputComponent } from "./utilities/form-input-components/mkj-boolean-input/mkj-boolean-input.component";
import { MkjColorPickerComponent } from "./utilities/form-input-components/mkj-color-picker/mkj-color-picker.component";
import { MkjDateInputComponent } from "./utilities/form-input-components/mkj-date-input/mkj-date-input.component";
Expand All @@ -175,7 +170,6 @@ import { MkjToolbarComponent } from "./utilities/mkj-toolbar/mkj-toolbar.compone
import { GlobaleEinstellungenComponent } from "./components/einstellungen/globale-einstellungen/globale-einstellungen.component";
import { MkjTextInputComponent } from "./utilities/form-input-components/mkj-text-input/mkj-text-input.component";
import { UiNamingConfigComponent } from "./components/einstellungen/globale-einstellungen/ui-naming-config/ui-naming-config.component";
import { FinanzenWrapperComponent } from "./components/finanzen/finanzen-wrapper.component";
import { MkjListComponent } from "./utilities/mkj-list/mkj-list.component";
import { MkjTileViewComponent } from "./utilities/mkj-tile-view/mkj-tile-view.component";
import { KassabuchDetailsComponent } from "./components/finanzen/kassabuch-details/kassabuch-details.component";
Expand All @@ -195,7 +189,8 @@ import { MkjListCellComponent } from "./utilities/mkj-list/mkj-list-cell/mkj-lis
import { ListCellValuePipe } from "./utilities/mkj-list/mkj-list-cell/list-cell-value.pipe";
import { GruppeMitgliederListComponent } from "./components/gruppen/gruppe-mitglieder-list/gruppe-mitglieder-list.component";
import { NotenmappeNotenListComponent } from "./components/archiv/notenmappen/notenmappe-noten-list/notenmappe-noten-list.component";
import { KassabuchungenListComponent } from './components/finanzen/kassabuchungen-list/kassabuchungen-list.component';
import { KassabuchungenListComponent } from "./components/finanzen/kassabuchungen-list/kassabuchungen-list.component";
import { RouterOutletWrapperComponent } from "./components/router-outlet-wrapper.component";

// FullCalendarModule.registerPlugins([
// dayGridPlugin,
Expand Down Expand Up @@ -299,6 +294,7 @@ registerLocaleData(localeDe);
AppComponent,
PermissionSelectedPipe,
AnschriftOverviewComponent,
RouterOutletWrapperComponent,
AnschriftEditComponent,
AppMainComponent,
AppTopbarComponent,
Expand All @@ -307,9 +303,6 @@ registerLocaleData(localeDe);
AppNotfoundComponent,
AppErrorComponent,
AppAccessdeniedComponent,
AusrueckungenWrapperComponent,
ArchivWrapperComponent,
MitgliederWrapperComponent,
StatistikMitgliederComponent,
TestApiComponent,
MkjDateInputComponent,
Expand All @@ -320,18 +313,17 @@ registerLocaleData(localeDe);
AppAccessdeniedComponent,
MkjListCellComponent,
AusrueckungSingleComponent,
EinstellungenWrapperComponent,
MkjDatePipe,
MkjDashboardComponent,
SignupComponent,
LoginComponent,
MitgliederListComponent,
MitgliederDetailsComponent,
MitgliederOverviewComponent,
MitgliederEditComponent,
NotenOverviewComponent,
VisibleForPermissionDirective,
NotenEditorComponent,
MkjToolbarComponent,
AusrueckungEditorComponent,
TerminEditComponent,
RollenEditComponent,
ListCellValuePipe,
MkjTextTransformPipe,
Expand All @@ -344,13 +336,12 @@ registerLocaleData(localeDe);
MkjNotensucheComponent,
LokaleEinstellungenComponent,
KalenderaboComponent,
AusrueckungenAktuellComponent,
TermineOverviewComponent,
MkjContentLoaderComponent,
MkjTemplateDirective,
AusrueckungFormComponent,
MkjBooleanInputComponent,
GruppenOverviewComponent,
MitgliedFormComponent,
MkjTileComponent,
GruppeEditComponent,
FullNamePipe,
Expand All @@ -377,7 +368,6 @@ registerLocaleData(localeDe);
GlobaleEinstellungenComponent,
MkjTextInputComponent,
UiNamingConfigComponent,
FinanzenWrapperComponent,
MkjListComponent,
MkjTileViewComponent,
KassabuchDetailsComponent,
Expand Down
Loading

0 comments on commit 9dcf899

Please sign in to comment.