nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
carodej
2020-07-14 10:34:42 +02:00
parent 2ae60003d6
commit c9d300769c
55 changed files with 1747 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

571
resources/babel.babel
View File

@@ -146,6 +146,58 @@
</concept_node>
</children>
</folder_node>
<folder_node>
<name>activation</name>
<children>
<folder_node>
<name>stripe</name>
<children>
<concept_node>
<name>button</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
</children>
</folder_node>
<folder_node>
<name>admin_menu</name>
<children>
@@ -3463,6 +3515,48 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>button_submit</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>button_testing</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>credentials_disclaimer</name>
<definition_loaded>false</definition_loaded>
@@ -3505,6 +3599,216 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_create_acc</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_create_webhook</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_currency</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_currency_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_pub_key</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_pub_key_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_sec_key</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_sec_key_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_setup</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_webhook_key_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>webhook_url</name>
<definition_loaded>false</definition_loaded>
@@ -5201,6 +5505,252 @@
</concept_node>
</children>
</folder_node>
<folder_node>
<name>notice</name>
<children>
<concept_node>
<name>stripe_activation</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_activation_button</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>page_contact_us</name>
<children>
<concept_node>
<name>description</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>error_message</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<folder_node>
<name>form</name>
<children>
<concept_node>
<name>email</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>email_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>message</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>message_plac</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>submit_button</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<concept_node>
<name>success_message</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>page_create_password</name>
<children>
@@ -9566,6 +10116,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>stripe_set</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>

4
resources/js/App.vue
View File

