Change faws with helptext. Change dev apis urls. Update libraries

This commit is contained in:
Konstantinos Triantafyllou 2022-10-21 17:11:16 +03:00
parent 46ca9b68dd
commit fb8c7c8ab6
11 changed files with 39 additions and 43 deletions

View File

@ -31,8 +31,8 @@ const routes: Routes = [
loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule) loadChildren: () => import('./get-started/get-started.module').then(m => m.GetStartedModule)
}, },
{ {
path: 'faq', path: 'faqs',
loadChildren: () => import('./faq/faq.module').then(m => m.FaqModule), loadChildren: () => import('./faqs/faqs.module').then(m => m.FaqsModule),
canLoad: [isDevelopmentGuard] canLoad: [isDevelopmentGuard]
}, },
{ {

View File

@ -1,10 +0,0 @@
<div class="uk-background-muted">
<div class="uk-container uk-container-large uk-section uk-section-small">
<div class="uk-padding-small uk-padding-remove-horizontal">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
<div class="uk-text-center" uk-scrollspy-class>
<h1 class="uk-margin-medium-top uk-margin-medium-bottom">Frequently Asked <br> Questions<span class="uk-text-primary">.</span></h1>
</div>
</div>
</div>

View File

@ -2,12 +2,12 @@ import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {FaqComponent} from "./faq.component"; import {FaqsComponent} from "./faqs.component";
@NgModule({ @NgModule({
imports: [ imports: [
RouterModule.forChild([ RouterModule.forChild([
{ path: '', component: FaqComponent, canDeactivate: [PreviousRouteRecorder] } { path: '', component: FaqsComponent, canDeactivate: [PreviousRouteRecorder] }
]) ])
] ]
}) })

View File

@ -0,0 +1,12 @@
<div class="uk-background-muted">
<div class="uk-container uk-container-large uk-section uk-section-small">
<div class="uk-padding-small uk-padding-remove-horizontal">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
<div class="uk-text-center" uk-scrollspy-class>
<h1 class="uk-margin-medium-top uk-margin-medium-bottom">Frequently Asked <br> Questions<span
class="uk-text-primary">.</span></h1>
</div>
</div>
</div>
<helper *ngIf="pageContents" [texts]="pageContents.top"></helper>

View File

@ -10,17 +10,17 @@ import {Subscriber} from "rxjs";
import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component'; import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
@Component({ @Component({
selector: 'faq', selector: 'faqs',
templateUrl: 'faq.component.html' templateUrl: 'faqs.component.html'
}) })
export class FaqComponent { export class FaqsComponent {
public pageContents = null; public pageContents = null;
public divContents = null; public divContents = null;
public url: string = null; public url: string = null;
public pageTitle: string = "OpenAIRE - Monitor | FAQ"; public pageTitle: string = "OpenAIRE - Monitor | FAQs";
public description: string = "OpenAIRE - Monitor | FAQ"; public description: string = "OpenAIRE - Monitor | FAQs";
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'FAQ'}]; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'FAQs'}];
public properties: EnvProperties = properties; public properties: EnvProperties = properties;
subscriptions = []; subscriptions = [];
@ -44,7 +44,7 @@ export class FaqComponent {
this.updateTitle(this.pageTitle); this.updateTitle(this.pageTitle);
this.updateDescription(this.description); this.updateDescription(this.description);
//this.getDivContents(); //this.getDivContents();
//this.getPageContents(); this.getPageContents();
} }
private getPageContents() { private getPageContents() {

View File

@ -4,7 +4,7 @@ import {RouterModule} from '@angular/router';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service'; import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
import {FaqComponent} from "./faq.component"; import {FaqsComponent} from "./faqs.component";
import {FaqRoutingModule} from "./faq-routing.module"; import {FaqRoutingModule} from "./faq-routing.module";
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module"; import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
@ -18,13 +18,13 @@ import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, IconsModule Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, IconsModule
], ],
declarations: [ declarations: [
FaqComponent FaqsComponent
], ],
exports: [ exports: [
FaqComponent FaqsComponent
], ],
providers:[ providers:[
PreviousRouteRecorder, PiwikService PreviousRouteRecorder, PiwikService
] ]
}) })
export class FaqModule { } export class FaqsModule { }

