Merge branch 'DevelopMadara'

luckydiamond/package-lock.json

@@ -11,6 +11,7 @@
         "@popperjs/core": "^2.11.8",
         "@vuelidate/core": "^2.0.3",
         "@vuelidate/validators": "^2.0.4",
+        "axios": "^1.6.7",
         "bootstrap": "^5.3.2",
         "core-js": "^3.8.3",
         "howler": "^2.2.4",
@@ -3813,6 +3814,11 @@
         "lodash": "^4.17.14"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -3859,6 +3865,16 @@
         "postcss": "^8.1.0"
       }
     },
+    "node_modules/axios": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
+      "dependencies": {
+        "follow-redirects": "^1.15.4",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/babel-loader": {
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
@@ -4585,6 +4601,17 @@
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commander": {
       "version": "8.3.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
@@ -5366,6 +5393,14 @@
       "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.3.tgz",
       "integrity": "sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ=="
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -6618,10 +6653,9 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
+      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -6637,6 +6671,19 @@
         }
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -8246,7 +8293,6 @@
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "dev": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -8255,7 +8301,6 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dev": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -9823,6 +9868,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",

luckydiamond/package.json

@@ -12,6 +12,7 @@
     "@popperjs/core": "^2.11.8",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
+    "axios": "^1.6.7",
     "bootstrap": "^5.3.2",
     "core-js": "^3.8.3",
     "howler": "^2.2.4",

luckydiamond/src/assets/css/ComponentsStyles/asidebar.css

@@ -20,7 +20,20 @@
     align-items: center;
     height: 100%;
 }
-
+.fotosloti {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 0.1vh;
+}
+.fotosloti a img {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    text-align: center;
+    max-width: 100%;
+    max-height: 100%;
+}
 .menu__content--gamemodes {
     background: rgba(217, 217, 217, 0.12);
     filter: drop-shadow(4px 4px 4px rgba(0, 0, 0, 0.25));

luckydiamond/src/assets/css/ComponentsStyles/chat.css

@@ -41,7 +41,11 @@
     font-size: 18px;
     font-weight: 700;
 }
-
+.chat__mute-button {
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+  }
 /* .content p {
     width: 80%;
     word-wrap: break-word;

luckydiamond/src/assets/css/PagesStyles/profile.css

@@ -2,7 +2,6 @@
     width: 30%;
     margin-left: 3%;
 }
-
 .profile__content .profile__user--img {
     margin: 17.6% 8.4% 1% 0;
     background: #969C8D;
@@ -13,15 +12,20 @@
 .profile__card {
     display: flex;
     flex-direction: column;
+}.hisorypaymond {
+     /* height: 590px; */
+     height: 70vh;
+     width: auto;
+     overflow-y: auto;
+     overflow-x: auto;
+     overflow-y: auto;
 }
-
 .profile__card h1 {
     color: #FFF;
     font-weight: 700;
     font-family: Montserrat;
     font-size: 40px;
 }
-
 .profile__card h2 {
     border-radius: 20px;
     background: #22252F;
@@ -35,47 +39,38 @@
     font-size: 28px;
     padding-left: 11px;
 }
-
 .profile__card h2 img {
     margin-right: 4.4%;
 }
-
 .profile__btns--payments {
     margin-top: 7.9%;
     display: flex;
     flex-direction: column;
 }
-
 .icon-diamond h2 img {
     width: 33px;
     height: 33px;
 }
-
 .deposit-icon {
     margin: 3px 0 0 10px;
 }
-
 .withdraw-icon {
     margin-left: 33px;
 }
-
 .btn-bg {
     border-radius: 10px;
     background: rgba(255, 255, 255, 0.12);
     box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
     width: 36%;
 }
-
 .btn-margin {
     padding: 3.8% 46% 3% 14%;
     margin-bottom: 11px;
     background: #62D4B2;
 }
-
 .btn-display {
     display: flex;
 }
-
 .text-btn {
     text-decoration: none;
     color: #000;
@@ -85,16 +80,23 @@
     font-size: 18px;
     margin-left: 4px;
 }
-
 .icon-margin-deposit-withdraw {
     margin-right: 4px;
 }
