From 7f4631cf2ebf2c8e3fe6601658007c288a4a601e Mon Sep 17 00:00:00 2001 From: chinonso098 Date: Wed, 25 Sep 2024 23:25:38 -0400 Subject: [PATCH] moved window component to shared-components --- src/app/app.component.spec.ts | 2 +- src/app/app.module.ts | 4 ++-- .../system-component/properties/properties.component.html | 2 +- .../system-component}/window/animation/animations.ts | 0 .../window/window.btn.highlight.directives.ts | 0 .../system-component}/window/window.component.css | 0 .../system-component}/window/window.component.html | 0 .../system-component}/window/window.component.spec.ts | 0 .../system-component}/window/window.component.ts | 2 +- src/app/system-apps/taskbar/taskbar.component.ts | 5 ++++- .../system-apps/taskbarentries/taskbarentries.component.ts | 4 +++- src/app/system-apps/terminal/terminal.component.ts | 4 +++- 12 files changed, 15 insertions(+), 8 deletions(-) rename src/app/{system-apps => shared/system-component}/window/animation/animations.ts (100%) rename src/app/{system-apps => shared/system-component}/window/window.btn.highlight.directives.ts (100%) rename src/app/{system-apps => shared/system-component}/window/window.component.css (100%) rename src/app/{system-apps => shared/system-component}/window/window.component.html (100%) rename src/app/{system-apps => shared/system-component}/window/window.component.spec.ts (100%) rename src/app/{system-apps => shared/system-component}/window/window.component.ts (99%) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 54d4f0b4..be01903b 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -2,7 +2,7 @@ import {TestBed} from '@angular/core/testing'; import {AppComponent} from './app.component'; import {TitleComponent } from './user-apps/title/title.component'; import {DesktopComponent} from './system-apps/desktop/desktop.component'; -import {WindowComponent} from './system-apps/window/window.component' +import {WindowComponent} from './shared/system-component/window/window.component' describe('AppComponent', () => { beforeEach(async () => { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5bcf6b75..1a5cf09f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,7 +16,7 @@ import { TaskBarPreviewComponent } from './system-apps/taskbarpreview/taskbarpre import { TaskBarEntriesComponent } from './system-apps/taskbarentries/taskbarentries.component'; import { TaskBarEntryComponent } from './system-apps/taskbarentry/taskbarentry.component'; import { FileExplorerComponent } from './system-apps/fileexplorer/fileexplorer.component'; -import { WindowComponent } from './system-apps/window/window.component'; +import { WindowComponent } from './shared/system-component/window/window.component'; import { FileManagerComponent } from './system-apps/filemanager/filemanager.component'; import { GreetingComponent } from './user-apps/greeting/greeting.component'; import { TaskmanagerComponent } from './system-apps/taskmanager/taskmanager.component'; @@ -38,7 +38,7 @@ import { FileTreeViewComponent } from './shared/system-component/filetreeview/fi import { SafeUrlPipe } from './shared/system-pipes/safe.resource.url.pipe'; import { TruncatePipe } from './shared/system-pipes/string.shorten.pipe'; -import { HighlightDirective } from './system-apps/window/window.btn.highlight.directives'; +import { HighlightDirective } from './shared/system-component/window/window.btn.highlight.directives'; import { TaskBarEntryHighlightDirective } from './system-apps/taskbarentries/taskbar.entry.highlight.directives'; import { LongPressDirective } from './system-apps/audioplayer/long.press.directive'; import { ColumnResizeDirective } from './system-apps/taskmanager/taskmanager.column-resize.directive'; diff --git a/src/app/shared/system-component/properties/properties.component.html b/src/app/shared/system-component/properties/properties.component.html index 8c949590..95449759 100644 --- a/src/app/shared/system-component/properties/properties.component.html +++ b/src/app/shared/system-component/properties/properties.component.html @@ -106,7 +106,7 @@

- + diff --git a/src/app/system-apps/window/animation/animations.ts b/src/app/shared/system-component/window/animation/animations.ts similarity index 100% rename from src/app/system-apps/window/animation/animations.ts rename to src/app/shared/system-component/window/animation/animations.ts diff --git a/src/app/system-apps/window/window.btn.highlight.directives.ts b/src/app/shared/system-component/window/window.btn.highlight.directives.ts similarity index 100% rename from src/app/system-apps/window/window.btn.highlight.directives.ts rename to src/app/shared/system-component/window/window.btn.highlight.directives.ts diff --git a/src/app/system-apps/window/window.component.css b/src/app/shared/system-component/window/window.component.css similarity index 100% rename from src/app/system-apps/window/window.component.css rename to src/app/shared/system-component/window/window.component.css diff --git a/src/app/system-apps/window/window.component.html b/src/app/shared/system-component/window/window.component.html similarity index 100% rename from src/app/system-apps/window/window.component.html rename to src/app/shared/system-component/window/window.component.html diff --git a/src/app/system-apps/window/window.component.spec.ts b/src/app/shared/system-component/window/window.component.spec.ts similarity index 100% rename from src/app/system-apps/window/window.component.spec.ts rename to src/app/shared/system-component/window/window.component.spec.ts diff --git a/src/app/system-apps/window/window.component.ts b/src/app/shared/system-component/window/window.component.ts similarity index 99% rename from src/app/system-apps/window/window.component.ts rename to src/app/shared/system-component/window/window.component.ts index e79de303..0d25bc34 100644 --- a/src/app/system-apps/window/window.component.ts +++ b/src/app/shared/system-component/window/window.component.ts @@ -5,7 +5,7 @@ import { RunningProcessService } from 'src/app/shared/system-service/running.pro import { Subscription } from 'rxjs'; import { StateManagmentService } from 'src/app/shared/system-service/state.management.service'; import { BaseState, WindowState } from 'src/app/system-files/state/state.interface'; -import {openCloseAnimation, hideShowAnimation, minimizeMaximizeAnimation} from 'src/app/system-apps/window/animation/animations'; +import {openCloseAnimation, hideShowAnimation, minimizeMaximizeAnimation} from 'src/app/shared/system-component/window/animation/animations'; import { StateType } from 'src/app/system-files/state/state.type'; import { SessionManagmentService } from 'src/app/shared/system-service/session.management.service'; diff --git a/src/app/system-apps/taskbar/taskbar.component.ts b/src/app/system-apps/taskbar/taskbar.component.ts index 4be35be3..71567fda 100644 --- a/src/app/system-apps/taskbar/taskbar.component.ts +++ b/src/app/system-apps/taskbar/taskbar.component.ts @@ -4,6 +4,7 @@ import { ProcessIDService } from 'src/app/shared/system-service/process.id.servi import { RunningProcessService } from 'src/app/shared/system-service/running.process.service'; import { ComponentType } from 'src/app/system-files/component.types'; import { Process } from 'src/app/system-files/process'; +import { Constants } from 'src/app/system-files/constants'; @Component({ selector: 'cos-taskbar', @@ -16,10 +17,12 @@ export class TaskbarComponent implements AfterViewInit{ private _runningProcessService:RunningProcessService; private _menuService:MenuService; private _el: ElementRef; + private _consts:Constants = new Constants(); + SECONDS_DELAY = 1000; hasWindow = false; - icon = 'osdrive/Cheetah/System/Imageres/generic_program.png'; + icon = `${this._consts.IMAGE_BASE_PATH}generic_program.png`; name = 'taskbar'; processId = 0; type = ComponentType.System diff --git a/src/app/system-apps/taskbarentries/taskbarentries.component.ts b/src/app/system-apps/taskbarentries/taskbarentries.component.ts index c01cb525..3ad09831 100644 --- a/src/app/system-apps/taskbarentries/taskbarentries.component.ts +++ b/src/app/system-apps/taskbarentries/taskbarentries.component.ts @@ -7,6 +7,7 @@ import { TriggerProcessService } from 'src/app/shared/system-service/trigger.pro import { ComponentType } from 'src/app/system-files/component.types'; import { FileInfo } from 'src/app/system-files/file.info'; import { Process } from 'src/app/system-files/process'; +import { Constants } from 'src/app/system-files/constants'; @Component({ selector: 'cos-taskbarentries', @@ -19,6 +20,7 @@ export class TaskBarEntriesComponent implements AfterViewInit, OnDestroy { private _runningProcessService:RunningProcessService; private _triggerProcessService:TriggerProcessService; private _menuService:MenuService; + private _consts:Constants = new Constants(); private _processListChangeSub!: Subscription; private _addIconToTaskbarSub!: Subscription; @@ -36,7 +38,7 @@ export class TaskBarEntriesComponent implements AfterViewInit, OnDestroy { unPinned = "unPinned"; hasWindow = false; - icon = 'osdrive/Cheetah/System/Imageres/generic_program.png'; + icon = `${this._consts.IMAGE_BASE_PATH}generic_program.png`; name = 'taskbarentry'; processId = 0; type = ComponentType.System; diff --git a/src/app/system-apps/terminal/terminal.component.ts b/src/app/system-apps/terminal/terminal.component.ts index 78a7b2dc..75b0d91b 100644 --- a/src/app/system-apps/terminal/terminal.component.ts +++ b/src/app/system-apps/terminal/terminal.component.ts @@ -12,6 +12,7 @@ import { AppState, BaseState } from 'src/app/system-files/state/state.interface' import { StateType } from 'src/app/system-files/state/state.type'; import { StateManagmentService } from 'src/app/shared/system-service/state.management.service'; import { SessionManagmentService } from 'src/app/shared/system-service/session.management.service'; +import { Constants } from 'src/app/system-files/constants'; import * as htmlToImage from 'html-to-image'; import { TaskBarPreviewImage } from '../taskbarpreview/taskbar.preview'; @@ -35,6 +36,7 @@ export class TerminalComponent implements BaseComponent, OnInit, AfterViewInit, private _stateManagmentService:StateManagmentService; private _sessionManagmentService: SessionManagmentService; private _appState!:AppState; + private _consts:Constants = new Constants(); private msgPosCounter = 0; private scrollCounter = 0 @@ -70,7 +72,7 @@ export class TerminalComponent implements BaseComponent, OnInit, AfterViewInit, traversalDepth = 0; hasWindow = true; - icon = '/osdrive/Cheetah/System/Imageres/terminal_48.png'; + icon = `${this._consts.IMAGE_BASE_PATH}terminal.png`; name = 'terminal'; processId = 0; type = ComponentType.System;