From 9e281d111fc1a813f07c56518ed59ea12e6f7f7a Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 22:21:36 +0300 Subject: [PATCH 01/84] changed padding for main card in gamemodes --- luckydiamond/src/assets/css/PagesStyles/home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 0e0fd45..2646135 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -127,7 +127,7 @@ display: flex; justify-content: center; align-items: center; - padding-top: 10.6%; + padding-top: 8.7%; } .line__content .line__btn--main .line__btn { From 5efe622a48f73b0d01794fa02cacec73f748dfbc Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 22:28:25 +0300 Subject: [PATCH 02/84] added router for redirect on home and add router for profile page --- luckydiamond/src/components/HeaderComponent.vue | 2 +- luckydiamond/src/pages/ProfilePage.vue | 11 +++++++++++ luckydiamond/src/router/router.js | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 luckydiamond/src/pages/ProfilePage.vue diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index 9e0db18..1fccefc 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -6,7 +6,7 @@
diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue new file mode 100644 index 0000000..4a5807f --- /dev/null +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/luckydiamond/src/router/router.js b/luckydiamond/src/router/router.js index 3b9ec02..cc8f1fe 100644 --- a/luckydiamond/src/router/router.js +++ b/luckydiamond/src/router/router.js @@ -1,9 +1,12 @@ import { createRouter, createWebHistory } from "vue-router"; import HomePage from "../pages/HomePage.vue"; +import ProfilePage from "@/pages/ProfilePage.vue"; + export default createRouter({ history: createWebHistory(), routes: [ - { path: '/', component: HomePage, name: 'home' } + { path: '/', component: HomePage, name: 'home' }, + { path: '/', component: ProfilePage, name: 'profile' } ] }) \ No newline at end of file From 73a7d8d161bdff6e66577e94798609ba153d986c Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 22:29:44 +0300 Subject: [PATCH 03/84] added router for profile --- luckydiamond/src/components/HeaderComponent.vue | 2 +- luckydiamond/src/router/router.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index 1fccefc..0e2031c 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -7,7 +7,7 @@
diff --git a/luckydiamond/src/router/router.js b/luckydiamond/src/router/router.js index cc8f1fe..f8f8061 100644 --- a/luckydiamond/src/router/router.js +++ b/luckydiamond/src/router/router.js @@ -7,6 +7,6 @@ export default createRouter({ history: createWebHistory(), routes: [ { path: '/', component: HomePage, name: 'home' }, - { path: '/', component: ProfilePage, name: 'profile' } + { path: '/profile', component: ProfilePage, name: 'profile' } ] }) \ No newline at end of file From 0443f1eeb9bc21e4b4e40e6c8ff6a75dd1e530cb Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 22:33:00 +0300 Subject: [PATCH 04/84] added template for profile, add components --- luckydiamond/src/pages/ProfilePage.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 4a5807f..1362192 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -1,11 +1,21 @@ \ No newline at end of file From 5de313bf19f09174f3e6966f5364fc869c1073fe Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 22:34:49 +0300 Subject: [PATCH 05/84] refactor naming for components in homepage --- luckydiamond/src/pages/HomePage.vue | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/luckydiamond/src/pages/HomePage.vue b/luckydiamond/src/pages/HomePage.vue index be69b5f..becf1da 100644 --- a/luckydiamond/src/pages/HomePage.vue +++ b/luckydiamond/src/pages/HomePage.vue @@ -1,11 +1,11 @@ \ No newline at end of file From 2d199a47304538bc3f67c82d3c68091ca4fb9b1d Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 25 Nov 2023 23:46:21 +0300 Subject: [PATCH 13/84] changed margin for btn send msg in chat component --- luckydiamond/src/assets/css/ComponentsStyles/chat.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css index b46a657..333f103 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css @@ -97,7 +97,7 @@ .write__content button { padding: 8px 9px; - margin-left: -15%; + margin-left: -20%; border-radius: 6px; background: #3D3F48; border: none; From f05e15dcb2f7954cef8956cccc590cd915cb7f82 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 00:09:44 +0300 Subject: [PATCH 14/84] added payments template and styles --- .../src/assets/css/PagesStyles/profile.css | 79 ++++++++++++++++++ luckydiamond/src/assets/css/global.css | 1 + .../person-icon-profile-userinfo.png | Bin 0 -> 15338 bytes luckydiamond/src/pages/ProfilePage.vue | 26 +++++- 4 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 luckydiamond/src/assets/icons-test/person-icon-profile-userinfo.png diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 86323b3..5a69f56 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -77,4 +77,83 @@ .withdraw { padding: 9px 0 13px 13px; +} + + +.payments { + margin: 29px 0 0 -60px; +} + +.types { + display: flex; +} + +.types-margin h3 { + margin-right: 125px; +} + +.types-text h3 { + color: #ABABB4; + font-weight: 600; + font-family: Montserrat; + font-size: 14px; +} + +.types-line { + margin-top: 12px; + background: #38383E; + width: 86%; + height: 3px; +} + +.payments__card { + margin-top: 29px; + display: flex; + align-items: start; +} + +.user-info { + display: flex; +} + +.user-name { + display: flex; + flex-direction: column; + margin-left: 10px; +} + +.user-name__text h3 { + color: #FFF; + font-weight: 700; + font-family: Montserrat; + font-size: 20px; +} + +.user-name__text p { + color: #A9A9A9; + font-weight: 400; + font-family: Montserrat; + font-size: 20px; +} + +.data-info { + margin-left: 115px; +} + +.data-info__text h3 { + color: #A9A9A9; + font-weight: 400; + font-family: Montserrat; + font-size: 17px; +} + +.transaction-info { + margin-left: 90px; +} + +.transaction-info__text h3 { + color: #EA3D38; + font-weight: 500; + font-family: Montserrat; + font-size: 22px; } \ No newline at end of file diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index bf5c2b4..541ea78 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -122,6 +122,7 @@ body, html { /* Profile */ .profile { + display: flex; grid-area: profile; height: 95%; border-radius: 50px; diff --git a/luckydiamond/src/assets/icons-test/person-icon-profile-userinfo.png b/luckydiamond/src/assets/icons-test/person-icon-profile-userinfo.png new file mode 100644 index 0000000000000000000000000000000000000000..d85d000a60931b01414573773c87af0ba33386d0 GIT binary patch literal 15338 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 IM6N<$f*0Kzga7~l literal 0 HcmV?d00001 diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 5f64d63..1c3ec1f 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -20,7 +20,31 @@
- +
+
+

Игрок и вид транзакции

+

Дата

+

Сумма

+
+
+
+
+
+ +
+

5ч назад

+
+
+

-1 АР

+
+
+
From 7628690b05a644825ee84cc2ea678e206a3d8ff1 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 00:18:00 +0300 Subject: [PATCH 15/84] added logic for dynamic changed nav color in header component --- luckydiamond/src/components/HeaderComponent.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index 0e2031c..6f0580c 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -6,8 +6,8 @@
@@ -47,8 +47,12 @@ export default { data() { return { balance: 25000, - auth: false + auth: false, + route: '' } + }, + mounted() { + this.route = this.$route.name } } From a3531dfda809f758e70d4fd781bf1d7a9b20f03a Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 00:29:58 +0300 Subject: [PATCH 16/84] changed styles for a-now in headercomponent --- luckydiamond/src/assets/css/ComponentsStyles/header.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/header.css b/luckydiamond/src/assets/css/ComponentsStyles/header.css index b635559..e31ad79 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/header.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/header.css @@ -15,10 +15,10 @@ } .header__nav nav a { - margin-right: 30%; text-decoration: none; font-family: Montserrat Alternates; font-weight: 700; + margin-right: 3em; } .header__nav--now { From 753432e7b7d4ffb48b6d8663800f920da6b290a9 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 00:33:09 +0300 Subject: [PATCH 17/84] added directory for archive components or test components in /components/archive --- .../src/components/{ => archive}/NotiicationwindowComponent.vue | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename luckydiamond/src/components/{ => archive}/NotiicationwindowComponent.vue (100%) diff --git a/luckydiamond/src/components/NotiicationwindowComponent.vue b/luckydiamond/src/components/archive/NotiicationwindowComponent.vue similarity index 100% rename from luckydiamond/src/components/NotiicationwindowComponent.vue rename to luckydiamond/src/components/archive/NotiicationwindowComponent.vue From f96a7acf386fb3dc5927f6aae56883f1e98e528e Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 15:39:06 +0300 Subject: [PATCH 18/84] fixed changed from main branch in developckutls --- .../src/components/HeaderComponent.vue | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue index 21d7bd8..68ca310 100644 --- a/luckydiamond/src/components/HeaderComponent.vue +++ b/luckydiamond/src/components/HeaderComponent.vue @@ -1,32 +1,3 @@ - -<<<<<<< HEAD From e566193454bc2855afe9cf876ada2a06a4744889 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 16:15:24 +0300 Subject: [PATCH 19/84] added logic payments modal --- .../css/ComponentsStyles/payments-modal.css | 24 +++++++++++++++++ .../src/components/archive/PaymentsModal.vue | 27 +++++++++++++++++++ luckydiamond/src/pages/ProfilePage.vue | 23 ++++++++++++---- 3 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css create mode 100644 luckydiamond/src/components/archive/PaymentsModal.vue diff --git a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css new file mode 100644 index 0000000..9e04077 --- /dev/null +++ b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css @@ -0,0 +1,24 @@ +.payment-modal { + position: absolute; + top: 20%; + left: 35%; +} + +.payments-modal__content { + background: #000; + width: 400px; + height: 200px; + text-align: center; + display: flex; + justify-content: space-between; +} + +.payments-modal__content button { + background: #fff; + border: none; + color: #ff0000; + width: 40px; + height: 40px; + font-size: 40px; + cursor: pointer; +} \ No newline at end of file diff --git a/luckydiamond/src/components/archive/PaymentsModal.vue b/luckydiamond/src/components/archive/PaymentsModal.vue new file mode 100644 index 0000000..00ea776 --- /dev/null +++ b/luckydiamond/src/components/archive/PaymentsModal.vue @@ -0,0 +1,27 @@ + + + \ No newline at end of file diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 1c3ec1f..3cee22e 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -14,8 +14,8 @@

{{ balance }}

- Пополнить - Вывести + Пополнить + Вывести
@@ -48,6 +48,7 @@
+ @@ -55,16 +56,28 @@ import AsideBarComponent from "@/components/AsidebarComponent.vue"; import ChatComponent from "@/components/ChatComponent.vue"; import HeaderComponent from "@/components/HeaderComponent.vue"; +import PaymentsModal from "@/components/archive/PaymentsModal.vue"; import '@/assets/css/PagesStyles/profile.css' export default { - components: { HeaderComponent, AsideBarComponent, ChatComponent }, + components: { HeaderComponent, AsideBarComponent, ChatComponent, PaymentsModal }, data() { return { username: 'Artemka', - balance: 25000 + balance: 25000, + openModal: false, + payments: true + } + }, + methods: { + withdrawClick() { + this.openModal = true + this.payments = false + }, + depositClick() { + this.openModal = true + this.payments = true } } - } \ No newline at end of file From 1e1542cbc2e9ac3c9aee9ad8252063254055a71b Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 16:34:22 +0300 Subject: [PATCH 20/84] added template for deposit modal --- .../css/ComponentsStyles/payments-modal.css | 33 +++++++++++++++++-- .../src/components/archive/PaymentsModal.vue | 13 ++++++-- luckydiamond/src/pages/ProfilePage.vue | 12 +++---- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css index 9e04077..3948467 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css @@ -2,12 +2,12 @@ position: absolute; top: 20%; left: 35%; -} - -.payments-modal__content { background: #000; width: 400px; height: 200px; +} + +.payments-modal__content { text-align: center; display: flex; justify-content: space-between; @@ -21,4 +21,31 @@ height: 40px; font-size: 40px; cursor: pointer; +} + +.payments__input--color input { + color: #000; +} + +.payments__margin { + margin: 40px 0 0 20px; +} + +.payments__margin input { + margin-left: 10px; +} + +.payments__button .payments-modal__content--btn { + display: flex; + justify-content: center; + margin-top: 5%; +} + +.payments__button .payments-modal__content--btn button { + background: #fff; + color: #000; + font-weight: 700; + padding: 10px 10px; + border: none; + cursor: pointer; } \ No newline at end of file diff --git a/luckydiamond/src/components/archive/PaymentsModal.vue b/luckydiamond/src/components/archive/PaymentsModal.vue index 00ea776..5cb8656 100644 --- a/luckydiamond/src/components/archive/PaymentsModal.vue +++ b/luckydiamond/src/components/archive/PaymentsModal.vue @@ -1,9 +1,18 @@ diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 3cee22e..057f894 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -14,8 +14,8 @@

{{ balance }}

- Пополнить - Вывести + Пополнить + Вывести
@@ -70,13 +70,13 @@ export default { } }, methods: { - withdrawClick() { - this.openModal = true - this.payments = false - }, depositClick() { this.openModal = true this.payments = true + }, + withdrawClick() { + this.openModal = true + this.payments = false } } } From 4db9f3144265b99623c5098419121cadcc962426 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 16:44:40 +0300 Subject: [PATCH 21/84] added template for withdraw in payments modal --- .../src/components/archive/PaymentsModal.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/components/archive/PaymentsModal.vue b/luckydiamond/src/components/archive/PaymentsModal.vue index 5cb8656..63a4a34 100644 --- a/luckydiamond/src/components/archive/PaymentsModal.vue +++ b/luckydiamond/src/components/archive/PaymentsModal.vue @@ -11,7 +11,18 @@
-
+
+
+ + +
+
+ + +
+
+ +
From 8d5e7e347516871efa249d174ffcc210c5b5f0a1 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 16:59:23 +0300 Subject: [PATCH 22/84] added logic for send data from modal --- .../src/components/archive/PaymentsModal.vue | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/luckydiamond/src/components/archive/PaymentsModal.vue b/luckydiamond/src/components/archive/PaymentsModal.vue index 63a4a34..417b5a5 100644 --- a/luckydiamond/src/components/archive/PaymentsModal.vue +++ b/luckydiamond/src/components/archive/PaymentsModal.vue @@ -6,22 +6,22 @@
- +
- +
- +
- +
- +
@@ -36,11 +36,25 @@ export default { ], data() { return { + amount: 1, + card: 0, } }, methods: { closeModal() { return this.$emit('closemodal') + }, + detectorMethod(method) { + if (method === 'dep') { + return this.$emit('deposit', this.amount) + } + else if (method === 'with') { + return this.$emit('withdraw', this.amount, this.card) + } + else { + console.log('Произошла ошибка при взаимодействие') + return + } } } } From 3d86619802378ab712549abd6670a4627731ce74 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 17:08:00 +0300 Subject: [PATCH 23/84] added logic for accept data from modal --- .../src/components/archive/PaymentsModal.vue | 1 + luckydiamond/src/pages/ProfilePage.vue | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/components/archive/PaymentsModal.vue b/luckydiamond/src/components/archive/PaymentsModal.vue index 417b5a5..9076d9e 100644 --- a/luckydiamond/src/components/archive/PaymentsModal.vue +++ b/luckydiamond/src/components/archive/PaymentsModal.vue @@ -45,6 +45,7 @@ export default { return this.$emit('closemodal') }, detectorMethod(method) { + this.closeModal() if (method === 'dep') { return this.$emit('deposit', this.amount) } diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 057f894..fa91973 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -48,7 +48,7 @@ - + @@ -66,7 +66,8 @@ export default { username: 'Artemka', balance: 25000, openModal: false, - payments: true + payments: true, + arrayHistory: [], } }, methods: { @@ -77,6 +78,26 @@ export default { withdrawClick() { this.openModal = true this.payments = false + }, + claimDataDeposit(amount) { + const historyPayments = { + name: 'TEST USER', + comment: 'test', + data: '5ч назад', + amount: amount + } + + this.arrayHistory.push(historyPayments) + }, + claimDataWithdraw(amount) { + const historyPayments = { + name: 'TEST USER', + comment: 'test', + data: '5ч назад', + amount: -amount + } + + this.arrayHistory.push(historyPayments) } } } From e9807e0efb0312edf49bf42b28f029e55548a8d7 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 17:14:23 +0300 Subject: [PATCH 24/84] added vision from array in profile page, payments section --- luckydiamond/src/pages/ProfilePage.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index fa91973..692bf0a 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -29,19 +29,19 @@
-
+
-

