From 37e57292224b951fe7fef9b31eeff3b573143287 Mon Sep 17 00:00:00 2001
From: Marcel <34819524+MarcelCoding@users.noreply.github.com>
Date: Mon, 14 Mar 2022 18:33:42 +0100
Subject: [PATCH] Fixed merge conflicts

---
 .../styled-button.component.html              |  1 -
 .../styled-button.component.spec.ts           | 25 -------------------
 .../styled-button/styled-button.component.ts  | 17 -------------
 .../components/button/button.component.html   |  3 +++
 .../components/button/button.component.scss}  |  1 +
 .../button/button.component.spec.ts           | 23 +++++++++++++++++
 .../components/button/button.component.ts     | 17 +++++++++++++
 src/core/components/button/button.module.ts   | 17 +++++++++++++
 8 files changed, 61 insertions(+), 43 deletions(-)
 delete mode 100644 src/app/design/styled-button/styled-button.component.html
 delete mode 100644 src/app/design/styled-button/styled-button.component.spec.ts
 delete mode 100644 src/app/design/styled-button/styled-button.component.ts
 create mode 100644 src/core/components/button/button.component.html
 rename src/{app/design/styled-button/styled-button.component.scss => core/components/button/button.component.scss} (99%)
 create mode 100644 src/core/components/button/button.component.spec.ts
 create mode 100644 src/core/components/button/button.component.ts
 create mode 100644 src/core/components/button/button.module.ts

diff --git a/src/app/design/styled-button/styled-button.component.html b/src/app/design/styled-button/styled-button.component.html
deleted file mode 100644
index a8821237..00000000
--- a/src/app/design/styled-button/styled-button.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<button [disabled]="disabled" (click)="onClick.emit($event)" [class]="flavor"><ng-content></ng-content></button>
diff --git a/src/app/design/styled-button/styled-button.component.spec.ts b/src/app/design/styled-button/styled-button.component.spec.ts
deleted file mode 100644
index ca36cb31..00000000
--- a/src/app/design/styled-button/styled-button.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StyledButtonComponent } from './styled-button.component';
-
-describe('StyledButtonComponent', () => {
-  let component: StyledButtonComponent;
-  let fixture: ComponentFixture<StyledButtonComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ StyledButtonComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(StyledButtonComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/src/app/design/styled-button/styled-button.component.ts b/src/app/design/styled-button/styled-button.component.ts
deleted file mode 100644
index f3521984..00000000
--- a/src/app/design/styled-button/styled-button.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-export type ButtonFlavor = 'primary' | 'success' | 'warning' | 'danger' | 'info';
-
-@Component({
-  selector: 'app-styled-button',
-  templateUrl: './styled-button.component.html',
-  styleUrls: ['./styled-button.component.scss']
-})
-export class StyledButtonComponent {
-
-  @Input() public disabled = false;
-  @Input() public flavor: ButtonFlavor = 'primary';
-
-  // tslint:disable-next-line: no-output-on-prefix
-  @Output() public onClick = new EventEmitter<MouseEvent>();
-}
diff --git a/src/core/components/button/button.component.html b/src/core/components/button/button.component.html
new file mode 100644
index 00000000..94abb52d
--- /dev/null
+++ b/src/core/components/button/button.component.html
@@ -0,0 +1,3 @@
+<button (click)="onClick.emit($event)" [class]="flavor" [disabled]="disabled">
+  <ng-content></ng-content>
+</button>
diff --git a/src/app/design/styled-button/styled-button.component.scss b/src/core/components/button/button.component.scss
similarity index 99%
rename from src/app/design/styled-button/styled-button.component.scss
rename to src/core/components/button/button.component.scss
index 1175d014..f2f9411f 100644
--- a/src/app/design/styled-button/styled-button.component.scss
+++ b/src/core/components/button/button.component.scss
@@ -37,6 +37,7 @@ button {
   border: none;
   font-size: 16px;
   margin-right: 10px;
+
   &:last-child {
     margin-right: 0;
   }
diff --git a/src/core/components/button/button.component.spec.ts b/src/core/components/button/button.component.spec.ts
new file mode 100644
index 00000000..3c2faae7
--- /dev/null
+++ b/src/core/components/button/button.component.spec.ts
@@ -0,0 +1,23 @@
+import {ComponentFixture, TestBed} from '@angular/core/testing';
+import {ButtonComponent} from './button.component';
+
+describe('ButtonComponent', () => {
+  let component: ButtonComponent;
+  let fixture: ComponentFixture<ButtonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ButtonComponent]
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ButtonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/core/components/button/button.component.ts b/src/core/components/button/button.component.ts
new file mode 100644
index 00000000..fc9ad2c3
--- /dev/null
+++ b/src/core/components/button/button.component.ts
@@ -0,0 +1,17 @@
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+
+export type ButtonFlavor = 'primary' | 'success' | 'warning' | 'danger' | 'info';
+
+@Component({
+  selector: 'app-button',
+  templateUrl: './button.component.html',
+  styleUrls: ['./button.component.scss']
+})
+export class ButtonComponent {
+
+  @Input() public disabled = false;
+  @Input() public flavor: ButtonFlavor = 'primary';
+
+  // eslint-disable-next-line @angular-eslint/no-output-on-prefix
+  @Output() public onClick = new EventEmitter<MouseEvent>();
+}
diff --git a/src/core/components/button/button.module.ts b/src/core/components/button/button.module.ts
new file mode 100644
index 00000000..7c7d65bb
--- /dev/null
+++ b/src/core/components/button/button.module.ts
@@ -0,0 +1,17 @@
+import {NgModule} from '@angular/core';
+import {CommonModule} from '@angular/common';
+import {ButtonComponent} from './button.component';
+
+@NgModule({
+  declarations: [
+    ButtonComponent
+  ],
+  exports: [
+    ButtonComponent
+  ],
+  imports: [
+    CommonModule
+  ]
+})
+export class ButtonModule {
+}