From b0bfff15a664b0fb8c1edbc95b2a1f546ed7370e Mon Sep 17 00:00:00 2001 From: Lotte Hofstede Date: Wed, 20 Sep 2017 16:06:10 +0200 Subject: [PATCH] 44024: scss import fixes --- src/app/app.component.scss | 5 +++- .../collection-page.component.scss | 2 +- .../collection-page.component.ts | 17 +----------- .../community-page.component.scss | 2 +- ...ty-page-sub-collection-list.component.scss | 2 +- src/app/core/footer/footer.component.scss | 2 +- src/app/header/header.component.scss | 2 +- .../home/home-news/home-news.component.scss | 2 +- src/app/home/home.component.scss | 2 +- .../metadata-field-wrapper.component.scss | 2 +- .../metadata-uri-values.component.scss | 2 +- .../metadata-values.component.scss | 2 +- .../full-file-section.component.scss | 3 ++- .../full/full-item-page.component.scss | 2 +- .../item-page/simple/item-page.component.scss | 2 +- .../collection-list-element.component.scss | 2 +- .../community-list-element.component.scss | 2 +- .../item-list-element.component.scss | 2 +- .../object-list-element.component.scss | 2 +- .../object-list/object-list.component.scss | 2 +- ...-search-result-list-element.component.scss | 2 +- ...-search-result-list-element.component.scss | 2 +- ...-search-result-list-element.component.scss | 2 +- .../search-result-list-element.component.scss | 2 +- .../wrapper-list-element.component.scss | 2 +- .../pagenotfound/pagenotfound.component.scss | 2 +- .../search-page/search-page.component.scss | 2 +- src/app/search/search.service.ts | 27 ++++++++++++------- .../comcol-page-content.component.scss | 2 +- .../comcol-page-header.component.scss | 2 +- .../comcol-page-logo.component.scss | 2 +- .../search-form/search-form.component.scss | 2 +- src/app/thumbnail/thumbnail.component.scss | 2 +- src/styles/_mixins.scss | 5 +++- src/styles/_shared_imports.scss | 5 ---- src/styles/_variables.scss | 5 ++++ 36 files changed, 62 insertions(+), 63 deletions(-) delete mode 100644 src/styles/_shared_imports.scss create mode 100644 src/styles/_variables.scss diff --git a/src/app/app.component.scss b/src/app/app.component.scss index 50bc75c7ae..d274f5fe4a 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -1,4 +1,7 @@ -@import '../styles/shared_imports'; +@import '../styles/variables.scss'; +@import '../../node_modules/bootstrap/scss/bootstrap.scss'; +@import "../../node_modules/font-awesome/scss/font-awesome.scss"; + html { position: relative; min-height: 100%; diff --git a/src/app/collection-page/collection-page.component.scss b/src/app/collection-page/collection-page.component.scss index 4b7e0f33c5..da97dd7a62 100644 --- a/src/app/collection-page/collection-page.component.scss +++ b/src/app/collection-page/collection-page.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts index 44c45edc4f..6eca621f27 100644 --- a/src/app/collection-page/collection-page.component.ts +++ b/src/app/collection-page/collection-page.component.ts @@ -64,22 +64,7 @@ export class CollectionPageComponent implements OnInit, OnDestroy { this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe()); } - onPageChange(currentPage: number): void { - this.config.currentPage = currentPage; - this.updateResults(); - } - - onPageSizeChange(elementsPerPage: number): void { - this.config.pageSize = elementsPerPage; - this.updateResults(); - } - - onSortDirectionChange(sortDirection: SortDirection): void { - this.sortConfig = new SortOptions(this.sortConfig.field, sortDirection); - this.updateResults(); - } - - onSortFieldChange(field: string): void { + onPaginationChange(field: string): void { this.sortConfig = new SortOptions(field, this.sortConfig.direction); this.updateResults(); } diff --git a/src/app/community-page/community-page.component.scss b/src/app/community-page/community-page.component.scss index 4b7e0f33c5..da97dd7a62 100644 --- a/src/app/community-page/community-page.component.scss +++ b/src/app/community-page/community-page.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss index 60c8d3a9ab..50be6f5ad0 100644 --- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss +++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; diff --git a/src/app/core/footer/footer.component.scss b/src/app/core/footer/footer.component.scss index 01d27660bf..08900fd285 100644 --- a/src/app/core/footer/footer.component.scss +++ b/src/app/core/footer/footer.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; $footer-bg: $gray-100; $footer-border: 1px solid darken($footer-bg, 10%); $footer-padding: $spacer * 1.5; diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 9ca58d372f..81f6a809bf 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -1,4 +1,4 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; header nav.navbar { border-radius: 0; diff --git a/src/app/home/home-news/home-news.component.scss b/src/app/home/home-news/home-news.component.scss index 688b3180a7..c1c16995c5 100644 --- a/src/app/home/home-news/home-news.component.scss +++ b/src/app/home/home-news/home-news.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; :host { display: block; margin-right: ($grid-gutter-width / -2); diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index 4b7e0f33c5..da97dd7a62 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss index c31cd78b69..dff97a6eb2 100644 --- a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss +++ b/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss @@ -1,4 +1,4 @@ -@import '../../../../styles/shared_imports'; +@import '../../../../styles/variables.scss'; :host { .simple-view-element { diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss index 32edd2b966..96ce861942 100644 --- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss +++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.scss @@ -1 +1 @@ -@import '../../../../styles/shared_imports'; +@import '../../../../styles/variables.scss'; diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.scss b/src/app/item-page/field-components/metadata-values/metadata-values.component.scss index 32edd2b966..96ce861942 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.scss +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.scss @@ -1 +1 @@ -@import '../../../../styles/shared_imports'; +@import '../../../../styles/variables.scss'; diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.scss b/src/app/item-page/full/field-components/file-section/full-file-section.component.scss index f53e75b46a..77db5d97cf 100644 --- a/src/app/item-page/full/field-components/file-section/full-file-section.component.scss +++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.scss @@ -1,4 +1,5 @@ -@import '../../../../../styles/shared_imports'; +@import '../../../../../styles/variables'; +@import '../../../../../styles/mixins'; @media screen and (min-width: map-get($grid-breakpoints, md)) { dt { text-align: right; diff --git a/src/app/item-page/full/full-item-page.component.scss b/src/app/item-page/full/full-item-page.component.scss index f303939bad..65b9262338 100644 --- a/src/app/item-page/full/full-item-page.component.scss +++ b/src/app/item-page/full/full-item-page.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; :host { div.simple-view-link { text-align: center; diff --git a/src/app/item-page/simple/item-page.component.scss b/src/app/item-page/simple/item-page.component.scss index 60c8d3a9ab..50be6f5ad0 100644 --- a/src/app/item-page/simple/item-page.component.scss +++ b/src/app/item-page/simple/item-page.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; diff --git a/src/app/object-list/collection-list-element/collection-list-element.component.scss b/src/app/object-list/collection-list-element/collection-list-element.component.scss index 7e1977b051..ad84b72f8c 100644 --- a/src/app/object-list/collection-list-element/collection-list-element.component.scss +++ b/src/app/object-list/collection-list-element/collection-list-element.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/community-list-element/community-list-element.component.scss b/src/app/object-list/community-list-element/community-list-element.component.scss index 7e1977b051..ad84b72f8c 100644 --- a/src/app/object-list/community-list-element/community-list-element.component.scss +++ b/src/app/object-list/community-list-element/community-list-element.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/item-list-element/item-list-element.component.scss b/src/app/object-list/item-list-element/item-list-element.component.scss index 7e1977b051..ad84b72f8c 100644 --- a/src/app/object-list/item-list-element/item-list-element.component.scss +++ b/src/app/object-list/item-list-element/item-list-element.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/object-list-element/object-list-element.component.scss b/src/app/object-list/object-list-element/object-list-element.component.scss index e1927924f0..1a22768fe8 100644 --- a/src/app/object-list/object-list-element/object-list-element.component.scss +++ b/src/app/object-list/object-list-element/object-list-element.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports'; +@import '../../../styles/variables.scss'; :host { display: block; diff --git a/src/app/object-list/object-list.component.scss b/src/app/object-list/object-list.component.scss index 0d6f946970..b14c7376e3 100644 --- a/src/app/object-list/object-list.component.scss +++ b/src/app/object-list/object-list.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; \ No newline at end of file +@import '../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss index d2a689f81f..88eb98509a 100644 --- a/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss +++ b/src/app/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.scss @@ -1 +1 @@ -@import '../../../../styles/shared_imports.scss'; \ No newline at end of file +@import '../../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss index d2a689f81f..88eb98509a 100644 --- a/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss +++ b/src/app/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.scss @@ -1 +1 @@ -@import '../../../../styles/shared_imports.scss'; \ No newline at end of file +@import '../../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss index d2a689f81f..88eb98509a 100644 --- a/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss +++ b/src/app/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.scss @@ -1 +1 @@ -@import '../../../../styles/shared_imports.scss'; \ No newline at end of file +@import '../../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/object-list/search-result-list-element/search-result-list-element.component.scss b/src/app/object-list/search-result-list-element/search-result-list-element.component.scss index 025e2c2278..d688753eb3 100644 --- a/src/app/object-list/search-result-list-element/search-result-list-element.component.scss +++ b/src/app/object-list/search-result-list-element/search-result-list-element.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports.scss'; +@import '../../../styles/variables.scss'; :host { /deep/ em { font-weight: bold; diff --git a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss b/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss index a2752e5e5a..6f997644cc 100644 --- a/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss +++ b/src/app/object-list/wrapper-list-element/wrapper-list-element.component.scss @@ -1,2 +1,2 @@ -@import '../../../styles/shared_imports.scss'; +@import '../../../styles/variables.scss'; diff --git a/src/app/pagenotfound/pagenotfound.component.scss b/src/app/pagenotfound/pagenotfound.component.scss index 4b7e0f33c5..da97dd7a62 100644 --- a/src/app/pagenotfound/pagenotfound.component.scss +++ b/src/app/pagenotfound/pagenotfound.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; diff --git a/src/app/search-page/search-page.component.scss b/src/app/search-page/search-page.component.scss index 3d884cd38b..da97dd7a62 100644 --- a/src/app/search-page/search-page.component.scss +++ b/src/app/search-page/search-page.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports.scss'; +@import '../../styles/variables.scss'; diff --git a/src/app/search/search.service.ts b/src/app/search/search.service.ts index 337668ef8a..da9d6c0a1c 100644 --- a/src/app/search/search.service.ts +++ b/src/app/search/search.service.ts @@ -11,6 +11,20 @@ import { Metadatum } from '../core/shared/metadatum.model'; import { Item } from '../core/shared/item.model'; import { ItemSearchResult } from '../object-list/search-result-list-element/item-search-result/item-search-result.model'; +function shuffle(array: any[]) { + let i = 0; + let j = 0; + let temp = null; + + for (i = array.length - 1; i > 0; i -= 1) { + j = Math.floor(Math.random() * (i + 1)); + temp = array[i]; + array[i] = array[j]; + array[j] = temp; + } + return array; +} + @Injectable() export class SearchService { @@ -53,19 +67,12 @@ export class SearchService { returningPageInfo.currentPage = 1; } returningPageInfo.totalPages = this.totalPages; - returningPageInfo.totalElements = 10 * this.totalPages; + returningPageInfo.totalElements = returningPageInfo.elementsPerPage * returningPageInfo.totalPages; const pageInfo = Observable.of(returningPageInfo); - const itemsRD = this.itemDataService.findAll({ - scopeID: '8e0928a0-047a-4369-8883-12669f32dd64', - currentPage: returningPageInfo.currentPage, - elementsPerPage: returningPageInfo.elementsPerPage - }); + const itemsRD = this.itemDataService.findAll({ elementsPerPage: 10 }); const payload = itemsRD.payload.map((items: Item[]) => { - return items.sort(() => { - const values = [-1, 0, 1]; - return values[Math.floor(Math.random() * values.length)]; - }) + return shuffle(items) .map((item: Item, index: number) => { const mockResult: SearchResult = new ItemSearchResult(); mockResult.dspaceObject = item; diff --git a/src/app/shared/comcol-page-content/comcol-page-content.component.scss b/src/app/shared/comcol-page-content/comcol-page-content.component.scss index 7e1977b051..ad84b72f8c 100644 --- a/src/app/shared/comcol-page-content/comcol-page-content.component.scss +++ b/src/app/shared/comcol-page-content/comcol-page-content.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/shared/comcol-page-header/comcol-page-header.component.scss b/src/app/shared/comcol-page-header/comcol-page-header.component.scss index 7e1977b051..ad84b72f8c 100644 --- a/src/app/shared/comcol-page-header/comcol-page-header.component.scss +++ b/src/app/shared/comcol-page-header/comcol-page-header.component.scss @@ -1 +1 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file 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 7e1977b051..ad84b72f8c 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 @@ -@import '../../../styles/shared_imports'; \ No newline at end of file +@import '../../../styles/variables.scss'; \ No newline at end of file diff --git a/src/app/shared/search-form/search-form.component.scss b/src/app/shared/search-form/search-form.component.scss index ca8849e3c0..d5811186e7 100644 --- a/src/app/shared/search-form/search-form.component.scss +++ b/src/app/shared/search-form/search-form.component.scss @@ -1,4 +1,4 @@ -@import '../../../styles/shared_imports.scss'; +@import '../../../styles/variables.scss'; // temporary fix for bootstrap 4 beta btn color issue .btn-secondary { diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss index 4b7e0f33c5..da97dd7a62 100644 --- a/src/app/thumbnail/thumbnail.component.scss +++ b/src/app/thumbnail/thumbnail.component.scss @@ -1 +1 @@ -@import '../../styles/shared_imports'; +@import '../../styles/variables.scss'; diff --git a/src/styles/_mixins.scss b/src/styles/_mixins.scss index 731d379269..73aa27eccc 100644 --- a/src/styles/_mixins.scss +++ b/src/styles/_mixins.scss @@ -1 +1,4 @@ -/* Custom mixins go here */ \ No newline at end of file +@import '../../node_modules/bootstrap/scss/functions.scss'; +@import '../../node_modules/bootstrap/scss/mixins.scss'; + +/* Custom mixins go here */ diff --git a/src/styles/_shared_imports.scss b/src/styles/_shared_imports.scss deleted file mode 100644 index 9a49b74953..0000000000 --- a/src/styles/_shared_imports.scss +++ /dev/null @@ -1,5 +0,0 @@ -@import 'bootstrap_variables.scss'; -@import '../../node_modules/bootstrap/scss/bootstrap.scss'; -@import "../../node_modules/font-awesome/scss/font-awesome.scss"; -@import 'mixins.scss'; -@import 'custom_variables.scss'; \ No newline at end of file diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss new file mode 100644 index 0000000000..812a19d418 --- /dev/null +++ b/src/styles/_variables.scss @@ -0,0 +1,5 @@ +@import 'bootstrap_variables.scss'; +@import '../../node_modules/font-awesome/scss/variables.scss'; +@import '../../node_modules/bootstrap/scss/functions.scss'; +@import '../../node_modules/bootstrap/scss/variables.scss'; +@import 'custom_variables.scss'; \ No newline at end of file