diff --git a/angular.json b/angular.json index d6a7c21..ac9c723 100644 --- a/angular.json +++ b/angular.json @@ -45,16 +45,13 @@ "src/.htaccess" ], "styles": [ - "src/mining.scss", "src/styles.less", "src/assets/common-assets/library-css/material.scss" ], "scripts": [ "node_modules/uikit/dist/js/uikit.min.js", "node_modules/uikit/dist/js/uikit-icons.min.js", - "node_modules/jquery/dist/jquery.js", - "node_modules/interactiveminingv3/assets/js/ResizeSensor.js", - "node_modules/interactiveminingv3/assets/js/jquery.sticky-sidebar.js" + "node_modules/jquery/dist/jquery.js" ], "vendorChunk": true, "extractLicenses": false, diff --git a/package-lock.json b/package-lock.json index d7111fd..baf9795 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,6 +17,7 @@ "@angular/platform-browser": "^14.2.3", "@angular/platform-browser-dynamic": "^14.2.3", "@angular/router": "^14.2.3", + "jquery": "^3.4.1", "ng-recaptcha": "^10.0.0", "rxjs": "^6.5.1", "tslib": "^2.3.0", @@ -28,6 +29,7 @@ "@angular/cli": "~14.2.3", "@angular/compiler-cli": "^14.2.3", "@types/jasmine": "~3.6.0", + "@types/node": "^12.11.1", "jasmine-core": "~4.1.0", "karma": "~6.3.0", "karma-chrome-launcher": "~3.1.0", @@ -3062,9 +3064,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.2.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz", - "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==", + "version": "12.20.55", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", "dev": true }, "node_modules/@types/parse-json": { @@ -7054,6 +7056,11 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/jquery": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -14138,9 +14145,9 @@ "dev": true }, "@types/node": { - "version": "20.2.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz", - "integrity": "sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==", + "version": "12.20.55", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", + "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==", "dev": true }, "@types/parse-json": { @@ -17097,6 +17104,11 @@ } } }, + "jquery": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index 1a5fa92..f21e1d6 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,14 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --host 0.0.0.0 --disable-host-check --port=5100", "build": "ng build", - "watch": "ng build --watch --configuration development", - "test": "ng test" + "build-dev": "ng build --configuration=development", + "build-beta": "ng build --configuration=beta", + "build-prod": "ng build --configuration production", + "webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/monitor-dashboard/browser/stats.json --host 0.0.0.0", + "test": "ng test", + "after-build-clean": "rm -rf dist/connect-admin/assets/common-assets/.git dist/connect-admin/assets/openaire-theme/.git .angular" }, "private": true, "dependencies": { @@ -20,6 +24,7 @@ "@angular/material": "^14.2.2", "@angular/router": "^14.2.3", "rxjs": "^6.5.1", + "jquery": "^3.4.1", "tslib": "^2.3.0", "uikit": "3.13.10", "ng-recaptcha": "^10.0.0", @@ -30,6 +35,7 @@ "@angular/cli": "~14.2.3", "@angular/compiler-cli": "^14.2.3", "@types/jasmine": "~3.6.0", + "@types/node": "^12.11.1", "jasmine-core": "~4.1.0", "karma": "~6.3.0", "karma-chrome-launcher": "~3.1.0", diff --git a/src/.htaccess b/src/.htaccess new file mode 100644 index 0000000..2b26651 --- /dev/null +++ b/src/.htaccess @@ -0,0 +1,10 @@ +RewriteEngine On + # If an existing asset or directory is requested go to it as it is + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR] + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d + RewriteRule ^ - [L] + + # If the requested resource doesn't exist, use index.html +RewriteRule ^ ./index.html + + diff --git a/src/favicon.ico b/src/favicon.ico deleted file mode 100644 index 997406a..0000000 Binary files a/src/favicon.ico and /dev/null differ diff --git a/src/index.html b/src/index.html index 1fb8c65..8a0ab99 100644 --- a/src/index.html +++ b/src/index.html @@ -2,12 +2,29 @@ - ClientManagementPortal + Client Management | OpenAIRE + + + + + + + + + + + + + + + + + + - - + diff --git a/src/main.ts b/src/main.ts index c7b673c..ed0ebe8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,9 +2,9 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; +import {properties} from "./environments/environment"; -if (environment.production) { +if (properties.environment !== 'development') { enableProdMode(); } diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json index 20e2ee6..bff25bb 100644 --- a/src/tsconfig.app.json +++ b/src/tsconfig.app.json @@ -7,7 +7,7 @@ }, "files": [ "main.ts", - "src/polyfills.ts" + "polyfills.ts" ], "include": [ "src/**/*.d.ts" diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json index c764063..a41e57e 100644 --- a/src/tsconfig.spec.json +++ b/src/tsconfig.spec.json @@ -2,17 +2,18 @@ { "extends": "../tsconfig.json", "compilerOptions": { - "outDir": "./out-tsc/spec", + "outDir": "../out-tsc/spec", "types": [ - "jasmine" + "jasmine", + "node" ] }, "files": [ "test.ts", - "src/polyfills.ts" + "polyfills.ts" ], "include": [ - "src/**/*.spec.ts", - "src/**/*.d.ts" + "**/*.spec.ts", + "**/*.d.ts" ] }