From f4482c710c56adbeeb7ec9a5b8586aa76e280540 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Thu, 18 Oct 2018 16:48:17 +0200 Subject: [PATCH 01/32] 55959: Add subcommunities on community page --- resources/i18n/en.json | 5 ++ .../community-page.component.html | 1 + .../+community-page/community-page.module.ts | 2 + ...ty-page-sub-collection-list.component.html | 2 +- ...ity-page-sub-community-list.component.html | 15 ++++ ...ity-page-sub-community-list.component.scss | 1 + ...-page-sub-community-list.component.spec.ts | 78 +++++++++++++++++++ ...unity-page-sub-community-list.component.ts | 23 ++++++ src/app/core/shared/community.model.ts | 2 +- 9 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html create mode 100644 src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss create mode 100644 src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts create mode 100644 src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index b6a23068d7..d084728fde 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -22,6 +22,9 @@ }, "sub-collection-list": { "head": "Collections of this Community" + }, + "sub-community-list": { + "head": "Communities of this Community" } }, "item": { @@ -209,6 +212,7 @@ "community": "Loading community...", "collection": "Loading collection...", "sub-collections": "Loading sub-collections...", + "sub-communities": "Loading sub-communities...", "recent-submissions": "Loading recent submissions...", "item": "Loading item...", "objects": "Loading...", @@ -221,6 +225,7 @@ "community": "Error fetching community", "collection": "Error fetching collection", "sub-collections": "Error fetching sub-collections", + "sub-communities": "Error fetching sub-communities", "recent-submissions": "Error fetching recent submissions", "item": "Error fetching item", "objects": "Error fetching objects", diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html index 637e37af0c..a86a86c3da 100644 --- a/src/app/+community-page/community-page.component.html +++ b/src/app/+community-page/community-page.component.html @@ -24,6 +24,7 @@ [content]="communityPayload.copyrightText" [hasInnerHtml]="true"> + diff --git a/src/app/+community-page/community-page.module.ts b/src/app/+community-page/community-page.module.ts index e00c3910c5..d7f97755c2 100644 --- a/src/app/+community-page/community-page.module.ts +++ b/src/app/+community-page/community-page.module.ts @@ -6,6 +6,7 @@ import { SharedModule } from '../shared/shared.module'; import { CommunityPageComponent } from './community-page.component'; import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component'; import { CommunityPageRoutingModule } from './community-page-routing.module'; +import {CommunityPageSubCommunityListComponent} from './sub-community-list/community-page-sub-community-list.component'; @NgModule({ imports: [ @@ -16,6 +17,7 @@ import { CommunityPageRoutingModule } from './community-page-routing.module'; declarations: [ CommunityPageComponent, CommunityPageSubCollectionListComponent, + CommunityPageSubCommunityListComponent, ] }) export class CommunityPageModule { diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html index 12c2578d9c..9156a99b18 100644 --- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html +++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html @@ -1,5 +1,5 @@ -
+

{{'community.sub-collection-list.head' | translate}}

  • diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html new file mode 100644 index 0000000000..6cd62ba48d --- /dev/null +++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html @@ -0,0 +1,15 @@ + +
    +

    {{'community.sub-community-list.head' | translate}}

    + +
    + + +     diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss new file mode 100644 index 0000000000..50be6f5ad0 --- /dev/null +++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.scss @@ -0,0 +1 @@ +@import '../../../styles/variables.scss'; diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts new file mode 100644 index 0000000000..b4203eb11a --- /dev/null +++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts @@ -0,0 +1,78 @@ +import {async, ComponentFixture, TestBed} from '@angular/core/testing'; +import {TranslateModule} from '@ngx-translate/core'; +import {NO_ERRORS_SCHEMA} from '@angular/core'; +import {CommunityPageSubCommunityListComponent} from './community-page-sub-community-list.component'; +import {Community} from '../../core/shared/community.model'; +import {Observable} from 'rxjs/Observable'; +import {RemoteData} from '../../core/data/remote-data'; +import {PaginatedList} from '../../core/data/paginated-list'; +import 'rxjs/add/observable/of'; +import {PageInfo} from '../../core/shared/page-info.model'; +import {SharedModule} from '../../shared/shared.module'; +import {RouterTestingModule} from '@angular/router/testing'; +import {NoopAnimationsModule} from '@angular/platform-browser/animations'; +import {By} from '@angular/platform-browser'; + +describe('SubCommunityList Component', () => { + let comp: CommunityPageSubCommunityListComponent; + let fixture: ComponentFixture; + + const subcommunities = [Object.assign(new Community(), { + name: 'SubCommunity 1', + id: '123456789-1', + metadata: [ + { + key: 'dc.title', + language: 'en_US', + value: 'SubCommunity 1' + }] + }), + Object.assign(new Community(), { + name: 'SubCommunity 2', + id: '123456789-2', + metadata: [ + { + key: 'dc.title', + language: 'en_US', + value: 'SubCommunity 2' + }] + }) + ]; + + const mockCommunity = Object.assign(new Community(), { + metadata: [ + { + key: 'dc.title', + language: 'en_US', + value: 'Test title' + }], + subcommunities: Observable.of(new RemoteData(true, true, true, + undefined, new PaginatedList(new PageInfo(), subcommunities))) + }) + ; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), SharedModule, + RouterTestingModule.withRoutes([]), + NoopAnimationsModule], + declarations: [CommunityPageSubCommunityListComponent], + schemas: [NO_ERRORS_SCHEMA] + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent); + comp = fixture.componentInstance; + }); + + it('should display a list of subCommunities', () => { + comp.community = mockCommunity; + fixture.detectChanges(); + + const subComList = fixture.debugElement.queryAll(By.css('li')); + expect(subComList.length).toEqual(2); + expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1'); + expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2'); + }); +}); diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts new file mode 100644 index 0000000000..da6135040c --- /dev/null +++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts @@ -0,0 +1,23 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; + +import { RemoteData } from '../../core/data/remote-data'; +import { Community } from '../../core/shared/community.model'; + +import { fadeIn } from '../../shared/animations/fade'; +import { PaginatedList } from '../../core/data/paginated-list'; + +@Component({ + selector: 'ds-community-page-sub-community-list', + styleUrls: ['./community-page-sub-community-list.component.scss'], + templateUrl: './community-page-sub-community-list.component.html', + animations:[fadeIn] +}) +export class CommunityPageSubCommunityListComponent implements OnInit { + @Input() community: Community; + subCommunitiesRDObs: Observable>>; + + ngOnInit(): void { + this.subCommunitiesRDObs = this.community.subcommunities; + } +} diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts index 20bd50f4a9..d90742fa00 100644 --- a/src/app/core/shared/community.model.ts +++ b/src/app/core/shared/community.model.ts @@ -61,6 +61,6 @@ export class Community extends DSpaceObject { collections: Observable>>; - subcommunities: Observable>>; + subcommunities: Observable>>; } From 44c227ffff052225ad88990fe0c22d00b4cfed38 Mon Sep 17 00:00:00 2001 From: Yana De Pauw Date: Fri, 26 Oct 2018 10:55:27 +0200 Subject: [PATCH 02/32] 55959: Add additional test when no subcommunities When the subcommunity list is empty, the subcommunity section should be hidden. --- ...-page-sub-community-list.component.spec.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts index b4203eb11a..a3efc2ebc5 100644 --- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts +++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts @@ -39,6 +39,17 @@ describe('SubCommunityList Component', () => { }) ]; + const emptySubCommunitiesCommunity = Object.assign(new Community(), { + metadata: [ + { + key: 'dc.title', + language: 'en_US', + value: 'Test title' + }], + subcommunities: Observable.of(new RemoteData(true, true, true, + undefined, new PaginatedList(new PageInfo(), []))) + }); + const mockCommunity = Object.assign(new Community(), { metadata: [ { @@ -75,4 +86,12 @@ describe('SubCommunityList Component', () => { expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1'); expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2'); }); + + it('should not display the header when subCommunities are empty', () => { + comp.community = emptySubCommunitiesCommunity; + fixture.detectChanges(); + + const subComHead = fixture.debugElement.queryAll(By.css('h2')); + expect(subComHead.length).toEqual(0); + }); }); From 67619a2ba56296e36b8e09d5560dea85f4e3dfb0 Mon Sep 17 00:00:00 2001 From: Bram Luyten Date: Wed, 31 Oct 2018 23:06:38 +0100 Subject: [PATCH 03/32] issue 323 comcol page logo bottom padding --- .../shared/comcol-page-logo/comcol-page-logo.component.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/shared/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol-page-logo/comcol-page-logo.component.scss index ad84b72f8c..ea0ae377b3 100644 --- a/src/app/shared/comcol-page-logo/comcol-page-logo.component.scss +++ b/src/app/shared/comcol-page-logo/comcol-page-logo.component.scss @@ -1 +1,5 @@ -@import '../../../styles/variables.scss'; \ No newline at end of file +@import '../../../styles/variables.scss'; + +.dso-logo { + padding-bottom: 1em; +} From 2af1d3b0421cab2f72a566261d2119ad8dc5cc99 Mon Sep 17 00:00:00 2001 From: lotte Date: Mon, 5 Nov 2018 16:34:03 +0100 Subject: [PATCH 04/32] 57053: started on menu --- resources/images/dspace-logo.svg | 37 +++++++++++++++ src/app/app.component.html | 1 + src/app/app.component.scss | 5 ++ src/app/app.effects.ts | 5 +- src/app/app.module.ts | 2 + src/app/app.reducer.ts | 12 +++-- src/app/header/header.component.html | 22 +++------ src/app/header/header.component.scss | 15 ++---- src/app/header/header.component.ts | 31 +------------ .../navbar.actions.ts} | 28 +++++------ src/app/navbar/navbar.component.html | 46 +++++++++++++++++++ src/app/navbar/navbar.component.scss | 18 ++++++++ .../navbar.component.spec.ts} | 28 +++++------ src/app/navbar/navbar.component.ts | 34 ++++++++++++++ .../navbar.effects.spec.ts} | 20 ++++---- .../navbar.effects.ts} | 8 ++-- .../navbar.reducer.spec.ts} | 42 ++++++++--------- .../navbar.reducer.ts} | 14 +++--- .../auth-nav-menu.component.html | 6 +-- src/styles/_custom_variables.scss | 4 ++ 20 files changed, 237 insertions(+), 141 deletions(-) create mode 100644 resources/images/dspace-logo.svg rename src/app/{header/header.actions.ts => navbar/navbar.actions.ts} (52%) create mode 100644 src/app/navbar/navbar.component.html create mode 100644 src/app/navbar/navbar.component.scss rename src/app/{header/header.component.spec.ts => navbar/navbar.component.spec.ts} (74%) create mode 100644 src/app/navbar/navbar.component.ts rename src/app/{header/header.effects.spec.ts => navbar/navbar.effects.spec.ts} (66%) rename src/app/{header/header.effects.ts => navbar/navbar.effects.ts} (71%) rename src/app/{header/header.reducer.spec.ts => navbar/navbar.reducer.spec.ts} (65%) rename src/app/{header/header.reducer.ts => navbar/navbar.reducer.ts} (54%) diff --git a/resources/images/dspace-logo.svg b/resources/images/dspace-logo.svg new file mode 100644 index 0000000000..60df1ed46d --- /dev/null +++ b/resources/images/dspace-logo.svg @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/src/app/app.component.html b/src/app/app.component.html index 95db61ab5a..24ce6dc843 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,7 @@
    + diff --git a/src/app/app.component.scss b/src/app/app.component.scss index e4c51ae37b..1b2a21b0c6 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -28,7 +28,12 @@ body { } .main-content { + z-index: $main-z-index; flex: 1 0 auto; margin-top: $content-spacing; margin-bottom: $content-spacing; } + +ds-navbar { + z-index: $nav-z-index; +} diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts index 6a53d7b619..3ee483ccba 100644 --- a/src/app/app.effects.ts +++ b/src/app/app.effects.ts @@ -1,10 +1,9 @@ - -import { HeaderEffects } from './header/header.effects'; import { StoreEffects } from './store.effects'; import { NotificationsEffects } from './shared/notifications/notifications.effects'; +import { NavbarEffects } from './navbar/navbar.effects'; export const appEffects = [ StoreEffects, - HeaderEffects, + NavbarEffects, NotificationsEffects ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 528c84fd3b..987ce77dd1 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -31,6 +31,7 @@ import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-s import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component'; import { NotificationComponent } from './shared/notifications/notification/notification.component'; import { SharedModule } from './shared/shared.module'; +import { NavbarComponent } from './navbar/navbar.component'; export function getConfig() { return ENV_CONFIG; @@ -87,6 +88,7 @@ if (!ENV_CONFIG.production) { declarations: [ AppComponent, HeaderComponent, + NavbarComponent, FooterComponent, PageNotFoundComponent, NotificationComponent, diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts index 8dc82dfb6f..6bdb1a1f58 100644 --- a/src/app/app.reducer.ts +++ b/src/app/app.reducer.ts @@ -1,7 +1,5 @@ import { ActionReducerMap } from '@ngrx/store'; import * as fromRouter from '@ngrx/router-store'; - -import { headerReducer, HeaderState } from './header/header.reducer'; import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer'; import { formReducer, FormState } from './shared/form/form.reducer'; import { @@ -12,13 +10,17 @@ import { filterReducer, SearchFiltersState } from './+search-page/search-filters/search-filter/search-filter.reducer'; -import { notificationsReducer, NotificationsState } from './shared/notifications/notifications.reducers'; +import { + notificationsReducer, + NotificationsState +} from './shared/notifications/notifications.reducers'; import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer'; +import { navbarReducer, NavbarState } from './navbar/navbar.reducer'; export interface AppState { router: fromRouter.RouterReducerState; hostWindow: HostWindowState; - header: HeaderState; + navbar: NavbarState; forms: FormState; notifications: NotificationsState; searchSidebar: SearchSidebarState; @@ -29,7 +31,7 @@ export interface AppState { export const appReducers: ActionReducerMap = { router: fromRouter.routerReducer, hostWindow: hostWindowReducer, - header: headerReducer, + navbar: navbarReducer, forms: formReducer, notifications: notificationsReducer, searchSidebar: sidebarReducer, diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index f47696609c..22e2a307a5 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -1,18 +1,10 @@
    -
    diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 81f6a809bf..627ce93c6c 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -1,14 +1,5 @@ @import '../../styles/variables.scss'; -header nav.navbar { - border-radius: 0; -} - -header nav.navbar .navbar-toggler:hover { - cursor: pointer; -} - -header nav.navbar .navbar-toggler .navbar-toggler-icon { - background-image: none !important; - line-height: 1.5; -} +.navbar-brand img { + height: $header-logo-height; +} \ No newline at end of file diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 93cb329f4f..8ccc779873 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,43 +1,16 @@ -import { Component, OnInit } from '@angular/core'; -import { createSelector, Store } from '@ngrx/store'; +import { Component } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { RouterReducerState } from '@ngrx/router-store'; - -import { HeaderState } from './header.reducer'; -import { HeaderToggleAction } from './header.actions'; -import { AppState } from '../app.reducer'; -import { HostWindowService } from '../shared/host-window.service'; - -const headerStateSelector = (state: AppState) => state.header; -const navCollapsedSelector = createSelector(headerStateSelector, (header: HeaderState) => header.navCollapsed); @Component({ selector: 'ds-header', styleUrls: ['header.component.scss'], templateUrl: 'header.component.html', }) -export class HeaderComponent implements OnInit { +export class HeaderComponent { /** * Whether user is authenticated. * @type {Observable} */ public isAuthenticated: Observable; - public isNavBarCollapsed: Observable; public showAuth = false; - - constructor( - private store: Store, - private windowService: HostWindowService - ) { - } - - ngOnInit(): void { - // set loading - this.isNavBarCollapsed = this.store.select(navCollapsedSelector); - } - - public toggle(): void { - this.store.dispatch(new HeaderToggleAction()); - } - } diff --git a/src/app/header/header.actions.ts b/src/app/navbar/navbar.actions.ts similarity index 52% rename from src/app/header/header.actions.ts rename to src/app/navbar/navbar.actions.ts index 7176474a4a..c588c41f0c 100644 --- a/src/app/header/header.actions.ts +++ b/src/app/navbar/navbar.actions.ts @@ -10,23 +10,23 @@ import { type } from '../shared/ngrx/type'; * literal types and runs a simple check to guarantee all * action types in the application are unique. */ -export const HeaderActionTypes = { - COLLAPSE: type('dspace/header/COLLAPSE'), - EXPAND: type('dspace/header/EXPAND'), - TOGGLE: type('dspace/header/TOGGLE') +export const NavbarActionTypes = { + COLLAPSE: type('dspace/navbar/COLLAPSE'), + EXPAND: type('dspace/navbar/EXPAND'), + TOGGLE: type('dspace/navbar/TOGGLE') }; /* tslint:disable:max-classes-per-file */ -export class HeaderCollapseAction implements Action { - type = HeaderActionTypes.COLLAPSE; +export class NavbarCollapseAction implements Action { + type = NavbarActionTypes.COLLAPSE; } -export class HeaderExpandAction implements Action { - type = HeaderActionTypes.EXPAND; +export class NavbarExpandAction implements Action { + type = NavbarActionTypes.EXPAND; } -export class HeaderToggleAction implements Action { - type = HeaderActionTypes.TOGGLE; +export class NavbarToggleAction implements Action { + type = NavbarActionTypes.TOGGLE; } /* tslint:enable:max-classes-per-file */ @@ -34,7 +34,7 @@ export class HeaderToggleAction implements Action { * Export a type alias of all actions in this action group * so that reducers can easily compose action types */ -export type HeaderAction - = HeaderCollapseAction - | HeaderExpandAction - | HeaderToggleAction +export type NavbarAction + = NavbarCollapseAction + | NavbarExpandAction + | NavbarToggleAction diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html new file mode 100644 index 0000000000..7c4de41098 --- /dev/null +++ b/src/app/navbar/navbar.component.html @@ -0,0 +1,46 @@ + diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss new file mode 100644 index 0000000000..10e97834f3 --- /dev/null +++ b/src/app/navbar/navbar.component.scss @@ -0,0 +1,18 @@ +@import '../../styles/variables.scss'; + +nav.navbar { + border-bottom: 1px $gray-400 solid; +} + +nav.navbar .navbar-toggler .navbar-toggler-icon { + background-image: none !important; + line-height: 1.5; +} + +.dropdown-menu { + min-width: 100%; +} +.reset-padding { + margin-left: -$spacer/2; + margin-right: -$spacer/2; +} \ No newline at end of file diff --git a/src/app/header/header.component.spec.ts b/src/app/navbar/navbar.component.spec.ts similarity index 74% rename from src/app/header/header.component.spec.ts rename to src/app/navbar/navbar.component.spec.ts index 9d0dd04e40..0a0ed43716 100644 --- a/src/app/header/header.component.spec.ts +++ b/src/app/navbar/navbar.component.spec.ts @@ -1,4 +1,4 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Store, StoreModule } from '@ngrx/store'; import { TranslateModule } from '@ngx-translate/core'; @@ -6,13 +6,7 @@ import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { Observable } from 'rxjs/Observable'; -import { HeaderComponent } from './header.component'; -import { HeaderState } from './header.reducer'; -import { HeaderToggleAction } from './header.actions'; -import { AuthNavMenuComponent } from '../shared/auth-nav-menu/auth-nav-menu.component'; -import { LogInComponent } from '../shared/log-in/log-in.component'; -import { LogOutComponent } from '../shared/log-out/log-out.component'; -import { LoadingComponent } from '../shared/loading/loading.component'; +import { NavbarComponent } from './navbar.component'; import { ReactiveFormsModule } from '@angular/forms'; import { HostWindowService } from '../shared/host-window.service'; import { HostWindowServiceStub } from '../shared/testing/host-window-service-stub'; @@ -20,12 +14,14 @@ import { RouterStub } from '../shared/testing/router-stub'; import { Router } from '@angular/router'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { NavbarState } from './navbar.reducer'; +import { NavbarToggleAction } from './navbar.actions'; -let comp: HeaderComponent; -let fixture: ComponentFixture; -let store: Store; +let comp: NavbarComponent; +let fixture: ComponentFixture; +let store: Store; -describe('HeaderComponent', () => { +describe('NavbarComponent', () => { // async beforeEach beforeEach(async(() => { @@ -36,7 +32,7 @@ describe('HeaderComponent', () => { NgbCollapseModule.forRoot(), NoopAnimationsModule, ReactiveFormsModule], - declarations: [HeaderComponent], + declarations: [NavbarComponent], providers: [ { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }, { provide: Router, useClass: RouterStub }, @@ -48,7 +44,7 @@ describe('HeaderComponent', () => { // synchronous beforeEach beforeEach(() => { - fixture = TestBed.createComponent(HeaderComponent); + fixture = TestBed.createComponent(NavbarComponent); comp = fixture.componentInstance; @@ -63,8 +59,8 @@ describe('HeaderComponent', () => { navbarToggler.triggerEventHandler('click', null); }); - it('should dispatch a HeaderToggleAction', () => { - expect(store.dispatch).toHaveBeenCalledWith(new HeaderToggleAction()); + it('should dispatch a NavbarToggleAction', () => { + expect(store.dispatch).toHaveBeenCalledWith(new NavbarToggleAction()); }); }); diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts new file mode 100644 index 0000000000..e1f8d0bb82 --- /dev/null +++ b/src/app/navbar/navbar.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; +import { createSelector, Store } from '@ngrx/store'; +import { Observable } from 'rxjs/Observable'; + +import { NavbarState } from './navbar.reducer'; +import { NavbarToggleAction } from './navbar.actions'; +import { AppState } from '../app.reducer'; + +const navbarStateSelector = (state: AppState) => state.navbar; +const navCollapsedSelector = createSelector(navbarStateSelector, (navbar: NavbarState) => navbar.navCollapsed); + +@Component({ + selector: 'ds-navbar', + styleUrls: ['navbar.component.scss'], + templateUrl: 'navbar.component.html', +}) +export class NavbarComponent implements OnInit { + public isNavBarCollapsed: Observable; + + constructor( + private store: Store, + ) { + } + + ngOnInit(): void { + // set loading + this.isNavBarCollapsed = this.store.select(navCollapsedSelector); + } + + public toggle(): void { + this.store.dispatch(new NavbarToggleAction()); + } + +} diff --git a/src/app/header/header.effects.spec.ts b/src/app/navbar/navbar.effects.spec.ts similarity index 66% rename from src/app/header/header.effects.spec.ts rename to src/app/navbar/navbar.effects.spec.ts index e67043dcba..261d24a850 100644 --- a/src/app/header/header.effects.spec.ts +++ b/src/app/navbar/navbar.effects.spec.ts @@ -1,26 +1,26 @@ import { TestBed } from '@angular/core/testing'; -import { HeaderEffects } from './header.effects'; -import { HeaderCollapseAction } from './header.actions'; +import { NavbarEffects } from './navbar.effects'; +import { NavbarCollapseAction } from './navbar.actions'; import { HostWindowResizeAction } from '../shared/host-window.actions'; import { Observable } from 'rxjs/Observable'; import { provideMockActions } from '@ngrx/effects/testing'; import { cold, hot } from 'jasmine-marbles'; import * as fromRouter from '@ngrx/router-store'; -describe('HeaderEffects', () => { - let headerEffects: HeaderEffects; +describe('NavbarEffects', () => { + let navbarEffects: NavbarEffects; let actions: Observable; beforeEach(() => { TestBed.configureTestingModule({ providers: [ - HeaderEffects, + NavbarEffects, provideMockActions(() => actions), // other providers ], }); - headerEffects = TestBed.get(HeaderEffects); + navbarEffects = TestBed.get(NavbarEffects); }); describe('resize$', () => { @@ -28,9 +28,9 @@ describe('HeaderEffects', () => { it('should return a COLLAPSE action in response to a RESIZE action', () => { actions = hot('--a-', { a: new HostWindowResizeAction(800, 600) }); - const expected = cold('--b-', { b: new HeaderCollapseAction() }); + const expected = cold('--b-', { b: new NavbarCollapseAction() }); - expect(headerEffects.resize$).toBeObservable(expected); + expect(navbarEffects.resize$).toBeObservable(expected); }); }); @@ -40,9 +40,9 @@ describe('HeaderEffects', () => { it('should return a COLLAPSE action in response to an UPDATE_LOCATION action', () => { actions = hot('--a-', { a: { type: fromRouter.ROUTER_NAVIGATION } }); - const expected = cold('--b-', { b: new HeaderCollapseAction() }); + const expected = cold('--b-', { b: new NavbarCollapseAction() }); - expect(headerEffects.routeChange$).toBeObservable(expected); + expect(navbarEffects.routeChange$).toBeObservable(expected); }); }); diff --git a/src/app/header/header.effects.ts b/src/app/navbar/navbar.effects.ts similarity index 71% rename from src/app/header/header.effects.ts rename to src/app/navbar/navbar.effects.ts index e1d281958b..bc6cf876e1 100644 --- a/src/app/header/header.effects.ts +++ b/src/app/navbar/navbar.effects.ts @@ -3,18 +3,18 @@ import { Effect, Actions } from '@ngrx/effects' import * as fromRouter from '@ngrx/router-store'; import { HostWindowActionTypes } from '../shared/host-window.actions'; -import { HeaderCollapseAction } from './header.actions'; +import { NavbarCollapseAction } from './navbar.actions'; @Injectable() -export class HeaderEffects { +export class NavbarEffects { @Effect() resize$ = this.actions$ .ofType(HostWindowActionTypes.RESIZE) - .map(() => new HeaderCollapseAction()); + .map(() => new NavbarCollapseAction()); @Effect() routeChange$ = this.actions$ .ofType(fromRouter.ROUTER_NAVIGATION) - .map(() => new HeaderCollapseAction()); + .map(() => new NavbarCollapseAction()); constructor(private actions$: Actions) { diff --git a/src/app/header/header.reducer.spec.ts b/src/app/navbar/navbar.reducer.spec.ts similarity index 65% rename from src/app/header/header.reducer.spec.ts rename to src/app/navbar/navbar.reducer.spec.ts index b2630ec960..b9afbd743e 100644 --- a/src/app/header/header.reducer.spec.ts +++ b/src/app/navbar/navbar.reducer.spec.ts @@ -1,13 +1,9 @@ import * as deepFreeze from 'deep-freeze'; -import { headerReducer } from './header.reducer'; -import { - HeaderCollapseAction, - HeaderExpandAction, - HeaderToggleAction -} from './header.actions'; +import { navbarReducer } from './navbar.reducer'; +import { NavbarCollapseAction, NavbarExpandAction, NavbarToggleAction } from './navbar.actions'; -class NullAction extends HeaderCollapseAction { +class NullAction extends NavbarCollapseAction { type = null; constructor() { @@ -15,18 +11,18 @@ class NullAction extends HeaderCollapseAction { } } -describe('headerReducer', () => { +describe('navbarReducer', () => { it('should return the current state when no valid actions have been made', () => { const state = { navCollapsed: false }; const action = new NullAction(); - const newState = headerReducer(state, action); + const newState = navbarReducer(state, action); expect(newState).toEqual(state); }); it('should start with navCollapsed = true', () => { const action = new NullAction(); - const initialState = headerReducer(undefined, action); + const initialState = navbarReducer(undefined, action); // The navigation starts collapsed expect(initialState.navCollapsed).toEqual(true); @@ -34,8 +30,8 @@ describe('headerReducer', () => { it('should set navCollapsed to true in response to the COLLAPSE action', () => { const state = { navCollapsed: false }; - const action = new HeaderCollapseAction(); - const newState = headerReducer(state, action); + const action = new NavbarCollapseAction(); + const newState = navbarReducer(state, action); expect(newState.navCollapsed).toEqual(true); }); @@ -44,8 +40,8 @@ describe('headerReducer', () => { const state = { navCollapsed: false }; deepFreeze(state); - const action = new HeaderCollapseAction(); - headerReducer(state, action); + const action = new NavbarCollapseAction(); + navbarReducer(state, action); // no expect required, deepFreeze will ensure an exception is thrown if the state // is mutated, and any uncaught exception will cause the test to fail @@ -53,8 +49,8 @@ describe('headerReducer', () => { it('should set navCollapsed to false in response to the EXPAND action', () => { const state = { navCollapsed: true }; - const action = new HeaderExpandAction(); - const newState = headerReducer(state, action); + const action = new NavbarExpandAction(); + const newState = navbarReducer(state, action); expect(newState.navCollapsed).toEqual(false); }); @@ -63,16 +59,16 @@ describe('headerReducer', () => { const state = { navCollapsed: true }; deepFreeze(state); - const action = new HeaderExpandAction(); - headerReducer(state, action); + const action = new NavbarExpandAction(); + navbarReducer(state, action); }); it('should flip the value of navCollapsed in response to the TOGGLE action', () => { const state1 = { navCollapsed: true }; - const action = new HeaderToggleAction(); + const action = new NavbarToggleAction(); - const state2 = headerReducer(state1, action); - const state3 = headerReducer(state2, action); + const state2 = navbarReducer(state1, action); + const state3 = navbarReducer(state2, action); expect(state2.navCollapsed).toEqual(false); expect(state3.navCollapsed).toEqual(true); @@ -82,8 +78,8 @@ describe('headerReducer', () => { const state = { navCollapsed: true }; deepFreeze(state); - const action = new HeaderToggleAction(); - headerReducer(state, action); + const action = new NavbarToggleAction(); + navbarReducer(state, action); }); }); diff --git a/src/app/header/header.reducer.ts b/src/app/navbar/navbar.reducer.ts similarity index 54% rename from src/app/header/header.reducer.ts rename to src/app/navbar/navbar.reducer.ts index 2c8a89249b..c3edc80115 100644 --- a/src/app/header/header.reducer.ts +++ b/src/app/navbar/navbar.reducer.ts @@ -1,30 +1,30 @@ -import { HeaderAction, HeaderActionTypes } from './header.actions'; +import { NavbarAction, NavbarActionTypes } from './navbar.actions'; -export interface HeaderState { +export interface NavbarState { navCollapsed: boolean; } -const initialState: HeaderState = { +const initialState: NavbarState = { navCollapsed: true }; -export function headerReducer(state = initialState, action: HeaderAction): HeaderState { +export function navbarReducer(state = initialState, action: NavbarAction): NavbarState { switch (action.type) { - case HeaderActionTypes.COLLAPSE: { + case NavbarActionTypes.COLLAPSE: { return Object.assign({}, state, { navCollapsed: true }); } - case HeaderActionTypes.EXPAND: { + case NavbarActionTypes.EXPAND: { return Object.assign({}, state, { navCollapsed: false }); } - case HeaderActionTypes.TOGGLE: { + case NavbarActionTypes.TOGGLE: { return Object.assign({}, state, { navCollapsed: !state.navCollapsed }); diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html index cc9b8c410b..217b731e0c 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html @@ -1,6 +1,6 @@
      -
    • -
      +
    • +
      {{ 'nav.login' | translate }}
    • -
      +
      Hello {{(user | async).name}}
      diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index f378c2b7c9..3ae9e79265 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -9,3 +9,7 @@ $drop-zone-area-inner-z-index: 1021; $login-logo-height:72px; $login-logo-width:72px; +$main-z-index: 0; +$nav-z-index: 10; + +$header-logo-height: 80px; From b0fe14d01508e0986aedabef77be91dcaa0fec50 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 9 Nov 2018 10:18:17 +0100 Subject: [PATCH 05/32] 57053: horizontal menu --- resources/i18n/en.json | 10 +++- src/app/app.component.html | 3 +- src/app/app.component.scss | 2 +- src/app/app.module.ts | 2 + .../header-navbar-wrapper.component.html | 4 ++ .../header-navbar-wrapper.component.scss | 9 +++ .../header-navbar-wrapper.component.ts | 36 +++++++++++ src/app/header/header.component.html | 10 +++- src/app/header/header.component.scss | 6 +- src/app/header/header.component.ts | 12 ++++ src/app/navbar/navbar.component.html | 38 ++++++------ src/app/navbar/navbar.component.scss | 60 +++++++++++++++---- src/app/navbar/navbar.component.ts | 43 ++++++++----- src/app/shared/animations/slide.ts | 11 +++- src/styles/_bootstrap_variables.scss | 1 + 15 files changed, 194 insertions(+), 53 deletions(-) create mode 100644 src/app/header-nav-wrapper/header-navbar-wrapper.component.html create mode 100644 src/app/header-nav-wrapper/header-navbar-wrapper.component.scss create mode 100644 src/app/header-nav-wrapper/header-navbar-wrapper.component.ts diff --git a/resources/i18n/en.json b/resources/i18n/en.json index 169ff0efe9..73cf536496 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -46,7 +46,15 @@ } }, "nav": { - "home": "Home", + "browse": { + "header": "All of DSpace" + }, + "community-browse": { + "header": "By Community" + }, + "statistics": { + "header": "Statistics" + }, "login": "Log In", "logout": "Log Out" }, diff --git a/src/app/app.component.html b/src/app/app.component.html index 24ce6dc843..41171d3081 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,7 +1,6 @@
      - - + diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 1b2a21b0c6..8e5031d0ba 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -34,6 +34,6 @@ body { margin-bottom: $content-spacing; } -ds-navbar { +ds-header-navbar-wrapper { z-index: $nav-z-index; } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 987ce77dd1..0aceaf2ef6 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,6 +32,7 @@ import { NotificationsBoardComponent } from './shared/notifications/notification import { NotificationComponent } from './shared/notifications/notification/notification.component'; import { SharedModule } from './shared/shared.module'; import { NavbarComponent } from './navbar/navbar.component'; +import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component'; export function getConfig() { return ENV_CONFIG; @@ -89,6 +90,7 @@ if (!ENV_CONFIG.production) { AppComponent, HeaderComponent, NavbarComponent, + HeaderNavbarWrapperComponent, FooterComponent, PageNotFoundComponent, NotificationComponent, diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html new file mode 100644 index 0000000000..1eab1d9ffd --- /dev/null +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -0,0 +1,4 @@ +
      + + +
      \ No newline at end of file diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss new file mode 100644 index 0000000000..f514508385 --- /dev/null +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss @@ -0,0 +1,9 @@ +@import '../../styles/variables.scss'; + +@media screen and (max-width: map-get($grid-breakpoints, md)) { + :host.open { + background-color: $white; + top: 0; + position: sticky; + } +} \ No newline at end of file diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts new file mode 100644 index 0000000000..1480758ee3 --- /dev/null +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts @@ -0,0 +1,36 @@ +import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core'; +import { createSelector, Store } from '@ngrx/store'; +import { AppState } from '../app.reducer'; +import { Observable } from 'rxjs/Observable'; +import { NavbarState } from '../navbar/navbar.reducer'; +import { Subscription } from 'rxjs/Subscription'; +import { hasValue } from '../shared/empty.util'; + +const navbarStateSelector = (state: AppState) => state.navbar; +const navCollapsedSelector = createSelector(navbarStateSelector, (navbar: NavbarState) => navbar.navCollapsed); +@Component({ + selector: 'ds-header-navbar-wrapper', + styleUrls: ['header-navbar-wrapper.component.scss'], + templateUrl: 'header-navbar-wrapper.component.html', +}) +export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy { + @HostBinding('class.open') isOpen = false; + private sub: Subscription; + public isNavBarCollapsed: Observable; + + constructor( + private store: Store + ) { + } + + ngOnInit(): void { + this.isNavBarCollapsed = this.store.select(navCollapsedSelector); + this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed) + } + + ngOnDestroy() { + if (hasValue(this.sub)) { + this.sub.unsubscribe(); + } + } +} diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 22e2a307a5..3a24f0e075 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -3,8 +3,16 @@ -
      diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 627ce93c6c..7834cfbaaa 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -2,4 +2,8 @@ .navbar-brand img { height: $header-logo-height; -} \ No newline at end of file +} +.navbar-toggler .navbar-toggler-icon { + background-image: none !important; + line-height: 1.5; +} diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 8ccc779873..6877f196aa 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -1,5 +1,8 @@ import { Component } from '@angular/core'; import { Observable } from 'rxjs/Observable'; +import { NavbarToggleAction } from '../navbar/navbar.actions'; +import { Store } from '@ngrx/store'; +import { AppState } from '../app.reducer'; @Component({ selector: 'ds-header', @@ -13,4 +16,13 @@ export class HeaderComponent { */ public isAuthenticated: Observable; public showAuth = false; + + constructor( + private store: Store, + ) { + } + + public toggle(): void { + this.store.dispatch(new NavbarToggleAction()); + } } diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index 7c4de41098..cf8ff5166c 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -1,43 +1,43 @@ -
      • -
    • + + -
      • + *ngComponentOutlet="sectionComponents.get(section.id); injector: sectionInjectors.get(section.id);"> +
    diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts index 7a805814fd..3d4b0fc313 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts @@ -1,18 +1,19 @@ import { Component, Injector, OnInit } from '@angular/core'; import { Observable } from 'rxjs/internal/Observable'; -import { slideSidebar } from '../../shared/animations/slide'; +import { slide, slideHorizontal, slideSidebar } from '../../shared/animations/slide'; import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service'; import { MenuService } from '../../shared/menu/menu.service'; import { MenuID, SectionType } from '../../shared/menu/initial-menus-state'; import { MenuComponent } from '../../shared/menu/menu.component'; import { TextSectionTypeModel } from '../../shared/menu/models/section-types/text.model'; import { LinkSectionTypeModel } from '../../shared/menu/models/section-types/link.model'; +import { AuthService } from '../../core/auth/auth.service'; @Component({ selector: 'ds-admin-sidebar', templateUrl: './admin-sidebar.component.html', styleUrls: ['./admin-sidebar.component.scss'], - animations: [slideSidebar] + animations: [slideHorizontal, slideSidebar] }) export class AdminSidebarComponent extends MenuComponent implements OnInit { menuID = MenuID.ADMIN; @@ -22,14 +23,22 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { constructor(protected menuService: MenuService, protected injector: Injector, - private variableService: CSSVariableService) { + private variableService: CSSVariableService, + private authService: AuthService + ) { super(menuService, injector); } ngOnInit(): void { + this.createMenu(); super.ngOnInit(); this.sidebarWidth = this.variableService.getVariable('adminSidebarWidth'); - this.createMenu(); + this.authService.isAuthenticated() + .subscribe((loggedIn: boolean) => { + if (loggedIn) { + this.menuService.showMenu(this.menuID); + } + }); } createMenu() { @@ -39,7 +48,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'new', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.new' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.new' + } as TextSectionTypeModel, icon: 'plus-circle' }, { @@ -47,28 +59,44 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'new', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.new_community', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.new_community', + link: '/communities/submission' + } as LinkSectionTypeModel, }, { id: 'new_collection', parentID: 'new', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.new_collection', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.new_collection', + link: '/collections/submission' + } as LinkSectionTypeModel, }, { id: 'new_item', parentID: 'new', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.new_item', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.new_item', + link: '/items/submission' + } as LinkSectionTypeModel, }, { id: 'new_item_version', parentID: 'new', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.new_item_version', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.new_item_version', + link: '#' + } as LinkSectionTypeModel, }, /* Edit */ @@ -76,7 +104,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'edit', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.edit' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.edit' + } as TextSectionTypeModel, icon: 'pencil-alt' }, { @@ -84,21 +115,33 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'edit', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.edit_community', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.edit_community', + link: '#' + } as LinkSectionTypeModel, }, { id: 'edit_collection', parentID: 'edit', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.edit_collection', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.edit_collection', + link: '#' + } as LinkSectionTypeModel, }, { id: 'edit_item', parentID: 'edit', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.edit_item', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.edit_item', + link: '#' + } as LinkSectionTypeModel, }, /* Import */ @@ -106,22 +149,35 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'import', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.import' } as TextSectionTypeModel, - icon: 'sign-in-alt' + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.import' + } as TextSectionTypeModel, + icon: 'sign-in-alt', + index: -1 }, { id: 'import_metadata', parentID: 'import', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.import_metadata', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.import_metadata', + link: '#' + } as LinkSectionTypeModel, + index: 1 }, { id: 'import_batch', parentID: 'import', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.import_batch', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.import_batch', + link: '#' + } as LinkSectionTypeModel, }, /* Export */ @@ -129,7 +185,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'export', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.export' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.export' + } as TextSectionTypeModel, icon: 'sign-out-alt' }, { @@ -137,27 +196,43 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'export', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.export_community', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.export_community', + link: '#' + } as LinkSectionTypeModel, }, { id: 'export_collection', parentID: 'export', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.export_collection', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.export_collection', + link: '#' + } as LinkSectionTypeModel, }, { id: 'export_item', parentID: 'export', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.export_item', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.export_item', + link: '#' + } as LinkSectionTypeModel, }, { id: 'export_metadata', parentID: 'export', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.export_metadata', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.export_metadata', + link: '#' + } as LinkSectionTypeModel, }, /* Access Control */ @@ -165,7 +240,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'access_control', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.access_control' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.access_control' + } as TextSectionTypeModel, icon: 'key' }, { @@ -173,21 +251,33 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'access_control', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.access_control_people', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.access_control_people', + link: '#' + } as LinkSectionTypeModel, }, { id: 'access_control_groups', parentID: 'access_control', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.access_control_groups', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.access_control_groups', + link: '#' + } as LinkSectionTypeModel, }, { id: 'access_control_authorizations', parentID: 'access_control', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.access_control_authorizations', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.access_control_authorizations', + link: '#' + } as LinkSectionTypeModel, }, /* Search */ @@ -195,7 +285,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'find', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.find' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.find' + } as TextSectionTypeModel, icon: 'search' }, { @@ -203,21 +296,33 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'find', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.find_items', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.find_items', + link: '/search' + } as LinkSectionTypeModel, }, { id: 'find_withdrawn_items', parentID: 'find', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.find_withdrawn_items', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.find_withdrawn_items', + link: '#' + } as LinkSectionTypeModel, }, { id: 'find_private_items', parentID: 'find', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.find_private_items', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.find_private_items', + link: '/admin/items' + } as LinkSectionTypeModel, }, /* Registries */ @@ -225,7 +330,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'registries', active: false, visible: true, - model: { type: SectionType.TEXT, text: 'admin.sidebar.section.registries' } as TextSectionTypeModel, + model: { + type: SectionType.TEXT, + text: 'admin.sidebar.section.registries' + } as TextSectionTypeModel, icon: 'list' }, { @@ -233,14 +341,22 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { parentID: 'registries', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.registries_metadata', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.registries_metadata', + link: '/registries/metadata' + } as LinkSectionTypeModel, }, { id: 'registries_format', parentID: 'registries', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.registries_format', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.registries_format', + link: '/registries/format' + } as LinkSectionTypeModel, }, /* Curation tasks */ @@ -248,16 +364,24 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'curation_tasks', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.curation_task', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.curation_task', + link: '/curation' + } as LinkSectionTypeModel, icon: 'filter' }, /* Statistics */ { - id: 'statistics', + id: 'statistics_task', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.statistics', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.statistics_task', + link: '#' + } as LinkSectionTypeModel, icon: 'chart-bar' }, @@ -266,7 +390,11 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { id: 'control_panel', active: false, visible: true, - model: { type: SectionType.LINK, text: 'admin.sidebar.section.control_panel', link: '#' } as LinkSectionTypeModel, + model: { + type: SectionType.LINK, + text: 'admin.sidebar.section.control_panel', + link: '#' + } as LinkSectionTypeModel, icon: 'cogs' }, ]; @@ -297,4 +425,5 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit { this.sidebarOpen = true; } } + } diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html index 175a6f7be6..044293c823 100644 --- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html +++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html @@ -10,15 +10,17 @@
    - {{count | async}} + + +
      -
    • +
    • + *ngComponentOutlet="itemComponents.get(subSection.id); injector: itemInjectors.get(subSection.id);">
    diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts index a7168ce386..6b086524d7 100644 --- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts +++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts @@ -9,7 +9,6 @@ import { rendersSectionForMenu } from '../../../shared/menu/menu.decorator'; import { MenuService } from '../../../shared/menu/menu.service'; import { MenuSection } from '../../../shared/menu/menu.reducer'; import { Observable } from 'rxjs'; -import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; @Component({ selector: 'ds-expandable-admin-sidebar-section', @@ -22,22 +21,18 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject'; export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionComponent implements OnInit { subSections: Observable; menuID = MenuID.ADMIN; - link = '#'; sidebarActiveBg; sidebarCollapsed: Observable; - c = 0; - count = new BehaviorSubject(0); constructor(@Inject('sectionDataProvider') menuSection, protected menuService: MenuService, - private variableService: CSSVariableService, protected injector: Injector,) { + private variableService: CSSVariableService, protected injector: Injector) { super(menuSection, menuService, injector); + } ngOnInit(): void { super.ngOnInit(); this.subSections = this.menuService.getSubSectionsByParentID(this.menuID, this.section.id); - // this.active.subscribe((t) => console.log('section: ', this.section.id, this.c, t)); - // this.active.subscribe((t) => this.count.next(++this.c)); this.sidebarActiveBg = this.variableService.getVariable('adminSidebarActiveBg'); this.sidebarCollapsed = this.menuService.isMenuCollapsed(this.menuID); } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bc0a512358..8c4126f8ed 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -31,11 +31,11 @@ import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-s import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component'; import { NotificationComponent } from './shared/notifications/notification/notification.component'; import { SharedModule } from './shared/shared.module'; -import { NavbarComponent } from './navbar/navbar.component'; import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component'; import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component'; import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component'; import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component'; +import { NavbarModule } from './navbar/navbar.module'; export function getConfig() { return ENV_CONFIG; @@ -53,6 +53,7 @@ export function getMetaReducers(config: GlobalConfig): Array = { router: fromRouter.routerReducer, hostWindow: hostWindowReducer, - navbar: navbarReducer, forms: formReducer, notifications: notificationsReducer, searchSidebar: sidebarReducer, diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts index a1cf92aeb3..4c30f118f1 100644 --- a/src/app/core/index/index.reducer.spec.ts +++ b/src/app/core/index/index.reducer.spec.ts @@ -20,6 +20,8 @@ describe('requestReducer', () => { const testState: IndexState = { [IndexName.OBJECT]: { [key1]: val1 + }, + [IndexName.REQUEST]: { } }; deepFreeze(testState); diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html index 1eab1d9ffd..931ab36749 100644 --- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html @@ -1,4 +1,4 @@
    - +
    \ No newline at end of file diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts index d041f41654..f93005218d 100644 --- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts +++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts @@ -1,13 +1,12 @@ import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core'; -import { createSelector, select, Store } from '@ngrx/store'; +import { Store } from '@ngrx/store'; import { AppState } from '../app.reducer'; -import { NavbarState } from '../navbar/navbar.reducer'; import { hasValue } from '../shared/empty.util'; import { Observable } from 'rxjs/internal/Observable'; import { Subscription } from 'rxjs/internal/Subscription'; +import { MenuService } from '../shared/menu/menu.service'; +import { MenuID } from '../shared/menu/initial-menus-state'; -const navbarStateSelector = (state: AppState) => state.navbar; -const navCollapsedSelector = createSelector(navbarStateSelector, (navbar: NavbarState) => navbar.navCollapsed); @Component({ selector: 'ds-header-navbar-wrapper', styleUrls: ['header-navbar-wrapper.component.scss'], @@ -17,14 +16,16 @@ export class HeaderNavbarWrapperComponent implements OnInit, OnDestroy { @HostBinding('class.open') isOpen = false; private sub: Subscription; public isNavBarCollapsed: Observable; + menuID = MenuID.PUBLIC; constructor( - private store: Store + private store: Store, + private menuService: MenuService ) { } ngOnInit(): void { - this.isNavBarCollapsed = this.store.pipe(select(navCollapsedSelector)); + this.isNavBarCollapsed = this.menuService.isMenuCollapsed(this.menuID); this.sub = this.isNavBarCollapsed.subscribe((isCollapsed) => this.isOpen = !isCollapsed) } diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 7d84cf821e..6cd200a09c 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -9,7 +9,7 @@
    -
    - - diff --git a/src/app/app.component.scss b/src/app/app.component.scss index c0e5d839ef..6fbc8310db 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -11,8 +11,8 @@ html { body { overflow-x: hidden; } -// Sticky Footer +// Sticky Footer .outer-wrapper { display: flex; margin: 0; @@ -39,5 +39,7 @@ ds-header-navbar-wrapper { } ds-admin-sidebar { + position: absolute; z-index: $sidebar-z-index; } + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0551b4f453..d802d6bee5 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -25,16 +25,23 @@ import { AuthService } from './core/auth/auth.service'; import { Angulartics2GoogleAnalytics } from 'angulartics2/ga'; import variables from '../styles/_exposed_variables.scss'; import { CSSVariableService } from './shared/sass-helper/sass-helper.service'; +import { MenuService } from './shared/menu/menu.service'; +import { MenuID } from './shared/menu/initial-menus-state'; +import { Observable } from 'rxjs/internal/Observable'; +import { slideSidebarMargin } from './shared/animations/slide'; @Component({ selector: 'ds-app', templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + animations: [slideSidebarMargin] }) export class AppComponent implements OnInit, AfterViewInit { isLoading = true; + hasAdminSidebar: Observable; + collapsedSidebarWidth: Observable; constructor( @Inject(GLOBAL_CONFIG) public config: GlobalConfig, @@ -45,7 +52,8 @@ export class AppComponent implements OnInit, AfterViewInit { private angulartics2GoogleAnalytics: Angulartics2GoogleAnalytics, private authService: AuthService, private router: Router, - private cssService: CSSVariableService + private cssService: CSSVariableService, + private menuService: MenuService ) { // this language will be used as a fallback when a translation isn't found in the current language translate.setDefaultLang('en'); @@ -72,6 +80,9 @@ export class AppComponent implements OnInit, AfterViewInit { first(), filter((authenticated) => !authenticated) ).subscribe((authenticated) => this.authService.checkAuthenticationToken()); + this.hasAdminSidebar = this.menuService.isMenuVisible(MenuID.ADMIN); + + this.collapsedSidebarWidth = this.cssService.getVariable('collapsedSidebarWidth'); } private storeCSSVariables() { diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts index 1d07bd1dc5..94bfaee530 100644 --- a/src/app/shared/animations/slide.ts +++ b/src/app/shared/animations/slide.ts @@ -58,3 +58,9 @@ export const slideSidebar = trigger('slideSidebar', [ ] )) ]); + +export const slideSidebarMargin = trigger('slideSidebarMargin', [ + state('collapsed', style({ marginLeft: 0 })), + state('expanded', style({ marginLeft: '{{ collapsedSidebarWidth }}' }), { params: { collapsedSidebarWidth: '*' } }), + transition('collapsed <=> expanded', [animate('200ms')]), +]); \ No newline at end of file diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts index d6772c5978..ffad314325 100644 --- a/src/app/shared/menu/initial-menus-state.ts +++ b/src/app/shared/menu/initial-menus-state.ts @@ -13,7 +13,7 @@ export const initialMenusState: MenusState = { [MenuID.ADMIN]: { id: MenuID.ADMIN, - collapsed: false, + collapsed: true, visible: false, sections: {}, sectionToSubsectionIndex: {} diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss index 1ace8b3118..6b20bfecb0 100644 --- a/src/styles/_bootstrap_variables.scss +++ b/src/styles/_bootstrap_variables.scss @@ -1,7 +1,13 @@ +/** Help Variables **/ +$fa-fixed-width: 1.25rem; +$icon-padding: 1rem; +$collapsed-sidebar-width: calculatePx($fa-fixed-width + (2 * $icon-padding)); /* Fonts */ $fa-font-path: "../assets/fonts"; /* Images */ $image-path: "../assets/images"; + +/** Bootstrap Variables **/ /* Colors */ $gray-base: #000 !default; $gray-900: lighten($gray-base, 13.5%) !default; // #222 @@ -10,6 +16,7 @@ $gray-700: lighten($gray-base, 46.6%) !default; // #777 $gray-600: lighten($gray-base, 73.3%) !default; // #bbb $gray-100: lighten($gray-base, 93.5%) !default; // #eee + /* Reassign color vars to semantic color scheme */ $blue: #2B4E72 !default; $green: #94BA65 !default; @@ -37,3 +44,12 @@ $navbar-dark-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3C $navbar-light-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-light-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E"); $enable-shadows: true !default; + +$grid-breakpoints: ( + xs: 0, + sm: (576px - $collapsed-sidebar-width), + md: (768px - $collapsed-sidebar-width), + lg: (992px - $collapsed-sidebar-width), + xl: (1200px - $collapsed-sidebar-width) +) !default; + diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index abd8101a1e..cf40b7fd67 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -21,4 +21,4 @@ $admin-sidebar-header-bg: darken($dark, 7%); $admin-sidebar-width: 250px; $dark-scrollbar-background: $admin-sidebar-active-bg; -$dark-scrollbar-foreground: #47495d; \ No newline at end of file +$dark-scrollbar-foreground: #47495d; diff --git a/src/styles/_exposed_variables.scss b/src/styles/_exposed_variables.scss index 42b319a04b..1903bd3c19 100644 --- a/src/styles/_exposed_variables.scss +++ b/src/styles/_exposed_variables.scss @@ -7,4 +7,5 @@ lgMin: map-get($grid-breakpoints, lg); smMin: map-get($grid-breakpoints, sm); adminSidebarActiveBg: $admin-sidebar-active-bg; + collapsedSidebarWidth: $collapsed-sidebar-width; } \ No newline at end of file diff --git a/src/styles/_functions.scss b/src/styles/_functions.scss index 81de954285..4445b89727 100644 --- a/src/styles/_functions.scss +++ b/src/styles/_functions.scss @@ -3,10 +3,16 @@ @return $remSize; } + @function strip-unit($number) { @if type-of($number) == 'number' and not unitless($number) { @return $number / ($number * 0 + 1); } - @return $number; -} \ No newline at end of file +} + + +@function calculatePx($size) { + $pxSize: strip-unit($size) * 16px; + @return $pxSize; +} diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index d641cd3e3e..33a3f0b1fa 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -1,5 +1,5 @@ -@import 'bootstrap_variables.scss'; -@import '../../node_modules/bootstrap/scss/functions.scss'; -@import '../../node_modules/bootstrap/scss/variables.scss'; @import '_functions.scss'; +@import '../../node_modules/bootstrap/scss/functions.scss'; +@import 'bootstrap_variables.scss'; +@import '../../node_modules/bootstrap/scss/variables.scss'; @import 'custom_variables.scss'; \ No newline at end of file From c0a4fdc79749e0f0f1c0229e16c4c5de9e117769 Mon Sep 17 00:00:00 2001 From: lotte Date: Fri, 7 Dec 2018 17:06:44 +0100 Subject: [PATCH 20/32] 57053: added menu preview --- .../admin-sidebar-section.component.html | 2 +- .../admin-sidebar.component.html | 7 +- .../admin-sidebar.component.scss | 8 +- .../admin-sidebar/admin-sidebar.component.ts | 17 +++-- ...dable-admin-sidebar-section.component.html | 8 +- ...andable-admin-sidebar-section.component.ts | 9 +++ src/app/app.component.html | 6 +- src/app/app.component.scss | 3 +- src/app/app.component.ts | 12 ++- src/app/navbar/navbar.component.scss | 2 - .../pagenotfound/pagenotfound.component.html | 2 +- src/app/shared/animations/slide.ts | 11 ++- src/app/shared/menu/initial-menus-state.ts | 2 + src/app/shared/menu/menu.actions.ts | 21 +++++ src/app/shared/menu/menu.component.ts | 23 ++++++ src/app/shared/menu/menu.effects.ts | 76 +++++++++---------- src/app/shared/menu/menu.reducer.ts | 11 ++- src/app/shared/menu/menu.service.ts | 31 +++++++- src/styles/_bootstrap_variables.scss | 3 + src/styles/_custom_variables.scss | 1 - src/styles/_exposed_variables.scss | 3 +- 21 files changed, 179 insertions(+), 79 deletions(-) diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html index 9823861097..aec0635e82 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html +++ b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html @@ -1,5 +1,5 @@
  • - +
    diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/+admin/admin-sidebar/admin-sidebar.component.html index eedb95525a..7a339d85f2 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar.component.html +++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.html @@ -1,9 +1,9 @@
    • diff --git a/src/app/shared/chips/chips.component.spec.ts b/src/app/shared/chips/chips.component.spec.ts index d7940303c0..84efe2b86e 100644 --- a/src/app/shared/chips/chips.component.spec.ts +++ b/src/app/shared/chips/chips.component.spec.ts @@ -10,6 +10,7 @@ import { SortablejsModule } from 'angular-sortablejs'; import { By } from '@angular/platform-browser'; import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model'; import { createTestComponent, hasClass } from '../testing/utils'; +import { TranslateModule } from '@ngx-translate/core'; describe('ChipsComponent test suite', () => { @@ -27,6 +28,7 @@ describe('ChipsComponent test suite', () => { imports: [ NgbModule.forRoot(), SortablejsModule.forRoot({animation: 150}), + TranslateModule.forRoot() ], declarations: [ ChipsComponent, diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts index c3968d098a..ac56bed1f0 100644 --- a/src/app/shared/menu/menu.reducer.spec.ts +++ b/src/app/shared/menu/menu.reducer.spec.ts @@ -54,7 +54,7 @@ describe('menusReducer', () => { visible: true, model: { type: 0, - text: 'admin.sidebar.section.new' + text: 'menu.section.new' }, icon: 'plus-circle', index: 0 @@ -66,7 +66,7 @@ describe('menusReducer', () => { visible: true, model: { type: 1, - text: 'admin.sidebar.section.new_item', + text: 'menu.section.new_item', link: '/items/submission' } }, @@ -77,7 +77,7 @@ describe('menusReducer', () => { visible: true, model: { type: 1, - text: 'admin.sidebar.section.new_community', + text: 'menu.section.new_community', link: '/communities/submission' } }, @@ -87,7 +87,7 @@ describe('menusReducer', () => { visible: true, model: { type: 0, - text: 'admin.sidebar.section.access_control' + text: 'menu.section.access_control' }, icon: 'key', index: 4 @@ -99,7 +99,7 @@ describe('menusReducer', () => { visible: true, model: { type: 1, - text: 'admin.sidebar.section.access_control_people', + text: 'menu.section.access_control_people', link: '#' } }, @@ -110,7 +110,7 @@ describe('menusReducer', () => { visible: true, model: { type: 1, - text: 'admin.sidebar.section.access_control_groups', + text: 'menu.section.access_control_groups', link: '#' } }, @@ -121,7 +121,7 @@ describe('menusReducer', () => { visible: true, model: { type: 1, - text: 'admin.sidebar.section.new_collection', + text: 'menu.section.new_collection', link: '/collections/submission' } } From 67e2a78a264f98f82050d99b844e1dae5367e5ee Mon Sep 17 00:00:00 2001 From: lotte Date: Wed, 19 Dec 2018 14:15:34 +0100 Subject: [PATCH 29/32] applied more feedback --- .../+search-page/search-sidebar/search-sidebar.component.html | 2 +- src/app/header/header.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.html b/src/app/+search-page/search-sidebar/search-sidebar.component.html index a9a958cffa..5ff1e3c8fa 100644 --- a/src/app/+search-page/search-sidebar/search-sidebar.component.html +++ b/src/app/+search-page/search-sidebar/search-sidebar.component.html @@ -4,7 +4,7 @@
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index 336acc35df..8f2da69f0d 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -3,6 +3,9 @@ import { Observable } from 'rxjs/internal/Observable'; import { MenuService } from '../shared/menu/menu.service'; import { MenuID } from '../shared/menu/initial-menus-state'; +/** + * Represents the header with the logo and simple navigation + */ @Component({ selector: 'ds-header', styleUrls: ['header.component.scss'], From b4d21d88b5cd9efbefb2f07f29ae5b799eb52c1b Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Wed, 19 Dec 2018 15:15:35 -0800 Subject: [PATCH 30/32] Changed search filter cursor to pointer --- .../search-filter/search-filter.component.scss | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss index 6e49172a48..4e45f49468 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss +++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss @@ -2,11 +2,12 @@ @import '../../../../styles/mixins.scss'; :host { - border: 1px solid map-get($theme-colors, light); - .search-filter-wrapper.closed { - overflow: hidden; - } - .filter-toggle { - line-height: $line-height-base; - } -} \ No newline at end of file + border: 1px solid map-get($theme-colors, light); + cursor: pointer; + .search-filter-wrapper.closed { + overflow: hidden; + } + .filter-toggle { + line-height: $line-height-base; + } +} From 8ae08fc1fdb3723fad564f98d8da8a2d2da9f28d Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 20 Dec 2018 14:09:41 +0100 Subject: [PATCH 31/32] added title to admin sidebar section icon --- .../admin-sidebar-section/admin-sidebar-section.component.html | 2 +- .../admin-sidebar-section.component.spec.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html index ac2f3338d0..e72a17aac1 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html +++ b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html @@ -1,6 +1,6 @@
  • - +
    diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts index d02b0d30c6..30c57c17ea 100644 --- a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts +++ b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.spec.ts @@ -9,6 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AdminSidebarSectionComponent } from './admin-sidebar-section.component'; import { RouterTestingModule } from '@angular/router/testing'; import { By } from '@angular/platform-browser'; +import { TranslateModule } from '@ngx-translate/core'; describe('AdminSidebarSectionComponent', () => { let component: AdminSidebarSectionComponent; @@ -18,7 +19,7 @@ describe('AdminSidebarSectionComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, RouterTestingModule], + imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()], declarations: [AdminSidebarSectionComponent, TestComponent], providers: [ { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } }, From e7e285cadce1c1bebc54f112a542baea6cea4d1f Mon Sep 17 00:00:00 2001 From: lotte Date: Thu, 20 Dec 2018 14:30:41 +0100 Subject: [PATCH 32/32] fixed search filter animation --- .../search-filter/search-filter.component.html | 2 +- .../search-filter/search-filter.component.scss | 5 ++--- .../search-filters/search-filter/search-filter.component.ts | 4 ++-- src/app/shared/animations/slide.ts | 5 ++++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.html b/src/app/+search-page/search-filters/search-filter/search-filter.component.html index 26b2543221..1013bf7e28 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.component.html +++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.html @@ -1,7 +1,7 @@
    {{'search.filters.filter.' + filter.name + '.head'| translate}}
    -
    +
    \ No newline at end of file diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss index d0c1d561e5..6e49172a48 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss +++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.scss @@ -3,9 +3,8 @@ :host { border: 1px solid map-get($theme-colors, light); - overflow: hidden; - .search-filter-wrapper:not(.closed) { - overflow: visible; + .search-filter-wrapper.closed { + overflow: hidden; } .filter-toggle { line-height: $line-height-base; diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts index d63b744ba7..87f8edc1ea 100644 --- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts +++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.ts @@ -89,7 +89,7 @@ export class SearchFilterComponent implements OnInit { * @param event The animation event */ finishSlide(event: any): void { - if (event.fromState === 'void') { + if (event.fromState === 'collapsed') { this.collapsed = false; } } @@ -99,7 +99,7 @@ export class SearchFilterComponent implements OnInit { * @param event The animation event */ startSlide(event: any): void { - if (event.toState === 'void') { + if (event.toState === 'collapsed') { this.collapsed = true; } } diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts index f64bdb0e35..38bfaaddca 100644 --- a/src/app/shared/animations/slide.ts +++ b/src/app/shared/animations/slide.ts @@ -10,10 +10,13 @@ import { } from '@angular/animations'; export const slide = trigger('slide', [ + state('expanded', style({ height: '*' })), + state('collapsed', style({ height: 0 })), state('void', style({ height: 0 })), state('*', style({ height: '*' })), transition(':enter', [animate('200ms')]), - transition(':leave', [animate('200ms')]) + transition(':leave', [animate('200ms')]), + transition('expanded <=> collapsed', animate(250)) ]); export const slideHorizontal = trigger('slideHorizontal', [