Skip to content

Commit 9f84fe2

Browse files
flashdesignoryflashdesignory
committed
run format
1 parent 6b46f41 commit 9f84fe2

File tree

3 files changed

+60
-144
lines changed

3 files changed

+60
-144
lines changed

‎resources/newssite/news-next/src/context/data-context.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const DataContextProvider = ({ children }) => {
2121
const { content } = dataSource[lang];
2222

2323
const selected = Object.create(null);
24-
Object.keys(content).forEach(key => {
24+
Object.keys(content).forEach((key) => {
2525
const { sections } = content[key];
2626

2727
const selectedSections = [];
@@ -40,22 +40,23 @@ export const DataContextProvider = ({ children }) => {
4040
for (let k = 0; k < content.length; k++)
4141
content[k].id = uuidv4();
4242
}
43+
4344
}
4445

4546
index = (index + 1) % sections.length;
4647
}
4748

4849
selected[key] = {
4950
...content[key],
50-
sections: selectedSections
51+
sections: selectedSections,
5152
};
5253
});
5354

5455
const value = {
5556
lang,
5657
dir,
5758
...dataSource[lang],
58-
content: selected
59+
content: selected,
5960
};
6061

6162
return <DataContext.Provider value={value}>{children}</DataContext.Provider>;

‎resources/newssite/news-nuxt/components/atoms/ArticleContent.vue‎

Lines changed: 52 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -18,146 +18,62 @@ export default {
1818
</script>
1919

2020
<template>
21-
<!-- type === text -->
22-
<div
23-
v-if="type === 'text'"
24-
:class="styles['article-content']"
25-
>
26-
<ArticleText :text="content" />
27-
</div>
21+
<!-- type === text -->
22+
<div v-if="type === 'text'" :class="styles['article-content']">
23+
<ArticleText :text="content" />
24+
</div>
2825

29-
<!-- type === list -->
30-
<div
31-
v-if="type === 'list'"
32-
:class="styles['article-content']"
33-
>
34-
<ul :class="[styles['article-list'], styles.vertical, { [styles[display]]: display }]">
35-
<li
36-
v-for="item in content"
37-
:key="item.id"
38-
:class="styles['article-list-item']"
39-
>
40-
<a
41-
v-if="item.url && !item.title"
42-
:href="item.url"
43-
>
44-
<ArticleText :text="item.content" />
45-
</a>
46-
<ArticleText
47-
v-else
48-
:text="item.content"
49-
/>
50-
</li>
51-
</ul>
52-
</div>
26+
<!-- type === list -->
27+
<div v-if="type === 'list'" :class="styles['article-content']">
28+
<ul :class="[styles['article-list'], styles.vertical, { [styles[display]]: display }]">
29+
<li v-for="item in content" :key="item.id" :class="styles['article-list-item']">
30+
<a v-if="item.url && !item.title" :href="item.url">
31+
<ArticleText :text="item.content" />
32+
</a>
33+
<ArticleText v-else :text="item.content" />
34+
</li>
35+
</ul>
36+
</div>
5337

54-
<!-- type === articles-list -->
55-
<div
56-
v-if="type === 'articles-list'"
57-
:class="styles['article-list-content']"
58-
>
59-
<ul :class="[styles['article-list'], styles.vertical]">
60-
<li
61-
v-for="item in content"
62-
:key="item.id"
63-
:class="styles['article-list-item']"
64-
>
65-
<ArticleText
66-
:text-class="[styles['article-title'], 'truncate-multiline', 'truncate-multiline-3']"
67-
:text="item.title"
68-
type="h3"
69-
/>
70-
<a
71-
v-if="item.url && !item.title"
72-
:href="item.url"
73-
>
74-
<ArticleText :text="item.content" />
75-
</a>
76-
<ArticleText
77-
v-else
78-
:text="item.content"
79-
/>
80-
</li>
81-
</ul>
82-
</div>
38+
<!-- type === articles-list -->
39+
<div v-if="type === 'articles-list'" :class="styles['article-list-content']">
40+
<ul :class="[styles['article-list'], styles.vertical]">
41+
<li v-for="item in content" :key="item.id" :class="styles['article-list-item']">
42+
<ArticleText :text-class="[styles['article-title'], 'truncate-multiline', 'truncate-multiline-3']" :text="item.title" type="h3" />
43+
<a v-if="item.url && !item.title" :href="item.url">
44+
<ArticleText :text="item.content" />
45+
</a>
46+
<ArticleText v-else :text="item.content" />
47+
</li>
48+
</ul>
49+
</div>
8350

84-
<!-- type === excerpt -->
85-
<ul
86-
v-if="type === 'excerpt'"
87-
:class="[styles['article-list'], styles.horizontal]"
88-
>
89-
<li
90-
v-for="item in content"
91-
:key="item.id"
92-
:class="styles['article-list-item']"
93-
>
94-
<ArticleImage
95-
:image-class="styles['article-hero']"
96-
:image="item.image"
97-
/>
98-
<div :class="styles['article-content']">
99-
<ArticleText
100-
:text-class="['truncate-multiline', 'truncate-multiline-3']"
101-
:text="item.text"
102-
type="div"
103-
/>
104-
</div>
105-
</li>
106-
</ul>
51+
<!-- type === excerpt -->
52+
<ul v-if="type === 'excerpt'" :class="[styles['article-list'], styles.horizontal]">
53+
<li v-for="item in content" :key="item.id" :class="styles['article-list-item']">
54+
<ArticleImage :image-class="styles['article-hero']" :image="item.image" />
55+
<div :class="styles['article-content']">
56+
<ArticleText :text-class="['truncate-multiline', 'truncate-multiline-3']" :text="item.text" type="div" />
57+
</div>
58+
</li>
59+
</ul>
10760

108-
<!-- type === grid -->
109-
<div
110-
v-if="type === 'grid'"
111-
:class="[layoutStyles['grid-container'], { [layoutStyles[display]]: display }]"
112-
>
113-
<div
114-
v-for="item in content"
115-
:key="item.id"
116-
:class="layoutStyles['grid-item']"
117-
>
118-
<ArticleImage
119-
:image-class="styles['article-image-container']"
120-
:image="item.image"
121-
:meta="item.meta"
122-
/>
123-
<a
124-
v-if="item.url"
125-
:href="item.url"
126-
>
127-
<ArticleText
128-
:text-class="[styles['article-content'], 'truncate-multiline', 'truncate-multiline-3']"
129-
:text="item.text"
130-
type="h3"
131-
/>
132-
</a>
133-
<ArticleText
134-
v-else
135-
:text-class="[styles['article-content'], 'truncate-multiline', 'truncate-multiline-3']"
136-
:text="item.text"
137-
type="h3"
138-
/>
61+
<!-- type === grid -->
62+
<div v-if="type === 'grid'" :class="[layoutStyles['grid-container'], { [layoutStyles[display]]: display }]">
63+
<div v-for="item in content" :key="item.id" :class="layoutStyles['grid-item']">
64+
<ArticleImage :image-class="styles['article-image-container']" :image="item.image" :meta="item.meta" />
65+
<a v-if="item.url" :href="item.url">
66+
<ArticleText :text-class="[styles['article-content'], 'truncate-multiline', 'truncate-multiline-3']" :text="item.text" type="h3" />
67+
</a>
68+
<ArticleText v-else :text-class="[styles['article-content'], 'truncate-multiline', 'truncate-multiline-3']" :text="item.text" type="h3" />
69+
</div>
13970
</div>
140-
</div>
14171

142-
<!-- type === preview -->
143-
<ul
144-
v-if="type === 'preview'"
145-
:class="[styles['article-list'], styles.vertical]"
146-
>
147-
<li
148-
v-for="item in content"
149-
:key="item.id"
150-
:class="styles['article-list-item']"
151-
>
152-
<ArticleImage
153-
:image-class="styles['article-image-container']"
154-
:image="item.image"
155-
/>
156-
<ArticleText
157-
:text-class="[styles['article-title'], 'truncate-multiline', 'truncate-multiline-3']"
158-
:text="item.title"
159-
type="h3"
160-
/>
161-
</li>
162-
</ul>
72+
<!-- type === preview -->
73+
<ul v-if="type === 'preview'" :class="[styles['article-list'], styles.vertical]">
74+
<li v-for="item in content" :key="item.id" :class="styles['article-list-item']">
75+
<ArticleImage :image-class="styles['article-image-container']" :image="item.image" />
76+
<ArticleText :text-class="[styles['article-title'], 'truncate-multiline', 'truncate-multiline-3']" :text="item.title" type="h3" />
77+
</li>
78+
</ul>
16379
</template>

‎resources/newssite/news-nuxt/composables/provide-locale.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function provideLocale() {
2121
const { content } = dataSource[lang];
2222

2323
const selected = Object.create(null);
24-
Object.keys(content).forEach(key => {
24+
Object.keys(content).forEach((key) => {
2525
const { sections } = content[key];
2626

2727
const selectedSections = [];
@@ -37,8 +37,7 @@ export function provideLocale() {
3737
articles[j].id = uuidv4();
3838
const { content } = articles[j];
3939
if (Array.isArray(content)) {
40-
for (let k = 0; k < content.length; k++)
41-
content[k].id = uuidv4();
40+
for (let k = 0; k < content.length; k++) content[k].id = uuidv4();
4241
}
4342
}
4443

@@ -47,15 +46,15 @@ export function provideLocale() {
4746

4847
selected[key] = {
4948
...content[key],
50-
sections: selectedSections
49+
sections: selectedSections,
5150
};
5251
});
5352

5453
const value = {
5554
lang,
5655
dir,
5756
...dataSource[lang],
58-
content: selected
57+
content: selected,
5958
};
6059

6160
provide("data", value);

0 commit comments

Comments
 (0)