Skip to content
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6882f4d
refactor: update ThemeId import paths across multiple files
yvalentin Jul 30, 2025
4a898dc
feat: refactor Baserow table IDs to use configuration class
yvalentin Jul 31, 2025
17734a5
Merge branch 'fix/nx-ciruclar-deps' into feat/config-baserow
yvalentin Jul 31, 2025
265c758
refactor: remove unused BaserowFaq interface from types.ts
yvalentin Jul 31, 2025
45cd7db
feat: add Baserow FAQ interface and script for generating FAQ JSON
yvalentin Jul 31, 2025
cbb73dc
Merge branch 'main' into feat/faq-baserow
yvalentin Sep 3, 2025
7032843
feat: integrate FAQ data from Baserow and enhance FAQ structure
yvalentin Sep 8, 2025
c6fa9b3
refactor: remove obsolete FAQ JSON file and its associated class
yvalentin Sep 11, 2025
1fadfbc
feat: add tests on faq data
yvalentin Sep 11, 2025
4c72a27
Merge branch 'main' into feat/faq-baserow
yvalentin Sep 11, 2025
77f0a2d
fix: correct markdown link formatting in logger output
yvalentin Sep 11, 2025
2d93c2e
fix: update LastModificationBy type to include id and name properties
yvalentin Sep 11, 2025
e546b87
fix: improve FAQ validation by trimming whitespace from question and …
yvalentin Sep 11, 2025
48085c0
fix: remove unnecessary inheritance from AbstractBaserow in FaqBasero…
yvalentin Sep 11, 2025
750c9be
refactor: relocate static JSON files and update references across pro…
yvalentin Sep 12, 2025
d21dc72
fix: replace dynamic JSON import with static import and enhance FAQ m…
yvalentin Sep 12, 2025
244edde
feat: add unit tests for LinkValidator and extract foundLinks method …
yvalentin Sep 12, 2025
c50ba07
fix: replace dynamic JSON import with static import for testimonies i…
yvalentin Sep 15, 2025
65d4b9f
feat: enhance LinkValidator with MarkedUrl integration and update tests
yvalentin Sep 19, 2025
befff97
Merge branch 'main' into feat/faq-baserow
yvalentin Sep 19, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/database_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ '20.x' ]
node-version: [ '22.x' ]

steps:
- uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ '20.x' ]
node-version: [ '22.x' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ '20.x' ]
node-version: [ '22.x' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ '20.x' ]
node-version: [ '22.x' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -70,7 +70,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [ '20.x' ]
node-version: [ '22.x' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -88,7 +88,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down
55 changes: 52 additions & 3 deletions .github/workflows/update_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['20.x']
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -154,3 +154,52 @@ jobs:

draft: false

update-faq:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['22.x']

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- run: npm clean-install --foreground-scripts

- name: Generate FAQ
env:
BASEROW_TOKEN: '${{secrets.BASEROW_TOKEN}}'
run: npm run generate:faq

- name: Read Log File
id: read-log
run: |
echo "log_content<<EOF" >> $GITHUB_ENV
cat libs/data/generateFaqJson.log >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
with:
base: main
branch: chore/update_faq
commit-message: 'chore: update FAQ'
title: 'chore: update FAQ'
body: |
Cette pull request a été crée automatiquement pour mettre à jour les FAQ.

### :warning: Merci de bien vérifier les changements avant de merge. :warning:

### Liste de points problématiques automatiquement détectés:

:fire: :fire: :fire: :fire: critique
:fire: :fire: important
:fire: mineur
:warning: info

${{ env.log_content }}
draft: false
2 changes: 1 addition & 1 deletion apps/nuxt/src/assets/scss/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
&#{$modifier} {
position: sticky;
top: 0;
z-index: 50;
z-index: 501;
}
}
}
Expand Down
1 change: 1 addition & 0 deletions apps/nuxt/src/components/element/TeeContentBlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface Props {
}

