Skip to content

Commit dfb9d52

Browse files
committed
feat: redesign admin panel
1 parent a31d05f commit dfb9d52

25 files changed

+436
-73
lines changed

.DS_Store

0 Bytes
Binary file not shown.

config.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<module>
3+
<name>vuefront</name>
4+
<displayName><![CDATA[VueFront]]></displayName>
5+
<version><![CDATA[2.1.1]]></version>
6+
<description><![CDATA[CMS Connect App for PrestaShop]]></description>
7+
<author><![CDATA[VueFront]]></author>
8+
<tab><![CDATA[front_office_features]]></tab>
9+
<confirmUninstall><![CDATA[Are you sure you want to uninstall?]]></confirmUninstall>
10+
<is_configurable>1</is_configurable>
11+
<need_instance>0</need_instance>
12+
<limited_countries></limited_countries>
13+
</module>

views/css/admin/main.82c1c478b5af344ee048.css

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

views/js/d_pax/pages/alien.vue renamed to views/js/d_pax/components/alien.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<script>
3535
import {mapGetters} from 'vuex'
3636
export default {
37-
layout: 'auth',
3837
middleware: ['alien'],
3938
data() {
4039
return {
@@ -49,13 +48,13 @@ export default {
4948
methods: {
5049
handleLogout() {
5150
this.$store.dispatch('auth/logout')
52-
this.$router.push('/check')
51+
this.$store.commit('auth/toggleShowLogin')
5352
},
5453
async handleRefresh() {
5554
this.refreshLoading = true
5655
await this.$store.dispatch('account/load')
5756
if(this.account.banneded) {
58-
this.$router.push('/')
57+
this.$store.commit('auth/toggleShowLogin')
5958
}
6059
this.refreshLoading = false
6160
},
@@ -75,7 +74,11 @@ export default {
7574
</i18n>
7675
<style lang="scss">
7776
.alient-page {
78-
margin-top: 60px;
77+
border-radius: 3px;
78+
border: 1px solid #d9d9d9;
79+
background-color: #ffffff;
80+
padding: 50px 55px;
81+
margin-bottom: 60px;
7982
&__button_logout {
8083
display: block;
8184
cursor: pointer;
@@ -90,8 +93,6 @@ export default {
9093
text-align: center;
9194
}
9295
&__banner {
93-
background-color: #f9f9f9;
94-
padding: 50px;
9596
margin-bottom: 40px;
9697
&_image {
9798
padding: 0 40px;

views/js/d_pax/components/apps.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export default {
210210
padding: 10px;
211211
background: #efeff1 !important;
212212
border: none;
213+
margin: 0;
213214
height: 54px !important;
214215
background-color: #efeff1 !important;
215216
padding: 12px 24px !important;

views/js/d_pax/pages/banned.vue renamed to views/js/d_pax/components/banned.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<script>
3535
import {mapGetters} from 'vuex'
3636
export default {
37-
layout: 'auth',
3837
middleware: ['banned'],
3938
data() {
4039
return {
@@ -49,13 +48,13 @@ export default {
4948
methods: {
5049
handleLogout() {
5150
this.$store.dispatch('auth/logout')
52-
this.$router.push('/check')
51+
this.$store.commit('auth/toggleShowLogin')
5352
},
5453
async handleRefresh() {
5554
this.refreshLoading = true
5655
await this.$store.dispatch('account/load')
5756
if(this.account.banneded) {
58-
this.$router.push('/')
57+
this.$store.commit('auth/toggleShowLogin')
5958
}
6059
this.refreshLoading = false
6160
},
@@ -75,7 +74,11 @@ export default {
7574
</i18n>
7675
<style lang="scss">
7776
.banned-page {
78-
margin-top: 60px;
77+
border-radius: 3px;
78+
border: 1px solid #d9d9d9;
79+
background-color: #ffffff;
80+
padding: 50px 55px;
81+
margin-bottom: 60px;
7982
&__button_logout {
8083
display: block;
8184
cursor: pointer;
@@ -90,8 +93,6 @@ export default {
9093
text-align: center;
9194
}
9295
&__banner {
93-
background-color: #f9f9f9;
94-
padding: 50px;
9596
margin-bottom: 40px;
9697
&_image {
9798
padding: 0 40px;

views/js/d_pax/pages/check.vue renamed to views/js/d_pax/components/check.vue

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
<script>
5151
import { mapGetters } from "vuex";
5252
export default {
53-
layout: 'auth',
54-
middleware: ['notAuthenticated'],
5553
data() {
5654
return {
5755
form: {
@@ -67,6 +65,9 @@ export default {
6765
existingEmail: "auth/existingEmail"
6866
})
6967
},
68+
mounted() {
69+
this.$store.commit('account/setBanned', false)
70+
},
7071
methods: {
7172
async onSubmit (valid) {
7273
if (!valid) {
@@ -77,9 +78,9 @@ export default {
7778
await this.$store.dispatch('auth/checkEmail', {email: this.form.email})
7879
7980
if(!this.existingEmail) {
80-
this.$router.push('/register')
81+
this.$emit('register')
8182
} else {
82-
this.$router.push('/login')
83+
this.$emit('login')
8384
}
8485
8586
this.loading = false

views/js/d_pax/pages/confirm.vue renamed to views/js/d_pax/components/confirm.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<script>
5757
import {mapGetters} from 'vuex'
5858
export default {
59-
layout: 'auth',
6059
middleware: ['authenticated', 'notConfirmed'],
6160
data() {
6261
return {
@@ -71,14 +70,12 @@ export default {
7170
methods: {
7271
handleLogout() {
7372
this.$store.dispatch('auth/logout')
74-
this.$router.push('/check')
73+
this.$store.commit('auth/toggleShowLogin')
7574
},
7675
async handleRefresh() {
7776
this.refreshLoading = true
7877
await this.$store.dispatch('account/load')
79-
if(this.account.confirmed) {
80-
this.$router.push('/')
81-
}
78+
8279
this.refreshLoading = false
8380
},
8481
async handleResend() {
@@ -98,7 +95,11 @@ export default {
9895
</i18n>
9996
<style lang="scss">
10097
.confirm-page {
101-
margin-top: 60px;
98+
border-radius: 3px;
99+
border: 1px solid #d9d9d9;
100+
background-color: #ffffff;
101+
padding: 50px 55px;
102+
margin-bottom: 60px;
102103
&__button_logout {
103104
display: block;
104105
cursor: pointer;
@@ -125,12 +126,11 @@ export default {
125126
text-align: center;
126127
}
127128
&__banner {
128-
background-color: #f9f9f9;
129-
padding: 50px;
130129
margin-bottom: 40px;
131130
&_image {
132131
padding: 0 40px;
133132
margin-bottom: 20px;
133+
text-align: center;
134134
img {
135135
width: 100;
136136
max-width: 100%;

views/js/d_pax/components/editApp.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export default {
5353
this.$store.commit('apps/setEdit', false)
5454
},
5555
async onSubmit(valid) {
56-
console.log(valid)
5756
if (valid) {
5857
await this.$store.dispatch('apps/edit', {key: this.id, app: {
5958
eventUrl: this.form.eventUrl,

views/js/d_pax/components/header.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</b-col>
1212
<b-col>
1313
<b-navbar-nav class="align-items-center vf-header__right_nav">
14-
<header-activation v-if="cms.builds.length > 0 && information.apache" />
14+
<header-activation v-if="isLogged && cms.builds.length > 0 && information.apache" />
1515
<b-button
16-
v-if="cms.builds.length > 0 && !information.apache"
16+
v-if="isLogged && cms.builds.length > 0 && !information.apache"
1717
class="vf-header__button_activate"
1818
variant="success"
1919
@click="$scrollTo('#vf-nginx-configure')"
@@ -42,6 +42,7 @@ export default {
4242
4343
computed: {
4444
...mapGetters({
45+
isLogged: "auth/isLogged",
4546
cms: 'cms/get',
4647
information: 'information/get'
4748
})

0 commit comments

Comments
 (0)