-
 .withdraw {
     padding: 3.8% 46% 3% 14%;
     background: #EF4444;
 }
 
+.playerandvid {
+    margin-right: 10vh;
+}
+.data1 {
+    margin-right: 20vh;
+}
+.summa {
+    margin-right: 10vh;
+}
 
 .payments {
     margin: 2% 0 0 -4.25%;
@@ -102,41 +104,47 @@
 
 .types {
     display: flex;
+    
+
 }
 
 .types-margin h3 {
     margin-right: 7.813em;
-}
     
+}
 .types-text h3 {
     color: #ABABB4;
     font-weight: 600;
     font-family: Montserrat;
     font-size: 14px;
 }
-
 .types-line {
+    flex-grow: 1; /* Add this line */
     margin-top: 2.1%;
     background: #38383E;
-    width: 86%;
     height: 3px;
+    width: 100vh;
 }
-
 .payments__card {
     margin-top: 4.9%;
     display: flex;
+    align-items: center; /* Center vertically */
+    justify-content: space-between;
 }
 
 .user-info {
     display: flex;
+    align-items: center; /* Center vertically */
+    margin-right: 1em; /* Add margin for spacing */
+    width: 15vh;
 }
-
 .user-name {
     display: flex;
     flex-direction: column;
     margin-left: 0.625em;
+    align-items: center; /* Center horizontally */
+    margin-top: -0.5em; /* Adjust this value as needed */
 }
-
 .user-name__text h3 {
     color: #FFF;
     font-weight: 700;
@@ -144,26 +152,51 @@
     font-size: 20px;
 }
 
+.user-name1 {
+    display: flex;
+    flex-direction: column;
+    margin-left: 0.625em;
+    align-items: center; /* Center horizontally */
+    margin-top: -0.5em; /* Adjust this value as needed */
+}
+.user-name1__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: 10%;
+    margin-left: 20vh; /* Push to the right */
+    margin-right: auto; /* Push to the left */
 }
-
 .data-info__text h3 {
     color: #A9A9A9;
     font-weight: 400;
     font-family: Montserrat;
     font-size: 17px;
+   
 }
 
 .transaction-info {
-    margin-left: 7%;
+    margin-right: 10em; /* Add margin for spacing */
+    margin-right: 6em; /* Add margin for spacing */
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    width: 1vh;
+    margin-right: 13.5vh;
+}
+.transaction-info__text {
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    width: 13vh;
 }
 
 .transaction-info__text h3 {
@@ -171,63 +204,56 @@
     font-family: Montserrat;
     font-size: 22px;
 }
-
 .deposit-color h3 {
     color: #32C966;
 }
-
 .withdraw-color h3 {
     color: #EA3D38;
+    margin-right: 1vh;
+}
+.withdraw-color1 {
+    margin-left: 1.35em;
 }
-
 .error-deposit {
     position: absolute;
     left: 190px;
     top: 52px;
 }
-
 .error-deposit h2 {
     color: #BA3636;
     font-family: "Montserrat Alternates";
     font-weight: 700;
     font-size: 11px;
 }
-
 .error-card {
     position: absolute;
     top: 130px;
     left: 210px;
 }
-
 .error-card h2 {
     color: #BA3636;
     font-family: "Montserrat Alternates";
     font-weight: 700;
     font-size: 11px;
 }
-
 .error-checkbox h2 {
     color: #BA3636;
     font-family: "Montserrat Alternates";
     font-weight: 700;
     font-size: 11px;
 }
-
 .error-captcha {
     top: 235px;
     left: 45px;
     position: absolute;
 }
-
 .error-captcha h2 {
     color: #BA3636;
     font-family: "Montserrat Alternates";
     font-weight: 700;
     font-size: 13px;
 }
-
 /* Media */
