Skip to content

Commit 8d40bd7

Browse files
committed
Continue refactoring
* Move `TemporalityProfileEditWizardStep` to where it is used in `Pages/ManageWiki/cards` * Remove `dissmissable` property from `TemporalityCreateWikiWizardStep` and the optional close-dialog icon that will never be displayed * Remove `dissmissable` property from `TemporalityProfileEditWizardStep` and the `v-if` logic for the close-dialog icon as that will always be displayed * Remove unused `buttonText` property from `CreateWiki`
1 parent 2568e2e commit 8d40bd7

5 files changed

Lines changed: 19 additions & 28 deletions

File tree

src/components/Cards/CreateWiki.vue

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<v-form @submit="createWiki">
3-
<step-one-card
3+
<SiteDetailsCreateWikiWizardStep
44
v-show="step === 1"
55
:title="title"
66
:inFlight="inFlight"
@@ -12,7 +12,7 @@
1212
@next-step="goToStep(2)"
1313
/>
1414

15-
<step-two-card
15+
<AudienceAndPurposeWizardStep
1616
v-show="step === 2"
1717
:title="title"
1818
:inFlight="inFlight"
@@ -22,7 +22,7 @@
2222
@next-step="goToStep(3)"
2323
/>
2424

25-
<step-three-card
25+
<TemporalityCreateWikiWizardStep
2626
v-show="step === 3"
2727
:title="title"
2828
:inFlight="inFlight"
@@ -39,17 +39,17 @@
3939
import config from '~/config'
4040
import SiteDetailsCreateWikiWizardStep from './SiteDetailsCreateWikiWizardStep.vue'
4141
import AudienceAndPurposeWizardStep from './AudienceAndPurposeWizardStep.vue'
42-
import TemporalityProfileEditWizardStep from './TemporalityProfileEditWizardStep.vue'
42+
import TemporalityCreateWikiWizardStep from './TemporalityCreateWikiWizardStep.vue'
43+
4344
export default {
4445
name: 'CreateWiki',
4546
components: {
46-
StepOneCard: SiteDetailsCreateWikiWizardStep,
47-
StepTwoCard: AudienceAndPurposeWizardStep,
48-
StepThreeCard: TemporalityProfileEditWizardStep,
47+
SiteDetailsCreateWikiWizardStep,
48+
AudienceAndPurposeWizardStep,
49+
TemporalityCreateWikiWizardStep
4950
},
5051
props: [
51-
'title',
52-
'buttonText'
52+
'title'
5353
],
5454
computed: {
5555
currentUser: function () {
@@ -88,8 +88,6 @@ export default {
8888
}
8989
},
9090
created () {
91-
// what's this for?
92-
// this.buttonText = this.buttonTexts.next;
9391
this.checkCurrentLogin()
9492
},
9593
updated () {

src/components/Cards/TemporalityCreateWikiWizardStep.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<v-card class="elevation-12">
33
<v-toolbar dark color="primary">
44
<v-toolbar-title>{{ title }}</v-toolbar-title>
5-
<v-spacer></v-spacer>
6-
<v-btn v-if="dismissable" icon @click="$emit('close-dialog')">
7-
<v-icon>mdi-close</v-icon>
8-
</v-btn>
95
</v-toolbar>
106

117
<v-card-text>
@@ -100,8 +96,7 @@ export default {
10096
title: String,
10197
inFlight: Boolean,
10298
value: Object,
103-
error: Array,
104-
dismissable: Boolean
99+
error: Array
105100
},
106101
methods: {
107102
previousStep () {

src/components/Cards/TemporalityProfileEditWizardStep.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<v-toolbar dark color="primary">
44
<v-toolbar-title>{{ title }}</v-toolbar-title>
55
<v-spacer></v-spacer>
6-
<v-btn v-if="dismissable" icon @click="$emit('close-dialog')">
6+
<v-btn icon @click="$emit('close-dialog')">
77
<v-icon>mdi-close</v-icon>
88
</v-btn>
99
</v-toolbar>
@@ -87,7 +87,7 @@
8787
:disabled="inFlight"
8888
@click="submitWholeForm"
8989
>
90-
Create Wiki
90+
Set intended use
9191
</v-btn>
9292
</v-card-actions>
9393
</v-card>
@@ -100,8 +100,7 @@ export default {
100100
title: String,
101101
inFlight: Boolean,
102102
value: Object,
103-
error: Array,
104-
dismissable: Boolean
103+
error: Array
105104
},
106105
methods: {
107106
previousStep () {

src/components/Pages/CreateWiki.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<v-container class="fill-height" fluid >
44
<v-row align="center" justify="center">
55
<v-col class="card-column">
6-
<CreateWikiCard title="Create a wiki" buttonText="Next >"/>
6+
<CreateWikiCard title="Create a wiki"/>
77
</v-col>
88
</v-row>
99
</v-container>

src/components/Pages/ManageWiki/Cards/Profile.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
content-class="update-wiki-profile-dialog"
66
v-model="dialog.show"
77
>
8-
<step-two-card
8+
<AudienceAndPurposeWizardStep
99
v-show="dialog.step === 1"
1010
:title="dialog.title"
1111
:inFlight="inFlight"
@@ -14,14 +14,13 @@
1414
@close-dialog="dialog.show = false"
1515
@next-step="goToStep(2)"
1616
/>
17-
<step-three-card
17+
<TemporalityProfileEditWizardStep
1818
v-show="dialog.step === 2"
1919
:title="dialog.title"
2020
:inFlight="inFlight"
2121
:error="dialog.error"
22-
:dismissable="true"
2322
:showTerms="false"
24-
v-model="dialog.data.stepTwo"
23+
v-model="dialog.data.stepTwo"
2524
@close-dialog="dialog.show = false"
2625
@previous-step="goToStep(1)"
2726
@submit="updateProfile"
@@ -103,8 +102,8 @@ export default {
103102
name: 'Profile',
104103
components: {
105104
Message,
106-
StepTwoCard: AudienceAndPurposeWizardStep,
107-
StepThreeCard: TemporalityProfileEditWizardStep
105+
AudienceAndPurposeWizardStep,
106+
TemporalityProfileEditWizardStep
108107
},
109108
props: [
110109
'wikiId'

0 commit comments

Comments
 (0)