Fixed merge conflicts

Author: MarcelCoding

src/app/design/styled-button/styled-button.component.html

@@ -0,0 +1,3 @@
+<button (click)="onClick.emit($event)" [class]="flavor" [disabled]="disabled">
+  <ng-content></ng-content>
+</button>

src/app/design/styled-button/styled-button.component.spec.ts

@@ -37,6 +37,7 @@ button {
   border: none;
   font-size: 16px;
   margin-right: 10px;
+
   &:last-child {
     margin-right: 0;
   }

src/app/design/styled-button/styled-button.component.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();
+  });
+});

src/core/components/button/button.component.html

@@ -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>();
+}

…yled-button/styled-button.component.scss …/components/button/button.component.scsssrc/app/design/styled-button/styled-button.component.scss renamed to src/core/components/button/button.component.scss src/app/design/styled-button/styled-button.component.scss renamed to src/core/components/button/button.component.scss

@@ -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 {
+}