diff --git a/angular.json b/angular.json index 8d6f6c9..f0ef857 100644 --- a/angular.json +++ b/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "openaire-search": { + "openaire-aggregator": { "root": "", "sourceRoot": "src", "projectType": "application", @@ -54,6 +54,31 @@ { "replace": "src/environments/environment.ts", "with": "src/environments/environment.prod.ts" + }, + { + "replace": "src/index.html", + "with": "src/index.prod.html" + }, + { + "replace": "src/robots.txt", + "with": "src/robots.prod.txt" + } + ] + }, + "beta": { + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.beta.ts" } ] } @@ -62,18 +87,18 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "openaire-search:build" + "browserTarget": "openaire-aggregator:build" }, "configurations": { "production": { - "browserTarget": "openaire-search:build:production" + "browserTarget": "openaire-aggregator:build:production" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "openaire-search:build" + "browserTarget": "openaire-aggregator:build" } }, "test": { @@ -131,6 +156,22 @@ { "replace": "src/environments/environment.ts", "with": "src/environments/environment.prod.ts" + }, + { + "replace": "src/index.html", + "with": "src/index.prod.html" + }, + { + "replace": "src/robots.txt", + "with": "src/robots.prod.txt" + } + ] + }, + "beta": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.beta.ts" } ] } @@ -138,7 +179,7 @@ } } }, - "openaire-search-e2e": { + "openaire-aggregator-e2e": { "root": "e2e", "sourceRoot": "e2e", "projectType": "application", @@ -147,7 +188,7 @@ "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "./protractor.conf.js", - "devServerTarget": "openaire-search:serve" + "devServerTarget": "openaire-aggregator:serve" } }, "lint": { @@ -164,7 +205,7 @@ } } }, - "defaultProject": "openaire-search", + "defaultProject": "openaire-aggregator", "schematics": { "@schematics/angular:class": { "spec": false diff --git a/package.json b/package.json index 117e74b..cca8320 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "openaire-search", + "name": "openaire-aggregator", "version": "1.0.0", "license": "Openaire", "contributors": [ @@ -11,14 +11,20 @@ "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", "start:ssr": "npm run build:ssr && npm run serve:ssr", "start:prerender": "npm run build:prerender && npm run serve:prerender", + "start:ssr-beta": "npm run build:ssr-beta && npm run serve:ssr", + "start:prerender-beta": "npm run build:prerender-beta && 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": "ng build --prod --sourceMap --stats-json=true && ng run openaire-aggregator:server:production", + "build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true && ng run openaire-aggregator:server:beta", "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", "generate:prerender": "cd dist && node prerender", "webpack:server": "webpack --config webpack.server.config.js --progress --colors", "serve:prerender": "cd dist/browser && http-server", - "serve:ssr": "node dist/server" + "serve:ssr": "node dist/server", + "after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; " }, "private": true, "dependencies": { @@ -45,7 +51,9 @@ "datatables.net-dt": "^1.10.19", "jquery": "^3.4.1", "ng-recaptcha": "^3.0.5", + "ng2-ckeditor": "1.1.9", "ngx-json-ld": "0.1.6", + "nouislider": "^14.6.0", "prom-client": "^11.3.0", "ts-md5": "^1.2.0", "tslib": "^1.9.0", diff --git a/server.ts b/server.ts index 00f5ebc..48900fc 100644 --- a/server.ts +++ b/server.ts @@ -13,7 +13,7 @@ enableProdMode(); // Express server const app = express(); -const PORT = process.env.PORT || 4000; +const PORT = process.env.PORT || 3500; const DIST_FOLDER = join(process.cwd(), 'dist'); // Our index.html we'll use as our template diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1928a93..a9fbe83 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {SharedModule} from './shared/shared.module'; import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; -import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations'; +import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {CommonModule} from '@angular/common'; import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http'; import {AppComponent} from './app.component'; @@ -26,7 +26,7 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config imports: [ SharedModule, - NoopAnimationsModule, + BrowserAnimationsModule, CommonModule, HttpClientModule, ErrorModule, diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 2cb2425..3842500 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -45,12 +45,12 @@ export let properties: EnvProperties = { vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", - piwikSiteId: "6", - loginUrl: "https://beta.services.openaire.eu/uoa-user-management/openid_connect_login", + piwikSiteId: null, + loginUrl: "https://beta.services.openaire.eu/explore-login/openid_connect_login", userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", - logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", + logoutUrl: "https://beta.services.openaire.eu/explore-login/openid_logout", cookieDomain: ".openaire.eu", @@ -70,7 +70,7 @@ export let properties: EnvProperties = { pagingLimit: 20, resultsPerPage: 10, - "baseLink" : "/", + "baseLink" : "", "domain":"https://beta.explore.openaire.eu", searchLinkToResult: "/search/result?id=", diff --git a/src/index.beta.html b/src/index.beta.html new file mode 100644 index 0000000..ce4c1a4 --- /dev/null +++ b/src/index.beta.html @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Search OpenAIRE + + + + +
+ + +
+ + + + + diff --git a/src/index.prod.html b/src/index.prod.html new file mode 100644 index 0000000..ce4c1a4 --- /dev/null +++ b/src/index.prod.html @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Search OpenAIRE + + + + +
+ + +
+ + + + + diff --git a/src/robots.beta.txt b/src/robots.beta.txt new file mode 100644 index 0000000..c6742d8 --- /dev/null +++ b/src/robots.beta.txt @@ -0,0 +1,2 @@ +User-Agent: * +Disallow: / diff --git a/src/robots.prod.txt b/src/robots.prod.txt new file mode 100644 index 0000000..c6742d8 --- /dev/null +++ b/src/robots.prod.txt @@ -0,0 +1,2 @@ +User-Agent: * +Disallow: / diff --git a/src/robots.txt b/src/robots.txt index 0193584..c6742d8 100644 --- a/src/robots.txt +++ b/src/robots.txt @@ -1,19 +1,2 @@ User-Agent: * -Disallow: /cache -Disallow: /upload -Disallow: /participate/claim -Disallow: /participate/direct-claim -Disallow: /myclaims -Disallow: /claims - -#Disallow: / - - -Sitemap: https://explore.openaire.eu/sitemap.xml -Sitemap: https://explore.openaire.eu/publicationSitemap.xml -Sitemap: https://explore.openaire.eu/datasetSitemap.xml -Sitemap: https://explore.openaire.eu/softwareSitemap.xml -Sitemap: https://explore.openaire.eu/otherSitemap.xml -Sitemap: https://explore.openaire.eu/projectSitemap.xml -Sitemap: https://explore.openaire.eu/organizationSitemap.xml -Sitemap: https://explore.openaire.eu/dataproviderSitemap.xml +Disallow: /