Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature: restructured angular app #182

Merged
merged 3 commits into from
Jul 21, 2021
Merged

feature: restructured angular app #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f483ef0
Restructured Angular App
kubikowski Jul 20, 2021
689d38c
added a dedicated snek page, renamed page files
kubikowski Jul 20, 2021
83b13a4
optimised imports
kubikowski Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,24 @@ import { RouterModule, Routes } from '@angular/router';
const routes: Routes = [
{
path: '',
redirectTo: '/gong',
redirectTo: '/snek',
pathMatch: 'full'
}, {
path: 'background',
loadChildren: () => import('src/app/pages/background/background.module')
.then(module => module.BackgroundModule),
loadChildren: () => import('src/app/pages/background/background-page.module')
.then(module => module.BackgroundPageModule),
}, {
path: 'gong',
loadChildren: () => import('src/app/pages/gong/gong.module')
.then(module => module.GongModule),
loadChildren: () => import('src/app/pages/gong/gong-page.module')
.then(module => module.GongPageModule),
}, {
path: 'snek',
loadChildren: () => import('src/app/pages/snek/snek-page.module')
.then(module => module.SnekPageModule),
}, {
path: '**',
loadChildren: () => import('src/app/pages/not-found/not-found.module')
.then(module => module.NotFoundModule),
loadChildren: () => import('src/app/pages/not-found/not-found-page.module')
.then(module => module.NotFoundPageModule),
},
];

Expand Down
26 changes: 0 additions & 26 deletions src/app/app.component.spec.ts
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { ChangeDetectionStrategy, Component, ViewChild } from '@angular/core';
import { MatSidenav } from '@angular/material/sidenav';
import { NavigationService } from 'src/app/navigation/navigation.service';
import { TitleService } from 'src/app/navigation/routing/title.service';
import { ColorsService } from 'src/app/shared/colors/services/colors.service';
import { FpsService } from 'src/app/shared/screen-detector/fps.service';
import { ScreenDetectorService } from 'src/app/shared/screen-detector/screen-detector.service';
import { SvgIconService } from 'src/app/shared/svg/svg-icon.service';
import { ColorsService } from 'src/app/core/colors/services/colors.service';
import { TitleService } from 'src/app/core/routing/title.service';
import { FpsService } from 'src/app/core/screen/fps.service';
import { ScreenDetectorService } from 'src/app/core/screen/screen-detector.service';
import { SvgIconService } from 'src/app/core/svg/svg-icon.service';
import { NavigationService } from 'src/app/features/navigation/services/navigation.service';

