setup wizard debug

This commit is contained in:
Čarodej
2022-03-13 18:30:03 +01:00
parent 2bba6dc051
commit 5e48af22a2
100 changed files with 308 additions and 300 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
APP_NAME=Laravel APP_NAME=Laravel
APP_ENV=local APP_ENV=local
APP_KEY=base64:3eyU1lMJzg94d5p4slxUUe0gZmWwJHFJDVnozgZuPe4= APP_KEY=base64:P5ALPv1A4kpH7ppRtRyk3M9qoU0fG/tC5rV/3KX3Ff4=
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://localhost APP_URL=http://localhost
APP_DEMO=false APP_DEMO=false
@@ -15,7 +15,7 @@ DB_USERNAME=null
DB_PASSWORD=null DB_PASSWORD=null
FILESYSTEM_DISK=local FILESYSTEM_DISK=local
BROADCAST_DRIVER=log BROADCAST_DRIVER=null
CACHE_DRIVER=file CACHE_DRIVER=file
SESSION_DRIVER=file SESSION_DRIVER=file
SESSION_LIFETIME=120 SESSION_LIFETIME=120
+1 -1
View File
@@ -1,7 +1,7 @@
<?php <?php
return [ return [
'version' => '2.0.0-Rc.5', 'version' => '2.0.0-Rc.6',
'is_demo' => env('APP_DEMO', false), 'is_demo' => env('APP_DEMO', false),
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[7866],{8335:(t,n,e)=>{e.r(n),e.d(n,{default:()=>u});const s={name:"SetupWizard",mounted:function(){var t=this.$root.$data.config.installation;t&&"installation-done"===t&&this.$router.push({name:"SignIn"})}};const u=(0,e(1900).Z)(s,(function(){var t=this.$createElement;return(this._self._c||t)("router-view")}),[],!1,null,null,null).exports}}]); "use strict";(self.webpackChunk=self.webpackChunk||[]).push([[7866],{5001:(t,n,a)=>{a.r(n),a.d(n,{default:()=>s});const e={name:"SetupWizard",mounted:function(){var t=this.$root.$data.config.installation;t&&"installation-done"===t&&this.$router.push({name:"SignIn"})}};const s=(0,a(1900).Z)(e,(function(){var t=this.$createElement;return(this._self._c||t)("router-view",{staticClass:"dark:bg-dark-background bg-light-background"})}),[],!1,null,null,null).exports}}]);
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+42 -42
View File
@@ -1,68 +1,68 @@
{ {
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=e0c3cce208467016", "/chunks/request.js": "/chunks/request.js?id=2612a0666f7c5288",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=fd51df8575a7dee1", "/chunks/request-upload.js": "/chunks/request-upload.js?id=fd51df8575a7dee1",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2", "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=e00d8661d9309daf",
"/chunks/status-check.js": "/chunks/status-check.js?id=e66a3840dffd4244", "/chunks/status-check.js": "/chunks/status-check.js?id=63d576ce787c1ced",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=1dc6cf905488fbd3", "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=9805de5bb941797f",
"/chunks/database.js": "/chunks/database.js?id=918122950c687617", "/chunks/database.js": "/chunks/database.js?id=91cbfea9fce46de8",
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=d3c6bcc2b6a52cbe", "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=4355a418b292c1c7",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=155c2cce2fa0ec12", "/chunks/app-setup.js": "/chunks/app-setup.js?id=de913045c953752a",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=b1a30b60b50257d7", "/chunks/admin-account.js": "/chunks/admin-account.js?id=205b419d198f8fdc",
"/chunks/shared.js": "/chunks/shared.js?id=00b480ef478fe685", "/chunks/shared.js": "/chunks/shared.js?id=4c20e49c6ccc5da8",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=e056607bd53721b0", "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=e056607bd53721b0",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a0e3467219aa86d9", "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=a0e3467219aa86d9",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=1c660dd90667d0c2", "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5f3d082a586c619",
"/chunks/not-found.js": "/chunks/not-found.js?id=913fb0f40976e1a8", "/chunks/not-found.js": "/chunks/not-found.js?id=913fb0f40976e1a8",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=250d923cb7001cf2", "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=250d923cb7001cf2",
"/chunks/admin.js": "/chunks/admin.js?id=a5fdb4923760b8d1", "/chunks/admin.js": "/chunks/admin.js?id=51bf991d3cddbcd6",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=67eb430a1f049498", "/chunks/dashboard.js": "/chunks/dashboard.js?id=67eb430a1f049498",
"/chunks/invoices.js": "/chunks/invoices.js?id=1344281edac589dd", "/chunks/invoices.js": "/chunks/invoices.js?id=1344281edac589dd",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5eb4e2a4cdd4cee7", "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5eb4e2a4cdd4cee7",
"/chunks/pages.js": "/chunks/pages.js?id=e730474753a9e86c", "/chunks/pages.js": "/chunks/pages.js?id=e730474753a9e86c",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=adaad4c73702a696", "/chunks/page-edit.js": "/chunks/page-edit.js?id=4f54f01640f91ea4",
"/chunks/plans.js": "/chunks/plans.js?id=c5ae80b5680fd972", "/chunks/plans.js": "/chunks/plans.js?id=c5ae80b5680fd972",
"/chunks/users.js": "/chunks/users.js?id=57e2b88c5d64eeaf", "/chunks/users.js": "/chunks/users.js?id=57e2b88c5d64eeaf",
"/chunks/user-create.js": "/chunks/user-create.js?id=fcd35940135c149e", "/chunks/user-create.js": "/chunks/user-create.js?id=94cb6de3fa97532f",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=0c6d85e21d41cabe", "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=233b503c533785b6",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=43cb754235d711d4", "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=399dc36da3ead2dd",
"/chunks/user.js": "/chunks/user.js?id=be6451917a05f8bb", "/chunks/user.js": "/chunks/user.js?id=be6451917a05f8bb",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=972861e4eb171f5d", "/chunks/user-detail.js": "/chunks/user-detail.js?id=d24d758ff91cabaa",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=1fc24476a3965dc0", "/chunks/user-storage.js": "/chunks/user-storage.js?id=f975fec0bf4fc7e0",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=a802357ce121bd03", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=1c86ce0edbb859df",
"/chunks/user-password.js": "/chunks/user-password.js?id=2d1bee408b3b692e", "/chunks/user-password.js": "/chunks/user-password.js?id=204e36cbf11279ab",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=1ac15d3be67c9b88", "/chunks/user-delete.js": "/chunks/user-delete.js?id=bbf64bfbcc6eb5f9",
"/chunks/plan.js": "/chunks/plan.js?id=2444730c1a0a42fc", "/chunks/plan.js": "/chunks/plan.js?id=2444730c1a0a42fc",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=f38b09679bd4aee8", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=f38b09679bd4aee8",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=e276e77758ebee7f", "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=887502be9ee6ef81",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=d40791905384f49d", "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=f11556bf815870ba",
"/chunks/payments.js": "/chunks/payments.js?id=5ea275fedd8d638a", "/chunks/payments.js": "/chunks/payments.js?id=5ea275fedd8d638a",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=faa1e4d26fa5054d", "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=d81a724698921629",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=ccff0a49e0749e7f", "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=3ce158149a48ae6b",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=b0ca7cdad56e46fd", "/chunks/app-settings.js": "/chunks/app-settings.js?id=b0ca7cdad56e46fd",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=307a34b7306a0626", "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=ef490b0cab8308f1",
"/chunks/app-index.js": "/chunks/app-index.js?id=148bb3cd924f2d8f", "/chunks/app-index.js": "/chunks/app-index.js?id=2be003c6977e905c",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=0c5a17bf0141419b", "/chunks/app-environment.js": "/chunks/app-environment.js?id=819c23db13c00210",
"/chunks/app-others.js": "/chunks/app-others.js?id=aa69fa96609453f5", "/chunks/app-others.js": "/chunks/app-others.js?id=2d437d95f3823ded",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=ceb720460c353fa7", "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=8b0999957ba0a5fc",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=5e4259e8eaedeaef", "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=30a7d6424225bcd0",
"/chunks/app-server.js": "/chunks/app-server.js?id=212f36990ede9cb9", "/chunks/app-server.js": "/chunks/app-server.js?id=212f36990ede9cb9",
"/chunks/app-language.js": "/chunks/app-language.js?id=c0831821c608ce40", "/chunks/app-language.js": "/chunks/app-language.js?id=77ba96928bbd9ed6",
"/chunks/homepage.js": "/chunks/homepage.js?id=6e3781fe33f6ad9a", "/chunks/homepage.js": "/chunks/homepage.js?id=3babb68ac329a2e4",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=a20e623585f77df6", "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=a20e623585f77df6",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=95e6fbfcedfe13e5", "/chunks/contact-us.js": "/chunks/contact-us.js?id=e99f7a5acb98eb08",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=5228b9bf9ceec486", "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=5228b9bf9ceec486",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=35e61510310ad1b4", "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=35e61510310ad1b4",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=a816e7fd8855ca81", "/chunks/sign-in.js": "/chunks/sign-in.js?id=a16e70643a831be0",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=6e1299fbe43d8b17", "/chunks/sign-up.js": "/chunks/sign-up.js?id=cf84811cb369d980",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=0e4d06db3327945c", "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=48c8a5f422239bde",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=3d79af6ddf633a36", "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f196d33db637620f",
"/chunks/settings.js": "/chunks/settings.js?id=11ec746548172b1f", "/chunks/settings.js": "/chunks/settings.js?id=6185ba1b3f91cab1",
"/chunks/profile.js": "/chunks/profile.js?id=7cc9c9c7b16e6d9b", "/chunks/profile.js": "/chunks/profile.js?id=6f41d5db05622afd",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d4c2a86991a78181", "/chunks/settings-password.js": "/chunks/settings-password.js?id=5aed9d38b48443d7",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0a158de7fef68126", "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=0a158de7fef68126",
"/chunks/billing.js": "/chunks/billing.js?id=eab4f321654d0a3d", "/chunks/billing.js": "/chunks/billing.js?id=e0068be5f76f4e11",
"/chunks/platform.js": "/chunks/platform.js?id=4606a6c37d7b1d73", "/chunks/platform.js": "/chunks/platform.js?id=9a15187a99ab498f",
"/chunks/files.js": "/chunks/files.js?id=d1ac47f0c9b9f5e8", "/chunks/files.js": "/chunks/files.js?id=d1ac47f0c9b9f5e8",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c531b15d076872fa", "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=c531b15d076872fa",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=fa1e0a8c108ba841", "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=fa1e0a8c108ba841",
+2
View File
@@ -20,6 +20,7 @@ import Echo from 'laravel-echo';
window.Pusher = require('pusher-js'); window.Pusher = require('pusher-js');
if (config.broadcasting) {
window.Echo = new Echo({ window.Echo = new Echo({
broadcaster: 'pusher', broadcaster: 'pusher',
key: 'local', key: 'local',
@@ -29,3 +30,4 @@ window.Echo = new Echo({
forceTLS: false, forceTLS: false,
enabledTransports: ['ws', 'wss'], enabledTransports: ['ws', 'wss'],
}); });
}
@@ -8,7 +8,7 @@
<span v-if="description" class="block text-xs leading-4 dark:text-gray-500 text-gray-500" v-html="description"></span> <span v-if="description" class="block text-xs leading-4 dark:text-gray-500 text-gray-500" v-html="description"></span>
<!--Input Description--> <!--Input Description-->
<span v-if="error" class="error-message"> <span v-if="error" class="pt-2 text-xs dark:text-rose-600 text-rose-600">
{{ error }} {{ error }}
</span> </span>
</div> </div>
@@ -9,7 +9,7 @@
<slot /> <slot />
<!--Input Description--> <!--Input Description-->
<span v-if="error" class="pt-2 text-xs text-rose-600"> <span v-if="error" class="pt-2 text-xs dark:text-rose-600 text-rose-600">
{{ error }} {{ error }}
</span> </span>
@@ -13,7 +13,7 @@
<AuthButton class="button" icon="chevron-right" :text="$t('page_index.menu.log_in')" /> <AuthButton class="button" icon="chevron-right" :text="$t('page_index.menu.log_in')" />
</router-link> </router-link>
<div class="features" v-if="config.isSaaS"> <div class="features" v-if="config.subscriptionType === 'fixed'">
<div class="feature"> <div class="feature">
<credit-card-icon size="19" class="feature-icon"></credit-card-icon> <credit-card-icon size="19" class="feature-icon"></credit-card-icon>
<b class="feature-title">{{ $t('page_index.sign_feature_1') }}</b> <b class="feature-title">{{ $t('page_index.sign_feature_1') }}</b>
@@ -3,6 +3,10 @@
<PopupHeader :title="$t('Select Payment Method')" icon="credit-card" /> <PopupHeader :title="$t('Select Payment Method')" icon="credit-card" />
<PopupContent style="padding: 0 20px"> <PopupContent style="padding: 0 20px">
<InfoBox v-if="!config.isPayPal && !config.isPaystack" class="!mb-0">
<p>{{ $t("There isn't any payment method yet.") }}</p>
</InfoBox>
<!--PayPal implementation--> <!--PayPal implementation-->
<div <div
v-if="config.isPayPal" v-if="config.isPayPal"
@@ -67,6 +71,7 @@ import ButtonBase from '../FilesView/ButtonBase'
import { loadScript } from '@paypal/paypal-js' import { loadScript } from '@paypal/paypal-js'
import PaymentMethod from './PaymentMethod' import PaymentMethod from './PaymentMethod'
import Spinner from '../FilesView/Spinner' import Spinner from '../FilesView/Spinner'
import InfoBox from "./Forms/InfoBox"
import { events } from '../../bus' import { events } from '../../bus'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import axios from "axios"; import axios from "axios";
@@ -81,6 +86,7 @@ export default {
PopupHeader, PopupHeader,
ButtonBase, ButtonBase,
Spinner, Spinner,
InfoBox,
}, },
data() { data() {
return { return {
@@ -8,7 +8,7 @@
<AppInputText :title="$t('popup_2fa.input_label')" :error="errors[0]" :is-last="true"> <AppInputText :title="$t('popup_2fa.input_label')" :error="errors[0]" :is-last="true">
<input <input
v-model="password" v-model="password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="password" type="password"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -12,7 +12,7 @@
<AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]"> <AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]">
<input <input
v-model="name" v-model="name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -27,7 +27,7 @@
<AppInputText :title="$t('locale_name')" :error="errors[0]" :is-last="true"> <AppInputText :title="$t('locale_name')" :error="errors[0]" :is-last="true">
<input <input
v-model="form.name" v-model="form.name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -14,7 +14,7 @@
<AppInputText :title="$t('popup_personal_token.label')" :error="errors[0]" :is-last="true"> <AppInputText :title="$t('popup_personal_token.label')" :error="errors[0]" :is-last="true">
<input <input
v-model="name" v-model="name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -36,7 +36,7 @@
<AppInputText :error="errors[0]" class="-mt-2"> <AppInputText :error="errors[0]" class="-mt-2">
<input <input
v-model="form.email" v-model="form.email"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -55,7 +55,7 @@
<AppInputText :title="$t('Folder Name (optional)')" :description="$t('Created folder with files will be named with your own name.')" :error="errors[0]" class="-mt-2"> <AppInputText :title="$t('Folder Name (optional)')" :description="$t('Created folder with files will be named with your own name.')" :error="errors[0]" class="-mt-2">
<input <input
v-model="form.name" v-model="form.name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -70,7 +70,7 @@
<textarea <textarea
v-model="form.notes" v-model="form.notes"
rows="2" rows="2"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="input" ref="input"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -3,7 +3,7 @@
<!--Area--> <!--Area-->
<div <div
class="input-area rounded-lg bg-light-background dark:bg-2x-dark-foreground" class="input-area rounded-lg bg-light-background dark:bg-2x-dark-foreground"
:class="{ 'is-active': isOpen, 'is-error': isError }" :class="{ 'is-active': isOpen, '!border-rose-600': isError }"
@click="openMenu" @click="openMenu"
> >
<!--If is selected--> <!--If is selected-->
@@ -33,7 +33,7 @@
v-model="query" v-model="query"
ref="search" ref="search"
type="text" type="text"
:placeholder="$t('select_search_placeholder')" :placeholder="$te('select_search_placeholder') ? $t('select_search_placeholder') : 'Search in list...'"
class="search-input focus-border-theme rounded-lg" class="search-input focus-border-theme rounded-lg"
/> />
</div> </div>
@@ -20,7 +20,7 @@
<div class="relative flex items-center"> <div class="relative flex items-center">
<input <input
v-model="pickedItem.data.attributes.name" v-model="pickedItem.data.attributes.name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
ref="input" ref="input"
type="text" type="text"
class="!pr-10 focus-border-theme input-dark" class="!pr-10 focus-border-theme input-dark"
@@ -60,7 +60,7 @@
<AppInputText :error="errors[0]" class="-mt-2"> <AppInputText :error="errors[0]" class="-mt-2">
<input <input
v-model="shareOptions.password" v-model="shareOptions.password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:placeholder="$t('page_sign_in.placeholder_password')" :placeholder="$t('page_sign_in.placeholder_password')"
@@ -127,7 +127,7 @@
<AppInputText :error="errors[0]" class="-mt-2"> <AppInputText :error="errors[0]" class="-mt-2">
<input <input
v-model="shareOptions.password" v-model="shareOptions.password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:placeholder="$t('page_sign_in.placeholder_password')" :placeholder="$t('page_sign_in.placeholder_password')"
@@ -5,7 +5,7 @@
<!--Select Payment Plans--> <!--Select Payment Plans-->
<PopupContent v-if="plans"> <PopupContent v-if="plans">
<InfoBox v-if="plans.data.length === 0" class="!mb-0"> <InfoBox v-if="plans.data.length === 0" class="!mb-0">
<p>There isn't any plan yet.</p> <p>{{ $t("There isn't any plan yet.") }}</p>
</InfoBox> </InfoBox>
<!--Toggle yearly billing--> <!--Toggle yearly billing-->
@@ -38,7 +38,7 @@
min="1" min="1"
max="999999999" max="999999999"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase type="submit" button-style="theme" class="w-full sm:w-auto"> <ButtonBase type="submit" button-style="theme" class="w-full sm:w-auto">
{{ $t('Make a Payment') }} {{ $t('Make a Payment') }}
@@ -52,7 +52,7 @@
min="1" min="1"
max="999999999" max="999999999"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase <ButtonBase
:loadint="isSendingBillingAlert" :loadint="isSendingBillingAlert"
@@ -94,7 +94,7 @@
min="1" min="1"
max="999999999" max="999999999"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase <ButtonBase
:loadint="isSendingBillingAlert" :loadint="isSendingBillingAlert"
@@ -22,7 +22,7 @@
<AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]"> <AppInputText :title="$t('popup_create_folder.label')" :error="errors[0]">
<input <input
v-model="name" v-model="name"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="text" type="text"
ref="name" ref="name"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
@@ -46,7 +46,7 @@
@keypress.enter.stop.prevent="addMember" @keypress.enter.stop.prevent="addMember"
ref="email" ref="email"
v-model="email" v-model="email"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="email" type="email"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:placeholder="$t('Type member email...')" :placeholder="$t('Type member email...')"
@@ -27,7 +27,7 @@
@keypress.enter.stop.prevent="addMember" @keypress.enter.stop.prevent="addMember"
ref="email" ref="email"
v-model="email" v-model="email"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
type="email" type="email"
class="focus-border-theme input-dark !pr-20" class="focus-border-theme input-dark !pr-20"
:placeholder="$t('Type member email...')" :placeholder="$t('Type member email...')"
+8 -12
View File
@@ -20,7 +20,7 @@ const actions = {
commit('RETRIEVE_USER', response.data) commit('RETRIEVE_USER', response.data)
commit('UPDATE_NOTIFICATION_COUNT', response.data.data.relationships.unreadNotifications.data.length) commit('UPDATE_NOTIFICATION_COUNT', response.data.data.relationships.unreadNotifications.data.length)
if (! getters.isRunningConnection) { if (! getters.isRunningConnection && getters.config.broadcasting === 'pusher') {
dispatch('runConnection') dispatch('runConnection')
} }
}) })
@@ -35,6 +35,7 @@ const actions = {
}) })
}, },
logOut: ({ commit }) => { logOut: ({ commit }) => {
let popup = setTimeout(() => { let popup = setTimeout(() => {
commit('PROCESSING_POPUP', { commit('PROCESSING_POPUP', {
title: 'Logging Out', title: 'Logging Out',
@@ -44,7 +45,8 @@ const actions = {
axios axios
.post('/logout') .post('/logout')
.then(() => { .catch(() => this.$isSomethingWrong())
.finally(() => {
clearTimeout(popup) clearTimeout(popup)
commit('DESTROY_DATA') commit('DESTROY_DATA')
@@ -52,16 +54,6 @@ const actions = {
router.push({name: 'Homepage'}) router.push({name: 'Homepage'})
}) })
.catch((error) => {
if (error.response.status === 419) {
clearTimeout(popup)
commit('DESTROY_DATA')
commit('SET_AUTHORIZED', false)
router.push({name: 'Homepage'})
}
})
}, },
socialiteRedirect: ({ commit }, provider) => { socialiteRedirect: ({ commit }, provider) => {
axios axios
@@ -141,7 +133,11 @@ const mutations = {
state.permission = role state.permission = role
}, },
DESTROY_DATA(state) { DESTROY_DATA(state) {
state.currentFolder = undefined
state.user = undefined
state.app = undefined state.app = undefined
state.clipboard = []
}, },
ADD_TO_FAVOURITES(state, folder) { ADD_TO_FAVOURITES(state, folder) {
folder.forEach((item) => { folder.forEach((item) => {
@@ -36,7 +36,7 @@
v-model="storage.key" v-model="storage.key"
placeholder="Paste your key" placeholder="Paste your key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -48,7 +48,7 @@
v-model="storage.secret" v-model="storage.secret"
placeholder="Paste your secret" placeholder="Paste your secret"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -83,7 +83,7 @@
v-model="storage.endpoint" v-model="storage.endpoint"
placeholder="Type your endpoint" placeholder="Type your endpoint"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
readonly readonly
/> />
</AppInputText> </AppInputText>
@@ -100,7 +100,7 @@
v-model="storage.bucket" v-model="storage.bucket"
placeholder="Type your bucket name" placeholder="Type your bucket name"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -146,7 +146,7 @@
v-model="smtp.host" v-model="smtp.host"
placeholder="Type your mail host" placeholder="Type your mail host"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -158,7 +158,7 @@
v-model="smtp.port" v-model="smtp.port"
placeholder="Type your mail port" placeholder="Type your mail port"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -170,7 +170,7 @@
v-model="smtp.username" v-model="smtp.username"
placeholder="Type your mail username" placeholder="Type your mail username"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -182,7 +182,7 @@
v-model="smtp.password" v-model="smtp.password"
placeholder="Type your mail password" placeholder="Type your mail password"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -214,7 +214,7 @@
v-model="mailgun.domain" v-model="mailgun.domain"
placeholder="Type your domain" placeholder="Type your domain"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -226,7 +226,7 @@
v-model="mailgun.secret" v-model="mailgun.secret"
placeholder="Type your secret" placeholder="Type your secret"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -238,7 +238,7 @@
v-model="mailgun.endpoint" v-model="mailgun.endpoint"
placeholder="Type your endpoint" placeholder="Type your endpoint"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -252,7 +252,7 @@
v-model="postmark.token" v-model="postmark.token"
placeholder="Type your token" placeholder="Type your token"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -266,7 +266,7 @@
v-model="ses.access_key" v-model="ses.access_key"
placeholder="Type your access key" placeholder="Type your access key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -284,7 +284,7 @@
v-model="ses.secret_access_key" v-model="ses.secret_access_key"
placeholder="Type your secret access key" placeholder="Type your secret access key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -296,7 +296,7 @@
v-model="ses.default_region" v-model="ses.default_region"
placeholder="Type your default region" placeholder="Type your default region"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -308,7 +308,7 @@
v-model="ses.session_token" v-model="ses.session_token"
placeholder="Type your session token" placeholder="Type your session token"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -42,7 +42,7 @@
@input="$updateText('/admin/settings', 'header_title', app.header_title)" @input="$updateText('/admin/settings', 'header_title', app.header_title)"
v-model="app.header_title" v-model="app.header_title"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -62,7 +62,7 @@
@input="$updateText('/admin/settings', 'header_description', app.header_description)" @input="$updateText('/admin/settings', 'header_description', app.header_description)"
rows="2" rows="2"
v-model="app.header_description" v-model="app.header_description"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -108,7 +108,7 @@
@input="$updateText('/admin/settings', 'features_title', app.features_title)" @input="$updateText('/admin/settings', 'features_title', app.features_title)"
v-model="app.features_title" v-model="app.features_title"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -130,7 +130,7 @@
" "
rows="2" rows="2"
v-model="app.features_description" v-model="app.features_description"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -182,7 +182,7 @@
@input="$updateText('/admin/settings', 'feature_title_1', app.feature_title_1)" @input="$updateText('/admin/settings', 'feature_title_1', app.feature_title_1)"
v-model="app.feature_title_1" v-model="app.feature_title_1"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -207,7 +207,7 @@
" "
rows="2" rows="2"
v-model="app.feature_description_1" v-model="app.feature_description_1"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -226,7 +226,7 @@
@input="$updateText('/admin/settings', 'feature_title_2', app.feature_title_2)" @input="$updateText('/admin/settings', 'feature_title_2', app.feature_title_2)"
v-model="app.feature_title_2" v-model="app.feature_title_2"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -251,7 +251,7 @@
" "
rows="2" rows="2"
v-model="app.feature_description_2" v-model="app.feature_description_2"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -270,7 +270,7 @@
@input="$updateText('/admin/settings', 'feature_title_3', app.feature_title_3)" @input="$updateText('/admin/settings', 'feature_title_3', app.feature_title_3)"
v-model="app.feature_title_3" v-model="app.feature_title_3"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -295,7 +295,7 @@
" "
rows="2" rows="2"
v-model="app.feature_description_3" v-model="app.feature_description_3"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -351,7 +351,7 @@
@input="$updateText('/admin/settings', 'pricing_title', app.pricing_title)" @input="$updateText('/admin/settings', 'pricing_title', app.pricing_title)"
v-model="app.pricing_title" v-model="app.pricing_title"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -373,7 +373,7 @@
" "
rows="2" rows="2"
v-model="app.pricing_description" v-model="app.pricing_description"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -425,7 +425,7 @@
@input="$updateText('/admin/settings', 'get_started_title', app.get_started_title)" @input="$updateText('/admin/settings', 'get_started_title', app.get_started_title)"
v-model="app.get_started_title" v-model="app.get_started_title"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -451,7 +451,7 @@
" "
rows="2" rows="2"
v-model="app.get_started_description" v-model="app.get_started_description"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -477,7 +477,7 @@
@input="$updateText('/admin/settings', 'footer_content', app.footer_content)" @input="$updateText('/admin/settings', 'footer_content', app.footer_content)"
v-model="app.footer_content" v-model="app.footer_content"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
@@ -154,7 +154,7 @@
v-model="recaptcha.credentials.client_id" v-model="recaptcha.credentials.client_id"
:placeholder="$t('Paste your Site Key here')" :placeholder="$t('Paste your Site Key here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -166,7 +166,7 @@
v-model="recaptcha.credentials.client_secret" v-model="recaptcha.credentials.client_secret"
:placeholder="$t('Paste your Secret key here')" :placeholder="$t('Paste your Secret key here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -88,7 +88,7 @@
v-model="facebook.credentials.client_id" v-model="facebook.credentials.client_id"
:placeholder="$t('Paste your Client ID here')" :placeholder="$t('Paste your Client ID here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -100,7 +100,7 @@
v-model="facebook.credentials.client_secret" v-model="facebook.credentials.client_secret"
:placeholder="$t('Paste your Client Secret here')" :placeholder="$t('Paste your Client Secret here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -172,7 +172,7 @@
v-model="google.credentials.client_id" v-model="google.credentials.client_id"
:placeholder="$t('Paste your Client ID here')" :placeholder="$t('Paste your Client ID here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -184,7 +184,7 @@
v-model="google.credentials.client_secret" v-model="google.credentials.client_secret"
:placeholder="$t('Paste your Client Secret here')" :placeholder="$t('Paste your Client Secret here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -256,7 +256,7 @@
v-model="github.credentials.client_id" v-model="github.credentials.client_id"
:placeholder="$t('Paste your Client ID here')" :placeholder="$t('Paste your Client ID here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -268,7 +268,7 @@
v-model="github.credentials.client_secret" v-model="github.credentials.client_secret"
:placeholder="$t('Paste your Client Secret here')" :placeholder="$t('Paste your Client Secret here')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -109,7 +109,7 @@
v-model="selectedLanguage.data.attributes.name" v-model="selectedLanguage.data.attributes.name"
:placeholder="$t('admin_settings.appearance.description_plac')" :placeholder="$t('admin_settings.appearance.description_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -172,7 +172,7 @@
" "
:rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1" :rows="selectedLanguage.data.attributes.translations[key].length >= 80 ? 3 : 1"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
></textarea> ></textarea>
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -168,7 +168,7 @@
v-model="stripe.credentials.key" v-model="stripe.credentials.key"
:placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -179,7 +179,7 @@
v-model="stripe.credentials.secret" v-model="stripe.credentials.secret"
:placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -196,7 +196,7 @@
v-model="stripe.credentials.webhook" v-model="stripe.credentials.webhook"
:placeholder="$t('Paste your webhook secret')" :placeholder="$t('Paste your webhook secret')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -301,7 +301,7 @@
v-model="paystack.credentials.key" v-model="paystack.credentials.key"
:placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -312,7 +312,7 @@
v-model="paystack.credentials.secret" v-model="paystack.credentials.secret"
:placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -423,7 +423,7 @@
v-model="paypal.credentials.key" v-model="paypal.credentials.key"
:placeholder="$t('admin_settings.payments.stripe_pub_key_plac')" :placeholder="$t('admin_settings.payments.stripe_pub_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -434,7 +434,7 @@
v-model="paypal.credentials.secret" v-model="paypal.credentials.secret"
:placeholder="$t('admin_settings.payments.stripe_sec_key_plac')" :placeholder="$t('admin_settings.payments.stripe_sec_key_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -445,7 +445,7 @@
v-model="paypal.credentials.webhook" v-model="paypal.credentials.webhook"
:placeholder="$t('Paste your webhook id')" :placeholder="$t('Paste your webhook id')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -12,7 +12,7 @@
v-model="plan.name" v-model="plan.name"
:placeholder="$t('admin_page_plans.form.name_plac')" :placeholder="$t('admin_page_plans.form.name_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -24,7 +24,7 @@
<textarea <textarea
v-model="plan.description" v-model="plan.description"
:placeholder="$t('admin_page_plans.form.description_plac')" :placeholder="$t('admin_page_plans.form.description_plac')"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
maxlength="120" maxlength="120"
></textarea> ></textarea>
@@ -55,7 +55,7 @@
step="0.01" step="0.01"
min="1" min="1"
max="999999999999" max="999999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -117,7 +117,7 @@
type="number" type="number"
min="1" min="1"
max="999999999" max="999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -136,7 +136,7 @@
type="number" type="number"
min="1" min="1"
max="999999999" max="999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -12,7 +12,7 @@
v-model="plan.name" v-model="plan.name"
:placeholder="$t('admin_page_plans.form.name_plac')" :placeholder="$t('admin_page_plans.form.name_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -24,7 +24,7 @@
<textarea <textarea
v-model="plan.description" v-model="plan.description"
:placeholder="$t('admin_page_plans.form.description_plac')" :placeholder="$t('admin_page_plans.form.description_plac')"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
></textarea> ></textarea>
</AppInputText> </AppInputText>
@@ -78,7 +78,7 @@
step="0.01" step="0.01"
min="0.01" min="0.01"
max="999999999999" max="999999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -116,7 +116,7 @@
step="0.01" step="0.01"
min="0.01" min="0.01"
max="999999999999" max="999999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -153,7 +153,7 @@
step="0.01" step="0.01"
min="0.01" min="0.01"
max="999999999999" max="999999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -190,7 +190,7 @@
step="0.01" step="0.01"
min="0.01" min="0.01"
max="999999999999" max="999999999999"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
</AppInputText> </AppInputText>
@@ -26,7 +26,7 @@
v-model="planName" v-model="planName"
:placeholder="$t('admin_page_plans.form.name_delete_plac')" :placeholder="$t('admin_page_plans.form.name_delete_plac')"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
/> />
<ButtonBase <ButtonBase
@@ -30,7 +30,7 @@
:placeholder="$t('admin_page_user.create_user.label_email')" :placeholder="$t('admin_page_user.create_user.label_email')"
type="email" type="email"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -43,7 +43,7 @@
:placeholder="$t('admin_page_user.create_user.label_name')" :placeholder="$t('admin_page_user.create_user.label_name')"
type="text" type="text"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -64,7 +64,7 @@
:placeholder="$t('page_registration.placeholder_pass')" :placeholder="$t('page_registration.placeholder_pass')"
type="password" type="password"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -86,7 +86,7 @@
:placeholder="$t('admin_page_user.create_user.label_conf_pass')" :placeholder="$t('admin_page_user.create_user.label_conf_pass')"
type="password" type="password"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -21,7 +21,7 @@
:placeholder="$t('admin_page_user.placeholder_delete_user')" :placeholder="$t('admin_page_user.placeholder_delete_user')"
type="text" type="text"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase <ButtonBase
:loading="isSendingRequest" :loading="isSendingRequest"
@@ -31,7 +31,7 @@
min="1" min="1"
max="999999999" max="999999999"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase <ButtonBase
type="submit" type="submit"
@@ -86,7 +86,7 @@
min="1" min="1"
max="999999999" max="999999999"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<ButtonBase <ButtonBase
:loading="isSendingRequest" :loading="isSendingRequest"
@@ -28,7 +28,7 @@
:placeholder="$t('page_login.placeholder_email')" :placeholder="$t('page_login.placeholder_email')"
type="email" type="email"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -51,7 +51,7 @@
:placeholder="$t('page_create_password.label_new_pass')" :placeholder="$t('page_create_password.label_new_pass')"
type="password" type="password"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -74,7 +74,7 @@
:placeholder="$t('page_create_password.label_confirm_pass')" :placeholder="$t('page_create_password.label_confirm_pass')"
type="password" type="password"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -27,7 +27,7 @@
:placeholder="$t('page_login.placeholder_email')" :placeholder="$t('page_login.placeholder_email')"
type="email" type="email"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
+9 -4
View File
@@ -21,7 +21,7 @@
> >
<input <input
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
v-model="loginEmail" v-model="loginEmail"
:placeholder="$t('page_login.placeholder_email')" :placeholder="$t('page_login.placeholder_email')"
type="email" type="email"
@@ -82,8 +82,9 @@
v-model="loginPassword" v-model="loginPassword"
:placeholder="$t('page_sign_in.placeholder_password')" :placeholder="$t('page_sign_in.placeholder_password')"
type="password" type="password"
ref="inputPassword"
class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -160,7 +161,7 @@
type="text" type="text"
maxlength="6" maxlength="6"
class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 text-center font-bold dark:bg-2x-dark-foreground md:w-80" class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 text-center font-bold dark:bg-2x-dark-foreground md:w-80"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="mt-2 block text-center text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="mt-2 block text-center text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -209,7 +210,7 @@
type="text" type="text"
maxlength="21" maxlength="21"
class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 text-center font-bold dark:bg-2x-dark-foreground md:w-80" class="dark:placeholder:text-gray-600 focus-border-theme h-full w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 text-center font-bold dark:bg-2x-dark-foreground md:w-80"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="mt-2 block text-center text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="mt-2 block text-center text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -309,6 +310,10 @@ export default {
} else { } else {
// Show sign in password page // Show sign in password page
this.goToAuthPage('sign-in') this.goToAuthPage('sign-in')
this.$nextTick(() => {
this.$refs.inputPassword.focus()
})
} }
}) })
.catch((error) => { .catch((error) => {
+4 -4
View File
@@ -28,7 +28,7 @@
:placeholder="$t('page_registration.placeholder_email')" :placeholder="$t('page_registration.placeholder_email')"
type="email" type="email"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -51,7 +51,7 @@
:placeholder="$t('page_registration.placeholder_name')" :placeholder="$t('page_registration.placeholder_name')"
type="text" type="text"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -74,7 +74,7 @@
:placeholder="$t('page_registration.placeholder_pass')" :placeholder="$t('page_registration.placeholder_pass')"
type="password" type="password"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -97,7 +97,7 @@
:placeholder="$t('page_registration.placeholder_confirm_pass')" :placeholder="$t('page_registration.placeholder_confirm_pass')"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
type="password" type="password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
+2 -2
View File
@@ -28,7 +28,7 @@
:placeholder="$t('page_contact_us.form.email_plac')" :placeholder="$t('page_contact_us.form.email_plac')"
type="email" type="email"
class="focus-border-theme" class="focus-border-theme"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
@@ -42,7 +42,7 @@
:placeholder="$t('page_contact_us.form.message_plac')" :placeholder="$t('page_contact_us.form.message_plac')"
rows="6" rows="6"
class="focus-border-theme" class="focus-border-theme"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
></textarea> ></textarea>
<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span> <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
+1 -1
View File
@@ -1,5 +1,5 @@
<template> <template>
<router-view /> <router-view class="dark:bg-dark-background bg-light-background" />
</template> </template>
<script> <script>
@@ -35,7 +35,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Type your full name" placeholder="Type your full name"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -47,7 +47,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Type your email" placeholder="Type your email"
type="email" type="email"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -65,7 +65,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Type your password" placeholder="Type your password"
type="password" type="password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -83,7 +83,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Confirm your password" placeholder="Confirm your password"
type="password" type="password"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
+15 -22
View File
@@ -24,7 +24,7 @@
v-model="app.title" v-model="app.title"
placeholder="Type your app title" placeholder="Type your app title"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -42,7 +42,7 @@
v-model="app.description" v-model="app.description"
placeholder="Type your app description" placeholder="Type your app description"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
></textarea> ></textarea>
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -100,20 +100,14 @@
<div class="card text-left shadow-card"> <div class="card text-left shadow-card">
<FormLabel>Application</FormLabel> <FormLabel>Application</FormLabel>
<ValidationProvider <ValidationProvider tag="div" mode="passive" name="Contact Email" rules="required" v-slot="{ errors }">
tag="div"
mode="passive"
name="Contact Email"
rules="required"
v-slot="{ errors }"
>
<AppInputText title="Contact Email" :error="errors[0]"> <AppInputText title="Contact Email" :error="errors[0]">
<input <input
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
v-model="app.contactMail" v-model="app.contactMail"
placeholder="Type your contact email" placeholder="Type your contact email"
type="email" type="email"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -125,7 +119,7 @@
v-model="app.googleAnalytics" v-model="app.googleAnalytics"
placeholder="Paste your Google Analytics Code" placeholder="Paste your Google Analytics Code"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -156,7 +150,7 @@
max="999999999" max="999999999"
placeholder="Set default storage space in GB" placeholder="Set default storage space in GB"
type="number" type="number"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -183,19 +177,21 @@
<ValidationProvider <ValidationProvider
tag="div" tag="div"
mode="passive" mode="passive"
name="Contact Email" name="Subscription Type"
rules="required" rules="required"
v-slot="{ errors }" v-slot="{ errors }"
> >
<AppInputText <AppInputText
:title="$t('Subscription Type')" :title="$t('Subscription Type')"
description="Choose your preferred subscription system in advance. After installation and any other user registration, you can't change this setting later." description="Choose your preferred subscription system in advance. After installation and any other user registration, you can't change this setting later."
:error="errors[0]"
> >
<SelectInput <SelectInput
v-model="app.subscriptionType" v-model="app.subscriptionType"
:default="app.subscriptionType" :default="app.subscriptionType"
:options="$store.getters.subscriptionTypes" :options="$store.getters.subscriptionTypes"
:placeholder="$t('Select your subscription type')" :placeholder="$t('Select your subscription type')"
:is-error="errors[0]"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -260,15 +256,15 @@ export default {
app: { app: {
color: '#00BC7E', color: '#00BC7E',
subscriptionType: undefined, subscriptionType: undefined,
title: '', title: undefined,
description: '', description: undefined,
logo: undefined, logo: undefined,
logo_horizontal: undefined, logo_horizontal: undefined,
favicon: undefined, favicon: undefined,
og_image: undefined, og_image: undefined,
touch_icon: undefined, touch_icon: undefined,
contactMail: '', contactMail: undefined,
googleAnalytics: '', googleAnalytics: undefined,
defaultStorage: '5', defaultStorage: '5',
userRegistration: 1, userRegistration: 1,
storageLimitation: 1, storageLimitation: 1,
@@ -324,15 +320,12 @@ export default {
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
}, },
}) })
.then((response) => { .then(() => {
// End loading
this.isLoading = false
// Redirect to next step // Redirect to next step
this.$router.push({ name: 'AdminAccount' }) this.$router.push({ name: 'AdminAccount' })
}) })
.catch((error) => { .finally((error) => {
// End loading
this.isLoading = false this.isLoading = false
}) })
}, },
+5 -5
View File
@@ -60,7 +60,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Type your database host" placeholder="Type your database host"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{'!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -72,7 +72,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Type your database port" placeholder="Type your database port"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -84,7 +84,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Select your database name" placeholder="Select your database name"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -102,7 +102,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Select your database name" placeholder="Select your database name"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -120,7 +120,7 @@
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
placeholder="Select your database password" placeholder="Select your database password"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -48,7 +48,7 @@
v-model="storage.key" v-model="storage.key"
placeholder="Paste your key" placeholder="Paste your key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -60,7 +60,7 @@
v-model="storage.secret" v-model="storage.secret"
placeholder="Paste your secret" placeholder="Paste your secret"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -94,7 +94,7 @@
v-model="storage.endpoint" v-model="storage.endpoint"
placeholder="Type your endpoint" placeholder="Type your endpoint"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
readonly readonly
/> />
</AppInputText> </AppInputText>
@@ -112,7 +112,7 @@
v-model="storage.bucket" v-model="storage.bucket"
placeholder="Type your bucket name" placeholder="Type your bucket name"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -158,7 +158,7 @@
v-model="smtp.host" v-model="smtp.host"
placeholder="Type your mail host" placeholder="Type your mail host"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -176,7 +176,7 @@
v-model="smtp.port" v-model="smtp.port"
placeholder="Type your mail port" placeholder="Type your mail port"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -194,7 +194,7 @@
v-model="smtp.username" v-model="smtp.username"
placeholder="Type your mail username" placeholder="Type your mail username"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -212,7 +212,7 @@
v-model="smtp.password" v-model="smtp.password"
placeholder="Type your mail password" placeholder="Type your mail password"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -244,7 +244,7 @@
v-model="mailgun.domain" v-model="mailgun.domain"
placeholder="Type your domain" placeholder="Type your domain"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -256,7 +256,7 @@
v-model="mailgun.secret" v-model="mailgun.secret"
placeholder="Type your secret" placeholder="Type your secret"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -274,7 +274,7 @@
v-model="mailgun.endpoint" v-model="mailgun.endpoint"
placeholder="Type your endpoint" placeholder="Type your endpoint"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -288,7 +288,7 @@
v-model="postmark.token" v-model="postmark.token"
placeholder="Type your token" placeholder="Type your token"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -308,7 +308,7 @@
v-model="ses.access_key" v-model="ses.access_key"
placeholder="Type your access key" placeholder="Type your access key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -326,7 +326,7 @@
v-model="ses.secret_access_key" v-model="ses.secret_access_key"
placeholder="Type your secret access key" placeholder="Type your secret access key"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -344,7 +344,7 @@
v-model="ses.default_region" v-model="ses.default_region"
placeholder="Type your default region" placeholder="Type your default region"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -356,7 +356,7 @@
v-model="ses.session_token" v-model="ses.session_token"
placeholder="Type your session token" placeholder="Type your session token"
type="text" type="text"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -32,9 +32,9 @@
placeholder="Paste your purchase code" placeholder="Paste your purchase code"
type="text" type="text"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ 'border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs dark:text-rose-600 text-rose-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
<AuthButton <AuthButton
icon="chevron-right" icon="chevron-right"
+18 -17
View File
@@ -29,17 +29,17 @@
> >
<div class="text-left"> <div class="text-left">
<b class="block text-sm font-bold">PHP Version</b> <b class="block text-sm font-bold">PHP Version</b>
<small v-if="!phpVersion.acceptable" class="text-xs text-gray-600 pt-1 block leading-normal"> <small v-if="!phpVersion.acceptable" class="dark:text-gray-500 text-xs text-gray-600 pt-1 block leading-normal">
You need PHP version at least {{ phpVersion.minimal }}. You need PHP version at least {{ phpVersion.minimal }}.
</small> </small>
</div> </div>
<div class="flex items-center"> <div class="flex items-center">
<check-icon v-if="phpVersion.acceptable" size="16" class="vue-feather text-theme" /> <check-icon v-if="phpVersion.acceptable" size="16" class="vue-feather dark:text-theme text-theme" />
<x-icon v-if="!phpVersion.acceptable" size="16" class="vue-feather text-red-600" /> <x-icon v-if="!phpVersion.acceptable" size="16" class="vue-feather dark:text-red-600 text-red-600" />
<span <span
class="ml-3 text-sm font-bold" class="ml-3 text-sm font-bold"
:class="phpVersion.acceptable ? 'text-green-600' : 'text-red-600'" :class="phpVersion.acceptable ? 'dark:text-green-600 text-green-600' : 'dark:text-red-600 text-red-600'"
> >
{{ phpVersion.current }} {{ phpVersion.current }}
</span> </span>
@@ -53,15 +53,15 @@
> >
<div class="text-left"> <div class="text-left">
<b class="block text-sm font-bold">{{ setting }}</b> <b class="block text-sm font-bold">{{ setting }}</b>
<small v-if="!values.status" class="text-xs text-gray-600 pt-1 block leading-normal"> <small v-if="!values.status" class="dark:text-gray-500 text-xs text-gray-600 pt-1 block leading-normal">
We recommend set this value at least {{ values.minimal }}. We recommend set this value at least {{ values.minimal }}.
</small> </small>
</div> </div>
<div class="flex items-center"> <div class="flex items-center">
<check-icon v-if="values.status" size="16" class="vue-feather text-theme" /> <check-icon v-if="values.status" size="16" class="vue-feather dark:text-theme text-theme" />
<x-icon v-if="!values.status" size="16" class="vue-feather text-red-600" /> <x-icon v-if="!values.status" size="16" class="vue-feather dark:text-red-600 text-red-600" />
<span class="ml-3 text-sm font-bold" :class="values.status ? 'text-green-600' : 'text-red-600'"> <span class="ml-3 text-sm font-bold" :class="values.status ? 'dark:text-green-600 text-green-600' : 'dark:text-red-600 text-red-600'">
{{ values.current }}{{ setting !== 'max_execution_time' ? 'M' : '' }} {{ values.current }}{{ setting !== 'max_execution_time' ? 'M' : '' }}
</span> </span>
</div> </div>
@@ -89,10 +89,10 @@
{{ module }} {{ module }}
</b> </b>
<div class="flex items-center"> <div class="flex items-center">
<check-icon v-if="value" size="16" class="vue-feather text-theme" /> <check-icon v-if="value" size="16" class="vue-feather dark:text-theme text-theme" />
<x-icon v-if="!value" size="16" class="vue-feather text-red-600" /> <x-icon v-if="!value" size="16" class="vue-feather dark:text-red-600 text-red-600" />
<span class="ml-3 text-sm font-bold" :class="value ? 'text-green-600' : 'text-red-600'"> <span class="ml-3 text-sm font-bold" :class="value ? 'dark:text-green-600 text-green-600' : 'dark:text-red-600 text-red-600'">
{{ value ? 'Module Installed' : 'Missing Module' }} {{ value ? 'Module Installed' : 'Missing Module' }}
</span> </span>
</div> </div>
@@ -110,28 +110,29 @@
<div class="flex items-center justify-between pt-3"> <div class="flex items-center justify-between pt-3">
<div class="text-left"> <div class="text-left">
<b class="block text-sm font-bold">API</b> <b class="block text-sm font-bold">API</b>
<small v-if="isCheckedAPI && !apiRunning" class="text-xs text-gray-600 pt-1 block leading-normal"> <small v-if="isCheckedAPI && !apiRunning" class="dark:text-gray-500 text-xs text-gray-600 pt-1 block leading-normal">
We detect, your domain root is not set correctly, please check it. We detect, your domain root is not set correctly, please check it.
</small> </small>
</div> </div>
<div v-if="isCheckedAPI" class="flex items-center"> <div v-if="isCheckedAPI" class="flex items-center">
<check-icon v-if="apiRunning" size="16" class="vue-feather text-theme" /> <check-icon v-if="apiRunning" size="16" class="vue-feather dark:text-theme text-theme" />
<x-icon v-if="!apiRunning" size="16" class="vue-feather text-red-600" /> <x-icon v-if="!apiRunning" size="16" class="vue-feather dark:text-red-600 text-red-600" />
<span class="ml-3 text-sm font-bold" :class="apiRunning ? 'text-green-600' : 'text-red-600'"> <span class="ml-3 text-sm font-bold" :class="apiRunning ? 'dark:text-green-600 text-green-600' : 'dark:text-red-600 text-red-600'">
{{ apiRunning ? 'Working correctly' : "Doesn't work" }} {{ apiRunning ? 'Working correctly' : "Doesn't work" }}
</span> </span>
</div> </div>
<span v-if="!isCheckedAPI" class="ml-3 text-sm font-bold text-gray-600">Checking your API...</span> <span v-if="!isCheckedAPI" class="ml-3 text-sm font-bold text-gray-600">Checking your API...</span>
</div> </div>
<InfoBox v-if="isError" type="error" class="!mb-2"> </div>
<InfoBox v-if="isError" type="error">
<p> <p>
We can't proceed to the next step because there are unresolved issues. Please solve it at first We can't proceed to the next step because there are unresolved issues. Please solve it at first
and next continue. and next continue.
</p> </p>
</InfoBox> </InfoBox>
</div>
<AuthButton <AuthButton
@click.native="lastCheckBeforeNextPage" @click.native="lastCheckBeforeNextPage"
+1 -1
View File
@@ -22,7 +22,7 @@
:placeholder="$t('page_shared.placeholder_pass')" :placeholder="$t('page_shared.placeholder_pass')"
type="password" type="password"
class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground" class="dark:placeholder:text-gray-600 focus-border-theme w-full appearance-none rounded-lg border border-transparent bg-light-background px-5 py-3.5 font-bold dark:bg-2x-dark-foreground"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
<span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span> <span class="text-left text-xs text-red-600" v-if="errors[0]">{{ errors[0] }}</span>
</ValidationProvider> </ValidationProvider>
+3 -3
View File
@@ -95,7 +95,7 @@
:placeholder="$t('Current password')" :placeholder="$t('Current password')"
type="password" type="password"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -107,7 +107,7 @@
:placeholder="$t('page_create_password.label_new_pass')" :placeholder="$t('page_create_password.label_new_pass')"
type="password" type="password"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
@@ -125,7 +125,7 @@
:placeholder="$t('page_create_password.label_confirm_pass')" :placeholder="$t('page_create_password.label_confirm_pass')"
type="password" type="password"
class="focus-border-theme input-dark" class="focus-border-theme input-dark"
:class="{ 'border-red': errors[0] }" :class="{ '!border-rose-600': errors[0] }"
/> />
</AppInputText> </AppInputText>
</ValidationProvider> </ValidationProvider>
+2
View File
@@ -79,6 +79,8 @@
api: '{{ url('/api') }}', api: '{{ url('/api') }}',
locale: '{{ app()->getLocale() }}', locale: '{{ app()->getLocale() }}',
broadcasting: '{{ config('broadcasting.default') }}',
app_color: '{{ $settings->app_color ?? '#00BC7E' }}', app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
app_logo: '{{ $settings->app_logo ?? null }}', app_logo: '{{ $settings->app_logo ?? null }}',
app_footer: '{!! $settings->footer_content ?? null !!}', app_footer: '{!! $settings->footer_content ?? null !!}',
@@ -46,7 +46,7 @@ class AutoSubscribeForMeteredBillingAction
// Create balance with 0 amount // Create balance with 0 amount
$user->balance()->create([ $user->balance()->create([
'amount' => 0, 'amount' => 0,
'currency' => $plan->currency, 'currency' => $plan->currency, // todo: issue where plan is not created yet
]); ]);
} }
+1 -1
View File
@@ -44,7 +44,7 @@ if (! function_exists('isRunningCron')) {
*/ */
function isRunningCron(): bool function isRunningCron(): bool
{ {
return cache()->has('latest_cron_update') && Carbon::parse(cache()->get('latest_cron_update'))->diffInMinutes(now()) < 5; return cache()->has('latest_cron_update') && Carbon::parse(cache()->get('latest_cron_update'))->diffInMinutes(now()) < 2;
} }
} }
+2 -2
View File
@@ -63,8 +63,8 @@ class SocialiteTest extends TestCase
// Replace Socialite Instance with mock // Replace Socialite Instance with mock
$this->app->instance(Socialite::class, $stub); $this->app->instance(Socialite::class, $stub);
$this->getJson('/api/socialite/facebook/callback') $this->getJson('/socialite/facebook/callback')
->assertCreated(); ->assertRedirect();
$this $this
->assertDatabaseHas('users', [ ->assertDatabaseHas('users', [
+8 -5
View File
@@ -151,11 +151,8 @@ class UserAccountTest extends TestCase
'id' => (string) $user->id, 'id' => (string) $user->id,
'type' => 'user', 'type' => 'user',
'attributes' => [ 'attributes' => [
'avatar' => [ 'avatar' => null,
'md' => 'http://localhost/assets/images/default-avatar.png', 'color' => $user->settings->color,
'sm' => 'http://localhost/assets/images/default-avatar.png',
'xs' => 'http://localhost/assets/images/default-avatar.png',
],
'email' => $user->email, 'email' => $user->email,
'role' => $user->role, 'role' => $user->role,
'socialite_account' => false, 'socialite_account' => false,
@@ -204,6 +201,12 @@ class UserAccountTest extends TestCase
'favourites' => [ 'favourites' => [
'data' => [], 'data' => [],
], ],
'readNotifications' => [
'data' => [],
],
'unreadNotifications' => [
'data' => [],
],
], ],
], ],
]); ]);
@@ -24,7 +24,7 @@ class NotificationsTest extends TestCase
'notifiable_type' => 'App\Users\Models\User', 'notifiable_type' => 'App\Users\Models\User',
'notifiable_id' => $user->id, 'notifiable_id' => $user->id,
'data' => json_encode([ 'data' => json_encode([
'type' => 'file-request', 'category' => 'file-request',
'title' => 'File Request Filled', 'title' => 'File Request Filled',
'description' => "Your file request for 'Documents' folder was filled successfully.", 'description' => "Your file request for 'Documents' folder was filled successfully.",
'action' => [ 'action' => [
@@ -44,7 +44,7 @@ class NotificationsTest extends TestCase
->actingAs($user) ->actingAs($user)
->getJson('/api/user/notifications') ->getJson('/api/user/notifications')
->assertJsonFragment([ ->assertJsonFragment([
'type' => 'file-request', 'category' => 'file-request',
]) ])
->assertStatus(200); ->assertStatus(200);
} }