From 81d7bf799e3c046d792538dbcbf2f529b2159f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Micha=C5=82owski?= Date: Wed, 7 Aug 2024 16:18:25 +0200 Subject: [PATCH] fix(frontend): WiP migration --- frontend/src/assets/scss/gradido.scss | 1 - frontend/src/components/Auth/AuthFooter.vue | 12 +- frontend/src/components/ClipboardCopy.vue | 10 +- frontend/src/components/CommunitySwitch.vue | 218 ++++--- .../ContributionMessagesFormular.vue | 12 +- .../ContributionMessagesListItem.vue | 36 +- .../ContributionMessages/ParseMessage.vue | 2 +- .../Contributions/ContributionForm.vue | 4 +- .../Contributions/ContributionListItem.vue | 53 +- .../Contributions/OpenCreationsAmount.vue | 44 +- .../DecayInformations/CollapseLinksList.vue | 13 +- .../DecayInformation-Decay.vue | 29 +- .../DecayInformation-DecayStartblock.vue | 80 +-- .../DecayInformation-Long.vue | 86 +-- .../DecayInformation-Short.vue | 2 +- .../GddSend/TransactionConfirmationLink.vue | 8 +- .../GddSend/TransactionConfirmationSend.vue | 103 ++-- .../components/GddSend/TransactionForm.vue | 572 +++++++++++------- .../GddSend/TransactionResultLink.vue | 4 +- .../GddSend/TransactionResultSendError.vue | 4 +- .../src/components/GddTransactionList.vue | 6 +- .../src/components/GdtTransactionList.vue | 6 +- .../src/components/Inputs/InputAmount.vue | 203 ++++--- .../src/components/Inputs/InputIdentifier.vue | 117 ++-- .../Inputs/InputPasswordConfirmation.vue | 16 +- .../src/components/Inputs/InputTextarea.vue | 96 +-- .../LinkInformations/RedeemInformation.vue | 4 +- .../LinkInformations/RedeemLoggedOut.vue | 12 +- frontend/src/components/Menu/Sidebar.vue | 1 + .../src/components/SessionLogoutTimeout.vue | 4 + .../Template/ContentHeader/GddAmount.vue | 3 +- .../Template/RightSide/LastContributions.vue | 10 +- .../Template/RightSide/LastTransactions.vue | 2 +- frontend/src/components/Transaction.vue | 253 +++++--- .../src/components/TransactionCollapse.vue | 2 +- .../TransactionLinks/TransactionLink.vue | 232 ++++--- .../TransactionRows/AmountAndNameRow.vue | 14 +- .../TransactionRows/CollapseIcon.vue | 12 +- .../components/TransactionRows/DateRow.vue | 12 +- .../components/TransactionRows/DecayRow.vue | 15 +- .../TransactionRows/DurationRow.vue | 12 +- .../TransactionRows/LinkCountRow.vue | 12 +- .../components/TransactionRows/MemoRow.vue | 12 +- .../Transactions/TransactionCreation.vue | 26 +- .../Transactions/TransactionDecay.vue | 23 +- .../Transactions/TransactionLinkSummary.vue | 28 +- .../Transactions/TransactionReceive.vue | 32 +- .../Transactions/TransactionSend.vue | 41 +- .../src/components/UserSettings/UserCard.vue | 32 +- .../src/components/UserSettings/UserData.vue | 48 +- .../components/UserSettings/UserLanguage.vue | 38 +- .../src/components/UserSettings/UserName.vue | 20 +- .../components/UserSettings/UserPassword.vue | 24 +- frontend/src/components/skeleton/Overview.vue | 42 +- frontend/src/composables/useAuthLinks.js | 19 + frontend/src/composables/useCopyLinks.js | 53 ++ frontend/src/filters/amount.js | 36 +- frontend/src/i18n.js | 4 +- frontend/src/layouts/DashboardLayout.vue | 2 +- frontend/src/main.js | 20 +- frontend/src/pages/Circles.vue | 128 ++-- frontend/src/pages/ForgotPassword.vue | 27 +- frontend/src/pages/Register.vue | 36 +- frontend/src/pages/RegisterCommunity.vue | 32 +- frontend/src/pages/ResetPassword.vue | 8 +- frontend/src/pages/Send.vue | 384 ++++++++---- frontend/src/pages/Settings.vue | 140 ++--- frontend/src/pages/Transactions.vue | 2 +- frontend/src/pages/UserSearch.vue | 8 +- frontend/vite.config.js | 11 +- 70 files changed, 2110 insertions(+), 1503 deletions(-) create mode 100644 frontend/src/composables/useAuthLinks.js create mode 100644 frontend/src/composables/useCopyLinks.js diff --git a/frontend/src/assets/scss/gradido.scss b/frontend/src/assets/scss/gradido.scss index 5139b9983..6d09e7cea 100644 --- a/frontend/src/assets/scss/gradido.scss +++ b/frontend/src/assets/scss/gradido.scss @@ -53,7 +53,6 @@ @import "bootstrap/scss/bootstrap"; // Bootstrap-vue (2.21.1) scss -//@import "bootstrap-vue/src/index"; @import "custom/variables"; @import "gradido-template"; @import "gradido-template-dark"; diff --git a/frontend/src/components/Auth/AuthFooter.vue b/frontend/src/components/Auth/AuthFooter.vue index d74593e36..fe514f93c 100644 --- a/frontend/src/components/Auth/AuthFooter.vue +++ b/frontend/src/components/Auth/AuthFooter.vue @@ -1,7 +1,7 @@ diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue index 4374f7182..b43c84418 100644 --- a/frontend/src/components/ClipboardCopy.vue +++ b/frontend/src/components/ClipboardCopy.vue @@ -10,9 +10,10 @@ > {{ link }}
- - - + + + +
@@ -26,7 +27,8 @@ {{ linkText }}
- + +
diff --git a/frontend/src/components/CommunitySwitch.vue b/frontend/src/components/CommunitySwitch.vue index e46c94aaa..4f8741fd4 100644 --- a/frontend/src/components/CommunitySwitch.vue +++ b/frontend/src/components/CommunitySwitch.vue @@ -1,13 +1,13 @@ ---> + + + + diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue index e84f9273b..ab61f6a67 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -9,16 +9,16 @@ :placeholder="$t('form.memo')" rows="3" > - - + + {{ $t('form.cancel') }} - - + + {{ $t('form.reply') }} - - + + diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index 60f0a0819..1e31ca02b 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -1,8 +1,8 @@ diff --git a/frontend/src/components/ContributionMessages/ParseMessage.vue b/frontend/src/components/ContributionMessages/ParseMessage.vue index 20aecf842..0d2dbf448 100644 --- a/frontend/src/components/ContributionMessages/ParseMessage.vue +++ b/frontend/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ text | GDD }} + {{ $filters.GDD(text) }}
{{ text }} diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue index cc7a4f669..1649c8ffb 100644 --- a/frontend/src/components/Contributions/ContributionForm.vue +++ b/frontend/src/components/Contributions/ContributionForm.vue @@ -52,10 +52,10 @@ diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 0afa5546e..abf42dbe0 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -4,8 +4,8 @@ class="contribution-list-item bg-white appBoxShadow gradido-border-radius pt-3 px-3" :class="status === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''" > - - + + - - - + + +
{{ firstName }} {{ lastName }} @@ -35,31 +35,32 @@ > {{ $t('contribution.alert.answerQuestion') }}
-
- + +
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
- + + {{ $t('contribution.alert.denied') }}
{{ $t('contribution.deleted') }}
-
{{ amount | GDD }}
-
- +
{{ $filters.GDD(amount) }}
+ +
-
-
- + + - +
{{ $t('delete') }}
-
- + +
- + +
{{ $t('edit') }}
-
- + +
- + +
{{ $t('moderatorChat') }}
-
-
+ +
- + - + diff --git a/frontend/src/components/Contributions/OpenCreationsAmount.vue b/frontend/src/components/Contributions/OpenCreationsAmount.vue index 5f49f5474..e1cdbd3ec 100644 --- a/frontend/src/components/Contributions/OpenCreationsAmount.vue +++ b/frontend/src/components/Contributions/OpenCreationsAmount.vue @@ -1,34 +1,34 @@ diff --git a/frontend/src/components/DecayInformations/CollapseLinksList.vue b/frontend/src/components/DecayInformations/CollapseLinksList.vue index c580fa04a..2bc65bbd4 100644 --- a/frontend/src/components/DecayInformations/CollapseLinksList.vue +++ b/frontend/src/components/DecayInformations/CollapseLinksList.vue @@ -11,7 +11,7 @@ @reset-transaction-link-list="resetTransactionLinkList" />
- {{ buttonText }} - +
- + +
@@ -57,9 +58,9 @@ export default { computed: { buttonText() { const i = this.transactionLinkCount - this.transactionLinks.length - if (i === 1) return this.$tc('link-load', 0) - if (i <= this.pageSize) return this.$tc('link-load', 1, { n: i }) - return this.$tc('link-load', 2, { n: this.pageSize }) + if (i === 1) return this.$t('link-load', 0) + if (i <= this.pageSize) return this.$t('link-load', 1, { n: i }) + return this.$t('link-load', 2, { n: this.pageSize }) }, }, } diff --git a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue index ce679fb30..1efff6629 100644 --- a/frontend/src/components/DecayInformations/DecayInformation-Decay.vue +++ b/frontend/src/components/DecayInformations/DecayInformation-Decay.vue @@ -1,26 +1,27 @@ --> + + +