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

env variables refactoring

Browse Source
This commit is contained in:
Čarodej
2022-03-02 10:43:27 +01:00
parent ff9198a03e
commit 4b751a29c2
7 changed files with 66 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/vuefilemanager.php
+4
View File
@@ -5,6 +5,10 @@ return [
'is_demo' => env('APP_DEMO', false), 'is_demo' => env('APP_DEMO', false),
'is_setup_wizard_demo' => env('IS_SETUP_WIZARD_DEMO', false),
'is_setup_wizard_debug' => env('IS_SETUP_WIZARD_DEBUG', false),
'is_admin_vuefilemanager_bar' => env('IS_ADMIN_VUEFILEMANAGER_BAR', true),
// Define size of chunk uploaded by MB. // Define size of chunk uploaded by MB.
// E.g. integer 128 means chunk size will be 128 MB. // E.g. integer 128 means chunk size will be 128 MB.
'chunk_size' => env('CHUNK_SIZE', '128'), 'chunk_size' => env('CHUNK_SIZE', '128'),
resources/js/components/Others/SelectSingleChargeMethodPopup.vue
+3
View File
@@ -162,6 +162,9 @@ export default {
type: 'success', type: 'success',
message: this.$t('Your payment was successfully received.'), message: this.$t('Your payment was successfully received.'),
}) })
// todo: temporary reload function
setTimeout(() => document.location.reload(), 500)
}, },
paystackClosed() { paystackClosed() {
// ... // ...
resources/js/components/Subscription/UserStoredPaymentMethods.vue
+2 -1
View File
@@ -142,6 +142,7 @@ export default {
}) })
// TODO: L9 - load credit card after was stored in database // TODO: L9 - load credit card after was stored in database
setTimeout(() => document.location.reload(), 500)
} }
this.stripe.storingStripePaymentMethod = false this.stripe.storingStripePaymentMethod = false
@@ -195,6 +196,6 @@ export default {
this.isCreditCardForm = !this.isCreditCardForm this.isCreditCardForm = !this.isCreditCardForm
this.stripeInit() this.stripeInit()
}, },
}, }
} }
</script> </script>
resources/js/views/User/Billing.vue
+1 -1
View File
@@ -104,6 +104,6 @@ export default {
}, },
computed: { computed: {
...mapGetters(['config']), ...mapGetters(['config']),
}, }
} }
</script> </script>
resources/views/index.blade.php
+14 -14
View File
@@ -27,7 +27,7 @@
} }
@endphp @endphp
<!DOCTYPE html> <!DOCTYPE html>
<html style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html style="min-height: 100%" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
@@ -104,8 +104,8 @@
installation: '{{ $installation ?? 'initial' }}', installation: '{{ $installation ?? 'initial' }}',
statusCheck: {!! json_encode($status_check) ?? 'undefined' !!}, statusCheck: {!! json_encode($status_check) ?? 'undefined' !!},
isSetupWizardDemo: {{ env('IS_SETUP_WIZARD_DEMO') ? 1 : 0 }}, isSetupWizardDemo: {{ config('vuefilemanager.is_setup_wizard_demo') ? 1 : 0 }},
isSetupWizardDebug: {{ env('IS_SETUP_WIZARD_DEBUG') ? 1 : 0 }}, isSetupWizardDebug: {{ config('vuefilemanager.is_setup_wizard_debug') ? 1 : 0 }},
// States // States
isEmptyPlans: {{ $isEmptyPlans ? 1 : 0 }}, isEmptyPlans: {{ $isEmptyPlans ? 1 : 0 }},
@@ -113,7 +113,7 @@
isEmptySubscriptions: {{ $isEmptySubscriptions ? 1 : 0 }}, isEmptySubscriptions: {{ $isEmptySubscriptions ? 1 : 0 }},
// Hidden set ups // Hidden set ups
isAdminVueFileManagerBar: {{ env('IS_ADMIN_VUEFILEMANAGER_BAR', 1) ? 1 : 0 }}, isAdminVueFileManagerBar: {{ config('vuefilemanager.is_admin_vuefilemanager_bar', 1) ? 1 : 0 }},
// Metered // Metered
allowed_registration_bonus: {{ $settings->allowed_registration_bonus ?? 0 }}, allowed_registration_bonus: {{ $settings->allowed_registration_bonus ?? 0 }},
@@ -127,34 +127,34 @@
// PayPal // PayPal
isPayPal: {{ $settings->allowed_paypal ?? 0 }}, isPayPal: {{ $settings->allowed_paypal ?? 0 }},
isPayPalLive: {{ env('PAYPAL_IS_LIVE') ? 1 : 0 }}, isPayPalLive: {{ config('subscription.credentials.paypal.is_live') ? 1 : 0 }},
paypal_client_id: '{{ env('PAYPAL_CLIENT_ID') }}', paypal_client_id: '{{ config('subscription.credentials.paypal.id') }}',
paypal_payment_description: '{{ $settings->paypal_payment_description ?? '' }}', paypal_payment_description: '{{ $settings->paypal_payment_description ?? '' }}',
// Paystack // Paystack
isPaystack: {{ $settings->allowed_paystack ?? 0 }}, isPaystack: {{ $settings->allowed_paystack ?? 0 }},
paystack_public_key: '{{ env('PAYSTACK_PUBLIC_KEY') }}', paystack_public_key: '{{ config('subscription.credentials.paystack.public_key') }}',
paystack_payment_description: '{{ $settings->paystack_payment_description ?? '' }}', paystack_payment_description: '{{ $settings->paystack_payment_description ?? '' }}',
// Stripe // Stripe
isStripe: {{ $settings->allowed_stripe ?? 0 }}, isStripe: {{ $settings->allowed_stripe ?? 0 }},
stripe_public_key: '{{ env('STRIPE_PUBLIC_KEY') }}', stripe_public_key: '{{ config('subscription.credentials.stripe.public_key') }}',
stripe_payment_description: '{{ $settings->stripe_payment_description ?? '' }}', stripe_payment_description: '{{ $settings->stripe_payment_description ?? '' }}',
// ReCaptcha // ReCaptcha
recaptcha_client_id: '{{ env('RECAPTCHA_CLIENT_ID') }}', recaptcha_client_id: '{{ config('services.recaptcha.client_id') }}',
allowedRecaptcha: {{ $settings->allowed_recaptcha ?? 0 }}, allowedRecaptcha: {{ $settings->allowed_recaptcha ?? 0 }},
isRecaptchaConfigured: {{ env('RECAPTCHA_CLIENT_ID') ? 1 : 0 }}, isRecaptchaConfigured: {{ config('services.recaptcha.client_id') ? 1 : 0 }},
// Social logins // Social logins
allowedFacebookLogin: {{ $settings->allowed_facebook_login ?? 0 }}, allowedFacebookLogin: {{ $settings->allowed_facebook_login ?? 0 }},
isFacebookLoginConfigured: {{ env('FACEBOOK_CLIENT_ID') ? 1 : 0 }}, isFacebookLoginConfigured: {{ config('services.facebook.client_id') ? 1 : 0 }},
allowedGoogleLogin: {{ $settings->allowed_google_login ?? 0 }}, allowedGoogleLogin: {{ $settings->allowed_google_login ?? 0 }},
isGoogleLoginConfigured: {{ env('GOOGLE_CLIENT_ID') ? 1 : 0 }}, isGoogleLoginConfigured: {{ config('services.google.client_id') ? 1 : 0 }},
allowedGithubLogin: {{ $settings->allowed_github_login ?? 0 }}, allowedGithubLogin: {{ $settings->allowed_github_login ?? 0 }},
isGithubLoginConfigured: {{ env('GITHUB_CLIENT_ID') ? 1 : 0 }}, isGithubLoginConfigured: {{ config('services.github.client_id') ? 1 : 0 }},
// Adsense // Adsense
allowedAdsense: {{ $settings?->allowed_adsense ?? 0 }}, allowedAdsense: {{ $settings?->allowed_adsense ?? 0 }},
@@ -173,7 +173,7 @@
} }
</script> </script>
@if(env('APP_ENV') !== 'local') @if(config('app.env') !== 'local')
{{--Application production script--}} {{--Application production script--}}
<script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script> <script src="{{ asset('js/main.js') }}?v={{ get_version() }}"></script>
src/App/Users/Rules/ReCaptchaRules.php
+1 -1
View File
@@ -20,7 +20,7 @@ class ReCaptchaRules implements Rule
'https://www.google.com/recaptcha/api/siteverify', 'https://www.google.com/recaptcha/api/siteverify',
[ [
'form_params' => [ 'form_params' => [
'secret' => env('RECAPTCHA_CLIENT_SECRET', false), 'secret' => config('services.recaptcha.client_secret'),
'remoteip' => request()->getClientIp(), 'remoteip' => request()->getClientIp(),
'response' => $value, 'response' => $value,
], ],
src/Support/helpers.php
+1 -1
View File
@@ -245,7 +245,7 @@ if (! function_exists('get_storage')) {
*/ */
function get_storage() function get_storage()
{ {
return env('FILESYSTEM_DISK'); return config('filesystems.default');
} }
} }