From d5531d0b2ef322fcd13e7eb5d58d95384ccdd2f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Tue, 2 Apr 2024 22:28:36 +0300 Subject: [PATCH 1/8] components(calculator/inner-container): refactor --- components/calculator/inner-container.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/calculator/inner-container.vue b/components/calculator/inner-container.vue index 0e43d5da..bd886048 100644 --- a/components/calculator/inner-container.vue +++ b/components/calculator/inner-container.vue @@ -1,11 +1,11 @@ - From 81ffbb24564141131c5b8970aa1b99d46a62dcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Tue, 2 Apr 2024 22:30:14 +0300 Subject: [PATCH 2/8] components(calculator/result-form-row): migrate to Composition API --- components/calculator/result-form-row.vue | 42 +++++++++++------------ 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/components/calculator/result-form-row.vue b/components/calculator/result-form-row.vue index 50af0992..a644e4e1 100644 --- a/components/calculator/result-form-row.vue +++ b/components/calculator/result-form-row.vue @@ -1,11 +1,11 @@ - - From 89ee81d49a7acd3622877f92d8492abce7719abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Tue, 2 Apr 2024 23:03:29 +0300 Subject: [PATCH 4/8] components(calculator/share-dialog): major refactor --- assets/scss/components/_index.scss | 3 +- assets/scss/components/dialog.scss | 32 ---- components/calculator/share-dialog.vue | 211 +++++++++++++------------ 3 files changed, 108 insertions(+), 138 deletions(-) delete mode 100644 assets/scss/components/dialog.scss diff --git a/assets/scss/components/_index.scss b/assets/scss/components/_index.scss index ce42a70c..751c56aa 100644 --- a/assets/scss/components/_index.scss +++ b/assets/scss/components/_index.scss @@ -1 +1,2 @@ -@import "./dialog.scss"; +// FIXME: Removing this causes SASS error. +@import "~vuetify/src/styles/styles.sass"; diff --git a/assets/scss/components/dialog.scss b/assets/scss/components/dialog.scss deleted file mode 100644 index 305a8ed0..00000000 --- a/assets/scss/components/dialog.scss +++ /dev/null @@ -1,32 +0,0 @@ -@import "~vuetify/src/styles/styles.sass"; - -$vh-dialog-selector: ".vh-dialog"; - -#{$vh-dialog-selector} { - display: flex; - flex-flow: column nowrap; - background: map-get($material-dark-elevation-colors, "1"); - &__header { - flex: 0 - } - &__content { - height: 100%; - overflow-y: auto; - flex: 1 - } -} - -@media #{map-get($display-breakpoints, "sm-and-down")} { - html:has(#{$vh-dialog-selector}.v-dialog--active) { - position: fixed; - &, body { - width: 100%; - height: 100%; - inset: 0; - overflow: hidden - } - body { - position: absolute - } - } -} diff --git a/components/calculator/share-dialog.vue b/components/calculator/share-dialog.vue index 6044224c..97554f03 100644 --- a/components/calculator/share-dialog.vue +++ b/components/calculator/share-dialog.vue @@ -1,140 +1,141 @@ - From bc5dc25356e07c4278a5a062f9a078a0f5dc8fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20G=C3=B6rg=C3=BCl=C3=BC?= Date: Tue, 2 Apr 2024 23:06:38 +0300 Subject: [PATCH 5/8] components(calculator/share-dialog-url): minor refactor --- components/calculator/share-dialog-url.vue | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/components/calculator/share-dialog-url.vue b/components/calculator/share-dialog-url.vue index 7a2892b1..7b75815b 100644 --- a/components/calculator/share-dialog-url.vue +++ b/components/calculator/share-dialog-url.vue @@ -19,15 +19,9 @@ elevation="0" block="" rounded=""> - - + @@ -84,7 +78,6 @@ import { createXShareUrl, createWhatsAppShareUrl } from "@/utils/create-social-media-share-url.js"; -import { isCustomIcon, loadCustomIconAsHtml } from "@/utils/custom-icon.js"; export default { data: () => ({ @@ -107,12 +100,6 @@ export default { }); } catch { } - }, - isCustomIcon(item) { - return isCustomIcon(item.icon); - }, - loadCustomIconAsHtml(item) { - return loadCustomIconAsHtml(item.icon); } }, computed: { @@ -135,7 +122,7 @@ export default { const vm = this; return [ { - url: createFacebookShareUrl(vm.url, document.title), + url: createFacebookShareUrl(vm.url), title: "Facebook'ta paylaş", color: "#1877f2", icon: mdiFacebook @@ -147,7 +134,7 @@ export default { icon: "x.svg" }, { - url: createWhatsAppShareUrl(vm.url, document.title), + url: createWhatsAppShareUrl(vm.url), title: "WhatsApp ile gönder", color: "#25d366", icon: mdiWhatsapp @@ -170,15 +157,7 @@ export default { }; -