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

[Connect | Trunk]: Add FAQs page. Add breadcrumbs to all pages. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@58548 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-04-24 16:33:03 +00:00
parent 85b3051c5c
commit 1796453bb7
10 changed files with 102 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ const routes: Routes = [
{ path: 'about', redirectTo: 'about/learn-how', pathMatch: 'full'},
{ path: 'about/learn-how', loadChildren: './learn-how/learn-how.module#LearnHowModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'about/learn-in-depth', loadChildren: './learn-how/learnInDepth/learn-in-depth.module#LearnInDepthModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'about/faq', loadChildren: './learn-how/faqs/faqs.module#FaqsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'contact-us', loadChildren: './contact/contact.module#ContactModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'invite', loadChildren: './utils/subscribe/invite/invite.module#InviteModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
{ path: 'content', loadChildren: './content/contentPage.module#ContentPageModule', resolve: { envSpecific: EnvironmentSpecificResolver }},

14
src/app/communities/browseCommunity/browse-community.component.html
View File

@ -1,12 +1,22 @@
<div class="uk-container line-height-normal uk-text-small" *ngIf="community">
<div *ngIf="community.status =='manager'"
<div class="badges">
<div *ngIf="community.isSubscribed"
class="portal-card-badge uk-text-center">
<span>Subscribed</span>
</div>
<div *ngIf="community.status == 'manager'"
class="private-card-badge uk-text-center ">
<span>Private</span>
</div>
</div>
<!--<div *ngIf="community.status =='manager'"
class="uk-card-badge private-card-badge uk-width-1-3 uk-position-top-left uk-text-small uk-text-center">
Private
</div>
<div *ngIf="community.isSubscribed"
class="uk-position-top-right uk-card-badge portal-card-badge uk-width-1-2 uk-text-small uk-text-center">
<span>Subscribed</span>
</div>
</div>-->
<div class="uk-card-media-top uk-padding uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle">
<a *ngIf="directLink" [href]="getCommunityPageUrl()" target="_blank">
<div class="community">

17
src/app/learn-how/faqs/faqs-routing.module.ts Normal file
View File

@ -0,0 +1,17 @@
import {NgModule} from '@angular/core';
import {RouterModule} from '@angular/router';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {FaqsComponent} from "./faqs.component";
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
@NgModule({
imports: [
RouterModule.forChild([
{ path: '', component: FaqsComponent, canActivate: [FreeGuard, IsRouteEnabled], canDeactivate: [PreviousRouteRecorder] }
])
]
})
export class FaqsRoutingModule { }

23
src/app/learn-how/faqs/faqs.component.ts Normal file
View File

@ -0,0 +1,23 @@
import {Component} from '@angular/core';
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'learn-in-depth',
template: `
<div class="image-front-topbar"
uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"
tm-header-transparent="light" tm-header-transparent-placeholder="">
<div class="uk-section uk-background-norepeat uk-section-overlap uk-padding-remove-bottom">
<div class="uk-container uk-container-large uk-section uk-padding-remove-bottom uk-margin-medium-top">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
</div>
<html-page [pageTitle]="pageTitle" [description]="pageDescription"></html-page>
</div>
`
})
export class FaqsComponent {
public pageTitle: string = "OpenAIRE - Connect | FAQs";
public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community";
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'FAQs'}];
}

33
src/app/learn-how/faqs/faqs.module.ts Normal file
View File

@ -0,0 +1,33 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {RouterModule} from '@angular/router';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {PiwikService} from '../../openaireLibrary/utils/piwik/piwik.service';
import {FaqsComponent} from "./faqs.component";
import {FaqsRoutingModule} from "./faqs-routing.module";
import {HelperModule} from "../../openaireLibrary/utils/helper/helper.module";
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
import {Schema2jsonldModule} from "../../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {SEOServiceModule} from "../../openaireLibrary/sharedComponents/SEO/SEOService.module";
import {BreadcrumbsModule} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
import {HtmlPagesModule} from "../../htmlPages/htmlPages.module";
@NgModule({
imports: [
CommonModule, RouterModule, FaqsRoutingModule, HelperModule,
Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, HtmlPagesModule
],
declarations: [
FaqsComponent
],
exports: [
FaqsComponent
],
providers:[
FreeGuard, PreviousRouteRecorder, PiwikService, IsRouteEnabled
]
})
export class FaqsModule { }

