Mise à jour du layout
This commit is contained in:
Rampeur
+6
-6
@@ -10,7 +10,7 @@
|
||||
},
|
||||
"newProjectRoot": "projects",
|
||||
"projects": {
|
||||
"headup_angular": {
|
||||
"adastra_angular": {
|
||||
"projectType": "application",
|
||||
"schematics": {
|
||||
"@schematics/angular:component": {
|
||||
@@ -27,7 +27,7 @@
|
||||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:browser-esbuild",
|
||||
"options": {
|
||||
"outputPath": "dist/headup_angular",
|
||||
"outputPath": "dist/adastra_angular",
|
||||
"index": "src/index.html",
|
||||
"main": "src/main.ts",
|
||||
"tsConfig": "tsconfig.app.json",
|
||||
@@ -120,13 +120,13 @@
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"configurations": {
|
||||
"production": {
|
||||
"buildTarget": "headup_angular:build:production"
|
||||
"buildTarget": "adastra_angular:build:production"
|
||||
},
|
||||
"development": {
|
||||
"buildTarget": "headup_angular:build:development"
|
||||
"buildTarget": "adastra_angular:build:development"
|
||||
},
|
||||
"local": {
|
||||
"buildTarget": "headup_angular:build:local"
|
||||
"buildTarget": "adastra_angular:build:local"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
@@ -134,7 +134,7 @@
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||
"options": {
|
||||
"buildTarget": "headup_angular:build"
|
||||
"buildTarget": "adastra_angular:build"
|
||||
}
|
||||
},
|
||||
"test": {
|
||||
|
||||
Generated
+6
-6
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "headup-app",
|
||||
"name": "adastra-app",
|
||||
"version": "1.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "headup-app",
|
||||
"name": "adastra-app",
|
||||
"version": "1.0.0",
|
||||
"dependencies": {
|
||||
"@angular/animations": "^17.3.5",
|
||||
@@ -20,7 +20,7 @@
|
||||
"@angular/platform-browser": "^17.3.5",
|
||||
"@angular/platform-browser-dynamic": "^17.3.8",
|
||||
"@angular/router": "^17.3.8",
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap": "^5.3.7",
|
||||
"chart.js": "^4.4.2",
|
||||
"chartist": "^1.3.0",
|
||||
"ng-chartist": "^8.2.0",
|
||||
@@ -6319,9 +6319,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/bootstrap": {
|
||||
"version": "5.3.3",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
|
||||
"integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
|
||||
"version": "5.3.7",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
|
||||
"integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "headup-app",
|
||||
"name": "adastra-app",
|
||||
"version": "1.0.0",
|
||||
"author": "Solide Apps <admin@unespace.com>",
|
||||
"contributors": [
|
||||
@@ -10,7 +10,7 @@
|
||||
"start": "ng serve",
|
||||
"build": "ng build",
|
||||
"watch": "ng build --watch --configuration development",
|
||||
"dev": "ng serve --configuration local",
|
||||
"dev": "ng serve --configuration local --port 4201",
|
||||
"local": "APP_ENV=local ng serve --port 4400 --configuration local",
|
||||
"lint": "ng lint",
|
||||
"test": "ng test"
|
||||
@@ -32,7 +32,7 @@
|
||||
"@angular/platform-browser": "^17.3.5",
|
||||
"@angular/platform-browser-dynamic": "^17.3.8",
|
||||
"@angular/router": "^17.3.8",
|
||||
"bootstrap": "^5.3.3",
|
||||
"bootstrap": "^5.3.7",
|
||||
"chart.js": "^4.4.2",
|
||||
"chartist": "^1.3.0",
|
||||
"ng-chartist": "^8.2.0",
|
||||
|
||||
@@ -14,16 +14,16 @@ describe('AppComponent', () => {
|
||||
expect(app).toBeTruthy();
|
||||
});
|
||||
|
||||
it(`should have the 'headup_angular' title`, () => {
|
||||
it(`should have the 'adastra_angular' title`, () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
const app = fixture.componentInstance;
|
||||
expect(app.title).toEqual('headup_angular');
|
||||
expect(app.title).toEqual('adastra_angular');
|
||||
});
|
||||
|
||||
it('should render title', () => {
|
||||
const fixture = TestBed.createComponent(AppComponent);
|
||||
fixture.detectChanges();
|
||||
const compiled = fixture.nativeElement as HTMLElement;
|
||||
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, headup_angular');
|
||||
expect(compiled.querySelector('h1')?.textContent).toContain('Hello, adastra_angular');
|
||||
});
|
||||
});
|
||||
|
||||
@@ -32,7 +32,7 @@ export const MY_FORMATS = {
|
||||
styleUrl: './app.component.scss'
|
||||
})
|
||||
export class AppComponent implements OnInit {
|
||||
public title = 'Head Up';
|
||||
public title = 'Ad Astra';
|
||||
|
||||
constructor(private userService: UserService, private titleService: Title) { }
|
||||
|
||||
|
||||
@@ -76,11 +76,11 @@ export class AuthComponent implements OnInit, OnDestroy {
|
||||
if (this.authType === 'register') {
|
||||
this.title = 'Création de compte';
|
||||
this.btnTitle = 'Créer le compte';
|
||||
this.titleService.setTitle(`Head Up - Créer un compte`);
|
||||
this.titleService.setTitle(`Ad Astra - Créer un compte`);
|
||||
} else {
|
||||
this.title = 'Se connecter';
|
||||
this.btnTitle = 'Se connecter';
|
||||
this.titleService.setTitle(`Head Up - Connexion`);
|
||||
this.titleService.setTitle(`Ad Astra - Connexion`);
|
||||
}
|
||||
// add form control for username if this is the register page
|
||||
if (this.authType === 'register') {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -37,12 +37,12 @@ import { JumpsService } from 'src/app/core/services';
|
||||
export class HomeComponent implements OnInit {
|
||||
private _lastjump: Subscription = new Subscription();
|
||||
private _lastjump$: Observable<Jump> = new Observable();
|
||||
public title = 'Home';
|
||||
public title = 'Shop bientôt disponible!';
|
||||
public description = 'Encore un peu de patience, notre shop sera mis en ligne d\'ici peu.';
|
||||
public errors: Errors = { errors: {} };
|
||||
public lastJump: Jump = {} as Jump;
|
||||
public destroyRef = inject(DestroyRef);
|
||||
public now = new Date();
|
||||
public isJumpDay = false;
|
||||
|
||||
constructor(
|
||||
private _jumpsService: JumpsService
|
||||
@@ -52,7 +52,6 @@ export class HomeComponent implements OnInit {
|
||||
this._lastjump$ = this._jumpsService.getLastJump().pipe(takeUntilDestroyed(this.destroyRef));
|
||||
this._lastjump = this._lastjump$.subscribe((jump) => {
|
||||
this.lastJump = jump;
|
||||
this.isJumpDay = this._isToday(new Date(this.lastJump.date));
|
||||
});
|
||||
}
|
||||
private _isToday(someDate: Date) {
|
||||
|
||||
@@ -38,7 +38,7 @@ export class ProfileComponent implements OnInit, OnDestroy {
|
||||
) { }
|
||||
|
||||
ngOnInit() {
|
||||
this.titleService.setTitle(`Head Up - ${this.title}`);
|
||||
this.titleService.setTitle(`Ad Astra - ${this.title}`);
|
||||
Object.assign(this.user, this.userService.getCurrentUser());
|
||||
if (this.user.username) {
|
||||
this.bannerTitle = `@${this.user.username}`;
|
||||
|
||||
@@ -55,7 +55,7 @@ export class CredentialsComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.titleService.setTitle(`Head Up - ${this.title}`);
|
||||
this.titleService.setTitle(`Ad Astra - ${this.title}`);
|
||||
Object.assign(this.user, this.userService.getCurrentUser());
|
||||
this.credentialsForm.patchValue(this.user);
|
||||
if (this.user.username) {
|
||||
|
||||
@@ -66,7 +66,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.titleService.setTitle(`Head Up - ${this.title}`);
|
||||
this.titleService.setTitle(`Ad Astra - ${this.title}`);
|
||||
// Make a fresh copy of the current user's object to place in editable form fields
|
||||
Object.assign(this.user, this.userService.getCurrentUser());
|
||||
// Fill the form
|
||||
|
||||
@@ -9,6 +9,6 @@ import { DatePipe } from '@angular/common';
|
||||
})
|
||||
export class FooterComponent {
|
||||
today: number = Date.now();
|
||||
siteLink = 'https://www.rampeur.com';
|
||||
author = 'Solide Apps';
|
||||
siteLink = 'https://www.adastra-cbd.com';
|
||||
author = 'Ad Astra';
|
||||
}
|
||||
|
||||
@@ -1,125 +1,44 @@
|
||||
<mat-toolbar class="topbar bg-primary">
|
||||
<div class="navbar-header">
|
||||
<a class="navbar-brand" href="/">
|
||||
<span class="logo">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="190px" height="33px" viewBox="0 0 190 33" enable-background="new 0 0 190 33" xml:space="preserve">
|
||||
<path id="Jumper_2" fill="#FFFFFF"
|
||||
d="M171.086,25.274c-0.071-0.029-0.119-0.065-0.17-0.069c-0.527-0.06-1.051-0.143-1.584-0.136
|
||||
c-0.198,0.003-0.39,0.033-0.574,0.105c-0.296,0.114-0.593,0.23-0.895,0.333c-0.345,0.115-0.697,0.207-1.065,0.201
|
||||
c-0.258-0.002-0.495-0.071-0.721-0.2c-0.356-0.205-0.53-0.527-0.548-0.945c-0.012-0.196,0.029-0.382,0.089-0.567
|
||||
c0.058-0.193,0.176-0.345,0.338-0.445c0.184-0.112,0.372-0.218,0.574-0.294c0.385-0.147,0.777-0.265,1.15-0.446
|
||||
c0.148-0.074,0.32-0.103,0.479-0.151c0.218-0.062,0.419-0.158,0.595-0.312c0.434-0.371,0.938-0.584,1.491-0.661
|
||||
c0.028-0.004,0.06-0.009,0.083-0.015c0.01-0.002,0.019-0.011,0.05-0.028c0.087-0.373,0.117-0.77-0.016-1.147
|
||||
c-0.177-0.5-0.298-1.012-0.398-1.533c-0.112-0.575-0.242-1.149-0.367-1.723c-0.063-0.291-0.118-0.583-0.108-0.887
|
||||
c0.002-0.045-0.016-0.091-0.021-0.13c-0.107-0.045-0.194-0.007-0.285,0.013c-0.372,0.086-0.746,0.167-1.133,0.151
|
||||
c-0.073-0.004-0.149-0.009-0.224-0.013c-0.27-0.013-0.538-0.031-0.808-0.037c-0.318-0.011-0.633-0.011-0.95-0.011
|
||||
c-0.289,0.004-0.519-0.09-0.699-0.341c-0.367-0.511-0.751-1.009-1.126-1.512c-0.229-0.306-0.453-0.613-0.685-0.915
|
||||
c-0.108-0.14-0.197-0.284-0.129-0.482c-0.437-0.519-0.708-1.134-0.993-1.742c-0.088-0.19-0.211-0.363-0.317-0.544
|
||||
c-0.107-0.18-0.133-0.377-0.111-0.584c0.014-0.124,0.057-0.223,0.204-0.274c0.029,0.046,0.058,0.106,0.103,0.145
|
||||
c0.038,0.034,0.097,0.045,0.162,0.071c0.021,0.269,0.152,0.489,0.309,0.694c0.182,0.236,0.397,0.287,0.703,0.17
|
||||
c0.092-0.236,0.032-0.542,0.258-0.733c0.112,0.033,0.114,0.126,0.119,0.21c0.01,0.23,0.02,0.463,0.02,0.693
|
||||
c0,0.154-0.018,0.307-0.026,0.461c-0.012,0.173-0.023,0.345-0.027,0.518c-0.006,0.17,0.06,0.315,0.16,0.45
|
||||
c0.111-0.039,0.216-0.076,0.32-0.113c0.063,0.058,0.113,0.097,0.155,0.146c0.266,0.324,0.521,0.654,0.846,0.919
|
||||
c0.131,0.107,0.228,0.254,0.343,0.381c0.112,0.125,0.231,0.25,0.35,0.374c0.101,0.1,0.216,0.133,0.361,0.097
|
||||
c0.279-0.068,0.563-0.121,0.848-0.177c0.101-0.021,0.203-0.025,0.302-0.044c0.212-0.037,0.425-0.065,0.629-0.124
|
||||
c0.243-0.07,0.488-0.12,0.743-0.13c0.354-0.015,0.704-0.054,1.051-0.123c0.127-0.025,0.26-0.023,0.389-0.037
|
||||
c0.081-0.009,0.159-0.031,0.266-0.052c-0.056-0.1-0.097-0.17-0.143-0.25c-0.106,0-0.212-0.01-0.312,0.003
|
||||
c-0.449,0.049-0.868-0.042-1.291-0.289c-0.02-0.063-0.054-0.152-0.068-0.245c-0.038-0.238-0.059-0.478-0.099-0.715
|
||||
c-0.025-0.154,0.004-0.288,0.079-0.416c0.312-0.536,0.626-1.073,0.94-1.61c0.02-0.031,0.042-0.064,0.066-0.091
|
||||
c0.554-0.622,1.223-0.968,2.056-0.914c0.14,0.008,0.28,0.021,0.413,0.053c0.713,0.166,1.136,0.625,1.263,1.37
|
||||
c0.054,0.326,0.083,0.65,0.022,0.979c-0.019,0.094-0.013,0.194-0.021,0.291c-0.021,0.314-0.129,0.58-0.433,0.717
|
||||
c-0.063,0.029-0.121,0.083-0.188,0.13c0.103,0.156,0.191,0.303,0.292,0.437c0.036,0.049,0.104,0.081,0.161,0.098
|
||||
c0.072,0.02,0.149,0.017,0.223,0.014c0.188-0.009,0.372,0.009,0.555,0.047c0.116,0.024,0.242,0.022,0.36,0.014
|
||||
c0.43-0.035,0.854-0.038,1.282,0.021c0.405,0.054,0.818,0.05,1.227,0.071c0.161,0.008,0.312-0.035,0.454-0.121
|
||||
c0.235-0.144,0.482-0.237,0.752-0.284c0.2-0.034,0.397-0.109,0.587-0.188c0.666-0.272,1.333-0.545,1.993-0.833
|
||||
c0.385-0.167,0.775-0.258,1.194-0.245c0.55,0.018,0.481,0.081,1.14-0.292c0.271-0.153,0.546-0.288,0.845-0.372
|
||||
c0.043-0.014,0.088-0.02,0.146-0.031c0.045,0.076,0.087,0.147,0.131,0.224c0.047-0.018,0.095-0.028,0.131-0.051
|
||||
c0.356-0.21,0.713-0.417,1.063-0.637c0.254-0.16,0.429-0.393,0.531-0.688c0.051-0.146,0.119-0.284,0.189-0.42
|
||||
c0.052-0.102,0.107-0.206,0.186-0.288c0.25-0.259,0.501-0.517,0.766-0.76c0.16-0.146,0.344-0.264,0.515-0.397
|
||||
c0.065-0.049,0.125-0.086,0.208-0.043c0.059,0.102,0.116,0.204,0.191,0.332c-0.04,0.05-0.081,0.113-0.131,0.162
|
||||
c-0.147,0.136-0.298,0.264-0.445,0.397c-0.176,0.157-0.248,0.37-0.312,0.626c0.245-0.074,0.396-0.362,0.67-0.234
|
||||
c0.079,0.141,0.054,0.271-0.03,0.384c-0.074,0.097-0.161,0.186-0.252,0.268c-0.119,0.11-0.254,0.198-0.364,0.315
|
||||
c-0.137,0.143-0.275,0.291-0.376,0.462c-0.249,0.411-0.558,0.749-0.957,0.999c-0.311,0.193-0.631,0.37-0.947,0.556
|
||||
c-0.016,0.009-0.033,0.015-0.05,0.026c-0.442,0.346-0.979,0.507-1.469,0.757c-0.334,0.172-0.678,0.32-1.015,0.484
|
||||
c-0.364,0.174-0.716,0.366-1.044,0.608c-0.42,0.312-0.881,0.548-1.395,0.646c-0.385,0.071-0.771,0.126-1.158,0.186
|
||||
c-0.764,0.119-1.528,0.231-2.291,0.357c-0.151,0.024-0.316,0.034-0.458,0.131c0.01,0.127,0.087,0.213,0.144,0.311
|
||||
c0.428,0.748,0.842,1.501,1.209,2.285c0.067,0.146,0.137,0.294,0.198,0.445c0.18,0.426,0.337,0.855,0.359,1.328
|
||||
c0.016,0.328,0.065,0.651,0.101,0.977c0.006,0.05,0.006,0.098,0.01,0.146c0.03,0.483-0.147,0.834-0.577,1.057
|
||||
c-0.394,0.201-0.784,0.399-1.196,0.542c-0.17,0.005-0.318-0.111-0.515-0.07c0.015,0.144,0.024,0.274,0.042,0.405
|
||||
c0.063,0.499,0.136,0.994,0.196,1.491c0.047,0.379,0.018,0.752-0.115,1.112c-0.073,0.197-0.152,0.392-0.226,0.591
|
||||
c-0.066,0.192-0.18,0.335-0.356,0.427c-0.038,0.02-0.07,0.052-0.146,0.107c0.355,0.054,0.672-0.048,0.981,0.086
|
||||
c0.024-0.072,0.045-0.124,0.057-0.178c0.036-0.158,0.052-0.323,0.101-0.479c0.108-0.354,0.245-0.422,0.59-0.298
|
||||
c0.356,0.129,0.679,0.331,0.923,0.627c0.222,0.273,0.491,0.473,0.785,0.645c0.187,0.11,0.376,0.211,0.554,0.333
|
||||
c0.411,0.286,0.662,0.696,0.835,1.167c0.002,0.01,0.002,0.021,0.006,0.027c0.113,0.356-0.139,0.573-0.484,0.499
|
||||
c-0.069-0.012-0.141-0.053-0.202-0.094c-0.078-0.049-0.154-0.105-0.228-0.166c-0.382-0.329-0.378-0.286-0.842-0.239
|
||||
c-0.082,0.008-0.162,0.035-0.247,0.047c-0.423,0.082-0.451,0.129-1.049-0.029c-0.246,0.119-0.516,0.244-0.784,0.382
|
||||
c-0.393,0.201-0.773,0.426-1.178,0.604c-0.601,0.261-1.18,0.568-1.764,0.866c-0.522,0.266-1.067,0.46-1.646,0.53
|
||||
c-0.506,0.064-1.005,0.049-1.497-0.101c-0.706-0.209-1.172-0.79-1.244-1.546c-0.02-0.206,0.028-0.401,0.088-0.597
|
||||
c0.13-0.405,0.331-0.774,0.551-1.134c0.443-0.73,0.954-1.403,1.484-2.068C170.955,25.439,171.013,25.367,171.086,25.274z" />
|
||||
<path id="Head_Up" fill="#FFFFFF" d="M56.496,12.915l-1.858,10.843h-5.11l1.156-6.74h-5.417l-1.155,6.74H39l1.858-10.843H56.496z
|
||||
M47.125,6.172l-0.904,5.275h-5.112l0.904-5.275H47.125z M57.651,6.172l-0.932,5.275h-5.111l0.933-5.275H57.651z M72.124,12.915
|
||||
l-0.684,4.103h-9.115l-0.25,1.466h9.11l-0.91,5.275H56.06l1.857-10.843L72.124,12.915L72.124,12.915z M73.29,6.172l-0.911,5.275
|
||||
h-14.21l0.904-5.275H73.29z M87.222,23.758h-5.118l-0.17-2.345h-4.818l-0.97,2.345h-5.131l4.488-10.843h3.819
|
||||
c0.836,0.002,1.273,0.003,1.311,0.003l-1.685,4.1h2.702l-0.313-4.103h5.118L87.222,23.758z M86.34,11.448H76.109l2.183-5.275h7.677
|
||||
L86.34,11.448z M105.426,12.915l-1.145,6.74c-0.19,1.134-0.745,2.1-1.664,2.901c-0.919,0.801-1.928,1.201-3.028,1.201H87.932
|
||||
l1.858-10.843h5.083l-0.926,5.567h5.395l0.946-5.567H105.426z M105.931,9.573c0,0.234-0.02,0.469-0.058,0.704l-0.199,1.171H90.041
|
||||
l0.905-5.275h11.657c0.967,0,1.763,0.323,2.388,0.967S105.931,8.596,105.931,9.573z M132.414,12.915l-1.15,6.74
|
||||
c-0.189,1.134-0.745,2.1-1.663,2.901c-0.92,0.802-1.93,1.202-3.029,1.202h-7.677c-0.965,0-1.763-0.322-2.389-0.968
|
||||
c-0.624-0.643-0.938-1.455-0.938-2.434c0-0.232,0.02-0.468,0.058-0.702l1.121-6.74h5.141l-0.953,5.567h5.42l0.951-5.567H132.414z
|
||||
M123.039,6.172l-0.932,5.275h-5.11l0.931-5.275H123.039z M133.565,6.172l-0.931,5.275h-5.107l0.93-5.275H133.565z M149.488,12.915
|
||||
c-0.192,1.133-0.742,2.099-1.651,2.901c-0.911,0.801-1.919,1.201-3.019,1.201h-6.55l-1.155,6.741h-5.11l1.857-10.843L149.488,12.915
|
||||
L149.488,12.915z M150,9.573c0,0.234-0.02,0.469-0.058,0.704l-0.198,1.171H134.11l0.905-5.275h11.658
|
||||
c0.965,0,1.763,0.323,2.389,0.967C149.687,7.784,150,8.596,150,9.573z" />
|
||||
<path id="Jumper_1" fill="#FFFFFF"
|
||||
d="M13.163,30.84c0.039-0.191-0.035-0.336-0.106-0.482c-0.076-0.151-0.164-0.299-0.244-0.45
|
||||
c-0.104-0.196-0.167-0.406-0.177-0.634c-0.014-0.305-0.088-0.598-0.225-0.866c0.163-1.38,0.545-2.71,0.893-4.042
|
||||
c0.134-0.521,0.35-1.01,0.566-1.514c0.104-0.026,0.209-0.055,0.314-0.08c0.848-0.205,1.694-0.425,2.546-0.612
|
||||
c0.803-0.178,1.615-0.32,2.42-0.485c0.192-0.036,0.377-0.003,0.562,0.032c0.072,0.014,0.136,0.068,0.222,0.114
|
||||
c-0.024,0.113-0.035,0.212-0.065,0.305c-0.195,0.626-0.381,1.253-0.59,1.872c-0.226,0.671-0.352,1.365-0.533,2.048
|
||||
c-0.105,0.399-0.209,0.8-0.309,1.199c-0.055,0.226-0.105,0.444-0.027,0.684c0.039,0.12-0.016,0.278-0.039,0.419
|
||||
c-0.026,0.163-0.031,0.339-0.17,0.47c-0.031,0.029-0.052,0.089-0.056,0.136c-0.042,0.44-0.08,0.883-0.118,1.324
|
||||
c-0.001,0.021,0.009,0.039,0.019,0.073c0.093,0.102,0.227,0.127,0.368,0.138c0.34,0.021,0.674-0.011,1.005-0.084
|
||||
c0.298-0.062,0.588-0.06,0.878,0.043c0.77,0.277,1.526,0.162,2.273-0.104c0.093-0.032,0.181-0.085,0.262-0.14
|
||||
c0.093-0.062,0.174-0.139,0.167-0.273c-0.048-0.142-0.18-0.174-0.304-0.2c-0.214-0.047-0.429-0.087-0.644-0.118
|
||||
c-0.16-0.024-0.306-0.079-0.443-0.164c-0.109-0.066-0.227-0.127-0.339-0.188c-0.276-0.147-0.526-0.323-0.704-0.594
|
||||
c-0.06-0.091-0.144-0.165-0.213-0.244c0.1-0.127,0.21-0.242,0.29-0.375c0.077-0.128,0.122-0.275,0.176-0.416
|
||||
c0.349-0.88,0.658-1.773,0.846-2.706c0.055-0.265,0.071-0.539,0.124-0.807c0.112-0.573,0.232-1.147,0.355-1.718
|
||||
c0.096-0.455,0.162-0.915,0.189-1.377c0.018-0.293-0.018-0.585-0.099-0.871c-0.099-0.349-0.312-0.603-0.625-0.772
|
||||
c-0.24-0.133-0.497-0.208-0.762-0.25c-0.471-0.077-0.947-0.097-1.425-0.055c-0.623,0.058-1.243,0.138-1.863,0.196
|
||||
c-0.559,0.055-1.111-0.003-1.656-0.127c-0.443-0.1-0.719-0.487-0.693-0.955c0.011-0.18,0.032-0.363,0.062-0.542
|
||||
c0.114-0.746,0.232-1.495,0.358-2.238c0.031-0.178,0.093-0.352,0.156-0.521c0.187-0.518,0.299-1.045,0.271-1.6
|
||||
c-0.031-0.608,0.041-1.209,0.139-1.807c0.044-0.269,0.072-0.541,0.085-0.812c0.018-0.309,0.115-0.572,0.341-0.78
|
||||
c0.302-0.278,0.608-0.55,0.909-0.83c0.108-0.101,0.215-0.208,0.302-0.33c0.112-0.153,0.272-0.238,0.422-0.329
|
||||
c0.229-0.14,0.401-0.321,0.536-0.554c0.198-0.339,0.406-0.669,0.608-1.006c0.072-0.122,0.132-0.249,0.19-0.377
|
||||
c0.041-0.086,0.049-0.177-0.062-0.249c-0.299,0.062-0.337,0.428-0.604,0.565c-0.023-0.056-0.062-0.104-0.062-0.153
|
||||
c-0.006-0.323,0.03-0.641,0.234-0.914c0.045-0.063,0.104-0.124,0.073-0.228c-0.087-0.012-0.18-0.021-0.269-0.039
|
||||
c-0.024-0.005-0.043-0.038-0.077-0.068c-0.04,0.025-0.093,0.041-0.119,0.076c-0.188,0.233-0.373,0.47-0.558,0.708
|
||||
c-0.022,0.032-0.042,0.07-0.052,0.108c-0.1,0.401-0.227,0.794-0.249,1.213c-0.006,0.119-0.04,0.237-0.073,0.352
|
||||
c-0.012,0.043-0.056,0.078-0.095,0.129c-0.219-0.2-0.468-0.151-0.71-0.095c-0.182,0.041-0.36,0.104-0.558,0.163
|
||||
c-0.012-0.087-0.022-0.166-0.03-0.243c-0.036-0.422-0.053-0.843-0.154-1.26c-0.104-0.431-0.347-0.74-0.724-0.949
|
||||
c-0.273-0.153-0.56-0.267-0.872-0.282c-0.69-0.034-1.224,0.274-1.64,0.817c-0.211,0.279-0.305,0.608-0.36,0.95
|
||||
c-0.065,0.399-0.129,0.798-0.001,1.199c0.058,0.183,0.106,0.368,0.157,0.553c0.089,0.324,0.078,0.361-0.169,0.663
|
||||
c-0.057-0.024-0.117-0.052-0.18-0.076c-0.147-0.058-0.292-0.131-0.444-0.167c-0.33-0.076-0.645-0.196-0.959-0.322
|
||||
c-0.405-0.164-0.816-0.313-1.22-0.482c-0.284-0.118-0.563-0.252-0.84-0.387C8.42,7.775,7.884,7.465,7.302,7.254
|
||||
C7.118,7.188,6.975,7.087,6.912,6.876C6.879,6.765,6.789,6.668,6.71,6.58C6.49,6.332,6.236,6.127,5.95,5.956
|
||||
c-0.525-0.31-1.005-0.688-1.431-1.13C4.365,4.667,4.197,4.557,3.982,4.53C3.754,4.501,3.627,4.372,3.581,4.148
|
||||
C3.578,4.14,3.577,4.13,3.575,4.119C3.443,3.435,3.222,2.774,3.044,2.104C3.014,1.998,2.969,1.895,2.914,1.8
|
||||
C2.758,1.539,2.555,1.316,2.328,1.119c-0.079-0.07-0.162-0.156-0.302-0.102C1.982,1.224,1.982,1.418,2.121,1.608
|
||||
c0.125,0.172,0.152,0.388,0.2,0.601C2.244,2.258,2.17,2.304,2.083,2.361c0,0.077-0.014,0.156,0.001,0.232
|
||||
C2.159,2.979,2.241,3.363,2.314,3.75c0.038,0.186,0.074,0.376,0.081,0.567c0.006,0.23,0.087,0.408,0.265,0.547
|
||||
c0.071,0.055,0.133,0.123,0.203,0.178c0.142,0.117,0.26,0.24,0.289,0.441c0.018,0.13,0.114,0.227,0.21,0.321
|
||||
C3.917,6.352,4.47,6.902,5.018,7.459C5.145,7.586,5.246,7.74,5.36,7.878c0.174,0.208,0.34,0.421,0.524,0.62
|
||||
C6.029,8.654,6.209,8.75,6.417,8.812c0.236,0.07,0.468,0.167,0.694,0.269c0.699,0.313,1.394,0.633,2.092,0.951
|
||||
c0.287,0.131,0.52,0.329,0.721,0.594c-0.027,0.083-0.049,0.168-0.083,0.251c-0.22,0.542-0.412,1.091-0.569,1.658
|
||||
c-0.109,0.397-0.261,0.783-0.393,1.174c-0.196,0.582-0.388,1.167-0.475,1.779c-0.062,0.441-0.072,0.887,0.024,1.325
|
||||
c0.023,0.106,0.064,0.213,0.113,0.312c0.061,0.123,0.161,0.212,0.302,0.215c0.178,0.005,0.284,0.099,0.389,0.237
|
||||
C9.329,17.7,9.46,17.795,9.596,17.92c-0.051,0.095-0.103,0.203-0.16,0.304c-0.286,0.511-0.52,1.046-0.674,1.611
|
||||
c-0.087,0.322-0.123,0.652-0.104,0.989c0.033,0.619,0.318,1.092,0.825,1.432c0.241,0.16,0.506,0.272,0.787,0.352
|
||||
c0.084,0.022,0.167,0.051,0.248,0.075c0.07,0.148,0.041,0.292,0.04,0.43c-0.01,0.84-0.021,1.679-0.038,2.516
|
||||
c-0.006,0.354,0.007,0.706,0.076,1.055c0.056,0.28,0.042,0.56,0.016,0.845c-0.021,0.219-0.023,0.443-0.032,0.663
|
||||
c-0.002,0.041-0.01,0.089,0.009,0.119c0.116,0.2,0.029,0.395-0.022,0.584c-0.073,0.275-0.164,0.542-0.172,0.829
|
||||
c-0.003,0.098,0,0.197,0,0.297c0.186,0.125,0.297,0.279,0.346,0.488c0.042,0.184,0.191,0.282,0.359,0.332
|
||||
c0.16,0.046,0.328,0.078,0.496,0.092c0.365,0.032,0.734,0.06,1.098,0.066C12.854,31.002,13.037,31.017,13.163,30.84z" />
|
||||
<span class="logo me-3">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Logo_Ad_Astra" x="0px" y="0px" width="218px" height="48px" viewBox="0 0 218 48" enable-background="new 0 0 218 48" xml:space="preserve">
|
||||
<g id="Ad_Astra">
|
||||
<g>
|
||||
<polygon fill="#D7C067" points="66.158,26.352 64.543,20.319 54.508,20.319 52.896,26.352 "/>
|
||||
<polygon fill="#D7C067" points="62.985,38.615 63.716,41.5 70.209,41.5 66.724,28.614 60.308,28.614 61.658,33.665 57.394,33.665 58.745,28.614 52.25,28.614 48.842,41.5 55.299,41.5 56.069,38.615 "/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#DDDCDB" d="M92.467,26.352v-1.212c0-1.325-0.508-2.472-1.51-3.409c-1.003-0.937-2.23-1.412-3.647-1.412H71.733v6.033 H92.467z"/>
|
||||
<path fill="#DDDCDB" d="M92.467,28.614h-6.456v6.853H78.19v-6.853h-6.457V41.5H87.31c1.418,0,2.645-0.475,3.647-1.411 c1.002-0.938,1.51-2.083,1.51-3.409V28.614z"/>
|
||||
</g>
|
||||
<g>
|
||||
<polygon fill="#D7C067" points="119.495,26.352 117.88,20.319 107.846,20.319 106.232,26.352 "/>
|
||||
<polygon fill="#D7C067" points="116.322,38.615 117.053,41.5 123.546,41.5 120.061,28.614 113.644,28.614 114.995,33.665 110.73,33.665 112.081,28.614 105.588,28.614 102.179,41.5 108.635,41.5 109.406,38.615 "/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#DDDCDB" d="M145.803,33.434c0-1.324-0.508-2.471-1.509-3.408c-1.002-0.937-2.229-1.412-3.647-1.412h-15.571 c0.056,1.229,0.561,2.297,1.505,3.179c1.001,0.936,2.229,1.41,3.647,1.41h9.121v2.264H125.07V41.5h15.576 c1.418,0,2.645-0.475,3.647-1.411c1.001-0.938,1.509-2.083,1.509-3.409V33.434z"/>
|
||||
<path fill="#DDDCDB" d="M125.07,26.352h20.732v-6.033h-15.575c-1.417,0-2.646,0.475-3.647,1.412 c-1.002,0.936-1.51,2.084-1.51,3.409V26.352z"/>
|
||||
</g>
|
||||
<g>
|
||||
<rect x="155.362" y="28.614" fill="#DDDCDB" width="6.456" height="12.886"/>
|
||||
<rect x="148.223" y="20.319" fill="#DDDCDB" width="20.733" height="6.033"/>
|
||||
</g>
|
||||
<g>
|
||||
<path fill="#DDDCDB" d="M192.109,26.352v-1.212c0-1.325-0.508-2.472-1.51-3.409c-1.003-0.937-2.23-1.412-3.647-1.412h-15.576 v6.033H192.109z"/>
|
||||
<path fill="#DDDCDB" d="M171.375,41.5h6.456v-8.296h7.823V41.5h6.456v-8.066c0-0.679-0.481-1.473-1.432-2.362l-0.174-0.163 l0.174-0.163c0.846-0.79,1.319-1.506,1.414-2.132h-20.716V41.5z"/>
|
||||
</g>
|
||||
<g>
|
||||
<polygon fill="#DDDCDB" points="207.776,38.615 208.508,41.5 215,41.5 211.515,28.614 205.099,28.614 206.45,33.665 202.185,33.665 203.536,28.614 197.041,28.614 193.632,41.5 200.088,41.5 200.861,38.615 "/>
|
||||
<polygon fill="#DDDCDB" points="210.948,26.352 209.335,20.319 199.3,20.319 197.686,26.352 "/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="Star">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" fill="#DDDCDB" d="M67.011,15.14c-15.125-0.415-30.13,11.212-42.833,19.917 l5.321-16.303l2.163,5.883c0.43,1.075,0.917,0.809,2.133,0.276C45.682,19.162,51.53,13.062,67.011,15.14z"/>
|
||||
<path fill="#D7C067" d="M21.111,39.24l8.584-6.51l9.078,9.012l-8.772-5.538L16.491,46l4.396-17.216L3,19.504l21.795,7.159 L21.111,39.24z"/>
|
||||
<path fill="#D7C067" d="M25.738,23.656L7.23,18.529l16.482,1.101l2.655-8.707l2.032,5.081L25.738,23.656z"/>
|
||||
<path fill="#D7C067" d="M28.784,3l6.61,15.685c0.112,0.257,0.211,0.435,0.442,0.326c9.763-4.918,17.872-12.196,41.689-4.196 c-25.071-5.188-30.394,2.068-43.894,8.159c-0.269,0.111-0.497-0.09-0.729-0.662L27.238,8.07L28.784,3z"/>
|
||||
</g>
|
||||
</svg>
|
||||
</span>
|
||||
</a>
|
||||
@@ -130,9 +49,9 @@
|
||||
<span class="flex-spacer"></span>
|
||||
<ng-container *appShowAuthed="true">
|
||||
<div class="position-relative">
|
||||
<button [matMenuTriggerFor]="profile" mat-icon-button>
|
||||
<img [src]="currentUser.image" alt="user" class="profile-pic">
|
||||
</button>
|
||||
<span [matMenuTriggerFor]="profile" class="fw-light me-1 pointer">
|
||||
@{{ currentUser.username }}
|
||||
</span>
|
||||
<mat-menu #profile="matMenu">
|
||||
<button mat-menu-item [routerLink]="['/profile', currentUser.username]" routerLinkActive="active">
|
||||
<mat-icon fontIcon="account_circle" color="primary"></mat-icon> Mon compte
|
||||
@@ -152,7 +71,6 @@
|
||||
</button>
|
||||
</mat-menu>
|
||||
</div>
|
||||
<span [matMenuTriggerFor]="profile" class="fw-light me-1 text-navy pointer">@{{ currentUser.username }}</span>
|
||||
</ng-container>
|
||||
<ng-container *appShowAuthed="false">
|
||||
<span>
|
||||
@@ -164,10 +82,7 @@
|
||||
<mat-sidenav-container class="app-sidenav-container" [style.marginTop.px]="mobileQuery.matches ? 0 : 0">
|
||||
<mat-sidenav #snav id="snav" class="dark-sidebar pl-xs" [mode]="mobileQuery.matches ? 'side' : 'over'" fixedTopGap="0" [opened]="mobileQuery.matches" [disableClose]="mobileQuery.matches">
|
||||
<ng-container *appShowAuthed="true">
|
||||
<div class="user-profile" style="background-image: url('{{ currentUser.bg_image }}');">
|
||||
<div class="profile-img">
|
||||
<img [src]="currentUser.image" alt="user">
|
||||
</div>
|
||||
<div class="user-profile">
|
||||
<div class="profile-text">
|
||||
<a [matMenuTriggerFor]="sdprofile" class="d-flex justify-content-end align-items-end">
|
||||
<span>{{ currentUser.firstname }} {{ currentUser.lastname }}</span>
|
||||
|
||||
@@ -3,12 +3,13 @@ import { Injectable } from '@angular/core';
|
||||
import { Menu } from 'src/app/core/models/menu.model';
|
||||
|
||||
const MENUAUTH: Menu[] = [
|
||||
{ state: 'home', type: 'link', name: 'Accueil', icon: 'home', desc: '' },
|
||||
{ state: 'login', type: 'link', name: 'Se connecter', icon: 'fingerprint', desc: '' },
|
||||
{ state: 'register', type: 'link', name: 'Créer un compte', icon: 'person_add_alt', desc: '' },
|
||||
{ state: 'qcm', type: 'menu', name: 'QCM Brevets', icon: 'rule_folder', desc: '' }
|
||||
{ state: 'register', type: 'link', name: 'Créer un compte', icon: 'person_add_alt', desc: '' }
|
||||
];
|
||||
|
||||
const MENUITEMS: Menu[] = [
|
||||
{ state: 'home', type: 'link', name: 'Accueil', icon: 'home', desc: '' },
|
||||
{ state: 'dashboard', type: 'link', name: 'Dashboard', icon: 'dashboard', desc: '' },
|
||||
{ state: 'logbook', type: 'link', name: 'Carnet de saut', icon: 'assignment_turned_in', desc: '' },
|
||||
{ state: 'aeronefs', type: 'link', name: 'Aéronefs', icon: 'flight', desc: '' },
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
<link rel="manifest" href="manifest.webmanifest" />
|
||||
<meta name="theme-color" content="#a7d4c4" />
|
||||
</head>
|
||||
<body class="mat-app-background mat-typography dark-theme">
|
||||
<body class="mat-app-background mat-typography light-theme">
|
||||
<app-root></app-root>
|
||||
<script>
|
||||
(g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
|
||||
|
||||
@@ -15,7 +15,7 @@ mat-toolbar{
|
||||
position: relative;
|
||||
padding: 0px 15px;
|
||||
background-color: $headingtext;
|
||||
color: $sidebar-text;
|
||||
color: $sidebar-light;
|
||||
/* Make sure the toolbar will stay on top of the content as it scrolls past. */
|
||||
z-index: 2;
|
||||
.navbar-header {
|
||||
@@ -24,14 +24,14 @@ mat-toolbar{
|
||||
display: flex;
|
||||
line-height: 18px;
|
||||
align-items: center;
|
||||
.logo {
|
||||
margin-right: 10px;
|
||||
svg path {
|
||||
fill: $sidebar-text;
|
||||
}
|
||||
.logo.fill svg path {
|
||||
fill: $sidebar-light;
|
||||
}
|
||||
}
|
||||
}
|
||||
.mdc-button .mdc-button__label {
|
||||
color: #D9D9D9;
|
||||
}
|
||||
.profile-pic {
|
||||
border-radius: 100%;
|
||||
vertical-align: baseline;
|
||||
|
||||
@@ -1,6 +1,74 @@
|
||||
|
||||
/* Custom Theme Palettes */
|
||||
|
||||
|
||||
$md-custom-primary: (
|
||||
50 : #e6e9f3,
|
||||
100 : #c0c7e3,
|
||||
200 : #97a3d0,
|
||||
300 : #6e80bd,
|
||||
400 : #4f64af,
|
||||
500 : #2c4aa3,
|
||||
600 : #264399,
|
||||
700 : #1c398e,
|
||||
800 : #123082,
|
||||
900 : #001f6c,
|
||||
A100 : #77a9ff,
|
||||
A200 : #4489ff,
|
||||
A400 : #1169ff,
|
||||
A700 : #005bf6,
|
||||
contrast: (
|
||||
50 : #000000,
|
||||
100 : #000000,
|
||||
200 : #000000,
|
||||
300 : #000000,
|
||||
400 : #ffffff,
|
||||
500 : #ffffff,
|
||||
600 : #ffffff,
|
||||
700 : #ffffff,
|
||||
800 : #ffffff,
|
||||
900 : #ffffff,
|
||||
A100 : #000000,
|
||||
A200 : #000000,
|
||||
A400 : #ffffff,
|
||||
A700 : #ffffff,
|
||||
)
|
||||
);
|
||||
|
||||
$md-custom-primary-blue: (
|
||||
50 : #e3f0fa,
|
||||
100 : #bad9f3,
|
||||
200 : #90c2ea,
|
||||
300 : #67aae1,
|
||||
400 : #4b99dc,
|
||||
500 : #3389d6,
|
||||
600 : #2d7cc9,
|
||||
700 : #266bb7,
|
||||
800 : #205aa5,
|
||||
900 : #163e86,
|
||||
A100 : #77a9ff,
|
||||
A200 : #4489ff,
|
||||
A400 : #1169ff,
|
||||
A700 : #005bf6,
|
||||
contrast: (
|
||||
50 : #000000,
|
||||
100 : #000000,
|
||||
200 : #000000,
|
||||
300 : #000000,
|
||||
400 : #000000,
|
||||
500 : #000000,
|
||||
600 : #000000,
|
||||
700 : #ffffff,
|
||||
800 : #ffffff,
|
||||
900 : #ffffff,
|
||||
A100 : #000000,
|
||||
A200 : #000000,
|
||||
A400 : #ffffff,
|
||||
A700 : #ffffff,
|
||||
)
|
||||
);
|
||||
|
||||
$md-custom-primary-green: (
|
||||
50 : #f6fbf9,
|
||||
100 : #e9f5f1,
|
||||
200 : #dbeee8,
|
||||
|
||||
@@ -11,9 +11,9 @@ Main sidebar
|
||||
******************/
|
||||
|
||||
#snav mat-list-item.mat-mdc-list-item.selected:after {
|
||||
border-right: 18px solid color.scale($sidebar, $lightness: 4%);
|
||||
border-top: 18px solid #b7ddd0;
|
||||
border-bottom: 18px solid #b7ddd0;
|
||||
border-right: 18px solid color.scale($sidebar-light, $lightness: 50%);
|
||||
border-top: 18px solid $sidebar-text;
|
||||
border-bottom: 18px solid $sidebar-text;
|
||||
content: "";
|
||||
display: inline-block;
|
||||
position: absolute;
|
||||
@@ -25,7 +25,6 @@ Main sidebar
|
||||
/*box-shadow: 1px 0px 20px rgba(0, 0, 0, 0.08);*/
|
||||
box-shadow: 0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12);
|
||||
&.mat-drawer{
|
||||
//background: $sidebar; //#d4f3e8
|
||||
background-color: $sidebar-light;
|
||||
width: $sidenav-width;
|
||||
padding-top: 0px;
|
||||
@@ -118,9 +117,9 @@ use profile section
|
||||
|
||||
.user-profile {
|
||||
position: relative;
|
||||
height: $user-img-height;
|
||||
height: $sidenav-height;
|
||||
width: $sidenav-width;
|
||||
background-image: url('/assets/images/users/bg_user.jpg');
|
||||
background-image: none;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
.profile-img {
|
||||
@@ -192,7 +191,7 @@ use profile section
|
||||
width: 100%;
|
||||
bottom: 0;
|
||||
> a {
|
||||
color: $white !important;
|
||||
color: $sidebar !important;
|
||||
width: 100%;
|
||||
padding: 4px 10px 7px 22px;
|
||||
background-color: rgba(217, 202, 174, 0.5);
|
||||
|
||||
+2
-2
@@ -80,10 +80,10 @@ a.accent:hover {
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
a {
|
||||
color: $empty;
|
||||
color: $sidebar-light;
|
||||
}
|
||||
.copyright {
|
||||
color: $empty;
|
||||
color: $sidebar-light;
|
||||
}
|
||||
}
|
||||
.img-responsive {
|
||||
|
||||
@@ -66,8 +66,7 @@ File: scss
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.navbar-header {
|
||||
width: 210px;
|
||||
flex-shrink: 0;
|
||||
width: auto;
|
||||
.navbar-brand {
|
||||
padding-top: 0px;
|
||||
}
|
||||
@@ -79,6 +78,9 @@ File: scss
|
||||
******************************/
|
||||
|
||||
@media (max-width: 767px) {
|
||||
.navbar-header {
|
||||
width: 210px;
|
||||
}
|
||||
.mat-toolbar-single-row {
|
||||
height: 64px !important;
|
||||
}
|
||||
|
||||
+81
-76
@@ -21,52 +21,57 @@ File: scss
|
||||
@import "bootstrap/scss/variables-dark";
|
||||
@import "bootstrap/scss/maps";
|
||||
@import "bootstrap/scss/mixins";
|
||||
@import "bootstrap/scss/root";
|
||||
|
||||
// Optional components
|
||||
@import "bootstrap/scss/utilities";
|
||||
|
||||
// Layout & components
|
||||
@import "bootstrap/scss/root";
|
||||
@import "bootstrap/scss/reboot";
|
||||
@import "bootstrap/scss/type";
|
||||
@import "bootstrap/scss/containers";
|
||||
@import "bootstrap/scss/grid";
|
||||
@import "bootstrap/scss/helpers";
|
||||
@import "bootstrap/scss/utilities/api";
|
||||
//@import "bootstrap/scss/tables";
|
||||
@import "bootstrap/scss/badge";
|
||||
@import "bootstrap/scss/type";
|
||||
@import "bootstrap/scss/transitions";
|
||||
@import "bootstrap/scss/pagination";
|
||||
@import "bootstrap/scss/badge";
|
||||
@import "bootstrap/scss/alert";
|
||||
|
||||
// Helpers
|
||||
@import "bootstrap/scss/helpers";
|
||||
|
||||
// Utilities
|
||||
@import "bootstrap/scss/utilities/api";
|
||||
|
||||
@include mat.core();
|
||||
|
||||
// Define the palettes for your theme using the Material Design palettes available in palette.scss
|
||||
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
|
||||
// hue. Available color palettes: https://material.io/design/color/
|
||||
|
||||
//$headup_app-primary: mat.define-palette(mat.$light-green-palette);
|
||||
//$headup_app-accent: mat.define-palette(mat.$blue-grey-palette, A200, A100, A400);
|
||||
//$headup_app-warn: mat.define-palette(mat.$blue-palette);
|
||||
//$adastra_app-primary: mat.define-palette(mat.$light-green-palette);
|
||||
//$adastra_app-accent: mat.define-palette(mat.$blue-grey-palette, A200, A100, A400);
|
||||
//$adastra_app-warn: mat.define-palette(mat.$blue-palette);
|
||||
|
||||
$headup_app-primary: mat.define-palette($md-custom-primary, 500);
|
||||
$headup_app-accent: mat.define-palette($md-custom-accent, A200, A100, A400);
|
||||
$headup_app-warn: mat.define-palette($md-custom-warn);
|
||||
$headup_app-danger: mat.define-palette(mat.$red-palette);
|
||||
$headup_app-success: mat.define-palette(mat.$green-palette);
|
||||
$headup_app-info: mat.define-palette(mat.$blue-palette);
|
||||
$headup_app-warning: mat.define-palette($md-custom-orange);
|
||||
$adastra_app-primary: mat.define-palette($md-custom-primary, 500);
|
||||
$adastra_app-accent: mat.define-palette($md-custom-accent, A200, A100, A400);
|
||||
$adastra_app-warn: mat.define-palette($md-custom-warn);
|
||||
$adastra_app-danger: mat.define-palette(mat.$red-palette);
|
||||
$adastra_app-success: mat.define-palette(mat.$green-palette);
|
||||
$adastra_app-info: mat.define-palette(mat.$blue-palette);
|
||||
$adastra_app-warning: mat.define-palette($md-custom-orange);
|
||||
|
||||
$headup_app-turquoise: mat.define-palette($md-custom-turquoise);
|
||||
$headup_app-cyan: mat.define-palette($md-custom-cyan);
|
||||
$headup_app-navy: mat.define-palette($md-custom-navy);
|
||||
$headup_app-purple: mat.define-palette($md-custom-purple);
|
||||
$headup_app-raspberry: mat.define-palette($md-custom-raspberry);
|
||||
$headup_app-orange: mat.define-palette($md-custom-orange);
|
||||
$headup_app-yellow: mat.define-palette($md-custom-yellow);
|
||||
$headup_app-teal: mat.define-palette($md-custom-teal);
|
||||
$headup_app-magenta: mat.define-palette($md-custom-magenta);
|
||||
$headup_app-pink: mat.define-palette($md-custom-pink);
|
||||
$headup_app-megna: mat.define-palette($md-custom-megna);
|
||||
$headup_app-purple-light: mat.define-palette($md-custom-purple-light);
|
||||
$headup_app-navy-light: mat.define-palette($md-custom-navy-light);
|
||||
$adastra_app-turquoise: mat.define-palette($md-custom-turquoise);
|
||||
$adastra_app-cyan: mat.define-palette($md-custom-cyan);
|
||||
$adastra_app-navy: mat.define-palette($md-custom-navy);
|
||||
$adastra_app-purple: mat.define-palette($md-custom-purple);
|
||||
$adastra_app-raspberry: mat.define-palette($md-custom-raspberry);
|
||||
$adastra_app-orange: mat.define-palette($md-custom-orange);
|
||||
$adastra_app-yellow: mat.define-palette($md-custom-yellow);
|
||||
$adastra_app-teal: mat.define-palette($md-custom-teal);
|
||||
$adastra_app-magenta: mat.define-palette($md-custom-magenta);
|
||||
$adastra_app-pink: mat.define-palette($md-custom-pink);
|
||||
$adastra_app-megna: mat.define-palette($md-custom-megna);
|
||||
$adastra_app-purple-light: mat.define-palette($md-custom-purple-light);
|
||||
$adastra_app-navy-light: mat.define-palette($md-custom-navy-light);
|
||||
|
||||
$custom-typography: mat.define-typography-config(
|
||||
$font-family: 'Barlow, sans-serif',
|
||||
@@ -88,68 +93,68 @@ $custom-typography: mat.define-typography-config(
|
||||
|
||||
// Create the theme object. A theme consists of configurations for individual
|
||||
// theming systems such as "color" or "typography".
|
||||
$headup_app-theme: mat.define-dark-theme((
|
||||
$adastra_app-theme: mat.define-light-theme((
|
||||
color: (
|
||||
primary: $headup_app-primary,
|
||||
accent: $headup_app-accent,
|
||||
warn: $headup_app-warn,
|
||||
primary: $adastra_app-primary,
|
||||
accent: $adastra_app-accent,
|
||||
warn: $adastra_app-warn,
|
||||
),
|
||||
typography: $custom-typography,
|
||||
density: 0
|
||||
));
|
||||
|
||||
$headup_app-variants: (
|
||||
danger: $headup_app-danger,
|
||||
success: $headup_app-success,
|
||||
info: $headup_app-info,
|
||||
warning: $headup_app-warning,
|
||||
turquoise: $headup_app-turquoise,
|
||||
cyan: $headup_app-cyan,
|
||||
navy: $headup_app-navy,
|
||||
purple: $headup_app-purple,
|
||||
raspberry: $headup_app-raspberry,
|
||||
orange: $headup_app-orange,
|
||||
yellow: $headup_app-yellow,
|
||||
teal: $headup_app-teal,
|
||||
magenta: $headup_app-magenta,
|
||||
pink: $headup_app-pink,
|
||||
megna: $headup_app-megna,
|
||||
purple-light: $headup_app-purple-light,
|
||||
navy-light: $headup_app-navy-light
|
||||
$adastra_app-variants: (
|
||||
danger: $adastra_app-danger,
|
||||
success: $adastra_app-success,
|
||||
info: $adastra_app-info,
|
||||
warning: $adastra_app-warning,
|
||||
turquoise: $adastra_app-turquoise,
|
||||
cyan: $adastra_app-cyan,
|
||||
navy: $adastra_app-navy,
|
||||
purple: $adastra_app-purple,
|
||||
raspberry: $adastra_app-raspberry,
|
||||
orange: $adastra_app-orange,
|
||||
yellow: $adastra_app-yellow,
|
||||
teal: $adastra_app-teal,
|
||||
magenta: $adastra_app-magenta,
|
||||
pink: $adastra_app-pink,
|
||||
megna: $adastra_app-megna,
|
||||
purple-light: $adastra_app-purple-light,
|
||||
navy-light: $adastra_app-navy-light
|
||||
);
|
||||
/*
|
||||
$config: mat.get-color-config($headup_app-theme);
|
||||
$config: mat.get-color-config($adastra_app-theme);
|
||||
$foreground: map.get($config, foreground);
|
||||
$background: map.get($config, background);
|
||||
*/
|
||||
$foreground: map.get($headup_app-theme, foreground);
|
||||
$background: map.get($headup_app-theme, background);
|
||||
$foreground: map.get($adastra_app-theme, foreground);
|
||||
$background: map.get($adastra_app-theme, background);
|
||||
|
||||
/*
|
||||
@use './components';
|
||||
@include mat.core-theme($headup_app-theme);
|
||||
@include mat.button-theme($headup_app-theme);
|
||||
@include mat.badge-theme($headup_app-theme);
|
||||
@include mat.icon-theme($headup_app-theme);
|
||||
@include mat.icon-button-theme($headup_app-theme);
|
||||
@include mat.toolbar-theme($headup_app-theme);
|
||||
@include mat.card-theme($headup_app-theme);
|
||||
@include mat.table-theme($headup_app-theme);
|
||||
@include mat.sort-theme($headup_app-theme);
|
||||
@include mat.paginator-theme($headup_app-theme);
|
||||
@include mat.tabs-theme($headup_app-theme);
|
||||
@include mat.form-field-theme($headup_app-theme);
|
||||
@include mat.input-theme($headup_app-theme);
|
||||
@include mat.select-theme($headup_app-theme);
|
||||
@include mat.progress-spinner-theme($headup_app-theme);
|
||||
@include mat.dialog-theme($headup_app-theme);
|
||||
@include mat.menu-theme($headup_app-theme);
|
||||
@include mat.snack-bar-theme($headup_app-theme);
|
||||
@include components.theme($headup_app-theme, $custom-typography, $headup_app-variants);
|
||||
@include mat.core-theme($adastra_app-theme);
|
||||
@include mat.button-theme($adastra_app-theme);
|
||||
@include mat.badge-theme($adastra_app-theme);
|
||||
@include mat.icon-theme($adastra_app-theme);
|
||||
@include mat.icon-button-theme($adastra_app-theme);
|
||||
@include mat.toolbar-theme($adastra_app-theme);
|
||||
@include mat.card-theme($adastra_app-theme);
|
||||
@include mat.table-theme($adastra_app-theme);
|
||||
@include mat.sort-theme($adastra_app-theme);
|
||||
@include mat.paginator-theme($adastra_app-theme);
|
||||
@include mat.tabs-theme($adastra_app-theme);
|
||||
@include mat.form-field-theme($adastra_app-theme);
|
||||
@include mat.input-theme($adastra_app-theme);
|
||||
@include mat.select-theme($adastra_app-theme);
|
||||
@include mat.progress-spinner-theme($adastra_app-theme);
|
||||
@include mat.dialog-theme($adastra_app-theme);
|
||||
@include mat.menu-theme($adastra_app-theme);
|
||||
@include mat.snack-bar-theme($adastra_app-theme);
|
||||
@include components.theme($adastra_app-theme, $custom-typography, $adastra_app-variants);
|
||||
*/
|
||||
|
||||
@include mat.all-component-themes($headup_app-theme);
|
||||
@include components.theme($headup_app-theme, $custom-typography, $headup_app-variants);
|
||||
@include mat.all-component-themes($adastra_app-theme);
|
||||
@include components.theme($adastra_app-theme, $custom-typography, $adastra_app-variants);
|
||||
|
||||
//@import "chartist/dist/index";
|
||||
|
||||
|
||||
+14
-15
@@ -20,23 +20,22 @@ $badge-font-weight: 600;
|
||||
$user-img-size: 84px;
|
||||
$user-img-height: 158px;
|
||||
$sidenav-width: 237px;
|
||||
$sidenav-height: 35px;
|
||||
|
||||
/* Theme Colors */
|
||||
$primary: mat.get-color-from-palette(palettes.$md-custom-primary, 700); // #a7d4c4; // #a1c7a1;
|
||||
$accent: mat.get-color-from-palette(palettes.$md-custom-accent, 700); // #d9caae; // #d9caae;
|
||||
$warn: mat.get-color-from-palette(palettes.$md-custom-warn, 600); // #9788c7; // #9788c7;
|
||||
$secondary: mat.get-color-from-palette(palettes.$md-custom-warn, 600); // #9788c7; // #9788c7;
|
||||
$headingtext: mat.get-color-from-palette(palettes.$md-custom-primary, 500); // #b7ddd0; // #b1d2b1;
|
||||
$bodytext: mat.get-color-from-palette(palettes.$md-custom-primary, 100); // #e9f5f1; // #e8f2e8;
|
||||
//$sidebar: mat.get-color-from-palette(palettes.$md-custom-primary, 700); // #a7d4c4; // #a1c7a1;
|
||||
$sidebar: #101010;
|
||||
$sidebar-light: mat.get-color-from-palette(palettes.$md-custom-primary, 300); // #cde7de; // #d4f3e8;
|
||||
$sidebar-selected: mat.get-color-from-palette(palettes.$md-custom-primary, 500); // #b7ddd0; // #b1d2b1;
|
||||
$sidebar-footer: mat.get-color-from-palette(palettes.$md-custom-primary, 900); // #90c7b3;
|
||||
//$sidebar-text: mat.get-color-from-palette(palettes.$md-custom-primary, 50); // #f6fbf9; // #f6faf6;
|
||||
//$sidebar-icons: mat.get-color-from-palette(palettes.$md-custom-primary, 100); // #e9f5f1; // #e8f2e8;
|
||||
$sidebar-text: #74b69e;
|
||||
$sidebar-icons: #74b69e;
|
||||
$primary: mat.get-color-from-palette(palettes.$md-custom-primary, 700); // #a7d4c4;
|
||||
$accent: mat.get-color-from-palette(palettes.$md-custom-accent, 700); // #d9caae;
|
||||
$warn: mat.get-color-from-palette(palettes.$md-custom-warn, 600); // #9788c7;
|
||||
$secondary: mat.get-color-from-palette(palettes.$md-custom-warn, 600); // #9788c7;
|
||||
$headingtext: mat.get-color-from-palette(palettes.$md-custom-primary, 500); // #b7ddd0;
|
||||
$bodytext: mat.get-color-from-palette(palettes.$md-custom-primary, 100); // #e9f5f1;
|
||||
//$sidebar: mat.get-color-from-palette(palettes.$md-custom-primary, 700); // #a7d4c4;
|
||||
$sidebar: mat.get-color-from-palette(palettes.$md-custom-primary, 400); // #cde7de;
|
||||
$sidebar-light: #d9d9d9;
|
||||
$sidebar-selected: mat.get-color-from-palette(palettes.$md-custom-primary, 500); // #b7ddd0;
|
||||
$sidebar-footer: mat.get-color-from-palette(palettes.$md-custom-primary, 500); // #90c7b3;
|
||||
$sidebar-text: mat.get-color-from-palette(palettes.$md-custom-primary, 500);
|
||||
$sidebar-icons: mat.get-color-from-palette(palettes.$md-custom-primary, 500);
|
||||
$sidenav-content: #1c1c1c;
|
||||
$armygreen: #4b5320;
|
||||
$odbgreen: #485b54;
|
||||
|
||||
Reference in New Issue
Block a user