Paddy/Betterzon
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/Betterzon.git synced 2026-05-26 12:38:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into BETTERZON-78

Browse Source 
# Conflicts:
#	Frontend/angular.json
#	Frontend/package-lock.json
#	Frontend/src/app/app.module.ts
#	Frontend/src/styles.css
This commit is contained in:
Patrick Müller
2021-05-05 18:39:04 +02:00
parent 0c50162fdf e1da64cac3
commit b17b92fcc3
64 changed files with 2837 additions and 5518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Frontend/src/app/app.module.ts
+5 -5
View File
@@ -20,15 +20,15 @@ import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {ImprintComponent} from './pages/imprint/imprint.component';
import {PrivacyComponent} from './pages/privacy/privacy.component';
import {NgcCookieConsentModule, NgcCookieConsentConfig} from 'ngx-cookieconsent';
import {MatSlideToggleModule} from "@angular/material/slide-toggle";
import { TopBarComponent } from './components/top-bar/top-bar.component';
import {RouterModule} from "@angular/router";
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
import {TopBarComponent} from './components/top-bar/top-bar.component';
import {RouterModule} from '@angular/router';
import {MatButtonModule} from '@angular/material/button';
import {MatToolbarModule} from '@angular/material/toolbar';
import {MatIconModule} from '@angular/material/icon';
import {MatSidenavModule} from '@angular/material/sidenav';
import {MatListModule} from '@angular/material/list';
import { BottomBarComponent } from './components/bottom-bar/bottom-bar.component';
import {BottomBarComponent} from './components/bottom-bar/bottom-bar.component';
// For cookie popup
@@ -104,7 +104,7 @@ const cookieConfig: NgcCookieConsentConfig = {
MatButtonModule,
MatIconModule,
RouterModule.forRoot([
{ path: '', component: LandingpageComponent },
{path: '', component: LandingpageComponent},
]),
],
providers: [],