From 92c14dfc817d2e5b44634a4608c8a3368ba5cd84 Mon Sep 17 00:00:00 2001 From: Trevor Merritt Date: Sun, 23 Aug 2026 15:51:15 -0400 Subject: [PATCH] Initial commit --- build.gradle.kts | 11 + desktop/build.gradle.kts | 31 +++ .../geekback/dopewars/desktop/ApiClient.kt | 117 ++++++++ .../dev/geekback/dopewars/desktop/AppTheme.kt | 42 +++ .../geekback/dopewars/desktop/ClientState.kt | 64 +++++ .../geekback/dopewars/desktop/DemoMain3.kt | 181 +++++++++++++ .../dev/geekback/dopewars/desktop/Main.kt | 139 ++++++++++ .../dev/geekback/dopewars/desktop/Main3.kt | 124 +++++++++ .../dev/geekback/dopewars/desktop/Screens.kt | 10 + .../geekback/dopewars/desktop/configPanel.kt | 37 +++ .../geekback/dopewars/desktop/playerForm.kt | 61 +++++ .../geekback/dopewars/ui/DopeWarsModelUi.kt | 36 +++ .../dev/geekback/dopewars/ui/TravelUi.kt | 90 +++++++ .../dev/geekback/dopewars/ui/api/ApiUi.kt | 26 ++ .../dopewars/ui/api/MarketRequestUi.kt | 47 ++++ .../dopewars/ui/api/MarketResponseUi.kt | 29 ++ .../ui/api/PlayerNameUpdateRequestUi.kt | 25 ++ .../ui/api/PlayerNameUpdateResponseUi.kt | 26 ++ .../dopewars/ui/api/TradeRequestUi.kt | 50 ++++ .../dopewars/ui/api/TravelRequestUi.kt | 25 ++ .../dopewars/ui/api/TravelResponseUi.kt | 54 ++++ .../kotlin/dev/geekback/dopewars/ui/drug.kt | 94 +++++++ .../dev/geekback/dopewars/ui/inventory.kt | 29 ++ .../dev/geekback/dopewars/ui/inventoryItem.kt | 19 ++ .../dev/geekback/dopewars/ui/location.kt | 55 ++++ .../kotlin/dev/geekback/dopewars/ui/market.kt | 38 +++ .../kotlin/dev/geekback/dopewars/ui/player.kt | 47 ++++ gradle/libs.versions.toml | 36 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ server/build.gradle.kts | 59 ++++ .../dev/geekback/dopewars/server/Server.kt | 88 ++++++ .../server/repository/PlayerRepository.kt | 25 ++ .../dopewars/server/routes/GameRoutes.kt | 98 +++++++ .../dopewars/server/routes/MarketRoutes.kt | 63 +++++ .../dopewars/server/routes/ModelCrudRoutes.kt | 38 +++ .../dopewars/server/routes/PlayerRoutes.kt | 102 +++++++ .../dopewars/server/services/GameService.kt | 135 ++++++++++ .../dopewars/server/services/MarketService.kt | 22 ++ .../dopewars/server/services/PlayerService.kt | 1 + server/src/main/resources/index.html | 3 + server/src/main/resources/logback.xml | 11 + settings.gradle.kts | 17 ++ shared/build.gradle.kts | 21 ++ .../dev/geekback/dopewars/shared/Drug.kt | 22 ++ .../dev/geekback/dopewars/shared/DrugInfo.kt | 15 ++ .../dev/geekback/dopewars/shared/Drugs.kt | 15 ++ .../geekback/dopewars/shared/InventoryItem.kt | 9 + .../dev/geekback/dopewars/shared/Location.kt | 8 + .../dev/geekback/dopewars/shared/Locations.kt | 13 + .../dev/geekback/dopewars/shared/Market.kt | 12 + .../dev/geekback/dopewars/shared/Player.kt | 27 ++ .../geekback/dopewars/shared/SanityValues.kt | 3 + .../dopewars/shared/api/MarketRequest.kt | 9 + .../dopewars/shared/api/MarketResult.kt | 9 + .../shared/api/PlayerNameUpdateRequest.kt | 8 + .../shared/api/PlayerNameUpdateResponse.kt | 7 + .../dopewars/shared/api/TradeAction.kt | 10 + .../dopewars/shared/api/TradeRequest.kt | 13 + .../dopewars/shared/api/TravelRequest.kt | 9 + .../dopewars/shared/api/TravelResult.kt | 12 + 62 files changed, 2685 insertions(+) create mode 100644 build.gradle.kts create mode 100644 desktop/build.gradle.kts create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ApiClient.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/AppTheme.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ClientState.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/DemoMain3.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main3.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Screens.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/configPanel.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/desktop/playerForm.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/DopeWarsModelUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/TravelUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/ApiUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketRequestUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketResponseUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateRequestUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateResponseUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TradeRequestUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelRequestUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelResponseUi.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/drug.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventory.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventoryItem.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/location.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/market.kt create mode 100644 desktop/src/main/kotlin/dev/geekback/dopewars/ui/player.kt create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 server/build.gradle.kts create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/Server.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/repository/PlayerRepository.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/routes/GameRoutes.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/routes/MarketRoutes.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/routes/ModelCrudRoutes.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/routes/PlayerRoutes.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/services/GameService.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/services/MarketService.kt create mode 100644 server/src/main/kotlin/dev/geekback/dopewars/server/services/PlayerService.kt create mode 100644 server/src/main/resources/index.html create mode 100644 server/src/main/resources/logback.xml create mode 100644 settings.gradle.kts create mode 100644 shared/build.gradle.kts create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drug.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/DrugInfo.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drugs.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/InventoryItem.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Location.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Locations.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Market.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Player.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/SanityValues.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketRequest.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketResult.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateRequest.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateResponse.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeAction.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeRequest.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelRequest.kt create mode 100644 shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelResult.kt diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..bad6a98 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + kotlin("multiplatform") version "2.4.10" apply false + alias(libs.plugins.compose) apply false + alias(libs.plugins.kotlin.compose) apply false + alias(libs.plugins.ktor) apply false + alias(libs.plugins.kotlin.serialization) apply false +} + +repositories { + mavenCentral() +} diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts new file mode 100644 index 0000000..f696e32 --- /dev/null +++ b/desktop/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + kotlin("jvm") + alias(libs.plugins.compose) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.kotlin.serialization) +} + +dependencies { + implementation(project(":shared")) + implementation("com.composables:icons-material-icons-filled-cmp:2.2.1") + implementation(libs.kotlinx.serialization) + implementation(project(":shared")) + implementation(libs.ktor.serialization.kotlinx.json) + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.client.content.negotiation) + implementation("com.composables:icons-material-icons-filled-cmp:2.2.1") + implementation("org.jetbrains.compose.material3:material3:1.9.0") + implementation(compose.desktop.currentOs) +} + +repositories { + mavenCentral() + google() +} + +compose.desktop { + application { + mainClass = "dev.geekback.dopewars.desktop.Main3Kt" + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ApiClient.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ApiClient.kt new file mode 100644 index 0000000..04397e9 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ApiClient.kt @@ -0,0 +1,117 @@ +package dev.geekback.dopewars.desktop + +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.Player +import dev.geekback.dopewars.shared.api.PlayerNameUpdateRequest +import dev.geekback.dopewars.shared.api.TravelRequest +import dev.geekback.dopewars.shared.api.TravelResult +import io.ktor.client.HttpClient +import io.ktor.client.call.body +import io.ktor.client.engine.cio.CIO +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation +import io.ktor.client.request.get +import io.ktor.client.request.post +import io.ktor.client.request.setBody +import io.ktor.client.statement.bodyAsText +import io.ktor.http.ContentType +import io.ktor.http.HttpStatusCode +import io.ktor.http.contentType +import io.ktor.serialization.kotlinx.json.json +import kotlinx.serialization.json.Json + +/** + * ApiClient + * + * Client for accessing the Dopewars API server + */ +class ApiClient() { + private var address: String = "" + private val client = HttpClient(CIO) { + install(ContentNegotiation) { + json( + Json { + allowSpecialFloatingPointValues = true + ignoreUnknownKeys = true + prettyPrint = true + isLenient = true + }) + } + } + + fun new(address: String) { + this.address = address + } + + /** + * login + * + * Create a new game + */ + suspend fun login(baseUrl: String): Player { + println("URL = [${baseUrl}/players]") + val response = client.post(urlString = "$baseUrl/players") { + contentType(ContentType.Application.Json) + } + + return if (response.status == HttpStatusCode.Created) { + response.body() + } else { + println("Login fail. -> ${response.status}") + Player(name = "Invalid Login Attempt", id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx") + } + } + + suspend fun market(forPlayer: Player): Market { + val result: Market = client.get("${this.address}/market/${forPlayer.id}") { + contentType(ContentType.Application.Json) + }.body() + + return result + } + + suspend fun rename(newName: String, player: Player): Player { + val response = client.post("${this.address}/players/${player.id}/rename") { + val newBody = PlayerNameUpdateRequest(newName) + setBody(newBody) + contentType(ContentType.Application.Json) + } + + return if (response.status == HttpStatusCode.OK) { + val result: Player = response.body() + println("Rename Success -> $result") + result + } else { + println("Rename Fail -> ${response.status} / ${this.address}/players/${player.id}/rename") + player + } + } + + suspend fun refreshPlayer(initialState: Player): Player { + val response = client.get("${this.address}/players/${initialState.id}") { + contentType(ContentType.Application.Json) + } + + return if (response.status == HttpStatusCode.OK) { + val result: Player = response.body() + println("Refresh Success -> $result") + result + } else { + println("Refresh Failure") + initialState + } + } + + suspend fun travel(baseUrl: String, playerId: String, destination: TravelRequest) { + val response = client.post("$baseUrl/players/${playerId}/travel") { + setBody(destination) + contentType(ContentType.Application.Json) + } + + println("Travel result -> $response") + } + +// suspend fun travel(destination: Location): TravelResult { +// val response = client.get("${this.address}/players/${this.player}") +// } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/AppTheme.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/AppTheme.kt new file mode 100644 index 0000000..f2f881c --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/AppTheme.kt @@ -0,0 +1,42 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Card +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun AppTheme(content: @Composable () -> Unit) { + Scaffold { + MaterialTheme { + content() + } + } +} + +@Composable +fun BorderedCard(title: String, content: @Composable () -> Unit) { + Card(modifier = Modifier + .border(BorderStroke(width = 1.dp, color = Color.Black)) + .fillMaxWidth() + .padding(16.dp)) { + Column { + Text( + modifier = Modifier.padding(16.dp), + text = title, + style = MaterialTheme.typography.titleMedium) + content() + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ClientState.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ClientState.kt new file mode 100644 index 0000000..cae9f46 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/ClientState.kt @@ -0,0 +1,64 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.ApiClient +import dev.geekback.dopewars.shared.Player +import dev.geekback.dopewars.shared.api.TravelRequest +import dev.geekback.dopewars.shared.api.TravelResult +import dev.geekback.dopewars.ui.PlayerUi + +class ClientState(player: Player) { + var player by mutableStateOf(player) + + var apiUrl: String = "http://localhost:8080" + private var api: ApiClient = ApiClient() + + suspend fun renamePlayer(newName: String) { + println("Renaming player from ${this.player.name} to $newName") + this.player = this.api.rename(newName, this.player) + } + + suspend fun login() : Player { + val p = this.api.login("http://localhost:8080") + println("Logged in as ${p.name} / ${p.id}") + return p + } + + suspend fun updateMarket() { + println("Updating market") + this.player.lastMarket = this.api.market(this.player) + println("Market updated to this -> ${this.player.lastMarket}") + } + + suspend fun refreshPlayer() { + println("Refreshing player") + this.player = this.api.refreshPlayer(this.player) + println("Refreshed player") + } + + fun isLoggedIn(): Boolean { + println("Testing if user is logged in - ${this.player.id.isNotEmpty()}") + return this.player.id.isNotEmpty() + } + + fun refreshApi(url: String) { + println("[XXX] Refreshing API UrL to $url") + this.api.new(url) + } + + + suspend fun travel(player: Player, destination: TravelRequest) { + val result = this.api.travel("http://localhost:8080", player.id, destination) + + } + + companion object { + fun new(): ClientState { + return ClientState( + Player.new() + ) + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/DemoMain3.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/DemoMain3.kt new file mode 100644 index 0000000..afae8c3 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/DemoMain3.kt @@ -0,0 +1,181 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Button +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.window.Window +import androidx.compose.ui.window.application +import dev.geekback.dopewars.shared.Drug +import dev.geekback.dopewars.shared.DrugInfo +import dev.geekback.dopewars.shared.Drugs +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Locations +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.Player +import dev.geekback.dopewars.shared.api.MarketRequest +import dev.geekback.dopewars.shared.api.MarketResult +import dev.geekback.dopewars.shared.api.PlayerNameUpdateRequest +import dev.geekback.dopewars.shared.api.PlayerNameUpdateResponse +import dev.geekback.dopewars.shared.api.TradeAction +import dev.geekback.dopewars.shared.api.TradeRequest +import dev.geekback.dopewars.shared.api.TravelRequest +import dev.geekback.dopewars.shared.api.TravelResult +import dev.geekback.dopewars.ui.DopeWarsUi +import kotlinx.coroutines.launch + +fun main() = application { + Window( + onCloseRequest = ::exitApplication, + title = "DopeWars Dev Client" + ) { + DemoApp() + } +} + +data class ApiData( + var marketRequest: MarketRequest, + var marketResult: MarketResult, + var playerNameUpdateRequest: PlayerNameUpdateRequest, + var playerNameUpadteResponse: PlayerNameUpdateResponse, + var tradeAction: TradeAction, + var tradeRequest: TradeRequest, + var travelRequest: TravelRequest, + var travelResult: TravelResult +) + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun DemoApp() { + val drawerState = rememberDrawerState(DrawerValue.Closed) + val scope = rememberCoroutineScope() + var currentScreen by remember { mutableStateOf(Screens.HOME) } + var drug by remember { mutableStateOf(DrugInfo(drug = Drug.WEED, minValue = 100.0f, maxValue = 1000.0f)) } + var player by remember { mutableStateOf(Player(id = "____", name = "TBD")) } + var location by remember { mutableStateOf(Location(name = "LocationDefault"))} + var market by remember { mutableStateOf(Market( + location = Location(name = "MarketDefault"), + prices = mapOf() + ))} + + val ui = DopeWarsUi.new() + + val travelResultLocation = Locations.random(); + + var api by remember { mutableStateOf(ApiData( + marketRequest = MarketRequest( + location = Location(name = "MarketRequestLocation") + ), + marketResult = MarketResult( + market = Market(location = Location(name = "MarketResultLocation"), + prices = emptyMap() + ) + ), + playerNameUpdateRequest = PlayerNameUpdateRequest("newPlayerName"), + playerNameUpadteResponse = PlayerNameUpdateResponse( + updatedPlayer = Player(id = "____", name = "updatedPlayerName") + ), + tradeAction = TradeAction.BUY, + tradeRequest = TradeRequest( + action = TradeAction.BUY, + drug = Drug.random(), + quantity = 10 + ), + travelRequest = TravelRequest( + destination = Locations.random() + ), + travelResult = TravelResult( + location = travelResultLocation, + day = 1, + market = Market(location = travelResultLocation, mapOf()) + ) + )) } + + MaterialTheme { + ModalNavigationDrawer( + drawerState = drawerState, + drawerContent = { + ModalDrawerSheet { + Button(onClick = { + currentScreen = Screens.HOME + scope.launch { drawerState.close() } + }) { Text("Home")} + + + Button( onClick = { + currentScreen = Screens.DRUG + scope.launch { drawerState.close() } + }) { Text("Drug") } + + Button( onClick = { + currentScreen = Screens.PLAYER + scope.launch { drawerState.close() } + }) { Text("Player") } + + Button(onClick = { + currentScreen = Screens.LOCATION + scope.launch { drawerState.close() } + }) { Text("Location") } + + Button( onClick = { + currentScreen = Screens.API + scope.launch { drawerState.close() } + }) { Text("API") } + + } + } + ) { + // Main content + when (currentScreen) { + Screens.HOME -> { + Column { + ui.player.view(player) + // ui.drug.view(drug) + } + } + Screens.DRUG -> { + // ui.drug.form(drug) { + // drug = it + // } + } + Screens.PLAYER -> { + ui.player.form(player) { + player = it + } + } + Screens.LOCATION -> { + ui.location.form(location) { + location = it + } + } + Screens.MARKET -> { + ui.market.form(market) { + market = it + } + } + Screens.API -> { + Column { + ui.api.marketRequest.form(api.marketRequest) { api.marketRequest = it } + ui.api.marketResponse.form(api.marketResult) { api.marketResult = it } + ui.api.playerNameUpdateRequest.form(api.playerNameUpdateRequest) { api.playerNameUpdateRequest = it } + ui.api.playerNameUpdateResponse.form(api.playerNameUpadteResponse) { api.playerNameUpadteResponse = it } + ui.api.travelRequest.form(api.travelRequest) { api.travelRequest = it } + ui.api.travelResponse.form(api.travelResult) { api.travelResult = it} + ui.api.tradeRequest.form(api.tradeRequest) { api.tradeRequest = it} + } + } + } + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main.kt new file mode 100644 index 0000000..8329093 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main.kt @@ -0,0 +1,139 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.Button +import androidx.compose.material3.DrawerState +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Modifier +import androidx.compose.ui.window.Window +import androidx.compose.ui.window.application +import com.composables.icons.materialicons.MaterialIcons +import com.composables.icons.materialicons.filled.Menu +import dev.geekback.dopewars.shared.Drug +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Player +import kotlinx.coroutines.launch + + +fun main() { + val state = ClientState(Player(id = "", name = "TestClient")) + // var drug = Drug("TestDrug", minPrice = 10.0f, maxPrice = 100.0f) + var player = Player(id = "default", name = "defaultName") + var location = Location(name = "DefaultLocation") + application { + var currentScreen = remember { Screens.DRUG } + val scope = rememberCoroutineScope() + // state.updateApiUrl("http://localhost:8080") + // val scaffoldState = rememberScaffoldState(drawerState = DrawerState(DrawerValue.Closed)) + + // var menuVisible by remember { mutableStateOf(false) } + Window(onCloseRequest = ::exitApplication, title = "DopeWars") { + /* + Scaffold( + scaffoldState = scaffoldState, + drawerContent = { + Button(onClick = { + currentScreen = Screens.DRUG + scope.launch { + scaffoldState.drawerState.close() + } + }) { Text("Drug")} + + Button(onClick = { + currentScreen = Screens.PLAYER + scope.launch { + scaffoldState.drawerState.close() + } + }) { Text("Player") } + }, + topBar = { + TopAppBar( + title = { + Text("Title") + }, + navigationIcon = { + IconButton(onClick = { + scope.launch { + scaffoldState.drawerState.open() + } + }) { + Icon(imageVector = MaterialIcons.Filled.Menu , contentDescription = "Menu") + } + }) + } + ) { + */ + AppTheme { + Text("Test123") + + Column(modifier = Modifier.fillMaxSize()) { + /* + when (currentScreen) { + Screens.DRUG -> { + drugForm(drug) { + drug = it + } + + drugView(drug) + } + Screens.PLAYER -> { + playerView(player) + } + Screens.LOCATION -> { + locationView(location) + locationForm(location) { + location = it + } + } + Screens.INVENTORY -> { + inventoryView(emptyList()) + } + Screens.MARKET -> { + marketView(Market(Location("Unknown Location"), emptyMap())) + } + } + */ + } + } + } + + /* + println("Session ID = ${state.player.id}") + Column { + Text("DopeWars Desktop Client") + configPanel(config = state, onUrlChanged = { + state.updateApiUrl(it) + }) + PlayerForm( + initialState = state.player, + onRequestLogin = { + scope.launch { + state.login() + } + }, + onRequestPlayerRename = { newName -> + scope.launch { + state.renamePlayer(newName) + } + }, + onGetMarket = { + scope.launch { + state.updateMarket() + } + }, + onRefresh = { + scope.launch { + state.refreshPlayer() + } + } + ) + } + */ + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main3.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main3.kt new file mode 100644 index 0000000..61fcfdf --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Main3.kt @@ -0,0 +1,124 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.DrawerValue +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.ModalDrawerSheet +import androidx.compose.material3.ModalNavigationDrawer +import androidx.compose.material3.NavigationDrawerItem +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDrawerState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Window +import androidx.compose.ui.window.application +import com.composables.icons.materialicons.MaterialIcons +import com.composables.icons.materialicons.filled.Login +import dev.geekback.dopewars.ui.PlayerUi +import dev.geekback.dopewars.ui.TravelUi +import kotlinx.coroutines.launch + +fun main() { + application { + Window( + onCloseRequest = ::exitApplication, + title = "DopeWars" + ) { + App() + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun App() { + var state by remember { mutableStateOf(ClientState.new() ) } + val drawerState = rememberDrawerState(DrawerValue.Closed) + val scope = rememberCoroutineScope() + + AppTheme { + ModalNavigationDrawer( + drawerState = drawerState, + drawerContent = { + ModalDrawerSheet { + if (state.isLoggedIn()) { + // Display the current player state + PlayerUi().view(state.player) + } else { + NavigationDrawerItem( + label = { + Row { + Icon( + modifier = Modifier.padding(16.dp), + imageVector = MaterialIcons.Filled.Login, + contentDescription = "Login Icon" + ) + Text( + modifier = Modifier.padding(16.dp), + text = "Login" + ) + } + }, + selected = false, + onClick = { + scope.launch { + state.player = state.login() + } + } + ) + } + } + } + ) { + if (state.isLoggedIn()) { + mainWindow(state) + } else { + Column(modifier = Modifier.padding(16.dp)) { + Text("<-- Start a new game") + } + } + } + } +} + + +@Composable +fun mainWindow(state: ClientState) { + val scope = rememberCoroutineScope(); + var showingTravelWizard by remember { mutableStateOf(false) } + + PlayerUi().view(state.player) + Row { + Button(onClick = { + println("Transactions") + }) { + Text("Transactions") + } + + Button(onClick = { + showingTravelWizard = true + }) { + Text("Travel") + } + + if (showingTravelWizard) { + TravelUi().wizard(state.player) { + println("Player wants to go to $it") + showingTravelWizard = false + scope.launch { + state.travel(state.player, it) + } + } + } + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Screens.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Screens.kt new file mode 100644 index 0000000..c1a2b6f --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/Screens.kt @@ -0,0 +1,10 @@ +package dev.geekback.dopewars.desktop + +enum class Screens { + HOME, + DRUG, + PLAYER, + LOCATION, + MARKET, + API +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/configPanel.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/configPanel.kt new file mode 100644 index 0000000..8a79e01 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/configPanel.kt @@ -0,0 +1,37 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue + + +@Composable +fun configPanel(config: ClientState, onUrlChanged: (String) -> Unit) { + + var apiUrl by remember { mutableStateOf(config.apiUrl) } + + Card { + Column { + Text("Configuration") + Row { + Text("ApiURL = $apiUrl") + Text("Config.apiUrl = ${config.apiUrl}") + TextField(value = apiUrl, onValueChange = { apiUrl = it }) + + Button({ + onUrlChanged(apiUrl) + }) { + Text("Update API Url") + } + } + } + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/playerForm.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/playerForm.kt new file mode 100644 index 0000000..4c139f8 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/desktop/playerForm.kt @@ -0,0 +1,61 @@ +package dev.geekback.dopewars.desktop + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.Player + +@Composable +fun MarketDisplay(market: Market?) { + if (market == null) { + Text("No Market Available") + } else { + Card { + Column { + Text("Market for ${market.location}", modifier = Modifier.padding(16.dp)) + market.prices.forEach { (name, price) -> + Text("$name = $${price}") + } + } + } + } +} + +@Composable +fun PlayerForm( + initialState: Player, + onRequestLogin: () -> Unit, + onRequestPlayerRename: (String) -> Unit, + onGetMarket: () -> Unit, + onRefresh: () -> Unit +) { + var username by remember { mutableStateOf(initialState.name) } + + Column { + Text("This is for player $username") + Text("Session ID: [${initialState.id}]") + Card { + Column { + Button({ onRequestLogin() }) { Text("New Session") } + TextField(value = username, onValueChange = { username = it }, label = { Text("Username") }) + Button(onClick = { onRequestPlayerRename(username) }) { Text("Update Player Name") } + Button(onClick = { onGetMarket() }) { Text("Get the Market") } + Button(onClick = { onRefresh() }) { Text("Refresh Player") } + + MarketDisplay(initialState.lastMarket) + } + } + } + // form fields +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/DopeWarsModelUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/DopeWarsModelUi.kt new file mode 100644 index 0000000..5be4a88 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/DopeWarsModelUi.kt @@ -0,0 +1,36 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.shared.DrugInfo +import dev.geekback.dopewars.ui.api.ApiUi + +interface DopeWarsModelUi { + @Composable + fun view(model: T); + @Composable + fun form(model: T, onModelUpdate: (T) -> Unit) +} + +data class DopeWarsUi( + val drug: DrugInfoUi, + val inventory: InventoryUi, + val inventoryItem: InventoryItemUi, + val location: LocationUi, + val market: MarketUi, + val player: PlayerUi, + val api: ApiUi +) { + companion object { + fun new() : DopeWarsUi { + return DopeWarsUi( + drug = DrugInfoUi(), + inventory = InventoryUi(), + inventoryItem = InventoryItemUi(), + location = LocationUi(), + market = MarketUi(), + player = PlayerUi(), + api = ApiUi.new() + ) + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/TravelUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/TravelUi.kt new file mode 100644 index 0000000..368e955 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/TravelUi.kt @@ -0,0 +1,90 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.onClick +import androidx.compose.material3.Button +import androidx.compose.material3.Card +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Window +import com.composables.icons.materialicons.MaterialIcons +import com.composables.icons.materialicons.filled.Menu +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Locations +import dev.geekback.dopewars.shared.Player +import dev.geekback.dopewars.shared.api.TravelRequest + +class TravelUi { + /* + Wizard + + Holds the users hand through picking a new location + */ + @Composable + fun wizard(current: Player, onTicketPunched: (TravelRequest) -> Unit) { + var stage by remember { mutableStateOf(0) } + var pickedLocation by remember { mutableStateOf(0) } + val locations = Locations.all + var expanded by remember { mutableStateOf(false) } + Window(onCloseRequest = { onTicketPunched(TravelRequest(destination = current.location)) }, title = "Select New Location") { + Card(modifier = Modifier.padding(16.dp).fillMaxSize()) { + Column { + Text("Wizard") + var index = 0; + when (stage) { + 0 -> { + Text(text = locations[pickedLocation].name) + IconButton(onClick = { expanded = !expanded }) { + Icon(MaterialIcons.Filled.Menu, contentDescription = "More options") + } + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false } + ) { + locations.forEach { + DropdownMenuItem( + text = { Text("$it.name / $index")}, + onClick = { + expanded = false + pickedLocation = (index - 1) + println("location index to $index") + } + ) + index += 1; + } + } + + Button(onClick = { + stage += 1 + }) { + Text("Next Step") + } + } + 1 -> { + Text("Stage 1") + Button(onClick = { + println("Selected Location - $pickedLocation") + onTicketPunched(TravelRequest(locations[pickedLocation])) + }) { + Text("Finish") + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/ApiUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/ApiUi.kt new file mode 100644 index 0000000..26b2cf3 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/ApiUi.kt @@ -0,0 +1,26 @@ +package dev.geekback.dopewars.ui.api + +data class ApiUi( + val marketRequest: MarketRequestUi, + val marketResponse: MarketResponseUi, + val playerNameUpdateRequest: PlayerNameUpdateRequestUi, + val playerNameUpdateResponse: PlayerNameUpdateResponseUi, + val tradeRequest: TradeRequestUi, + // TODO: tradeResponse + val travelRequest: TravelRequestUi, + val travelResponse: TravelResponseUi, +) { + companion object { + fun new(): ApiUi { + return ApiUi( + marketRequest = MarketRequestUi(), + marketResponse = MarketResponseUi(), + playerNameUpdateRequest = PlayerNameUpdateRequestUi(), + playerNameUpdateResponse = PlayerNameUpdateResponseUi(), + tradeRequest = TradeRequestUi(), + travelRequest = TravelRequestUi(), + travelResponse = TravelResponseUi() + ) + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketRequestUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketRequestUi.kt new file mode 100644 index 0000000..e02d35f --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketRequestUi.kt @@ -0,0 +1,47 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.api.MarketRequest +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.ui.LocationUi + +class MarketRequestUi: DopeWarsModelUi { + @Composable + override fun view(model: MarketRequest) { + BorderedCard("Market Request for ${model.location.name}") { + LocationUi().view(model.location) + } + } + + @Composable + override fun form( + model: MarketRequest, + onModelUpdate: (MarketRequest) -> Unit + ) { + var localModel by remember { mutableStateOf(model) } + BorderedCard("Market Request Form") { + Column { + LocationUi().form(model.location) { + localModel = MarketRequest(location = it) + } + Row { + Button(onClick = { onModelUpdate(localModel) }) { + Text("Apply") + } + Button(onClick = { localModel = model }) { + Text("Cancel") + } + } + } + } + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketResponseUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketResponseUi.kt new file mode 100644 index 0000000..11b1c2e --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/MarketResponseUi.kt @@ -0,0 +1,29 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.api.MarketResult +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.ui.MarketUi + +class MarketResponseUi: DopeWarsModelUi { + @Composable + override fun view(model: MarketResult) { + BorderedCard("Market Result for ${model.market.location.name}") { + MarketUi().view(model.market) + } + } + + @Composable + override fun form( + model: MarketResult, + onModelUpdate: (MarketResult) -> Unit + ) { + BorderedCard("Market Result Form") { + MarketUi().form(model.market) { + onModelUpdate(model) + } + } + } + +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateRequestUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateRequestUi.kt new file mode 100644 index 0000000..70634f8 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateRequestUi.kt @@ -0,0 +1,25 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.shared.api.PlayerNameUpdateRequest + +class PlayerNameUpdateRequestUi(): DopeWarsModelUi { + @Composable + override fun view(model: PlayerNameUpdateRequest) { + BorderedCard("Player Name Update Request for ${model.newName}") { + } + } + + @Composable + override fun form(model: PlayerNameUpdateRequest, onModelUpdate: (PlayerNameUpdateRequest) -> Unit) { + Text("Player Name Update Request Form") + Button(onClick = { onModelUpdate(model) }) { + Text("Update with same data") + } + } + +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateResponseUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateResponseUi.kt new file mode 100644 index 0000000..6fa3556 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/PlayerNameUpdateResponseUi.kt @@ -0,0 +1,26 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.ui.PlayerUi +import dev.geekback.dopewars.shared.api.PlayerNameUpdateResponse + +class PlayerNameUpdateResponseUi: DopeWarsModelUi { + @Composable + override fun view(model: PlayerNameUpdateResponse) { + BorderedCard("Player Name Update Response") { + PlayerUi().view(model.updatedPlayer) + } + } + + @Composable + override fun form( + model: PlayerNameUpdateResponse, + onModelUpdate: (PlayerNameUpdateResponse) -> Unit + ) { + PlayerUi().form(model.updatedPlayer) { + onModelUpdate(model) + } + } +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TradeRequestUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TradeRequestUi.kt new file mode 100644 index 0000000..8850e9f --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TradeRequestUi.kt @@ -0,0 +1,50 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.api.TradeRequest +import dev.geekback.dopewars.ui.DopeWarsModelUi + +class TradeRequestUi: DopeWarsModelUi { + @Composable + override fun view(model: TradeRequest) { + BorderedCard("Trade Request for ${model.drug.name} / ${model.action} / ${model.quantity}") { + + } + } + + @Composable + override fun form( + model: TradeRequest, + onModelUpdate: (TradeRequest) -> Unit + ) { + var localModel by remember { mutableStateOf(model) } + var actionIndex by remember { mutableStateOf(0) } + var quantity by remember { mutableStateOf(model.quantity) } + var drug by remember { mutableStateOf(model.drug) } + + BorderedCard("Trade Requesst Form") { + Row { + Button(onClick = { + onModelUpdate(localModel) + println("Trade Request Form Apply Clicked") + }) { + Text("Apply") + } + Button(onClick = { + localModel = model + }) { + Text("Cancel") + } + } + } + } + +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelRequestUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelRequestUi.kt new file mode 100644 index 0000000..3fd84b4 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelRequestUi.kt @@ -0,0 +1,25 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.shared.api.TravelRequest + +class TravelRequestUi: DopeWarsModelUi { + @Composable + override fun view(model: TravelRequest) { + BorderedCard("Travel Request to ${model.destination.name}") { + } + } + + @Composable + override fun form( + model: TravelRequest, + onModelUpdate: (TravelRequest) -> Unit + ) { + BorderedCard("Travel Request Form") { + Text("Location Picker goes here.") + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelResponseUi.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelResponseUi.kt new file mode 100644 index 0000000..72aaac1 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/api/TravelResponseUi.kt @@ -0,0 +1,54 @@ +package dev.geekback.dopewars.ui.api + +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.api.TravelResult +import dev.geekback.dopewars.ui.DopeWarsModelUi +import dev.geekback.dopewars.ui.LocationUi +import dev.geekback.dopewars.ui.MarketUi + +class TravelResponseUi: DopeWarsModelUi { + + @Composable + override fun view(model: TravelResult) { + BorderedCard("Travel Result ${model.location.name}") { + LocationUi().view(model.location) + Text("Day: ${model.day}") + MarketUi().view(model.market) + + } + } + + @Composable + override fun form(model: TravelResult, onModelUpdate: (TravelResult) -> Unit) { + var day by remember { mutableStateOf(model.day) } + var location by remember { mutableStateOf(model.location) } + var market by remember { mutableStateOf(model.market) } + var localModel by remember { mutableStateOf(model) } + + BorderedCard("Travel Result Form") { + LocationUi().form(model.location) { + println("Update location to $it") + } + + Row { + Button(onClick = {}) { + Text("Apply") + } + + Button(onClick = {}) { + Text("Cancel") + } + } + + } + } + +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/drug.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/drug.kt new file mode 100644 index 0000000..c64b81d --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/drug.kt @@ -0,0 +1,94 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.RangeSlider +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.DRUG_MAX_PRICE +import dev.geekback.dopewars.shared.Drug +import dev.geekback.dopewars.shared.DrugInfo + +class DrugInfoUi: DopeWarsModelUi { + @Composable + override fun view(model: DrugInfo) { + BorderedCard(model.drug.name) { + Column { + Text("Price: ${model.minValue} - ${model.maxValue}") + } + } + } + + @Composable + override fun form( + model: DrugInfo, + onModelUpdate: (DrugInfo) -> Unit + ) { + var drug by remember { mutableStateOf(model) } + var name by remember { mutableStateOf(model.drug.name) } + var minPrice by remember { mutableFloatStateOf(model.minValue) } + var maxPrice by remember { mutableFloatStateOf(model.maxValue) } + + BorderedCard("Drug Form") { + Column { + // Name + TextField( + value = name, + onValueChange = { name = it }, + label = { Text("Name") }, + ) + + Row { + TextField( + value = minPrice.toString(), + onValueChange = { minPrice = it.toFloatOrNull() ?: minPrice }, + label = { Text("Min Price") }, + ) + + TextField( + value = maxPrice.toString(), + onValueChange = { maxPrice = it.toFloatOrNull() ?: maxPrice }, + label = { Text("Max Price") }, + ) + } + + RangeSlider( + value = (minPrice)..(maxPrice), + onValueChangeFinished = { }, + valueRange = 1f..DRUG_MAX_PRICE, + onValueChange = { it -> + minPrice = it.start + maxPrice = it.endInclusive + } + ) + + Row { + Button(onClick = { + drug = DrugInfo(Drug.WEED , minPrice, maxPrice) + onModelUpdate(drug) + }) { + Text("Apply") + } + + Button(onClick = { + name = Drug.WEED.name + minPrice = drug.minValue + maxPrice = drug.maxValue + }) { + Text("Cancel") + } + } + } + } + + } + } diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventory.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventory.kt new file mode 100644 index 0000000..2e3b474 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventory.kt @@ -0,0 +1,29 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.InventoryItem + +class InventoryUi: DopeWarsModelUi> { + @Composable + override fun view(model: List) { + BorderedCard("Inventory Items") { + + } + } + + @Composable + override fun form( + model: List, + onModelUpdate: (List) -> Unit + ) { + BorderedCard("Inventory Items Form") { + Button(onClick = { onModelUpdate(model) }) { + Text("Update") + } + } + } + +} \ No newline at end of file diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventoryItem.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventoryItem.kt new file mode 100644 index 0000000..c066862 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/inventoryItem.kt @@ -0,0 +1,19 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.shared.InventoryItem + +class InventoryItemUi: DopeWarsModelUi { + @Composable + override fun view(model: InventoryItem) { + + } + + @Composable + override fun form( + model: InventoryItem, + onModelUpdate: (InventoryItem) -> Unit + ) { + TODO("Not yet implemented") + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/location.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/location.kt new file mode 100644 index 0000000..593fd13 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/location.kt @@ -0,0 +1,55 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.foundation.layout.Row +import androidx.compose.material3.Button +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.Location + +class LocationUi: DopeWarsModelUi { + @Composable + override fun view(model: Location) { + BorderedCard("Location - ${model.name}") { + } + } + + @OptIn(ExperimentalMaterial3Api::class) + @Composable + override fun form( + model: Location, + onModelUpdate: (Location) -> Unit + ) { + var name by remember { mutableStateOf(model.name) } + var location by remember { mutableStateOf(model)} + + BorderedCard("Location") { + TextField(value = name, label = { + Text("Location Name") + }, onValueChange = { + name = it + }) + + Row { + Button(onClick = { + location.name = name; + onModelUpdate(location) + }) { + Text("Apply") + } + + Button(onClick = { + name = location.name + }) { + Text("Cancel") + } + } + } + } +} diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/market.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/market.kt new file mode 100644 index 0000000..4ea6823 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/market.kt @@ -0,0 +1,38 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.Market + +class MarketUi: DopeWarsModelUi { + @Composable + override fun view(model: Market) { + val prices = model.prices.toList() + BorderedCard("Market for ${model.location.name}") { + Column { + LazyColumn { + items(prices.size) { index -> + val item = prices[index]; + val name = item.first.name + val price = item.second.toFloat() + Text("Drug $name $${price}") + } + } + } + } + } + + @Composable + override fun form( + model: Market, + onModelUpdate: (Market) -> Unit + ) { + BorderedCard("Market for ${model.location.name}") { + Text("Market goes here.") + } + } +} + diff --git a/desktop/src/main/kotlin/dev/geekback/dopewars/ui/player.kt b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/player.kt new file mode 100644 index 0000000..29c93a9 --- /dev/null +++ b/desktop/src/main/kotlin/dev/geekback/dopewars/ui/player.kt @@ -0,0 +1,47 @@ +package dev.geekback.dopewars.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Button +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import dev.geekback.dopewars.desktop.BorderedCard +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.Player +import kotlin.time.Instant + +class PlayerUi: DopeWarsModelUi { + @Composable + override fun view(model: Player) { + BorderedCard(model.name) { + Column { + Text("ID: ${model.id}") + Text("Cash: $${model.cash}") + Text("Debt: $${model.debt}") + Text("Health: ${model.health}") + Text("Location: ${model.location.name}") + // TODO: this is an ugly memory hack + InventoryUi().view(model.inventory) + // marketView(model.lastMarket ?: Market(location = Location("Unknown"), prices = mapOf())) + val lastTime = Instant.fromEpochSeconds(model.lastActionTime) + Text("Last Action: $lastTime") + } + } + } + + @Composable + override fun form( + model: Player, + onModelUpdate: (Player) -> Unit + ) { + BorderedCard("Player ${model.name}") { + Button(onClick = { onModelUpdate(model) }) { + Text("Update") + } + } + } +} + +@Composable +fun playerView(player: Player) { +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..095df51 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,36 @@ +[versions] +ktor = "3.5.1" +kotlin = "2.4.0" +compose = "1.11.1" +datetime = "0.8.0" +logback = "1.5.38" +serialization = "1.11.0" + +[plugins] +compose = { id = "org.jetbrains.compose", version.ref="compose" } +ktor = { id = "io.ktor.plugin", version.ref="ktor" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref="kotlin" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } + +[libraries] +# KotlinX Modules +kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref="serialization" } +kotlinx-datetime = { group = "org.jetbrains.kotlinx", name="kotlinx-datetime", version.ref="datetime"} +logback = { group = "ch.qos.logback", name ="logback-classic", version.ref = "logback" } +# KTOR Common +ktor-serialization-kotlinx-json = { group = "io.ktor", name="ktor-serialization-kotlinx-json", version.ref="ktor" } +# KTOR Server +ktor-server-swagger = { group = "io.ktor", name="ktor-server-swagger", version.ref="ktor"} +ktor-server-test-host = { group = "io.ktor", name="ktor-server-test-host", version.ref="ktor"} +ktor-server-openapi = { group = "io.ktor", name = "ktor-server-openapi", version.ref = "ktor" } +ktor-server-routing-openapi = { group = "io.ktor", name = "ktor-server-routing-openapi", version.ref = "ktor" } +ktor-server-content-negotiation = { group = "io.ktor", name="ktor-server-content-negotiation", version.ref="ktor" } +ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" } +ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" } +ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref = "ktor" } +ktor-server-status-pages = { group ="io.ktor", name="ktor-server-status-pages", version.ref="ktor" } +ktor-server-logging = { group = "io.ktor", name="ktor-server-call-logging", version.ref="ktor" } +# KTOR client +ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" } +ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref="ktor" } +ktor-client-content-negotiation = { group = "io.ktor", name = "ktor-client-content-negotiation", version.ref="ktor" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2a84e18 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..ef07e01 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/server/build.gradle.kts b/server/build.gradle.kts new file mode 100644 index 0000000..62f09e0 --- /dev/null +++ b/server/build.gradle.kts @@ -0,0 +1,59 @@ +plugins { + kotlin("jvm") + alias(libs.plugins.ktor) + application +} + +repositories { + mavenCentral() +} + +dependencies { + // Ktor + implementation(libs.ktor.server.core) + implementation(libs.ktor.server.netty) + + // JSON + implementation(libs.ktor.serialization.kotlinx.json) + + // Status Pages / Exception Handling + implementation(libs.ktor.server.status.pages) + + // Logging + implementation(libs.ktor.server.logging) + implementation(libs.logback) + implementation(libs.ktor.server.swagger) + + // Testing + testImplementation(libs.ktor.server.test.host) + testImplementation(kotlin("test")) + + // Websockets + implementation(libs.ktor.server.websockets) + + // Swagger/OpenAPI + implementation(libs.ktor.server.openapi) + implementation(libs.ktor.server.routing.openapi) + implementation(libs.ktor.server.content.negotiation) + + // General Use + implementation(libs.kotlinx.datetime) + + implementation(project(":shared")) + implementation("ch.qos.logback:logback-classic:1.6.3") + +} + +application { + mainClass = "dev.geekback.dopewars.server.ServerKt" +} +// +//// Copy the JS+HTML from web to here +//tasks.processResources { +// dependsOn(":web:wasmJsBrowserProductionWebpack") +// +// from(project(":web") +// .layout +// .buildDirectory +// .dir("dist/js/productionExecutable")) +//} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/Server.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/Server.kt new file mode 100644 index 0000000..c76a2b8 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/Server.kt @@ -0,0 +1,88 @@ +package dev.geekback.dopewars.server + +import dev.geekback.dopewars.server.routes.gameRoutes +import dev.geekback.dopewars.server.routes.marketRoutes +import dev.geekback.dopewars.server.routes.modelCrudRoutes +import dev.geekback.dopewars.server.routes.playerRoutes +import dev.geekback.dopewars.server.services.GameService +import dev.geekback.dopewars.server.services.MarketService +import io.ktor.serialization.kotlinx.json.* +import io.ktor.server.application.* +import io.ktor.server.engine.* +import io.ktor.server.http.content.* +import io.ktor.server.netty.* +import io.ktor.server.plugins.calllogging.* +import io.ktor.server.plugins.contentnegotiation.* +import io.ktor.server.plugins.openapi.* +import io.ktor.server.routing.* +import io.ktor.server.websocket.* +import io.ktor.websocket.* +import kotlinx.serialization.json.Json +import org.slf4j.event.Level + +fun Application.module() { + println("[ # ] Loading Call Logging Plugin") + install(CallLogging) { + level = Level.INFO + } + + println("[ # ] Loading Web Sockets Plugin") + install(WebSockets); + + println("[ # ] Loading Content Negotiation Plugin") + install(ContentNegotiation) { + json(Json { + prettyPrint = true + isLenient = true + ignoreUnknownKeys = true + allowStructuredMapKeys = true + }) + } + + println("[ # ] Plugins Loaded") + + val marketService = MarketService() + val gameService = GameService(marketService) + + routing { + + playerRoutes(marketService, gameService) + marketRoutes(marketService, gameService) + gameRoutes(gameService) + modelCrudRoutes(marketService) + + webSocket("/ws") { + send("Welcome to DopeWars"); + for (frame in incoming) { + if (frame is Frame.Text) send("Echo: ${frame.readText()}") + } + } + + openAPI(path = "openapi") { + /* + Documentation source configuration goes here. + + This can be from file (documentation.yaml), or it can be served dynamically from your sources using the + `describe {}` API on routes. When `openApi` enabled in Gradle, these calls will be automatically injected + based on your code and comments. + */ + } + + staticResources("/", "") + } +} + +fun main() { + + val port = 8080 + val host = "0.0.0.0" + + val server = embeddedServer(Netty, port, host = host) { + module() + + println("[+] Listening on http://$host:$port") + } + + server.start(wait = true) + println("Past the server.start") +} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/repository/PlayerRepository.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/repository/PlayerRepository.kt new file mode 100644 index 0000000..91a64a1 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/repository/PlayerRepository.kt @@ -0,0 +1,25 @@ +package dev.geekback.dopewars.server.repository + +import dev.geekback.dopewars.shared.Player +import java.time.LocalDateTime + +object PlayerRepository { + + private val players = mutableMapOf() + + fun save(player: Player) { + players[player.id] = player + } + + fun find(id: String): Player? { + return players[id] + } + + fun all(): Collection { + return players.values + } + + fun getNextName(): String { + return "Player at ${LocalDateTime.now()}" + } +} \ No newline at end of file diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/routes/GameRoutes.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/GameRoutes.kt new file mode 100644 index 0000000..9570ddc --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/GameRoutes.kt @@ -0,0 +1,98 @@ +package dev.geekback.dopewars.server.routes + +import dev.geekback.dopewars.server.repository.PlayerRepository +import dev.geekback.dopewars.server.services.GameService +import dev.geekback.dopewars.shared.api.TradeRequest +import dev.geekback.dopewars.shared.api.TravelRequest +import io.ktor.http.HttpStatusCode +import io.ktor.server.request.receive +import io.ktor.server.routing.Route +import io.ktor.server.routing.post +import io.ktor.server.response.respond +import io.ktor.utils.io.ExperimentalKtorApi + +@OptIn(ExperimentalKtorApi::class) +fun Route.gameRoutes( + gameService: GameService +) { + // + post("/players/{playerId}/travel") { + val playerId = + call.parameters["playerId"] + ?: return@post call.respond( + HttpStatusCode.BadRequest + ) + + println("Player = $playerId") + + val request = + call.receive() + + println("TravelRequest = $request") + + val player = + PlayerRepository.find(playerId) + ?: return@post call.respond( + HttpStatusCode.NotFound + ) + + println("Player loaded") + + try { + + val result = gameService.travel( + player, + request.destination + ) + + call.respond(result) + + } catch (e: IllegalArgumentException) { + + + println("ERROR = $e") + + call.respond( + HttpStatusCode.BadRequest, + mapOf( + "error" to (e.message ?: "Travel failed") + ) + ) + } + } + + post("/players/{playerId}/trade") { + val playerId = + call.parameters["playerId"] + ?: return@post call.respond( + HttpStatusCode.BadRequest, + mapOf("error" to "Missing playerId") + ) + + val player = + PlayerRepository.find(playerId) + ?: return@post call.respond( + HttpStatusCode.NotFound, + mapOf("error" to "Player not found") + ) + + val request = call.receive() + + try { + + val updatedPlayer = + gameService.trade(player, request) + + call.respond(updatedPlayer) + + } catch (e: IllegalArgumentException) { + + call.respond( + HttpStatusCode.BadRequest, + mapOf( + "error" to (e.message ?: "Invalid trade") + ) + ) + } + } +} \ No newline at end of file diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/routes/MarketRoutes.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/MarketRoutes.kt new file mode 100644 index 0000000..01b6040 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/MarketRoutes.kt @@ -0,0 +1,63 @@ +package dev.geekback.dopewars.server.routes + +import dev.geekback.dopewars.server.repository.PlayerRepository +import dev.geekback.dopewars.server.services.GameService +import dev.geekback.dopewars.server.services.MarketService +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.api.MarketResult +import io.ktor.http.ContentType +import io.ktor.http.HttpStatusCode +import io.ktor.openapi.jsonSchema +import io.ktor.server.response.respond +import io.ktor.server.routing.Route +import io.ktor.server.routing.get +import io.ktor.server.routing.openapi.describe +import io.ktor.server.routing.route +import io.ktor.utils.io.ExperimentalKtorApi + +@OptIn(ExperimentalKtorApi::class) +fun Route.marketRoutes( + marketService: MarketService, + gameService: GameService +) { + route("/market") { + get { + val players = PlayerRepository.all().toList() + + val response: MutableList = mutableListOf(); + players.forEach { player -> + response.add(player.lastMarket!!) + } + + call.respond(response) + } + + get("/{playerId}") { + val playerId = + call.parameters["playerId"]!! + + val player = + PlayerRepository.find(playerId) + ?: return@get call.respond( + HttpStatusCode.NotFound + ) + + call.respond( + gameService.currentMarket(player) + ) + }.describe { + summary = "Get Market for Specified Player" + description = "Get a list of the products and the prices in a market" + responses { + HttpStatusCode.OK { + description = "Market Snapshot" + schema = jsonSchema() + } + HttpStatusCode.BadRequest { + description = "Invalid Query" + ContentType.Text.Plain + } + } + } + } +} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/routes/ModelCrudRoutes.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/ModelCrudRoutes.kt new file mode 100644 index 0000000..66b9b31 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/ModelCrudRoutes.kt @@ -0,0 +1,38 @@ +package dev.geekback.dopewars.server.routes + +import dev.geekback.dopewars.server.services.MarketService +import dev.geekback.dopewars.shared.Location +import io.ktor.server.request.receive +import io.ktor.server.response.respond +import io.ktor.server.routing.Route +import io.ktor.server.routing.get +import io.ktor.server.routing.post +import io.ktor.server.routing.route + +fun Route.modelCrudRoutes(marketService: MarketService) { + route("crud") { + route("{modelName}") { + + // List + get { + val modelName = call.parameters["modelName"] + when (modelName) { + "market" -> { + call.respond(marketService.generateMarket(Location("BRONX"))) + } + else -> { + call.respond("Model name is $modelName") + } + } + } + + // R + get("{modelId}") { + val modelId = call.parameters["modelId"] + val modelName = call.parameters["modelName"] + + call.respond("Model is $modelName and id is $modelId") + } + } + } +} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/routes/PlayerRoutes.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/PlayerRoutes.kt new file mode 100644 index 0000000..10dfdb5 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/routes/PlayerRoutes.kt @@ -0,0 +1,102 @@ +package dev.geekback.dopewars.server.routes + +import dev.geekback.dopewars.server.repository.PlayerRepository +import dev.geekback.dopewars.server.services.GameService +import dev.geekback.dopewars.server.services.MarketService +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Player +import io.ktor.http.ContentType +import io.ktor.http.HttpStatusCode +import io.ktor.openapi.jsonSchema +import io.ktor.server.routing.Route +import io.ktor.server.routing.post +import io.ktor.server.routing.route +import io.ktor.server.response.respond +import io.ktor.server.routing.get +import io.ktor.server.routing.openapi.describe +import io.ktor.utils.io.ExperimentalKtorApi +import java.util.UUID + +@OptIn(ExperimentalKtorApi::class) +fun Route.playerRoutes( + marketService: MarketService, + gameService: GameService +) { + // Player CRUD + route("/players") { + + // Create + post { + val location = Location("Brooklyn") + val mkt = marketService.generateMarket(location) + + val player = Player( + id = UUID.randomUUID().toString(), + name = PlayerRepository.getNextName(), + lastMarket = mkt + ) + + PlayerRepository.save(player) + + call.respond( + HttpStatusCode.Created, + player + ) + }.describe { + summary = "Create a new Player" + description = "Create a new Player with a unique ID" + responses { + HttpStatusCode.OK { + description = "A Player with unique ID" + schema = jsonSchema() + } + HttpStatusCode.BadRequest { + description = "An error occured creating the user" + ContentType.Text.Plain + } + } + } + + // Read + get { + val players = PlayerRepository.all(); + + call.respond( + HttpStatusCode.OK, + players + ) + }.describe { + summary = "Get all Players" + description = "Get a list of all the players on the server" + responses { + HttpStatusCode.OK { + description = "A list of Users" + schema = jsonSchema>() + } + } + } + + // Update + post("/{playerId}/rename") { + val playerId = call.parameters["playerId"] ?: return@post call.respond(HttpStatusCode.BadRequest) + + val newPlayer = Player( + id = playerId, + name = call.parameters["name"] ?: return@post call.respond(HttpStatusCode.BadRequest) + ) + + PlayerRepository.save(newPlayer) + } + + // Read + get("/{playerId}") { + val playerId = call.parameters["playerId"] + ?: return@get call.respond(HttpStatusCode.BadRequest) + + val player = PlayerRepository.find(playerId) + ?: return@get call.respond(HttpStatusCode.NotFound) + + call.respond(HttpStatusCode.OK, player) + } + } +} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/services/GameService.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/services/GameService.kt new file mode 100644 index 0000000..9810817 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/services/GameService.kt @@ -0,0 +1,135 @@ +package dev.geekback.dopewars.server.services + +import dev.geekback.dopewars.shared.Drug +import dev.geekback.dopewars.shared.InventoryItem +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Market +import dev.geekback.dopewars.shared.Player +import dev.geekback.dopewars.shared.api.TradeAction +import dev.geekback.dopewars.shared.api.TradeRequest +import dev.geekback.dopewars.shared.api.TravelResult + +class GameService( + private val marketService: MarketService +) { + + private val markets = mutableMapOf() + + fun currentMarket(player: Player): Market { + return markets.getOrPut(player.id) { + marketService.generateMarket(player.location) + } + } + + fun trade( + player: Player, + request: TradeRequest + ): Player { + + require(request.quantity > 0) { + "Quantity must be greater than zero" + } + + val market = currentMarket(player) + + val price = market.prices[request.drug] + ?: throw IllegalArgumentException( + "Drug not found: ${request.drug}" + ) + + when (request.action) { + TradeAction.BUY -> buy( + player, + request.drug, + request.quantity, + price + ) + + TradeAction.SELL -> sell( + player, + request.drug, + request.quantity, + price + ) + } + + return player + } + + private fun buy( + player: Player, + drug: Drug, + quantity: Int, + price: Float + ) { + + val cost = price * quantity + + require(player.cash >= cost) { + "Not enough cash" + } + + player.cash -= cost + + val existing = player.inventory + .find { it.drug == drug } + + if (existing != null) { + existing.quantity += quantity + } else { + player.inventory.add( + InventoryItem( + drug = drug, + quantity = quantity + ) + ) + } + } + + private fun sell( + player: Player, + drug: Drug, + quantity: Int, + price: Float + ) { + + val inventoryItem = player.inventory + .find { it.drug == drug } + ?: throw IllegalArgumentException( + "You do not own any $drug" + ) + + require(inventoryItem.quantity >= quantity) { + "Not enough inventory" + } + + inventoryItem.quantity -= quantity + player.cash += price * quantity.toFloat() + + if (inventoryItem.quantity == 0) { + player.inventory.remove(inventoryItem) + } + } + + fun travel( + player: Player, + destination: Location + ): TravelResult { + require(destination != player.location) { + "Player is already in $destination" + } + + player.location = destination + player.day += 1 + + val market = marketService.generateMarket(destination) + + markets[player.id] = market + + return TravelResult( + location = market.location, + day = player.day, + market = market, + ) + } +} \ No newline at end of file diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/services/MarketService.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/services/MarketService.kt new file mode 100644 index 0000000..48d27c2 --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/services/MarketService.kt @@ -0,0 +1,22 @@ +package dev.geekback.dopewars.server.services + +import dev.geekback.dopewars.shared.Drug +import dev.geekback.dopewars.shared.Drugs +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Market + +class MarketService { + + fun generateMarket(location: Location): Market { + val prices: MutableMap = mutableMapOf() + + Drugs.all.forEach { drugInfo -> + prices[drugInfo.drug] = drugInfo.newPrice() + } + + return Market( + location = location, + prices = prices.toMap() + ) + } +} diff --git a/server/src/main/kotlin/dev/geekback/dopewars/server/services/PlayerService.kt b/server/src/main/kotlin/dev/geekback/dopewars/server/services/PlayerService.kt new file mode 100644 index 0000000..2fd171f --- /dev/null +++ b/server/src/main/kotlin/dev/geekback/dopewars/server/services/PlayerService.kt @@ -0,0 +1 @@ +package dev.geekback.dopewars.server.services diff --git a/server/src/main/resources/index.html b/server/src/main/resources/index.html new file mode 100644 index 0000000..cc6e538 --- /dev/null +++ b/server/src/main/resources/index.html @@ -0,0 +1,3 @@ + +

This is the default page.

+ \ No newline at end of file diff --git a/server/src/main/resources/logback.xml b/server/src/main/resources/logback.xml new file mode 100644 index 0000000..fccfa8c --- /dev/null +++ b/server/src/main/resources/logback.xml @@ -0,0 +1,11 @@ + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5f98908 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,17 @@ +rootProject.name = "dopewars" +include(":shared", ":server", ":desktop") + +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } +} diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts new file mode 100644 index 0000000..bf4a509 --- /dev/null +++ b/shared/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + kotlin("multiplatform") + alias(libs.plugins.kotlin.serialization) +} + +repositories { + mavenCentral() +} + +kotlin { + jvm() + + sourceSets { + commonMain.dependencies { + implementation(libs.kotlinx.serialization) + implementation(libs.kotlinx.datetime) + } + + jvmMain.dependencies {} + } +} diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drug.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drug.kt new file mode 100644 index 0000000..2511aee --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drug.kt @@ -0,0 +1,22 @@ +package dev.geekback.dopewars.shared + +// import io.ktor.openapi.JsonSchema +import kotlinx.serialization.Serializable +import kotlin.random.Random + +@Serializable +enum class Drug { + WEED, + COCAINE, + HASH, + ACID, + HEROIN, + MUSHROOMS, + METH; + + companion object { + fun all() = listOf(WEED, COCAINE, HASH, ACID, HEROIN, MUSHROOMS, METH) + + fun random() = Drug.WEED + } +} diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/DrugInfo.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/DrugInfo.kt new file mode 100644 index 0000000..d6efeec --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/DrugInfo.kt @@ -0,0 +1,15 @@ +package dev.geekback.dopewars.shared + +import kotlinx.serialization.Serializable +import kotlin.random.Random + +@Serializable +data class DrugInfo( + val drug: Drug, + val minValue: Float, + val maxValue: Float, +) { + fun newPrice(): Float { + return Random.nextFloat() * (this.maxValue - this.minValue) + } +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drugs.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drugs.kt new file mode 100644 index 0000000..11520dd --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Drugs.kt @@ -0,0 +1,15 @@ +package dev.geekback.dopewars.shared + +object Drugs { + val all = listOf( + DrugInfo(Drug.WEED, 300.0f, 1000.0f), + DrugInfo(Drug.ACID, 1000.0f, 4500.0f), + DrugInfo(Drug.COCAINE, 15000.0f, 30000.0f), + DrugInfo(Drug.HASH, 5000.0f, 14000.0f), + DrugInfo(Drug.MUSHROOMS, 500.0f, 2500.0f), + DrugInfo(Drug.METH, 2000.0f, 9000.0f), + DrugInfo(Drug.HEROIN, minValue = 4000.0f, 9500.0f) + ) + + fun random() = all.random() +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/InventoryItem.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/InventoryItem.kt new file mode 100644 index 0000000..78b4442 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/InventoryItem.kt @@ -0,0 +1,9 @@ +package dev.geekback.dopewars.shared + +import kotlinx.serialization.Serializable + +@Serializable +data class InventoryItem( + val drug: Drug, + var quantity: Int +) diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Location.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Location.kt new file mode 100644 index 0000000..03c09a7 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Location.kt @@ -0,0 +1,8 @@ +package dev.geekback.dopewars.shared + +import kotlinx.serialization.Serializable + +@Serializable +data class Location( + var name: String +) \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Locations.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Locations.kt new file mode 100644 index 0000000..2da139c --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Locations.kt @@ -0,0 +1,13 @@ +package dev.geekback.dopewars.shared + +object Locations { + val all = listOf( + Location("Brooklyn"), + Location("Bronx"), + Location("Queens"), + Location("Statten Island"), + ) + + fun random() = all.random() +} + diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Market.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Market.kt new file mode 100644 index 0000000..53b0038 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Market.kt @@ -0,0 +1,12 @@ +package dev.geekback.dopewars.shared + +import kotlinx.serialization.Serializable + +@Serializable +data class Market( + val location: Location, + val prices: Map +) { + companion object { + } +} \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Player.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Player.kt new file mode 100644 index 0000000..476f1cb --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/Player.kt @@ -0,0 +1,27 @@ +package dev.geekback.dopewars.shared + +import kotlinx.serialization.Serializable +import kotlin.time.Clock + +@Serializable +data class Player( + val id: String, + val name: String, + var cash: Float = 2000f, + var debt: Float = 5500f, + var health: Int = 100, + var location: Location = Location("Brooklyn"), + var day: Int = 1, + val inventory: MutableList = mutableListOf(), + var lastMarket: Market? = null, + val lastActionTime: Long = Clock.System.now().epochSeconds +) { + companion object { + fun new(): Player { + return Player( + id = "", + name = "Default Player", + ) + } + } +} diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/SanityValues.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/SanityValues.kt new file mode 100644 index 0000000..cfab8d8 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/SanityValues.kt @@ -0,0 +1,3 @@ +package dev.geekback.dopewars.shared + +const val DRUG_MAX_PRICE: Float = 100_000f; diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketRequest.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketRequest.kt new file mode 100644 index 0000000..770a0b1 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketRequest.kt @@ -0,0 +1,9 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Location +import kotlinx.serialization.Serializable + +@Serializable +data class MarketRequest( + val location: Location +) \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketResult.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketResult.kt new file mode 100644 index 0000000..7e9ecbe --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/MarketResult.kt @@ -0,0 +1,9 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Market +import kotlinx.serialization.Serializable + +@Serializable +data class MarketResult( + val market: Market) { +} diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateRequest.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateRequest.kt new file mode 100644 index 0000000..96a63cc --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateRequest.kt @@ -0,0 +1,8 @@ +package dev.geekback.dopewars.shared.api + +import kotlinx.serialization.Serializable + +@Serializable +data class PlayerNameUpdateRequest( + val newName: String +) \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateResponse.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateResponse.kt new file mode 100644 index 0000000..a564b89 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/PlayerNameUpdateResponse.kt @@ -0,0 +1,7 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Player +import kotlinx.serialization.Serializable + +@Serializable +data class PlayerNameUpdateResponse(val updatedPlayer: Player) \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeAction.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeAction.kt new file mode 100644 index 0000000..bbb7ded --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeAction.kt @@ -0,0 +1,10 @@ +package dev.geekback.dopewars.shared.api + +import kotlinx.serialization.Serializable + +@Serializable +enum class TradeAction { + BUY, + SELL +} + diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeRequest.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeRequest.kt new file mode 100644 index 0000000..9ee94a7 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TradeRequest.kt @@ -0,0 +1,13 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Drug +import kotlinx.serialization.Serializable + +@Serializable +data class TradeRequest( + val action: TradeAction, + val drug: Drug, + val quantity: Int +) + + diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelRequest.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelRequest.kt new file mode 100644 index 0000000..0360732 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelRequest.kt @@ -0,0 +1,9 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Location +import kotlinx.serialization.Serializable + +@Serializable +data class TravelRequest( + val destination: Location +) diff --git a/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelResult.kt b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelResult.kt new file mode 100644 index 0000000..d3ad804 --- /dev/null +++ b/shared/src/commonMain/kotlin/dev/geekback/dopewars/shared/api/TravelResult.kt @@ -0,0 +1,12 @@ +package dev.geekback.dopewars.shared.api + +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.Market +import kotlinx.serialization.Serializable + +@Serializable +data class TravelResult( + val location: Location, + val day: Int, + val market: Market +)