withDefaults(defineProps<Props>(), {
title: undefined,
content: undefined,
containerFrom: undefined,
titleTag: 'h3',
Expand Down
4 changes: 2 additions & 2 deletions apps/nuxt/src/components/faq/Faq.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
</template>
<script lang="ts" setup>
import FaqSection from '@/components/faq/FaqSection.vue'
import { FaqItem } from '@/tools/faq/faqType'
import { Marked } from '@/tools/marked'
import { FaqSectionType } from '@/types'

interface Props {
faqItems: FaqItem[]
faqItems: FaqSectionType[]
}
const props = defineProps<Props>()

Expand Down
7 changes: 3 additions & 4 deletions apps/nuxt/src/components/faq/FaqCatalog.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<script lang="ts" setup>
import { FaqJson } from '@/tools/faq/FaqJson'
import { FaqPage } from '@/tools/faq/faqType'
import { FaqSectionType } from '@/types'
import Navigation from '@/tools/navigation'

interface Props {
faqPage: FaqPage
faqItems: FaqSectionType[]
hasSideMenu: boolean
}
defineProps<Props>()
Expand All @@ -23,5 +22,5 @@ defineProps<Props>()
</p>
</div>
</div>
<Faq :faq-items="FaqJson.pages[faqPage]" />
<Faq :faq-items="faqItems" />
</template>
4 changes: 2 additions & 2 deletions apps/nuxt/src/components/faq/FaqSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
</div>
</template>
<script lang="ts" setup>
import { FaqItem } from '@/tools/faq/faqType'
import { FaqSectionType } from '@/types'
import { Marked } from '@/tools/marked'

interface Props {
faqItem: FaqItem
faqItem: FaqSectionType
}
defineProps<Props>()

Expand Down
3 changes: 1 addition & 2 deletions apps/nuxt/src/components/home/TeeHomeProjectList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@
import { useProjectStore } from '@/stores/project'
import ProjectFilter from '@/tools/project/projectFilter'
import { ProjectManager } from '@/tools/project/projectManager'
import { ProjectSorter } from '@tee/data'
import { Theme } from '@/tools/theme'
import { CompanyData } from '@/tools/companyData'
import { RouteName } from '@/types'
import { RouteName, ProjectSorter } from '@/types'

interface Props {
limit: number
Expand Down
9 changes: 6 additions & 3 deletions apps/nuxt/src/components/home/TeeHomeTestimonies.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div class="fr-grid-row fr-grid-row--center fr-mt-4w">
<div class="fr-col-md-10 fr-col-xl-10">
<Testimony
<LazyTestimony
v-for="(testimony, index) in testimoniesToDisplay"
:key="testimony.slug"
:class="[index === testimoniesToDisplay.length - 1 ? 'fr-mb-md-3w fr-bg-sm--none' : 'fr-mb-6w']"
Expand All @@ -22,10 +22,13 @@
</template>

<script lang="ts" setup>
import { testimonies } from '@tee/data/static'
import { Testimony } from '@/types'

const { default: testimoniesJson } = await import('@/public/json/testimony/testimonies.json')
const testimonies = testimoniesJson as unknown as Testimony[]

const testimoniesToDisplay = testimonies
.filter((testimonie) => testimonie.homePageHighlight > 0)
.filter((testimony) => testimony.homePageHighlight > 0)
.sort((a, b) => a.homePageHighlight - b.homePageHighlight)
</script>

Expand Down
11 changes: 5 additions & 6 deletions apps/nuxt/src/components/layout/LayoutCatalog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@
:count-items="countItems"
/>
<template
v-if="$slots.faq || faqPage"
v-if="$slots.faq || faqItems"
#faq
>
<slot name="faq">
<FaqCatalog
v-if="faqPage"
:faq-page="faqPage"
v-if="faqItems"
:faq-items="faqItems"
:has-side-menu="hasSideMenu"
/>
</slot>
Expand All @@ -76,18 +76,17 @@ import FaqCatalog from '@/components/faq/FaqCatalog.vue'
import Layout from '@/components/layout/Layout.vue'
import { useFiltersStore } from '@/stores/filters'
import { useNavigationStore } from '@/stores/navigation'
import { FaqPage } from '@/tools/faq/faqType'
import Navigation from '@/tools/navigation'
import { Theme } from '@/tools/theme'
import { ThemeId } from '@/types'
import { ThemeId, FaqSectionType } from '@/types'
import { computed } from 'vue'

interface Props {
hasSideMenu: boolean
title?: string
hasError?: boolean
countItems: number
faqPage?: FaqPage
faqItems?: FaqSectionType[]
}
const props = defineProps<Props>()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
</template>

<script setup lang="ts">
import { enrichedOperators } from '@/tools/operator'
import { DsfrCheckboxSetProps } from '@gouvminint/vue-dsfr'
import { FilterItemKeys, FiltersType, OperatorFilter } from '@/types'

import { enrichedOperators } from '@tee/data/static'
import { useFiltersStore } from '@/stores/filters'

const filters: FiltersType = useFiltersStore().filters
Expand Down
4 changes: 3 additions & 1 deletion apps/nuxt/src/components/project/details/ProjectSideNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
<script setup lang="ts">
import { ProjectType } from '@/types'
import { Scroll } from '@/tools/scroll'
import { testimonies } from '@tee/data/static'
import { Testimony } from '@/types'

const testimonies: Testimony[] = []

interface Props {
project: ProjectType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
>
<template #content>
<p class="fr-hidden fr-unhidden-md fr-mb-0">Ces entreprises sont passées à l'action et en récoltent déjà les bénéfices.</p>
<Testimony
<LazyTestimony
v-for="(testimony, index) in testimoniesToDisplay"
:key="testimony.slug"
:class="[index === testimoniesToDisplay.length - 1 ? 'fr-mt-4w fr-bg-sm--none' : 'fr-mt-4w fr-mb-6w']"
Expand All @@ -21,8 +21,10 @@
</template>

<script lang="ts" setup>
import type { ProjectType } from '@/types' // adjust path as needed
import { testimonies } from '@tee/data/static'
import { ProjectType, Testimony } from '@/types' // adjust path as needed

const { default: testimoniesJson } = await import('@/public/json/testimony/testimonies.json')
const testimonies = testimoniesJson as unknown as Testimony[]

const props = defineProps<{
project: ProjectType | undefined
Expand Down
3 changes: 1 addition & 2 deletions apps/nuxt/src/components/project/list/SimpleProjectList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
</LayoutList>
</template>
<script setup lang="ts">
import { ProjectType } from '@tee/data'
import { FilterItemKeys } from '@/types'
import { FilterItemKeys, ProjectType } from '@/types'
import ProjectPriority from '@/tools/project/projectPriority'

const { filters } = storeToRefs(useFiltersStore())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
</template>
<script setup lang="ts">
import Breakpoint from '@/tools/breakpoints'
import { Color } from '@/types'
import { ProjectType } from '@tee/data'
import { Color, ProjectType } from '@/types'

export interface TrackThemeOptionProps {
value: string | undefined
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ import { useTrackStore } from '@/stores/track'
import { useUsedTrackStore } from '@/stores/usedTrack'
import { ProjectManager } from '@/tools/project/projectManager'
import ProjectFilter from '@/tools/project/projectFilter'
import type { TrackOptionItem } from '@/types'
import type { TrackOptionItem, ProjectType } from '@/types'
import { computed } from 'vue'
import { Theme } from '@/tools/theme'
import { ProjectType } from '@tee/data'
import { useProjectStore } from '@/stores/project'
import { useNavigationStore } from '@/stores/navigation'

Expand Down
11 changes: 6 additions & 5 deletions apps/nuxt/src/pages/TeeHomePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
Trouvez ici des réponses concrètes sur les aides, démarches et outils pour réussir votre transition écologique.
</p>
</div>
<Faq
:faq-items="FaqJson.pages[FaqPage.Home]"
<LazyFaq
:faq-items="faqHomeJson"
class="fr-container fr-px-md-0"
/>
</div>
Expand All @@ -40,14 +40,15 @@
<script setup lang="ts">
import { defineRouteRules } from '#imports'
import { MiddlewareName } from '@/middleware/type/middlewareName'
import { FaqPage } from '@/tools/faq/faqType'
import { MetaRobots } from '@/tools/metaRobots'
import Navigation from '@/tools/navigation'
import { FilterItemKeys, RouteName } from '@/types'
import { FaqSectionType, FilterItemKeys, RouteName } from '@/types'

const { filters } = storeToRefs(useFiltersStore())
const navigation = new Navigation()
const { FaqJson } = await import('@/tools/faq/FaqJson')

const { default: json } = await import('@/public/json/faq/home.json')
const faqHomeJson = json as unknown as FaqSectionType[]

definePageMeta({
path: '/',
Expand Down
Loading
Loading