Merge pull request #17 from SwimResults/develop

v1.0.1

Author: konrad2002

package-lock.json

@@ -30,6 +30,7 @@
     "@ngx-translate/http-loader": "^7.0.0",
     "angular-oauth2-oidc": "^15.0.1",
     "rxjs": "~7.8.0",
+    "safe-pipe": "^2.0.5-0",
     "tslib": "^2.3.0",
     "zone.js": "~0.12.0"
   },

package.json

@@ -12,6 +12,7 @@ import {AuthComponent} from "./content/auth/auth.component";
 import {UserProfileComponent} from "./content/account";
 import {PageMeetingsComponent} from "./content/meetings";
 import {LogoutComponent} from "./content/auth/logout/logout.component";
+import {PageAdminEventComponent} from "./content/admin";
 
 
 const routes: Routes = [
@@ -21,7 +22,7 @@ const routes: Routes = [
   { path: 'account/profile',          component: UserProfileComponent },
   { path: 'dashboard',                component: PageDashboardGeneralComponent },
   { path: 'calendar',                 component: CalendarComponent },
-  { path: 'meetings',                 redirectTo: '/meetings' },
+  { path: 'meetings',                 redirectTo: '/' },
   { path: 'athlete',                  component: PageAthletesGeneralComponent },
   { path: 'athlete/:entity_id',       component: PageAthleteComponent },
   { path: 'team',                     component: PageTeamsGeneralComponent },
@@ -30,7 +31,7 @@ const routes: Routes = [
   {
     path: 'm/:event',
     children: [
-      { path: "",                     component: PageDashboardEventComponent },
+      { path: "",                     redirectTo: 'dashboard', pathMatch: "full" },
       { path: "dashboard",            component: PageDashboardEventComponent },
       { path: "live",                 component: PageLiveComponent },
       { path: "event",                component: PageEventsComponent },
@@ -41,6 +42,7 @@ const routes: Routes = [
       { path: 'team/:entity_id',      component: PageTeamComponent },
       { path: "files",                component: PageFilesComponent },
       { path: "stats",                component: PageStatsEventComponent },
+      { path: "admin",                component: PageAdminEventComponent },
     ]
   }
 

src/app/app-routing.module.ts

@@ -1,3 +1,11 @@
+<div
+  class="system-environment"
+  *ngIf="showEnv"
+  (click)="toggleEnv()"
+  style="{{'background-color: ' + env_color}}"
+>
+  <span class="env">{{environment | uppercase}}</span>
+</div>
 <main [class]="'sidebar-' + sidebarState">
   <sr-sidebar [class]="sidebarState"></sr-sidebar>
   <div class="sidebar-hider" (click)="hideSidebar()"></div>

src/app/app.component.html

@@ -57,6 +57,20 @@ main {
   }
 }
 
+.system-environment {
+  position: fixed;
+  width: 300px;
+  rotate: -45deg;
+  z-index: 1000;
+  background-color: #00459d;
+  color: white;
+  text-align: center;
+  font-weight: 1000;
+  left: -104px;
+  top: 34px;
+  padding: 4px;
+}
+
 @media only screen and (max-width: 1050px) {
   main {
     grid-template-columns: 0 40px minmax(1px,1440px) 40px;

src/app/app.component.scss

@@ -21,16 +21,19 @@ export class AppComponent implements OnDestroy {
 
   build: string = "";
   showBuild: boolean = true;
+  showEnv: boolean = true;
   sidebarState = "";
 
   environment = environment.environment;
+  env_color = environment.env_color;
 
   constructor(
     private translateService: TranslateService,
     private menuService: SidebarMenuService,
     private routeService: RouteService
   ) {
     this.showBuild = this.environment != 'productive'
+    this.showEnv = this.environment != 'productive'
 
     this.fetchBuild().then(r => {
       this.build = r;
@@ -76,6 +79,10 @@ export class AppComponent implements OnDestroy {
     this.showBuild = !this.showBuild;
   }
 
+  toggleEnv() {
+    this.showEnv = !this.showEnv;
+  }
+
   hideSidebar() {
     this.menuService.setViewType("hidden");
   }

src/app/app.component.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { PageAdminEventComponent } from './pages';
+
+
+
+@NgModule({
+  declarations: [
+    PageAdminEventComponent
+  ],
+  imports: [
+    CommonModule
+  ]
+})
+export class AdminModule { }

src/app/content/admin/admin.module.ts

@@ -0,0 +1,3 @@
+export * from './pages';
+
+export * from './admin.module';

src/app/content/admin/index.ts

@@ -0,0 +1 @@
+export * from './page-admin-event/page-admin-event.component';

src/app/content/admin/pages/index.ts

@@ -0,0 +1 @@
+Dies ist ein geschützter Admin-Bereich, der eigentlich nicht geschützt wird.