6
src/app/my-communities/my-communities.component.html
View File

@ -6,8 +6,10 @@
class="banner-background image-front-topbar uk-section uk-background-norepeat uk-background-bottom-center uk-background-cover uk-section-secondary uk-section-overlap uk-position-relative uk-preserve-color"
uk-scrollspy="{&quot;target&quot;:&quot;[uk-scrollspy-class]&quot;,&quot;cls&quot;:&quot;uk-animation-fade&quot;,&quot;delay&quot;:false}"
tm-header-transparent="light" tm-header-transparent-placeholder="">
<div class=" uk-section uk-padding-remove-bottom">
<div class="uk-position-cover"></div>
<div class="uk-section uk-padding-remove-bottom">
<div class="uk-container uk-container-large uk-margin-small-top">
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div>
<div class="uk-position-relative uk-panel">
<div *ngIf="loading" class="uk-container uk-container-large uk-height-large">
<div class="uk-animation-fade uk-margin-top uk-width-1-1" role="alert"><span

2
src/app/my-communities/my-communities.component.ts
View File

@ -15,6 +15,7 @@ import {ErrorMessagesComponent} from '../openaireLibrary/utils/errorMessages.com
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'my-communities',
@ -36,6 +37,7 @@ export class MyCommunitiesComponent {
public subscriberErrorMessage: string = "";
public errorCodes: ErrorCodes;
private errorMessages: ErrorMessagesComponent;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'my Communities'}];
properties: EnvProperties;
private user: User;

3
src/app/my-communities/my-communities.module.ts
View File

@ -16,12 +16,13 @@ import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
import {BrowseCommunityModule} from "../communities/browseCommunity/browse-community.module";
import {MyCommunitiesRoutingModule} from "./my-communities-routing.module";
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
@NgModule({
imports: [
CommonModule, FormsModule, RouterModule, HelperModule,
ManageModule, ErrorMessagesModule, BrowseCommunityModule, Schema2jsonldModule, SEOServiceModule,
MyCommunitiesRoutingModule
MyCommunitiesRoutingModule, BreadcrumbsModule
],
declarations: [
MyCommunitiesComponent

5
src/app/searchPages/communities/searchCommunities.component.ts
View File

@ -14,6 +14,7 @@ import {SubscribeService} from "../../openaireLibrary/utils/subscribe/subscribe.
import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
import {HelperFunctions} from "../../openaireLibrary/utils/HelperFunctions.class";
import {UserManagementService} from "../../openaireLibrary/services/user-management.service";
import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'search-communities',
@ -21,12 +22,13 @@ import {UserManagementService} from "../../openaireLibrary/services/user-managem
<search-page pageTitle="OpenAIRE-Connect | Search Communities"
[hasPrefix]=false [piwikSiteId]="piwikSiteId"
searchFormClass="communitiesSearchForm"
[formPlaceholderText]="'Search for Research Communities' + ((showType)?' and Initiatives':'')"
[formPlaceholderText]="'Search for Research Gateways…'"
type="communities" entityType="community" [filters]="filters"
[results]="results" [searchUtils]="searchUtils"
[showResultCount]=true [baseUrl]="baseUrl"
[disableForms]="disableForms"
[lastIndex]=false [sort]=true
[breadcrumbs]="breadcrumbs"
[showType]="showType">
</search-page>
`
@ -45,6 +47,7 @@ export class SearchCommunitiesComponent {
public baseUrl: string = null;
public refineFields: string[] = this.searchFields.COMMUNITIES_SEARCH_FIELDS;
public showType = false;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'communities'}];
properties:EnvProperties;
@ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
private user: User;

6
src/assets/connect-custom.css
View File

@ -88,7 +88,9 @@
}
.communityCard {
box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
box-shadow: 0 1px 3px #00000029;
border-radius: 2px;
padding: 20px;
}
.rc-label {
@ -102,7 +104,7 @@
.searchForm, .communitiesSearchForm {
background: linear-gradient(145deg, rgba(255, 255, 255, 1) 0%, rgba(160, 193, 242, 1) 100%);
background: transparent linear-gradient(0deg, #FAFAFA 0%, #E2EEFA 100%);
}
.generalSearchForm,