From 18a36fb8a8833c888e96f85675590ee684060428 Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:28:32 +0200
Subject: [PATCH 01/18] Update README.md
---
README.md | 31 +++++++------------------------
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index b0dbb36..0bcbec6 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,13 @@
+# Проект "Lucky Diamond Casino"
+Сайт Онлайн-Казино на игровую валюту Майнкрафт сервера СПМ.
+## Важные ссылки
+[Документация SPWorlds](https://github.com/sp-worlds/api-docs)
+[DiscordAPI](https://discord.com/developers/docs/topics/oauth2#oauth2)
-
-
-
-
-
-
-
+[Отображение головы](https://visage.surgeplay.com/index.html)
-
-Важные ссылки
-Отображение головы
-https://visage.surgeplay.com/index.html
-
- 
-Sp api
-https://github.com/sp-worlds/api-docs
-Discord api
- https://discord.com/developers/docs/topics/oauth2#oauth2
-
-
-Откуда берём вдохновление
- https://cs.fail/en/
-
-
-
+[Вдохновление](https://cs.fail/en/)
From b46c626ed069ab036299e5434df6d17328001c1a Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:29:55 +0200
Subject: [PATCH 02/18] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0bcbec6..fe5776a 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,6 @@
[DiscordAPI](https://discord.com/developers/docs/topics/oauth2#oauth2)
-[Отображение головы](https://visage.surgeplay.com/index.html)
+[Отображение Скинов](https://visage.surgeplay.com/index.html)
[Вдохновление](https://cs.fail/en/)
From 3423b90d9df5ec6094926c9aa496f0d32b381b7e Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:43:28 +0200
Subject: [PATCH 03/18] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index fe5776a..c815c38 100644
--- a/README.md
+++ b/README.md
@@ -11,3 +11,4 @@
[Отображение Скинов](https://visage.surgeplay.com/index.html)
[Вдохновление](https://cs.fail/en/)
+
From d98d3c3206e5c1afc61f713c4cafe6c8cde6a5d7 Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:44:57 +0200
Subject: [PATCH 04/18] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index c815c38..5488231 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
# Проект "Lucky Diamond Casino"
Сайт Онлайн-Казино на игровую валюту Майнкрафт сервера СПМ.
From 64e308c71e79f8651a56333988c0d0dfa5562d5e Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:09:45 +0200
Subject: [PATCH 05/18] Update README.md
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index 5488231..adf24db 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,6 @@
[Вдохновление](https://cs.fail/en/)
+## Наша Команда
+
+
From bbd5b07ed1cd112c9034290addc0469c44871832 Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 15:27:57 +0200
Subject: [PATCH 06/18] Update README.md
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
index adf24db..efc1304 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,11 @@
Сайт Онлайн-Казино на игровую валюту Майнкрафт сервера СПМ.
+## Вклад и Разработка
+
+Если вы хотите дополнить или улучшить визуал нашего сайта, то сделайте pull запрос к этому репозиторию.
+
+
## Важные ссылки
[Документация SPWorlds](https://github.com/sp-worlds/api-docs)
From b347c2225d55f0a14e0f86abae960cb98e00bf8d Mon Sep 17 00:00:00 2001
From: Kostya
Date: Mon, 29 Jan 2024 22:36:47 +0300
Subject: [PATCH 07/18] fixed bug with clicked on btn and input
---
.../src/pages/games-pages/SapergamePage.vue | 52 +++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue
index 95d6486..7db371d 100644
--- a/luckydiamond/src/pages/games-pages/SapergamePage.vue
+++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue
@@ -227,8 +227,60 @@ export default {
}
},
watch: {
+ amountDeposit(DepositCount) {
+ if (![1, 5, 10, 50, 100, parseInt(this.balance)].includes(DepositCount)) {
+ this.clickedBtn = null
+ }
+ else {
+ let index
+ switch (DepositCount) {
+ case 1:
+ index = 0
+ break
+ case 5:
+ index = 1
+ break
+ case 10:
+ index = 2
+ break
+ case 50:
+ index = 3
+ break
+ case 100:
+ index = 4
+ break
+ case parseInt(this.balance):
+ index = 5
+ break
+ }
+
+ this.clickedBtnChoice(index, DepositCount)
+ }
+ },
async amountCrystals(CrystalsCount) {
this.PercentageGameSteps = []
+ if (![1, 5, 10, 24].includes(CrystalsCount)) {
+ this.clickedBtnCrystal = null
+ }
+ else {
+ let index
+ switch (CrystalsCount) {
+ case 1:
+ index = 0
+ break
+ case 5:
+ index = 1
+ break
+ case 10:
+ index = 2
+ break
+ case 24:
+ index = 3
+ break
+ }
+ this.clickedBtnCrystals(index, CrystalsCount)
+ }
+
if (CrystalsCount >= 1 && CrystalsCount <= 24) {
try {
await GetPercentageSteps(this.amountCrystals)
From dead4e8c2ae9ba785b6a80e23061be47dc215502 Mon Sep 17 00:00:00 2001
From: Hepatica
Date: Mon, 29 Jan 2024 21:51:56 +0100
Subject: [PATCH 08/18] fix InsertSpaceEvery24Chars
---
luckydiamond/src/components/WritechatComponent.vue | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/luckydiamond/src/components/WritechatComponent.vue b/luckydiamond/src/components/WritechatComponent.vue
index ead608a..3daa1e8 100644
--- a/luckydiamond/src/components/WritechatComponent.vue
+++ b/luckydiamond/src/components/WritechatComponent.vue
@@ -46,13 +46,16 @@ export default {
this.$emit("send", [formattedWord, this.username, this.icon]);
this.msg = "";
},
-
- InsertSpaceEvery24Chars(word) {
+
+ InsertSpaceEvery24Chars(text) {
let result = "";
- for (let i = 0; i < word.length; i += 22) {
- result += word.substring(i, i + 22) + " ";
+ for (let i = 0; i < text.length; i++) {
+ if (i > 0 && i % 24 === 0) {
+ result += " ";
+ }
+ result += text[i];
}
- return result.trim();
+ return result;
},
},
};
From ff80ad7185ae5fc2b81e30b57962dd60d438e75a Mon Sep 17 00:00:00 2001
From: Hepatica
Date: Mon, 29 Jan 2024 22:05:15 +0100
Subject: [PATCH 09/18] Add word break
---
.../src/assets/css/ComponentsStyles/chat.css | 1 +
.../src/components/WritechatComponent.vue | 24 +++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css
index 87ef473..19b2d4e 100644
--- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css
+++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css
@@ -18,6 +18,7 @@
.chat {
margin: 1% 3.2% 0 0;
+ word-break: break-all;
}
.chat__content {
diff --git a/luckydiamond/src/components/WritechatComponent.vue b/luckydiamond/src/components/WritechatComponent.vue
index 3daa1e8..78fba92 100644
--- a/luckydiamond/src/components/WritechatComponent.vue
+++ b/luckydiamond/src/components/WritechatComponent.vue
@@ -42,21 +42,21 @@ export default {
}
},
SendmsgData() {
- const formattedWord = this.InsertSpaceEvery24Chars(this.msg);
- this.$emit("send", [formattedWord, this.username, this.icon]);
+ // const formattedWord = this.InsertSpaceEvery24Chars(this.msg);
+ this.$emit("send", [this.msg, this.username, this.icon]);
this.msg = "";
},
- InsertSpaceEvery24Chars(text) {
- let result = "";
- for (let i = 0; i < text.length; i++) {
- if (i > 0 && i % 24 === 0) {
- result += " ";
- }
- result += text[i];
- }
- return result;
- },
+ // InsertSpaceEvery24Chars(text) {
+ // let result = "";
+ // for (let i = 0; i < text.length; i++) {
+ // if (i > 0 && i % 24 === 0) {
+ // result += " ";
+ // }
+ // result += text[i];
+ // }
+ // return result;
+ // },
},
};
From 8c78e74c9fb4168d3bc37958f3cd88b11850466f Mon Sep 17 00:00:00 2001
From: Kostya
Date: Tue, 30 Jan 2024 00:09:59 +0300
Subject: [PATCH 10/18] fixed bug with max-btn
---
.../src/pages/games-pages/SapergamePage.vue | 35 ++++++++++++++++---
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue
index 7db371d..1ac0277 100644
--- a/luckydiamond/src/pages/games-pages/SapergamePage.vue
+++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue
@@ -235,19 +235,44 @@ export default {
let index
switch (DepositCount) {
case 1:
- index = 0
+ if (parseInt(this.balance) === DepositCount) {
+ index = 5
+ }
+ else {
+ index = 0
+ }
break
case 5:
- index = 1
+ if (parseInt(this.balance) === DepositCount) {
+ index = 5
+ }
+ else {
+ index = 1
+ }
break
case 10:
- index = 2
+ if (parseInt(this.balance) === DepositCount) {
+ index = 5
+ }
+ else {
+ index = 2
+ }
break
case 50:
- index = 3
+ if (parseInt(this.balance) === DepositCount) {
+ index = 5
+ }
+ else {
+ index = 3
+ }
break
case 100:
- index = 4
+ if (parseInt(this.balance) === DepositCount) {
+ index = 5
+ }
+ else {
+ index = 4
+ }
break
case parseInt(this.balance):
index = 5
From a57057911fad7225c24fd25d20c6b0aacfe44e69 Mon Sep 17 00:00:00 2001
From: Hepatica
Date: Mon, 29 Jan 2024 22:17:20 +0100
Subject: [PATCH 11/18] Change style for chat
---
luckydiamond/src/assets/css/ComponentsStyles/chat.css | 3 ++-
luckydiamond/src/assets/css/global.css | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css
index 19b2d4e..32f6ef6 100644
--- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css
+++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css
@@ -56,7 +56,8 @@
}
.chat__content--users {
- height: 590px;
+ /* height: 590px; */
+ height: 70vh;
width: auto;
overflow-y: auto;
overflow-x: auto;
diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css
index 2fa6e95..98d2c4f 100644
--- a/luckydiamond/src/assets/css/global.css
+++ b/luckydiamond/src/assets/css/global.css
@@ -107,7 +107,7 @@ body, html {
background: #16171B;
filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25));
border-radius: 20px;
- height: 90%;
+ height: 99%;
position: relative;
z-index: 3;
}
From 904b1cd9faba6b1d8855c3687b7c875c3c8c763e Mon Sep 17 00:00:00 2001
From: Hepatica
Date: Mon, 29 Jan 2024 22:25:58 +0100
Subject: [PATCH 12/18] change styles
---
luckydiamond/src/assets/css/global.css | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css
index 98d2c4f..3e048ac 100644
--- a/luckydiamond/src/assets/css/global.css
+++ b/luckydiamond/src/assets/css/global.css
@@ -106,8 +106,9 @@ body, html {
grid-area: chat;
background: #16171B;
filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25));
- border-radius: 20px;
- height: 99%;
+ border-radius: 0;
+ /* border-radius: 20px; */
+ height: 100%;
position: relative;
z-index: 3;
}
From b9821a627a271e9e1b41a96c1a680b6b95ec582d Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Mon, 29 Jan 2024 23:36:45 +0200
Subject: [PATCH 13/18] Update README.md
---
README.md | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/README.md b/README.md
index efc1304..1df3431 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,27 @@
Если вы хотите дополнить или улучшить визуал нашего сайта, то сделайте pull запрос к этому репозиторию.
+### Запуск Проекта
+
+- Переход к папке проекта:
+`cd LuckyDiamond/luckydiamond`
+
+- Установка всех зависимостей проекта:
+`npm i`
+
+- Запуск локального сервера:
+`npm run serve`
+
+### Добавление Куки-Файлы для локального сервера
+
+- Зайти на vercel страницу
+- Нажать сочетание клавиш ctrl + shift + i
+- Перейти в Application(Приложение)
+- Кликнуть на файлы Куки
+- Нажать на нашу ссылку и скопировать AUTHTOKEN, SearchToken, SpUserName, UserId
+- Вставить значения и названия на Локальный хост
+- Обновить страницу
+
## Важные ссылки
From 53e4790cd59ccf9f344e7d1934ab7972ea4059c3 Mon Sep 17 00:00:00 2001
From: Rafael Chasman <96600211+rafael1209@users.noreply.github.com>
Date: Tue, 30 Jan 2024 01:18:16 +0200
Subject: [PATCH 14/18] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1df3431..2b0f14d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
- Запуск локального сервера:
`npm run serve`
-### Добавление Куки-Файлы для локального сервера
+### Добавление Куки-Файлов для локального сервера
- Зайти на vercel страницу
- Нажать сочетание клавиш ctrl + shift + i
From deb62dd10cfeae1087b10dab96602980e85d71d2 Mon Sep 17 00:00:00 2001
From: Kostya
Date: Tue, 30 Jan 2024 14:21:02 +0300
Subject: [PATCH 15/18] added if block for check response type
---
luckydiamond/src/components/ChatComponent.vue | 24 ++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue
index c0ebe58..9ad4b69 100644
--- a/luckydiamond/src/components/ChatComponent.vue
+++ b/luckydiamond/src/components/ChatComponent.vue
@@ -91,19 +91,21 @@ export default {
},
created() {
GetChatHistory().then((response) => {
- response.forEach((element) => {
- let imageUrl = "https://avatar.spworlds.ru/face/55/" + element.userName;
+ if (response && response.length) {
+ response.forEach((element) => {
+ let imageUrl = "https://avatar.spworlds.ru/face/55/" + element.userName;
- const MsgUser = {
- id: this.id + 1,
- msg: element.message,
- username: element.userName,
- icon: imageUrl,
- };
+ const MsgUser = {
+ id: this.id + 1,
+ msg: element.message,
+ username: element.userName,
+ icon: imageUrl,
+ };
- this.array.push(MsgUser);
- });
- this.ScrollToBottom();
+ this.array.push(MsgUser);
+ });
+ this.ScrollToBottom();
+ }
});
},
};
From b48ec976ef75c833a3bf2076c3c055273652bd29 Mon Sep 17 00:00:00 2001
From: Kostya
Date: Tue, 30 Jan 2024 14:37:39 +0300
Subject: [PATCH 16/18] fixed bug with maxCircles and Emeralds-count if
upd-page
---
luckydiamond/src/pages/games-pages/SapergamePage.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue
index 1ac0277..e206e92 100644
--- a/luckydiamond/src/pages/games-pages/SapergamePage.vue
+++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue
@@ -201,6 +201,7 @@ export default {
balance: 0,
winningAmount: 0,
gamesCircle: 0,
+ gameTurn: 0,
ErrorClick: '',
gameStart: false,
offEventPointers: false,
@@ -325,7 +326,7 @@ export default {
flippedCards: {
async handler(value) {
if (value.length < 1 || this.ValidationPlay.endGame === true) return
- const maxCircles = 25 - this.amountCrystals
+ const maxCircles = 25 - this.amountCrystals - this.gameTurn
console.log(`MAXCIRLES - ${maxCircles} VALUE: ${value} GAMECIRCLE - ${this.gamesCircle}`)
if (this.gameStart !== false) {
@@ -437,6 +438,8 @@ export default {
this.amountCrystals = response.MinesCount
this.amountDeposit = response.PuttedMoney
this.winningAmount = response.WinningMoney
+ this.emeraldsAmount = 25 - this.amountCrystals - response.CurrentUserTurn
+ this.gameTurn = response.CurrentUserTurn
const soundStartGame = new Howl({
src: ['/sounds/start-game.mp3'],
From f6812dab849fce46ee7770f27adba83aab8bc11c Mon Sep 17 00:00:00 2001
From: Kostya
Date: Tue, 30 Jan 2024 14:46:20 +0300
Subject: [PATCH 17/18] fixed bug with gameTurn count
---
luckydiamond/src/pages/games-pages/SapergamePage.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue
index e206e92..9a64e01 100644
--- a/luckydiamond/src/pages/games-pages/SapergamePage.vue
+++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue
@@ -381,6 +381,7 @@ export default {
this.gameStart = false
this.gamesCircle = 0
this.winningAmount = 0
+ this.gameTurn = 0
const SoundCorrect = new Howl({
src: ['/sounds/incorrect-sound.mp3'],
volume: 0.5
From 5c0e43fcf696d2ed61ea5b71dddb7e88381bd1cb Mon Sep 17 00:00:00 2001
From: Kostya
Date: Tue, 30 Jan 2024 14:57:37 +0300
Subject: [PATCH 18/18] fixed logic for gameTurn and fixed-styles for circles
---
luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css | 2 +-
luckydiamond/src/pages/games-pages/SapergamePage.vue | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css
index 6090765..645b198 100644
--- a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css
+++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css
@@ -452,7 +452,7 @@ input[type="number"]::-webkit-outer-spin-button {
display: flex;
justify-content: center;
position: relative;
- left: 7px;
+ left: 17px;
}
.circles {
diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue
index 9a64e01..3045527 100644
--- a/luckydiamond/src/pages/games-pages/SapergamePage.vue
+++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue
@@ -408,6 +408,7 @@ export default {
this.offEventPointers = false
this.gameStart = false
this.gamesCircle = 0
+ this.gameTurn = 0
this.claimWinningAmount()
@@ -512,6 +513,7 @@ export default {
this.offEventPointers = false
this.gameStart = false
this.gamesCircle = 0
+ this.gameTurn = 0
await GetWinningAmount({ SearchToken: GetCookie('SearchToken'), AuthToken: GetCookie('AUTHTOKEN') })
this.winningAmount = 0