diff --git a/apps/dafa-web/src/app/components/navigation/navigation.component.html b/apps/dafa-web/src/app/components/navigation/navigation.component.html index 5beb4de..ebc718f 100644 --- a/apps/dafa-web/src/app/components/navigation/navigation.component.html +++ b/apps/dafa-web/src/app/components/navigation/navigation.component.html @@ -13,6 +13,7 @@ [routerLinkActive]="['navigation__link--active']" [routerLinkActiveOptions]="{ exact: true }" > + Startsida diff --git a/apps/dafa-web/src/app/components/navigation/navigation.module.ts b/apps/dafa-web/src/app/components/navigation/navigation.module.ts index a228ce8..e8aa9a0 100644 --- a/apps/dafa-web/src/app/components/navigation/navigation.module.ts +++ b/apps/dafa-web/src/app/components/navigation/navigation.module.ts @@ -1,11 +1,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { IconModule } from '@dafa-shared/components/icon/icon.module'; import { NavigationComponent } from './navigation.component'; @NgModule({ declarations: [NavigationComponent], - imports: [CommonModule, RouterModule], + imports: [CommonModule, RouterModule, IconModule], exports: [NavigationComponent], }) export class NavigationModule {} diff --git a/apps/dafa-web/src/app/data/enums/icon-type.enum.ts b/apps/dafa-web/src/app/data/enums/icon-type.enum.ts index 94a8f05..8909494 100644 --- a/apps/dafa-web/src/app/data/enums/icon-type.enum.ts +++ b/apps/dafa-web/src/app/data/enums/icon-type.enum.ts @@ -1,4 +1,5 @@ export enum IconType { HOME = 'home', USER = 'user', + BELL = 'bell', } diff --git a/apps/dafa-web/src/app/pages/page-not-found/page-not-found.component.html b/apps/dafa-web/src/app/pages/page-not-found/page-not-found.component.html index 69725b9..1f08c37 100644 --- a/apps/dafa-web/src/app/pages/page-not-found/page-not-found.component.html +++ b/apps/dafa-web/src/app/pages/page-not-found/page-not-found.component.html @@ -1,10 +1,12 @@ -
-

Oj då! Vi kan inte hitta sidan.

-

Det kan bero på att länken du använder är felaktig eller att sidan inte längre finns.

- - - Gå tillbaka till startsidan - -
+ +
+

Oj då! Vi kan inte hitta sidan.

+

Det kan bero på att länken du använder är felaktig eller att sidan inte längre finns.

