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
8 changed files with 201 additions and 35 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>
--- 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/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,11 +2,17 @@
  <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>
@@ -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>
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