Adding more mobile features

Adding user in balance page for mobile
Merge pull request #36 from danilt2000/DevelopMadara
2025-12-10 12:19:31 +02:00 · 2024-05-13 13:11:50 +03:00 · 2024-05-13 12:09:10 +03:00 · 2024-05-01 17:37:42 +02:00 · 2024-05-01 18:36:30 +05:00 · 2024-04-29 18:51:04 +02:00
14 changed files with 234 additions and 41 deletions
--- a/luckydiamond/public/index.html
+++ b/luckydiamond/public/index.html
@@ -21,6 +21,15 @@
  <link rel="stylesheet" href="dist/css/bootstrap-grid.min.css" />
  <link rel="stylesheet" href="//cdn.jsdelivr.net/gh/dmhendricks/bootstrap-grid-css@4.1.3/dist/css/bootstrap-grid.min.css" />
  <title>LuckyDiamond</title>
+  <meta property="og:title" content="LuckyDiamond" />
+  <meta property="og:type" content="rich" />
+  <meta property="og:url" content="lucky-diamonds.ru" />
+  <meta property="og:image" content="https://cdn.discordapp.com/attachments/1208431882044448769/1208432176614604820/Logo.png?ex=662dbfea&is=662c6e6a&hm=840608b1659515ab1103ef63aa041146bb89c204408ff9e880b984ca6aa17b13&" />
+  <meta property="og:description"
+        content="Лучшее онлайн-казино на сервере СПм" />
+  <meta property="og:locale" content="ru_RU" />
+  <meta property="og:site_name" content="lucky-diamonds.ru" />
+  <meta name="robots" content="all">
 </head>

 <body>
@@ -39,4 +48,4 @@
 <script src="https://cdn.jsdelivr.net/npm/@vuelidate/core"></script>
 <script src="https://cdn.jsdelivr.net/npm/@vuelidate/validators"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
-</html>
+</html>
--- a/luckydiamond/src/assets/css/ComponentsStyles/developer.css
+++ b/luckydiamond/src/assets/css/ComponentsStyles/developer.css
@@ -508,7 +508,7 @@
 .busha888_card {
    width: 422px;
    height: 269px;
-    flex-shrink: 0;
+    
    border-radius: 22px;
    border: 3px solid #595959 ;
    border-color: #595959;
@@ -519,7 +519,7 @@
 }

 .text {
-    width: 211px;
+    width: 200px;
    height: 269px;

 
@@ -534,7 +534,7 @@
    font-family: 'Montserrat';
    color: white;
    font-size: 14px;
-    width: 97px;
+    width: 200px;
    height: 16px;
 }
 .aboutinfo h1 {
@@ -579,13 +579,14 @@
    
 }
 .skin {
-    margin-right: 13px;
    margin-top: 51px;
    margin-bottom: 3px;
-    
-    
+    display: flex;
+    width: 212px;
+    height: 212px;
 }
 .skin img {
+   
    width: 212px;
    height: 212px;
 }
--- a/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css
+++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css
@@ -20,7 +20,12 @@
    margin-left: 1vh;
    margin-top: 2.4vh;
  }
-
+.IstoriaMenedger {
+    margin-left: 85px;
+    margin-top: 7px;
+    width: 30px;
+    height: 30px;
+}
 .jackpot-loading-bar {
    z-index: 1;
    /* margin-left: 5%; */
@@ -387,4 +392,10 @@
        padding-left: 0;
        padding-right: 0;
    }
+    .IstoriaMenedger {
+        margin-left: 20px;
+        margin-top: 7px;
+        width: 30px;
+        height: 30px;
+    }
 }
--- a/luckydiamond/src/assets/css/PagesStyles/profile.css
+++ b/luckydiamond/src/assets/css/PagesStyles/profile.css
@@ -275,6 +275,9 @@
    .withdraw {
        padding-right: 56%;
    }