+ + + Gå tillbaka till startsidan + +
+
diff --git a/apps/dafa-web/src/app/pages/page-not-found/page-not-found.module.ts b/apps/dafa-web/src/app/pages/page-not-found/page-not-found.module.ts index e520f4a..5ab9aa1 100644 --- a/apps/dafa-web/src/app/pages/page-not-found/page-not-found.module.ts +++ b/apps/dafa-web/src/app/pages/page-not-found/page-not-found.module.ts @@ -3,6 +3,7 @@ import { DigiNgTypographyBaseModule } from '@af/digi-ng/_typography/typography-b import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { HorizontalCenterModule } from '@dafa-shared/components/horizontal-center/horizontal-center.module'; import { PageNotFoundComponent } from './page-not-found.component'; @NgModule({ @@ -12,6 +13,7 @@ import { PageNotFoundComponent } from './page-not-found.component'; RouterModule.forChild([{ path: '', component: PageNotFoundComponent }]), DigiNgTypographyBaseModule, DigiNgIconArrowLeftModule, + HorizontalCenterModule, ], }) export class PageNotFoundModule {} diff --git a/apps/dafa-web/src/app/pages/start/start.component.html b/apps/dafa-web/src/app/pages/start/start.component.html index 40b1c25..c462f75 100644 --- a/apps/dafa-web/src/app/pages/start/start.component.html +++ b/apps/dafa-web/src/app/pages/start/start.component.html @@ -1,3 +1,5 @@ -
Start funkar!
+ +
Start funkar!
+
diff --git a/apps/dafa-web/src/app/pages/start/start.component.ts b/apps/dafa-web/src/app/pages/start/start.component.ts index 39f1c3c..f152359 100644 --- a/apps/dafa-web/src/app/pages/start/start.component.ts +++ b/apps/dafa-web/src/app/pages/start/start.component.ts @@ -6,6 +6,4 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; styleUrls: ['./start.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class StartComponent { - constructor() {} -} +export class StartComponent {} diff --git a/apps/dafa-web/src/app/pages/start/start.module.ts b/apps/dafa-web/src/app/pages/start/start.module.ts index 2275f2e..c1c4ec2 100644 --- a/apps/dafa-web/src/app/pages/start/start.module.ts +++ b/apps/dafa-web/src/app/pages/start/start.module.ts @@ -2,10 +2,16 @@ import { DigiNgTypographyBaseModule } from '@af/digi-ng/_typography/typography-b import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; +import { HorizontalCenterModule } from '@dafa-shared/components/horizontal-center/horizontal-center.module'; import { StartComponent } from './start.component'; @NgModule({ declarations: [StartComponent], - imports: [CommonModule, RouterModule.forChild([{ path: '', component: StartComponent }]), DigiNgTypographyBaseModule], + imports: [ + CommonModule, + RouterModule.forChild([{ path: '', component: StartComponent }]), + DigiNgTypographyBaseModule, + HorizontalCenterModule, + ], }) export class StartModule {} diff --git a/apps/dafa-web/src/app/shared/components/.gitkeep b/apps/dafa-web/src/app/shared/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.html b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.html new file mode 100644 index 0000000..9e6a2af --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.scss b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.scss new file mode 100644 index 0000000..a956795 --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.scss @@ -0,0 +1,10 @@ +@import 'variables/breakpoints'; +@import 'variables/containers'; +@import 'variables/gutters'; + +.horizontal-center { + width: 100%; + max-width: $af__breakpoint-xl; + padding: 0 $af__gutter-m; + margin: 0 auto; +} diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.spec.ts b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.spec.ts new file mode 100644 index 0000000..d37f797 --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { HorizontalCenterComponent } from './horizontal-center.component'; + +describe('HorizontalCenterComponent', () => { + let component: HorizontalCenterComponent; + let fixture: ComponentFixture; + + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [HorizontalCenterComponent], + }).compileComponents(); + }) + ); + + beforeEach(() => { + fixture = TestBed.createComponent(HorizontalCenterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.ts b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.ts new file mode 100644 index 0000000..085535a --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.component.ts @@ -0,0 +1,9 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +@Component({ + selector: 'dafa-horizontal-center', + templateUrl: './horizontal-center.component.html', + styleUrls: ['./horizontal-center.component.scss', './horizontal-center.print.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class HorizontalCenterComponent {} diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.module.ts b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.module.ts new file mode 100644 index 0000000..0830df3 --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.module.ts @@ -0,0 +1,11 @@ +import { DigiNgLayoutContainerModule } from '@af/digi-ng/_layout/layout-container'; +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { HorizontalCenterComponent } from './horizontal-center.component'; + +@NgModule({ + declarations: [HorizontalCenterComponent], + imports: [CommonModule, DigiNgLayoutContainerModule], + exports: [HorizontalCenterComponent], +}) +export class HorizontalCenterModule {} diff --git a/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.print.component.scss b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.print.component.scss new file mode 100644 index 0000000..dbebd1d --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/horizontal-center/horizontal-center.print.component.scss @@ -0,0 +1,5 @@ +@media print { + .horizontal-center { + padding: 0; + } +} diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.component.html b/apps/dafa-web/src/app/shared/components/icon/icon.component.html new file mode 100644 index 0000000..1338229 --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/icon/icon.component.html @@ -0,0 +1,18 @@ + + + + + + diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.component.scss b/apps/dafa-web/src/app/shared/components/icon/icon.component.scss new file mode 100644 index 0000000..abd987e --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/icon/icon.component.scss @@ -0,0 +1,20 @@ +@import 'mixins/icon'; + +:host { + display: inline-flex; +} + +.icon { + &--s { + @include dafa__digi-ng-icon(0.875em); + } + &--m { + @include dafa__digi-ng-icon(1em); + } + &--l { + @include dafa__digi-ng-icon(1.5em); + } + &--xl { + @include dafa__digi-ng-icon(2em); + } +} diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.component.spec.ts b/apps/dafa-web/src/app/shared/components/icon/icon.component.spec.ts new file mode 100644 index 0000000..6fd656c --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/icon/icon.component.spec.ts @@ -0,0 +1,28 @@ +/* tslint:disable:no-unused-variable */ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { By } from '@angular/platform-browser'; +import { DebugElement } from '@angular/core'; + +import { IconComponent } from './icon.component'; + +describe('IconComponent', () => { + let component: IconComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ IconComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(IconComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.component.ts b/apps/dafa-web/src/app/shared/components/icon/icon.component.ts new file mode 100644 index 0000000..ac01cde --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/icon/icon.component.ts @@ -0,0 +1,27 @@ +import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; +import { IconSize } from '@dafa-enums/icon-size.enum'; +import { IconType } from '@dafa-enums/icon-type.enum'; + +const CUSTOM_ICONS: IconType[] = [IconType.HOME]; + +@Component({ + selector: 'dafa-icon', + templateUrl: './icon.component.html', + styleUrls: ['./icon.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class IconComponent implements OnChanges { + @Input() icon: IconType; + @Input() size: IconSize = IconSize.M; + + iconClass: string; + iconType = IconType; + + ngOnChanges(): void { + this.iconClass = `icon--${this.size}`; + } + + get isCustomIcon(): boolean { + return CUSTOM_ICONS.includes(this.icon); + } +} diff --git a/apps/dafa-web/src/app/shared/components/icon/icon.module.ts b/apps/dafa-web/src/app/shared/components/icon/icon.module.ts new file mode 100644 index 0000000..ee56eec --- /dev/null +++ b/apps/dafa-web/src/app/shared/components/icon/icon.module.ts @@ -0,0 +1,10 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { IconComponent } from './icon.component'; + +@NgModule({ + declarations: [IconComponent], + imports: [CommonModule], + exports: [IconComponent], +}) +export class IconModule {} diff --git a/apps/dafa-web/src/styles/styles.scss b/apps/dafa-web/src/styles/styles.scss index 74ddf49..6203319 100644 --- a/apps/dafa-web/src/styles/styles.scss +++ b/apps/dafa-web/src/styles/styles.scss @@ -51,6 +51,7 @@ strong { &__link { display: inline-flex; + align-items: center; &--with-icon { gap: $af__gutter-xs;