Skip to content
This repository was archived by the owner on Nov 21, 2023. It is now read-only.

Commit 8bf77cd

Browse files
sebousansebousan
authored
Merge pull request #8 from arthaud-proust-rd/feature/simplify-imports
Simplification des imports
2 parents f662c30 + 33552fe commit 8bf77cd

File tree

5 files changed

+63
-115
lines changed

5 files changed

+63
-115
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
.idea/

‎admin/app/blocks/blocks.js

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,11 @@
1-
// Available blocks
2-
import { availableBlocks } from '../settings/available-blocks.js';
3-
4-
// import all blocks
5-
import { block_alert } from './alert.js'
6-
import { block_cta } from './cta.js'
7-
import { block_chart } from './chart.js'
8-
import { block_quote } from './quote.js'
9-
import { block_editorial } from './editorial.js'
10-
import { block_embed } from './embed.js'
11-
import { block_faq } from './faq.js'
12-
import { block_figure } from './figure.js'
13-
import { block_form } from './form.js'
14-
import { block_datas } from './datas.js'
15-
import { block_images } from './images.js'
16-
import { block_instagram } from './instagram.js'
17-
import { block_gallery } from './gallery.js'
18-
import { block_informations } from './informations.js'
19-
import { block_latest } from './latest.js'
20-
import { block_map } from './map.js'
21-
import { block_newsletter } from './newsletter.js'
22-
import { block_paragraph } from './paragraph.js'
23-
import { block_pushes } from './pushes.js'
24-
import { block_selectedcasestudies } from './selected-casestudies.js'
25-
import { block_selectedpersons } from './selected-persons.js'
26-
import { block_selectedposts } from './selected-posts.js'
27-
import { block_selectedprojects } from './selected-projects.js'
28-
import { block_selectedpublications } from './selected-publications.js'
29-
import { block_title } from './title.js'
30-
31-
// add selected blocks
32-
const selectedBlocks = [];
33-
availableBlocks.forEach(element => {
34-
selectedBlocks.push(eval('block_' + element));
35-
});
1+
import * as availableBlocks from '../settings/available-blocks.js';
362

373
export const blocks = {
384
name: 'blocks',
395
label: 'Blocs de contenu',
406
label_singular: 'Bloc de contenu',
417
widget: 'list',
428
collapsed: false,
43-
types: selectedBlocks,
9+
types: Object.values(availableBlocks),
4410
i18n: true
4511
};

‎admin/app/collections.js

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,14 @@
1-
// Config
2-
import config from './config.js';
3-
4-
// Available collections
5-
import { availableCollections } from './settings/available-collections.js';
6-
7-
// Collections
8-
let filesToImport = [];
9-
let selectedCollections = [];
10-
11-
// add mandory collections
12-
filesToImport.push('./content/indexes.js');
13-
filesToImport.push('./content/pages.js');
14-
selectedCollections = [{},{}];
15-
16-
// add selected collections
17-
availableCollections.forEach(element => {
18-
let file = './content/' + element + '.js';
19-
filesToImport.push(file);
20-
selectedCollections.push({});
21-
});
22-
23-
// add data
24-
filesToImport.push('./data/config.js');
25-
selectedCollections.push({});
26-
27-
// Import and init
28-
const countFilesToImport = filesToImport.length;
29-
let i = 0;
30-
for (const file of filesToImport) {
31-
import(file).then((module) => {
32-
// add collections with order respect
33-
let index = filesToImport.indexOf(file);
34-
selectedCollections.splice(index, 1, module.default);
35-
// Init
36-
i += 1;
37-
if (i === countFilesToImport) {
38-
config.collections = selectedCollections;
39-
window.initCMS({ config });
40-
}
41-
});
42-
}
1+
import hugolifyConfig from './config.js';
2+
3+
import indexes from "./content/indexes.js";
4+
import pages from "./content/pages.js";
5+
import availableCollections from './settings/available-collections.js';
6+
import config from "./data/config.js";
7+
8+
hugolifyConfig.collections = [
9+
indexes,
10+
pages,
11+
...availableCollections,
12+
config
13+
];
14+
window.initCMS({ config: hugolifyConfig });

‎admin/app/settings/available-blocks.js

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
export const availableBlocks = [
2-
'alert',
3-
'cta',
4-
'informations',
5-
'pushes',
6-
'datas',
7-
'map',
8-
'quote',
9-
'latest',
10-
'editorial',
11-
'embed',
12-
'faq',
13-
'figure',
14-
'gallery',
15-
'chart',
16-
'images',
17-
'instagram',
18-
'newsletter',
19-
'paragraph',
20-
'selectedposts',
21-
'selectedcasestudies',
22-
'selectedpersons',
23-
'selectedprojects',
24-
'selectedpublications',
25-
'title'
26-
];
1+
export { block_alert } from "../blocks/alert.js"
2+
export { block_cta } from "../blocks/cta.js"
3+
export { block_informations } from "../blocks/informations.js"
4+
export { block_pushes } from "../blocks/pushes.js"
5+
export { block_datas } from "../blocks/datas.js"
6+
export { block_map } from "../blocks/map.js"
7+
export { block_quote } from "../blocks/quote.js"
8+
export { block_latest } from "../blocks/latest.js"
9+
export { block_editorial } from "../blocks/editorial.js"
10+
export { block_embed } from "../blocks/embed.js"
11+
export { block_faq } from "../blocks/faq.js"
12+
export { block_figure } from "../blocks/figure.js"
13+
export { block_gallery } from "../blocks/gallery.js"
14+
export { block_chart } from "../blocks/chart.js"
15+
export { block_images } from "../blocks/images.js"
16+
export { block_instagram } from "../blocks/instagram.js"
17+
export { block_newsletter } from "../blocks/newsletter.js"
18+
export { block_paragraph } from "../blocks/paragraph.js"
19+
export { block_selectedposts } from "../blocks/selected-posts.js"
20+
export { block_selectedcasestudies } from "../blocks/selected-casestudies.js"
21+
export { block_selectedpersons } from "../blocks/selected-persons.js"
22+
export { block_selectedprojects } from "../blocks/selected-projects.js"
23+
export { block_selectedpublications } from "../blocks/selected-publications.js"
24+
export { block_title } from "../blocks/title.js"

‎admin/app/settings/available-collections.js

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
export const availableCollections = [
2-
'posts',
3-
'categories',
4-
'tags',
5-
'projects',
6-
'projects_types',
7-
'projects_tags',
8-
'casestudies',
9-
'publications',
10-
'persons'
11-
];
1+
import posts from '../content/posts.js'
2+
import categories from '../content/categories.js'
3+
import tags from '../content/tags.js'
4+
import projects from '../content/projects.js'
5+
import projects_types from '../content/projects_types.js'
6+
import projects_tags from '../content/projects_tags.js'
7+
import casestudies from '../content/casestudies.js'
8+
import publications from '../content/publications.js'
9+
import persons from '../content/persons.js'
10+
11+
export default [
12+
posts,
13+
categories,
14+
tags,
15+
projects,
16+
projects_types,
17+
projects_tags,
18+
casestudies,
19+
publications,
20+
persons
21+
]

0 commit comments

Comments
 (0)