Skip to content
Snippets Groups Projects
Verified Commit c5b340ac authored by Alex ORLUC's avatar Alex ORLUC
Browse files

move angular boot in src/core

parent 810ba3d8
No related branches found
No related tags found
No related merge requests found
Showing
with 30 additions and 27 deletions
......@@ -14,16 +14,16 @@
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/",
"index": "./src/frontend/index.html",
"main": "./src/main.ts",
"polyfills": "./src/polyfills.ts",
"tsConfig": "./src/tsconfig.app.json",
"index": "./src/frontend/core/index.html",
"main": "./src/frontend/core/main.ts",
"polyfills": "./src/frontend/core/polyfills.ts",
"tsConfig": "./src/frontend/core/tsconfig.app.json",
"assets": [
"./src/favicon.ico",
"./src/assets"
"./src/frontend/core/favicon.ico",
"./src/frontend/assets"
],
"styles": [
"./src/styles.scss",
"./src/frontend/core/styles.scss",
"./node_modules/@fortawesome/fontawesome-free/css/all.min.css"
],
"scripts": [
......@@ -34,8 +34,8 @@
"production": {
"fileReplacements": [
{
"replace": "./src/environments/environment.ts",
"with": "./src/environments/environment.prod.ts"
"replace": "./src/frontend/core/environments/environment.ts",
"with": "./src/frontend/core/environments/environment.prod.ts"
}
],
"optimization": true,
......@@ -70,18 +70,18 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "./src/test.ts",
"polyfills": "./src/polyfills.ts",
"tsConfig": "./src/tsconfig.spec.json",
"karmaConfig": "./src/karma.conf.js",
"main": "./src/frontend/core/test.ts",
"polyfills": "./src/frontend/core/polyfills.ts",
"tsConfig": "./src/frontend/core/tsconfig.spec.json",
"karmaConfig": "./src/frontend/core/karma.conf.js",
"styles": [
"./src/styles.scss",
"./src/frontend/core/styles.scss",
"./node_modules/@fortawesome/fontawesome-free/css/all.min.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
"src/frontend/core/favicon.ico",
"src/frontend/assets"
]
}
},
......@@ -89,8 +89,8 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"./src/tsconfig.app.json",
"./src/tsconfig.spec.json"
"./src/frontend/core/tsconfig.app.json",
"./src/frontend/core/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
......
<script>
window.location.href = 'dist/index.html';
</script>
......@@ -42,7 +42,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
loadingConnexion = false;
constructor(public http: HttpClient, private cookieService: CookieService, private router: Router, iconReg: MatIconRegistry, sanitizer: DomSanitizer, public signaturesService: SignaturesContentService, public notificationService: NotificationService) {
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/assets/logo_white.svg'));
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/frontend/assets/logo_white.svg'));
}
ngOnInit(): void {
......
......@@ -55,7 +55,7 @@
.avatar {
position: absolute;
background: url(../../../../src/assets/user_sample.svg) $primary;
background: url(../../assets/user_sample.svg) $primary;
width: 65px;
height: 65px;
border-radius: 40px;
......
......@@ -49,7 +49,7 @@ export class ProfileComponent implements OnInit, AfterViewInit {
showPassword = false;
constructor(public http: HttpClient, iconReg: MatIconRegistry, sanitizer: DomSanitizer, public notificationService: NotificationService, public signaturesService: SignaturesContentService, private cookieService: CookieService) {
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/assets/logo_white.svg'));
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('../src/frontend/assets/logo_white.svg'));
}
ngOnInit(): void {
......
......@@ -119,7 +119,7 @@
.avatar {
cursor: pointer;
position: absolute;
background: url(../../../../src/assets/user_sample.svg) $primary;
background: url(../../assets/user_sample.svg) $primary;
width: 65px;
height: 65px;
border-radius: 40px;
......
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './frontend/app/app.module';
import { AppModule } from '../app/app.module';
import { environment } from './environments/environment';
if (environment.production) {
......
File moved
File moved
// CORE VARS COLOR
@import './frontend/css/vars.scss';
@import '../css/vars.scss';
// COMPILATED MATERIAL THEMING
@import './frontend/css/maarch-material.css';
@import '../css/maarch-material.css';
.default {
......
File moved
{
"extends": "../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"exclude": [
"src/test.ts",
"./test.ts",
"**/*.spec.ts"
]
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment