From b409c3c670ee8a4ba8d0d71d4e0a47ba45262781 Mon Sep 17 00:00:00 2001
From: Felix <apolltoast98@gmail.com>
Date: Sun, 3 Jan 2021 12:42:34 +0100
Subject: [PATCH] merge master

---
 src/app/app.module.ts                         |  4 ++-
 src/app/dashboard/dashboard.component.css     |  0
 src/app/dashboard/dashboard.component.html    |  1 +
 src/app/dashboard/dashboard.component.spec.ts | 25 +++++++++++++++++++
 src/app/dashboard/dashboard.component.ts      | 15 +++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/app/dashboard/dashboard.component.css
 create mode 100644 src/app/dashboard/dashboard.component.html
 create mode 100644 src/app/dashboard/dashboard.component.spec.ts
 create mode 100644 src/app/dashboard/dashboard.component.ts

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2203d4f..8f19381 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -15,6 +15,7 @@ import { NotFoundComponent } from './not-found/not-found.component';
 import { CartComponent } from './cart/cart.component';
 import { PushNotificationsModule } from 'ng-push-ivy';
 import { ClipboardModule } from 'ngx-clipboard';
+import { DashboardComponent } from './dashboard/dashboard.component';
 
 const config: SocketIoConfig = { url: 'http://localhost:2009', options: {} };
 
@@ -26,7 +27,8 @@ const config: SocketIoConfig = { url: 'http://localhost:2009', options: {} };
     PayComponent,
     HelloComponent,
     NotFoundComponent,
-    CartComponent
+    CartComponent,
+    DashboardComponent
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/dashboard/dashboard.component.css b/src/app/dashboard/dashboard.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/dashboard/dashboard.component.html b/src/app/dashboard/dashboard.component.html
new file mode 100644
index 0000000..9c5fce9
--- /dev/null
+++ b/src/app/dashboard/dashboard.component.html
@@ -0,0 +1 @@
+<p>dashboard works!</p>
diff --git a/src/app/dashboard/dashboard.component.spec.ts b/src/app/dashboard/dashboard.component.spec.ts
new file mode 100644
index 0000000..5ec4ff8
--- /dev/null
+++ b/src/app/dashboard/dashboard.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DashboardComponent } from './dashboard.component';
+
+describe('DashboardComponent', () => {
+  let component: DashboardComponent;
+  let fixture: ComponentFixture<DashboardComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ DashboardComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
new file mode 100644
index 0000000..38138a3
--- /dev/null
+++ b/src/app/dashboard/dashboard.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-dashboard',
+  templateUrl: './dashboard.component.html',
+  styleUrls: ['./dashboard.component.css']
+})
+export class DashboardComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}