auto redirect

This commit is contained in:
Čarodej
2022-03-04 12:25:46 +01:00
parent 2724fb1873
commit 0f6dd0304f
20 changed files with 36 additions and 49 deletions
+15 -16
View File
@@ -219,6 +219,7 @@ return [
'credit_to_auto_withdraw' => 'You own {credit} in credits that will be automatically withdrawn on your next payment.', 'credit_to_auto_withdraw' => 'You own {credit} in credits that will be automatically withdrawn on your next payment.',
], ],
'regular' => [ 'regular' => [
'cancel' => 'Cancel',
'actions.close' => 'Close', 'actions.close' => 'Close',
'actions.create_folder' => 'Create folder', 'actions.create_folder' => 'Create folder',
'actions.delete' => 'Delete item', 'actions.delete' => 'Delete item',
@@ -387,7 +388,6 @@ return [
'folder.item_counts' => '{count} Item | {count} Items', 'folder.item_counts' => '{count} Item | {count} Items',
'global.active' => 'Active', 'global.active' => 'Active',
'global.admin' => 'Admin', 'global.admin' => 'Admin',
'global.cancel' => 'Cancel',
'global.canceled' => 'Canceled', 'global.canceled' => 'Canceled',
'global.confirm_action' => "Yes, I'm sure", 'global.confirm_action' => "Yes, I'm sure",
'global.default' => 'Default', 'global.default' => 'Default',
@@ -516,7 +516,6 @@ return [
'popup_exceed_limit.title' => 'You exceed storage limit', 'popup_exceed_limit.title' => 'You exceed storage limit',
'popup_mimetypes_blacklist.message' => 'File of this type ({mimetype}) is not allowed to upload.', 'popup_mimetypes_blacklist.message' => 'File of this type ({mimetype}) is not allowed to upload.',
'popup_mimetypes_blacklist.title' => 'You are trying to upload unsupported file type', 'popup_mimetypes_blacklist.title' => 'You are trying to upload unsupported file type',
'popup_move_item.cancel' => 'Cancel',
'popup_move_item.submit' => 'Move Item', 'popup_move_item.submit' => 'Move Item',
'popup_move_item.title' => 'Move Item', 'popup_move_item.title' => 'Move Item',
'popup_pass_changed.message' => 'So now, you have awesome new password.', 'popup_pass_changed.message' => 'So now, you have awesome new password.',
@@ -752,23 +751,23 @@ return [
'actions.upload_folder' => 'Upload Folder', 'actions.upload_folder' => 'Upload Folder',
// v2 // v2
'member' => 'Members', 'member' => 'Members',
// file request // file request
'request_for_upload' => '{name} is Asking You For Files', 'request_for_upload' => '{name} is Asking You For Files',
'request_for_upload_success' => 'Upload Request for {name} was Fulfilled Successfully', 'request_for_upload_success' => 'Upload Request for {name} was Fulfilled Successfully',
'request_for_upload_expired' => 'Upload Request Expired', 'request_for_upload_expired' => 'Upload Request Expired',
'automatically_uploads_for_file_request' => 'Your files will be uploaded automatically and after that, you can organize your files in folders.', 'automatically_uploads_for_file_request' => 'Your files will be uploaded automatically and after that, you can organize your files in folders.',
'request_for_upload_unavailable' => 'This upload request is no longer available for uploading files.', 'request_for_upload_unavailable' => 'This upload request is no longer available for uploading files.',
'closing_request_for_upload' => 'Are you sure you uploaded all files you want for {name}?', 'closing_request_for_upload' => 'Are you sure you uploaded all files you want for {name}?',
'closing_request_for_upload_warn' => "You won't be able to upload any files here once again.", 'closing_request_for_upload_warn' => "You won't be able to upload any files here once again.",
'user_leave_message' => '{name} leave you a message', 'user_leave_message' => '{name} leave you a message',
'tell_you_are_done' => 'Tell {name} you are done!', 'tell_you_are_done' => 'Tell {name} you are done!',
// teams // teams
'user_invite_you_into_team_folder' => '{name} invite you to join with his team into shared team folder', 'user_invite_you_into_team_folder' => '{name} invite you to join with his team into shared team folder',
'register_with_email_and_get_folder' => 'Register account with your email {email} and get access to this Team Folder.', 'register_with_email_and_get_folder' => 'Register account with your email {email} and get access to this Team Folder.',
'' => '', '' => '',
'' => '', '' => '',
], ],
]; ];
+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
@@ -21,7 +21,7 @@
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"> <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">
{{ $t('global.cancel') }} {{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -37,7 +37,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase class="w-full" @click.native="createFolder" button-style="theme" <ButtonBase class="w-full" @click.native="createFolder" button-style="theme"
>{{ $t('popup_create_folder.title') }} >{{ $t('popup_create_folder.title') }}
@@ -41,7 +41,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"> <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">
{{ $t('global.cancel') }} {{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -35,7 +35,7 @@
<PopupActions v-if="!token"> <PopupActions v-if="!token">
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"> <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">
{{ $t('global.cancel') }} {{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -99,7 +99,7 @@
<!--Actions--> <!--Actions-->
<PopupActions v-if="!generatedUploadRequest"> <PopupActions v-if="!generatedUploadRequest">
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase class="w-full" @click.native="createUploadRequest" :loading="isLoading" button-style="theme" <ButtonBase class="w-full" @click.native="createUploadRequest" :loading="isLoading" button-style="theme"
>{{ $t('Create Request') }} >{{ $t('Create Request') }}
@@ -34,7 +34,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase class="w-full" @click.native="moveItem" :button-style="selectedFolder ? 'theme' : 'secondary'" <ButtonBase class="w-full" @click.native="moveItem" :button-style="selectedFolder ? 'theme' : 'secondary'"
>{{ $t('popup_move_item.submit') }} >{{ $t('popup_move_item.submit') }}
@@ -15,7 +15,7 @@
<PopupActions> <PopupActions>
<ButtonBase @click.native="closePopup" button-style="secondary" class="w-full" <ButtonBase @click.native="closePopup" button-style="secondary" class="w-full"
>{{ $t('global.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase @click.native="confirm" :button-style="buttonColor" class="w-full" <ButtonBase @click.native="confirm" :button-style="buttonColor" class="w-full"
>{{ $t('global.confirm_action') }} >{{ $t('global.confirm_action') }}
@@ -55,7 +55,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"> <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">
{{ $t('popup_move_item.cancel') }} {{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase class="w-full" @click.native="changeName" button-style="theme"> <ButtonBase class="w-full" @click.native="changeName" button-style="theme">
{{ $t('popup_share_edit.save') }} {{ $t('popup_share_edit.save') }}
@@ -126,7 +126,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase v-if="!isGeneratedShared" class="w-full" @click.native="$closePopup()" button-style="secondary"> <ButtonBase v-if="!isGeneratedShared" class="w-full" @click.native="$closePopup()" button-style="secondary">
{{ $t('popup_move_item.cancel') }} {{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -28,7 +28,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
@@ -104,14 +104,6 @@ export default {
}, },
data() { data() {
return { return {
stripe: {
isGettingCheckoutLink: false,
},
paypal: {
isMethodsLoaded: false,
isMethodLoading: false,
},
isPaymentOptionPage: false,
isSelectedYearlyPlans: false, isSelectedYearlyPlans: false,
isLoading: false, isLoading: false,
selectedPlan: undefined, selectedPlan: undefined,
@@ -138,8 +130,7 @@ export default {
payByPayPal() { payByPayPal() {
axios.post(`/api/subscriptions/swap/${this.selectedPlan.data.id}`) axios.post(`/api/subscriptions/swap/${this.selectedPlan.data.id}`)
.then((response) => { .then((response) => {
console.log(response.data.links[0].href); window.location = response.data.links[0].href
//window.location = response.data.links[0].href
}) })
}, },
payByStripe() { payByStripe() {
@@ -157,8 +148,7 @@ export default {
planCode: this.selectedPlan.data.meta.driver_plan_id.paystack, planCode: this.selectedPlan.data.meta.driver_plan_id.paystack,
}) })
.then((response) => { .then((response) => {
console.log(response.data.data.authorization_url); window.location = response.data.data.authorization_url
//window.location = response.data.data.authorization_url
}) })
}, },
selectPlan(plan) { selectPlan(plan) {
@@ -174,9 +164,7 @@ export default {
// Reset states on popup close // Reset states on popup close
events.$on('popup:close', () => { events.$on('popup:close', () => {
this.isSelectedYearlyPlans = false this.isSelectedYearlyPlans = false
this.isPaymentOptionPage = false
this.selectedPlan = undefined this.selectedPlan = undefined
this.paypal.isMethodsLoaded = false
}) })
}, },
} }
@@ -110,7 +110,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -79,7 +79,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"
@@ -58,7 +58,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary" <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary"
>{{ $t('popup_move_item.cancel') }} >{{ $t('cancel') }}
</ButtonBase> </ButtonBase>
<ButtonBase <ButtonBase
class="w-full" class="w-full"