diff --git a/src/app/features/search/data.ts b/src/app/features/search/data.ts index c53ac5a84..90e6230f1 100644 --- a/src/app/features/search/data.ts +++ b/src/app/features/search/data.ts @@ -287,7 +287,7 @@ export const resources: Resource[] = [ }, conflictOfInterestResponse: 'Author asserted no Conflict of Interest', license: 'No License', - doi: 'Keberadaan suatu organisme pada suatu tempat dipengaruhi oleh faktor lingkungan dan makanan. Ketersediaan makanan dengan kualitas yang cocok dan kuantitas yang ukup bagi suatu organisme akan meningkatkan populasi cepat. Sebaliknya jika keadaan tersebut tidak mendukung maka akan dipastikan bahwa organisme tersebut akan menurun. Sedangkan faktor abiotik meliputi suhu, kelembaban, cahaya, curah hujan, dan angin. Suhu mempengaruhi aktivitas serangga serta perkembangannya. Serangga juga tertarik pada gelombang cahaya tertentu. Serangga ada yang menerima intensitas cahaya yang tinggi dan aktif pada siang hari (diurnal) dan serangga ada yang aktif menerima intensitas cahaya rendah pada malam hari (nokturnal). Metode yang digunakan yaitu metode Light trap. Hail yang didapatkan bahwa komponen lingkungan (biotik dan abiotik) akan mempengaruhi kelimpahan dan keanekaragaman spesies pada suatu tempat sehingga tingginya kelimpahan individu tiap jenis dapat dipakai untuk menilai kualitas suatu habitat. Sehingga tidak semua serangga yang aktif pada siang hari tidak dapat aktif di malam hari karena efek adanya sinar tergantung sepenuhnya pada kondisi temperature dan kelembaban disekitar.', + doi: 'https://doi.org/10.31234/osf.io/7mgkd', }, { id: 'https://osf.io/cegxv', @@ -314,5 +314,7 @@ export const resources: Resource[] = [ publicRegistrations: 6, publicPreprints: 3, orcid: 'https://orcid.org/0000-0003-2697-7146', + employment: 'University of Turku', + education: 'University of Turku', }, ]; diff --git a/src/app/features/search/models/resource.entity.ts b/src/app/features/search/models/resource.entity.ts index 905d3b1e6..2898c17d6 100644 --- a/src/app/features/search/models/resource.entity.ts +++ b/src/app/features/search/models/resource.entity.ts @@ -21,4 +21,6 @@ export interface Resource { publicRegistrations?: number; publicPreprints?: number; orcid?: string; + employment?: string; + education?: string; } diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index 24dc53c68..823ab02bd 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -76,7 +76,7 @@ export class SearchComponent { }) .toLowerCase() .includes(search) || - resource.from?.name.toLowerCase(), + resource.from?.name.toLowerCase().includes(search), ); }); diff --git a/src/app/shared/components/resources/resource-card/resource-card.component.html b/src/app/shared/components/resources/resource-card/resource-card.component.html index 4ffadbc70..e9b2b1f91 100644 --- a/src/app/shared/components/resources/resource-card/resource-card.component.html +++ b/src/app/shared/components/resources/resource-card/resource-card.component.html @@ -7,9 +7,9 @@
@if (item().resourceType === ResourceType.File) { -

{{ item().fileName }}

+ {{ item().fileName }} } @else { -

{{ item().title }}

+ {{ item().title }} } @if (item().orcid) { @@ -36,7 +36,9 @@

{{ item().title }}

} } @if (item().creators!.length > 4) { -

and {{ item().creators!.length - 4 }} more

+

+  and {{ item().creators!.length - 4 }} more +

}
} @@ -50,10 +52,12 @@

{{ item().title }}

} -

- Date created: {{ item().dateCreated | date: "MMMM d, y" }} | Date - modified: {{ item().dateModified | date: "MMMM d, y" }} -

+ @if (item().dateCreated && item().dateModified) { +

+ Date created: {{ item().dateCreated | date: "MMMM d, y" }} | Date + modified: {{ item().dateModified | date: "MMMM d, y" }} +

+ } @if (item().resourceType === ResourceType.Registration) {
@@ -102,7 +106,7 @@

{{ item().title }}

@if (item().provider) { -

Provider:

+

Provider: 

{{ item().provider?.name }} } @@ -114,17 +118,33 @@

{{ item().title }}

} - -

URL:

- {{ item().id }} -
+ @if (item().resourceType !== ResourceType.User) { + +

URL: 

+ {{ item().id }} +
+ } @if (item().doi) { -

DOI:

+

DOI: 

{{ item().doi }}
} + + @if (item().resourceType === ResourceType.User) { +

Public projects: {{ item().publicProjects }}

+

Public registrations: {{ item().publicRegistrations }}

+

Public preprints: {{ item().publicPreprints }}

+ } + + @if (item().employment) { +

Employment: {{ item().employment }}

+ } + + @if (item().education) { +

Education: {{ item().education }}

+ }
diff --git a/src/app/shared/components/resources/resource-card/resource-card.component.scss b/src/app/shared/components/resources/resource-card/resource-card.component.scss index 460f77cac..508b4f1b1 100644 --- a/src/app/shared/components/resources/resource-card/resource-card.component.scss +++ b/src/app/shared/components/resources/resource-card/resource-card.component.scss @@ -8,7 +8,11 @@ padding: 1.7rem; row-gap: 0.85rem; - h2 { + .title { + font-weight: 700; + font-size: 1.4rem; + line-height: 1.7rem; + color: var.$dark-blue-1; &:hover { text-decoration: underline; } diff --git a/src/assets/styles/overrides/dropdown.scss b/src/assets/styles/overrides/dropdown.scss index 498fba07c..90e836aaf 100644 --- a/src/assets/styles/overrides/dropdown.scss +++ b/src/assets/styles/overrides/dropdown.scss @@ -30,6 +30,7 @@ .p-select-label { padding: 0; + font-weight: 700; } .p-select-overlay { diff --git a/src/assets/styles/overrides/select.scss b/src/assets/styles/overrides/select.scss index 69525a108..eead30a9b 100644 --- a/src/assets/styles/overrides/select.scss +++ b/src/assets/styles/overrides/select.scss @@ -46,3 +46,11 @@ font-weight: 700; } } + +.no-border-dropdown { + .p-select-option { + span { + white-space: nowrap; + } + } +}