View File

@ -260,10 +260,10 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
this.sort(this.stakeholders); this.sort(this.stakeholders);
this.stakeholders = this.publicStakeholders.concat(this.privateStakeholders); this.stakeholders = this.publicStakeholders.concat(this.privateStakeholders);
this.stakeholdersSlider = { this.stakeholdersSlider = {
stakeholders: this.slider(this.stakeholders), stakeholders: this.stakeholderSlider(this.stakeholders),
funders: this.slider(this.funders), funders: this.stakeholderSlider(this.funders),
ris: this.slider(this.ris), ris: this.stakeholderSlider(this.ris),
organizations: this.slider(this.organizations) organizations: this.stakeholderSlider(this.organizations)
}; };
} }
this.loading = false; this.loading = false;
@ -287,7 +287,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit, IDeactiv
}) })
} }
public slider(stakeholders: StakeholderInfo[], size: number = 6): StakeholderInfo[][] { public stakeholderSlider(stakeholders: StakeholderInfo[], size: number = 6): StakeholderInfo[][] {
let slider: StakeholderInfo[][] = []; let slider: StakeholderInfo[][] = [];
for (let i = 0; i < (stakeholders.length / size); i++) { for (let i = 0; i < (stakeholders.length / size); i++) {
slider.push(stakeholders.slice(i * size, ((i + 1) * size))); slider.push(stakeholders.slice(i * size, ((i + 1) * size)));

View File

@ -18,12 +18,9 @@ import {RefineFieldResultsServiceModule} from "../openaireLibrary/services/refin
import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module";
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module"; import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module"; import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
import {lock} from "../openaireLibrary/utils/icons/icons";
import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module"; import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module";
import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module"; import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
import {SectionScrollModule} from '../openaireLibrary/utils/section-scroll/section-scroll.module'; import {SectionScrollModule} from '../openaireLibrary/utils/section-scroll/section-scroll.module';
import {TabsModule} from '../openaireLibrary/utils/tabs/tabs.module';
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module"; import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.module"; import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.module";
@ -31,8 +28,7 @@ import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.
imports: [ imports: [
CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule, CommonModule, FormsModule, RouterModule, ErrorMessagesModule, OtherPortalsModule,
HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule, HelperModule, Schema2jsonldModule, SEOServiceModule, HomeRoutingModule, SearchResearchResultsServiceModule,
RefineFieldResultsServiceModule, AlertModalModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, SectionScrollModule, RefineFieldResultsServiceModule, AlertModalModule, IconsModule, UrlPrefixModule, LogoUrlPipeModule, SectionScrollModule, LoadingModule, BrowseStakeholderModule
TabsModule, LoadingModule, BrowseStakeholderModule
], ],
declarations: [ declarations: [
HomeComponent HomeComponent
@ -46,7 +42,5 @@ import {BrowseStakeholderModule} from "../browse-stakeholder/browse-stakeholder.
] ]
}) })
export class HomeModule { export class HomeModule {
constructor(private iconsService: IconsService) { constructor() {}
this.iconsService.registerIcons([lock])
}
} }

@ -1 +1 @@
Subproject commit ada4017fe56e3c6d1465319173259bbfe149da8d Subproject commit 0069e499bf46fcc32514ca4187c7e46755159381

@ -1 +1 @@
Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd Subproject commit 1866a893c6b467f5e26a9659e37acaf4071a7f6c

View File

@ -39,9 +39,9 @@ export let properties: EnvProperties = {
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "298", piwikSiteId: "298",
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/', registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login", loginUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo", userInfoUrl: "http://mpagasas.di.uoa.gr:19080/login-service/userInfo",
logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout", logoutUrl: "http://mpagasas.di.uoa.gr:19080/login-service/openid_logout",
cookieDomain: ".di.uoa.gr", cookieDomain: ".di.uoa.gr",
feedbackmail: "openaire.test@gmail.com", feedbackmail: "openaire.test@gmail.com",
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=", cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",