From c5b340ac3c10434c5b9713aa91a16f388de6f08f Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 21 Nov 2018 11:27:44 +0100
Subject: [PATCH] move angular boot in src/core
---
angular.json | 36 +++++++++---------
index.php | 3 ++
src/frontend/app/login/login.component.ts | 2 +-
.../app/profile/profile.component.scss | 2 +-
src/frontend/app/profile/profile.component.ts | 2 +-
.../app/sidebar/sidebar.component.scss | 2 +-
src/{ => frontend}/assets/logo_white.svg | 0
src/{ => frontend}/assets/user_sample.svg | 0
src/{ => frontend/core}/browserslist | 0
.../core}/environments/environment.prod.ts | 0
.../core}/environments/environment.ts | 0
src/{ => frontend/core}/favicon.ico | Bin
src/frontend/{ => core}/index.html | 0
src/{ => frontend/core}/karma.conf.js | 0
src/{ => frontend/core}/main.ts | 2 +-
src/{ => frontend/core}/pdf.pdf | Bin
src/{ => frontend/core}/polyfills.ts | 0
src/{ => frontend/core}/styles.scss | 4 +-
src/{ => frontend/core}/test.ts | 0
src/{ => frontend/core}/tsconfig.app.json | 4 +-
src/frontend/{ => core}/tsconfig.json | 0
src/{ => frontend/core}/tsconfig.spec.json | 2 +-
src/{ => frontend/core}/tslint.json | 0
src/frontend/main.ts | 7 ----
src/frontend/tsconfig.app.json | 12 ------
25 files changed, 31 insertions(+), 47 deletions(-)
create mode 100644 index.php
rename src/{ => frontend}/assets/logo_white.svg (100%)
rename src/{ => frontend}/assets/user_sample.svg (100%)
rename src/{ => frontend/core}/browserslist (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/environments/environment.prod.ts (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/environments/environment.ts (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/favicon.ico (100%)
mode change 100755 => 100644
rename src/frontend/{ => core}/index.html (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/karma.conf.js (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/main.ts (85%)
mode change 100755 => 100644
rename src/{ => frontend/core}/pdf.pdf (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/polyfills.ts (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/styles.scss (97%)
rename src/{ => frontend/core}/test.ts (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/tsconfig.app.json (69%)
mode change 100755 => 100644
rename src/frontend/{ => core}/tsconfig.json (100%)
mode change 100755 => 100644
rename src/{ => frontend/core}/tsconfig.spec.json (87%)
mode change 100755 => 100644
rename src/{ => frontend/core}/tslint.json (100%)
mode change 100755 => 100644
delete mode 100755 src/frontend/main.ts
delete mode 100755 src/frontend/tsconfig.app.json
diff --git a/angular.json b/angular.json
index ef6a61f80d..e9b00df603 100755
--- a/angular.json
+++ b/angular.json
@@ -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/**"
diff --git a/index.php b/index.php
new file mode 100644
index 0000000000..0267c86efa
--- /dev/null
+++ b/index.php
@@ -0,0 +1,3 @@
+<script>
+ window.location.href = 'dist/index.html';
+</script>
diff --git a/src/frontend/app/login/login.component.ts b/src/frontend/app/login/login.component.ts
index fdfbf0de7f..2614825520 100644
--- a/src/frontend/app/login/login.component.ts
+++ b/src/frontend/app/login/login.component.ts
@@ -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 {
diff --git a/src/frontend/app/profile/profile.component.scss b/src/frontend/app/profile/profile.component.scss
index 45a2971bd5..dfe63a5b9c 100644
--- a/src/frontend/app/profile/profile.component.scss
+++ b/src/frontend/app/profile/profile.component.scss
@@ -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;
diff --git a/src/frontend/app/profile/profile.component.ts b/src/frontend/app/profile/profile.component.ts
index 15056375b0..4c9826edf7 100644
--- a/src/frontend/app/profile/profile.component.ts
+++ b/src/frontend/app/profile/profile.component.ts
@@ -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 {
diff --git a/src/frontend/app/sidebar/sidebar.component.scss b/src/frontend/app/sidebar/sidebar.component.scss
index c179b6c34f..e4924b9710 100644
--- a/src/frontend/app/sidebar/sidebar.component.scss
+++ b/src/frontend/app/sidebar/sidebar.component.scss
@@ -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;
diff --git a/src/assets/logo_white.svg b/src/frontend/assets/logo_white.svg
similarity index 100%
rename from src/assets/logo_white.svg
rename to src/frontend/assets/logo_white.svg
diff --git a/src/assets/user_sample.svg b/src/frontend/assets/user_sample.svg
similarity index 100%
rename from src/assets/user_sample.svg
rename to src/frontend/assets/user_sample.svg
diff --git a/src/browserslist b/src/frontend/core/browserslist
old mode 100755
new mode 100644
similarity index 100%
rename from src/browserslist
rename to src/frontend/core/browserslist
diff --git a/src/environments/environment.prod.ts b/src/frontend/core/environments/environment.prod.ts
old mode 100755
new mode 100644
similarity index 100%
rename from src/environments/environment.prod.ts
rename to src/frontend/core/environments/environment.prod.ts
diff --git a/src/environments/environment.ts b/src/frontend/core/environments/environment.ts
old mode 100755
new mode 100644
similarity index 100%
rename from src/environments/environment.ts
rename to src/frontend/core/environments/environment.ts
diff --git a/src/favicon.ico b/src/frontend/core/favicon.ico
old mode 100755
new mode 100644
similarity index 100%
rename from src/favicon.ico
rename to src/frontend/core/favicon.ico
diff --git a/src/frontend/index.html b/src/frontend/core/index.html
old mode 100755
new mode 100644
similarity index 100%
rename from src/frontend/index.html
rename to src/frontend/core/index.html
diff --git a/src/karma.conf.js b/src/frontend/core/karma.conf.js
old mode 100755
new mode 100644
similarity index 100%
rename from src/karma.conf.js
rename to src/frontend/core/karma.conf.js
diff --git a/src/main.ts b/src/frontend/core/main.ts
old mode 100755
new mode 100644
similarity index 85%
rename from src/main.ts
rename to src/frontend/core/main.ts
index 2b753ff4fa..8187df7082
--- a/src/main.ts
+++ b/src/frontend/core/main.ts
@@ -1,7 +1,7 @@
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) {
diff --git a/src/pdf.pdf b/src/frontend/core/pdf.pdf
old mode 100755
new mode 100644
similarity index 100%
rename from src/pdf.pdf
rename to src/frontend/core/pdf.pdf
diff --git a/src/polyfills.ts b/src/frontend/core/polyfills.ts
old mode 100755
new mode 100644
similarity index 100%
rename from src/polyfills.ts
rename to src/frontend/core/polyfills.ts
diff --git a/src/styles.scss b/src/frontend/core/styles.scss
similarity index 97%
rename from src/styles.scss
rename to src/frontend/core/styles.scss
index f79b91b6d8..ee0c98af78 100644
--- a/src/styles.scss
+++ b/src/frontend/core/styles.scss
@@ -1,9 +1,9 @@
// 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 {
diff --git a/src/test.ts b/src/frontend/core/test.ts
old mode 100755
new mode 100644
similarity index 100%
rename from src/test.ts
rename to src/frontend/core/test.ts
diff --git a/src/tsconfig.app.json b/src/frontend/core/tsconfig.app.json
old mode 100755
new mode 100644
similarity index 69%
rename from src/tsconfig.app.json
rename to src/frontend/core/tsconfig.app.json
index 8ea061ea1b..74ea13d442
--- a/src/tsconfig.app.json
+++ b/src/frontend/core/tsconfig.app.json
@@ -1,11 +1,11 @@
{
- "extends": "../tsconfig.json",
+ "extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"exclude": [
- "src/test.ts",
+ "./test.ts",
"**/*.spec.ts"
]
}
diff --git a/src/frontend/tsconfig.json b/src/frontend/core/tsconfig.json
old mode 100755
new mode 100644
similarity index 100%
rename from src/frontend/tsconfig.json
rename to src/frontend/core/tsconfig.json
diff --git a/src/tsconfig.spec.json b/src/frontend/core/tsconfig.spec.json
old mode 100755
new mode 100644
similarity index 87%
rename from src/tsconfig.spec.json
rename to src/frontend/core/tsconfig.spec.json
index de7733630e..0ef7609d3a
--- a/src/tsconfig.spec.json
+++ b/src/frontend/core/tsconfig.spec.json
@@ -1,5 +1,5 @@
{
- "extends": "../tsconfig.json",
+ "extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"types": [
diff --git a/src/tslint.json b/src/frontend/core/tslint.json
old mode 100755
new mode 100644
similarity index 100%
rename from src/tslint.json
rename to src/frontend/core/tslint.json
diff --git a/src/frontend/main.ts b/src/frontend/main.ts
deleted file mode 100755
index d5ecfb5932..0000000000
--- a/src/frontend/main.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { enableProdMode } from '@angular/core';
-
-import { AppModule } from './app/app.module';
-
-enableProdMode();
-platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/src/frontend/tsconfig.app.json b/src/frontend/tsconfig.app.json
deleted file mode 100755
index 79143525f9..0000000000
--- a/src/frontend/tsconfig.app.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "extends": "./tsconfig.json",
- "compilerOptions": {
- "outDir": "../out-tsc/app",
- "baseUrl": "../../apps/maarch_entreprise/",
- "module": "es2015",
- "types": []
- },
- "exclude": [
- "**/*.spec.ts"
- ]
-}
--
GitLab