From a1106564c1d0cf7803b671d1b82aa2851575cbe2 Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 22 Jun 2020 18:21:02 -0300 Subject: [PATCH 1/2] Replaced data with component name. Rename generator template. --- .../block/{name_sc}/data/{default.yaml => {name-sc}.yaml} | 0 .../paragraph/data/{data-en.yaml => paragraph-en.yaml} | 0 .../paragraph/data/{data-nl.yaml => paragraph-nl.yaml} | 0 .../data/{data-simple.json => paragraph-simple.json} | 0 .../block/paragraph/data/{data.js => paragraph.js} | 0 .../block/paragraph/data/{data.yaml => paragraph.yaml} | 0 .../block/two-col/data/{data.yaml => paragraph.yaml} | 0 src/data/about.yaml | 2 +- src/data/home.yaml | 6 +++--- src/data/test.js | 2 +- 10 files changed, 5 insertions(+), 5 deletions(-) rename build-tools/generator-template/block/{name_sc}/data/{default.yaml => {name-sc}.yaml} (100%) rename src/app/component/block/paragraph/data/{data-en.yaml => paragraph-en.yaml} (100%) rename src/app/component/block/paragraph/data/{data-nl.yaml => paragraph-nl.yaml} (100%) rename src/app/component/block/paragraph/data/{data-simple.json => paragraph-simple.json} (100%) rename src/app/component/block/paragraph/data/{data.js => paragraph.js} (100%) rename src/app/component/block/paragraph/data/{data.yaml => paragraph.yaml} (100%) rename src/app/component/block/two-col/data/{data.yaml => paragraph.yaml} (100%) diff --git a/build-tools/generator-template/block/{name_sc}/data/default.yaml b/build-tools/generator-template/block/{name_sc}/data/{name-sc}.yaml similarity index 100% rename from build-tools/generator-template/block/{name_sc}/data/default.yaml rename to build-tools/generator-template/block/{name_sc}/data/{name-sc}.yaml diff --git a/src/app/component/block/paragraph/data/data-en.yaml b/src/app/component/block/paragraph/data/paragraph-en.yaml similarity index 100% rename from src/app/component/block/paragraph/data/data-en.yaml rename to src/app/component/block/paragraph/data/paragraph-en.yaml diff --git a/src/app/component/block/paragraph/data/data-nl.yaml b/src/app/component/block/paragraph/data/paragraph-nl.yaml similarity index 100% rename from src/app/component/block/paragraph/data/data-nl.yaml rename to src/app/component/block/paragraph/data/paragraph-nl.yaml diff --git a/src/app/component/block/paragraph/data/data-simple.json b/src/app/component/block/paragraph/data/paragraph-simple.json similarity index 100% rename from src/app/component/block/paragraph/data/data-simple.json rename to src/app/component/block/paragraph/data/paragraph-simple.json diff --git a/src/app/component/block/paragraph/data/data.js b/src/app/component/block/paragraph/data/paragraph.js similarity index 100% rename from src/app/component/block/paragraph/data/data.js rename to src/app/component/block/paragraph/data/paragraph.js diff --git a/src/app/component/block/paragraph/data/data.yaml b/src/app/component/block/paragraph/data/paragraph.yaml similarity index 100% rename from src/app/component/block/paragraph/data/data.yaml rename to src/app/component/block/paragraph/data/paragraph.yaml diff --git a/src/app/component/block/two-col/data/data.yaml b/src/app/component/block/two-col/data/paragraph.yaml similarity index 100% rename from src/app/component/block/two-col/data/data.yaml rename to src/app/component/block/two-col/data/paragraph.yaml diff --git a/src/data/about.yaml b/src/data/about.yaml index 48db477b..abf7891a 100644 --- a/src/data/about.yaml +++ b/src/data/about.yaml @@ -12,4 +12,4 @@ blocks: data: {} - name: "paragraph" - data: "import!../app/component/block/paragraph/data/data.yaml" + data: "import!../app/component/block/paragraph/data/paragraph.yaml" diff --git a/src/data/home.yaml b/src/data/home.yaml index 7f80a1c8..8910bda5 100644 --- a/src/data/home.yaml +++ b/src/data/home.yaml @@ -11,10 +11,10 @@ blocks: data: {} - name: "paragraph" - data: "import!../app/component/block/paragraph/data/data.yaml" + data: "import!../app/component/block/paragraph/data/paragraph.yaml" - name: "paragraph" - data: "import!../app/component/block/paragraph/data/data-${language}.yaml" + data: "import!../app/component/block/paragraph/data/paragraph-${language}.yaml" - name: 'two-col' - data: 'import!../app/component/block/two-col/data/data.yaml' + data: 'import!../app/component/block/two-col/data/paragraph.yaml' diff --git a/src/data/test.js b/src/data/test.js index 334c2420..4c7df8ab 100644 --- a/src/data/test.js +++ b/src/data/test.js @@ -13,7 +13,7 @@ module.exports = () => ({ }, { name: 'paragraph', - data: 'import!../app/component/block/paragraph/data/data.js', + data: 'import!../app/component/block/paragraph/data/paragraph.js', }, ], }); From 06436bd6bb0674d17261a1490e67ed18fd3df0e3 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 23 Jun 2020 11:08:02 -0300 Subject: [PATCH 2/2] Fixed two-col.yaml naming. --- .../block/two-col/data/{paragraph.yaml => two-col.yaml} | 0 src/data/home.yaml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/app/component/block/two-col/data/{paragraph.yaml => two-col.yaml} (100%) diff --git a/src/app/component/block/two-col/data/paragraph.yaml b/src/app/component/block/two-col/data/two-col.yaml similarity index 100% rename from src/app/component/block/two-col/data/paragraph.yaml rename to src/app/component/block/two-col/data/two-col.yaml diff --git a/src/data/home.yaml b/src/data/home.yaml index 8910bda5..f6a3e7cf 100644 --- a/src/data/home.yaml +++ b/src/data/home.yaml @@ -17,4 +17,4 @@ blocks: data: "import!../app/component/block/paragraph/data/paragraph-${language}.yaml" - name: 'two-col' - data: 'import!../app/component/block/two-col/data/paragraph.yaml' + data: 'import!../app/component/block/two-col/data/two-col.yaml'