From 5afff4a0e40a530863b9209eaf0dd3ae9e91cd87 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 19 Nov 2024 13:17:57 -0600 Subject: [PATCH] feat: changed some stuff around --- .../src/Debate/Arguments/Nutrition/AnabolicKeto.elm | 6 +++--- .../Debate/Arguments/Philosophy/AntiVandalism.elm | 10 +++++----- frontend/src/Debate/Helpers.elm | 5 +++-- frontend/src/Pages/Arguments.elm | 12 ++++++------ frontend/src/Pages/Services.elm | 8 ++++---- .../{ => ServiceList}/Coaching/DebateAnalysis.elm | 2 +- .../{ => ServiceList}/Coaching/DebateTutoring.elm | 2 +- .../{ => ServiceList}/Coaching/NutritionScience.elm | 2 +- .../{ => ServiceList}/Creative/NixBuilds.elm | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) rename frontend/src/Services/{ => ServiceList}/Coaching/DebateAnalysis.elm (90%) rename frontend/src/Services/{ => ServiceList}/Coaching/DebateTutoring.elm (90%) rename frontend/src/Services/{ => ServiceList}/Coaching/NutritionScience.elm (90%) rename frontend/src/Services/{ => ServiceList}/Creative/NixBuilds.elm (92%) diff --git a/frontend/src/Debate/Arguments/Nutrition/AnabolicKeto.elm b/frontend/src/Debate/Arguments/Nutrition/AnabolicKeto.elm index 88ad638..8cdd617 100755 --- a/frontend/src/Debate/Arguments/Nutrition/AnabolicKeto.elm +++ b/frontend/src/Debate/Arguments/Nutrition/AnabolicKeto.elm @@ -26,12 +26,12 @@ argumentAnabolicKeto = [ { premise = "If a higher proportion of amino acids are spent on gluconeogenesis while on ketogenic diets compared to non-ketogenic diets, then a lower proportion of amino acids are available for hypertrophy on ketogenic diets compared to non-ketogenic diets." , notation = "(P→Q)" } - , { premise = "A higher proportion of amino acids are spent on gluconeogenesis while on ketogenic diets compared to non-ketogenic diets." - , notation = "(P)" - } , { premise = "If a lower proportion of amino acids are available for hypertrophy on ketogenic diets compared to non-ketogenic diets, then ketogenic diets are likely to cost anabolic potential compared to non-ketogenic diets." , notation = "(Q→R)" } + , { premise = "A higher proportion of amino acids are spent on gluconeogenesis while on ketogenic diets compared to non-ketogenic diets." + , notation = "(P)" + } ] , conclusion = "Therefore, ketogenic diets are likely to cost anabolic potential compared to non-ketogenic diets." , conclusionNotation = "(∴R)" diff --git a/frontend/src/Debate/Arguments/Philosophy/AntiVandalism.elm b/frontend/src/Debate/Arguments/Philosophy/AntiVandalism.elm index 99156f8..05d7c78 100755 --- a/frontend/src/Debate/Arguments/Philosophy/AntiVandalism.elm +++ b/frontend/src/Debate/Arguments/Philosophy/AntiVandalism.elm @@ -9,7 +9,7 @@ argumentAntiVandalism = , propositionTitle = "Vandalizing zoos increases the probability of harming the animals they keep." , propositionReductio = "" , propositionSummary = "Summary" - , proofLink = "https://www.umsu.de/trees/#(P~5Q),(P),(Q~5R)%7C=(R)" + , proofLink = "https://www.umsu.de/trees/#(P~5Q),(P),(Q~5R)%7C=(R)" , definitionTable = [ { definiendum = "P" , definiens = "zoos must spend extra money cleaning graffiti" @@ -26,15 +26,15 @@ argumentAntiVandalism = [ { premise = "If zoos must spend extra money cleaning graffiti, then zoos will have less money to devote to animal care." , notation = "(P→Q)" } + , { premise = "If zoos will have less money to devote to animal care, then vandalizing zoos increases the probability of harming the animals they keep." + , notation = "(Q→R)" + } , { premise = "Zoos must spend extra money cleaning graffiti." , notation = "(P)" } - , { premise = "If zoos will have less money to devote to animal care, then vandalizing zoos increases the probability of harming the animals they keep." - , notation = "(Q→R)" - } ] , conclusion = "Therefore, vandalizing zoos increases the probability of harming the animals they keep." , conclusionNotation = "(∴R)" } ] - } \ No newline at end of file + } diff --git a/frontend/src/Debate/Helpers.elm b/frontend/src/Debate/Helpers.elm index d00840b..5ea5327 100755 --- a/frontend/src/Debate/Helpers.elm +++ b/frontend/src/Debate/Helpers.elm @@ -6,6 +6,7 @@ import Debate.Types exposing (..) import Effect exposing (Effect) import Element exposing (..) import Element.Border as D exposing (..) +import Element.Events as V exposing (..) import Element.Font as F import Html import Html.Attributes as H exposing (style, title, wrap) @@ -67,7 +68,7 @@ argumentMaker argument = reductio -> paragraph (paragraphBoldFormat ++ [ F.size 18 ]) [ text "Reductio: " |> el [ F.color colourTheme.highlightText ] - , text reductio |> el [ F.color colourTheme.nonHighlightedText, F.regular, F.size 16 ] + , text reductio |> el [ F.color colourTheme.nonHighlightedText, F.regular, F.size 16 ], text " Ⓘ" -- create a tooltip for this in the future ] in column @@ -76,7 +77,7 @@ argumentMaker argument = [ newTabLink [] { url = argument.proofLink , label = transitionNonHighlightedLinkHover <| text argument.argumentTitle - } + } --create expandable text for this in the future ] , paragraph (paragraphBoldFormat ++ [ F.size 18 ]) [ text "Proposition: " |> el [ F.color colourTheme.highlightText ] diff --git a/frontend/src/Pages/Arguments.elm b/frontend/src/Pages/Arguments.elm index 6dcf8f5..3c0385a 100755 --- a/frontend/src/Pages/Arguments.elm +++ b/frontend/src/Pages/Arguments.elm @@ -3,7 +3,6 @@ module Pages.Arguments exposing (Model, Msg, page) import Config.Colour as T exposing (..) import Config.Format as O exposing (..) import Config.Identity as I exposing (..) -import Debate.Helpers exposing (..) import Debate.Arguments.Medicine.ApoBCVD exposing (..) import Debate.Arguments.Nutrition.AnabolicKeto exposing (..) import Debate.Arguments.Nutrition.AntagonisticPleiotropy exposing (..) @@ -53,6 +52,7 @@ import Debate.Arguments.Politics.BoobyTrapPagers exposing (..) import Debate.Arguments.Science.EpidemiologyCausality exposing (..) import Debate.Arguments.Science.FlatEarthDebunk exposing (..) import Debate.Arguments.Science.TruncatedMeta exposing (..) +import Debate.Helpers exposing (..) import Effect exposing (Effect) import Element exposing (..) import Element.Border as D exposing (..) @@ -178,11 +178,11 @@ debateList = , argumentOmega3Omega6Ratio , argumentPlantBasedCVDReversal , argumentPolyphenolReductio - , argumentUnhealthyCoconutOil , argumentSodiumCVD , argumentTMAOCausality - , argumentUnhealthyRedMeat + , argumentUnhealthyCoconutOil , argumentUnhealthyProcessedMeat + , argumentUnhealthyRedMeat , argumentUnhealthySaturatedFat ] } @@ -201,12 +201,12 @@ debateList = , argumentEthicalSlurs , argumentFineTuning , argumentImmortalityReductio - , argumentVeganSocietyReductio , argumentOddOrderPredators , argumentOstroveganism , argumentPollinationReductio , argumentScratcherPioneers , argumentTransPeople + , argumentVeganSocietyReductio ] } , { categoryName = "Politics" @@ -216,9 +216,9 @@ debateList = } , { categoryName = "Science" , arguments = - [ argumentFlatEarthDebunk + [ argumentEpidemiologyCausality + , argumentFlatEarthDebunk , argumentTruncatedMeta - , argumentEpidemiologyCausality ] } ] diff --git a/frontend/src/Pages/Services.elm b/frontend/src/Pages/Services.elm index e3769fa..5bd103b 100755 --- a/frontend/src/Pages/Services.elm +++ b/frontend/src/Pages/Services.elm @@ -10,10 +10,10 @@ import Html.Attributes as H exposing (style) import Layouts import Page exposing (Page) import Route exposing (Route) -import Services.Coaching.DebateAnalysis exposing (..) -import Services.Coaching.DebateTutoring exposing (..) -import Services.Coaching.NutritionScience exposing (..) -import Services.Creative.NixBuilds exposing (..) +import Services.ServiceList.Coaching.DebateAnalysis exposing (..) +import Services.ServiceList.Coaching.DebateTutoring exposing (..) +import Services.ServiceList.Coaching.NutritionScience exposing (..) +import Services.ServiceList.Creative.NixBuilds exposing (..) import Services.Helpers exposing (..) import Shared exposing (..) import View exposing (View) diff --git a/frontend/src/Services/Coaching/DebateAnalysis.elm b/frontend/src/Services/ServiceList/Coaching/DebateAnalysis.elm similarity index 90% rename from frontend/src/Services/Coaching/DebateAnalysis.elm rename to frontend/src/Services/ServiceList/Coaching/DebateAnalysis.elm index 4aec8bf..758890a 100755 --- a/frontend/src/Services/Coaching/DebateAnalysis.elm +++ b/frontend/src/Services/ServiceList/Coaching/DebateAnalysis.elm @@ -1,4 +1,4 @@ -module Services.Coaching.DebateAnalysis exposing (..) +module Services.ServiceList.Coaching.DebateAnalysis exposing (..) import Services.Types exposing (..) diff --git a/frontend/src/Services/Coaching/DebateTutoring.elm b/frontend/src/Services/ServiceList/Coaching/DebateTutoring.elm similarity index 90% rename from frontend/src/Services/Coaching/DebateTutoring.elm rename to frontend/src/Services/ServiceList/Coaching/DebateTutoring.elm index 2713855..697357d 100755 --- a/frontend/src/Services/Coaching/DebateTutoring.elm +++ b/frontend/src/Services/ServiceList/Coaching/DebateTutoring.elm @@ -1,4 +1,4 @@ -module Services.Coaching.DebateTutoring exposing (..) +module Services.ServiceList.Coaching.DebateTutoring exposing (..) import Services.Types exposing (..) diff --git a/frontend/src/Services/Coaching/NutritionScience.elm b/frontend/src/Services/ServiceList/Coaching/NutritionScience.elm similarity index 90% rename from frontend/src/Services/Coaching/NutritionScience.elm rename to frontend/src/Services/ServiceList/Coaching/NutritionScience.elm index 07f2815..2e8aa7b 100755 --- a/frontend/src/Services/Coaching/NutritionScience.elm +++ b/frontend/src/Services/ServiceList/Coaching/NutritionScience.elm @@ -1,4 +1,4 @@ -module Services.Coaching.NutritionScience exposing (..) +module Services.ServiceList.Coaching.NutritionScience exposing (..) import Services.Types exposing (..) diff --git a/frontend/src/Services/Creative/NixBuilds.elm b/frontend/src/Services/ServiceList/Creative/NixBuilds.elm similarity index 92% rename from frontend/src/Services/Creative/NixBuilds.elm rename to frontend/src/Services/ServiceList/Creative/NixBuilds.elm index 4f39e3a..beac184 100755 --- a/frontend/src/Services/Creative/NixBuilds.elm +++ b/frontend/src/Services/ServiceList/Creative/NixBuilds.elm @@ -1,4 +1,4 @@ -module Services.Creative.NixBuilds exposing (..) +module Services.ServiceList.Creative.NixBuilds exposing (..) import Services.Types exposing (..)