diff --git a/backend/MemeBE/Program.cs b/backend/MemeBE/Program.cs index 5df31d8..5462b3e 100644 --- a/backend/MemeBE/Program.cs +++ b/backend/MemeBE/Program.cs @@ -13,7 +13,7 @@ { options.AddPolicy("MyCorsPolicy", builder => { - builder.WithOrigins("https://nice-water-0ee9aa403.4.azurestaticapps.net", "http://localhost:63342", "https://memethegathering.wielki.ch") // URL innego serwera + builder.WithOrigins("https://nice-water-0ee9aa403.4.azurestaticapps.net", "http://localhost:63342", "https://memethegathering.wielki.ch", "https://mtg.wielki.ch/") // URL innego serwera .AllowAnyMethod() .AllowAnyHeader() .AllowCredentials(); // Ważne dla SignalR diff --git a/backend/MemeBE/cards.csv b/backend/MemeBE/cards.csv index 725eedf..0312fe6 100644 --- a/backend/MemeBE/cards.csv +++ b/backend/MemeBE/cards.csv @@ -17,4 +17,14 @@ 17;ParksandRecs;/static/jpg/ParksandRecs.png;MakeLaugh,1;1 18;Reee;/static/jpg/Reee.png;MakeLaugh,1;0 19;Rickroll;/static/jpg/Rickroll.png;MakeLaugh,1;1 -20;RollSafeThink;/static/jpg/OhGodNo.png;Shield,2;2 \ No newline at end of file +20;SaladCat;/static/jpg/SaladCat.png;MakeLaugh,1;1 +21;Satisfaction;/static/jpg/Satisfaction.png;Shield,2;2 +22;ScumbagSteve;/static/jpg/ScumbagSteve.png;MakeLaugh,1;1 +23;SpanishLaughingGuy;/static/jpg/SpanishLaughingGuy.png;MakeLaugh,1;1 +24;SpiderMan;/static/jpg/SpiderMan.png;MakeLaugh,1;0 +25;StareDad;/static/jpg/StareDad.png;MakeLaugh,1;1 +26;SuccessBaby;/static/jpg/SuccessBaby.png;Shield,2;2 +27;SurprisedPikachu;/static/jpg/SurprisedPikachu.png;MakeLaugh,1;1 +28;SurprisedKirk;/static/jpg/SurprisedKirk.png;MakeLaugh,2;0 +29;Takemymoney;/static/jpg/Takemymoney.png;MakeLaugh,2;1 +30;RollSafeThink;/static/jpg/OhGodNo.png;Shield,1;2 \ No newline at end of file diff --git a/client/index.html b/client/index.html index 00c2052..8692084 100644 --- a/client/index.html +++ b/client/index.html @@ -13,7 +13,7 @@
-

Meme: The Gathering

+

Meme: The Gathering

diff --git a/client/static/css/style.css b/client/static/css/style.css index 5c01787..2d7f56b 100644 --- a/client/static/css/style.css +++ b/client/static/css/style.css @@ -13,10 +13,11 @@ body { background-image: url("../../Background.webp"); background-attachment: fixed; background-size: cover; - height: 95%; + height: 98%; } #lobby { + background: rgba(42,178,217, .6); position: relative; width: 100%; @@ -28,6 +29,10 @@ body { flex-direction: column; } +.game-title { + margin-top: 210px; +} + #lobby button, #lobby input { width: 100%; max-width: 300px; @@ -110,6 +115,11 @@ body { flex-direction: row; } +#playersZones h1,h2,h3,h4 { + + display:inline; +} + #playersZones .player { background: linear-gradient(rgba(221,71,73, .6), rgba(18, 77, 94, 0.6) ); max-width: 33%; @@ -125,6 +135,10 @@ body { background-image: url("../../playericon.png"); } +.otherPlayerName { + font-family: 'Honk', sans-serif; +} + .middle { flex-grow: 1; display: flex; @@ -161,8 +175,9 @@ body { flex-wrap: nowrap; /*background-color:rgba(57, 64, 77, .8);*/ padding: 15px; - overflow-x: scroll; + overflow-x: auto; max-height: 300px; + min-height: 300px; } #playerZone .playerData { @@ -185,6 +200,7 @@ body { display: flex; height: 150px; width: 100%; + overflow-x: auto; } .card { @@ -251,4 +267,18 @@ body { /*font-family: 'Honk', sans-serif;*/ font-size: 24pt; color: white; +} + +@keyframes rotateText { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +.rotating-text { + + animation: rotateText 2s linear; /* 'infinite' for looping */ } \ No newline at end of file diff --git a/client/static/jpg/Satisfaction.png b/client/static/jpg/Satisfaction.png index 9fb9e13..11ed074 100644 Binary files a/client/static/jpg/Satisfaction.png and b/client/static/jpg/Satisfaction.png differ diff --git a/client/static/jpg/SurprisedKirk.png b/client/static/jpg/SurprisedKirk.png new file mode 100644 index 0000000..6c3b59c Binary files /dev/null and b/client/static/jpg/SurprisedKirk.png differ diff --git a/client/static/jpg/Takemymoney.png b/client/static/jpg/Takemymoney.png new file mode 100644 index 0000000..1112f1f Binary files /dev/null and b/client/static/jpg/Takemymoney.png differ diff --git a/client/static/js/main.js b/client/static/js/main.js index d537a20..e849394 100644 --- a/client/static/js/main.js +++ b/client/static/js/main.js @@ -227,6 +227,8 @@ function addToGameLog(message) { let li = document.createElement("li"); li.innerHTML = message; document.querySelector("#gameLog ul").appendChild(li); + let logParent = document.querySelector("#gameLog"); + logParent.scrollTop = logParent.scrollHeight; } function showLobbyErrorMessage(message) { @@ -241,6 +243,7 @@ function addPlayerZone(playerName) { playerDiv.setAttribute('data-player-name', playerName); const nameElement = document.createElement('h3'); + nameElement.className = 'otherPlayerName'; nameElement.textContent = playerName; const laughElement = document.createElement('h4');