-
 @media screen and (min-device-width: 1400px) and (max-device-width: 1600px) {
     .profile__card h2 {
         width: 72%;
@@ -238,8 +264,66 @@
     .withdraw {
         padding-right: 56%;
     }
-}
+    .withdraw-color h3 {
+        color: #EA3D38;
+        margin-right: 1vh;
+    }
+    .transaction-info {
+        margin-right: 10em; /* Add margin for spacing */
+        margin-right: 6em; /* Add margin for spacing */
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        width: 1vh;
+        margin-right: 8.5vh;
+    }
+    .transaction-info__text {
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        width: 13vh;
+    }
+    .user-name {
+        display: flex;
+        flex-direction: column;
+        margin-left: 0.625em;
+        align-items: center; /* Center horizontally */
+        margin-top: -0.5em; /* Adjust this value as needed */
+    }
+    .user-name__text h3 {
+        color: #FFF;
+        font-weight: 700;
+        font-family: Montserrat;
+        font-size: 20px;
+    }
+    .user-name1 {
+        display: flex;
+        flex-direction: column;
+        margin-left: 0.625em;
+        align-items: center; /* Center horizontally */
+        margin-top: -0.5em; /* Adjust this value as needed */
+    }
+    .user-name1__text h3 {
+        color: #FFF;
+        font-weight: 700;
+        font-family: Montserrat;
+        font-size: 20px;
+    }
+    .data-info {
+        margin-left: 22.5vh; /* Push to the right */
+        margin-right: auto; /* Push to the left */
+    }
+    .data-info__text h3 {
+        color: #A9A9A9;
+        font-weight: 400;
+        font-family: Montserrat;
+        font-size: 17px;
        
+    }
+    .withdraw-color1 {
+        margin-left: 1.35em;
+    }
+}
 @media screen and (min-device-width: 1200px) and (max-device-width: 1399px) {
     .profile__card h2 {
         width: 80%;
@@ -250,6 +334,67 @@
     .withdraw {
         padding-right: 66%;
     }
-}
     
+}
+@media screen and (min-device-width: 1921px) {
+    .withdraw-color h3 {
+        color: #EA3D38;
+        margin-right: 1vh;
+    }
+    .transaction-info {
+        margin-right: 10em; /* Add margin for spacing */
+        margin-right: 6em; /* Add margin for spacing */
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        width: 1vh;
+        margin-right: 20vh;
+    }
+    .transaction-info__text {
+        display: flex;
+        justify-content: center;
+        align-content: center;
+        width: 13vh;
+    }
+    .user-name {
+        display: flex;
+        flex-direction: column;
+        margin-left: 0.625em;
+        align-items: center; /* Center horizontally */
+        margin-top: -0.5em; /* Adjust this value as needed */
+    }
+    .user-name__text h3 {
+        color: #FFF;
+        font-weight: 700;
+        font-family: Montserrat;
+        font-size: 20px;
+    }
+    .user-name1 {
+        display: flex;
+        flex-direction: column;
+        margin-left: 0.625em;
+        align-items: center; /* Center horizontally */
+        margin-top: -0.5em; /* Adjust this value as needed */
+    }
+    .user-name1__text h3 {
+        color: #FFF;
+        font-weight: 700;
+        font-family: Montserrat;
+        font-size: 20px;
+    }
+    .data-info {
+        margin-left: 17vh; /* Push to the right */
+        margin-right: auto; /* Push to the left */
+    }
+    .data-info__text h3 {
+        color: #A9A9A9;
+        font-weight: 400;
+        font-family: Montserrat;
+        font-size: 17px;
+       
+    }
+    .withdraw-color1 {
+        margin-left: 1.35em;
+    }
+}
 /* /Media */

luckydiamond/src/assets/css/PagesStyles/settings.css

@@ -7,3 +7,25 @@
     box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25);
     margin: 10px 39px 18px 13px;
 }
+#volume-control {
+    display: flex;
+    align-items: center;
+  }
+  
+  #volume-up, #volume-down {
+    width: 30px;
+    height: 30px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #fff;
+    cursor: pointer;
+  }
+  
+  #volume-indicator {
+    width: 100px;
+    height: 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    background-color: #ccc;
+  }
+  

luckydiamond/src/assets/icons-gamemodes/jackpot_icon.svg

@@ -1,6 +1,18 @@
 <svg width="209" height="210" viewBox="0 0 209 210" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g filter="url(#filter0_i_2771_7)">
 <rect width="208.019" height="210" fill="url(#pattern0)"/>
