nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-29 11:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

- favicon fix

Browse Source 
- checkout fix
- stripe prefered locales
- color theme
- stripe card info box in dev version
This commit is contained in:
Peter Papp
2021-03-26 16:02:02 +01:00
parent ee1a8a6719
commit a3d4dfec3b
19 changed files with 320 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/js/Oasis/Admin/UserCreateOrder.vue
+22 -17
View File
@@ -19,10 +19,24 @@
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>Plan:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Plan" v-slot="{ errors }">
<SelectInput v-model="user.plan"
:default="user.country"
:options="plans"
placeholder="Vyberte plan"
:isError="errors[0]" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<FormLabel class="mt-70">{{ $t('user_settings.title_billing') }}</FormLabel>
<!--Name-->
<div class="block-wrapper">
<label>ICO:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ICO" rules="required" v-slot="{ errors }">
<label>ICO (volitelne):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="ICO" v-slot="{ errors }">
<input v-model="user.ico" placeholder="Type ICO" type="text" class="focus-border-theme" :class="{'is-error': errors[0]}" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
<small v-if="fullDetails" class="input-help">
@@ -111,8 +125,8 @@
</div>
<div class="block-wrapper">
<label>{{ $t('user_settings.phone_number') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Phone Number" v-slot="{ errors }">
<label>{{ $t('user_settings.phone_number') }} (volitelne):</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Phone Number" v-slot="{ errors }">
<input v-model="user.phone_number"
:placeholder="$t('user_settings.phone_number_plac')"
type="text"
@@ -122,18 +136,6 @@
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>Plan:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" rules="required" name="Plan" v-slot="{ errors }">
<SelectInput v-model="user.plan"
:default="user.country"
:options="plans"
placeholder="Vyberte plan"
:isError="errors[0]" />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
</div>
<div class="form-group">
@@ -237,8 +239,11 @@
if (error.response.data.errors['email']) {
this.$refs.createUser.setErrors({
'email': error.response.data.errors['email']
'Email': error.response.data.errors['email']
});
// Scroll top
document.getElementById('single-page').scrollTop = 0
}
} else {
resources/js/Oasis/Onboarding/PayForPlan.vue
+10 -3
View File
@@ -4,7 +4,7 @@
<MobileHeader :title="$router.currentRoute.meta.title" />
<div class="content-page">
<div class="plan-title">
<credit-card-icon size="42" class="title-icon"></credit-card-icon>
<credit-card-icon size="42" class="title-icon text-theme" />
<h1>{{ $t('page_upgrade_account.title') }}</h1>
<h2>{{ $t('page_upgrade_account.desription') }}</h2>
</div>
@@ -16,7 +16,7 @@
<!-- Pay by new credit card -->
<div class="register-card">
<InfoBox v-if="config.isDemo">
<InfoBox v-if="config.isDemo || config.isDev">
<p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
</InfoBox>
@@ -43,6 +43,7 @@
:placeholder="$t('user_settings.name_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -57,6 +58,7 @@
:placeholder="$t('user_settings.address_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -72,6 +74,7 @@
:placeholder="$t('user_settings.city_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -86,6 +89,7 @@
:placeholder="$t('user_settings.postal_code_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -115,6 +119,7 @@
:placeholder="$t('user_settings.state_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<small class="input-help">
State, county, province, or region.
@@ -132,6 +137,7 @@
:placeholder="$t('user_settings.phone_number_plac')"
type="text"
:class="{'is-error': errors[0]}"
class="focus-border-theme"
/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
@@ -385,6 +391,7 @@
axios.get('/api/user/subscription/setup-intent')
.then(response => {
this.clientSecret = response.data.client_secret
this.isLoading = false
})
.catch(() => {
this.$isSomethingWrong()
@@ -601,7 +608,7 @@
margin: 0 auto 80px;
path, line, polyline, rect, circle {
color: $theme;
color: inherit;
}
h1 {
resources/js/Oasis/Onboarding/SelectPlan.vue
+2 -2
View File
@@ -6,7 +6,7 @@
<!--Page Title-->
<div class="plan-title">
<cloud-icon size="42" class="title-icon"></cloud-icon>
<cloud-icon size="42" class="title-icon text-theme" />
<h1>{{ $t('page_pricing_tables.title') }}</h1>
<h2>{{ $t('page_pricing_tables.description') }}</h2>
</div>
@@ -81,7 +81,7 @@
margin: 0 auto 80px;
path, line, polyline, rect, circle {
color: $theme;
color: inherit;
}
h1 {
resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
+8 -4
View File
@@ -18,7 +18,7 @@
<!-- Pay by new credit card -->
<div class="register-card form block-form">
<InfoBox v-if="config.isDemo">
<InfoBox v-if="config.isDemo || config.isDev">
<p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
</InfoBox>
@@ -33,10 +33,11 @@
</div>
</div>
<InfoBox>
<InfoBox v-if="requestedPlan">
<ListInfo class="billing">
<ListInfoItem class="billing-item" title="Spolecnost" content="CMPortal, s.r.o." />
<ListInfoItem class="billing-item" title="Adresa" content="Korytná 47/3, Praha 10000, Česká Republika" />
<ListInfoItem class="billing-item" title="Spolecnost" :content="requestedPlan.data.relationships.user.data.attributes.name" />
<ListInfoItem v-if="requestedPlan.data.relationships.user.data.attributes.ico" class="billing-item" title="ICO" :content="requestedPlan.data.relationships.user.data.attributes.ico" />
<ListInfoItem class="billing-item" title="Adresa" :content="address" />
</ListInfo>
</InfoBox>
</div>
@@ -152,6 +153,9 @@
return this.requestedPlan.data.relationships.plan.data.attributes.tax_rates.find(taxRate => {
return taxRate.country === this.requestedPlan.data.relationships.user.data.attributes.country
})
},
address() {
return this.requestedPlan.data.relationships.user.data.attributes.address + ', ' + this.requestedPlan.data.relationships.user.data.attributes.postal_code + ', ' + this.requestedPlan.data.relationships.user.data.attributes.city
}
},
data() {
resources/js/components/FilesView/ButtonBase.vue
+1 -5
View File
@@ -1,7 +1,7 @@
<template>
<button class="button-base" :class="buttonStyle" type="button">
<div v-if="loading" class="icon">
<refresh-cw-icon size="16" class="sync-alt"></refresh-cw-icon>
<refresh-cw-icon size="16" class="sync-alt" />
</div>
<div class="content">
<slot v-if="! loading"></slot>
@@ -52,10 +52,6 @@
.content {
color: white;
}
polyline, path {
color: inherit;
}
}
&.danger {
resources/js/components/FilesView/FilePreviewNavigationPanel.vue
+5 -6
View File
@@ -1,13 +1,13 @@
<template>
<div class="navigation-panel" v-if="fileInfoDetail[0]">
<div class="name-wrapper">
<x-icon @click="closeFullPreview" size="22" class="icon-close"></x-icon>
<x-icon @click="closeFullPreview" size="22" class="icon-close hover-text-theme" />
<div class="name-count-wrapper">
<p class="title">{{ fileInfoDetail[0].name }}</p>
<span class="file-count"> ({{ showingImageIndex + ' ' + $t('pronouns.of') + ' ' + filteredFiles.length }}) </span>
</div>
<span id="fast-preview-menu" class="fast-menu-icon" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
<more-horizontal-icon class="more-icon" size="14"> </more-horizontal-icon>
<span id="fast-preview-menu" class="fast-menu-icon group" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
<more-horizontal-icon class="more-icon group-hover-text-theme" size="14" />
</span>
</div>
@@ -162,14 +162,13 @@ export default {
border-radius: 6px;
vertical-align: middle;
cursor: pointer;
color: $text;
@include transition(150ms);
&:hover {
background: $light_background;
line {
stroke: $theme;
color: inherit;
}
}
}
@@ -191,7 +190,7 @@ export default {
background: $light_background;
svg circle {
stroke: $theme;
color: inherit;
}
}
.more-icon {
resources/js/helpers.js
Vendored
+1 -1
View File
@@ -106,7 +106,7 @@ const Helpers = {
// Push items to file queue
[...event.dataTransfer.items].map(item => {
this.$store.commit('ADD_FILES_TO_QUEUE', {
folder_id: parent_id,
folder_id: parent_id ? parent_id : '',
file: item.getAsFile(),
})
});
resources/js/router.js
Vendored
+10
View File
@@ -88,6 +88,16 @@ const routesOasis = [
title: i18n.t('routes_title.user_create')
},
},
{
name: 'UserCreate',
path: '/admin/user/create',
component: () =>
import(/* webpackChunkName: "chunks/user-create" */ './Oasis/Admin/UserCreate'),
meta: {
requiresAuth: true,
title: i18n.t('routes_title.user_create')
},
},
]
},
]
resources/js/store/modules/app.js
Vendored
+2 -2
View File
@@ -23,6 +23,8 @@ const defaultState = {
},
],
countries: [
{label: 'Czech Republic', value: 'CZ'},
{label: 'Slovakia', value: 'SK'},
{label: 'Afghanistan', value: 'AF'},
{label: 'Åland Islands', value: 'AX'},
{label: 'Albania', value: 'AL'},
@@ -80,7 +82,6 @@ const defaultState = {
{label: 'Croatia', value: 'HR'},
{label: 'Cuba', value: 'CU'},
{label: 'Cyprus', value: 'CY'},
{label: 'Czech Republic', value: 'CZ'},
{label: 'Denmark', value: 'DK'},
{label: 'Djibouti', value: 'DJ'},
{label: 'Dominica', value: 'DM'},
@@ -219,7 +220,6 @@ const defaultState = {
{label: 'Seychelles', value: 'SC'},
{label: 'Sierra Leone', value: 'SL'},
{label: 'Singapore', value: 'SG'},
{label: 'Slovakia', value: 'SK'},
{label: 'Slovenia', value: 'SI'},
{label: 'Solomon Islands', value: 'SB'},
{label: 'Somalia', value: 'SO'},
resources/js/views/Upgrade/UpgradeBilling.vue
+1 -1
View File
@@ -16,7 +16,7 @@
<!-- Pay by new credit card -->
<div class="register-card" v-show="! defaultPaymentMethod || payByNewCard">
<InfoBox v-if="config.isDemo">
<InfoBox v-if="config.isDemo || config.isDev">
<p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
</InfoBox>
resources/js/views/User/CreatePaymentMethod.vue
+1 -1
View File
@@ -6,7 +6,7 @@
<!-- Register new credit card -->
<div class="register-card">
<InfoBox v-show="config.isDemo">
<InfoBox v-if="config.isDemo || config.isDev">
<p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
</InfoBox>