@Component({
selector: 'app-root',
Expand Down
9 changes: 5 additions & 4 deletions src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { AppRoutingModule } from 'src/app/app-routing.module';
import { AppComponent } from 'src/app/app.component';
import { NavigationModule } from 'src/app/navigation/navigation.module';
import { SharedModule } from 'src/app/shared/shared.module';
import { CoreModule } from 'src/app/core/core.module';
import { BackgroundModule } from 'src/app/features/background/background.module';
import { NavigationModule } from 'src/app/features/navigation/navigation.module';

@NgModule({
declarations: [ AppComponent ],
imports: [
BrowserModule,
BrowserAnimationsModule,
AppRoutingModule,
CoreModule,
BackgroundModule,
NavigationModule,
SharedModule,
],
providers: [],
bootstrap: [ AppComponent ],
})
export class AppModule { }
0 ...p/shared/animations/float-up.animation.ts → ...app/core/animations/float-up.animation.ts
View file
Open in desktop
File renamed without changes.
0 ...ared/animations/slide-in-out-animation.ts → ...core/animations/slide-in-out-animation.ts
View file
Open in desktop
File renamed without changes.
0 ...olor-palettes/base-color-palette.model.ts → ...olor-palettes/base-color-palette.model.ts
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...olor-palettes/color-palette.model.spec.ts → ...olor-palettes/color-palette.model.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Color } from 'src/app/shared/colors/models/color.model';
import { BluePalette } from 'src/app/shared/colors/models/color-palettes/color-palettes.constant';
import { DarkTheme } from 'src/app/shared/colors/models/color-themes/color-themes.constant';
import { BluePalette } from 'src/app/core/colors/models/color-palettes/color-palettes.constant';
import { DarkTheme } from 'src/app/core/colors/models/color-themes/color-themes.constant';
import { Color } from 'src/app/core/colors/models/color.model';

describe('Color Palette', () => {

Expand Down
8 changes: 4 additions & 4 deletions ...els/color-palettes/color-palette.model.ts → ...els/color-palettes/color-palette.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { BaseColorPalette } from 'src/app/shared/colors/models/color-palettes/base-color-palette.model';
import { Color } from 'src/app/shared/colors/models/color.model';
import { LightTheme } from 'src/app/shared/colors/models/color-themes/color-themes.constant';
import { ColorTheme } from 'src/app/shared/colors/models/color-themes/color-theme.model';
import { BaseColorPalette } from 'src/app/core/colors/models/color-palettes/base-color-palette.model';
import { ColorTheme } from 'src/app/core/colors/models/color-themes/color-theme.model';
import { LightTheme } from 'src/app/core/colors/models/color-themes/color-themes.constant';
import { Color } from 'src/app/core/colors/models/color.model';

export class ColorPalette extends BaseColorPalette {
public constructor(
Expand Down
4 changes: 2 additions & 2 deletions ...color-palettes/color-palettes.constant.ts → ...color-palettes/color-palettes.constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ColorPalette } from 'src/app/shared/colors/models/color-palettes/color-palette.model';
import { Color } from 'src/app/shared/colors/models/color.model';
import { ColorPalette } from 'src/app/core/colors/models/color-palettes/color-palette.model';
import { Color } from 'src/app/core/colors/models/color.model';

export const BluePalette = new ColorPalette(
Color.fromString('#51d4ff'),
Expand Down
0 ...ls/color-themes/base-color-theme.model.ts → ...ls/color-themes/base-color-theme.model.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ls/color-themes/color-theme.model.spec.ts → ...ls/color-themes/color-theme.model.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LightTheme } from 'src/app/shared/colors/models/color-themes/color-themes.constant';
import { Color } from 'src/app/shared/colors/models/color.model';
import { LightTheme } from 'src/app/core/colors/models/color-themes/color-themes.constant';
import { Color } from 'src/app/core/colors/models/color.model';

describe('Color Theme', () => {

Expand Down
4 changes: 2 additions & 2 deletions .../models/color-themes/color-theme.model.ts → .../models/color-themes/color-theme.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BaseColorTheme } from 'src/app/shared/colors/models/color-themes/base-color-theme.model';
import { Color } from 'src/app/shared/colors/models/color.model';
import { BaseColorTheme } from 'src/app/core/colors/models/color-themes/base-color-theme.model';
import { Color } from 'src/app/core/colors/models/color.model';

export class ColorTheme extends BaseColorTheme {
static readonly infoColor = Color.fromString('#00b3ee');
Expand Down
4 changes: 2 additions & 2 deletions ...els/color-themes/color-themes.constant.ts → ...els/color-themes/color-themes.constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ColorTheme } from 'src/app/shared/colors/models/color-themes/color-theme.model';
import { Color } from 'src/app/shared/colors/models/color.model';
import { ColorTheme } from 'src/app/core/colors/models/color-themes/color-theme.model';
import { Color } from 'src/app/core/colors/models/color.model';

export const LightTheme = new ColorTheme(
Color.fromString('white'),
Expand Down
2 changes: 1 addition & 1 deletion .../shared/colors/models/color.model.spec.ts → ...pp/core/colors/models/color.model.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Color, InvalidColorString } from 'src/app/shared/colors/models/color.model';
import { Color, InvalidColorString } from 'src/app/core/colors/models/color.model';

describe('Color', () => {

Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/colors/models/color.model.ts → src/app/core/colors/models/color.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ColorName from 'color-name';
import { clamp } from 'src/app/shared/functions/clamp/clamp.function';
import { clamp } from 'src/app/core/functions/clamp/clamp.function';

export class InvalidColorString extends Error {
constructor(message?: string) {
Expand Down
14 changes: 7 additions & 7 deletions ...ed/colors/services/colors.service.spec.ts → ...re/colors/services/colors.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { fakeAsync, TestBed, tick } from '@angular/core/testing';
import { BaseColorPalette } from 'src/app/shared/colors/models/color-palettes/base-color-palette.model';
import { ColorPalette } from 'src/app/shared/colors/models/color-palettes/color-palette.model';
import { BluePalette, GreenPalette } from 'src/app/shared/colors/models/color-palettes/color-palettes.constant';
import { BaseColorTheme } from 'src/app/shared/colors/models/color-themes/base-color-theme.model';
import { ColorTheme } from 'src/app/shared/colors/models/color-themes/color-theme.model';
import { DarkTheme, LightTheme } from 'src/app/shared/colors/models/color-themes/color-themes.constant';
import { ColorsService } from 'src/app/shared/colors/services/colors.service';
import { BaseColorPalette } from 'src/app/core/colors/models/color-palettes/base-color-palette.model';
import { ColorPalette } from 'src/app/core/colors/models/color-palettes/color-palette.model';
import { BluePalette, GreenPalette } from 'src/app/core/colors/models/color-palettes/color-palettes.constant';
import { BaseColorTheme } from 'src/app/core/colors/models/color-themes/base-color-theme.model';
import { ColorTheme } from 'src/app/core/colors/models/color-themes/color-theme.model';
import { DarkTheme, LightTheme } from 'src/app/core/colors/models/color-themes/color-themes.constant';
import { ColorsService } from 'src/app/core/colors/services/colors.service';

describe('ColorsService', () => {
let colorsService: ColorsService;
Expand Down
14 changes: 7 additions & 7 deletions .../shared/colors/services/colors.service.ts → ...pp/core/colors/services/colors.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Injectable, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs';
import { BaseColorPalette } from 'src/app/shared/colors/models/color-palettes/base-color-palette.model';
import { ColorPalette } from 'src/app/shared/colors/models/color-palettes/color-palette.model';
import { BluePalette, ColorPalettes } from 'src/app/shared/colors/models/color-palettes/color-palettes.constant';
import { BaseColorTheme } from 'src/app/shared/colors/models/color-themes/base-color-theme.model';
import { ColorTheme } from 'src/app/shared/colors/models/color-themes/color-theme.model';
import { ColorThemes, LightTheme } from 'src/app/shared/colors/models/color-themes/color-themes.constant';
import { Observed } from 'src/app/shared/decorators/observed.decorator';
import { BaseColorPalette } from 'src/app/core/colors/models/color-palettes/base-color-palette.model';
import { ColorPalette } from 'src/app/core/colors/models/color-palettes/color-palette.model';
import { BluePalette, ColorPalettes } from 'src/app/core/colors/models/color-palettes/color-palettes.constant';
import { BaseColorTheme } from 'src/app/core/colors/models/color-themes/base-color-theme.model';
import { ColorTheme } from 'src/app/core/colors/models/color-themes/color-theme.model';
import { ColorThemes, LightTheme } from 'src/app/core/colors/models/color-themes/color-themes.constant';
import { Observed } from 'src/app/core/decorators/observed.decorator';
import { SubSink } from 'subsink';

@Injectable({ providedIn: 'root' })
Expand Down
6 changes: 2 additions & 4 deletions src/app/shared/shared.module.ts → src/app/core/core.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { DyslexicTextModule } from 'src/app/shared/dyslexic-text/dyslexic-text.module';
import { MaterialModule } from 'src/app/shared/material.module';
import { MaterialModule } from 'src/app/core/material.module';

@NgModule({
exports: [
Expand All @@ -13,8 +12,7 @@ import { MaterialModule } from 'src/app/shared/material.module';
FormsModule,
ReactiveFormsModule,
RouterModule,
DyslexicTextModule,
MaterialModule,
],
})
export class SharedModule { }
export class CoreModule { }
2 changes: 1 addition & 1 deletion ...red/decorators/observed.decorator.spec.ts → ...ore/decorators/observed.decorator.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Observable } from 'rxjs';
import { take } from 'rxjs/operators';
import { Observed } from 'src/app/shared/decorators/observed.decorator';
import { Observed } from 'src/app/core/decorators/observed.decorator';
import { SubSink } from 'subsink';

const testValue1 = 10;
Expand Down
0 ...p/shared/decorators/observed.decorator.ts → ...app/core/decorators/observed.decorator.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ed/functions/clamp/clamp.function.spec.ts → ...re/functions/clamp/clamp.function.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { clamp } from './clamp.function';
import { clamp } from 'src/app/core/functions/clamp/clamp.function';

describe('clamp', () => {
const lowerBound = 0;
Expand Down
0 .../shared/functions/clamp/clamp.function.ts → ...pp/core/functions/clamp/clamp.function.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...shared/functions/mod/mod.function.spec.ts → ...p/core/functions/mod/mod.function.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { mod } from './mod.function';
import { mod } from 'src/app/core/functions/mod/mod.function';

describe('mod', () => {

Expand Down
0 src/app/shared/functions/mod/mod.function.ts → src/app/core/functions/mod/mod.function.ts
View file
Open in desktop
File renamed without changes.
0 ...ctions/reg-exp/escape-reg-exp.function.ts → ...ctions/reg-exp/escape-reg-exp.function.ts
View file
Open in desktop
File renamed without changes.
0 ...unctions/rxjs/not-null-filter.function.ts → ...unctions/rxjs/not-null-filter.function.ts
View file
Open in desktop
File renamed without changes.
0 ...red/functions/sets/difference.function.ts → ...ore/functions/sets/difference.function.ts
View file
Open in desktop
File renamed without changes.
0 ...ed/functions/sets/equivalence.function.ts → ...re/functions/sets/equivalence.function.ts
View file
Open in desktop
File renamed without changes.
0 ...ed/functions/sets/inersection.function.ts → ...re/functions/sets/inersection.function.ts
View file
Open in desktop
File renamed without changes.
0 ...d/functions/sets/remove-nulls.function.ts → ...e/functions/sets/remove-nulls.function.ts
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...ared/functions/sets/sets.function.spec.ts → ...core/functions/sets/sets.function.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { difference } from './difference.function';
import { equivalence } from './equivalence.function';
import { intersection } from './inersection.function';
import { union } from './union.function';
import { xor } from './xor.function';
import { difference } from 'src/app/core/functions/sets/difference.function';
import { equivalence } from 'src/app/core/functions/sets/equivalence.function';
import { intersection } from 'src/app/core/functions/sets/inersection.function';
import { union } from 'src/app/core/functions/sets/union.function';
import { xor } from 'src/app/core/functions/sets/xor.function';

describe('Set Utilities', () => {

Expand Down
0 ...p/shared/functions/sets/union.function.ts → ...app/core/functions/sets/union.function.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...app/shared/functions/sets/xor.function.ts → src/app/core/functions/sets/xor.function.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { difference } from './difference.function';
import { union } from './union.function';
import { difference } from 'src/app/core/functions/sets/difference.function';
import { union } from 'src/app/core/functions/sets/union.function';

/**
* The symmetric difference of two sets contains only the unique elements to each set.
Expand Down
0 src/app/shared/material.module.ts → src/app/core/material.module.ts
View file
Open in desktop
File renamed without changes.
0 src/app/navigation/routing/title.service.ts → src/app/core/routing/title.service.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...app/shared/screen-detector/fps.service.ts → src/app/core/screen/fps.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Injectable, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs';
import { map, scan } from 'rxjs/operators';
import { Observed } from 'src/app/shared/decorators/observed.decorator';
import { Observed } from 'src/app/core/decorators/observed.decorator';
import { SubSink } from 'subsink';

@Injectable({ providedIn: 'root' })
Expand Down
2 changes: 1 addition & 1 deletion ...creen-detector/screen-detector.service.ts → ...pp/core/screen/screen-detector.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable, OnDestroy, Renderer2, RendererFactory2 } from '@angular/core';
import { Observable } from 'rxjs';
import { Observed } from 'src/app/shared/decorators/observed.decorator';
import { Observed } from 'src/app/core/decorators/observed.decorator';

@Injectable({ providedIn: 'root' })
export class ScreenDetectorService implements OnDestroy {
Expand Down
0 src/app/shared/svg/external-svg-icon.enum.ts → src/app/core/svg/external-svg-icon.enum.ts
View file
Open in desktop
File renamed without changes.
0 src/app/shared/svg/internal-svg-icon.enum.ts → src/app/core/svg/internal-svg-icon.enum.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/app/shared/svg/svg-icon.enum.ts → src/app/core/svg/svg-icon.enum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ExternalSvgIcon } from 'src/app/shared/svg/external-svg-icon.enum';
import { InternalSvgIcon } from 'src/app/shared/svg/internal-svg-icon.enum';
import { ExternalSvgIcon } from 'src/app/core/svg/external-svg-icon.enum';
import { InternalSvgIcon } from 'src/app/core/svg/internal-svg-icon.enum';

export type SvgIcon = keyof typeof InternalSvgIcon | keyof typeof ExternalSvgIcon;
type SvgIconEnum = { [ key in SvgIcon ]: key };
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/svg/svg-icon.service.ts → src/app/core/svg/svg-icon.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
import { ExternalSvgIcon } from 'src/app/shared/svg/external-svg-icon.enum';
import { InternalSvgIcon } from 'src/app/shared/svg/internal-svg-icon.enum';
import { ExternalSvgIcon } from 'src/app/core/svg/external-svg-icon.enum';
import { InternalSvgIcon } from 'src/app/core/svg/internal-svg-icon.enum';

@Injectable({ providedIn: 'root' })
export class SvgIconService {
Expand Down
0 src/app/shared/types/value-of.type.ts → src/app/core/types/value-of.type.ts
View file
Open in desktop
File renamed without changes.
0 ...tion/background/background.component.html → ...ures/background/background.component.html
View file
Open in desktop
File renamed without changes.
0 ...tion/background/background.component.scss → ...ures/background/background.component.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...gation/background/background.component.ts → ...atures/background/background.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChild } from '@angular/core';
import { Observable } from 'rxjs';
import { distinctUntilChanged, map } from 'rxjs/operators';
import { BackgroundCanvasService } from 'src/app/navigation/background/services/background-canvas.service';
import { FpsService } from 'src/app/shared/screen-detector/fps.service';
import { FpsService } from 'src/app/core/screen/fps.service';
import { BackgroundCanvasService } from 'src/app/features/background/services/background-canvas.service';

@Component({
selector: 'app-background',
Expand Down
16 changes: 16 additions & 0 deletions src/app/features/background/background.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { CoreModule } from 'src/app/core/core.module';
import { BackgroundComponent } from 'src/app/features/background/background.component';

@NgModule({
declarations: [
BackgroundComponent,
],
imports: [
CoreModule,
],
exports: [
BackgroundComponent,
],
})
export class BackgroundModule { }
2 changes: 1 addition & 1 deletion ...background/models/canvas-element.model.ts → ...background/models/canvas-element.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorPalette } from 'src/app/shared/colors/models/color-palettes/color-palette.model';
import { ColorPalette } from 'src/app/core/colors/models/color-palettes/color-palette.model';

export abstract class CanvasElement {
public static canvasWidth: number;
Expand Down
6 changes: 3 additions & 3 deletions ...igation/background/models/circle.model.ts → ...eatures/background/models/circle.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CanvasElement } from 'src/app/navigation/background/models/canvas-element.model';
import { BaseColorPalette } from 'src/app/shared/colors/models/color-palettes/base-color-palette.model';
import { clamp } from 'src/app/shared/functions/clamp/clamp.function';
import { BaseColorPalette } from 'src/app/core/colors/models/color-palettes/base-color-palette.model';
import { clamp } from 'src/app/core/functions/clamp/clamp.function';
import { CanvasElement } from 'src/app/features/background/models/canvas-element.model';

type ColorKey = keyof BaseColorPalette;

Expand Down
4 changes: 2 additions & 2 deletions ...ackground/moving-background-icon.model.ts → ...odels/svg/moving-background-icon.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { sins } from 'src/app/shared/moving-background/sins.constant';
import { SvgIcon } from 'src/app/shared/svg/svg-icon.enum';
import { SvgIcon } from 'src/app/core/svg/svg-icon.enum';
import { sins } from 'src/app/features/background/models/svg/sins.constant';

export class MovingBackgroundIcon {
private static idCounter = 0;
Expand Down
2 changes: 1 addition & 1 deletion ...shared/moving-background/sins.constant.ts → ...es/background/models/svg/sins.constant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { SvgIcon } from 'src/app/shared/svg/svg-icon.enum';
import { SvgIcon } from 'src/app/core/svg/svg-icon.enum';

export const sins = [
SvgIcon.SINS_ANGER,
Expand Down
12 changes: 6 additions & 6 deletions ...und/services/background-canvas.service.ts → ...und/services/background-canvas.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { Injectable } from '@angular/core';
import { animationFrameScheduler, combineLatest, interval } from 'rxjs';
import { debounceTime, filter, map, tap } from 'rxjs/operators';
import { CanvasElement } from 'src/app/navigation/background/models/canvas-element.model';
import { Circle } from 'src/app/navigation/background/models/circle.model';
import { CanvasService } from 'src/app/shared/canvas/canvas.service';
import { ColorsService } from 'src/app/shared/colors/services/colors.service';
import { MovingBackgroundService } from 'src/app/shared/moving-background/moving-background.service';
import { ScreenDetectorService } from 'src/app/shared/screen-detector/screen-detector.service';
import { ColorsService } from 'src/app/core/colors/services/colors.service';
import { ScreenDetectorService } from 'src/app/core/screen/screen-detector.service';
import { CanvasElement } from 'src/app/features/background/models/canvas-element.model';
import { Circle } from 'src/app/features/background/models/circle.model';
import { CanvasService } from 'src/app/features/background/services/canvas.service';
import { MovingBackgroundService } from 'src/app/features/background/services/moving-background.service';

@Injectable()
export class BackgroundCanvasService extends CanvasService {
Expand Down
6 changes: 3 additions & 3 deletions src/app/shared/canvas/canvas.service.ts → ...res/background/services/canvas.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Injectable, OnDestroy } from '@angular/core';
import { combineLatest, Observable } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import { CanvasElement } from 'src/app/navigation/background/models/canvas-element.model';
import { Observed } from 'src/app/shared/decorators/observed.decorator';
import { ScreenDetectorService } from 'src/app/shared/screen-detector/screen-detector.service';
import { Observed } from 'src/app/core/decorators/observed.decorator';
import { ScreenDetectorService } from 'src/app/core/screen/screen-detector.service';
import { CanvasElement } from 'src/app/features/background/models/canvas-element.model';
import { SubSink } from 'subsink';

@Injectable()
Expand Down