feat(ui): changed Background color, centered Lobby

Added a background color for the mainmenu and the lobby + centered lobby
This commit is contained in:
LQ63
2025-11-09 16:34:47 +01:00
parent b847d3c054
commit a71752df2f
7 changed files with 91 additions and 96 deletions

View File

@@ -3,7 +3,7 @@
--background-image: url('/assets/images/background.png') !important; --background-image: url('/assets/images/background.png') !important;
--color: #f8f9fa !important; /* Light text on dark bg */ --color: #f8f9fa !important; /* Light text on dark bg */
--highlightscolor: rgba(131, 131, 131, 0.75) !important; --highlightscolor: rgba(131, 131, 131, 0.75) !important;
--background-color: #192734;
/* Bootstrap variable overrides for dark mode */ /* Bootstrap variable overrides for dark mode */
--bs-body-color: var(--color); --bs-body-color: var(--color);
--bs-link-color: #66b2ff; --bs-link-color: #66b2ff;

View File

@@ -2,4 +2,5 @@
--background-image: url('/assets/images/img.png'); --background-image: url('/assets/images/img.png');
--color: black; --color: black;
--highlightscolor: rgba(0, 0, 0, 0.75); --highlightscolor: rgba(0, 0, 0, 0.75);
--background-color: rgba(228, 232, 237, 1);
} }

View File

