Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(directory): Add front page categories #4560

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added apps/directory/public/img/bacterial-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/blood-sample-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/brain-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/coronavirus-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/heart-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/infected-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/metabolism-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/pediatrics-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/ribbon-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/directory/public/img/statistics-blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions apps/directory/src/components/ImageCard.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<template>
<div
class="card text-center img-thumbnail"
style="width: 10rem; height: 10rem; min-width: 10rem"
>
<div class="p-2">
<img
:src="imageSrc"
class="card-img-top"
alt="altText"
style="width: 5rem; height: 5rem"
/>
</div>

<div class="card-body" style="padding: 5px 5px">
<router-link v-if="to" :to="to" class="stretched-link"
><h6 class="card-title">{{ label }}</h6></router-link
>
<h6 class="card-title" v-else>{{ label }}</h6>
</div>
</div>
</template>

<script setup lang="ts">
import { RouteLocationRaw } from "vue-router";

defineProps<{
imageSrc: string;
altText: string;
label: string;
to?: RouteLocationRaw;
}>();
</script>

<style scoped>
.card {
border-radius: 1rem;
border: #003675 2px solid;
transition: 0.3s;
box-shadow: 0px 2px 0px #003675;
}

.card:hover {
background-color: #f8f9fa;
cursor: pointer;
box-shadow: 0px 4px 0px #003675;
transform: scale(1.1);
}

.card-title {
color: #003675;
}
</style>
40 changes: 30 additions & 10 deletions apps/directory/src/components/configuration/LandingpageEditor.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
<template>
<!-- todo: break this into components or something. -->
<div class="container-fluid p-0 landingpage-editor" v-if="newConfigReady">
<div class="d-flex">
<label
><input
<form>
<div class="form-group form-check">
<input
type="checkbox"
class="mr-2"
v-model="newConfig.landingpage.enabled"
class="form-check-input"
id="landingpageEnabled"
@change="save"
/>Landingpage enabled</label
>
</div>
v-model="newConfig.landingpage.enabled"
/>
<label class="form-check-label" for="landingpageEnabled"
>Landingpage enabled</label
>
</div>
<div class="form-group">
<label for="landingpageHeaderInput">Landingpage header</label>
<input
class="form-control"
id="landingpageHeaderInput"
aria-describedby="landing page header"
v-model="newConfig.landingpage.headerText"
@input="save"
/>
<small id="emailHelp" class="form-text text-muted"
>Main landing page header</small
>
</div>
</form>