+</g>
 <defs>
+<filter id="filter0_i_2771_7" x="0" y="0" width="208.019" height="214" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="4"/>
+<feGaussianBlur stdDeviation="2"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_2771_7"/>
+</filter>
 <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
 <use xlink:href="#image0_2771_7" transform="matrix(0.00197173 0 0 0.00195312 -0.00476189 0)"/>
 </pattern>

luckydiamond/src/assets/icons-menu/slots-icon.svg

@@ -1,21 +1,21 @@
-<svg width="73" height="44" viewBox="0 0 73 44" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="57" height="36" viewBox="0 0 57 36" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="sadasdad 1" filter="url(#filter0_d_644_4)">
+<g filter="url(#filter0_i_3187_2)">
-<rect width="65" height="36" fill="url(#pattern0)" shape-rendering="crispEdges"/>
+<rect width="56.8" height="36" fill="url(#pattern0)"/>
 </g>
 <defs>
-<filter id="filter0_d_644_4" x="0" y="0" width="73" height="44" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_i_3187_2" x="0" y="0" width="56.7998" height="40" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
 <feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dx="4" dy="4"/>
+<feOffset dy="4"/>
 <feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="out"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
 <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_644_4"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_3187_2"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_644_4" result="shape"/>
 </filter>
 <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_644_4" transform="matrix(0.00193643 0 0 0.00354004 0 -0.40625)"/>
+<use xlink:href="#image0_3187_2" transform="matrix(0.00195312 0 0 0.0030816 0 -0.288889)"/>
 </pattern>
-<image id="image0_644_4" width="512" height="512" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIAAQMAAADOtka5AAAAAXNSR0IB2cksfwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAZQTFRFAAAA70RE4n0h2gAAAAJ0Uk5TAP9bkSK1AAAET0lEQVR4nO3bTZKbMBAFYCgWLH2DcBQdDY7GUTgCSy8oFGP+W0J0q41xUu8tUnkV+qsZLH4mA0mCIAiCIAiCIAiCIAiCIAiCIAiCIAiC/JMpe918Zm2tAgprnyqgtFb1PaT2lUoB5APQKIDHALQKoBgAzV40A9ApgHIANB+DfSd+Ph2BKhrIRqCOBvIRaO4DHiMQv5LUQDEC8UtRDZgRiF/LaqAcgfiDYTihqU5qr+Em1wDDcZBpDsfhSEyVwPRHNNC/d8SdQPdeTQDuBe5fB+qlrAd0R6P6hPIC2ocS0J1U778uqIH7L67332Co75HUt3nqG001oL5X1t+tG91K/sBPLOofujLdMkjGj0EzP+xFzT58H06aHxvfe7EBAAAAAAAfB6bbHVYqD5AK5reXkgWQfAHbq+ECGBHQuoBofvM9zEAmA3oHyGXA+jnMQCEEagoYIdBQoBQCLQWE8+uN2QSI1uGQTgv0BBAuA7vemU2AdBk4gOxQGlJpgXoPFN8Hmj1gvg+0HwZKu79pp7fg+z6tGgK0xwNOL9fdsAJNYID24g10G8CSHx5PgMf6PaxAaID2aSdU0UC2roUF6EMDB0AbDUznn+cWCA4cAL0WsPcB81Wg0gK1FmhuB1ot8Lwd6H4OMMtBet7no2kHLCyrFw6QrQcpp+cOMN8kMPv4K7ItMF/jK15PD4Ga2R2gIBuc9fIIaJhdDRgKGHeDsw7gMqDm94uAit8vAgT9GqAXdAcYzlO9pDtAvjkLczo9H+w2OOte4EEGQt0D9MMGT253gAfZ4Kw7QD5er1pu9wBPMhDuDpC+/s0IugMkr78aQXeBP++LRc3tLpCQgZPuBcbDndcvAeZfxLP6VUCfcLsPyMhAsB8AXcLtPiAnA8F+CTAd7rw+n+Y/DbQJt/uAggwE+wHQJNzuAwwZCPYDoE64/RKgJAPBfgBUCbf7AEsGgv0ASBJuvwKYTzi8/jGgXjfIyEC4+4GODAT6DFQfBPL5v+1ZfQbYAwdArwW257zlcQZWN+uHEA0kc6YNiumEw+s/CcxnLF7/VaDidw9QkoFwvwgQdA9gyUC4XwP0gu4CKRk46dcAnaD/IpAtv4xldRcoyMBJdwFLFs5Jd4DN61Ws7gD5fLFn9s8Dm/ezWN0BiuVKx+s/CJhhg07U/zvg659CeTtgtceCAwiPxtQBNg/ucnq+/VVxzBnp4QCbV0453bpAIuh2XZb/NPC8HWgFA9cAjRaotUAVC6SfAiRfsg/o2QMHQLfdIPYxkjhg8yTMskHMszj1DqjkwG6D/WsQJ0BB96H0gSZDDiX3Df4w4Hl/prTy7B7iMrrxGKDZA8X3gXoPxD+fGA1UeyD/PrCflz9mSl+iin9Sdo4UeFKg1AJGCDQUKIRATQHpSqooIF0IdF76OTqfovRj8LzGVYgAZx8KF7P3bcBS9x0gCIIgCIIgCIIgCIIgCIIgCIIgCIIgt+UvVBu5EERv1u4AAAAASUVORK5CYII="/>
+<image id="image0_3187_2" width="512" height="512" xlink:href="data:image/png;base64,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"/>
 </defs>
 </svg>

