Skip to content

Commit

Permalink
restructure theme and assets
Browse files Browse the repository at this point in the history
  • Loading branch information
dysTOS committed Nov 11, 2023
1 parent d901296 commit e8bf4c9
Show file tree
Hide file tree
Showing 316 changed files with 74 additions and 584 deletions.
5 changes: 5 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@
"input": "src/configurations/gmr/assets/images",
"output": "assets/images",
"glob": "*.*"
},
{
"input": "src/configurations/gmr/assets/css",
"output": "assets/css",
"glob": "*.*"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"test": "ng test",
"lint": "ng lint",
"artisan-serve": "cd ../mkjAPI && php artisan serve",
"build-css": "sass src/assets/theme/base/mkj/theme-mkj-dark.scss:src/assets/theme/theme-mkj-dark.css src/assets/theme/base/mkj/theme-mkj-light.scss:src/assets/theme/theme-mkj-light.css src/assets/theme/base/gmr/theme-gmr-dark.scss:src/assets/theme/theme-gmr-dark.css src/assets/theme/base/gmr/theme-gmr-light.scss:src/assets/theme/theme-gmr-light.css"
"build-css": "sass src/theme/base/mkj/theme-mkj-dark.scss:src/assets/css/theme-dark.css src/theme/base/mkj/theme-mkj-light.scss:src/assets/css/theme-light.css src/theme/base/gmr/theme-gmr-dark.scss:src/configurations/gmr/assets/css/theme-dark.css src/theme/base/gmr/theme-gmr-light.scss:src/configurations/gmr/assets/css/theme-light.css"
},
"private": true,
"dependencies": {
Expand Down
7 changes: 0 additions & 7 deletions src/app/components/aatest/aatest.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@
[method]="'post'"
>
</p-fileUpload>

<button
pButton
label="TEST BILD DOWNLOAD"
(click)="download()"
></button>
<button pButton label="TEST OCS" (click)="testOCS()"></button>
</p-tabPanel>
<p-tabPanel header="Push Notifications">
<p-card>
Expand Down
15 changes: 0 additions & 15 deletions src/app/components/aatest/aatest.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,6 @@ export class AatestComponent implements OnInit {
this.notenService.getNotenmappen().subscribe((res) => console.log(res));
}

public testOCS() {
const url = "https://cloud.mk-jainzen.at/ocs/v1.php/cloud";
const creds = window.btoa("admin:gmrmkjrs&1928/3");
const headers = {
headers: new HttpHeaders({
"ocs-apirequest": "true",
Authorization: creds,
}),
};
this.http.get(url, headers).subscribe({
next: (res) => console.log(res),
error: (err) => console.log(err),
});
}

public saveWordpressPost() {
const url = "http://localhost:8000/api/savepost";
const headers = {
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/app.accessdenied.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="exception-body accessdenied-body">
<div class="exception-panel">
<img src="assets/layout/images/exception/icon-access.png" />
<img src="assets/images/exception/icon-access.png" />

<p-button label="Zum Dashboard" [routerLink]="['/']"></p-button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/app.error.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="exception-body error-body">
<div class="exception-panel">
<img src="assets/layout/images/exception/icon-error.png" />
<img src="assets/images/exception/icon-error.png" />

<p-button label="Zum Dashboard" [routerLink]="['/']"></p-button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/app.notfound.component.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="exception-body pagenotfound-body">
<div class="exception-panel">
<img src="assets/layout/images/exception/icon-404.png" />
<img src="assets/images/exception/icon-404.png" />

<p-button label="Zum Dashboard" [routerLink]="['/']"></p-button>
</div>
Expand Down
13 changes: 2 additions & 11 deletions src/app/services/theme.service.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { Injectable } from "@angular/core";
import { environment } from "src/environments/environment";

@Injectable({
providedIn: "root",
})
export class ThemeService {
private themePrefix = environment.prefix;

public darkMode: boolean = false;
public layoutMode: "static" | "overlay" = "static";
public inputStyle: "outlined" | "filled" = "outlined";
Expand Down Expand Up @@ -49,15 +46,9 @@ export class ThemeService {

public changeTheme() {
if (this.darkMode) {
this.changeStyleSheet(
"theme-css",
"theme-" + this.themePrefix + "-dark.css"
);
this.changeStyleSheet("theme-css", "theme-dark.css");
} else {
this.changeStyleSheet(
"theme-css",
"theme-" + this.themePrefix + "-light.css"
);
this.changeStyleSheet("theme-css", "theme-light.css");
}
this.writeLocalSettings();
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/assets/css/theme-dark.css.map

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/assets/css/theme-light.css.map

Large diffs are not rendered by default.

File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed src/assets/layout/images/avatar1.png
Binary file not shown.
Binary file removed src/assets/layout/images/avatar2.png
Binary file not shown.
Binary file removed src/assets/layout/images/avatar3.png
Binary file not shown.
Binary file removed src/assets/layout/images/avatar4.png
Binary file not shown.
Binary file removed src/assets/layout/images/dashboard/bridge.png
Binary file not shown.
17 changes: 0 additions & 17 deletions src/assets/layout/images/dashboard/chart-1.svg

This file was deleted.

17 changes: 0 additions & 17 deletions src/assets/layout/images/dashboard/chart-2.svg

This file was deleted.

17 changes: 0 additions & 17 deletions src/assets/layout/images/dashboard/chart-3.svg

This file was deleted.

17 changes: 0 additions & 17 deletions src/assets/layout/images/dashboard/chart-4.svg

This file was deleted.

Binary file removed src/assets/layout/images/dashboard/map.png
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/layout/images/landing/icon-cleancode.png
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/layout/images/landing/icon-responsive.png
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/layout/images/landing/landing-main.png
Binary file not shown.
Binary file removed src/assets/layout/images/landing/showcase-image.png
Binary file not shown.
Binary file removed src/assets/layout/images/login/login-image.png
Binary file not shown.
Binary file removed src/assets/layout/images/logo-black.png
Binary file not shown.
Binary file removed src/assets/layout/images/logo-loading.png
Diff not rendered.
Loading

0 comments on commit e8bf4c9

Please sign in to comment.