peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-11-16 14:51:21 +01:00
parent 85abff3ac7
commit 850f9e0f29
7 changed files with 115 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+1 -1
View File
@@ -400,7 +400,7 @@ const routes: Routes = [
loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
}, },
], ],
// canActivate: [InactivityGuard] canActivate: [InactivityGuard]
}, },
]; ];
src/app/pages/login/login.page.ts
-2
View File
@@ -40,7 +40,6 @@ export class LoginPage implements OnInit {
private changeProfileService: ChangeProfileService, private changeProfileService: ChangeProfileService,
public ThemeService: ThemeService, public ThemeService: ThemeService,
private storageservice: StorageService, private storageservice: StorageService,
) {} ) {}
ngOnInit() { ngOnInit() {
@@ -132,7 +131,6 @@ export class LoginPage implements OnInit {
} }
} }
goback() { goback() {
const pathName = SessionStore.user.UrlBeforeInactivity const pathName = SessionStore.user.UrlBeforeInactivity
if(pathName) { if(pathName) {
src/app/services/toast.service.ts
+21 -7
View File
@@ -196,16 +196,30 @@ export class ToastService {
loading() : HTMLDivElement { loading() : HTMLDivElement {
let loader: HTMLDivElement = document.createElement('div') let loader: HTMLDivElement = document.createElement('div')
let theme;
if(document.querySelector('body').className.includes('gov')) {
theme = 'gov'
} else if(document.querySelector('body').className.includes('default')) {
theme = 'blue'
} else if(document.querySelector('body').className.includes('tribunal')) {
theme = 'tribunal'
} else {
theme = 'gov'
}
loader.innerHTML = ` loader.innerHTML = `
<div class="loading-blocker">
<div class="loading-blocker"> <div class="loading-blocker-container">
<div class="loading-blocker-container"> <img src="/assets/gif/theme/${theme}/Blocks-loader.svg" />
<img src="/assets/images/Blocks-loader.gif" /> </div>
</div> </div>
</div> `;
`
console.log(document.querySelector('body').classList)
document.body.append(loader) document.body.append(loader)
loader.addEventListener('click', ()=>{ loader.addEventListener('click', ()=>{
src/assets/gif/theme/blue/Blocks-loader.svg
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
<rect x="19" y="19" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
</rect><rect x="40" y="19" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
</rect><rect x="61" y="19" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
</rect><rect x="19" y="40" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
</rect><rect x="61" y="40" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
</rect><rect x="19" y="61" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
</rect><rect x="40" y="61" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
</rect><rect x="61" y="61" width="20" height="20" fill="#42b9fe">
<animate attributeName="fill" values="#3880ff;#42b9fe;#42b9fe" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
</rect>
<!-- [ldio] generated by https://loading.io/ --></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

src/assets/gif/theme/gov/Blocks-loader.svg
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
<rect x="19" y="19" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
</rect><rect x="40" y="19" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
</rect><rect x="61" y="19" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
</rect><rect x="19" y="40" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
</rect><rect x="61" y="40" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
</rect><rect x="19" y="61" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
</rect><rect x="40" y="61" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
</rect><rect x="61" y="61" width="20" height="20" fill="#c63527">
<animate attributeName="fill" values="#1d0e0b;#c63527;#c63527" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
</rect>
<!-- [ldio] generated by https://loading.io/ --></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

src/assets/gif/theme/tribunal/Blocks-loader.svg
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
<rect x="19" y="19" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0s" calcMode="discrete"></animate>
</rect><rect x="40" y="19" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.125s" calcMode="discrete"></animate>
</rect><rect x="61" y="19" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.25s" calcMode="discrete"></animate>
</rect><rect x="19" y="40" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.875s" calcMode="discrete"></animate>
</rect><rect x="61" y="40" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.375s" calcMode="discrete"></animate>
</rect><rect x="19" y="61" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.75s" calcMode="discrete"></animate>
</rect><rect x="40" y="61" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.625s" calcMode="discrete"></animate>
</rect><rect x="61" y="61" width="20" height="20" fill="#ff1c1c">
<animate attributeName="fill" values="#ebf4fa;#ff1c1c;#ff1c1c" keyTimes="0;0.125;1" dur="1s" repeatCount="indefinite" begin="0.5s" calcMode="discrete"></animate>
</rect>
<!-- [ldio] generated by https://loading.io/ --></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

src/global.scss
+33
View File
@@ -1300,3 +1300,36 @@ ngx-mat-datetime-content{
} }
@keyframes ldio-rpinwye8j0b {
0% { transform: rotate(0deg) }
50% { transform: rotate(180deg) }
100% { transform: rotate(360deg) }
}
.ldio-rpinwye8j0b div {
position: absolute;
animation: ldio-rpinwye8j0b 1s linear infinite;
width: 160px;
height: 160px;
top: 20px;
left: 20px;
border-radius: 50%;
box-shadow: 0 4px 0 0 #e15b64;
transform-origin: 80px 82px;
}
.loadingio-eclipse {
width: 200px;
height: 200px;
display: inline-block;
overflow: hidden;
}
.ldio-rpinwye8j0b {
width: 100%;
height: 100%;
position: relative;
transform: translateZ(0) scale(1);
backface-visibility: hidden;
transform-origin: 0 0; /* see note above */
}
.ldio-rpinwye8j0b div { box-sizing: content-box; }