Skip to content

Commit 7b2ada3

Browse files
ValentinCrochemorealanpoulain
ValentinCrochemore
authored and
alanpoulain
committed
Update components name
1 parent 9222554 commit 7b2ada3

20 files changed

+78
-78
lines changed

‎src/generators/QuasarGenerator.js

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ export default class extends BaseGenerator {
1414
]);
1515

1616
this.registerTemplates("quasar/", [
17-
// common components
18-
"components/common/ActionCellComponent.vue",
19-
"components/common/BreadcrumbComponent.vue",
20-
"components/common/ConfirmDeleteComponent.vue",
21-
"components/common/DataFilterComponent.vue",
22-
"components/common/FormRepeaterComponent.vue",
23-
"components/common/LoadingComponent.vue",
24-
"components/common/ToolbarComponent.vue",
25-
2617
// components
27-
"components/foo/CreateComponent.vue",
28-
"components/foo/FilterComponent.vue",
29-
"components/foo/FormComponent.vue",
30-
"components/foo/ListComponent.vue",
31-
"components/foo/ShowComponent.vue",
32-
"components/foo/UpdateComponent.vue",
18+
"components/foo/FooCreate.vue",
19+
"components/foo/FooFilter.vue",
20+
"components/foo/FooForm.vue",
21+
"components/foo/FooList.vue",
22+
"components/foo/FooShow.vue",
23+
"components/foo/FooUpdate.vue",
24+
25+
// common components
26+
"components/common/CommonActionCell.vue",
27+
"components/common/CommonBreadcrumb.vue",
28+
"components/common/CommonConfirmDelete.vue",
29+
"components/common/CommonDataFilter.vue",
30+
"components/common/CommonFormRepeater.vue",
31+
"components/common/CommonLoading.vue",
32+
"components/common/CommonToolbar.vue",
3333

3434
// composables
3535
"composables/breadcrumb.ts",
@@ -43,10 +43,10 @@ export default class extends BaseGenerator {
4343
"i18n/common.ts",
4444

4545
// pages
46-
"pages/foo/CreatePage.vue",
47-
"pages/foo/ListPage.vue",
48-
"pages/foo/ShowPage.vue",
49-
"pages/foo/UpdatePage.vue",
46+
"pages/foo/PageCreate.vue",
47+
"pages/foo/PageList.vue",
48+
"pages/foo/PageShow.vue",
49+
"pages/foo/PageUpdate.vue",
5050

5151
// router
5252
"router/foo.ts",
@@ -247,13 +247,13 @@ export default {
247247

248248
[
249249
// common components
250-
"components/common/ActionCellComponent.vue",
251-
"components/common/BreadcrumbComponent.vue",
252-
"components/common/ConfirmDeleteComponent.vue",
253-
"components/common/DataFilterComponent.vue",
254-
"components/common/FormRepeaterComponent.vue",
255-
"components/common/LoadingComponent.vue",
256-
"components/common/ToolbarComponent.vue",
250+
"components/common/CommonActionCell.vue",
251+
"components/common/CommonBreadcrumb.vue",
252+
"components/common/CommonConfirmDelete.vue",
253+
"components/common/CommonDataFilter.vue",
254+
"components/common/CommonFormRepeater.vue",
255+
"components/common/CommonLoading.vue",
256+
"components/common/CommonToolbar.vue",
257257

258258
// composables
259259
"composables/breadcrumb.ts",
@@ -280,18 +280,18 @@ export default {
280280

281281
[
282282
// components
283-
"components/%s/CreateComponent.vue",
284-
"components/%s/FilterComponent.vue",
285-
"components/%s/FormComponent.vue",
286-
"components/%s/ListComponent.vue",
287-
"components/%s/ShowComponent.vue",
288-
"components/%s/UpdateComponent.vue",
283+
"components/%s/%sCreate.vue",
284+
"components/%s/%sFilter.vue",
285+
"components/%s/%sForm.vue",
286+
"components/%s/%sList.vue",
287+
"components/%s/%sShow.vue",
288+
"components/%s/%sUpdate.vue",
289289

290290
// pages
291-
"pages/%s/CreatePage.vue",
292-
"pages/%s/ListPage.vue",
293-
"pages/%s/ShowPage.vue",
294-
"pages/%s/UpdatePage.vue",
291+
"pages/%s/PageCreate.vue",
292+
"pages/%s/PageList.vue",
293+
"pages/%s/PageShow.vue",
294+
"pages/%s/PageUpdate.vue",
295295

296296
// routes
297297
"router/%s.ts",
@@ -307,12 +307,12 @@ export default {
307307
"types/%s.ts",
308308
].forEach((pattern) => {
309309
if (
310-
pattern === "components/%s/FilterComponent.vue" &&
310+
pattern === "components/%s/%sFilter.vue" &&
311311
!context.parameters.length
312312
) {
313313
return;
314314
}
315-
this.createFileFromPattern(pattern, dir, [lc], context);
315+
this.createFileFromPattern(pattern, dir, [lc, titleUcFirst], context);
316316
});
317317

318318
// entrypoint

‎src/generators/QuasarGenerator.test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ test("Generate a Quasar app", async () => {
5252
"Toolbar",
5353
].forEach((name) => {
5454
expect(
55-
fs.existsSync(`${tmpobj.name}/components/common/${name}Component.vue`)
55+
fs.existsSync(`${tmpobj.name}/components/common/Common${name}.vue`)
5656
).toBe(true);
5757
});
5858

5959
// components
6060
["Create", "Form", "List", "Show", "Update"].forEach((name) => {
61-
expect(
62-
fs.existsSync(`${tmpobj.name}/components/foo/${name}Component.vue`)
63-
).toBe(true);
61+
expect(fs.existsSync(`${tmpobj.name}/components/foo/Foo${name}.vue`)).toBe(
62+
true
63+
);
6464
});
6565

6666
// i18n
@@ -69,7 +69,7 @@ test("Generate a Quasar app", async () => {
6969

7070
// pages
7171
["Create", "List", "Show", "Update"].forEach((name) => {
72-
expect(fs.existsSync(`${tmpobj.name}/pages/foo/${name}Page.vue`)).toBe(
72+
expect(fs.existsSync(`${tmpobj.name}/pages/foo/Page${name}.vue`)).toBe(
7373
true
7474
);
7575
});

‎templates/quasar/components/common/ActionCellComponent.vue renamed to ‎templates/quasar/components/common/CommonActionCell.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</template>
4141

4242
<script lang="ts" setup>
43-
import ConfirmDelete from 'src/components/common/ConfirmDeleteComponent.vue';
43+
import ConfirmDelete from 'src/components/common/CommonConfirmDelete.vue';
4444
import { ref, toRefs } from 'vue';
4545
4646
const props = defineProps<{

‎templates/quasar/components/common/BreadcrumbComponent.vue renamed to ‎templates/quasar/components/common/CommonBreadcrumb.vue

File renamed without changes.

‎templates/quasar/components/common/ConfirmDeleteComponent.vue renamed to ‎templates/quasar/components/common/CommonConfirmDelete.vue

File renamed without changes.

‎templates/quasar/components/common/DataFilterComponent.vue renamed to ‎templates/quasar/components/common/CommonDataFilter.vue

File renamed without changes.

‎templates/quasar/components/common/FormRepeaterComponent.vue renamed to ‎templates/quasar/components/common/CommonFormRepeater.vue

File renamed without changes.

‎templates/quasar/components/common/LoadingComponent.vue renamed to ‎templates/quasar/components/common/CommonLoading.vue

File renamed without changes.

‎templates/quasar/components/common/ToolbarComponent.vue renamed to ‎templates/quasar/components/common/CommonToolbar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</template>
5454

5555
<script lang="ts" setup>
56-
import ConfirmDelete from 'src/components/common/ConfirmDeleteComponent.vue';
56+
import ConfirmDelete from 'src/components/common/CommonConfirmDelete.vue';
5757
import { ref, toRefs } from 'vue';
5858
5959
const props = defineProps<{

‎templates/quasar/components/foo/CreateComponent.vue renamed to ‎templates/quasar/components/foo/FooCreate.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</template>
66
</Toolbar>
77

8-
<{{titleUcFirst}}Form :errors="violations" @submit="submitForm" />
8+
<Form :errors="violations" @submit="submitForm" />
99

1010
<Loading :showing="isLoading" />
1111
</template>
1212

1313
<script lang="ts" setup>
14-
import Toolbar from 'src/components/common/ToolbarComponent.vue';
15-
import Breadcrumb from 'src/components/common/BreadcrumbComponent.vue';
16-
import Loading from 'components/common/LoadingComponent.vue';
17-
import {{titleUcFirst}}Form from 'components/{{lc}}/FormComponent.vue';
14+
import Toolbar from 'src/components/common/CommonToolbar.vue';
15+
import Breadcrumb from 'src/components/common/CommonBreadcrumb.vue';
16+
import Loading from 'components/common/CommonLoading.vue';
17+
import Form from 'components/{{lc}}/{{titleUcFirst}}Form.vue';
1818
import { useRouter } from 'vue-router';
1919
import { use{{titleUcFirst}}CreateStore } from 'stores/{{lc}}/create';
2020
import { storeToRefs } from 'pinia';

‎templates/quasar/components/foo/FilterComponent.vue renamed to ‎templates/quasar/components/foo/FooFilter.vue

File renamed without changes.

‎templates/quasar/components/foo/FormComponent.vue renamed to ‎templates/quasar/components/foo/FooForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
:values="item.{{name}}"
88
:label="$t('{{../lc}}.{{name}}')"
99
class="col-12 col-md-8"
10-
@update="(values) => (item.{{name}} = values)"
10+
@update="(values: any) => (item.{{name}} = values)"
1111
/>
1212
{{else}}
1313
<q-input
@@ -57,7 +57,7 @@ import { {{titleUcFirst}} } from 'src/types/{{lc}}';
5757
import { SubmissionErrors } from 'src/types/error';
5858
import { Ref, ref, toRef } from 'vue';
5959
{{#if hasManyRelations}}
60-
import FormRepeater from 'src/components/common/FormRepeaterComponent.vue';
60+
import FormRepeater from 'src/components/common/CommonFormRepeater.vue';
6161
import { Item } from 'src/types/item';
6262
{{/if}}
6363
{{#if hasDateField}}

‎templates/quasar/components/foo/ListComponent.vue renamed to ‎templates/quasar/components/foo/FooList.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{#if parameters.length}}
1616
<DataFilter @filter="onSendFilter" @reset="resetFilter">
1717
<template #filter>
18-
<{{titleUcFirst}}Filter :values="filters" />
18+
<Filter :values="filters" />
1919
</template>
2020
</DataFilter>
2121
{{/if}}
@@ -124,12 +124,12 @@
124124

125125
<script lang="ts" setup>
126126
{{#if parameters.length }}
127-
import DataFilter from 'src/components/common/DataFilterComponent.vue';
128-
import {{titleUcFirst}}Filter from 'src/components/{{lc}}/FilterComponent.vue';
127+
import DataFilter from 'src/components/common/CommonDataFilter.vue';
128+
import Filter from 'src/components/{{lc}}/{{titleUcFirst}}Filter.vue';
129129
{{/if}}
130-
import Toolbar from 'src/components/common/ToolbarComponent.vue';
131-
import Breadcrumb from 'src/components/common/BreadcrumbComponent.vue';
132-
import ActionCell from 'src/components/common/ActionCellComponent.vue';
130+
import Toolbar from 'src/components/common/CommonToolbar.vue';
131+
import Breadcrumb from 'src/components/common/CommonBreadcrumb.vue';
132+
import ActionCell from 'src/components/common/CommonActionCell.vue';
133133
import { useRouter } from 'vue-router';
134134
import { useI18n } from 'vue-i18n';
135135
{{#if hasDateField}}

‎templates/quasar/components/foo/ShowComponent.vue renamed to ‎templates/quasar/components/foo/FooShow.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
</template>
100100

101101
<script lang="ts" setup>
102-
import Toolbar from 'src/components/common/ToolbarComponent.vue';
103-
import Breadcrumb from 'src/components/common/BreadcrumbComponent.vue';
104-
import Loading from 'src/components/common/LoadingComponent.vue';
102+
import Toolbar from 'src/components/common/CommonToolbar.vue';
103+
import Breadcrumb from 'src/components/common/CommonBreadcrumb.vue';
104+
import Loading from 'src/components/common/CommonLoading.vue';
105105
import { useRoute, useRouter } from 'vue-router';
106106
import { use{{titleUcFirst}}ShowStore } from 'src/stores/{{lc}}/show';
107107
import { storeToRefs } from 'pinia';

‎templates/quasar/components/foo/UpdateComponent.vue renamed to ‎templates/quasar/components/foo/FooUpdate.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77
</Toolbar>
88

9-
<{{titleUcFirst}}Form
9+
<Form
1010
v-if="item"
1111
:values="item"
1212
:errors="violations"
@@ -18,10 +18,10 @@
1818
</template>
1919

2020
<script lang="ts" setup>
21-
import Toolbar from 'components/common/ToolbarComponent.vue';
22-
import Breadcrumb from 'components/common/BreadcrumbComponent.vue';
23-
import Loading from 'components/common/LoadingComponent.vue';
24-
import {{titleUcFirst}}Form from 'components/{{lc}}/FormComponent.vue';
21+
import Toolbar from 'components/common/CommonToolbar.vue';
22+
import Breadcrumb from 'components/common/CommonBreadcrumb.vue';
23+
import Loading from 'components/common/CommonLoading.vue';
24+
import Form from 'components/{{lc}}/{{titleUcFirst}}Form.vue';
2525
import { useRoute, useRouter } from 'vue-router';
2626
import { use{{titleUcFirst}}UpdateStore } from 'src/stores/{{lc}}/update';
2727
import { storeToRefs } from 'pinia';

‎templates/quasar/pages/foo/ListPage.vue renamed to ‎templates/quasar/pages/foo/PageCreate.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<Suspense>
3-
<{{titleUcFirst}}List />
3+
<Create />
44

55
<template #fallback>Loading...</template>
66
</Suspense>
77
</template>
88

99
<script setup lang="ts">
10-
import {{titleUcFirst}}List from 'components/{{lc}}/ListComponent.vue';
10+
import Create from 'components/{{lc}}/{{titleUcFirst}}Create.vue';
1111
</script>

‎templates/quasar/pages/foo/ShowPage.vue renamed to ‎templates/quasar/pages/foo/PageList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<Suspense>
3-
<{{titleUcFirst}}Show />
3+
<List />
44

55
<template #fallback>Loading...</template>
66
</Suspense>
77
</template>
88

99
<script setup lang="ts">
10-
import {{titleUcFirst}}Show from 'components/{{lc}}/ShowComponent.vue';
10+
import List from 'components/{{lc}}/{{titleUcFirst}}List.vue';
1111
</script>

‎templates/quasar/pages/foo/CreatePage.vue renamed to ‎templates/quasar/pages/foo/PageShow.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<Suspense>
3-
<{{titleUcFirst}}Create />
3+
<Show />
44

55
<template #fallback>Loading...</template>
66
</Suspense>
77
</template>
88

99
<script setup lang="ts">
10-
import {{titleUcFirst}}Create from 'components/{{lc}}/CreateComponent.vue';
10+
import Show from 'components/{{lc}}/{{titleUcFirst}}Show.vue';
1111
</script>

‎templates/quasar/pages/foo/UpdatePage.vue renamed to ‎templates/quasar/pages/foo/PageUpdate.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<Suspense>
3-
<{{titleUcFirst}}Update />
3+
<Update />
44

55
<template #fallback>Loading...</template>
66
</Suspense>
77
</template>
88

99
<script setup lang="ts">
10-
import {{titleUcFirst}}Update from 'components/{{lc}}/UpdateComponent.vue';
10+
import Update from 'components/{{lc}}/{{titleUcFirst}}Update.vue';
1111
</script>

‎templates/quasar/router/foo.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@ export default [
2121
{
2222
name: list.label,
2323
path: '/{{name}}/',
24-
component: () => import('pages/{{lc}}/ListPage.vue'),
24+
component: () => import('pages/{{lc}}/PageList.vue'),
2525
meta: {
2626
breadcrumb: [list],
2727
},
2828
},
2929
{
3030
name: create.label,
3131
path: '/{{name}}/create',
32-
component: () => import('pages/{{lc}}/CreatePage.vue'),
32+
component: () => import('pages/{{lc}}/PageCreate.vue'),
3333
meta: {
3434
breadcrumb: [{ ...list, to: { name: list.label } }, create],
3535
},
3636
},
3737
{
3838
name: update.label,
3939
path: '/{{name}}/edit/:id',
40-
component: () => import('pages/{{lc}}/UpdatePage.vue'),
40+
component: () => import('pages/{{lc}}/PageUpdate.vue'),
4141
meta: {
4242
breadcrumb: [{ ...list, to: { name: list.label } }, update],
4343
},
4444
},
4545
{
4646
name: show.label,
4747
path: '/{{name}}/show/:id',
48-
component: () => import('pages/{{lc}}/ShowPage.vue'),
48+
component: () => import('pages/{{lc}}/PageShow.vue'),
4949
meta: {
5050
breadcrumb: [{ ...list, to: { name: list.label } }, show],
5151
},

0 commit comments

Comments
 (0)