diff --git a/src/index.html b/src/index.html index c157a5aa..80546e46 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - Foretold.io + Estiband diff --git a/src/lib/Prop.re b/src/lib/Prop.re index 9d240aee..9e0929f4 100644 --- a/src/lib/Prop.re +++ b/src/lib/Prop.re @@ -30,6 +30,9 @@ module Value = { | Probability(r) => (r *. 100. |> Js.Float.toFixed) ++ "%" | DateTime(r) => r |> MomentRe.Moment.defaultFormat | FloatPoint(r) => r |> Js.Float.toFixed + | Conditional(r) => r.name + | ConditionalArray(r) => + r |> E.A.fmap(r => r.name) |> Js.Array.joinWith(",") }; }; diff --git a/src/lib/ValueForm.re b/src/lib/ValueForm.re index ab73f1d3..11f19015 100644 --- a/src/lib/ValueForm.re +++ b/src/lib/ValueForm.re @@ -59,7 +59,7 @@ let make = className="max-w-sm rounded overflow-hidden shadow-sm py-1 px-2 rounded mb-3 bg-gray-200"> {r |> ReasonReact.string} ) diff --git a/src/models/EAFunds.re b/src/models/EAFunds.re index f256a758..6d6f03b9 100644 --- a/src/models/EAFunds.re +++ b/src/models/EAFunds.re @@ -152,6 +152,7 @@ module Interface = { Some(DateTime(intendedYear)), Some(DateTime(currentYear)), Some(SelectSingle(output)), + _, |] => choiceFromString(fund) |> E.O.fmap(fund => @@ -230,11 +231,14 @@ module Interface = { (), ), TypeWithMetadata.make( - ~name="Conditional on World Ending", - ~id="worldEnd", + ~name="Conditionals", + ~id="conditionals", ~type_= Conditionals( - Prop.Type.makeConditionals([||], [|"Foo", "Bar", "Char"|]), + Prop.Type.makeConditionals( + [||], + [|"Global Existential Event"|], + ), ), (), ),