+    .referal {
+        padding-right: 56%;
+    }
    .withdraw-color h3 {
        color: #EA3D38;
        margin-right: 1vh;
@@ -345,6 +348,9 @@
    .withdraw {
        padding-right: 66%;
    }
+    .referal {
+        padding-right: 66%;
+    }
    
 }
@media screen and (min-device-width: 1921px) {
--- a/luckydiamond/src/assets/icons-developcard/video
+++ b/luckydiamond/src/assets/icons-developcard/video
--- a/luckydiamond/src/assets/icons-games/double-game/Vector.svg
+++ b/luckydiamond/src/assets/icons-games/double-game/Vector.svg
@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 14.9717C30.0153 23.2362 23.2754 29.9942 15.0109 30C11.4414 30.0025 8.16271 28.7583 5.58616 26.6788C4.91619 26.138 4.8661 25.1339 5.47493 24.5251L6.15641 23.8436C6.67711 23.3229 7.5084 23.266 8.0853 23.7236C9.98358 25.23 12.3859 26.1291 15 26.1291C21.1515 26.1291 26.129 21.1506 26.129 15C26.129 8.8485 21.1505 3.87098 15 3.87098C12.0475 3.87098 9.36598 5.0183 7.37491 6.89106L10.4447 9.96087C11.0544 10.5705 10.6226 11.6129 9.76046 11.6129H0.967741C0.433246 11.6129 0 11.1797 0 10.6452V1.85244C0 0.990304 1.04238 0.558509 1.65205 1.16813L4.63826 4.15434C7.33118 1.58081 10.981 0 15 0C23.2748 0 29.9847 6.70042 30 14.9717ZM19.0577 19.7368L19.6519 18.9729C20.1441 18.3401 20.0301 17.428 19.3972 16.9359L16.9355 15.0211V8.70969C16.9355 7.90798 16.2856 7.25808 15.4839 7.25808H14.5161C13.7144 7.25808 13.0645 7.90798 13.0645 8.70969V16.9144L17.0207 19.9915C17.6535 20.4836 18.5655 20.3697 19.0577 19.7368Z" fill="#B8B8B8"/>
+</svg>
--- a/luckydiamond/src/components/DevelopComponent.vue
+++ b/luckydiamond/src/components/DevelopComponent.vue
@@ -163,7 +163,7 @@
      <div class="text">
        <div class="aboutinfo">
          <p>Фронтэндер</p>
-          <h1>busha888</h1>
+          <h1>Madara0330H</h1>
        </div>
        <div class="whatjob">
          <img src="@/assets/icons-developcard/html.png" alt="html">
@@ -172,12 +172,12 @@
        <div class="icons">
          <a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" target="_blank" ><img src="@/assets/icons-developcard/odniclasniki.png" alt=""></a>
          <a href="https://t.me/Slayyyyyyyyyyyyyyyyy" target="_blank" ><img src="@/assets/icons-developcard/telegram.png" alt=""></a>
-          <a href="https://www.youtube.com/@busha1/featured" target="_blank" ><img src="@/assets/icons-developcard/like.png" alt=""></a>
+          <a href="https://www.youtube.com/" target="_blank" ><img src="@/assets/icons-developcard/like.png" alt=""></a>
          <a href="https://github.com/Madara0330E" target="_blank" ><img src="@/assets/icons-developcard/github.png" alt=""></a>
        </div>
      </div>
      <div class="skin">
-        <img src="https://avatar.spworlds.ru/front/212/busha888.png" alt="">
+        <img src="https://avatar.spworlds.ru/front/212/Madara0330H.png" alt="">
        </div>
    </div>
    <div class="CLARFFY_card">
--- a/luckydiamond/src/components/NotiicationwindowComponent.vue
+++ b/luckydiamond/src/components/NotiicationwindowComponent.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="notification" v-if="notification">
    <div class="notification__content">
-      <h3>Операция вывода отправлена</h3>
+      <h3>{{ text }}</h3>
    </div>
  </div>
 </template>
@@ -11,7 +11,8 @@ import '@/assets/css/ComponentsStyles/notification.css'

 export default {
  props: {
-    notification: Boolean
+    notification: Boolean,
+    text: String,
  },
  emits: ['notificationremove'],
  methods: {
--- a/luckydiamond/src/components/adaptive-components/HeaderMobileComponent.vue
+++ b/luckydiamond/src/components/adaptive-components/HeaderMobileComponent.vue
@@ -8,7 +8,7 @@
        <div class="header-mobile__balance">
          <div class="header-mobile__balance--content">
            <div class="header-mobile__card card-display card-text card-img">
-              <h2><img src="@/assets/icons-adaptive/home-adaptive/icon-diamond-ore.png">999</h2>
+              <h2><img src="@/assets/icons-adaptive/home-adaptive/icon-diamond-ore.png">{{ this.balance}}</h2>
            </div>
            <div class="header-mobile__btn--balance btn-card btn-card__margin">
              <a href="#" @click="$router.push({ name: 'profile' })"><img src="@/assets/icons-adaptive/home-adaptive/icon-wallet.svg"></a>
@@ -16,7 +16,7 @@
          </div>
        </div>
        <div class="header-mobile__user-icon user-icon">
-          <img src="@/assets/icons-test/person-icon-profile-userinfo.png">
+          <img :src="this.imageUrl">
        </div>
      </div>
    </div>
@@ -25,8 +25,117 @@

 <script>
 import '@/assets/css/ComponentsStyles/AdaptiveStyles/headermobile.css'
-export default {
+import { LogIn } from "@/assets/js/authentication/AuthService.js";
+import { GetCurrentMoney } from "@/assets/js/rest/RestMethods.js";

+import { eventBus } from "@/main";
+
+import {
+  SetCookie,
+  GetCookie,
+  DeleteAllCookie,
+} from "@/assets/js/storage/CookieStorage.js";
+export default {
+  methods: {
+    logout() {
+      this.auth = false;
+      this.balance = 0;
+      this.authtoken = "";
+      DeleteAllCookie();
+    },
+    updateBalanceMethod() {
+      GetCurrentMoney(GetCookie("AUTHTOKEN"), GetCookie("SearchToken")).then(
+        (response) => {
+          this.balance = response.currentMoney;
+        }
+      );
+      eventBus.emit("Updatebalance-saper");
+    },
+  },
+  data() {
+    return {
+      balance: 0,
+      auth: false,
+      authtoken: "",
+      imageUrl: "https://avatar.spworlds.ru/face/55/",
+      userName: "",
+    };
+  },
+  mounted() {
+    eventBus.on("Updatebalance", () => {
+      this.updateBalanceMethod();
+    });
+  },
+  created() {
+    try {
+      let authCode = this.$route.query.code;
+
+      if (authCode) {
+        LogIn(authCode)
+          .then((response) => {
+            SetCookie("UserId", response.userId);
+            SetCookie("SpUserName", response.spUserName);
+            SetCookie("AUTHTOKEN", response.authtoken);
+            SetCookie("SearchToken", response.searchToken);
+
+            this.imageUrl = this.imageUrl + `${response.spUserName}.png`;
+            this.userName = response.spUserName;
+            this.auth = true;
+            this.authtoken = response.authtoken;
+            GetCurrentMoney(GetCookie("AUTHTOKEN"), GetCookie("SearchToken"))
+              .then((response) => {
+                this.balance = response.currentMoney;
+              })
+              .catch((error) => {
+                console.error(error);
+              });
+          })
+          .catch(() => {
+            let currentUserName = GetCookie("SpUserName");
+            GetCurrentMoney(GetCookie("AUTHTOKEN"), GetCookie("SearchToken"))
+              .then((response) => {
+                this.balance = response.currentMoney;
+                console.log(response);
+              })
+              .catch((error) => {
+                console.error(error);
+              });
+
+            if (currentUserName) {
+              this.imageUrl = this.imageUrl + `${currentUserName}.png`;
+              this.userName = GetCookie("SpUserName");
+              this.auth = true;
+              this.authtoken = GetCookie("AUTHTOKEN");
+            } else {
+              this.auth = false;
+              this.balance = 0;
+            }
+          });
+      } else {
+        let currentUserName = GetCookie("SpUserName");
+        GetCurrentMoney(GetCookie("AUTHTOKEN"), GetCookie("SearchToken"))
+          .then((response) => {
+            this.balance = response.currentMoney;
+          })
+          .catch((error) => {
+            // Обработка ошибки
+            console.error(error);
+          });
+
+        if (currentUserName) {
+          this.imageUrl = this.imageUrl + `${currentUserName}.png`;
+          this.userName = GetCookie("SpUserName");
+          this.auth = true;
+          this.authtoken = GetCookie("AUTHTOKEN");
+        } else {
+          this.auth = false;
+          this.balance = 0;
+        }
+      }
+    } catch (error) {
+      console.error("Auth Code error:", error);
+    }
+  },
 }
 </script>

--- a/luckydiamond/src/components/adaptive-components/MenuMobileComponent.vue
+++ b/luckydiamond/src/components/adaptive-components/MenuMobileComponent.vue
@@ -2,12 +2,18 @@
  <footer class="footer-mobile">
    <div class="footer-mobile__content">
      <div class="footer-mobile__icons icons-size">
-        <a href="#"><img class="icon-start" src="@/assets/icons-adaptive/home-adaptive/icon-home-menu.png"></a>
+        <a href="#" @click="$router.push({ name: 'home' })"><img class="icon-start" src="@/assets/icons-adaptive/home-adaptive/icon-home-menu.png"></a>
        <a href="#" @click="$router.push({ name: 'profile' })"><img class="icon-center" src="@/assets/icons-adaptive/home-adaptive/icon-wallet-menu.svg"></a>
-        <a href="#"><img class="icon-center" src="@/assets/icons-adaptive/home-adaptive/icon-chat-menu.png"></a>
-        <a href="#"><img class="icon-center" src="@/assets/icons-adaptive/home-adaptive/icon-info-menu.png"></a>
-        <a href="#"><img class="icon-end" src="@/assets/icons-adaptive/home-adaptive/icon-menu.png"></a>
+        <a href="#" @click="this.chatOpened = !this.chatOpened"><img class="icon-center" src="@/assets/icons-adaptive/home-adaptive/icon-chat-menu.png"></a>
+        <a href="#" @click="$router.push({ name: 'about'})"><img class="icon-center" src="@/assets/icons-adaptive/home-adaptive/icon-info-menu.png"></a>
+
+
+        <a href="#" @click="this.menuOpened = !this.menuOpened"><img class="icon-end" src="@/assets/icons-adaptive/home-adaptive/icon-menu.png"></a>
      </div>
+      <notiicationwindow-component @notificationremove="NotificationMethod" :notification="menuOpened == true" :text="Тест"></notiicationwindow-component>
+      <div class="chat-component" v-if="chatOpened == true">
+        <chat-component></chat-component>
+      </div>  
    </div>
  </footer>
 </template>
@@ -15,7 +21,12 @@
 <script>
 import '@/assets/css/ComponentsStyles/AdaptiveStyles/menumobile.css'
 export default {
-
+  data() {
+    return {
+      chatOpened: false,
+      menuOpened: false
+    }
+  }
 }
 </script>

--- a/luckydiamond/src/pages/ProfilePage.vue
+++ b/luckydiamond/src/pages/ProfilePage.vue
@@ -60,7 +60,7 @@
  </section>
    <referal-modal v-if="openRef" @notifacetionmoney="NotificationEventListener" @closemodal="openRef = false"></referal-modal>
    <payments-modal v-if="openModal" @notifacetionmoney="NotificationEventListener" @closemodal="openModal = false" :payments="payments"></payments-modal>
-    <notiicationwindow-component @notificationremove="NotificationMethod" :notification="notification"></notiicationwindow-component>
+    <notiicationwindow-component @notificationremove="NotificationMethod" :notification="notification" text="Операция проведена успешно"></notiicationwindow-component>
  </div>
 </template>
 <script>
--- a/luckydiamond/src/pages/adaptive-pages/ProfilemobilePage.vue
+++ b/luckydiamond/src/pages/adaptive-pages/ProfilemobilePage.vue
@@ -6,10 +6,10 @@
      <div class="profile-mobile__content">
        <div class="macroinfo-profile text-default-mobile img-margin">
          <h2>Профиль</h2>
-          <img src="@/assets/icons-test/person-icon-profile-userinfo.png">
+          <img :src="this.imageUrl">
        </div>
        <div class="info-profile">
-          <h3 class="text-nickname-user">Artmeka</h3>
+          <h3 class="text-nickname-user">{{this.userName}}</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="#" @click="paymetsCall('dep')" class="deposit-button"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-deposit.svg"> Пополнить</a>
@@ -24,22 +24,16 @@
 </template>

 <script>
+import { GetCurrentMoney } from "@/assets/js/rest/RestMethods";
+import { GetCookie } from "@/assets/js/storage/CookieStorage";
 import HeaderMobileComponent from "@/components/adaptive-components/HeaderMobileComponent.vue";
 import MenuMobileComponent from "@/components/adaptive-components/MenuMobileComponent.vue";
 import PaymentsMobile from "@/components/adaptive-components/PaymentsMobile.vue";
-
+import {eventBus} from "@/main"
 import '@/assets/css/PagesStyles/adaptive-pages/profilemobile.css'

 export default {
-  components: { HeaderMobileComponent, MenuMobileComponent, PaymentsMobile },
-  data () {
-    return {
-      payments: {
-        paymentsWindow: false,
-        paymentsView: false
-      },
-    }
-  },
+  
  methods: {
    paymetsCall(view) {
      this.payments.paymentsWindow = true
@@ -47,8 +41,49 @@ export default {
    },
    paymentsClose() {
      this.payments.paymentsWindow = false
-    }
-  }
+    },
+  },
+  data() {
+    return {
+      balance: 0,
+      auth: false,
+      authtoken: "",
+      imageUrl: "https://avatar.spworlds.ru/face/55/",
+      userName: "",
+      payments: {
+        paymentsWindow: false,
+        paymentsView: false
+      },
+    };
+  },
+  mounted() {
+    eventBus.on("Updatebalance", () => {
+      this.updateBalanceMethod();
+    });
+  },
+  created() {
+        let currentUserName = GetCookie("SpUserName");
+        GetCurrentMoney(GetCookie("AUTHTOKEN"), GetCookie("SearchToken"))
+          .then((response) => {
+            this.balance = response.currentMoney;
+          })
+          .catch((error) => {
+            // Обработка ошибки
+            console.error(error);
+          });
+
+        if (currentUserName) {
+          this.imageUrl = this.imageUrl + `${currentUserName}.png`;
+          this.userName = GetCookie("SpUserName");
+          this.auth = true;
+          this.authtoken = GetCookie("AUTHTOKEN");
+        } else {
+          this.auth = false;
+          this.balance = 0;
+        }
+      
+  },
+  components: { HeaderMobileComponent, MenuMobileComponent, PaymentsMobile },
 }
 </script>

--- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue
+++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue
@@ -138,7 +138,6 @@ export default {
        const dataCrashParse = JSON.parse(dataCrash)

        this.crashObject = dataCrashParse
-        // console.log(this.crashObject)
      }
      catch (e) {
       console.error(e)
@@ -146,7 +145,9 @@ export default {

      if (this.crashObject.Status === 'GameEnd' && this.startGame === true && this.crashObject.Players.some(player => player.UserName === GetCookie('SpUserName'))) {
        this.startGame = false
-        this.updateUserMoney()
+        setTimeout(() => {
+        this.updateUserMoney();
+    }, 3000);
      }
      if (
          this.crashObject.Players.some(player =>
@@ -304,8 +305,9 @@ export default {
            .then((response) => {
              console.log(response)
              this.startGame = false
-
-              this.updateUserMoney()
+              setTimeout(() => {
+        this.updateUserMoney();
+    }, 3000);
            })
      }
    },
--- a/luckydiamond/src/pages/games-pages/JackpotPage.vue
+++ b/luckydiamond/src/pages/games-pages/JackpotPage.vue
@@ -50,7 +50,12 @@
            <img src="@/assets/icons-games/double-game/info.svg" alt="" />
         </a>
        </div>
-          
+          <div class="IstoriaMenedger">
+            
+              <a href="#" @click="$router.push({ name: 'jackpot-history' })"><img  class="IstoriaMenedger" src="@/assets/icons-games/double-game/Vector.svg"></a>
+              
+           
+          </div>
        </div>
          <p>Больше ставь, больше побеждай!</p>
Author	SHA1	Message	Date
Dmitriy yawaflua Andreev	bded15f76d	Adding more mobile features	2024-05-13 13:11:50 +03:00
Dima yawaflua Andreev	108709b24f	Adding user in balance page for mobile	2024-05-13 12:09:10 +03:00
Hepatica	850a62626f	Merge pull request #36 from danilt2000/DevelopMadara he remembered Nick in a game , and he remembered Nick in a game.	2024-05-01 17:37:42 +02:00
Madara0330E	2a37eea433	he remembered Nick in a game , and he remembered Nick in a game. he remembered Nick in a game , and he remembered Nick in a game.	2024-05-01 18:36:30 +05:00
Hepatica	a8a3e73004	turn on site	2024-04-29 18:51:04 +02:00
Hepatica	cab760e151	Merge pull request #34 from yawaflua/patch-1 Update index.html	2024-04-27 21:00:31 +02:00
rafael1209	aed79c1bfb	turn off	2024-04-27 21:27:10 +03:00
Dima yawaflua Andreev	e1e0e38d2f	Update index.html	2024-04-27 17:46:46 +03:00
Hepatica	bf7746abfd	Merge pull request #35 from danilt2000/DevelopMadara Change url for madara card in about page	2024-04-27 12:35:20 +02:00
Madara0330E	27fc9df170	ghfhfh hgfhh	2024-04-27 15:32:22 +05:00
Dima yawaflua Andreev	be025b54cf	Update index.html	2024-04-27 00:03:40 +03:00
Rafael Chasman	e5bca083f3	Merge pull request #33 from danilt2000/DevelopMadara выаыаыаыауккк	2024-04-24 22:16:58 +03:00
Madara0330E	f8f15ada28	выаыаыаыауккк	2024-04-24 21:35:17 +05:00
Hepatica	4648607e3a	add timer for updating game money on crash	2024-04-21 16:11:26 +02:00
Hepatica	70b8937ef3	add timer for updating balance on crash	2024-04-21 15:59:53 +02:00
Hepatica	c7671237e1	delete console log	2024-04-21 15:50:44 +02:00
Hepatica	f2573a5f3b	Revert "Add checking for correct status in crash game" This reverts commit `3912f4c313`.	2024-04-21 15:31:04 +02:00
Hepatica	3912f4c313	Add checking for correct status in crash game	2024-04-21 15:27:25 +02:00
Swino4ka	6ab6c881b4	Merge pull request #31 from danilt2000/Swino4ka added spacebar	2024-04-18 12:33:02 +02:00
Swino4ka	8d84a39351	Merge pull request #30 from danilt2000/Swino4ka Added professions to mine card, fixed some code	2024-04-18 12:31:29 +02:00
Swino4ka	9ac77a2fe0	Merge pull request #29 from danilt2000/Swino4ka Reverted, fixed problems	2024-04-17 22:14:36 +02:00
Swino4ka	8f083fb7d2	Merge pull request #28 from danilt2000/Swino4ka Deleted crash history	2024-04-17 18:26:49 +02:00
Swino4ka	ed3e5b6a93	Merge pull request #27 from danilt2000/Swino4ka Swino4ka	2024-04-17 18:21:40 +02:00