Merge branch 'main' of https://github.com/danilt2000/LuckyDiamond

luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css

@@ -126,6 +126,10 @@ input:focus {
     border: none;
 }
 
+.btn-style-payments button:disabled {
+    background: #3d3a3a;
+}
+
 .btn-click {
     border-radius: 10px !important;
     background: #EF4444 !important;

luckydiamond/src/components/PaymentsModal.vue

@@ -21,7 +21,7 @@
           <input type="text">
         </div>
         <div class="btn-deposit btn-style-payments">
-          <button type="submit" @click="detectorMethod('dep')">Пополнить</button>
+          <button type="submit" :disabled="offBtn" @click="RedirectedMethodDep">Пополнить</button>
         </div>
       </div>
     </div>
@@ -36,7 +36,7 @@
         <input v-model="card" type="number">
       </div>
       <div class="btn-withdraw btn-style-payments">
-        <button type="submit" @click="detectorMethod('with')">Вывод</button>
+        <button type="submit">Вывод</button>
       </div>
     </div>
   </div>
@@ -57,18 +57,23 @@ export default {
       card: 0,
       clickedBtn: '',
       url: '',
+      offBtn: true,
       PaymentsModalNumbers
     }
   },
   watch: {
     amount(newAmount) {
       console.log(newAmount)
+      this.offBtn = true
+      console.log('OFFBTN', this.offBtn)
       setTimeout(() => {
         try {
           GettingMoneyOperation(newAmount)
               .then((response) => {
                 console.log('Payments Modal Working!: ', response)
                 this.url = response.url
+                this.offBtn = false
+                console.log('ONBTN', this.offBtn)
               })
         }
         catch (e) {
@@ -81,19 +86,22 @@ export default {
     closeModal() {
       return this.$emit('closemodal')
     },
-    detectorMethod(method) {
-      this.closeModal()
-      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
-      }
+    RedirectedMethodDep() {
+      window.location.href = this.url
     },
+    // detectorMethod(method) {
+    //   this.closeModal()
+    //   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
+    //   }
+    // },
     clickedBtnChoice(index, content) {
       this.clickedBtn = index
       this.amount = content

luckydiamond/src/pages/ProfilePage.vue

@@ -8,7 +8,7 @@
 
   <section class="profile">
     <div class="profile__content">
-      <img class="profile__user--img" src="@/assets/icons-test/person-icon-profile.png">
+      <img class="profile__user--img" :src="imageUrl">
       <div class="profile__card icon-diamond">
         <h1>{{ username }}</h1>
         <h2><img src="@/assets/icons-profile/icon-diamond-ore.png">{{ balance }}</h2>
@@ -57,6 +57,7 @@ import AsideBarComponent from "@/components/AsidebarComponent.vue";
 import ChatComponent from "@/components/ChatComponent.vue";
 import HeaderComponent from "@/components/HeaderComponent.vue";
 import PaymentsModal from "@/components/PaymentsModal.vue";
+import { GetCookie } from "@/assets/js/storage/CookieStorage";
 import '@/assets/css/PagesStyles/profile.css'
 
 export default {
@@ -64,12 +65,17 @@ export default {
   data() {
     return {
       username: 'Artemka',
+      imageUrl: '',
       balance: 25000,
       openModal: false,
       payments: true,
       arrayHistory: [],
     }
   },
+  created() {
+    this.username = GetCookie('SpUserName')
+    this.imageUrl = `https://visage.surgeplay.com/front/256/${this.username}`
+  },
   methods: {
     formatNumber(number) {
       return number < 10 ? `0${number}` : number;