From 7bc07675187d090463f19bca2c64c45dbea9b022 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 12 Jun 2020 09:50:36 +0000 Subject: [PATCH] [Trunk | Explore]: 1. index.html & styles.css & angular.json: Css and js files removed from index.html and added in styles.css / angular.json. 2. angular.json: Development configuration added for server side. 3. package.json: Development rules added for server side. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@58899 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/angular.json | 23 ++++++++++++++++++++++- explore/package.json | 5 +++++ explore/src/index.html | 28 ++++++++++++++-------------- explore/src/styles.css | 5 +++++ 4 files changed, 46 insertions(+), 15 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 56f2085b..a1983ab6 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -31,6 +31,9 @@ "node_modules/datatables.net-dt/css/jquery.dataTables.css" ], "scripts": [ + "src/assets/common-assets/common/jquery.js", + "src/assets/common-assets/common/uikit.min.js", + "src/assets/common-assets/common/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js", "node_modules/datatables.net/js/jquery.dataTables.js" ] @@ -86,6 +89,17 @@ "with": "src/environments/environment.test.ts" } ] + }, + "development": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, } } }, @@ -103,6 +117,9 @@ }, "test": { "browserTarget": "openaire-search:build:test" + }, + "development": { + "browserTarget": "openaire-search:build:development" } } }, @@ -120,6 +137,9 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "scripts": [ + "src/assets/common-assets/common/jquery.js", + "src/assets/common-assets/common/uikit.min.js", + "src/assets/common-assets/common/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js", "node_modules/datatables.net/js/jquery.dataTables.js" ], @@ -183,7 +203,8 @@ "with": "src/environments/environment.test.ts" } ] - } + }, + "development": {} } } } diff --git a/explore/package.json b/explore/package.json index 14b4bcaa..3461b703 100644 --- a/explore/package.json +++ b/explore/package.json @@ -15,16 +15,21 @@ "start:prerender-beta": "npm run build:prerender-beta && npm run serve:prerender", "start:ssr-test": "npm run build:ssr-test && npm run serve:ssr", "start:prerender-test": "npm run build:prerender-test && npm run serve:prerender", + "start:ssr-dev": "npm run build:ssr-dev && npm run serve:ssr", + "start:prerender-dev": "npm run build:prerender-dev && npm run serve:prerender", "build": "ng build", "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true && ng run openaire-search:server:production", "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true && ng run openaire-search:server:beta", "build:client-and-server-bundles-test": "ng build --configuration=test --sourceMap --stats-json=true && ng run openaire-search:server:test", + "build:client-and-server-bundles-dev": "ng build --configuration=development --sourceMap --stats-json=true && ng run openaire-search:server:development", "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender", "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server", "build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender", "build:ssr-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server", "build:prerender-test": "npm run build:client-and-server-bundles-test && npm run webpack:server && npm run generate:prerender", "build:ssr-test": "npm run build:client-and-server-bundles-test && npm run webpack:server", + "build:prerender-dev": "npm run build:client-and-server-bundles-dev && npm run webpack:server && npm run generate:prerender", + "build:ssr-dev": "npm run build:client-and-server-bundles-dev && npm run webpack:server", "generate:prerender": "cd dist && node prerender", "webpack:server": "webpack --config webpack.server.config.js --progress --colors", "serve:prerender": "cd dist/browser && http-server", diff --git a/explore/src/index.html b/explore/src/index.html index dad078cd..90faa98c 100644 --- a/explore/src/index.html +++ b/explore/src/index.html @@ -44,23 +44,23 @@ Search OpenAIRE - - - + + + - + - - - - + + + + diff --git a/explore/src/styles.css b/explore/src/styles.css index 19273937..2adb1bd5 100644 --- a/explore/src/styles.css +++ b/explore/src/styles.css @@ -1,2 +1,7 @@ /* You can add global styles to this file, and also import other style files */ @import '~@angular/material/prebuilt-themes/indigo-pink.css'; + +@import "assets/common-assets/common/theme.css"; +@import "assets/common-assets/common/custom.css"; +@import "assets/common-assets/library.css"; +@import "assets/explore-custom.css"; \ No newline at end of file