Skip to content
This repository was archived by the owner on Apr 15, 2025. It is now read-only.

Commit 74cc2e2

Browse files
ThornWalliThornWalli
committed
fix(update): add fonts and prepare for lighthouse
1 parent ed2b2b4 commit 74cc2e2

File tree

102 files changed

+622
-267
lines changed

Some content is hidden

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

102 files changed

+622
-267
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ logs
2626
sw.*
2727
env/cert/*
2828
!env/cert/README.md
29+
.env

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
- Headline ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Headline/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Headline/default.vue))
1818
- Icon ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Icon/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Icon/default.vue))
1919
- Link ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Link/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Link/default.vue))
20-
- RichText ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/RichText/index.vue)) | | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/RichText/default.vue))
21-
- Slider ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/index.vue)) | | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/default.vue))
22-
- Slide ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/Slide/index.vue)) | | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/Slide/default.vue))
20+
- RichText ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/RichText/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/RichText/default.vue))
21+
- Slider ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/default.vue))
22+
- Slide ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/Slide/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Slider/Slide/default.vue))
2323
- Svg ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Svg/index.vue))
24-
- Toggle ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/index.vue)) | | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/default.vue))
25-
- Toggle ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/index.vue)) | | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/default.vue))
24+
- Toggle ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/default.vue))
25+
- Toggle ([index](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/index.vue)) | ([default](https://github.com/GrabarzUndPartner/foundation/blob/main/packages/core/Toggle/default.vue))
2626

2727

2828
### Mutations

‎package-lock.json‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/core/Headline/index.vue‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<component :is="`h${level}`" v-bind="$attrs" v-on="$listeners">
2+
<component :is="`h${level}`" v-font="font" v-bind="$attrs" v-on="$listeners">
33
<slot />
44
</component>
55
</template>
@@ -12,6 +12,12 @@ export default {
1212
level: {
1313
type: Number,
1414
default: 1
15+
},
16+
font: {
17+
type: [Object, Array],
18+
default () {
19+
return [];
20+
}
1521
}
1622
}
1723
};

‎packages/core/RichText/index.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
2-
<div v-if="$slots.default">
2+
<div v-if="$slots.default" v-font="font">
33
<slot :value="value" />
44
</div>
5-
<div v-else v-html="value" />
5+
<div v-else v-font="font" v-html="value" />
66
</template>
77

88
<script>
@@ -12,6 +12,12 @@ export default {
1212
value: {
1313
type: String,
1414
default: null
15+
},
16+
font: {
17+
type: [Object, Array],
18+
default () {
19+
return [];
20+
}
1521
}
1622
}
1723
};

‎packages/core/Slider/Slide/index.vue‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<component :is="component" class="splide__slide">
2+
<component :is="component" :id="`${splideId}-slide${String(index + 1).padStart(2, '0')}`" class="splide__slide">
33
<slot />
44
</component>
55
</template>
@@ -11,6 +11,14 @@ export default {
1111
component: {
1212
type: [String, Function, Object],
1313
default: 'div'
14+
},
15+
splideId: {
16+
type: String,
17+
required: true
18+
},
19+
index: {
20+
type: Number,
21+
required: true
1422
}
1523
}
1624
};

‎packages/core/Slider/default.vue‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
11
<template>
22
<base-slider class="design-default" v-bind="$attrs" v-on="$listeners">
3-
<template #default>
3+
<template #default="{splideId}">
44
<slot>
5-
<default-slide>Default Slide 1</default-slide>
6-
<default-slide>Default Slide 2</default-slide>
7-
<default-slide>Default Slide 3</default-slide>
5+
<default-slide :index="0" :splide-id="splideId">
6+
Default Slide 1
7+
</default-slide>
8+
<default-slide :index="1" :splide-id="splideId">
9+
Default Slide 2
10+
</default-slide>
11+
<default-slide :index="2" :splide-id="splideId">
12+
Default Slide 3
13+
</default-slide>
814
</slot>
915
</template>
1016

11-
<template #afterList="{go, hasNext, hasPrev}">
12-
<base-button class="navigation" :disabled="!hasPrev" :aria-label="ariaLabel.prev" :aria-controls="`Slider${_uid}-track`" @click="go('<')">
17+
<template #afterList="{splideId, go, hasNext, hasPrev}">
18+
<base-button class="navigation" :disabled="!hasPrev" :aria-label="ariaLabel.prev" :aria-controls="`${splideId}-track`" @click="go('<')">
1319
Prev
1420
</base-button>
15-
<base-button class="navigation prev" :disabled="!hasNext" :aria-label="ariaLabel.next" :aria-controls="`Slider${_uid}-track`" @click="go('>')">
21+
<base-button class="navigation prev" :disabled="!hasNext" :aria-label="ariaLabel.next" :aria-controls="`${splideId}-track`" @click="go('>')">
1622
Next
1723
</base-button>
1824
</template>
1925

20-
<template #afterTrack="{length, index:currentIndex, go, hasNext, hasPrev}">
26+
<template #afterTrack="{splideId, length, index:currentIndex, go, hasNext, hasPrev}">
2127
<div class="pagination">
22-
<base-button :disabled="!hasPrev" :aria-label="ariaLabel.prev" :aria-controls="`Slider${_uid}-track`" @click="go('<')">
28+
<base-button :disabled="!hasPrev" :aria-label="ariaLabel.prev" :aria-controls="`${splideId}-track`" @click="go('<')">
2329
Prev
2430
</base-button>
2531
<ul>
2632
<li v-for="index in length" :key="index">
27-
<base-button :disabled="(index-1) === currentIndex" :aria-label="`${ariaLabel.slide}${(index-1)}`" :aria-controls="`Slider${_uid}-slide${(index-1)}`" @click="go((index-1))">
33+
<base-button :disabled="(index-1) === currentIndex" :aria-label="`${ariaLabel.slide}${(index-1)}`" :aria-controls="`${splideId}-slide${(index-1)}`" @click="go((index-1))">
2834
{{ index }}
2935
</base-button>
3036
</li>
3137
</ul>
3238
<span>{{ currentIndex + 1 }} / {{ length }}</span>
33-
<base-button :disabled="!hasNext" :aria-label="ariaLabel.next" :aria-controls="`Slider${_uid}-track`" @click="go('>')">
39+
<base-button :disabled="!hasNext" :aria-label="ariaLabel.next" :aria-controls="`${splideId}-track`" @click="go('>')">
3440
Next
3541
</base-button>
3642
</div>

‎packages/core/Slider/index.vue‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
<template>
22
<div>
33
<div ref="slider">
4-
<slot name="beforeTrack" v-bind="{index, length, go, hasNext, hasPrev}" />
5-
<div class="splide__track">
6-
<slot name="beforeList" v-bind="{index, length, go, hasNext, hasPrev}" />
4+
<slot name="beforeTrack" v-bind="{splideId, index, length, go, hasNext, hasPrev}" />
5+
<div :id="`${splideId}-track`" class="splide__track">
6+
<slot name="beforeList" v-bind="{splideId, index, length, go, hasNext, hasPrev}" />
77
<component :is="listTag" class="splide__list">
8-
<slot v-bind="{index, length, go, hasNext, hasPrev}">
9-
<base-slide>Slide 1</base-slide>
10-
<base-slide>Slide 2</base-slide>
11-
<base-slide>Slide 3</base-slide>
8+
<slot v-bind="{splideId, index, length, go, hasNext, hasPrev}">
9+
<base-slide :index="0" :splide-id="splideId">
10+
Slide 1
11+
</base-slide>
12+
<base-slide :index="1" :splide-id="splideId">
13+
Slide 2
14+
</base-slide>
15+
<base-slide :index="2" :splide-id="splideId">
16+
Slide 3
17+
</base-slide>
1218
</slot>
1319
</component>
14-
<slot name="afterList" v-bind="{index, length, go, hasNext, hasPrev}" />
20+
<slot name="afterList" v-bind="{splideId, index, length, go, hasNext, hasPrev}" />
1521
</div>
16-
<slot name="afterTrack" v-bind="{index, length, go, hasNext, hasPrev}" />
22+
<slot name="afterTrack" v-bind="{splideId, index, length, go, hasNext, hasPrev}" />
1723
</div>
1824
</div>
1925
</template>
@@ -22,15 +28,15 @@
2228
import { getSplide } from './utils';
2329
import BaseSlide from './Slide';
2430
31+
let sliderIndex = 1;
2532
export default {
2633
components: { BaseSlide },
2734
props: {
2835
// https://splidejs.com/guides/options/
2936
options: {
3037
type: Object,
3138
default () {
32-
return {
33-
};
39+
return {};
3440
}
3541
},
3642
// https://splidejs.com/extensions/
@@ -54,6 +60,7 @@ export default {
5460
go: null,
5561
states: null,
5662
splide: null,
63+
splideId: null,
5764
splideWrapper: { splide: null }
5865
};
5966
},
@@ -76,10 +83,16 @@ export default {
7683
}
7784
},
7885
86+
created () {
87+
this.splideId = `splide${String(sliderIndex).padStart(2, '0')}`;
88+
sliderIndex++;
89+
},
90+
7991
async mounted () {
8092
const { Splide, STATES, extensions } = await getSplide();
8193
const { Intersection } = extensions;
8294
this.states = STATES;
95+
8396
this.splide = new Splide(this.$refs.slider, {
8497
...this.options,
8598
pagination: false,
@@ -94,11 +107,15 @@ export default {
94107
}
95108
}
96109
});
110+
97111
this.go = this.splide.go.bind(this.splide);
112+
98113
this.splide.on('moved', index => (this.index = index));
99114
this.splide.on('mounted', () => {
115+
this.splideId = this.splide.root.id;
100116
this.ready = true;
101117
});
118+
102119
this.$nextTick(() => {
103120
this.splide.mount({ ...extensions, Intersection });
104121
});

‎packages/core/base/Select.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ const isChecked = (context) => {
8080

8181
<style lang="postcss" scoped>
8282
input.hidden {
83+
position: absolute;
8384
width: 0;
8485
height: 0;
8586
opacity: 0;

‎packages/sample/ImageText/index.vue‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)