diff --git a/prepareDeploy.sh b/prepareDeploy.sh index a7f191f..d52d0f3 100755 --- a/prepareDeploy.sh +++ b/prepareDeploy.sh @@ -1,8 +1,24 @@ -cp connect-production-properties.json src/assets/env-properties.json; -rm -rf src/assets/common-assets/.svn/; -rm -rf src/app/openaireLibrary/.svn/; -pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts; -npm run build:dynamic; -rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh; -echo 'Ready!'; -echo 'Now copy dist to the server!' +##ATTENTION +## DON'T run it in svn folder - it *REMOVES* files +## Copy project in another file "deploy-folder" +## cd "deploy-folder" +## run the script + +## uncommect from here--> +# cp connect-production-properties.json src/assets/env-properties.json; +# rm -rf src/assets/common-assets/.svn/; +# rm -rf src/app/openaireLibrary/.svn/; +# pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts; +# npm run build:dynamic; +# rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh; +# echo 'Ready!'; +# echo 'Now copy to the server!' +##<-- to here + +##copy "deploy-folder" in beta.connect.openaire.eu +##coppies of previous deployments exist in "/home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD" +##run "npm i" +##become nodejs user: "sudo su nodejs -s /bin/bash" +##go to "cd /srv/www/portal" +##cp files from "cp -r HOME_PATH/deploy-folder/* ." +##restart portal "pm2 restart connect" diff --git a/src/app/content/content-routing.module.ts b/src/app/content/content-routing.module.ts new file mode 100644 index 0000000..d1abda4 --- /dev/null +++ b/src/app/content/content-routing.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { RouterModule } from '@angular/router'; + +import {ContentPageComponent} from './contentPage.component'; +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: ContentPageComponent, canActivate: [FreeGuard], canDeactivate: [PreviousRouteRecorder] } + + ]) + ] +}) +export class ContentPageRoutingModule { } diff --git a/src/app/content/contentPage.component.html b/src/app/content/contentPage.component.html new file mode 100644 index 0000000..e49940d --- /dev/null +++ b/src/app/content/contentPage.component.html @@ -0,0 +1,12 @@ + +
+
+
+ About OpenAIRE Connect content +
+

+ In this page we will provide you information about OpenAIRE Connect content. + Comming soon... +

+
+
diff --git a/src/app/content/contentPage.component.ts b/src/app/content/contentPage.component.ts new file mode 100644 index 0000000..8f40ac7 --- /dev/null +++ b/src/app/content/contentPage.component.ts @@ -0,0 +1,34 @@ +import {Component, Input, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core'; +import {Observable} from 'rxjs/Observable'; +import {ActivatedRoute, Router} from '@angular/router'; +import {Title, Meta} from '@angular/platform-browser'; + +@Component({ + selector: 'content', + templateUrl: './contentPage.component.html' +}) +export class ContentPageComponent { + + constructor ( private route: ActivatedRoute, private _router: Router, + private _meta: Meta, private _title: Title) {} + + public ngOnInit() { + this.updateTitle("Content"); + this.updateDescription("content, open access"); + + } + + private updateDescription(description:string){ + this._meta.updateTag({content:description},"name='description'"); + this._meta.updateTag({content:description},"property='og:description'"); + } + private updateTitle(title:string){ + var _prefix ="OpenAIRE | "; + var _title = _prefix + ((title.length> 50 ) ?title.substring(0,50):title); + this._title.setTitle(_title); + this._meta.updateTag({content:_title},"property='og:title'"); + } + private updateUrl(url:string){ + this._meta.updateTag({content:url},"property='og:url'"); + } +} diff --git a/src/app/content/contentPage.module.ts b/src/app/content/contentPage.module.ts new file mode 100644 index 0000000..9d24940 --- /dev/null +++ b/src/app/content/contentPage.module.ts @@ -0,0 +1,25 @@ +import { NgModule, ModuleWithProviders } from '@angular/core'; + +import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; +import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; +import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard' + +import {ContentPageComponent} from './contentPage.component'; +import {ContentPageRoutingModule} from './content-routing.module'; + + +@NgModule({ + imports: [ + ContentPageRoutingModule + ], + declarations: [ + ContentPageComponent + ], + providers:[FreeGuard,PreviousRouteRecorder, IsRouteEnabled], + exports: [ + ContentPageComponent + ] +}) + + +export class ContentPageModule{} diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index 5c36e61..a6388aa 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -56,7 +56,7 @@ "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=", - "adminToolsAPIURL" :"http://scoobydoo.di.uoa.gr:8080/uoa-admin-tools", + "adminToolsAPIURL" :"http://duffy.di.uoa.gr:8080/uoa-admin-tools", "adminToolsCommunity" :"openaire",