MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 13 Wiki Activity

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Konstantinos Triantafyllou 2023-06-30 11:14:29 +03:00
parent 961bd57501 fc44d3acb0
commit 45ca7d06ba
6 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.ts
View File

@ -186,25 +186,17 @@ export function app() {
server.post('/build-css/:id/:suffix', jsonParser,(req, res) => {
let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id));
if (variables) {
buildCss(req.params.id , req.params.suffix, variables);
res.status(200).send({
code: 200,
message: 'CSS build for ' + req.params.id + ' layout was successful'
});
} else {
res.status(500).send({code: 500, message: 'No variables found'});
}
});
server.post('/build-css/preview/:id/:suffix', jsonParser, (req, res) => {
let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id));
if (variables) {
buildCss(req.params.id, req.params.suffix, variables);
res.status(200).send({code: 200, message: 'CSS build for ' + req.params.id + ' layout was successful'});
} else {
res.status(500).send({code: 500, message: 'No layout found'});
}
});
// Example Express Rest API endpoints
// server.get('/api/**', (req, res) => { });

8
src/app/app-routing.module.ts
View File

@ -51,6 +51,14 @@ const routes: Routes = [
loadChildren: () => import('./htmlPages/nationalBulletins/nationalBulletinsPage.module').then(m => m.NaionalBulletinPageModule),
canActivate: [IsCommunity]
},
{
path: 'faqs',
loadChildren: () => import('./htmlPages/featured/featuredPage.module').then(m => m.FeaturedPageModule),
},
{
path: 'roadmap',
loadChildren: () => import('./htmlPages/featured/featuredPage.module').then(m => m.FeaturedPageModule),
},
// {
// path: 'featured',
// children: [

2
src/app/app.component.ts
View File

@ -405,6 +405,8 @@ export class AppComponent implements OnInit, OnDestroy {
new MenuItem("", "Projects and funding Opportunities", "", "/projects", false, [], ["/projects"], {}),
new MenuItem("", "Fields of Science", "", "/fields-of-science", false, [], ["/fields-of-science"], {}),
new MenuItem("", "Sustainable Development Goals", "", "/sdgs", false, [], ["/sdgs"], {}),
new MenuItem("", "FAQs", "", "/faqs", false, [], ["/faqs"], {}),
new MenuItem("", "Roadmap", "", "/roadmap", false, [], ["/roadmap"], {}),
]
));
this.menuItems.push(

36
src/app/develop/develop.component.ts
View File

@ -75,6 +75,42 @@ import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties"
</div>
</div>
</div>
<div class="uk-container uk-container-large">
<h1>Download records<span class="uk-text-primary">.</span></h1>
</div>
<div class="uk-section uk-container uk-container-large">
<div class="uk-grid uk-grid-large uk-child-width-1-2@m" uk-grid>
<div class="uk-text-center uk-flex uk-flex-middle">
<div class="uk-icon-bg-shadow uk-icon-bg-shadow-large uk-margin-auto">
<icon name="download" customClass="uk-text-background" [flex]="true" ratio="2.5" type="outlined" visuallyHidden="For {{openaireEntities.RESULTS}}"></icon>
</div>
</div>
<div class="uk-text-center">
<div class="">
To get all metadata records of the community in bulk, use the dump of research communities on Zenodo.
It contains one tar file per community.
Each tar file contains gzipped tar files with one JSON per line.
<a href="https://graph.openaire.eu/docs/downloads/subgraphs#the-dumps-about-research-communities-initiatives-and-infrastructures" target="_blank">
More information</a>
</div>
<div class="uk-margin-top">
<a class="uk-display-inline-block uk-button uk-button-text"
href="https://doi.org/10.5281/zenodo.3974604" target="_blank">
<span class="uk-flex uk-flex-middle">
<span>Community dump</span>
</span>
</a>
<br>
<a class="uk-display-inline-block uk-button uk-button-text"
href="https://doi.org/10.5281/zenodo.3974225" target="_blank">
<span class="uk-flex uk-flex-middle">
<span>Schema</span>
</span>
</a>
</div>
</div>
</div>
</div>
</div>
`
})

18
src/app/htmlPages/featured/featuredPage.component.ts
View File

@ -1,30 +1,36 @@
import {Component} from '@angular/core';
import {Router} from "@angular/router";
import {ActivatedRoute, Router} from "@angular/router";
import {Subscription} from "rxjs";
import {ConfigurationService} from "../../openaireLibrary/utils/configuration/configuration.service";
import {Portal} from "../../openaireLibrary/utils/entities/adminTool/portal";
import {Page} from "../../openaireLibrary/utils/entities/adminTool/page";
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'featured',
template: `
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
<!-- <div class="uk-padding-small uk-padding-remove-horizontal">-->
<!-- <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>-->
<!-- </div>-->
<div *ngIf="breadcrumbs" class="uk-padding-small uk-padding-remove-horizontal">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
<html-page [description]="page ? page.name : 'Featured'" [pageTitle]="page ? page.name : 'Featured'"></html-page>
</div>
`
})
export class FeaturedPageComponent {
// public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about - National Bulletins'}];
public breadcrumbs: Breadcrumb[];
public page: Page;
subs: Subscription[] = [];
constructor(private config: ConfigurationService, private _router: Router) {
constructor(private config: ConfigurationService, private _router: Router, private route: ActivatedRoute) {
}
ngOnInit() {
this.subs.push(this.route.data.subscribe(data => {
if(data?.breadcrumbs) {
this.breadcrumbs = data.breadcrumbs;
}
}))
this.subs.push(this.config.communityInformationState.subscribe((portal: Portal) => {
if (portal) {
let pages: Page[] = <Page[]>portal.pages;

9
src/app/learn-how/learn-how.component.ts
View File

@ -189,8 +189,13 @@ import {QuickContactService} from '../openaireLibrary/sharedComponents/quick-con
<div>Manage statistical numbers & charts that will be displayed in the community overview and graph analysis views.</div>
</div>
</div>
<div class="mid">
<img src="assets/connect-assets/about/placeholder-img.png" alt="">
<div class="mid uk-flex uk-flex-middle">
<div class="uk-position-relative">
<img class="uk-position-center uk-position-z-index uk-position-absolute" src="assets/connect-assets/home/tablet.png" alt="ipad"
loading="lazy"
style="width: 100%;">
<img src="assets/connect-assets/home/3.png" alt="">
</div>
</div>
<div class="right">
<div class="right-text uk-margin-medium-bottom uk-padding uk-margin-right-left uk-padding-remove-left">