Merge branch 'DevelopCkutls'

luckydiamond/public/index.html

@@ -31,23 +31,5 @@
   <!-- built files will be auto injected -->
 </body>
 <script src='https://www.google.com/recaptcha/api.js'></script>
-<script>
-
-  function get_action(form) {
-    var v = grecaptcha.getResponse();
-    console.log(v);
-    if (v.length == 0) {
-      document.getElementById('captcha').innerHTML = "You can't leave Captcha Code empty";
-
-
-      return false;
-    }
-    else {
-
-      document.getElementById('captcha').innerHTML = "Captcha completed";
-      return true;
-    }
-  }
-</script>
 
 </html>

luckydiamond/src/assets/css/PagesStyles/adaptive-pages/profilemobile.css

@@ -35,6 +35,27 @@ body {
     flex-direction: column;
 }
 
+.profile-mobile__btns-payments a {
+    display: flex;
+    color: #17181C;
+    border-radius: 10px;
+    font-family: Montserrat Alternates;
+    font-size: 18px;
+    font-weight: 700;
+    text-decoration: none;
+    padding: 20px 20px;
+    margin: 0 0 5px 0
+}
+
+.profile-mobile__btns-payments .deposit-button {
+    background: #62D4B2;
+    margin-top: 10px;
+}
+
+.withdraw-button {
+    background: #EF4444;
+}
+
 .text-default-mobile h2, h3 {
     font-weight: 700;
     color: #fff;
@@ -85,3 +106,21 @@ body {
     font-family: Montserrat Alternates;
     font-size: 28px;
 }
+
+@media screen and (max-device-width: 415px) {
+    .header-mobile {
+        height: 45%;
+    }
+    .profile-mobile__content {
+        margin-top: -10%;
+        flex-direction: column;
+        text-align: center;
+        align-items: center;
+    }
+    .macroinfo-profile {
+        margin: 0;
+    }
+    .info-profile {
+        margin: 0;
+    }
+}

luckydiamond/src/components/AsidebarComponent.vue

@@ -2,14 +2,14 @@
   <aside class="menu">
     <div class="menu__content">
       <div class="menu__btn--home">
-        <a href="#"><img width="73" height="73" src="../assets/icons-menu/home-icon.svg"></a>
+        <a href="#" @click="$router.push({ name: 'home' })"><img width="73" height="73" src="../assets/icons-menu/home-icon.svg"></a>
       </div>
       <div class="menu__btns--gamemodes">
         <div class="menu__content--gamemodes">
           <a href="#"><img class="menu__content--slots-icon" src="../assets/icons-menu/slots-icon.svg"></a>
           <a href="#"><img  class="menu__content--cruch-icon" src="../assets/icons-menu/crush-icon.svg"></a>
           <a href="#"><img  src="../assets/icons-menu/case-icon.png"></a>
-          <a href="#"><img  class="menu__content--bomb-icon" src="../assets/icons-menu/bomb-icon.svg"></a>
+          <a href="#" @click="$router.push({ name: 'saper' })"><img  class="menu__content--bomb-icon" src="../assets/icons-menu/bomb-icon.svg"></a>
         </div>
       </div>
       <div class="menu__btn--settings">

luckydiamond/src/components/HeaderComponent.vue

@@ -122,7 +122,7 @@ export default {
             </h2>
           </div>
           <div class="header__btn--wallet">
-            <a href="">кошелёк</a>
+            <a href="#" @click="$router.push({ name: 'profile' })">кошелёк</a>
           </div>
         </div>
       </div>

luckydiamond/src/pages/ProfilePage.vue

@@ -49,7 +49,7 @@
       </div>
     </div>
   </section>
-    <payments-modal v-if="openModal" @notifacetionmoney="NotificationMethod" @closemodal="openModal = false" :payments="payments"></payments-modal>
+    <payments-modal v-if="openModal" @notifacetionmoney="NotificationEventListener" @closemodal="openModal = false" :payments="payments"></payments-modal>
     <notiicationwindow-component @notificationremove="NotificationMethod" :notification="notification"></notiicationwindow-component>
   </div>
 </template>
@@ -112,9 +112,12 @@ export default {
       this.openModal = true
       this.payments = false
     },
-    NotificationMethod() {
+    NotificationEventListener() {
-      this.notification = !this.notification
+      this.notification = true
       this.openModal = false
+    },
+    NotificationMethod() {
+      this.notification = false
     }
     // formatNumber(number) {
     //   return number < 10 ? `0${number}` : number;

luckydiamond/src/pages/adaptive-pages/ProfilemobilePage.vue

@@ -12,8 +12,8 @@
           <h3 class="text-nickname-user">Artmeka</h3>
           <h3 class="balance-border balance-display balance-text"><img src="@/assets/icons-profile/icon-diamond-ore.png">999</h3>
           <div class="profile-mobile__btns-payments">
-            <a href="#"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-deposit.svg"> Пополнить</a>
+            <a href="#" class="deposit-button"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-deposit.svg"> Пополнить</a>
-            <a href="#"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-withdraw.png"> Вывести</a>
+            <a href="#" class="withdraw-button"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-withdraw.png"> Вывести</a>
           </div>
         </div>
       </div>