[Aggregator|Trunk]

add prod/beta versions files and build instructions
fix issue with animation (in server side)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@60128 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-12-14 16:22:50 +00:00
parent 570ce5e570
commit b4e6e6d9e8
10 changed files with 193 additions and 35 deletions

View File

@ -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

View File

@ -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",

View File

@ -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

View File

@ -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,

View File

@ -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=",

61
src/index.beta.html Normal file
View File

@ -0,0 +1,61 @@
<!DOCTYPE html>
<html lang="en" dir="ltr" vocab="http://schema.org/">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="/" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description"
content="openAIRE aggregator portal, open access, publications, research results, European commission, search"/>
<meta property="og:description" content="openAIRE explore, open access, publications, research results, European commission, search"/>
<meta property="og:title" content="OpenAIRE"/>
<meta property="og:type" content="website"/>
<meta property="og:url" content="https://beta.explore.openaire.eu"/>
<meta property="og:site_name" content="OpenAIRE"/>
<meta property="og:image" content="assets/common-assets/common/Symbol.png"/>
<meta property="og:image:secure_url" content="assets/common-assets/common/Symbol.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="360" />
<meta property="og:image:height" content="359" />
<meta name="robots" content="noindex">
<link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="assets/common-assets/logo/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
<link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
<link rel="manifest" href="assets/common-assets/logo/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<title>Search OpenAIRE</title>
</head>
<body class="" style="">
<div class="uk-offcanvas-content uk-height-viewport">
<app-root></app-root>
</div>
<script type="text/javascript" >
function loadAltmetrics(e,t,n){
var d="createElement",c="getElementsByTagName",m="setAttribute",n=document.getElementById(e);
return n&&n.parentNode&&n.parentNode.removeChild(n),n=document[d+"NS"]&&document.documentElement.namespaceURI,n=n?document[d+"NS"](n,"script"):document[d]("script"),n[m]("id",e),n[m]("src",t),(document[c]("head")[0]||document[c]("body")[0]).appendChild(n),n=new Image,void n[m]("src","https://d1uo4w7k31k5mn.cloudfront.net/donut/0.png")
};
</script>
</body>
</html>

61
src/index.prod.html Normal file
View File

@ -0,0 +1,61 @@
<!DOCTYPE html>
<html lang="en" dir="ltr" vocab="http://schema.org/">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<base href="/" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description"
content="openAIRE aggregator portal, open access, publications, research results, European commission, search"/>
<meta property="og:description" content="openAIRE explore, open access, publications, research results, European commission, search"/>
<meta property="og:title" content="OpenAIRE"/>
<meta property="og:type" content="website"/>
<meta property="og:url" content="https://beta.explore.openaire.eu"/>
<meta property="og:site_name" content="OpenAIRE"/>
<meta property="og:image" content="assets/common-assets/common/Symbol.png"/>
<meta property="og:image:secure_url" content="assets/common-assets/common/Symbol.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="360" />
<meta property="og:image:height" content="359" />
<meta name="robots" content="noindex">
<link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="assets/common-assets/logo/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
<link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
<link rel="manifest" href="assets/common-assets/logo/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<title>Search OpenAIRE</title>
</head>
<body class="" style="">
<div class="uk-offcanvas-content uk-height-viewport">
<app-root></app-root>
</div>
<script type="text/javascript" >
function loadAltmetrics(e,t,n){
var d="createElement",c="getElementsByTagName",m="setAttribute",n=document.getElementById(e);
return n&&n.parentNode&&n.parentNode.removeChild(n),n=document[d+"NS"]&&document.documentElement.namespaceURI,n=n?document[d+"NS"](n,"script"):document[d]("script"),n[m]("id",e),n[m]("src",t),(document[c]("head")[0]||document[c]("body")[0]).appendChild(n),n=new Image,void n[m]("src","https://d1uo4w7k31k5mn.cloudfront.net/donut/0.png")
};
</script>
</body>
</html>

2
src/robots.beta.txt Normal file
View File

@ -0,0 +1,2 @@
User-Agent: *
Disallow: /

2
src/robots.prod.txt Normal file
View File

@ -0,0 +1,2 @@
User-Agent: *
Disallow: /

View File

@ -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: /