5ч назад

+

{{ payment.data }}

-

-1 АР

+

{{ payment.amount }} АР

From 29c426b7747ef16f9ab904a5ff030668ff061e62 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 17:26:34 +0300 Subject: [PATCH 25/84] added dynamic styles for color transactions in profile --- luckydiamond/src/assets/css/PagesStyles/profile.css | 9 ++++++++- luckydiamond/src/pages/ProfilePage.vue | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 5a69f56..55a9591 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -152,8 +152,15 @@ } .transaction-info__text h3 { - color: #EA3D38; font-weight: 500; font-family: Montserrat; font-size: 22px; +} + +.deposit-color h3 { + color: #32C966; +} + +.withdraw-color h3 { + color: #EA3D38; } \ No newline at end of file diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 692bf0a..c996e2b 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -40,7 +40,7 @@

{{ payment.data }}

-
+

{{ payment.amount }} АР

From e5542ab56bb8791d12c58eb223d2f8656fdde4ef Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 17:27:25 +0300 Subject: [PATCH 26/84] changed margin in payments card, profile --- luckydiamond/src/assets/css/PagesStyles/profile.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 55a9591..ef2fe9d 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -137,7 +137,7 @@ } .data-info { - margin-left: 115px; + margin-left: 95px; } .data-info__text h3 { @@ -148,7 +148,7 @@ } .transaction-info { - margin-left: 90px; + margin-left: 95px; } .transaction-info__text h3 { From 5a7226f35eb0a87e9a909fd57a824b6a4fb25cd0 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 17:48:43 +0300 Subject: [PATCH 27/84] refactor, changed px -> %/em in profile page --- .../src/assets/css/PagesStyles/profile.css | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index ef2fe9d..b3778c1 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -1,10 +1,10 @@ .profile__content { width: 35%; - margin-left: 36px; + margin-left: 3%; } .profile__content .profile__user--img { - margin: 88px 42px 5px 0; + margin: 17.6% 8.4% 1% 0; } .profile__card { @@ -32,11 +32,11 @@ } .profile__card h2 img { - margin-right: 7px; + margin-right: 4.4%; } .profile__btns--payments { - margin-top: 39px; + margin-top: 7.9%; display: flex; flex-direction: column; } @@ -57,7 +57,7 @@ } .btn-margin { - padding: 9px 0 13px 13px; + padding: 1.8% 0 2% 2%; margin-bottom: 11px; } @@ -76,12 +76,12 @@ } .withdraw { - padding: 9px 0 13px 13px; + padding: 1.8% 0 2% 2%; } .payments { - margin: 29px 0 0 -60px; + margin: 2% 0 0 -4.25%; } .types { @@ -89,7 +89,7 @@ } .types-margin h3 { - margin-right: 125px; + margin-right: 7.813em; } .types-text h3 { @@ -100,14 +100,14 @@ } .types-line { - margin-top: 12px; + margin-top: 2.1%; background: #38383E; width: 86%; height: 3px; } .payments__card { - margin-top: 29px; + margin-top: 4.9%; display: flex; align-items: start; } @@ -119,7 +119,7 @@ .user-name { display: flex; flex-direction: column; - margin-left: 10px; + margin-left: 0.625em; } .user-name__text h3 { @@ -137,7 +137,7 @@ } .data-info { - margin-left: 95px; + margin-left: 13%; } .data-info__text h3 { @@ -148,7 +148,7 @@ } .transaction-info { - margin-left: 95px; + margin-left: 13%; } .transaction-info__text h3 { From 5ea14bc077cc206e18d063d055589dc2b57b6fe2 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 26 Nov 2023 18:06:52 +0300 Subject: [PATCH 28/84] added test logic for adaptive --- luckydiamond/src/pages/HomePage.vue | 26 +++++++++++++++---- .../pages/adaptive-pages/HomemobilePage.vue | 15 +++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue diff --git a/luckydiamond/src/pages/HomePage.vue b/luckydiamond/src/pages/HomePage.vue index becf1da..63bca0c 100644 --- a/luckydiamond/src/pages/HomePage.vue +++ b/luckydiamond/src/pages/HomePage.vue @@ -1,6 +1,6 @@ - From 950df68981782923ab7847afc8115cc357f5e0db Mon Sep 17 00:00:00 2001 From: Kostya Date: Thu, 30 Nov 2023 12:49:00 +0300 Subject: [PATCH 40/84] added template for footer-mobile --- .../PagesStyles/adaptive-pages/homemobile.css | 27 +++++++++++++++++- .../home-adaptive/icon-chat.png | Bin 123 -> 0 bytes .../home-adaptive/icon-chat.svg | 15 ++++++++++ .../home-adaptive/icon-home.svg | 27 ++++-------------- .../home-adaptive/icon-settings.png | Bin 0 -> 6024 bytes .../home-adaptive/icon-settings.svg | 17 ----------- .../pages/adaptive-pages/HomemobilePage.vue | 11 ++++++- 7 files changed, 57 insertions(+), 40 deletions(-) delete mode 100644 luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.png create mode 100644 luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.svg create mode 100644 luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.png delete mode 100644 luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.svg diff --git a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css index 355972e..c2638ca 100644 --- a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css +++ b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css @@ -33,7 +33,7 @@ body { .footer-mobile { grid-area: footer-mobile; width: 100%; - height: 20%; + height: 10%; background: #17181C; position: fixed; bottom: 0; @@ -174,4 +174,29 @@ body { /* Footer */ +.footer-mobile__content { + display: flex; + justify-content: center; + align-items: center; + margin-top: 10px; +} + +.icons-size img { + width: 65px; + height: 65px; +} + +.icons-margin img { + margin: 0 10px; +} + +.footer-mobile__block img { + display: flex; + justify-content: center; + align-items: center; + background: #D9D9D91F; + +} + + /* /Footer */ \ No newline at end of file diff --git a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.png b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.png deleted file mode 100644 index 04cc712f24b2ecf0100a4c9b415783d8f8fba087..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?3oVGw3ym^DWNq@p;; z-HBn{IhmJ04okYDuOkD)#(wTUiL5}rfTxRNNChJ!E5on diff --git a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.svg b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.svg new file mode 100644 index 0000000..32485bd --- /dev/null +++ b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-chat.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-home.svg b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-home.svg index 9364d14..86919e3 100644 --- a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-home.svg +++ b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-home.svg @@ -1,32 +1,17 @@ - - - - - - - - + + + - + - - - - - - - - - - - - + + diff --git a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.png b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..4b3a2996cd7c3ad3ad0981b0cdd0b4a48dd133dc GIT binary patch literal 6024 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 literal 0 HcmV?d00001 diff --git a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.svg b/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.svg deleted file mode 100644 index f16c5cd..0000000 --- a/luckydiamond/src/assets/icons-adaptive/home-adaptive/icon-settings.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue index bc2b7df..92d6ab6 100644 --- a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue +++ b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue @@ -39,7 +39,16 @@
-
+
+
+ +
+
+ +
+
+ +
From afbd0f68a659f070ff1c1ce421a47095eab0a107 Mon Sep 17 00:00:00 2001 From: Kostya Date: Thu, 30 Nov 2023 12:53:42 +0300 Subject: [PATCH 41/84] refactor styles for mobile v., added btn in img and styles for btn-img --- .../PagesStyles/adaptive-pages/homemobile.css | 13 +++++-------- .../pages/adaptive-pages/HomemobilePage.vue | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css index c2638ca..1098165 100644 --- a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css +++ b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css @@ -186,17 +186,14 @@ body { height: 65px; } -.icons-margin img { +.icons-margin a { margin: 0 10px; } -.footer-mobile__block img { - display: flex; - justify-content: center; - align-items: center; - background: #D9D9D91F; - +.chat-icon a, +.home-icon a, +.settings-icon a { + background: #000; } - /* /Footer */ \ No newline at end of file diff --git a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue index 92d6ab6..30907bd 100644 --- a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue +++ b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue @@ -40,14 +40,20 @@ From 2e1cea27fb2d89227327053fec92eba2d082f471 Mon Sep 17 00:00:00 2001 From: Kostya Date: Thu, 30 Nov 2023 13:04:01 +0300 Subject: [PATCH 42/84] refactor styles footer-mobile, home-mobile. Change template and styles for icons-btn --- .../PagesStyles/adaptive-pages/homemobile.css | 22 ++++++++++--------- .../pages/adaptive-pages/HomemobilePage.vue | 8 +++---- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css index 1098165..55193e5 100644 --- a/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css +++ b/luckydiamond/src/assets/css/PagesStyles/adaptive-pages/homemobile.css @@ -180,20 +180,22 @@ body { align-items: center; margin-top: 10px; } - -.icons-size img { - width: 65px; - height: 65px; -} - -.icons-margin a { - margin: 0 10px; -} - .chat-icon a, .home-icon a, .settings-icon a { background: #000; } +.footer-mobile__block a { + display: flex; + justify-content: center; + align-items: center; + width: 65px; + height: 65px; + background: #D9D9D91F; + border-radius: 20px; + margin: 0 10px; +} + + /* /Footer */ \ No newline at end of file diff --git a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue index 30907bd..8d52ce5 100644 --- a/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue +++ b/luckydiamond/src/pages/adaptive-pages/HomemobilePage.vue @@ -39,18 +39,18 @@