<div>
<landingpage :key="revision" editable @open="openModal" />
</div>
Expand Down Expand Up @@ -352,6 +370,7 @@ export default {
this.editorOpen = true;
},
save() {
console.log("saving", this.newConfig);
this.settingsStore.UpdateConfig(this.newConfig);
this.$emit("save", JSON.stringify(this.newConfig));
this.editorOpen = false;
Expand Down Expand Up @@ -384,11 +403,12 @@ export default {
position: relative;
}

label {
dialog label {
display: flex;
justify-content: space-between;
}
input,

dialog input,
textarea {
margin-left: 1rem;
}
Expand Down
1 change: 1 addition & 0 deletions apps/directory/src/property-config/initialLandingpage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const initialLandingpage = {
enabled: false,
headerText: "Search the BBMRI-ERIC Directory by category",
page_header: "BBMRI-ERIC Directory",
goto_catalogue_link: "Browse the catalogue",
page_search: {
Expand Down
240 changes: 170 additions & 70 deletions apps/directory/src/views/Landingpage.vue
Original file line number Diff line number Diff line change
@@ -1,25 +1,123 @@
<template>
<main>
<section class="d-flex justify-content-center">
<landingpage-header
:header-text="pageHeader"
:linkText="gotoCatalogue"
:css="landingpageCss"
>
<landingpage-search
:buttonText="search.buttonText"
:ariaLabel="search.ariaLabel"
:searchPlaceholder="search.searchPlaceholder"
:css="landingpageCss"
/>
<button
class="edit-button header-section"
@click="$emit('open', 'landingpage-header')"
v-if="editable"
<section class="w-75 mx-auto">
<h1 class="text-center py-5">
{{ headerText }}
</h1>
<div class="row">
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Autoimmune Diseases"
image-src="img/bacterial-blue.png"
alt-text="bacterial"
:to="{ name: 'catalogue', query: { Categories: 'autoimmune' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Cardiovascular Deseases"
image-src="img/heart-blue.png"
alt-text="bacterial"
:to="{ name: 'catalogue', query: { Categories: 'cardiovascular' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="COVID 19"
image-src="img/coronavirus-blue.png"
alt-text="coronavirus"
:to="{ name: 'catalogue', query: { Categories: 'covid19' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Infectious Diseases"
image-src="img/infected-blue.png"
alt-text="infected"
:to="{ name: 'catalogue', query: { Categories: 'infectious' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Metabolic Disorders"
image-src="img/metabolism-blue.png"
alt-text="metabolism"
:to="{ name: 'catalogue', query: { Categories: 'metabolic' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Nervous System Disorders"
image-src="img/brain-blue.png"
alt-text="brain"
:to="{ name: 'catalogue', query: { Categories: 'nervous_system' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Oncology"
image-src="img/ribbon-blue.png"
alt-text="Oncology"
:to="{ name: 'catalogue', query: { Categories: 'oncology' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Pediatrics"
image-src="img/pediatrics-blue.png"
alt-text="pediatrics"
:to="{ name: 'catalogue', query: { Categories: 'paediatrics' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
Edit
</button>
</landingpage-header>
<ImageCard
label="Population Reference"
image-src="img/blood-sample-blue.png"
alt-text="Population Reference"
:to="{ name: 'catalogue', query: { Categories: 'population' } }"
/>
</div>
<div
class="col-sm-6 col-md-4 col-xl-3 d-flex justify-content-center pb-3"
>
<ImageCard
label="Rare Diseases"
image-src="img/statistics-blue.png"
alt-text="Rare Diseases"
:to="{ name: 'catalogue', query: { Categories: 'rare_disease' } }"
/>
</div>
<div
class="col-sm-12 col-md-8 col-xl-6 cards-section-other d-flex justify-content-center align-items-center"
>
<div>
<p>or proceed to the directory without any selection</p>
<router-link
class="btn btn-lg btn-outline-secondary btn-block"
to="/catalogue"
>Directory</router-link
>
</div>
</div>
</div>
</section>
<section
class="d-flex justify-content-between mx-5 my-5 cta-container w-75 mx-auto"
Expand Down Expand Up @@ -72,63 +170,61 @@
</main>
</template>

<script>
<script setup lang="ts">
import LandingpageBiobankSpotlight from "../components/landingpage-components/LandingpageBiobankSpotlight.vue";
import LandingpageCallToAction from "../components/landingpage-components/LandingpageCallToAction.vue";
import LandingpageHeader from "../components/landingpage-components/LandingpageHeader.vue";
import LandingpageCollectionSpotlight from "../components/landingpage-components/LandingpageCollectionSpotlight.vue";
import LandingpageSearch from "../components/landingpage-components/LandingpageSearch.vue";
import { useSettingsStore } from "../stores/settingsStore";
import ImageCard from "../components/ImageCard.vue";
import Button from "../components/Button.vue";
import { computed } from "vue";
import router from "../router";

const settingsStore = useSettingsStore();

export default {
setup() {
const settingsStore = useSettingsStore();
withDefaults(
defineProps<{
editable: boolean;
}>(),
{
editable: false,
}
);

interface ILandingpageConfig {
headerText?: string;
page_biobank_spotlight?: {
header?: string;
biobankName?: string;
biobankId?: string;
bodyHtml?: string;
buttonText?: string;
};
page_collection_spotlight?: any;
page_call_to_actions?: any;
css?: any;
}

return { settingsStore };
},
props: {
editable: {
type: Boolean,
required: false,
default: () => false,
},
},
components: {
LandingpageHeader,
LandingpageSearch,
LandingpageCallToAction,
LandingpageBiobankSpotlight,
LandingpageCollectionSpotlight,
},
computed: {
landingpage() {
if (this.settingsStore.configurationFetched) {
return this.settingsStore.config.landingpage;
} else return this.settingsStore.config;
},
pageHeader() {
return this.landingpage.page_header;
},
gotoCatalogue() {
return this.landingpage.goto_catalogue_link;
},
search() {
return this.landingpage.page_search;
},
biobankSpotlight() {
return this.landingpage.page_biobank_spotlight;
},
collectionSpotlight() {
return this.landingpage.page_collection_spotlight;
},
callToActions() {
return this.landingpage.page_call_to_actions;
},
landingpageCss() {
return this.landingpage.css;
},
},
};
const landingpage = computed(() =>
settingsStore.configurationFetched
? (settingsStore.config.landingpage as ILandingpageConfig)
: (settingsStore.config as ILandingpageConfig)
);

const biobankSpotlight = computed(
() => landingpage.value.page_biobank_spotlight || {}
);
const collectionSpotlight = computed(
() => landingpage.value.page_collection_spotlight
);
const callToActions = computed(() => landingpage.value.page_call_to_actions);
const landingpageCss = computed(() => landingpage.value.css);

const headerText = computed(
() =>
landingpage.value.headerText ??
"Search the BBMRI-ERIC Directory by category"
);
</script>

<style scoped>
Expand Down Expand Up @@ -159,4 +255,8 @@ section {
top: 2%;
right: 2%;
}

.cards-section-other {
color: #003675;
}
</style>
Loading
Loading