Skip to content

Commit

Permalink
cosmetic
Browse files Browse the repository at this point in the history
  • Loading branch information
b-inary committed Sep 30, 2023
1 parent b688b3b commit 7a9054b
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 53 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@rushstack/eslint-patch": "^1.5.0",
"@tailwindcss/forms": "^0.5.6",
"@tauri-apps/cli": "^1.5.0",
"@types/node": "^20.7.1",
"@types/node": "^20.8.0",
"@vitejs/plugin-vue": "^4.3.4",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
Expand Down
81 changes: 61 additions & 20 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ rust-version = "1.65"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "1.4.1", features = [] }
tauri-build = { version = "1.5.0", features = [] }

[dependencies]
serde_json = "1.0.107"
Expand Down
17 changes: 8 additions & 9 deletions src-tauri/src/solver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,25 +117,24 @@ pub fn game_init(
rake_rate,
rake_cap,
flop_bet_sizes: [
BetSizeCandidates::try_from((oop_flop_bet.as_str(), oop_flop_raise.as_str())).unwrap(),
BetSizeCandidates::try_from((ip_flop_bet.as_str(), ip_flop_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_flop_bet.as_str(), oop_flop_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_flop_bet.as_str(), ip_flop_raise.as_str())).unwrap(),
],
turn_bet_sizes: [
BetSizeCandidates::try_from((oop_turn_bet.as_str(), oop_turn_raise.as_str())).unwrap(),
BetSizeCandidates::try_from((ip_turn_bet.as_str(), ip_turn_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_turn_bet.as_str(), oop_turn_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_turn_bet.as_str(), ip_turn_raise.as_str())).unwrap(),
],
river_bet_sizes: [
BetSizeCandidates::try_from((oop_river_bet.as_str(), oop_river_raise.as_str()))
.unwrap(),
BetSizeCandidates::try_from((ip_river_bet.as_str(), ip_river_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_river_bet.as_str(), oop_river_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_river_bet.as_str(), ip_river_raise.as_str())).unwrap(),
],
turn_donk_sizes: match donk_option {
false => None,
true => DonkSizeCandidates::try_from(oop_turn_donk.as_str()).ok(),
true => DonkSizeOptions::try_from(oop_turn_donk.as_str()).ok(),
},
river_donk_sizes: match donk_option {
false => None,
true => DonkSizeCandidates::try_from(oop_river_donk.as_str()).ok(),
true => DonkSizeOptions::try_from(oop_river_donk.as_str()).ok(),
},
add_allin_threshold,
force_allin_threshold,
Expand Down
17 changes: 8 additions & 9 deletions src-tauri/src/tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,24 @@ pub fn tree_new(
rake_rate: 0.0,
rake_cap: 0.0,
flop_bet_sizes: [
BetSizeCandidates::try_from((oop_flop_bet.as_str(), oop_flop_raise.as_str())).unwrap(),
BetSizeCandidates::try_from((ip_flop_bet.as_str(), ip_flop_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_flop_bet.as_str(), oop_flop_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_flop_bet.as_str(), ip_flop_raise.as_str())).unwrap(),
],
turn_bet_sizes: [
BetSizeCandidates::try_from((oop_turn_bet.as_str(), oop_turn_raise.as_str())).unwrap(),
BetSizeCandidates::try_from((ip_turn_bet.as_str(), ip_turn_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_turn_bet.as_str(), oop_turn_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_turn_bet.as_str(), ip_turn_raise.as_str())).unwrap(),
],
river_bet_sizes: [
BetSizeCandidates::try_from((oop_river_bet.as_str(), oop_river_raise.as_str()))
.unwrap(),
BetSizeCandidates::try_from((ip_river_bet.as_str(), ip_river_raise.as_str())).unwrap(),
BetSizeOptions::try_from((oop_river_bet.as_str(), oop_river_raise.as_str())).unwrap(),
BetSizeOptions::try_from((ip_river_bet.as_str(), ip_river_raise.as_str())).unwrap(),
],
turn_donk_sizes: match donk_option {
false => None,
true => DonkSizeCandidates::try_from(oop_turn_donk.as_str()).ok(),
true => DonkSizeOptions::try_from(oop_turn_donk.as_str()).ok(),
},
river_donk_sizes: match donk_option {
false => None,
true => DonkSizeCandidates::try_from(oop_river_donk.as_str()).ok(),
true => DonkSizeOptions::try_from(oop_river_donk.as_str()).ok(),
},
add_allin_threshold,
force_allin_threshold,
Expand Down
2 changes: 1 addition & 1 deletion src/components/BoardSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<input
v-model="boardText"
type="text"
class="px-2 py-1 rounded-lg text-sm"
class="w-40 px-2 py-1 rounded-lg text-sm"
@focus="($event.target as HTMLInputElement).select()"
@change="onBoardTextChange"
/>
Expand Down
15 changes: 11 additions & 4 deletions src/components/BunchingEffect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
<div v-if="editingPlayer === -1">
<div class="flex">
<div
class="px-3 py-1 text-cyan-600 bg-cyan-50 border-2 border-cyan-600 rounded-md font-semibold"
class="flex pl-2.5 pr-3 py-1 text-cyan-600 bg-cyan-50 border-2 border-cyan-600 rounded-md font-semibold"
>
Enabling the bunching effect will significantly slow down the solver.<br />
If you are not sure, we recommend leaving it disabled.
<InformationCircleIcon class="inline w-5 h-5 mt-[0.1875rem] mr-1.5" />
<div>
Enabling the bunching effect will significantly slow down the
solver.<br />
If you are not sure, we recommend leaving it disabled.
</div>
</div>
</div>

Expand Down Expand Up @@ -204,7 +208,10 @@ import * as invokes from "../invokes";
import RangeEditor from "./RangeEditor.vue";
import RangeMiniViewer from "./RangeMiniViewer.vue";
import { Tippy } from "vue-tippy";
import { QuestionMarkCircleIcon } from "@heroicons/vue/20/solid";
import {
InformationCircleIcon,
QuestionMarkCircleIcon,
} from "@heroicons/vue/20/solid";
const store = useStore();
const configStore = useConfigStore();
Expand Down
2 changes: 1 addition & 1 deletion src/components/ResultChance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<script setup lang="ts">
import { computed, ref, watch } from "vue";
import { cardId, ranks, suits, toFixed1, toFixedAdaptive } from "../utils";
import { ranks, suits, cardId, toFixed1, toFixedAdaptive } from "../utils";
import {
ChanceReports,
Spot,
Expand Down

0 comments on commit 7a9054b

Please sign in to comment.