Skip to content

Commit 542cba2

Browse files
committed
feat: add support subscription
1 parent e4b97e6 commit 542cba2

40 files changed

+141
-54
lines changed

view/javascript/d_pax/components/development.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ export default {
186186
letter-spacing: 0.18px;
187187
text-align: left;
188188
color: $warm-grey-two;
189+
margin-bottom: 10px;
189190
ul {
190191
list-style-type: decimal;
191192
padding-left: 20px;

view/javascript/d_pax/components/firstBuild.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
>{{ $t('text_bellow') }}</a>.
2323
</div>
2424
<div
25+
v-if="information.apache"
2526
class="first-build__footer_title"
2627
>
2728
{{ $t('footerTitlePopup') }}

view/javascript/d_pax/components/information.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{{ $t('textBuildMin') }}
1414
</div>
1515
<div class="vf-information__item_value">
16-
{{ Math.floor($moment.duration(cms.usagedTime, 'milliseconds').asMinutes()) }} / 100
16+
{{ totalUsaged }} / {{ timeCount }}
1717
</div>
1818
</div>
1919
<div class="vf-information__item">
@@ -58,7 +58,13 @@
5858
import {mapGetters} from 'vuex'
5959
export default {
6060
computed: {
61-
...mapGetters({information: 'information/get', cms: 'cms/get'})
61+
...mapGetters({information: 'information/get', cms: 'cms/get', account: 'account/get'}),
62+
totalUsaged () {
63+
return Math.floor(this.$moment.duration(this.account.times, 'milliseconds').asMinutes())
64+
},
65+
timeCount () {
66+
return this.account.subscribe ? 1000 : 100
67+
}
6268
}
6369
}
6470
</script>

view/javascript/d_pax/components/subscription.vue

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,21 @@
1010
class="account-subscription__button"
1111
variant="warning"
1212
size="lg"
13+
@click="handleSubscribe"
1314
>
1415
{{ $t("button_subscribe") }}
1516
</b-button>
1617
</div>
1718
</template>
19+
<script>
20+
export default {
21+
methods: {
22+
async handleSubscribe () {
23+
await this.$store.dispatch('cms/subscribe')
24+
}
25+
}
26+
}
27+
</script>
1828
<i18n locale="en">
1929
{
2030
"text_title": "Go Production!",

view/javascript/d_pax/components/welcome.vue

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ export default {
4242
},
4343
computed: {
4444
...mapGetters({
45-
cms: 'cms/get'
45+
cms: 'cms/get',
46+
error: 'error'
4647
})
4748
},
4849
mounted() {
@@ -62,17 +63,21 @@ export default {
6263
async handleGenerate() {
6364
this.loading = true
6465
await this.$store.dispatch('cms/generate', {id: this.cms.id})
65-
const interval = setInterval(async () => {
66-
await this.$store.dispatch('cms/load', {id: this.cms.id})
67-
this.$apolloClient.defaultClient.clearStore()
68-
if(!this.cms.generating) {
69-
await this.$store.dispatch('information/updateVueFront', {url: this.cms.downloadUrl})
70-
this.$store.commit('cms/setFirstBuild', true)
66+
if(!this.error) {
67+
const interval = setInterval(async () => {
68+
await this.$store.dispatch('cms/load', {id: this.cms.id})
69+
this.$apolloClient.defaultClient.clearStore()
70+
if(!this.cms.generating) {
71+
await this.$store.dispatch('information/updateVueFront', {url: this.cms.downloadUrl})
72+
this.$store.commit('cms/setFirstBuild', true)
7173
72-
this.loading = false
73-
clearInterval(interval)
74-
}
75-
}, 3000)
74+
this.loading = false
75+
clearInterval(interval)
76+
}
77+
}, 3000)
78+
} else {
79+
this.loading = false
80+
}
7681
}
7782
}
7883
}

view/javascript/d_pax/layouts/default.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ export default {
2626
</script>
2727
<i18n locale="en">
2828
{
29-
"not_writable_htaccess": "File permissions. Please add writing permissions to the following files and folder: .htaccess"
29+
"not_writable_htaccess": "File permissions. Please add writing permissions to the following files and folder: .htaccess",
30+
"validate_payment": "Not verified account",
31+
"not_exists_url": "The CMS Connect URL you have provided is not working. Please check if you have properly specified the url and try again.",
32+
"not_working_graphql_api": "The CMS Connect URL you have provided is not working. Please check if you have properly specified the url and try again."
3033
}
3134
</i18n>
3235
<style lang="scss">

view/javascript/d_pax/pages/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<development />
1313
</b-col>
1414
<b-col md="3">
15-
<subscription v-if="false" />
15+
<subscription v-if="!account.subscribe" />
1616
<information />
1717
</b-col>
1818
</b-row>
@@ -42,7 +42,7 @@ export default {
4242
},
4343
middleware: ['authenticated', 'confirmed', 'noBanned', 'noAlien'],
4444
computed: {
45-
...mapGetters({information: 'information/get', cms: 'cms/get', firstBuild: 'cms/firstBuild'})
45+
...mapGetters({account: 'account/get' ,information: 'information/get', cms: 'cms/get', firstBuild: 'cms/firstBuild'})
4646
}
4747
}
4848
</script>

view/javascript/d_pax/store/account.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ export const actions = {
3838
confirmed
3939
email
4040
banned
41+
subscribe
42+
subscribeCancel
43+
subscribeDateEnd
44+
paymentMethodChecked
4145
image(width: 101, height: 101) {
4246
url
4347
path

view/javascript/d_pax/store/auth.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ export const actions = {
7979
email
8080
banned
8181
confirmed
82+
times
83+
subscribe
84+
subscribeCancel
85+
subscribeDateEnd
86+
paymentMethodChecked
8287
image(width: 101, height: 101) {
8388
url
8489
path
@@ -111,6 +116,11 @@ export const actions = {
111116
email
112117
banned
113118
confirmed
119+
times
120+
subscribe
121+
subscribeCancel
122+
subscribeDateEnd
123+
paymentMethodChecked
114124
image(width: 101, height: 101) {
115125
url
116126
path
@@ -148,6 +158,11 @@ export const actions = {
148158
email
149159
banned
150160
confirmed
161+
times
162+
subscribe
163+
subscribeCancel
164+
subscribeDateEnd
165+
paymentMethodChecked
151166
image(width: 101, height: 101) {
152167
url
153168
path

view/javascript/d_pax/store/cms.js

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,48 @@ export const getters = {
3737
}
3838

3939
export const actions = {
40+
41+
async subscribe({commit}) {
42+
try {
43+
const { data } = await this.$apolloClient.defaultClient.mutate({
44+
mutation: gql`
45+
mutation {
46+
subscribeCms {
47+
id
48+
firstName
49+
lastName
50+
email
51+
npmToken
52+
banned
53+
confirmed
54+
balance
55+
times
56+
subscribe
57+
subscribeCancel
58+
subscribeDateEnd
59+
paymentMethodChecked
60+
image(width: 101, height: 101) {
61+
url
62+
path
63+
}
64+
developer {
65+
linkSupport
66+
status
67+
username
68+
}
69+
role {
70+
name
71+
}
72+
}
73+
}
74+
`,
75+
variables: {}
76+
})
77+
commit('account/setAccount', data.subscribeCms, { root: true })
78+
} catch (e) {
79+
commit('setResponseError', e, { root: true })
80+
}
81+
},
4082
async search({commit, getters, dispatch, rootGetters}) {
4183
let id = false
4284
for(const key in getters['list'].content) {

view/javascript/d_vuefront/0.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/0.c52553d8b74542c19fe6.css renamed to view/javascript/d_vuefront/0.a7969d8384a3fb38c7d1.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/0.c52553d8b74542c19fe6.bundle.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

view/javascript/d_vuefront/10.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/10.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/11.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/11.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/16.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/16.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/19.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/19.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/21.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/21.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/22.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/22.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/24.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/24.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/5.c52553d8b74542c19fe6.bundle.js renamed to view/javascript/d_vuefront/5.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/6.a7969d8384a3fb38c7d1.bundle.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

view/javascript/d_vuefront/6.c52553d8b74542c19fe6.bundle.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

view/javascript/d_vuefront/manifest.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,134 +53,134 @@
5353
"id": 0,
5454
"next": null,
5555
"js": [
56-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/0.c52553d8b74542c19fe6.bundle.js"
56+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/0.a7969d8384a3fb38c7d1.bundle.js"
5757
],
5858
"css": [
59-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/0.c52553d8b74542c19fe6.css"
59+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/0.a7969d8384a3fb38c7d1.css"
6060
]
6161
},
6262
"js": [
63-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/17.c52553d8b74542c19fe6.bundle.js"
63+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/17.a7969d8384a3fb38c7d1.bundle.js"
6464
],
6565
"css": []
6666
},
6767
"js": [
68-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/2.c52553d8b74542c19fe6.bundle.js"
68+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/2.a7969d8384a3fb38c7d1.bundle.js"
6969
],
7070
"css": []
7171
},
7272
"js": [
73-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/23.c52553d8b74542c19fe6.bundle.js"
73+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/23.a7969d8384a3fb38c7d1.bundle.js"
7474
],
7575
"css": []
7676
},
7777
"js": [
78-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/16.c52553d8b74542c19fe6.bundle.js"
78+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/16.a7969d8384a3fb38c7d1.bundle.js"
7979
],
8080
"css": []
8181
},
8282
"js": [
83-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/25.c52553d8b74542c19fe6.bundle.js"
83+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/25.a7969d8384a3fb38c7d1.bundle.js"
8484
],
8585
"css": []
8686
},
8787
"js": [
88-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/20.c52553d8b74542c19fe6.bundle.js"
88+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/20.a7969d8384a3fb38c7d1.bundle.js"
8989
],
9090
"css": []
9191
},
9292
"js": [
93-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/14.c52553d8b74542c19fe6.bundle.js"
93+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/14.a7969d8384a3fb38c7d1.bundle.js"
9494
],
9595
"css": []
9696
},
9797
"js": [
98-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/3.c52553d8b74542c19fe6.bundle.js"
98+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/3.a7969d8384a3fb38c7d1.bundle.js"
9999
],
100100
"css": []
101101
},
102102
"js": [
103-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/6.c52553d8b74542c19fe6.bundle.js"
103+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/6.a7969d8384a3fb38c7d1.bundle.js"
104104
],
105105
"css": []
106106
},
107107
"js": [
108-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/5.c52553d8b74542c19fe6.bundle.js"
108+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/5.a7969d8384a3fb38c7d1.bundle.js"
109109
],
110110
"css": []
111111
},
112112
"js": [
113-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/24.c52553d8b74542c19fe6.bundle.js"
113+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/24.a7969d8384a3fb38c7d1.bundle.js"
114114
],
115115
"css": []
116116
},
117117
"js": [
118-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/13.c52553d8b74542c19fe6.bundle.js"
118+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/13.a7969d8384a3fb38c7d1.bundle.js"
119119
],
120120
"css": []
121121
},
122122
"js": [
123-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/15.c52553d8b74542c19fe6.bundle.js"
123+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/15.a7969d8384a3fb38c7d1.bundle.js"
124124
],
125125
"css": []
126126
},
127127
"js": [
128-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/11.c52553d8b74542c19fe6.bundle.js"
128+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/11.a7969d8384a3fb38c7d1.bundle.js"
129129
],
130130
"css": []
131131
},
132132
"js": [
133-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/22.c52553d8b74542c19fe6.bundle.js"
133+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/22.a7969d8384a3fb38c7d1.bundle.js"
134134
],
135135
"css": []
136136
},
137137
"js": [
138-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/19.c52553d8b74542c19fe6.bundle.js"
138+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/19.a7969d8384a3fb38c7d1.bundle.js"
139139
],
140140
"css": []
141141
},
142142
"js": [
143-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/10.c52553d8b74542c19fe6.bundle.js"
143+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/10.a7969d8384a3fb38c7d1.bundle.js"
144144
],
145145
"css": []
146146
},
147147
"js": [
148-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/18.c52553d8b74542c19fe6.bundle.js"
148+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/18.a7969d8384a3fb38c7d1.bundle.js"
149149
],
150150
"css": []
151151
},
152152
"js": [
153-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/9.c52553d8b74542c19fe6.bundle.js"
153+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/9.a7969d8384a3fb38c7d1.bundle.js"
154154
],
155155
"css": []
156156
},
157157
"js": [
158-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/21.c52553d8b74542c19fe6.bundle.js"
158+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/21.a7969d8384a3fb38c7d1.bundle.js"
159159
],
160160
"css": []
161161
},
162162
"js": [
163-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/7.c52553d8b74542c19fe6.bundle.js"
163+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/7.a7969d8384a3fb38c7d1.bundle.js"
164164
],
165165
"css": []
166166
},
167167
"js": [
168-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/4.c52553d8b74542c19fe6.bundle.js"
168+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/4.a7969d8384a3fb38c7d1.bundle.js"
169169
],
170170
"css": []
171171
},
172172
"js": [
173-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/8.c52553d8b74542c19fe6.bundle.js"
173+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/8.a7969d8384a3fb38c7d1.bundle.js"
174174
],
175175
"css": []
176176
},
177177
"js": [
178-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/12.c52553d8b74542c19fe6.bundle.js"
178+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/12.a7969d8384a3fb38c7d1.bundle.js"
179179
],
180180
"css": []
181181
},
182182
"js": [
183-
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/c52553d8b74542c19fe6.bundle.js"
183+
"/wp-content/plugins/vuefront/view/javascript/d_vuefront/a7969d8384a3fb38c7d1.bundle.js"
184184
],
185185
"css": []
186186
}

0 commit comments

Comments
 (0)