@@ -126,11 +126,11 @@
// Redirect to database verify code
if ( installation === 'setup-database') {
//this.$router.push({name: 'PurchaseCode'})
this.$router.push({name: 'PurchaseCode'})
// Redirect to starting installation process
} else if ( installation === 'setup-disclaimer' ) {
//this.$router.push({name: 'InstallationDisclaimer'})
this.$router.push({name: 'InstallationDisclaimer'})
}
},
mounted() {

4
resources/js/components/Index/IndexPricingTables.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="page-wrapper medium pricing" v-if="! isEmpty && index.section_pricing_content === '1'">
<div class="page-wrapper medium pricing" v-if="! isEmpty && index.section_pricing_content === '1' && config.stripe_public_key">
<div id="pricing" class="page-title center">
<h1 class="title" v-html="index.pricing_title"></h1>
</div>
@@ -34,7 +34,7 @@
CloudIcon,
},
computed: {
...mapGetters(['index']),
...mapGetters(['index', 'config']),
},
data() {
return {

10
resources/js/components/Others/EmptyPageContent.vue
View File

@@ -4,6 +4,7 @@
<div class="icon">
<file-icon v-if="icon === 'file'" size="38"></file-icon>
<file-text-icon v-if="icon === 'file-text'" size="38"></file-text-icon>
<settings-icon v-if="icon === 'settings'" size="38"></settings-icon>
</div>
<div class="header">
<h1 class="title">{{ title }}</h1>
@@ -15,12 +16,13 @@
</template>
<script>
import { FileIcon, FileTextIcon } from 'vue-feather-icons'
import { FileIcon, FileTextIcon, SettingsIcon } from 'vue-feather-icons'
export default {
name: 'EmptyPageContent',
props: ['icon','title','description'],
components: {
SettingsIcon,
FileTextIcon,
FileIcon,
}
@@ -41,10 +43,14 @@
.content {
margin: 0 auto;
max-width: 360px;
/deep/ .button-base {
margin: 0 auto;
}
}
.icon {
path, polyline, line {
path, polyline, line, circle {
stroke: $theme;
}
}

4
resources/js/components/Others/Forms/InfoBox.vue
View File

@@ -35,6 +35,10 @@
line-height: 1.6;
word-break: break-word;
font-weight: 600;
/deep/ a {
color: $theme;
}
}
b {

3
resources/js/components/Others/MoveItem.vue
View File

@@ -12,7 +12,7 @@
<!--Folder tree-->
<div v-if="! isLoadingTree && navigation">
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="location"/>
<TreeMenu :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
<TreeMenu :disabled-by-id="pickedItem.unique_id" :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
</div>
</PopupContent>
@@ -127,5 +127,4 @@
.item-thumbnail {
margin-bottom: 20px;
}
</style>

20
resources/js/components/Others/TreeMenu.vue
View File

@@ -1,6 +1,6 @@
<template>
<!--Folder Icon-->
<div class="folder-item-wrapper">
<div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById === nodes.unique_id}">
<div class="folder-item" :class="{'is-selected': isSelected}" @click="getFolder" :style="indent">
<chevron-right-icon @click.stop="showTree" size="17" class="icon-arrow" :class="{'is-opened': isVisible, 'is-visible': nodes.folders.length !== 0}"></chevron-right-icon>
@@ -9,7 +9,7 @@
<span class="label">{{ nodes.name }}</span>
</div>
<TreeMenu :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.unique_id" />
<TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.unique_id" />
</div>
</template>
@@ -21,7 +21,7 @@
export default {
name: 'TreeMenu',
props: [
'nodes', 'depth'
'nodes', 'depth', 'disabledById'
],
components: {
ChevronRightIcon,
@@ -38,6 +38,7 @@
return {
isVisible: false,
isSelected: false,
isInactive: false
}
},
methods: {
@@ -49,16 +50,18 @@
this.isVisible = ! this.isVisible
}
},
created() {
mounted() {
// Show first location
if (this.depth == 1) this.isVisible = true
if (this.depth == 1)
this.isVisible = true
// Select clicked folder
events.$on('pick-folder', node => {
this.isSelected = false
if (this.nodes.unique_id == node.unique_id) this.isSelected = true
if (this.nodes.unique_id == node.unique_id)
this.isSelected = true
})
// Select clicked folder
@@ -76,6 +79,11 @@
@import '@assets/vue-file-manager/_variables';
@import '@assets/vue-file-manager/_mixins';
.is-inactive {
opacity: 0.5;
pointer-events: none;
}
.folder-item {
user-select: none;
display: block;

2
resources/js/components/Others/UserImageInput.vue
View File

@@ -80,7 +80,7 @@
left: 0;
right: 0;
bottom: 0;
z-index: 1;
z-index: 2;
width: 100%;
cursor: pointer;
}

2
resources/js/i18n/index.js vendored
View File

@@ -10,7 +10,7 @@ Vue.use(VueI18n);
const i18n = new VueI18n({
locale: config.locale,
messages: Object.assign({
en, sk
en
}),
});

38
resources/js/i18n/lang/cn.json
View File

@@ -7,6 +7,12 @@
"share": "Share item",
"upload": "上传文件"
},
"activation": {
"stripe": {
"button": "设置您的Stripe帐户",
"title": "您的Stripe帐户尚未设置"
}
},
"admin_menu": {
"dashboard": "仪表板",
"invoices": "发票",
@@ -216,8 +222,20 @@
},
"payments": {
"allow_payments": "允许订阅付款",
"button_submit": "测试并保存条带",
"button_testing": "测试条连接",
"credentials_disclaimer": "不显示您的Stripe凭据，因为这些值是秘密的，陌生人不得透露。您可以在 <b>.env</b> 文件中更改Stripe凭据。",
"section_payments": "条纹付款",
"stripe_create_acc": "如果您没有带区帐户，请 <a href=\"https://dashboard.stripe.com/register\" target=\"_blank\">在</a> 这里注册并获取您的可发布密钥，秘密密钥并创建您的网络挂钩。",
"stripe_create_webhook": "",
"stripe_currency": "Stripe Currency",
"stripe_currency_plac": "Select your Stripe currency",
"stripe_pub_key": "Publishable Key",
"stripe_pub_key_plac": "Paste your publishable key",
"stripe_sec_key": "Secret Key",
"stripe_sec_key_plac": "Paste your secret key",
"stripe_setup": "Stripe Setup",
"stripe_webhook_key_plac": "Paste your stripe webhook secret",
"webhook_url": "Stripe webhook URL"
},
"tabs": {
@@ -327,6 +345,23 @@
"nothing_to_preview": "没有任何信息可以预览。",
"nothing_was_found": "没找到任何信息。"
},
"notice": {
"stripe_activation": "您的Stripe帐户尚未设置。要向您的用户收费，请 {0}。",
"stripe_activation_button": "设置您的Stripe帐户"
},
"page_contact_us": {
"description": "你有任何问题吗？请与我们联系。",
"error_message": "出问题了，请重试。",
"form": {
"email": "电子邮件",
"email_plac": "输入您的电子邮件",
"message": "信息",
"message_plac": "在这里输入你的消息...",
"submit_button": "发信息"
},
"success_message": "您的消息已成功发送。",
"title": "联系我们"
},
"page_create_password": {
"button_update": "更新密码",
"label_confirm_pass": "确认密码",
@@ -614,7 +649,8 @@
"created_user": "User was created successfully!",
"email_set": "您的电子邮件设置已成功更新",
"plan_created": "您的计划已成功创建！",
"sended_password": "You successfully send user email for reset password!"
"sended_password": "You successfully send user email for reset password!",
"stripe_set": "您的Stripe帐户已成功设置！"
},
"types": {
"file": "文件",

38
resources/js/i18n/lang/en.json
View File

@@ -7,6 +7,12 @@
"share": "Share item",
"upload": "Upload file"
},
"activation": {
"stripe": {
"button": "Set up your Stripe account",
"title": "Your Stripe account is not set"
}
},
"admin_menu": {
"dashboard": "Dashboard",
"invoices": "Invoices",
@@ -216,8 +222,20 @@
},
"payments": {
"allow_payments": "Allow Subscription Payments",
"button_submit": "Test and Save Stripe",
"button_testing": "Testing Stripe Connection",
"credentials_disclaimer": "Your Stripe credentials is not showed because these values are secret and must not be revealed by stranger. You can change your Stripe credentials in your <b>.env</b> file.",
"section_payments": "Stripe Payments",
"stripe_create_acc": "If you don’t have stripe account, please <a href=\"https://dashboard.stripe.com/register\" target=\"_blank\">register here</a> and get your Publishable Key, Secret Key and create your webhook.",
"stripe_create_webhook": "You have to create webhook endpoint in your Stripe Dashboard. You can find it in <b>Dashboard -> Developers -> Webhooks -> Add Endpoint</b>. In Endpoint URL please copy and paste url bellow. Make sure, this url is your public domain, not localhost. In events section, please click on <b>receive all events</b>. That's all.",
"stripe_currency": "Stripe Currency",
"stripe_currency_plac": "Select your Stripe currency",
"stripe_pub_key": "Publishable Key",
"stripe_pub_key_plac": "Paste your publishable key",
"stripe_sec_key": "Secret Key",
"stripe_sec_key_plac": "Paste your secret key",
"stripe_setup": "Stripe Setup",
"stripe_webhook_key_plac": "Paste your stripe webhook secret",
"webhook_url": "Stripe webhook URL"
},
"tabs": {
@@ -327,6 +345,23 @@
"nothing_to_preview": "There is nothing to preview.",
"nothing_was_found": "Nothing was found."
},
"notice": {
"stripe_activation": "Your Stripe account is not set. To charging your users please {0}.",
"stripe_activation_button": "set up your Stripe account"
},
"page_contact_us": {
"description": "Do you have any questions? Get in touch with us.",
"error_message": "Something went wrong, please try it again.",
"form": {
"email": "Email",
"email_plac": "Type your email",
"message": "Message",
"message_plac": "Type your message here...",
"submit_button": "Send Message"
},
"success_message": "Your message was send successfully.",
"title": "Contact Us"
},
"page_create_password": {
"button_update": "Update Password",
"label_confirm_pass": "Confirm password",
@@ -614,7 +649,8 @@
"created_user": "User was created successfully!",
"email_set": "Your email settings was updated successfully",
"plan_created": "Your plan was successfully created!",
"sended_password": "You successfully send user email for reset password!"
"sended_password": "You successfully send user email for reset password!",
"stripe_set": "Your Stripe account was successfully set!"
},
"types": {
"file": "File",

40
resources/js/i18n/lang/sk.json
View File

@@ -7,6 +7,12 @@
"share": "Zdieľať položku",
"upload": "Nahrať súbory"
},
"activation": {
"stripe": {
"button": "Nastaviť účet Stripe",
"title": "Váš účet Stripe nie je nastavený"
}
},
"admin_menu": {
"dashboard": "Prehľad",
"invoices": "Faktúry",
@@ -216,9 +222,21 @@
},
"payments": {
"allow_payments": "Povoliť platby za plány",
"button_submit": "Otestovať a uložiť Stripe",
"button_testing": "Testovanie Stripe pripojenia",
"credentials_disclaimer": "Vaše poverenia v službe Stripe sa nezobrazujú, pretože tieto hodnoty sú tajné a nesmie ich odhaliť cudzinec. Svoje poverenia v službe Stripe môžete zmeniť v súbore <b>.env</b> aplikácie.",
"section_payments": "Stripe platby",
"webhook_url": "Stripe webhook URL"
"stripe_create_acc": "Ak nemáte účet Stripe, <a href=\"https://dashboard.stripe.com/register\" target=\"_blank\">zaregistrujte sa tu</a> a získajte svoj publikovateľný kľúč, tajný kľúč a vytvorte Stripe webhook.",
"stripe_create_webhook": "",
"stripe_currency": "Stripe Mena",
"stripe_currency_plac": "Vyberte Stripe menu",
"stripe_pub_key": "Verejný kľúč",
"stripe_pub_key_plac": "Vložte Váš verejný kľúč",
"stripe_sec_key": "Tajný kľúč",
"stripe_sec_key_plac": "Vložte Váš tajný kľúč",
"stripe_setup": "Stripe nastavenia",
"stripe_webhook_key_plac": "Vložte Váš Stripe webhook tajný kľúč",
"webhook_url": "Stripe webhook URL adresa"
},
"tabs": {
"appearance": "Vzhľad",
@@ -327,6 +345,23 @@
"nothing_to_preview": "Tu nie je nič pre zobrazenie.",
"nothing_was_found": "Nič sa nenašlo."
},
"notice": {
"stripe_activation": "Váš účet Stripe nie je nastavený. Pre spoplatňovanie používateľov prosím {0}.",
"stripe_activation_button": "nastavte účet Stripe"
},
"page_contact_us": {
"description": "Máte nejaké otázky? Spojte sa s nami.",
"error_message": "Niečo sa pokazilo, skúste to znova.",
"form": {
"email": "E-mail",
"email_plac": "Zadajte svoj e-mail",
"message": "Správa",
"message_plac": "Sem napíšte správu...",
"submit_button": "Odoslať správu"
},
"success_message": "Vaša správa bola úspešne odoslaná.",
"title": "Kontaktujte nás"
},
"page_create_password": {
"button_update": "Aktualizovať heslo",
"label_confirm_pass": "Potvrďte nové heslo",
@@ -614,7 +649,8 @@
"created_user": "Úspešne ste vytvorili uživateľa!",
"email_set": "Vaše nastavenia e-mailu boli úspešne aktualizované",
"plan_created": "Váš plán bol úspešne vytvorený!",
"sended_password": "Úspešne ste odoslali email uživateľovi pre reset hesla!"
"sended_password": "Úspešne ste odoslali email uživateľovi pre reset hesla!",
"stripe_set": "Váš účet Stripe bol úspešne nastavený!"
},
"types": {
"file": "Súbor",

6
resources/js/store/modules/app.js vendored
View File

@@ -48,6 +48,12 @@ const mutations = {
state.authorized = data.authCookie
state.homeDirectory = data.rootDirectory
},
SET_SAAS(state, data) {
state.config.isSaaS = data
},
SET_STRIPE_PUBLIC_KEY(state, data) {
state.config.stripe_public_key = data
},
FILE_INFO_TOGGLE(state, isVisible) {
state.fileInfoPanelVisible = isVisible

2
resources/js/views/Admin/AppSettings/AppSettings.vue
View File

@@ -18,7 +18,7 @@
</div>
</router-link>
<router-link replace :to="{name: 'AppIndex'}" class="menu-list-item link">
<router-link v-if="config.isSaaS" replace :to="{name: 'AppIndex'}" class="menu-list-item link">
<div class="icon">
<book-icon size="17"></book-icon>
</div>

665
resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
View File

@@ -1,8 +1,8 @@
<template>
<PageTab :is-loading="isLoading" class="form-fixed-width">
<!--Personal Information-->
<PageTabGroup>
<!--Stripe Information-->
<PageTabGroup v-if="config.stripe_public_key">
<div class="form block-form">
<FormLabel>{{ $t('admin_settings.payments.section_payments') }}</FormLabel>
<InfoBox>
@@ -27,6 +27,71 @@
</div>
</div>
</PageTabGroup>
<!--Stripe Set up-->
<PageTabGroup v-if="! config.stripe_public_key">
<ValidationObserver @submit.prevent="stripeCredentialsSubmit" ref="stripeCredentials" v-slot="{ invalid }" tag="form" class="form block-form">
<FormLabel>{{ $t('admin_settings.payments.stripe_setup') }}</FormLabel>
<InfoBox>
<p v-html="$t('admin_settings.payments.stripe_create_acc')"></p>
</InfoBox>
<div class="block-wrapper">
<label>{{ $t('admin_settings.payments.stripe_currency') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Currency" rules="required" v-slot="{ errors }">
<SelectInput v-model="stripeCredentials.currency" :options="currencyList" :placeholder="$t('admin_settings.payments.stripe_currency_plac')" :isError="errors[0]"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('admin_settings.payments.stripe_pub_key') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Publishable Key" rules="required" v-slot="{ errors }">
<input v-model="stripeCredentials.key" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" type="text" :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>{{ $t('admin_settings.payments.stripe_sec_key') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Secret Key" rules="required" v-slot="{ errors }">
<input v-model="stripeCredentials.secret" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" type="text" :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>Webhook URL:</label>
<InfoBox>
<p v-html="$t('admin_settings.payments.stripe_create_webhook')"></p>
</InfoBox>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Webhook URL" rules="required" v-slot="{ errors }">
<input :value="stripeWebhookEndpoint" type="text" disabled/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>Webhook Secret:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Webhook Secret" rules="required" v-slot="{ errors }">
<input v-model="stripeCredentials.webhookSecret" :placeholder="$t('admin_settings.payments.stripe_webhook_key_plac')" type="text" :class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<InfoBox v-if="isError" type="error" style="margin-bottom: -20px">
<p>{{ errorMessage }}</p>
</InfoBox>
<ButtonBase :loading="isLoading" :disabled="isLoading" type="submit"
button-style="theme" class="submit-button">
{{ submitButtonText }}
</ButtonBase>
</ValidationObserver>
</PageTabGroup>
</PageTab>
</template>
@@ -44,6 +109,7 @@
import InfoBox from '@/components/Others/Forms/InfoBox'
import {required} from 'vee-validate/dist/rules'
import {mapGetters} from 'vuex'
import {events} from "@/bus"
import axios from 'axios'
export default {
@@ -67,17 +133,610 @@
...mapGetters(['config']),
stripeWebhookEndpoint() {
return this.config.host + '/stripe/webhook'
},
submitButtonText() {
return this.isLoading ? this.$t('admin_settings.payments.button_testing') : this.$t('admin_settings.payments.button_submit')
}
},
data() {
return {
isLoading: true,
isError: false,
errorMessage: '',
payments: {
status: undefined,
status: 1,
configured: undefined,
},
stripeCredentials: {
key: '',
secret: '',
webhookSecret: '',
currency: '',
},
currencyList: [
{
label: 'USD - United States Dollar',
value: 'USD',
},
{
label: 'EUR - Euro',
value: 'EUR',
},
{
label: 'GBP - British Pound',
value: 'GBP',
},
{
label: 'AFN - Afghan Afghani',
value: 'AFN',
},
{
label: 'ALL - Albanian Lek',
value: 'ALL',
},
{
label: 'DZD - Algerian Dinar',
value: 'DZD',
},
{
label: 'AOA - Angolan Kwanza',
value: 'AOA',
},
{
label: 'ARS - Argentine Peso',
value: 'ARS',
},
{
label: 'AMD - Armenian Dram',
value: 'AMD',
},
{
label: 'AWG - Aruban Florin',
value: 'AWG',
},
{
label: 'AUD - Australian Dollar',
value: 'AUD',
},
{
label: 'AZN - Azerbaijani Manat',
value: 'AZN',
},
{
label: 'BDT - Bangladeshi Taka',
value: 'BDT',
},
{
label: 'BBD - Barbadian Dollar',
value: 'BBD',
},
{
label: 'BZD - Belize Dollar',
value: 'BZD',
},
{
label: 'BMD - Bermudian Dollar',
value: 'BMD',
},
{
label: 'BOB - Bolivian Boliviano',
value: 'BOB',
},
{
label: 'BAM - Bosnia & Herzegovina Convertible Mark',
value: 'BAM',
},
{
label: 'BWP - Botswana Pula',
value: 'BWP',
},
{
label: 'BRL - Brazilian Real',
value: 'BRL',
},
{
label: 'BND - Brunei Dollar',
value: 'BND',
},
{
label: 'BGN - Bulgarian Lev',
value: 'BGN',
},
{
label: 'BIF - Burundian Franc',
value: 'BIF',
},
{
label: 'KHR - Cambodian Riel',
value: 'KHR',
},
{
label: 'CAD - Canadian Dollar',
value: 'CAD',
},
{
label: 'CVE - Cape Verdean Escudo',
value: 'CVE',
},
{
label: 'KYD - Cayman Islands Dollar',
value: 'KYD',
},
{
label: 'XAF - Central African Cfa Franc',
value: 'XAF',
},
{
label: 'XPF - Cfp Franc',
value: 'XPF',
},
{
label: 'CLP - Chilean Peso',
value: 'CLP',
},
{
label: 'CNY - Chinese Renminbi Yuan',
value: 'CNY',
},
{
label: 'COP - Colombian Peso',
value: 'COP',
},
{
label: 'KMF - Comorian Franc',
value: 'KMF',
},
{
label: 'CDF - Congolese Franc',
value: 'CDF',
},
{
label: 'CRC - Costa Rican Colón',
value: 'CRC',
},
{
label: 'HRK - Croatian Kuna',
value: 'HRK',
},
{
label: 'CZK - Czech Koruna',
value: 'CZK',
},
{
label: 'DKK - Danish Krone',
value: 'DKK',
},
{
label: 'DJF - Djiboutian Franc',
value: 'DJF',
},
{
label: 'DOP - Dominican Peso',
value: 'DOP',
},
{
label: 'XCD - East Caribbean Dollar',
value: 'XCD',
},
{
label: 'EGP - Egyptian Pound',
value: 'EGP',
},
{
label: 'ETB - Ethiopian Birr',
value: 'ETB',
},
{
label: 'FKP - Falkland Islands Pound',
value: 'FKP',
},
{
label: 'FJD - Fijian Dollar',
value: 'FJD',
},
{
label: 'GMD - Gambian Dalasi',
value: 'GMD',
},
{
label: 'GEL - Georgian Lari',
value: 'GEL',
},
{
label: 'GIP - Gibraltar Pound',
value: 'GIP',
},
{
label: 'GTQ - Guatemalan Quetzal',
value: 'GTQ',
},
{
label: 'GNF - Guinean Franc',
value: 'GNF',
},
{
label: 'GYD - Guyanese Dollar',
value: 'GYD',
},
{
label: 'HTG - Haitian Gourde',
value: 'HTG',
},
{
label: 'HNL - Honduran Lempira',
value: 'HNL',
},
{
label: 'HKD - Hong Kong Dollar',
value: 'HKD',
},
{
label: 'HUF - Hungarian Forint',
value: 'HUF',
},
{
label: 'ISK - Icelandic Króna',
value: 'ISK',
},
{
label: 'INR - Indian Rupee',
value: 'INR',
},
{
label: 'IDR - Indonesian Rupiah',
value: 'IDR',
},
{
label: 'ILS - Israeli New Sheqel',
value: 'ILS',
},
{
label: 'JMD - Jamaican Dollar',
value: 'JMD',
},
{
label: 'JPY - Japanese Yen',
value: 'JPY',
},
{
label: 'KZT - Kazakhstani Tenge',
value: 'KZT',
},
{
label: 'KES - Kenyan Shilling',
value: 'KES',
},
{
label: 'KGS - Kyrgyzstani Som',
value: 'KGS',
},
{
label: 'LAK - Lao Kip',
value: 'LAK',
},
{
label: 'LBP - Lebanese Pound',
value: 'LBP',
},
{
label: 'LSL - Lesotho Loti',
value: 'LSL',
},
{
label: 'LRD - Liberian Dollar',
value: 'LRD',
},
{
label: 'MOP - Macanese Pataca',
value: 'MOP',
},
{
label: 'MKD - Macedonian Denar',
value: 'MKD',
},
{
label: 'MGA - Malagasy Ariary',
value: 'MGA',
},
{
label: 'MWK - Malawian Kwacha',
value: 'MWK',
},
{
label: 'MYR - Malaysian Ringgit',
value: 'MYR',
},
{
label: 'MVR - Maldivian Rufiyaa',
value: 'MVR',
},
{
label: 'MRO - Mauritanian Ouguiya',
value: 'MRO',
},
{
label: 'MUR - Mauritian Rupee',
value: 'MUR',
},
{
label: 'MXN - Mexican Peso',
value: 'MXN',
},
{
label: 'MDL - Moldovan Leu',
value: 'MDL',
},
{
label: 'MNT - Mongolian Tögrög',
value: 'MNT',
},
{
label: 'MAD - Moroccan Dirham',
value: 'MAD',
},
{
label: 'MZN - Mozambican Metical',
value: 'MZN',
},
{
label: 'MMK - Myanmar Kyat',
value: 'MMK',
},
{
label: 'NAD - Namibian Dollar',
value: 'NAD',
},
{
label: 'NPR - Nepalese Rupee',
value: 'NPR',
},
{
label: 'ANG - Netherlands Antillean Gulden',
value: 'ANG',
},
{
label: 'TWD - New Taiwan Dollar',
value: 'TWD',
},
{
label: 'NZD - New Zealand Dollar',
value: 'NZD',
},
{
label: 'NIO - Nicaraguan Córdoba',
value: 'NIO',
},
{
label: 'NGN - Nigerian Naira',
value: 'NGN',
},
{
label: 'NOK - Norwegian Krone',
value: 'NOK',
},
{
label: 'PKR - Pakistani Rupee',
value: 'PKR',
},
{
label: 'PAB - Panamanian Balboa',
value: 'PAB',
},
{
label: 'PGK - Papua New Guinean Kina',
value: 'PGK',
},
{
label: 'PYG - Paraguayan Guaraní',
value: 'PYG',
},
{
label: 'PEN - Peruvian Nuevo Sol',
value: 'PEN',
},
{
label: 'PHP - Philippine Peso',
value: 'PHP',
},
{
label: 'PLN - Polish Złoty',
value: 'PLN',
},
{
label: 'QAR - Qatari Riyal',
value: 'QAR',
},
{
label: 'RON - Romanian Leu',
value: 'RON',
},
{
label: 'RUB - Russian Ruble',
value: 'RUB',
},
{
label: 'RWF - Rwandan Franc',
value: 'RWF',
},
{
label: 'STD - São Tomé and Príncipe Dobra',
value: 'STD',
},
{
label: 'SHP - Saint Helenian Pound',
value: 'SHP',
},
{
label: 'SVC - Salvadoran Colón',
value: 'SVC',
},
{
label: 'WST - Samoan Tala',
value: 'WST',
},
{
label: 'SAR - Saudi Riyal',
value: 'SAR',
},
{
label: 'RSD - Serbian Dinar',
value: 'RSD',
},
{
label: 'SCR - Seychellois Rupee',
value: 'SCR',
},
{
label: 'SLL - Sierra Leonean Leone',
value: 'SLL',
},
{
label: 'SGD - Singapore Dollar',
value: 'SGD',
},
{
label: 'SBD - Solomon Islands Dollar',
value: 'SBD',
},
{
label: 'SOS - Somali Shilling',
value: 'SOS',
},
{
label: 'ZAR - South African Rand',
value: 'ZAR',
},
{
label: 'KRW - South Korean Won',
value: 'KRW',
},
{
label: 'LKR - Sri Lankan Rupee',
value: 'LKR',
},
{
label: 'SRD - Surinamese Dollar',
value: 'SRD',
},
{
label: 'SZL - Swazi Lilangeni',
value: 'SZL',
},
{
label: 'SEK - Swedish Krona',
value: 'SEK',
},
{
label: 'CHF - Swiss Franc',
value: 'CHF',
},
{
label: 'TJS - Tajikistani Somoni',
value: 'TJS',
},
{
label: 'TZS - Tanzanian Shilling',
value: 'TZS',
},
{
label: 'THB - Thai Baht',
value: 'THB',
},
{
label: 'TOP - Tongan Paʻanga',
value: 'TOP',
},
{
label: 'TTD - Trinidad and Tobago Dollar',
value: 'TTD',
},
{
label: 'TRY - Turkish Lira',
value: 'TRY',
},
{
label: 'UGX - Ugandan Shilling',
value: 'UGX',
},
{
label: 'UAH - Ukrainian Hryvnia',
value: 'UAH',
},
{
label: 'AED - United Arab Emirates Dirham',
value: 'AED',
},
{
label: 'UYU - Uruguayan Peso',
value: 'UYU',
},
{
label: 'UZS - Uzbekistani Som',
value: 'UZS',
},
{
label: 'VUV - Vanuatu Vatu',
value: 'VUV',
},
{
label: 'VND - Vietnamese Đồng',
value: 'VND',
},
{
label: 'XOF - West African Cfa Franc',
value: 'XOF',
},
{
label: 'YER - Yemeni Rial',
value: 'YER',
},
{
label: 'ZMW - Zambian Kwacha',
value: 'ZMW',
},
],
}
},
methods: {
async stripeCredentialsSubmit() {
// Validate fields
const isValid = await this.$refs.stripeCredentials.validate();
if (!isValid) return;
// Start loading
this.isLoading = true
// Send request to get verify account
axios
.post('/api/setup/stripe-credentials', this.stripeCredentials)
.then(() => {
// End loading
this.isLoading = false
// Store Stripe Public
this.$store.commit('SET_STRIPE_PUBLIC_KEY', this.stripeCredentials.key)
// Show toaster
events.$emit('toaster', {
type: 'success',
message: this.$t('toaster.stripe_set'),
})
})
.catch(error => {
if (error.response.status = 401) {
this.isError = true
this.errorMessage = error.response.data.message
}
// End loading
this.isLoading = false
})
},
},
mounted() {
axios.get('/api/settings', {
params: {

41
resources/js/views/Admin/Dashboard.vue
View File

@@ -31,7 +31,15 @@
</a>
</div>
</div>
<div class="widgets-total">
<!--Stripe notice-->
<InfoBox v-if="! config.stripe_public_key" class="dashboard-notice">
<i18n path="notice.stripe_activation">
<router-link :to="{name: 'AppPayments'}">{{ $t('notice.stripe_activation_button') }}</router-link>
</i18n>
</InfoBox>
<div class="widgets-total" :class="{'widgets-coll-3': config.isSaaS, 'widgets-coll-2': ! config.isSaaS}">
<WidgetTotals
class="widget"
icon="users"
@@ -82,6 +90,7 @@
import SectionTitle from '@/components/Others/SectionTitle'
import WidgetTotals from '@/components/Admin/WidgetTotals'
import ButtonBase from '@/components/FilesView/ButtonBase'
import InfoBox from '@/components/Others/Forms/InfoBox'
import PageHeader from '@/components/Others/PageHeader'
import ColorLabel from '@/components/Others/ColorLabel'
import Spinner from '@/components/FilesView/Spinner'
@@ -104,6 +113,7 @@
PageHeader,
ButtonBase,
ColorLabel,
InfoBox,
Spinner,
},
computed: {
@@ -136,11 +146,22 @@
@import '@assets/vue-file-manager/_variables';
@import '@assets/vue-file-manager/_mixins';
.dashboard-notice {
margin-bottom: 20px;
}
.widgets-total {
display: flex;
flex: 0 0 33%;
display: grid;
margin: 0 -20px 20px;
&.widgets-coll-2 {
grid-template-columns: repeat(auto-fill, 50%);
}
&.widgets-coll-3 {
grid-template-columns: repeat(auto-fill, 33%);
}
.widget {
width: 100%;
padding: 20px;
@@ -212,10 +233,22 @@
}
}
@media only screen and (max-width: 1024px) {
.widgets-total {
&.widgets-coll-2, &.widgets-coll-3 {
grid-template-columns: repeat(auto-fill, 50%);
}
}
}
@media only screen and (max-width: 960px) {
.widgets-total {
display: block;
&.widgets-coll-2, &.widgets-coll-3 {
grid-template-columns: repeat(auto-fill, 100%);
}
}
.became-backer {

39
resources/js/views/Admin/Invoices.vue
View File

@@ -1,5 +1,7 @@
<template>
<div id="single-page">
<!--Page Content-->
<div id="page-content" v-if="! isLoading && invoices.length > 0">
<MobileHeader :title="$router.currentRoute.meta.title"/>
<PageHeader :title="$router.currentRoute.meta.title"/>
@@ -52,13 +54,28 @@
</DatatableWrapper>
</div>
</div>
<!--Empty invoices-->
<EmptyPageContent
v-if="! isLoading && invoices.length === 0"
v-if="! isLoading && invoices.length === 0 && config.stripe_public_key"
icon="file-text"
:title="$t('admin_page_invoices.empty.title')"
:description="$t('admin_page_invoices.empty.description')"
>
</EmptyPageContent>
<!--Stripe Not Configured-->
<EmptyPageContent
v-if="! config.stripe_public_key"
icon="settings"
:title="$t('activation.stripe.title')"
>
<router-link :to="{name: 'AppPayments'}">
<ButtonBase button-style="theme">{{ $t('activation.stripe.button') }}</ButtonBase>
</router-link>
</EmptyPageContent>
<!--Spinner-->
<div id="loader" v-if="isLoading">
<Spinner></Spinner>
</div>
@@ -78,6 +95,7 @@
import ColorLabel from '@/components/Others/ColorLabel'
import Spinner from '@/components/FilesView/Spinner'
import {ExternalLinkIcon} from "vue-feather-icons";
import { mapGetters } from 'vuex'
import axios from 'axios'
export default {
@@ -96,10 +114,13 @@
ColorLabel,
Spinner,
},
computed: {
...mapGetters(['config']),
},
data() {
return {
isLoading: true,
invoices: undefined,
invoices: [],
columns: [
{
label: this.$t('admin_page_invoices.table.number'),
@@ -134,11 +155,15 @@
}
},
created() {
axios.get('/api/invoices')
.then(response => {
this.invoices = response.data.data
this.isLoading = false
})
if (this.config.stripe_public_key) {
axios.get('/api/invoices')
.then(response => {
this.invoices = response.data.data
this.isLoading = false
})
} else {
this.isLoading = false
}
}
}
</script>

39
resources/js/views/Admin/Plans.vue
View File

@@ -1,5 +1,7 @@
<template>
<div id="single-page">
<!--Page Content-->
<div id="page-content" v-if="! isLoading && plans.length > 0">
<MobileHeader :title="$router.currentRoute.meta.title"/>
<PageHeader :title="$router.currentRoute.meta.title"/>
@@ -62,17 +64,30 @@
</div>
</div>
<!--Empty plans-->
<EmptyPageContent
v-if="! isLoading && plans.length === 0"
v-if="! isLoading && plans.length === 0 && config.stripe_public_key"
icon="file"
:title="$t('admin_page_plans.empty.title')"
:description="$t('admin_page_plans.empty.description')"
>
<router-link :to="{name: 'PlanCreate'}">
<router-link :to="{name: 'PlanCreate'}" tag="p">
<ButtonBase button-style="theme">{{ $t('admin_page_plans.empty.button') }}</ButtonBase>
</router-link>
</EmptyPageContent>
<!--Stripe Not Configured-->
<EmptyPageContent
v-if="! config.stripe_public_key"
icon="settings"
:title="$t('activation.stripe.title')"
>
<router-link :to="{name: 'AppPayments'}">
<ButtonBase button-style="theme">{{ $t('activation.stripe.button') }}</ButtonBase>
</router-link>
</EmptyPageContent>
<!--Spinner-->
<div id="loader" v-if="isLoading">
<Spinner></Spinner>
</div>
@@ -91,6 +106,7 @@
import PageHeader from '@/components/Others/PageHeader'
import ColorLabel from '@/components/Others/ColorLabel'
import Spinner from '@/components/FilesView/Spinner'
import { mapGetters } from 'vuex'
import axios from 'axios'
export default {
@@ -112,7 +128,7 @@
data() {
return {
isLoading: true,
plans: undefined,
plans: [],
columns: [
{
label: this.$t('admin_page_plans.table.status'),
@@ -146,17 +162,24 @@
],
}
},
computed: {
...mapGetters(['config']),
},
methods: {
changeStatus(val, id) {
this.$updateText('/plans/' + id + '/update', 'is_active', val)
}
},
created() {
axios.get('/api/plans')
.then(response => {
this.plans = response.data.data
this.isLoading = false
})
if (this.config.stripe_public_key) {
axios.get('/api/plans')
.then(response => {
this.plans = response.data.data
this.isLoading = false
})
} else {
this.isLoading = false
}
}
}
</script>

4
resources/js/views/Admin/Users/UserTabs/UserDetail.vue
View File

@@ -59,7 +59,7 @@
</PageTabGroup>
<!--Billing Information-->
<PageTabGroup>
<PageTabGroup v-if="config.isSaaS">
<div class="form block-form">
<FormLabel>{{ $t('user_settings.title_billing') }}</FormLabel>
@@ -167,7 +167,7 @@
required,
},
computed: {
...mapGetters(['roles']),
...mapGetters(['roles', 'config']),
},
data() {
return {

1
resources/js/views/Admin/Users/UserTabs/UserStorage.vue
View File

@@ -47,7 +47,6 @@
<script>
import FormLabel from '@/components/Others/Forms/FormLabel'
import InfoBox from '@/components/Others/Forms/InfoBox'
import PageTabGroup from '@/components/Others/Layout/PageTabGroup'
import PageTab from '@/components/Others/Layout/PageTab'
import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'

14
resources/js/views/Auth/SignUp.vue
View File

@@ -54,8 +54,8 @@
<div>
<i18n path="page_registration.agreement" tag="p" class="legal-agreement">
<router-link :to="{name: 'DynamicPage', params: {slug: 'terms-of-service'}}" target="_blank">Terms of Service</router-link>
<router-link :to="{name: 'DynamicPage', params: {slug: 'privacy-policy'}}" target="_blank">Privacy Policy</router-link>
<router-link :to="{name: 'DynamicPage', params: {slug: 'terms-of-service'}}" target="_blank">{{ termsOfService.title }}</router-link>
<router-link :to="{name: 'DynamicPage', params: {slug: 'privacy-policy'}}" target="_blank">{{ privacyPolicy.title }}</router-link>
</i18n>
<AuthButton icon="chevron-right" :text="$t('page_registration.button_create_account')" :loading="isLoading" :disabled="isLoading"/>
</div>
@@ -93,6 +93,16 @@
},
computed: {
...mapGetters(['config']),
privacyPolicy() {
return this.config.legal.find(legal => {
return legal.slug === 'privacy-policy'
})
},
termsOfService() {
return this.config.legal.find(legal => {
return legal.slug === 'terms-of-service'
})
},
},
data() {
return {

30
resources/js/views/Index/ContactUs.vue
View File

@@ -10,42 +10,42 @@
<!--Headline-->
<PageTitle
class="headline"
title="Contact Us"
description="Do you have any questions? Get in touch with us."
:title="$t('page_contact_us.title')"
:description="$t('page_contact_us.description')"
></PageTitle>
<ValidationObserver v-if="! isSuccess" @submit.prevent="contactForm" ref="contactForm" v-slot="{ invalid }" tag="form"
class="form block-form">
<div class="block-wrapper">
<label>{{ $t('page_registration.label_email') }}</label>
<label>{{ $t('page_contact_us.form.email') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="E-Mail" rules="required"
v-slot="{ errors }">
<input v-model="contact.email" :placeholder="$t('page_registration.placeholder_email')" type="email"
<input v-model="contact.email" :placeholder="$t('page_contact_us.form.email_plac')" type="email"
:class="{'is-error': errors[0]}"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<div class="block-wrapper">
<label>Message:</label>
<label>{{ $t('page_contact_us.form.message') }}:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Message" rules="required"
v-slot="{ errors }">
<textarea v-model="contact.message" placeholder="Type your message here..." rows="6" :class="{'is-error': errors[0]}"></textarea>
<textarea v-model="contact.message" :placeholder="$t('page_contact_us.form.message_plac')" rows="6" :class="{'is-error': errors[0]}"></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
<InfoBox v-if="isError">
<p>Something went wrong, please try it again.</p>
<p>{{ $t('page_contact_us.error_message') }}</p>
</InfoBox>
<div>
<AuthButton class="submit-button" icon="chevron-right" text="Send Message" :loading="isLoading" :disabled="isLoading"/>
<AuthButton class="submit-button" icon="chevron-right" :text="$t('page_contact_us.form.submit_button')" :loading="isLoading" :disabled="isLoading"/>
</div>
</ValidationObserver>
<InfoBox v-if="isSuccess">
<p>Your message was send successfully.</p>
<p>{{ $t('page_contact_us.success_message') }}</p>
</InfoBox>
</div>
@@ -106,18 +106,14 @@
axios
.post('/api/contact', this.contact)
.then(() => {
// End loading
this.isLoading = false
this.isSuccess = true
})
.catch(error => {
.catch(() => {
this.isError = true
})
.finally(() => {
// End loading
this.isLoading = false
this.isError = true
})
}
},

12
resources/js/views/SetupWIzard/AdminAccount.vue
View File

@@ -95,11 +95,11 @@
return {
isLoading: false,
admin: {
name: '',
email: '',
name: 'Jane Doe',
email: 'howdy@hi5ve.digital',
avatar: undefined,
password: '',
password_confirmation: '',
password: 'vuefilemanager',
password_confirmation: 'vuefilemanager',
},
}
},
@@ -143,6 +143,10 @@
// Set login state
this.$store.commit('SET_AUTHORIZED', true)
if (localStorage.getItem('license') === 'Extended') {
this.$store.commit('SET_SAAS', true)
}
// Go to files page
this.$router.push({name: 'Dashboard'})

22
resources/js/views/SetupWIzard/AppSetup.vue
View File

@@ -76,9 +76,9 @@
<div class="inline-wrapper">
<div class="switch-label">
<label class="input-label">Storage Limitation:</label>
<small class="input-help">If this value is off, all users will have infinity storage capacity and you won't be <br/>able to charge your users for storage plan.</small>
</div>
<SwitchInput v-model="app.storageLimitation" class="switch" :state="app.storageLimitation"/>
<small class="input-help">If this value is off, all users will have infinity storage capacity and you won't be <br/>able to charge your users for storage plan.</small>
</div>
</div>
</div>
@@ -153,14 +153,14 @@
return {
isLoading: false,
app: {
title: '',
description: '',
title: 'VueFileManager',
description: 'The best app',
logo: undefined,
logo_horizontal: undefined,
favicon: undefined,
contactMail: '',
contactMail: 'howdy@hi5ve.digital',
googleAnalytics: '',
defaultStorage: '',
defaultStorage: '5',
userRegistration: 1,
storageLimitation: 1,
},
@@ -184,10 +184,14 @@
formData.append('title', this.app.title)
formData.append('description', this.app.description)
formData.append('contactMail', this.app.contactMail)
formData.append('googleAnalytics', this.app.googleAnalytics)
formData.append('defaultStorage', this.app.defaultStorage)
formData.append('userRegistration', this.app.userRegistration)
formData.append('storageLimitation', this.app.storageLimitation)
formData.append('userRegistration', Boolean(this.app.userRegistration) ? 1 : 0)
formData.append('storageLimitation', Boolean(this.app.storageLimitation) ? 1 : 0)
if (this.app.googleAnalytics)
formData.append('googleAnalytics', this.app.googleAnalytics)
if (this.app.defaultStorage)
formData.append('defaultStorage', this.app.defaultStorage)
if (this.app.logo)
formData.append('logo', this.app.logo)

12
resources/js/views/SetupWIzard/EnvironmentSetup.vue
View File

@@ -197,12 +197,12 @@
bucket: '',
},
mail: {
driver: '',
host: '',
port: '',
username: '',
password: '',
encryption: '',
driver: 'smtp',
host: 'smtp.websupport.sk',
port: '25',
username: 'vuefilemanager@hi5ve.digital',
password: 'Yl2d]kET>)',
encryption: 'tls',
}
}
},

2
resources/js/views/SetupWIzard/PurchaseCode.vue
View File

@@ -56,7 +56,7 @@
data() {
return {
isLoading: false,
purchaseCode: 'e3420e63-ce6f-4d04-9b3e-f7f5cc6af7c6',
purchaseCode: '8654194a-3156-4cd0-944e-3440fcecdabb',
}
},
methods: {

7
resources/js/views/SetupWIzard/StripeCredentials.vue
View File

@@ -11,7 +11,7 @@
<ValidationObserver @submit.prevent="stripeCredentialsSubmit" ref="stripeCredentials" v-slot="{ invalid }" tag="form" class="form block-form">
<InfoBox>
<p>If you don’t have stripe account, please <a href="#" target="_blank">register here</a> and get your Publishable Key, Secret Key and create your webhook.</p>
<p>If you don’t have stripe account, please <a href="https://dashboard.stripe.com/register" target="_blank">register here</a> and get your Publishable Key, Secret Key and create your webhook.</p>
</InfoBox>
<FormLabel>Stripe Setup</FormLabel>
@@ -19,7 +19,7 @@
<div class="block-wrapper">
<label>Stripe Currency:</label>
<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Currency" rules="required" v-slot="{ errors }">
<SelectInput v-model="stripeCredentials.currency" :options="currencyList" default="mysql" placeholder="Select your Stripe currency" :isError="errors[0]"/>
<SelectInput v-model="stripeCredentials.currency" :options="currencyList" placeholder="Select your Stripe currency" :isError="errors[0]"/>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider>
</div>
@@ -688,6 +688,9 @@
// End loading
this.isLoading = false
// Store Stripe Public
this.$store.commit('SET_STRIPE_PUBLIC_KEY', this.stripeCredentials.key)
// Redirect to next step
this.$router.push({name: 'BillingsDetail'})
})

2
resources/views/index.blade.php
View File

@@ -53,7 +53,7 @@
isSaaS: {{ isset($settings->license) && $settings->license === 'Extended' ? 1 : 0 }},
isDemo: {{ env('APP_DEMO') ? 1 : 0 }},
legal: {!! $legal !!},
legal: {!! isset($legal) ? $legal : 'undefined' !!},
installation: '{{ $installation }}',
}