From e3584c13a9e38aee50abd5101705af0f6f6ac6a7 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Tue, 5 Jul 2022 13:11:12 +0200 Subject: [PATCH] migrated to scss to fix build errors --- desktop-app/angular.json | 11 +++++--- .../{app.component.css => app.component.scss} | 0 desktop-app/src/app/app.component.ts | 2 +- ...t.component.css => content.component.scss} | 0 .../src/app/content/content.component.ts | 2 +- ...t.css => current-task-item.component.scss} | 0 .../current-task-item.component.ts | 2 +- ...onent.css => current-tasks.component.scss} | 0 .../current-tasks/current-tasks.component.ts | 2 +- ...les.component.css => files.component.scss} | 0 desktop-app/src/app/files/files.component.ts | 2 +- ...er.component.css => header.component.scss} | 0 .../src/app/header/header.component.ts | 2 +- ...link.component.css => link.component.scss} | 0 desktop-app/src/app/link/link.component.ts | 27 +++++++++---------- ...s => loading-spinner-small.component.scss} | 0 .../loading-spinner-small.component.ts | 13 ++++----- ...ent.css => loading-spinner.component.scss} | 0 .../loading-spinner.component.ts | 2 +- ...ponent.css => package-item.component.scss} | 0 .../package-item/package-item.component.ts | 2 +- ....component.css => packages.component.scss} | 0 .../src/app/packages/packages.component.ts | 2 +- ...tup.component.css => setup.component.scss} | 0 desktop-app/src/app/setup/setup.component.ts | 2 +- ...omponent.css => status-bar.component.scss} | 0 .../app/status-bar/status-bar.component.ts | 2 +- ...w.component.css => webview.component.scss} | 0 .../src/app/webview/webview.component.ts | 2 +- desktop-app/src/{styles.css => styles.scss} | 18 ++++++------- 30 files changed, 46 insertions(+), 47 deletions(-) rename desktop-app/src/app/{app.component.css => app.component.scss} (100%) rename desktop-app/src/app/content/{content.component.css => content.component.scss} (100%) rename desktop-app/src/app/current-task-item/{current-task-item.component.css => current-task-item.component.scss} (100%) rename desktop-app/src/app/current-tasks/{current-tasks.component.css => current-tasks.component.scss} (100%) rename desktop-app/src/app/files/{files.component.css => files.component.scss} (100%) rename desktop-app/src/app/header/{header.component.css => header.component.scss} (100%) rename desktop-app/src/app/link/{link.component.css => link.component.scss} (100%) rename desktop-app/src/app/loading-spinner-small/{loading-spinner-small.component.css => loading-spinner-small.component.scss} (100%) rename desktop-app/src/app/loading-spinner/{loading-spinner.component.css => loading-spinner.component.scss} (100%) rename desktop-app/src/app/package-item/{package-item.component.css => package-item.component.scss} (100%) rename desktop-app/src/app/packages/{packages.component.css => packages.component.scss} (100%) rename desktop-app/src/app/setup/{setup.component.css => setup.component.scss} (100%) rename desktop-app/src/app/status-bar/{status-bar.component.css => status-bar.component.scss} (100%) rename desktop-app/src/app/webview/{webview.component.css => webview.component.scss} (100%) rename desktop-app/src/{styles.css => styles.scss} (97%) diff --git a/desktop-app/angular.json b/desktop-app/angular.json index acaf4cc..5e2309e 100644 --- a/desktop-app/angular.json +++ b/desktop-app/angular.json @@ -23,7 +23,7 @@ "src/assets" ], "styles": [ - "src/styles.css", + "src/styles.scss", "node_modules/materialize-css/dist/css/materialize.min.css" ], "scripts": [ @@ -137,7 +137,7 @@ "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", "styles": [ - "src/styles.css" + "src/styles.scss" ], "scripts": [], "assets": [ @@ -200,5 +200,10 @@ "defaultProject": "desktop-app", "cli": { "packageManager": "yarn" + }, + "schematics": { + "@schematics/angular:component": { + "styleext": "scss" + } } -} +} \ No newline at end of file diff --git a/desktop-app/src/app/app.component.css b/desktop-app/src/app/app.component.scss similarity index 100% rename from desktop-app/src/app/app.component.css rename to desktop-app/src/app/app.component.scss diff --git a/desktop-app/src/app/app.component.ts b/desktop-app/src/app/app.component.ts index 4eb8093..98dc265 100644 --- a/desktop-app/src/app/app.component.ts +++ b/desktop-app/src/app/app.component.ts @@ -11,7 +11,7 @@ import { environment } from '../environments/environment'; @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.css'], + styleUrls: ['./app.component.scss'], }) export class AppComponent implements OnInit, AfterViewInit { @ViewChild('spinner', { static: false }) spinner; diff --git a/desktop-app/src/app/content/content.component.css b/desktop-app/src/app/content/content.component.scss similarity index 100% rename from desktop-app/src/app/content/content.component.css rename to desktop-app/src/app/content/content.component.scss diff --git a/desktop-app/src/app/content/content.component.ts b/desktop-app/src/app/content/content.component.ts index 1ef9cf3..a9fefa4 100644 --- a/desktop-app/src/app/content/content.component.ts +++ b/desktop-app/src/app/content/content.component.ts @@ -4,7 +4,7 @@ import { AppService } from '../app.service'; @Component({ selector: 'app-content', templateUrl: './content.component.html', - styleUrls: ['./content.component.css'], + styleUrls: ['./content.component.scss'], }) export class ContentComponent implements OnInit { constructor(public appService: AppService) {} diff --git a/desktop-app/src/app/current-task-item/current-task-item.component.css b/desktop-app/src/app/current-task-item/current-task-item.component.scss similarity index 100% rename from desktop-app/src/app/current-task-item/current-task-item.component.css rename to desktop-app/src/app/current-task-item/current-task-item.component.scss diff --git a/desktop-app/src/app/current-task-item/current-task-item.component.ts b/desktop-app/src/app/current-task-item/current-task-item.component.ts index e263ea2..f14af76 100644 --- a/desktop-app/src/app/current-task-item/current-task-item.component.ts +++ b/desktop-app/src/app/current-task-item/current-task-item.component.ts @@ -4,7 +4,7 @@ import { ProcessBucketService } from '../process-bucket.service'; @Component({ selector: 'app-current-task-item', templateUrl: './current-task-item.component.html', - styleUrls: ['./current-task-item.component.css'], + styleUrls: ['./current-task-item.component.scss'], }) export class CurrentTaskItemComponent implements OnInit { @Input() task; diff --git a/desktop-app/src/app/current-tasks/current-tasks.component.css b/desktop-app/src/app/current-tasks/current-tasks.component.scss similarity index 100% rename from desktop-app/src/app/current-tasks/current-tasks.component.css rename to desktop-app/src/app/current-tasks/current-tasks.component.scss diff --git a/desktop-app/src/app/current-tasks/current-tasks.component.ts b/desktop-app/src/app/current-tasks/current-tasks.component.ts index 0029189..632b149 100644 --- a/desktop-app/src/app/current-tasks/current-tasks.component.ts +++ b/desktop-app/src/app/current-tasks/current-tasks.component.ts @@ -6,7 +6,7 @@ import { AppService } from '../app.service'; @Component({ selector: 'app-current-tasks', templateUrl: './current-tasks.component.html', - styleUrls: ['./current-tasks.component.css'], + styleUrls: ['./current-tasks.component.scss'], }) export class CurrentTasksComponent implements OnInit { constructor(public processService: ProcessBucketService, public appService: AppService) { diff --git a/desktop-app/src/app/files/files.component.css b/desktop-app/src/app/files/files.component.scss similarity index 100% rename from desktop-app/src/app/files/files.component.css rename to desktop-app/src/app/files/files.component.scss diff --git a/desktop-app/src/app/files/files.component.ts b/desktop-app/src/app/files/files.component.ts index 8e3debc..ab88b68 100644 --- a/desktop-app/src/app/files/files.component.ts +++ b/desktop-app/src/app/files/files.component.ts @@ -19,7 +19,7 @@ declare let M; @Component({ selector: 'app-files', templateUrl: './files.component.html', - styleUrls: ['./files.component.css'], + styleUrls: ['./files.component.scss'], }) export class FilesComponent implements OnInit { @ViewChild('filesModal', { static: false }) filesModal; diff --git a/desktop-app/src/app/header/header.component.css b/desktop-app/src/app/header/header.component.scss similarity index 100% rename from desktop-app/src/app/header/header.component.css rename to desktop-app/src/app/header/header.component.scss diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index f68f134..e5028dc 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -32,7 +32,7 @@ interface LogCatEntry { @Component({ selector: 'app-header', templateUrl: './header.component.html', - styleUrls: ['./header.component.css'], + styleUrls: ['./header.component.scss'], }) export class HeaderComponent implements OnInit { @ViewChild('header', { static: false }) header; diff --git a/desktop-app/src/app/link/link.component.css b/desktop-app/src/app/link/link.component.scss similarity index 100% rename from desktop-app/src/app/link/link.component.css rename to desktop-app/src/app/link/link.component.scss diff --git a/desktop-app/src/app/link/link.component.ts b/desktop-app/src/app/link/link.component.ts index 880dd88..fbfce58 100644 --- a/desktop-app/src/app/link/link.component.ts +++ b/desktop-app/src/app/link/link.component.ts @@ -2,23 +2,20 @@ import { Component, Input, OnInit } from '@angular/core'; import { AppService } from '../app.service'; @Component({ - selector: 'app-link', - templateUrl: './link.component.html', - styleUrls: ['./link.component.css'] + selector: 'app-link', + templateUrl: './link.component.html', + styleUrls: ['./link.component.scss'], }) export class LinkComponent implements OnInit { - @Input('url') url:string; - @Input('text') text:string; - @Input('isDark') isDark:boolean; - constructor(public appService:AppService) { + @Input('url') url: string; + @Input('text') text: string; + @Input('isDark') isDark: boolean; + constructor(public appService: AppService) {} - } + ngOnInit() {} - ngOnInit() { - } - - open(){ - console.log(this.url); - this.appService.opn(this.url); - } + open() { + console.log(this.url); + this.appService.opn(this.url); + } } diff --git a/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.css b/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.scss similarity index 100% rename from desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.css rename to desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.scss diff --git a/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.ts b/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.ts index 64fd58b..3f1b04d 100644 --- a/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.ts +++ b/desktop-app/src/app/loading-spinner-small/loading-spinner-small.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-loading-spinner-small', - templateUrl: './loading-spinner-small.component.html', - styleUrls: ['./loading-spinner-small.component.css'] + selector: 'app-loading-spinner-small', + templateUrl: './loading-spinner-small.component.html', + styleUrls: ['./loading-spinner-small.component.scss'], }) export class LoadingSpinnerSmallComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/desktop-app/src/app/loading-spinner/loading-spinner.component.css b/desktop-app/src/app/loading-spinner/loading-spinner.component.scss similarity index 100% rename from desktop-app/src/app/loading-spinner/loading-spinner.component.css rename to desktop-app/src/app/loading-spinner/loading-spinner.component.scss diff --git a/desktop-app/src/app/loading-spinner/loading-spinner.component.ts b/desktop-app/src/app/loading-spinner/loading-spinner.component.ts index 33012d7..4572c50 100644 --- a/desktop-app/src/app/loading-spinner/loading-spinner.component.ts +++ b/desktop-app/src/app/loading-spinner/loading-spinner.component.ts @@ -4,7 +4,7 @@ import { LoadingSpinnerService } from '../loading-spinner.service'; @Component({ selector: 'app-loading-spinner', templateUrl: './loading-spinner.component.html', - styleUrls: ['./loading-spinner.component.css'], + styleUrls: ['./loading-spinner.component.scss'], }) export class LoadingSpinnerComponent implements OnInit { isActive: boolean; diff --git a/desktop-app/src/app/package-item/package-item.component.css b/desktop-app/src/app/package-item/package-item.component.scss similarity index 100% rename from desktop-app/src/app/package-item/package-item.component.css rename to desktop-app/src/app/package-item/package-item.component.scss diff --git a/desktop-app/src/app/package-item/package-item.component.ts b/desktop-app/src/app/package-item/package-item.component.ts index 81f5903..d70ac8e 100644 --- a/desktop-app/src/app/package-item/package-item.component.ts +++ b/desktop-app/src/app/package-item/package-item.component.ts @@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; @Component({ selector: 'app-package-item', templateUrl: './package-item.component.html', - styleUrls: ['./package-item.component.css'], + styleUrls: ['./package-item.component.scss'], }) export class PackageItemComponent implements OnInit { @Input() package: any; diff --git a/desktop-app/src/app/packages/packages.component.css b/desktop-app/src/app/packages/packages.component.scss similarity index 100% rename from desktop-app/src/app/packages/packages.component.css rename to desktop-app/src/app/packages/packages.component.scss diff --git a/desktop-app/src/app/packages/packages.component.ts b/desktop-app/src/app/packages/packages.component.ts index 83b52a9..eef5906 100644 --- a/desktop-app/src/app/packages/packages.component.ts +++ b/desktop-app/src/app/packages/packages.component.ts @@ -10,7 +10,7 @@ import { PackageService } from './package.service'; @Component({ selector: 'app-packages', templateUrl: './packages.component.html', - styleUrls: ['./packages.component.css'], + styleUrls: ['./packages.component.scss'], }) export class PackagesComponent implements OnInit { @ViewChild('appSettingsModal', { static: false }) appSettingsModal; diff --git a/desktop-app/src/app/setup/setup.component.css b/desktop-app/src/app/setup/setup.component.scss similarity index 100% rename from desktop-app/src/app/setup/setup.component.css rename to desktop-app/src/app/setup/setup.component.scss diff --git a/desktop-app/src/app/setup/setup.component.ts b/desktop-app/src/app/setup/setup.component.ts index 465e260..eefb954 100644 --- a/desktop-app/src/app/setup/setup.component.ts +++ b/desktop-app/src/app/setup/setup.component.ts @@ -5,7 +5,7 @@ import { AdbClientService } from '../adb-client.service'; @Component({ selector: 'app-setup', templateUrl: './setup.component.html', - styleUrls: ['./setup.component.css'], + styleUrls: ['./setup.component.scss'], }) export class SetupComponent implements OnInit { isInstallingLauncher: boolean; diff --git a/desktop-app/src/app/status-bar/status-bar.component.css b/desktop-app/src/app/status-bar/status-bar.component.scss similarity index 100% rename from desktop-app/src/app/status-bar/status-bar.component.css rename to desktop-app/src/app/status-bar/status-bar.component.scss diff --git a/desktop-app/src/app/status-bar/status-bar.component.ts b/desktop-app/src/app/status-bar/status-bar.component.ts index 4af3c05..64072ca 100644 --- a/desktop-app/src/app/status-bar/status-bar.component.ts +++ b/desktop-app/src/app/status-bar/status-bar.component.ts @@ -4,7 +4,7 @@ import { StatusBarService } from '../status-bar.service'; @Component({ selector: 'app-status-bar', templateUrl: './status-bar.component.html', - styleUrls: ['./status-bar.component.css'], + styleUrls: ['./status-bar.component.scss'], }) export class StatusBarComponent implements OnInit { isWarning: boolean; diff --git a/desktop-app/src/app/webview/webview.component.css b/desktop-app/src/app/webview/webview.component.scss similarity index 100% rename from desktop-app/src/app/webview/webview.component.css rename to desktop-app/src/app/webview/webview.component.scss diff --git a/desktop-app/src/app/webview/webview.component.ts b/desktop-app/src/app/webview/webview.component.ts index 665b2c3..58e9360 100644 --- a/desktop-app/src/app/webview/webview.component.ts +++ b/desktop-app/src/app/webview/webview.component.ts @@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription'; @Component({ selector: 'app-webview', templateUrl: './webview.component.html', - styleUrls: ['./webview.component.css'], + styleUrls: ['./webview.component.scss'], }) export class WebviewComponent implements OnInit { constructor(webService: WebviewService, appService: AppService, router: Router, route: ActivatedRoute) { diff --git a/desktop-app/src/styles.css b/desktop-app/src/styles.scss similarity index 97% rename from desktop-app/src/styles.css rename to desktop-app/src/styles.scss index d65a4d5..5bd05fa 100644 --- a/desktop-app/src/styles.css +++ b/desktop-app/src/styles.scss @@ -242,7 +242,7 @@ code > pre, .code{ text-align: center; text-overflow: ellipsis; text-transform: uppercase; - color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255)); + color: rgb(255, 255, 255); background: #E51253; border-radius: 10px; box-shadow: 0 3px 1px -1px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); @@ -302,7 +302,7 @@ code > pre, .code{ bottom: 0; left: 0; right: 0; - background-color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255)); + background-color: rgb(255, 255, 255); opacity: 0; transition: opacity 0.2s; } @@ -317,7 +317,7 @@ code > pre, .code{ padding: 50%; width: 32px; /* Safari */ height: 32px; /* Safari */ - background-color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255)); + background-color: rgb(255, 255, 255); opacity: 0; transform: translate(-50%, -50%) scale(1); transition: opacity 1s, transform 0.5s; @@ -354,8 +354,8 @@ code > pre, .code{ /* Disabled */ .pure-material-button-contained:disabled { - color: rgba(var(--pure-material-onsurface-rgb, 255,255,255), 0.38); - background-color: rgba(var(--pure-material-onsurface-rgb, 255,255,255), 0.20); + color: rgba(255, 255, 255, 0.38); + background-color: rgba(255, 255, 255, 0.20); box-shadow: none; cursor: initial; } @@ -409,10 +409,10 @@ code > pre, .code{ transition: .2s; } -&:not(.filled-in) + span:not(.lever):after { - border: 0; - transform: scale(0); - } +:not(.filled-in) + span:not(.lever):after { + border: 0; + transform: scale(0); +} &:not(:checked):disabled + span:not(.lever):before { border: none;