luckydiamond/src/components/AsidebarComponent.vue

@@ -6,7 +6,7 @@
       </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>
+          <div class="fotosloti"><a href="#"><img  src="../assets/icons-menu/slots-icon.svg" ></a></div>
           <a href="#" @click="$router.push({ name: 'crash' })"><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="#" @click="$router.push({ name: 'saper' })"><img  class="menu__content--bomb-icon" src="../assets/icons-menu/bomb-icon.svg"></a> -->

luckydiamond/src/components/ChatComponent.vue

@@ -31,6 +31,9 @@
       </ul>
     </div>
     <writechat-component @send="ClaimDatamsg"></writechat-component>
+    <div class="chat__mute-button">
+      <button @click="muteChat">Mute</button>
+    </div>
   </aside>
 </template>
 
@@ -72,6 +75,10 @@ export default {
         alert("Вы не можете отправлять сообщения чаще, чем раз в 2 секунды.");
       }
     },
+    muteChat() {
+      // Mute the chat by disabling the event listener for incoming messages.
+      this.eventBus.$off("dataChat");
+    },
   },
   mounted() {
     eventBus.on("dataChat", (dataFromServer) => {
@@ -128,4 +135,5 @@ export default {
 </script>
 
 <style scoped>
+
 </style>

luckydiamond/src/pages/HomePage.vue

@@ -81,7 +81,7 @@
               <ul>
                 <li v-for="mode in twolinefirstelementGameMode" :key="mode">
                   <div :class="'linecontent-' + mode.id">
-                    <h3 class="title-twoline">{{ mode.title }}</h3>
+                    <h3 class="title-twoline">скоро</h3>
                   </div>
                   <div class="container">
                     <a href="#" class="line__btn"

luckydiamond/src/pages/ProfilePage.vue

@@ -2,11 +2,8 @@
   <profilemobile-page v-if="mobile"></profilemobile-page>
   <div class="content__grid-profile" v-else>
     <aside-bar-component></aside-bar-component>
-
     <chat-component></chat-component>
-
     <header-component></header-component>
-
   <section class="profile">
     <div class="profile__content">
       <img class="profile__user--img" :src="imageUrl">
@@ -16,6 +13,7 @@
       </div>
       <div class="profile__btns--payments">
         <a href="#" class="text-btn btn-bg btn-margin btn-display" @click="depositClick"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-deposit.svg"> Пополнить</a>
+        <a href="#" class="withdraw text-btn btn-bg btn-display" @click="claimDataDeposit(1000)"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-withdraw.png"> Вывести</a>
         <a href="#" class="withdraw text-btn btn-bg btn-display" @click="withdrawClick"><img class="icon-margin-deposit-withdraw" src="@/assets/icons-profile/icon-withdraw.png"> Вывести</a>
       </div>
     </div>
@@ -23,19 +21,28 @@
       <div class="payments__content">
         <div class="payments__types">
           <div class="types types-margin types-text">
-            <h3>Игрок и вид транзакции</h3>
+            <div class="playerandvid">
+            <h3>Вид транзакции</h3>
+          </div>
+            <div class="data1">
             <h3>Дата</h3>
+          </div>
+            <div class="summa1">
             <h3>Сумма</h3>
           </div>
+          </div>
           <div class="types-line"></div>
         </div>
+        <div class="hisorypaymond">
         <div class="payments__history">
           <div class="payments__card" v-for="payment in arrayHistory" :key="payment.id">
             <div class="user-info">
               <img src="@/assets/icons-test/person-icon-profile-userinfo.png">
-              <div class="user-name user-name__text">
+              <div class="user-name user-name__text" :class="{ 'withdraw-color1': payment.name }">
                 <h3>{{ payment.name }}</h3>
-                <p>{{ payment.comment }}</p>
+              </div>
+              <div class="user-name1 user-name1__text">
+                <h3>{{ payment.name1 }}</h3>
               </div>
             </div>
             <div class="data-info data-info__text">
@@ -45,7 +52,9 @@
               <h3>{{ payment.amount }} АР</h3>
             </div>
           </div>
-        </div>
+          </div>
+        
+      </div>
       </div>
     </div>
   </section>
@@ -53,19 +62,17 @@
     <notiicationwindow-component @notificationremove="NotificationMethod" :notification="notification"></notiicationwindow-component>
   </div>
 </template>
-
 <script>
 import AsideBarComponent from "@/components/AsidebarComponent.vue";
+import axios from 'axios';
 import ChatComponent from "@/components/ChatComponent.vue";
 import HeaderComponent from "@/components/HeaderComponent.vue";
 import PaymentsModal from "@/components/PaymentsModal.vue";
 import ProfilemobilePage from "@/pages/adaptive-pages/ProfilemobilePage.vue";
 import NotiicationwindowComponent from "@/components/NotiicationwindowComponent.vue";
-
 import { GetCookie } from "@/assets/js/storage/CookieStorage";
 import '@/assets/css/PagesStyles/profile.css'
 import {GetCurrentMoney} from "@/assets/js/rest/RestMethods";
-
 export default {
   components: {ProfilemobilePage, HeaderComponent, AsideBarComponent, ChatComponent, PaymentsModal, NotiicationwindowComponent },
   data() {
@@ -80,18 +87,35 @@ export default {
       arrayHistory: [],
     }
   },
+  
   emits: ['notificationremove'],
   mounted() {
     this.checkWindowSize()
-
     this.AddWindowListener()
   },
   beforeUnmount() {
     this.RemoveWindowListener()
   },
   created() {
+    axios.post('https://spsystemcore20231122004605.azurewebsites.net/api/Payment/GetPaymentHistory', {
+      searchToken: GetCookie('SearchToken'),
+      authtoken: GetCookie('AUTHTOKEN')
+    })
+    .then(response => {
+      // Обработка полученных данных
+      const paymentHistory = response.data.paymentHistory;
+      paymentHistory.forEach(payment => {
+        if (payment.amount > 0) {
+          this.claimDataDeposit(payment.amount,payment.utcDate); // Добавление депозита в историю
+        } else {
+          this.claimDataWithdraw(-payment.amount,payment.utcDate); // Добавление вывода в историю
+        }
+      });
+    })
+    .catch(error => {
+      console.error('Error fetching hisorypaymond:', error);
+    });
     this.username = GetCookie('SpUserName')
-
     GetCurrentMoney(GetCookie('AUTHTOKEN'), GetCookie('SearchToken'))
         .then((response) => {
           this.balance = response.currentMoney
@@ -100,7 +124,6 @@ export default {
         .catch((error) => {
           console.error('error in profile, get money', error)
         })
-
     this.imageUrl = `https://avatar.spworlds.ru/front/256/${this.username}`
   },
   methods: {
@@ -126,26 +149,55 @@ export default {
       const currentDate = new Date();
       return `${this.formatNumber(currentDate.getDate())}.${this.formatNumber(currentDate.getMonth() + 1)}.${currentDate.getFullYear()}, ${this.formatNumber(currentDate.getHours())}:${this.formatNumber(currentDate.getMinutes())}`;
     },
-    claimDataDeposit(amount) {
+    claimDataDeposit(amount, utcDate) {
-      const historyPayments = {
+  const historyPayments = {
-        name: 'TEST USER',
+    name1: 'Пополнение',
-        comment: 'test',
+    data: this.formatTime(utcDate),
-        data: this.getCurrentFormattedDate(),
+    amount: amount
-        amount: amount
+  }
-      }
 
-      this.arrayHistory.unshift(historyPayments)
+  this.arrayHistory.unshift(historyPayments);
-    },
+},
-    claimDataWithdraw(amount) {
-      const historyPayments = {
-        name: 'TEST USER',
-        comment: 'test',
-        data: this.getCurrentFormattedDate(),
-        amount: -amount
-      }
 
-      this.arrayHistory.unshift(historyPayments)
+claimDataWithdraw(amount, utcDate) {
+  const historyPayments = {
+    name: 'Вывод',
+    data: this.formatTime(utcDate),
+    amount: -amount
+  }
+
+  this.arrayHistory.unshift(historyPayments);
+},
+
+formatTime(utcDate) {
+  const dateUTC = new Date(utcDate);
+  const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  const currentTime = new Date();
+  const diffTime = currentTime - dateUTC;
+  const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24));
+  const diffHours = Math.floor(diffTime / (1000 * 60 * 60));
+  const diffMinuts = Math.floor(diffTime/(1000*60));
+
+  if (diffDays < 7)
+  {
+    if (diffDays > 0)
+    {
+      return `${diffDays} ${diffDays === 1 ? 'день' : 'дня'} назад`;
     }
+    else if(diffHours >0)
+    {
+      return `${diffHours} ${diffHours === 1 ? 'час' : 'часа'} назад`;
+    }
+    else{
+      return `${diffMinuts} ${diffMinuts === 1 ? 'минута' : 'минут'} назад`;
+    }
+  }
+  else
+  {
+    return dateUTC.toLocaleString('ru-RU', { timeZone: userTimeZone });
+  }
+}
+
   }
 }
 </script>

luckydiamond/src/pages/SettingsPage.vue

@@ -6,7 +6,16 @@
 
     <header-component></header-component>
 
-  <section class="settings"></section>
+  <section class="settings">
+    
+     <div id="volume-control">
+    <button id="volume-up" @click="volumeUp">+</button>
+    <button id="volume-down" @click="volumeDown">-</button>
+  </div>
+    
+    
+
+  </section>
     
   </div>
 </template>
@@ -19,10 +28,42 @@ import HeaderComponent from "@/components/HeaderComponent.vue";
 import '@/assets/css/PagesStyles/settings.css'
 export default {
   components: {
-  ChatComponent,
+    ChatComponent,
-  HeaderComponent,
+    HeaderComponent,
-  AsideBarComponent
+    AsideBarComponent
-}
+  },
+  methods: {
+    volumeUp() {
+      var volume = document.getElementById("volume-indicator").value;
+      if (volume) {
+        volume += 10;
 
+        if (volume > 100) {
+          volume = 100;
+        }
+
+        document.getElementById("volume-indicator").value = volume;
+      } else {
+        console.error("Element with id 'volume-indicator' not found or does not have a value property.");
+      }
+    },
+    // остальной код метода volumeDown()
+  
+    volumeDown() {
+      // Получить текущий уровень громкости
+      var volume = document.getElementById("volume-indicator").value;
+
+      // Уменьшить уровень громкости на 10%
+      volume -= 10;
+
+      // Убедиться, что уровень громкости не ниже 0%
+      if (volume < 0) {
+        volume = 0;
+      }
+
+      // Установить новый уровень громкости
+      document.getElementById("volume-indicator").value = volume;
+    },
+  },
 }
 </script>