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.

Sign up for GitHub

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

Jump to bottom

Feat/update bouquet card component on listing #599

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
+94 −205
Open

Feat/update bouquet card component on listing #599

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3b68fd
Update component
at-github Nov 22, 2024
a4d93d9
Fix layout
at-github Nov 22, 2024
8b97aba
Rename component
at-github Nov 22, 2024
c5a7533
Add description
at-github Nov 25, 2024
751ec29
Fix logo size
at-github Nov 25, 2024
aa4c071
Typo & color
at-github Nov 25, 2024
2b5d568
Fix prop
at-github Nov 27, 2024
48db2ca
Fix markdown description
at-github Nov 27, 2024
aacd34d
Reviews
at-github Nov 27, 2024
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
8 changes: 6 additions & 2 deletions src/components/bouquets/BouquetCardHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const { themeColors } = useThemeOptions(theme)

<template>
<article
class="fr-my-md-3w fr-px-3w fr-py-2w border border-default-grey fr-enlarge-link"
class="fr-my-1w fr-px-3w fr-py-2w border border-default-grey fr-enlarge-link"
>
<div
v-if="bouquet.private"
Expand All @@ -60,7 +60,7 @@ const { themeColors } = useThemeOptions(theme)
</div>
</div>
<div class="fr-grid-row fr-pt-2v">
<div class="fr-col-12 fr-col-sm-3">
<div class="fr-col-12 fr-col-sm-3 bouquet-card-col-logo">
<OrganizationLogo
v-if="bouquet.organization"
:size="64"
Expand Down Expand Up @@ -141,4 +141,8 @@ const { themeColors } = useThemeOptions(theme)
display: block;
line-height: inherit;
}

.bouquet-card-col-logo {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pas satisfait de cette astuce mais je n'ai pas réussi à avoir la même largeur de colonne juste avec le système de grille. Preneur d'une suggestion

max-width: 6.25rem;
}
</style>
15 changes: 5 additions & 10 deletions src/components/bouquets/BouquetList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { computed, onMounted } from 'vue'
import { useLoading } from 'vue-loading-overlay'
import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router'

import BouquetCard from '@/components/bouquets/BouquetCard.vue'
import { NoOptionSelected } from '@/model/theme'
import type { Topic } from '@/model/topic'
import { useTopicStore } from '@/store/TopicStore'
Expand Down Expand Up @@ -172,15 +171,11 @@ defineExpose({
</div>
</div>
<div class="bouquets-list-container fr-container fr-mb-4w border-top">
<div class="fr-grid-row fr-grid-row--gutters fr-mb-1w">
<div class="fr-col-12">
<BouquetCard
v-for="bouquet in bouquets"
:key="bouquet.id"
:bouquet="bouquet"
/>
</div>
</div>
<ul class="fr-mt-3w fr-pl-0" role="list">
<li v-for="bouquet in bouquets" :key="bouquet.id" class="fr-col-12">
<BouquetCardHome :bouquet="bouquet" />
</li>
</ul>
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion src/custom/ecospheres/views/HomeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ useHead({
</section>
<section class="fr-container fr-py-12v">
<h2>Les bouquets à découvrir</h2>
<ul class="fr-grid-row fr-grid-row--gutters" role="list">
<ul class="fr-grid-row fr-grid-row--gutters fr-mb-2w" role="list">
<li
v-for="topic in lastTopics"
:key="topic.id"
Expand Down
2 changes: 1 addition & 1 deletion src/views/bouquets/BouquetsListView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ watch(
/>
</div>
</nav>
<div className="fr-col">
<div className="fr-col-12 fr-col-md-8">
<BouquetList
ref="bouquetListComp"
:theme-name="selectedTheme"
Expand Down
Loading