diff --git a/ogWebconsole/src/app/app.module.ts b/ogWebconsole/src/app/app.module.ts index f2256e1..bea0b75 100644 --- a/ogWebconsole/src/app/app.module.ts +++ b/ogWebconsole/src/app/app.module.ts @@ -1,11 +1,9 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; - import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AuthLayoutComponent } from './components/layout/auth-layout/auth-layout.component'; import { MainLayoutComponent } from './components/layout/main-layout/main-layout.component'; -import { FooterComponent } from './components/layout/footer/footer.component'; import { HeaderComponent } from './components/layout/header/header.component'; import { SidebarComponent } from './components/layout/sidebar/sidebar.component'; import { LoginComponent } from './components/login/login.component'; @@ -18,7 +16,6 @@ import { CustomInterceptor } from './services/custom.interceptor'; AppComponent, AuthLayoutComponent, MainLayoutComponent, - FooterComponent, HeaderComponent, SidebarComponent, LoginComponent, diff --git a/ogWebconsole/src/app/components/layout/footer/footer.component.css b/ogWebconsole/src/app/components/layout/footer/footer.component.css deleted file mode 100644 index ad3101a..0000000 --- a/ogWebconsole/src/app/components/layout/footer/footer.component.css +++ /dev/null @@ -1,5 +0,0 @@ -:host{ - display: block; - background-color: blueviolet; - grid-area: footer; -} \ No newline at end of file diff --git a/ogWebconsole/src/app/components/layout/footer/footer.component.html b/ogWebconsole/src/app/components/layout/footer/footer.component.html deleted file mode 100644 index 28c0d7d..0000000 --- a/ogWebconsole/src/app/components/layout/footer/footer.component.html +++ /dev/null @@ -1 +0,0 @@ -

footer works!

diff --git a/ogWebconsole/src/app/components/layout/footer/footer.component.spec.ts b/ogWebconsole/src/app/components/layout/footer/footer.component.spec.ts deleted file mode 100644 index 4647de8..0000000 --- a/ogWebconsole/src/app/components/layout/footer/footer.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { FooterComponent } from './footer.component'; - -describe('FooterComponent', () => { - let component: FooterComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [FooterComponent] - }) - .compileComponents(); - - fixture = TestBed.createComponent(FooterComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/ogWebconsole/src/app/components/layout/footer/footer.component.ts b/ogWebconsole/src/app/components/layout/footer/footer.component.ts deleted file mode 100644 index 692bb74..0000000 --- a/ogWebconsole/src/app/components/layout/footer/footer.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-footer', - templateUrl: './footer.component.html', - styleUrl: './footer.component.css' -}) -export class FooterComponent { - -} diff --git a/ogWebconsole/src/app/components/layout/header/header.component.css b/ogWebconsole/src/app/components/layout/header/header.component.css index 1335174..72327d2 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.css +++ b/ogWebconsole/src/app/components/layout/header/header.component.css @@ -1,5 +1,5 @@ :host{ display: block; - background-color: red; + background-color: rgb(126, 126, 126); grid-area: header; } \ No newline at end of file diff --git a/ogWebconsole/src/app/components/layout/header/header.component.ts b/ogWebconsole/src/app/components/layout/header/header.component.ts index 5051cf8..d446c86 100644 --- a/ogWebconsole/src/app/components/layout/header/header.component.ts +++ b/ogWebconsole/src/app/components/layout/header/header.component.ts @@ -1,9 +1,8 @@ import { Component } from '@angular/core'; - @Component({ selector: 'app-header', templateUrl: './header.component.html', - styleUrl: './header.component.css' + styleUrl: './header.component.css', }) export class HeaderComponent { diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css index 7054a9f..5ab06d5 100644 --- a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css +++ b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.css @@ -6,7 +6,6 @@ "sidebar content" "sidebar footer"; grid-template-columns: 120px 1fr; - height: 100%; } .content-wrapper{ display: block; diff --git a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html index d5ccfef..8b7a5bd 100644 --- a/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html +++ b/ogWebconsole/src/app/components/layout/main-layout/main-layout.component.html @@ -1,6 +1,6 @@ - - + +
diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css index 7b47c67..166a418 100644 --- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css +++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.css @@ -1,5 +1,5 @@ :host{ display: block; - background-color: rgb(0, 128, 255); + background-color: rgb(85, 85, 85); grid-area: sidebar; } \ No newline at end of file diff --git a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts index c90d1fb..869580e 100644 --- a/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts +++ b/ogWebconsole/src/app/components/layout/sidebar/sidebar.component.ts @@ -6,5 +6,6 @@ import { Component } from '@angular/core'; styleUrl: './sidebar.component.css' }) export class SidebarComponent { - + hovered = false; } +//https://medium.com/@yevhen.chmykhun.01/angular-blueprint-application-layout-b1680ca888e0 \ No newline at end of file diff --git a/ogWebconsole/src/app/components/login/login.component.ts b/ogWebconsole/src/app/components/login/login.component.ts index adad3ed..36a9806 100644 --- a/ogWebconsole/src/app/components/login/login.component.ts +++ b/ogWebconsole/src/app/components/login/login.component.ts @@ -1,6 +1,5 @@ import { HttpClient } from '@angular/common/http'; import { Component } from '@angular/core'; -import { FormsModule } from '@angular/forms'; import { Router } from '@angular/router'; @Component({ diff --git a/ogWebconsole/src/app/services/custom.interceptor.spec.ts b/ogWebconsole/src/app/services/custom.interceptor.spec.ts new file mode 100644 index 0000000..370614f --- /dev/null +++ b/ogWebconsole/src/app/services/custom.interceptor.spec.ts @@ -0,0 +1,17 @@ +import { TestBed } from '@angular/core/testing'; +import { HttpInterceptorFn } from '@angular/common/http'; + +import { customInterceptor } from './custom.interceptor'; + +describe('customInterceptor', () => { + const interceptor: HttpInterceptorFn = (req, next) => + TestBed.runInInjectionContext(() => customInterceptor(req, next)); + + beforeEach(() => { + TestBed.configureTestingModule({}); + }); + + it('should be created', () => { + expect(interceptor).toBeTruthy(); + }); +}); diff --git a/ogWebconsole/src/app/services/custom.interceptor.ts b/ogWebconsole/src/app/services/custom.interceptor.ts new file mode 100644 index 0000000..7e02094 --- /dev/null +++ b/ogWebconsole/src/app/services/custom.interceptor.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { HttpInterceptorFn, HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http'; +import { Observable } from 'rxjs'; +import { Token } from '@angular/compiler'; + +export class CustomInterceptor implements HttpInterceptor{ + constructor(){} + intercept(req: HttpRequest, next: HttpHandler): Observable> { + + const token = localStorage.getItem('loginToken'); + const newCloneRequest = req.clone({ + setHeaders:{ + Authorization: `${token}` + } + }) + + return next.handle(newCloneRequest); + } +}