Skip to content

Commit 29edbbd

Browse files
authored
Merge pull request #974 from dnum-mi/develop
Develop
2 parents cbc986a + d9bba2b commit 29edbbd

File tree

149 files changed

+2627
-1139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2627
-1139
lines changed

.storybook/manager.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { addons } from '@storybook/manager-api'
22
import { themes } from '@storybook/theming'
3+
34
import VueDsfrTheme from './vue-dsfr-theme.js'
45

56
addons.setConfig({

.storybook/preview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { setup } from '@storybook/vue3'
44
import { FocusTrap } from 'focus-trap-vue'
55
import { defineComponent } from 'vue'
66
import type { Preview } from '@storybook/vue3'
7+
78
import VIcon from '../src/components/VIcon/VIcon.vue'
89

910
import VueDsfrTheme from './vue-dsfr-theme.js'

.storybook/vue-dsfr-theme.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { create } from '@storybook/theming'
2+
23
import brandImage from '../src/assets/icone-marianne-seule.png'
34

45
export default create({

.vitepress/config.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { fileURLToPath, URL } from 'node:url'
33
import { whyframe } from '@whyframe/core'
44
import { whyframeVue } from '@whyframe/vue'
55
import { defineConfig } from 'vitepress'
6+
67
import { hmrFix } from './plugins/hmrFix.js'
78

89
const minimalToc = [
@@ -231,6 +232,10 @@ const composants = [
231232
text: 'DsfrModal',
232233
link: '/composants/DsfrModal.md',
233234
},
235+
{
236+
text: 'DsfrMultiselect',
237+
link: '/composants/DsfrMultiselect.md',
238+
},
234239
{
235240
text: 'DsfrNotice',
236241
link: '/composants/DsfrNotice.md',

.vitepress/plugins/hmrFix.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { fileURLToPath } from 'node:url'
2+
23
import fullReload from 'vite-plugin-full-reload'
34
import type { Plugin } from 'vitepress'
45

.vitepress/theme/Story.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
22
import { useData } from 'vitepress'
33
import { onMounted, onUnmounted, ref, watchEffect } from 'vue'
4+
45
import { useScheme, type UseSchemeResult } from '../../src/index'
56
67
withDefaults(defineProps<{

.vitepress/theme/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { RouterLink } from 'vue-router'
33
import type { Theme } from 'vitepress'
44

55
import VIcon from '../../src/components/VIcon/VIcon.vue'
6+
67
import AppColors from './AppColors.vue'
78
import AppIcons from './AppIcons.vue'
89
import Story from './Story.vue'
9-
1010
import VIconLink from './VIconLink.vue'
1111
import './official-icons.css'
1212
import '@gouvfr/dsfr/dist/utility/icons/icons.main.css'

demo-app/App.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<script setup lang="ts">
22
import { computed, ref } from 'vue'
3-
43
import { useRoute } from 'vue-router'
5-
import DsfrBreadcrumb from '../src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue'
64
5+
import DsfrBreadcrumb from '../src/components/DsfrBreadcrumb/DsfrBreadcrumb.vue'
76
import DsfrFooter from '../src/components/DsfrFooter/DsfrFooter.vue'
87
import DsfrHeader, { type DsfrHeaderProps } from '../src/components/DsfrHeader/DsfrHeader.vue'
98
import DsfrModal from '../src/components/DsfrModal/DsfrModal.vue'
109
import DsfrNavigation, { type DsfrNavigationProps } from '../src/components/DsfrNavigation/DsfrNavigation.vue'
1110
import DsfrSkipLinks, { type DsfrSkipLinksProps } from '../src/components/DsfrSkipLinks/DsfrSkipLinks.vue'
11+
1212
import AppToaster from './components/AppToaster.vue'
1313
import useToaster from './composables/use-toaster.js'
1414
@@ -280,6 +280,7 @@ const currentRoute = computed(() => route.name)
280280
v-model="search"
281281
:quick-links="quickLinks"
282282
show-search
283+
service-title="VueDSFR demo App"
283284
placeholder="Rechercher placeholder"
284285
>
285286
<template #mainnav>

demo-app/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import VueDsfr from '@/index'
2-
31
import { createApp } from 'vue'
2+
43
import App from './App.vue'
54
import router from './router.js'
5+
6+
import VueDsfr from '@/index'
67
import '@gouvfr/dsfr/dist/core/core.main.min.css'
78
import '@gouvfr/dsfr/dist/scheme/scheme.min.css'
89

demo-app/views/AppAccordions.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script setup>
2-
import DsfrAccordion from '@/components/DsfrAccordion/DsfrAccordion.vue'
2+
import { ref } from 'vue'
33
4+
import DsfrAccordion from '@/components/DsfrAccordion/DsfrAccordion.vue'
45
import DsfrAccordionsGroup from '@/components/DsfrAccordion/DsfrAccordionsGroup.vue'
56
import DsfrTranscription from '@/components/DsfrTranscription/DsfrTranscription.vue'
6-
import { ref } from 'vue'
77
88
const activeAccordion = ref(-1)
99
const activeAccordionInGroup = ref(-1)

0 commit comments

Comments
 (0)