@@ -14,7 +14,7 @@
--bs-border-color: rgba(0, 0, 0, 0.125) !important; --bs-border-color: rgba(0, 0, 0, 0.125) !important;
--bs-heading-color: var(--color) !important; --bs-heading-color: var(--color) !important;
} }
@background-color: var(--background-color);
@highlightcolor: var(--highlightscolor); @highlightcolor: var(--highlightscolor);
@background-image: var(--background-image); @background-image: var(--background-image);
@color: var(--color); @color: var(--color);
@@ -29,6 +29,10 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-attachment: fixed; background-attachment: fixed;
} }
.lobby-background {
background-color: @background-color;
}
.navbar-header{ .navbar-header{
text-align:center; text-align:center;

View File

@@ -3,6 +3,7 @@
@(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby) @(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby)
@main("Ingame") { @main("Ingame") {
<main class="game-field-background vh-100">
<div class="py-5 ms-4 me-4"> <div class="py-5 ms-4 me-4">
<div class="row ms-4 me-4"> <div class="row ms-4 me-4">
@@ -67,4 +68,5 @@
</div> </div>
</div> </div>
</div> </div>
</main>
} }

View File

@@ -1,82 +1,73 @@
@(user: Option[model.users.User], gamelobby: logic.game.GameLobby) @(user: Option[model.users.User], gamelobby: logic.game.GameLobby)
@main("Lobby") { @main("Lobby") {
<div class="container"> <main class="lobby-background vh-100">
<div class="row"> <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
<div class="col"> <div class="row">
<div class="p-3 fs-1 d-flex align-items-center"> <div class="col">
<div class="text-center" style="flex-grow: 1;"> <div class="p-3 fs-1 d-flex align-items-center">
Lobby-Name: @gamelobby.name <div class="text-center" style="flex-grow: 1;">
Lobby-Name: @gamelobby.name
</div>
<form action="@(routes.IngameController.leaveGame(gamelobby.id))">
<button type="submit" class="btn btn-danger ms-auto">Exit</button>
</form>
</div> </div>
<form action="@(routes.IngameController.leaveGame(gamelobby.id))">
<button type="submit" class="btn btn-danger ms-auto">Exit</button>
</form>
</div> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col">
<div class="col"> <div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div>
<div class="p-3 text-center fs-4">Playeramount: @gamelobby.getPlayers.size / @gamelobby.maxPlayers</div> </div>
</div> </div>
</div> <div class="row justify-content-center align-items-center flex-grow-1">
<div class="row justify-content-center"> @if((gamelobby.getUserSession(user.get.id).host)) {
@for(playersession <- gamelobby.getPlayers.values) {
@if((gamelobby.getUserSession(user.get.id).host)) { <div class="col-auto my-auto">
@for(playersession <- gamelobby.getPlayers.values) { <div class="card" style="width: 18rem;">
<div class="col-auto"> <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
<div class="card" style="width: 18rem;"> <div class="card-body">
@if(playersession.id == user.get.id) {
<h5 class="card-title">@playersession.name (You)</h5>
@* <p class="card-text">Your text could be here!</p>*@
<a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
} else {
<h5 class="card-title">@playersession.name</h5>
@* <p class="card-text">Your text could be here!</p>*@
<form action="@(routes.IngameController.kickPlayer(gamelobby.id, playersession.id))" method="post">
<button type="submit" class="btn btn-danger">Remove</button>
</form>
}
</div>
</div>
</div>
}
<div class="col-12 text-center mb-5">
<a href="@(routes.IngameController.startGame(gamelobby.id))" class="btn btn-success">Start Game</a>
</div>
} else {
@for(playersession <- gamelobby.getPlayers.values) {
<div class="col-auto my-auto"> <div class="card" style="width: 18rem;">
<img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" /> <img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
<div class="card-body"> <div class="card-body">
@if(playersession.id == user.get.id) { @if(playersession.id == user.get.id) {
<h5 class="card-title">@playersession.name (You)</h5> <h5 class="card-title">@playersession.name (You)</h5>
@* <p class="card-text">Your text could be here!</p>*@
<a href="#" class="btn btn-danger disabled" aria-disabled="true" tabindex="-1">Remove</a>
} else { } else {
<h5 class="card-title">@playersession.name</h5> <h5 class="card-title">@playersession.name</h5>
@* <p class="card-text">Your text could be here!</p>*@
<form action="@(routes.IngameController.kickPlayer(gamelobby.id, playersession.id))" method="post">
<button type="submit" class="btn btn-danger">Remove</button>
</form>
} }
</div> </div>
</div>
</div>
}
<div class="row">
<div class="col text-center mt-3">
<a href="@(routes.IngameController.startGame(gamelobby.id))" class="btn btn-success">Start Game</a>
</div>
</div>
} else {
@for(playersession <- gamelobby.getPlayers.values) {
<div class="col-auto">
<div class="card" style="width: 18rem;">
<img src="@routes.Assets.versioned("images/profile.png")" alt="Profile" class="card-img-top w-50 mx-auto mt-3" />
<div class="card-body">
@if(playersession.id == user.get.id) {
<h5 class="card-title">@playersession.name (You)</h5>
} else {
<h5 class="card-title">@playersession.name</h5>
}
</div>
</div>
</div>
}
<div class="row">
<div class="col mt-3">
<p class="text-center fs-4">Waiting for the host to start the game...</p>
</div>
</div>
<div class="row">
<div class="col mt-1">
<div class="text-center">
<div class="spinner-border" role="status">
<span class="visually-hidden">Loading...</span>
</div> </div>
</div> </div>
}
<div class="col-12 text-center mt-3">
<p class="fs-4">Waiting for the host to start the game...</p>
<div class="spinner-border mt-1" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div> </div>
</div> }
} </div>
</div> </div>
</div> </main>
} }

View File

@@ -18,15 +18,10 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
</head> </head>
<body class="d-flex flex-column min-vh-100 game-field-background"> <body class="d-flex flex-column min-vh-100">
<main>
@* And here's where we render the `Html` object containing @* And here's where we render the `Html` object containing
* the page content. *@ * the page content. *@
@content @content
</main>
<footer class="footer">
</footer>
<script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script> <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>

View File

@@ -2,31 +2,33 @@
@main("Create Game") { @main("Create Game") {
@navbar(user) @navbar(user)
<form action="@routes.MainMenuController.createGame()" method="post" class="game-field-background"> <main class="lobby-background flex-grow-1">
<div class="w-50 mx-auto"> <form action="@routes.MainMenuController.createGame()" method="post">
<div class="mt-3"> <div class="w-50 mx-auto">
<label for="lobbyname" class="form-label">Lobby-Name</label>
<input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>
</div>
<div class="form-check form-switch mt-3">
<input class="form-check-input" type="checkbox" id="visibilityswitch" disabled>
<label class="form-check-label" for="visibilityswitch">public/private</label>
</div>
<div class="mt-3"> <div class="mt-3">
<label for="playeramount" class="form-label">Playeramount:</label> <label for="lobbyname" class="form-label">Lobby-Name</label>
<input type="range" class="form-range text-body" min="2" max="7" value="2" id="playeramount" name="playeramount"> <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>
<div class="d-flex justify-content-between"> </div>
<span>2</span> <div class="form-check form-switch mt-3">
<span>3</span> <input class="form-check-input" type="checkbox" id="visibilityswitch" disabled>
<span>4</span> <label class="form-check-label" for="visibilityswitch">public/private</label>
<span>5</span> </div>
<span>6</span> <div class="mt-3">
<span>7</span> <label for="playeramount" class="form-label">Playeramount:</label>
</div> <input type="range" class="form-range text-body" min="2" max="7" value="2" id="playeramount" name="playeramount">
<div class="d-flex justify-content-between">
<span>2</span>
<span>3</span>
<span>4</span>
<span>5</span>
<span>6</span>
<span>7</span>
</div>
</div>
<div class="mt-3 text-center">
<button type="submit" class="btn btn-success">Create Game</button>
</div> </div>
<div class="mt-3 text-center">
<button type="submit" class="btn btn-success">Create Game</button>
</div> </div>
</div> </form>
</form> </main>
} }