diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9491a2f..0000000 --- a/.gitignore +++ /dev/null @@ -1,363 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Oo]ut/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file diff --git a/README.md b/README.md index 80de43d..d2e5fe8 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,6 @@ [Вдохновление](https://cs.fail/en/) - ## Наша Команда -![Group 65](https://github.com/danilt2000/LuckyDiamond/assets/96600211/fb41b4fa-24d4-4372-8b58-089d1c9d4ca4) +![team](https://cdn.discordapp.com/attachments/1175674631684898866/1208428357952348170/Group_92.png?ex=65e33f9c&is=65d0ca9c&hm=9279223a5486b16e30267bced4fd1f7cc63ff59292cb5e29d741914b5902e5e0&) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css b/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css index 639765a..033fa02 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css @@ -9,33 +9,11 @@ display: flex; align-items: center; flex-direction: column; - margin-top: 12%; } .menu__content--jackpot-icon{ - margin-left: -5px; - transition: 250ms; - width: 125%; - height: 125%; -} - -.menu__content--jackpot-icon:hover { - margin-left: -15px; - width: 175%; - height: 175%; -} - -.menu__content--chest-icon { - margin-left: -1px; - transition: 250ms; - width: 100%; - height: 100%; -} - -.menu__content--chest-icon:hover { - margin-left: -5px; - height: 125%; - width: 125%; + width: 16vh; + height: -4vh; } .menu__btn--home { @@ -46,7 +24,6 @@ display: flex; align-items: center; height: 100%; - width: 100%; } .fotosloti { display: flex; @@ -77,29 +54,11 @@ } .menu__content--cruch-icon { - margin-left: 6px; - transition: 250ms; - width: 100%; - height: 100%; -} - -.menu__content--cruch-icon:hover { - margin-left: 0px; - width: 125%; - height: 125%; + margin-left: 6px } .menu__content--bomb-icon { - margin-left: 6px; - width: 100%; - height: 100%; - transition: 250ms; -} - -.menu__content--bomb-icon:hover { - margin-left: 0px; - width: 125%; - height: 125%; + margin-left: 6px } .menu__content--gamemodes { @@ -117,6 +76,8 @@ justify-content: center; align-items: center; text-align: center; + max-width: 100%; + max-height: 100%; } .menu__btn--settings { diff --git a/luckydiamond/src/assets/css/ComponentsStyles/header.css b/luckydiamond/src/assets/css/ComponentsStyles/header.css index a41484b..510c86a 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/header.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/header.css @@ -24,11 +24,6 @@ font-weight: 700; font-size: 18px; margin-right: 3em; - transition: 250ms; -} - -.header__nav nav a:hover { - color: #EF4444; } .header__nav--now { @@ -89,7 +84,6 @@ padding: 20px 23px 20px 23px; text-decoration: none; margin-left: -15%; - transition: 200ms; } .header__auth--discord { diff --git a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css index 2250133..1757aef 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css @@ -53,12 +53,6 @@ left: 10%; } -.referal-icon-diamond img { - position: absolute; - top: 35.5%; - left: 10%; -} - .deposit-icon__input .promo-input, .deposit-icon__input .deposit-amount__input, .withdraw-input .with-input{ diff --git a/luckydiamond/src/assets/css/PagesStyles/BanPage.css b/luckydiamond/src/assets/css/PagesStyles/BanPage.css deleted file mode 100644 index ebd3b0e..0000000 --- a/luckydiamond/src/assets/css/PagesStyles/BanPage.css +++ /dev/null @@ -1,29 +0,0 @@ -.banpage--body { - background-color: rgb(17, 14, 32); - background-image: linear-gradient(to right, rgba(255,0,0,0), rgba(255,0,0,1)); - padding: 0px; - margin: 0; - color: #fff; - text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - font-family: Montserrat Alternates; - font-size:25px; - font-weight: 700; - text-transform: uppercase; - text-align: center; -} -.banpage--video { - border-radius: 10px; -} - -.banpage--block { - width: 50%; - height: 100%; - display: block; - background-color: #ef4444; - margin: auto; - margin-top: 100px; - padding-top: 50px; - padding-bottom: 100px; - border-radius: 10px; - box-shadow: 12px 12px 2px 1px rgba(92, 12, 12, 0.2); -} \ No newline at end of file diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css deleted file mode 100644 index 05bd2f2..0000000 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ /dev/null @@ -1,325 +0,0 @@ -.bet-button { - border: none; - padding: 10px 20px; - margin: 5px; - border-radius: 10px; - color: white; - font-weight: bold; - cursor: pointer; - transition: transform 0.1s ease; - outline: none; -} - -/* Цвета для кнопок */ -.bet-button.red { - background-color: #863443; -} - -.bet-button.green { - background-color: #2D4940; -} - -.bet-button.black { - background-color: #202333; -} - -/* Стили для нажатой кнопки */ -.bet-button:active { - transform: scale(0.95); - /* Уменьшение при нажатии */ -} - -.bet-button.active { - opacity: 0.7; - /* Пример изменения стиля активной кнопки */ -} - -/* Можно добавить тени для кнопок, чтобы они выглядели объемнее */ -.bet-button { - margin: 1.2% 0 0 5.8%; - margin-bottom: 1vh; - box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2); -} - -/* Стиль для тени при нажатии (опционально) */ -.bet-button:active { - box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2); -} - -.double-start { - z-index: 1; - border-radius: 20px; - background: #1D223E; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - width: 42vh; - height: 37vh; - border: 1px solid #262C55; - margin: 2.6%; - margin-top: 0px; -} - -.double-game { - z-index: 1; - border-radius: 20px; - width: 69%; - height: 94%; -} - -.double-ui-component { - display: flex; - align-items: center; - background-color: #25325A; - border-radius: 15px; - /* padding: 10px 20px; */ - padding-right: 2vh; - padding-bottom: 1vh; - padding-top: 1vh; - padding-left: 2vh; - margin-bottom: 1vh; - max-width: 300px; - color: white; - font-family: Arial, sans-serif; - /* background: linear-gradient(to right, #1C213390 50%, #2F5139); */ -} - -.double-ui-component-gradient { - background: linear-gradient(to right, #1C213390 50%, #2F5139); -} - -/* .double-ui-component img {} */ - -.double-ui-component .double-username { - flex-grow: 1; - text-align: left; - margin-left: 1vh; - font-size: 18px; - font-family: Montserrat; - font-weight: bold; - color: #515D83; -} - -.double-ui-component .double-score { - display: flex; - align-items: center; -} - -.double-score { - font-size: 20px; - font-family: Montserrat; - font-weight: bold; - color: #748985; -} - -.double-img-user { - margin-top: 6px; -} - -.double-ui-component .double-score img { - width: 3vh; - height: 3vh; - margin-left: 10px; -} - -.double-members-ingame-red { - overflow-y: auto; - background: linear-gradient(to bottom right, - #A9373C, - #1C2133 20%); - z-index: 1; - border: 2px solid #3B4260; - border-radius: 15px; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - margin-top: 1vh; - width: 100%; - height: 49vh; - /* height: 94%; */ - padding: 2vh; -} - -.double-members-ingame-green { - overflow-y: auto; - background: linear-gradient(to bottom right, - #345D3B, - #1C2133 20%); - z-index: 1; - border: 2px solid #3B4260; - border-radius: 15px; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - margin-top: 1vh; - width: 100%; - height: 49vh; - /* height: 94%; */ - padding: 2vh; -} - -.double-members-ingame-black { - overflow-y: auto; - background: linear-gradient(to bottom right, - #1B1A1A, - #1C2133 26%); - z-index: 1; - border: 2px solid #3B4260; - border-radius: 15px; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - margin-top: 1vh; - margin-top: 1vh; - width: 100%; - /* height: 94%; */ - height: 49vh; - padding: 2vh; -} - -.double-members-flex-container { - display: flex; - justify-content: space-between; - align-items: center; - color: white; - margin-bottom: 2vh; -} - -.double-red-box { - display: flex; - align-items: baseline; - font-size: 18px; - font-family: Montserrat; - font-weight: bold; - color: #B64848; -} - -.double-white-box { - display: flex; - align-items: baseline; - font-size: 18px; - font-family: Montserrat; - font-weight: bold; - color: FEEBEB; -} - -.double-green-box { - display: flex; - align-items: baseline; - font-size: 18px; - font-family: Montserrat; - font-weight: bold; - color: #5EA25C; -} - -.double-number-color { - color: #56629A; - font-weight: bold; - font-size: 18px; - font-family: Montserrat; -} - -.double-red-box span { - font-size: larger; - /* Or any specific size */ - margin-left: 5px; - /* Spacing between RED and X2 */ -} - -.double-user-icon { - display: flex; - align-items: center; -} - -.double-user-icon .double-user-icon-span { - background-image: url('../../../icons-games/double-game/MembersInGame.png'); - width: 20px; - height: 20px; - margin-right: 5px; -} - -.double-game { - z-index: 1; - border-radius: 20px; - width: 69%; - height: 94%; -} - -.double-game-main-box { - border-radius: 10px; - border: 1px solid #262C55; - padding-top: 4vh; - padding-bottom: 4vh; - padding-left: 0vh !important; - padding-right: 0vh !important; - background: #1A1F37; - margin-bottom: 1vh !important; -} - -.double-carousel { - z-index: 1; - position: relative; - background: #2E2D37; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - width: 100%; - margin-top: 1px; - border: 1vh solid #2E2D37; - border-right: 0vh !important; - border-left: 0vh !important; - height: 95%; -} - -.container-double-history-text { - display: flex; -} - -.double-history-text { - background-color: #728DF8; - border: none; - color: #0E1220; - padding-right: 1vh; - padding-left: 1vh; - font-size: 16px; - margin: 4px 2px; - border-radius: 5px; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); - font-size: 18px; - font-family: Montserrat; - font-weight: bold; -} - -.double-carousel-arrow { - position: absolute; - bottom: -3vh; - left: 50%; - transform: translateX(-50%); - color: #728DF8; - font-size: 24px; -} - -.double-carousel-arrow-animate { - animation: blink 1s infinite; -} - -@keyframes blink { - - 0%, - 100% { - opacity: 1; - } - - 50% { - opacity: 0; - } -} - -.double-carousel-arrow-upper { - position: absolute; - top: -3vh; - left: 50%; - transform: translateX(-50%) rotate(180deg); - color: #728DF8; - font-size: 24px; -} - -.double-game-history-main-box { - border-radius: 20px; - border: 1px solid #262C55; - padding-top: 1vh; - padding-bottom: 0vh; - padding-left: 1vh; - padding-right: 0vh; - background: #1A1F37; -} \ No newline at end of file diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css index a503d61..a3bce2b 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css @@ -47,12 +47,17 @@ .carousel-arrow { position: absolute; bottom: -20px; + /* Регулируйте положение стрелки относительно нижнего края карусели */ left: 50%; + /* Центрирование стрелки по горизонтали */ transform: translateX(-50%); + /* Дополнительное центрирование, чтобы точка указывала точно на центр */ color: #728DF8; + /* Цвет стрелки */ font-size: 24px; + /* Размер стрелки */ + /* Добавьте любые дополнительные стили, такие как цвет фона, границы и т.д. */ } - .jackpot-useringame-list{ margin-top: 3.5%; overflow-y: auto; diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css index ef3a2bc..3f2c7eb 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css @@ -150,8 +150,7 @@ #diamonds-input { /* width: 347px; height: 38px; */ - /* width: 37vh; */ - width: 36vh; + width: 37vh; height: 4vh; } diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 5049070..a2ad6b8 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -97,7 +97,7 @@ .bg-early{ border-radius: 40px; - background: #EF4444; + background: #969B9E; box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); } @@ -137,7 +137,6 @@ font-weight: 700; text-transform: uppercase; text-align: center; - padding: 0px 0px 0px 28px; } .line__footer { @@ -154,6 +153,7 @@ } .line__footer img { + width: 60%; margin-bottom: 5%; } @@ -175,37 +175,13 @@ .line__img__jackpot { display: flex; - margin: 1% 6.6% 1% 0%; + margin: 1% 6.6% 1% 4.7%; } .display-firstline { display: flex; } -.cumming_soon_btn { - border-radius: 21px; - background: #FFF; - box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); - color: #000; - text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - font-family: Montserrat Alternates; - font-size: 36px; - font-weight: 700; - padding: 11px 0px 11px 11px; - text-decoration: none; - text-transform: uppercase; - position: relative; - bottom: 5%; - left: 2%; - transition: 250ms; - cursor: default; -} - -.cumming_soon_btn:hover { - background-color: #525252; - opacity: 0.75; -} - .line__btn { border-radius: 21px; background: #FFF; @@ -215,75 +191,14 @@ font-family: Montserrat Alternates; font-size: 36px; font-weight: 700; - padding: 11px 0px 11px 11px; + padding: 11px 11px; text-decoration: none; text-transform: uppercase; position: relative; bottom: 5%; left: 2%; - transition: 250ms; } -.line__btn span:after { - content: '\00bb'; - opacity: 0; - transition: 250ms; - right: 20; - } - -.line__btn:hover span:after { - opacity: 1; - right: 0; - padding-right: 0px; - } - -.line__btn:hover { - padding:11px 11px 11px 22px ; - } - -.line__btn:active { - left: 5%; - } - -.line__btn--crash { - border-radius: 21px; - background: #FFF; - box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); - color: #000; - text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - font-family: Montserrat Alternates; - font-size: 36px; - font-weight: 700; - padding: 11px 0px 11px 11px; - text-decoration: none; - text-transform: uppercase; - position: relative; - bottom: 5%; - left: 2%; - transition: 250ms; -} - -.line__btn--crash span:after { - content: '\00bb'; - opacity: 0; - transition: 250ms; - right: 20; - } - -.line__btn--crash:hover span:after { - opacity: 1; - right: 0; - padding-right: 0px; - } - -.line__btn--crash:hover { - padding:11px 11px 11px 22px ; - } - -.line__btn--crash:active { - left: 5%; - } - .line__btn__jackpot { border-radius: 21px; background: #FFF; @@ -293,35 +208,14 @@ font-family: Montserrat Alternates; font-size: 36px; font-weight: 700; - padding: 11px 0px 11px 11px; + padding: 11px 11px; text-decoration: none; text-transform: uppercase; position: relative; bottom: 4%; left: 6%; - transition: 250ms; } -.line__btn__jackpot span:after { - content: '\00bb'; - opacity: 0; - transition: 250ms; - } - -.line__btn__jackpot:hover span:after { - opacity: 1; - right: 0; - padding-right: 0px; - } - -.line__btn__jackpot:hover { - padding:11px 11px 11px 22px ; - } - - .line__btn__jackpot:active { - left: 10%; - } - .line__btn--elm { color: #000; font-size: 38px ; @@ -357,7 +251,7 @@ .gamemode__twoline--first__element { width: 100%; margin: 2% 3.6% 0 5.5%; - min-height: 209px; + min-height: 180px; } .linecontent-3 { @@ -370,13 +264,23 @@ color: #fff; text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); font-family: Montserrat Alternates; - font-size: 60px; + font-size: 87px; font-weight: 700; text-transform: uppercase; padding: 4.5% 2.2%; } +.gamemode__twoline--first__element .container { + display: flex; + justify-content: center; + align-items: center; +} +.gamemode__twoline--first__element .container a { + margin-right: 10%; + padding: 12px 10px; + margin-bottom: 3%; +} .gamemode__twoline--two__element { margin-top: 2%; @@ -393,195 +297,159 @@ margin-right: 10%; } -.cumming_soon--img { - margin-bottom: 4%; -} -.gamemode__twoline--two__element { - margin-top: 2%; - width: 100%; - min-height: 180px; -} - -.gamemode__twoline--first__element .container { - display: flex; - justify-content: center; - -} - -.gamemode__twoline--first__element .container a { - margin-right: 10%; -} - /* /GameMode */ /* Media */ -@media only screen and (max-width:1800px) { - .line__img__jackpot { - width: 150px; - height: 150px; - } - - .line__footer img { - width: 55%; - margin-bottom: 5%; +@media (max-width: 1586px) { + #diamonds-input-saper { + width: 30vh !important; } } -@media only screen and (max-width:1700px) { - .title-jackpot { - font-size:60px; - padding: 0px 0px 0px 28px; +@media screen and (min-device-width: 1400px) and (max-device-width: 1600px) { + .header__auth--discord { + width: 14%; } - - .title-twoline { - font-size: 40px; + .header__balance { + width: auto; } - - .line__img__jackpot { - height: 150px; - width: 150px; + .main { + width: 75% !important; } - - .line__footer img { - width: 40%; - margin-bottom: 5%; - } - - .line__content { - width: 100%; - height: 100%; - } - - .line__btn { - border-radius: 16px; - font-size: 30px; - padding: 11px 11px 11px 11px; - } - .main__content h1 { - font-size: 70px; + font-size: 4.5em; + } + .gamemode__content--text div { + width: 75%; + } + .gamemode__main { + height: auto; + width: 25%; } - .title-firstline { - font-size:80px; + font-size: 4.1em; } - - .cumming_soon_btn { - font-size: 30px; - border-radius: 16px; + .line__footer { + flex-direction: column; } - - .cumming_soon--img { - height: 40px; - width: 80px; + .line__footer img { + margin-top: -2em; } - - - - .line__btn__jackpot { - border-radius: 16px; - font-size: 30px; + .line__content .line__btn--main .line__btn { + left: 0; + top: 2vh; + /* top: -.4em; */ + /* top: top: 2vh;; */ } - - .line__btn--crash { - border-radius: 16px; - font-size: 30px; - padding: 7px 0px 11px 11px; + .line__img { + margin: 1% -8% 0 30%; } - - .crash--img { - height: 60px; - width: 60px; + .gamemode__firstline img { + width: 60%; } - - .line__content { - height: 354px; + .gamemode__firstline .title-firstline { + font-size: 3.2em; + } + .gamemode__twolines img { + display: none; + } + .gamemode__twolines .title-twoline { + font-size: 3.238em; + } + .line__btn { + font-size: 28px; + padding: 6px 11px; + } + .gamemode__twoline--first__element .container a { + padding: 6px 11px; } } -@media only screen and (max-width:1300px) { - .title-jackpot { - font-size:40px; - padding: 0px 0px 0px 28px; +@media screen and (min-device-width: 1200px) and (max-device-width: 1399px) { + .header__auth--discord { + width: 14%; } - - .title-twoline { - font-size: 20px; + .header__balance { + width: auto; } - - .line__img__jackpot { - height: 125px; - width: 125px; - } - - .line__footer img { - width: 40%; - margin-bottom: 5%; - } - - .line__content { - width: 100%; - height: 100%; - } - - .line__btn { - border-radius: 10px; - font-size: 20px; - padding: 11px 11px 11px 11px; - } - .main__content h1 { - font-size: 40px; + font-size: 4.5em; + } + .main { + width: 78% !important; + } + .gamemode__main { + height: auto; + width: 28.5%; + } + .gamemode__content--text div { + width: 78%; } - .title-firstline { - font-size:60px; + font-size: 4.1em; } - - .cumming_soon_btn { - font-size: 20px; - border-radius: 10px; - height: 50px; + .line__footer { + flex-direction: column; } - - .cumming_soon--img { - height: 40px; - width: 80px; + .line__footer img { + margin-top: -2em; } - - - - .line__btn__jackpot { - border-radius: 10px; - font-size: 20px; + .line__content .line__btn--main .line__btn { + left: 0; + top: -.4em; } - - .line__btn--crash { - border-radius: 10px; - font-size: 20px; - padding: 0px 0px 0px 16px; + .line__img { + margin: 1% -8% 0 15%; } - - .crash--img { - height: 50px; - width: 50px; + .gamemode__firstline img { + width: 60%; } - - .line__content { - height: 265px; + .gamemode__firstline .title-firstline { + font-size: 3.2em; } - - - - .gamemode__twoline--two__element { - margin-top: 0; - width: 100%; - min-height: 60px; + .gamemode__twolines img { + display: none; } - .gamemode__twoline--first__element { - margin-top: 0; - width: 100%; - min-height: 60px; + .gamemode__twolines .title-twoline { + font-size: 3.238em; } -} \ No newline at end of file + .line__btn { + font-size: 28px; + padding: 6px 11px; + } + .gamemode__twoline--first__element .container a { + padding: 6px 11px; + } +} + +@media screen and (max-width: 1100px) { + .main__content h1 { + font-size: 3.5em; + } + .title-firstline { + font-size: 3.4em; + } + .line__img { + margin: -1% -18% 0 2%; + } +} + +@media screen and (min-height: 820px) { + .chat { + height: 87vh !important; + } +} + @media screen and (max-width: 1850px) { + .line__img__jackpot { + display: none !important; + } + } + +/* +@media screen and (min-height: 800) { + .chat { + height: 85vh !important; + } +} */ +/* /Media */ diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 04dc383..1cc92e6 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -88,17 +88,6 @@ background: #EF4444; } -.referal { - padding: 3.8% 46% 3% 14%; - margin-top: 12px; - background: #2D6AE0; -} - -.referal img { - height: 20px; - width: 22px; -} - .playerandvid { margin-right: 10vh; } diff --git a/luckydiamond/src/assets/css/PagesStyles/settings.css b/luckydiamond/src/assets/css/PagesStyles/settings.css index 3dd9e19..6d73a79 100644 --- a/luckydiamond/src/assets/css/PagesStyles/settings.css +++ b/luckydiamond/src/assets/css/PagesStyles/settings.css @@ -76,56 +76,3 @@ background: red; /* Цвет фона трека для Firefox */ height: 8px; /* Высота трека для Firefox */ } - - - -/* toggle in label designing */ -.toggle { - position : relative ; - display : flex; - width : 60px; - height : 32px; - background-color: #000413; - border-radius: 5px; - justify-content: center; - align-items: center; - - -} - -/* After slide changes */ -.toggle:after { - content: ''; - position: absolute; - width: 22px; - height: 22px; - border-radius: 5px; - display: flex; - justify-content: center; - align-items: center; - align-content: center; - background-color: #EF4444; - top: 5px; - left: 6px; - transition: all 0.5s; -} - -/* Toggle text */ -.toggle p { - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; -} - -/* Checkbox checked effect */ -.checkbox:checked + .toggle::after { - - left : 34px; -} - -/* Checkbox checked toggle label bg color */ - - -/* Checkbox vanished */ -.checkbox { - display : none; -} \ No newline at end of file diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index b702f24..6083e71 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -179,7 +179,7 @@ button { height: 86vh; position: relative; z-index: 3; - + } /* /Chat */ @@ -235,7 +235,7 @@ button { .about { grid-area: about; - + } @@ -301,7 +301,7 @@ button { grid-area: help; display: flex; /* height:99%; */ - height: 86vh; + height:86vh; border-radius: 3.125rem; background: #17181C; box-shadow: 0.25rem 0.25rem 0.25rem 0px rgba(0, 0, 0, 0.25); @@ -309,7 +309,7 @@ button { /*height: 96.2%;*/ width: 1000px; margin: 0 auto; - + } @@ -336,9 +336,8 @@ button { height: 35%; z-index: 0; } - /* /Crash */ /* Media */ -/* /Media */ \ No newline at end of file +/* /Media */ diff --git a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleBlackDouble.png b/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleBlackDouble.png deleted file mode 100644 index 534865b..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleBlackDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleGreenDouble.png b/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleGreenDouble.png deleted file mode 100644 index b79ba1d..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleGreenDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleRedDouble.png b/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleRedDouble.png deleted file mode 100644 index 490524a..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/HistoryRectangleRedDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/MembersInGame.png b/luckydiamond/src/assets/icons-games/double-game/MembersInGame.png deleted file mode 100644 index abd37cd..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/MembersInGame.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png deleted file mode 100644 index 9c11aa7..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png deleted file mode 100644 index fd4fb7b..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png deleted file mode 100644 index c9934c3..0000000 Binary files a/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-games/saper-game/arrowTop.png b/luckydiamond/src/assets/icons-games/saper-game/arrowTop.png deleted file mode 100644 index 8ea76a2..0000000 Binary files a/luckydiamond/src/assets/icons-games/saper-game/arrowTop.png and /dev/null differ diff --git a/luckydiamond/src/assets/icons-profile/icon-referal.png b/luckydiamond/src/assets/icons-profile/icon-referal.png deleted file mode 100644 index c834f64..0000000 Binary files a/luckydiamond/src/assets/icons-profile/icon-referal.png and /dev/null differ diff --git a/luckydiamond/src/assets/js/Profile/Referrals.js b/luckydiamond/src/assets/js/Profile/Referrals.js deleted file mode 100644 index 7d516bf..0000000 --- a/luckydiamond/src/assets/js/Profile/Referrals.js +++ /dev/null @@ -1,61 +0,0 @@ -import { BackendApiUrl } from '@/properties/Сonfig.js'; -import { GetCookie } from "@/assets/js/storage/CookieStorage"; -export async function GetReferralData () { - - const myHeaders = new Headers(); - myHeaders.append("Content-Type", "application/json"); - - const userData = { - searchToken: GetCookie("SearchToken"), - authtoken: GetCookie("AUTHTOKEN"), - }; - - const raw = JSON.stringify({ - "userCredentials": { - "searchToken": userData.searchToken, - "authtoken": userData.authtoken - } - }); - - const response = await fetch(`${BackendApiUrl}/PromoCode/GetReferralInfo`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: raw, - redirect: "follow" - }); - - return await response.json(); - - -} - -export async function WithdrawReferralMoney () { - const myHeaders = new Headers(); -myHeaders.append("Content-Type", "application/json"); - -const userData = { - searchToken: GetCookie("SearchToken"), - authtoken: GetCookie("AUTHTOKEN"), -}; - -const raw = JSON.stringify({ - "userCredentials": { - "searchToken": userData.searchToken, - "authtoken": userData.authtoken - } -}); - -const requestOptions = { - method: "POST", - headers: myHeaders, - body: raw, - redirect: "follow" -}; - -fetch("https://spsystemcore20231122004605.azurewebsites.net/api/PromoCode/TakeMoneyReferral", requestOptions) - .then((response) => response.text()) - .then((result) => console.log(result)) - .catch((error) => console.error(error)); -} \ No newline at end of file diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 3b3d6b0..9dea039 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -10,6 +10,7 @@ export function ConnectToChat() { try { if (webSocket && webSocket.readyState === WebSocket.OPEN) { + console.log('WebSocket connection already established.'); return; } @@ -21,32 +22,17 @@ export function ConnectToChat() { webSocket.onmessage = function (event) { - try { - const dataObject = JSON.parse(event.data); + const dataObject = JSON.parse(event.data); - if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { - eventBus.emit('dataChat', event.data); - return; - } - - if (dataObject.MessageType == 'DoubleGameState') { - eventBus.emit('doubleGame', event.data) - return; - } - - if (dataObject.MessageType == "CrashGameState") { - eventBus.emit('crash', event.data); - return; - } - - if (Array.isArray(dataObject.CurrentGame.PlayerList)) { - eventBus.emit('jackpotGameTik', event.data); - return; - } - - } catch (error) { - void (error); + if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { + eventBus.emit('dataChat', event.data); + console.log('CHAT') } + else { + eventBus.emit('crash', event.data) + } + + // console.log('Message from Server:', event.data); }; webSocket.onclose = function () { diff --git a/luckydiamond/src/assets/js/games/double/DoubleApi.js b/luckydiamond/src/assets/js/games/double/DoubleApi.js deleted file mode 100644 index 54e5a8b..0000000 --- a/luckydiamond/src/assets/js/games/double/DoubleApi.js +++ /dev/null @@ -1,69 +0,0 @@ -import { BackendApiUrl } from '@/properties/Сonfig.js'; -import { - GetCookie -} from "@/assets/js/storage/CookieStorage.js"; - - -export async function GetNewestDoubleGames() { - try { - const response = await fetch(`${BackendApiUrl}/GameDouble/GetNewestDoubleGames`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - redirect: 'follow' - }) - - if (!response.ok) { - console.log('Fetch error:', response.status) - } - - return await response - } - catch (error) { - console.log('Fetch error') - } -} - -export async function JoinGame(amount, betColor) { - - let betColorInt = 0; - if (betColor == "red") { - betColorInt = 0; - } - if (betColor == "green") { - betColorInt = 1; - } - if (betColor == "black") { - betColorInt = 2; - } - - const data = { - UserCredentials: { - SearchToken: GetCookie("SearchToken"), - AUTHTOKEN: GetCookie("AUTHTOKEN") - }, - bet: amount, - betColor: betColorInt - } - - try { - const response = await fetch(`${BackendApiUrl}/GameDouble/JoinGame`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify(data), - redirect: 'follow' - }) - - if (!response.ok) { - console.log('Fetch error:', response.status) - } - - return await response.json() - } - catch (error) { - console.log('Fetch error') - } -} \ No newline at end of file diff --git a/luckydiamond/src/assets/js/jackpot/JackpotLogic.js b/luckydiamond/src/assets/js/jackpot/JackpotLogic.js index 3213b34..ef1fa78 100644 --- a/luckydiamond/src/assets/js/jackpot/JackpotLogic.js +++ b/luckydiamond/src/assets/js/jackpot/JackpotLogic.js @@ -1,59 +1,59 @@ -// import { BackendWebSocketJackpotUrl } from '@/properties/Сonfig.js'; +import { BackendWebSocketJackpotUrl } from '@/properties/Сonfig.js'; import { BackendApiUrl } from '@/properties/Сonfig.js'; -// import { eventBus } from "@/main"; +import { eventBus } from "@/main"; // import { // GetCookie // } from "@/assets/js/storage/CookieStorage.js"; -// let webSocket; +let webSocket; -// export function ConnectToJackpotSocket() { -// try { +export function ConnectToJackpotSocket() { + try { -// if (webSocket && webSocket.readyState === WebSocket.OPEN) { -// console.log('WebSocket connection already established.'); -// return; -// } + if (webSocket && webSocket.readyState === WebSocket.OPEN) { + console.log('WebSocket connection already established.'); + return; + } -// webSocket = new WebSocket(BackendWebSocketJackpotUrl); + webSocket = new WebSocket(BackendWebSocketJackpotUrl); -// webSocket.onopen = function () { -// console.log('Connection established'); -// }; + webSocket.onopen = function () { + console.log('Connection established'); + }; -// webSocket.onmessage = function (event) { + webSocket.onmessage = function (event) { -// // const dataObject = JSON.parse(event.data); + // const dataObject = JSON.parse(event.data); -// eventBus.emit('jackpotGameTik', event.data); + eventBus.emit('jackpotGameTik', event.data); -// // console.log(dataObject) -// // if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { -// // eventBus.emit('dataChat', event.data); -// // console.log('CHAT') -// // } -// // else { -// // eventBus.emit('crash', event.data) -// // } + // console.log(dataObject) + // if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { + // eventBus.emit('dataChat', event.data); + // console.log('CHAT') + // } + // else { + // eventBus.emit('crash', event.data) + // } -// }; + }; -// webSocket.onclose = function () { + webSocket.onclose = function () { -// webSocket = new WebSocket(BackendWebSocketJackpotUrl); + webSocket = new WebSocket(BackendWebSocketJackpotUrl); -// console.log('Connection closed and reconnected'); -// }; + console.log('Connection closed and reconnected'); + }; -// webSocket.onerror = function (event) { -// webSocket = new WebSocket(BackendWebSocketJackpotUrl); -// console.error('WebSocket Error:', event); -// }; -// } catch (error) { -// console.error('Error in ConnectToChat:', error); -// } -// } + webSocket.onerror = function (event) { + webSocket = new WebSocket(BackendWebSocketJackpotUrl); + console.error('WebSocket Error:', event); + }; + } catch (error) { + console.error('Error in ConnectToChat:', error); + } +} export async function JoinJackpotGame(userData, amount) { const data = { diff --git a/luckydiamond/src/assets/js/moneyoperation/Claimmoney.js b/luckydiamond/src/assets/js/moneyoperation/Claimmoney.js index c9974a0..066902d 100644 --- a/luckydiamond/src/assets/js/moneyoperation/Claimmoney.js +++ b/luckydiamond/src/assets/js/moneyoperation/Claimmoney.js @@ -4,11 +4,7 @@ import {GetCookie} from "@/assets/js/storage/CookieStorage"; export async function GettingMoneyOperation(amount) { const data = { - Amount: amount, - UserCredentials: { - searchToken: GetCookie('SearchToken'), - authtoken: GetCookie('AUTHTOKEN') - } + Amount: amount }; try { const response = await fetch(`${BackendApiUrl}/payment/donate`, { diff --git a/luckydiamond/src/components/AsidebarComponent.vue b/luckydiamond/src/components/AsidebarComponent.vue index ad16767..02e1fab 100644 --- a/luckydiamond/src/components/AsidebarComponent.vue +++ b/luckydiamond/src/components/AsidebarComponent.vue @@ -9,8 +9,7 @@ - - + diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 769ca9d..e906c17 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -29,8 +29,6 @@ - - - play play > - + @@ -107,10 +103,10 @@ play play > - + diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index fb64343..f538eca 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -14,7 +14,6 @@
Пополнить Вывести - Рефералы
@@ -58,7 +57,6 @@
- @@ -69,14 +67,13 @@ import axios from 'axios'; import ChatComponent from "@/components/ChatComponent.vue"; import HeaderComponent from "@/components/HeaderComponent.vue"; import PaymentsModal from "@/components/PaymentsModal.vue"; -import ReferalModal from "@/components/ReferalModal.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, ReferalModal, NotiicationwindowComponent }, + components: {ProfilemobilePage, HeaderComponent, AsideBarComponent, ChatComponent, PaymentsModal, NotiicationwindowComponent }, data() { return { username: 'Artemka', @@ -85,12 +82,11 @@ export default { balance: 0, mobile: false, openModal: false, - openRef: false, payments: true, arrayHistory: [], } }, - + emits: ['notificationremove'], mounted() { this.checkWindowSize() @@ -100,57 +96,6 @@ export default { this.RemoveWindowListener() }, created() { - - const myHeaders = new Headers(); - myHeaders.append("Content-Type", "application/json"); - myHeaders.append("Cookie", "ARRAffinity=a6e48b9e9d2653435be7b61998d8624b44115214104213d6c8b8c526cc56dc70; ARRAffinitySameSite=a6e48b9e9d2653435be7b61998d8624b44115214104213d6c8b8c526cc56dc70"); - - const userData = { - searchToken: GetCookie("SearchToken"), - authtoken: GetCookie("AUTHTOKEN"), - }; - - const raw = JSON.stringify({ - "userCredentials": { - "searchToken": userData.searchToken, - "authtoken": userData.authtoken - } - }); - - const requestOptions = { - method: "POST", - headers: myHeaders, - body: raw, - redirect: "follow" - }; - - fetch("https://spsystemcore20231122004605.azurewebsites.net/api/PromoCode/GetReferralInfo", requestOptions) - .then((response) => response.text()) - .then((result) => { - console.log(result); - if (result == "\"The Referral is not created\"") { - const raw = JSON.stringify({ - "userCredentials": { - "searchToken": userData.searchToken, - "authtoken": userData.authtoken - } - }); - - const requestOptions = { - method: "POST", - headers: myHeaders, - body: raw, - redirect: "follow" - }; - - fetch("https://spsystemcore20231122004605.azurewebsites.net/api/PromoCode/CreateReferal", requestOptions) - .then((response) => response.text()) - .then((result) => console.log(result)) - .catch((error) => console.error(error)); - } - }) - .catch((error) => console.error(error)); - axios.post('https://spsystemcore20231122004605.azurewebsites.net/api/Payment/GetPaymentHistory', { searchToken: GetCookie('SearchToken'), authtoken: GetCookie('AUTHTOKEN') @@ -184,16 +129,10 @@ export default { depositClick() { this.openModal = true this.payments = true - this.openRef = false }, withdrawClick() { this.openModal = true this.payments = false - this.openRef = false - }, - referalClick() { - this.openModal = false - this.openRef = true }, NotificationEventListener() { this.notification = true diff --git a/luckydiamond/src/pages/SettingsPage.vue b/luckydiamond/src/pages/SettingsPage.vue index d13e8f1..a077510 100644 --- a/luckydiamond/src/pages/SettingsPage.vue +++ b/luckydiamond/src/pages/SettingsPage.vue @@ -12,32 +12,19 @@ --> -
-
-

Звук

- -
+
+

Звук

+ +

Данная страница находится в разработке, и будет полностью переделанна

- -
diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue deleted file mode 100644 index 83ddcb4..0000000 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ /dev/null @@ -1,697 +0,0 @@ - - - - \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/JackpotPage.vue b/luckydiamond/src/pages/games-pages/JackpotPage.vue index 2e43079..ce76fc3 100644 --- a/luckydiamond/src/pages/games-pages/JackpotPage.vue +++ b/luckydiamond/src/pages/games-pages/JackpotPage.vue @@ -263,7 +263,7 @@ import "@/assets/css/PagesStyles/games-pages/jackpot.css"; import "@/assets/css/global.css"; import JackpotNumbers from "@/mocks/JackpotNumbers"; import { - // ConnectToJackpotSocket, + ConnectToJackpotSocket, JoinJackpotGame, } from "@/assets/js/jackpot/JackpotLogic.js"; import { useVuelidate } from "@vuelidate/core"; @@ -659,7 +659,7 @@ export default { }, }, mounted() { - // ConnectToJackpotSocket(); + ConnectToJackpotSocket(); eventBus.on("jackpotGameTik", (data) => { try { diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue index 67a53c0..3b72744 100644 --- a/luckydiamond/src/pages/games-pages/SapergamePage.vue +++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue @@ -297,7 +297,7 @@ export default { } }); } catch (e) { - //console.error('Error in Percentage', e); + console.error('Error in Percentage', e); } } @@ -330,7 +330,7 @@ export default { this.offEventPointers = false let AnswerServer - //let LimitClicked = this.amountCrystals + let LimitClicked = this.amountCrystals let DepositDiamonds = this.amountDeposit const X_Cordinates = value[this.gamesCircle] @@ -365,10 +365,10 @@ export default { }) } catch (e) { - //console.error(e) + console.error(e) } - //console.log(LimitClicked, DepositDiamonds, X_Cordinates) + console.log(LimitClicked, DepositDiamonds, X_Cordinates) this.gamesCircle = this.gamesCircle + 1 this.offEventPointers = true if (AnswerServer === 'You dead') { @@ -457,7 +457,7 @@ export default { this.getBalanceUser() } catch (e) { - //console.error('Error in GetData', e) + console.error('Error in GetData', e) } } else { @@ -507,7 +507,7 @@ export default { }) } catch (e) { - //console.error(e) + console.error(e) } }, async claimWinningAmount() { @@ -528,7 +528,7 @@ export default { return eventBus.emit('Updatebalance') } catch (e) { - //console.error(e) + console.error(e) } } }, diff --git a/src/css/style.css b/src/css/style.css index 9c415bc..afc58a1 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -72,12 +72,6 @@ font-family: Montserrat Alternates; font-size: 18px; font-weight: 700; - transition: 250ms; -} - -.header_other_text_menu:hover { - color: #EF4444; - } .flex-container {