diff --git a/frontend/src/Config/StrengthBar.elm b/frontend/src/Config/StrengthBar.elm index 1d6dda5..931bbd5 100755 --- a/frontend/src/Config/StrengthBar.elm +++ b/frontend/src/Config/StrengthBar.elm @@ -44,10 +44,4 @@ barPadding = column [ E.width fill , E.alignLeft - , paddingEach - { top = 0 - , right = 0 - , bottom = 0 - , left = 10 - } ] diff --git a/frontend/src/Debate/Arguments/Helpers.elm b/frontend/src/Debate/Arguments/Helpers.elm index 434cb92..cb1f90d 100755 --- a/frontend/src/Debate/Arguments/Helpers.elm +++ b/frontend/src/Debate/Arguments/Helpers.elm @@ -88,6 +88,7 @@ argumentMaker argument = , summaryMakerDesktop argument , strengthMakerDesktop argument , tableMaker argument + , formalizationMaker argument , proofTreeMaker argument ] ] @@ -113,6 +114,7 @@ argumentMakerMobile argument = , summaryMakerMobile argument , strengthMakerMobile argument , tableMaker argument + , formalizationMaker argument , proofTreeMaker argument ] ] @@ -336,7 +338,17 @@ strengthMaker = [ tooltip "This represents my confidence in the soundness of the argument." ] - (text "Confidence:") + (el + [ paddingEach + { top = 0 + , right = 10 + , bottom = 0 + , left = 0 + } + ] + <| + text "Confidence:" + ) |> el [ F.color colourTheme.textLightOrange ] ] ] @@ -394,7 +406,7 @@ tableMaker argument = [ centerX , E.width fill ] - ([ wrappedRow + [ wrappedRow (paragraphBoldFormat ++ [ E.alignLeft , E.width fill @@ -485,12 +497,10 @@ tableMaker argument = ] } ] - ] - ++ formalizationMaker argument - ) + ] -formalizationMaker : Argument -> List (Element msg) +formalizationMaker : Argument -> Element msg formalizationMaker argument = let argumentFormatting : List (Attribute msg) @@ -501,71 +511,83 @@ formalizationMaker argument = , E.width fill ] in - List.indexedMap - (\index argumentEntry -> - column - (paragraphFormat - ++ [ spacing 3 - , centerX - , E.width fill - , paddingXY 35 10 - ] - ) - (List.indexedMap - (\premiseIndex premiseWithNotation -> - column - (argumentFormatting ++ [ E.width fill ]) - [ paragraph paragraphHightlightedBoldText - [ text ("P" ++ String.fromInt (premiseIndex + 1) ++ ")") - , text premiseWithNotation.premise - |> el - [ F.color colourTheme.textLightGrey - , F.regular - , E.width fill - , paddingEach - { top = 0 - , right = 0 - , bottom = 0 - , left = 5 - } - ] - ] - , paragraph argumentFormatting - [ text ("(" ++ premiseWithNotation.notation ++ ")") - |> el [ F.color colourTheme.textLightOrange, F.bold ] - ] - ] + column + [ centerX + , E.width fill + , spacing 10 + ] + (List.indexedMap + (\index argumentEntry -> + column + (paragraphFormat + ++ [ spacing 3 + , centerX + , E.width fill + , paddingXY 0 10 + , explain Debug.todo + ] ) - argumentEntry.premises - ++ [ column - (argumentFormatting ++ [ E.width fill ]) - [ paragraph paragraphHightlightedBoldText - [ text "C)" - , text argumentEntry.conclusion - |> el - [ F.color colourTheme.textLightGrey - , F.regular - , E.width fill - , paddingEach - { top = 0 - , right = 0 - , bottom = 0 - , left = 5 - } - ] + (List.indexedMap + (\premiseIndex premiseWithNotation -> + column + (argumentFormatting ++ [ E.width fill ]) + [ paragraph paragraphHightlightedBoldText + [ text ("P" ++ String.fromInt (premiseIndex + 1) ++ ")") + , text premiseWithNotation.premise + |> el + [ F.color colourTheme.textLightGrey + , F.regular + , E.width fill + , paddingEach + { top = 0 + , right = 0 + , bottom = 0 + , left = 5 + } + ] + ] + , paragraph + (argumentFormatting + ++ [ F.color colourTheme.textLightOrange + , F.bold + ] + ) + [ text ("(" ++ premiseWithNotation.notation ++ ")") + ] ] - , paragraph argumentFormatting - [ text ("(∴" ++ argumentEntry.conclusionNotation ++ ")") - |> el - [ F.color colourTheme.textLightOrange - , F.bold - ] + ) + argumentEntry.premises + ++ [ column + (argumentFormatting ++ [ E.width fill ]) + [ paragraph paragraphHightlightedBoldText + [ text "C)" + , text argumentEntry.conclusion + |> el + [ F.color colourTheme.textLightGrey + , F.regular + , E.width fill + , paddingEach + { top = 0 + , right = 0 + , bottom = 0 + , left = 5 + } + ] + ] + , paragraph + (argumentFormatting + ++ [ F.color colourTheme.textLightOrange + , F.bold + ] + ) + [ text ("(∴" ++ argumentEntry.conclusionNotation ++ ")") + ] ] - ] - ] - ) + ] + ) + ) + argument.argumentFormalization ) - argument.argumentFormalization proofTreeMaker : Argument -> Element msg diff --git a/frontend/src/Debate/Cuckery/CuckList/TroKalayjian.elm b/frontend/src/Debate/Cuckery/CuckList/TroKalayjian.elm index 2252818..32c3144 100755 --- a/frontend/src/Debate/Cuckery/CuckList/TroKalayjian.elm +++ b/frontend/src/Debate/Cuckery/CuckList/TroKalayjian.elm @@ -22,5 +22,13 @@ cuckTroKalayjian = , dodgeNicksDoxasticState = Just Belief , dodgeNicksDoxasticReason = SpecificPropReason "The proposition seems trivially true." } + , { dodgeLink = "https://x.com/TheNutrivore/status/1865857839845232689" + , dodgeDescription = RanAway + , dodgeProposition = "Meat doesn’t cause cardiovascular disease" + , dodgeReceipts = [] + , dodgeFallacy = Just (SpecificFallacy "") + , dodgeNicksDoxasticState = Just Disbelief + , dodgeNicksDoxasticReason = SpecificPropReason "The aggregate of the data suggests that higher intakes of meat, particularly red meat, increases the risk of cardiovascular disease, especially when replacing plant-based protein sources." + } ] } diff --git a/frontend/src/Debate/Gibberish/Helpers.elm b/frontend/src/Debate/Gibberish/Helpers.elm index c40e911..e0a972e 100755 --- a/frontend/src/Debate/Gibberish/Helpers.elm +++ b/frontend/src/Debate/Gibberish/Helpers.elm @@ -48,7 +48,7 @@ gibberishMaker gibberish = , F.center ] ) - [ domainList gibberish ] + [ desktopDomainList gibberish ] ] ] ] @@ -73,7 +73,7 @@ gibberishMakerMobile gibberish = ] ) [ cardImageMakerMobile (gibberishImage gibberish) - , domainList gibberish + , mobileDomainList gibberish ] ] ] @@ -94,20 +94,32 @@ gibberishTitle gibberish = gibberish.gibberishTitle -domainList : Gibberish -> Element msg -domainList gibberish = +desktopDomainList : Gibberish -> Element msg +desktopDomainList gibberish = column [ spacing 8 , E.width fill ] <| - List.map2 (\x y -> makeTerms x y) + List.map2 (\x y -> desktopMakeTerms x y) gibberish.gibberishTerms (List.range 1 (List.length gibberish.gibberishTerms)) -makeTerms : Terms -> Int -> Element msg -makeTerms terms index = +mobileDomainList : Gibberish -> Element msg +mobileDomainList gibberish = + column + [ spacing 8 + , E.width fill + ] + <| + List.map2 (\x y -> mobileMakeTerms x y) + gibberish.gibberishTerms + (List.range 1 (List.length gibberish.gibberishTerms)) + + +desktopMakeTerms : Terms -> Int -> Element msg +desktopMakeTerms terms index = column (paragraphAlignLeft ++ [ spacing 8 @@ -144,31 +156,7 @@ makeTerms terms index = [ el [ F.color colourTheme.textLightOrange ] <| text terms.term ] - , row - [ E.width fill - , height fill - ] - [ column - [ E.alignTop - , E.alignLeft - ] - [ paragraph - (paragraphBoldFormat - ++ [ F.size 18 - , E.alignLeft - , E.width fill - ] - ) - [ el - [ tooltip - "This represents my confidence that the term can be understood from at least one viewpoint." - ] - (text "Intelligibility:") - ] - ] - , barPadding - [ barMaker getIntelligibilityTooltip terms.strength ] - ] + , desktopBar terms , paragraph [ F.color colourTheme.textLightGrey , F.regular @@ -189,6 +177,133 @@ makeTerms terms index = ] +mobileMakeTerms : Terms -> Int -> Element msg +mobileMakeTerms terms index = + column + (paragraphAlignLeft + ++ [ spacing 8 + , E.width fill + ] + ) + [ row + [ F.color colourTheme.textLightGrey + , F.regular + , F.size 18 + , F.bold + , F.alignLeft + , E.width fill + ] + [ column + [ E.alignRight + , alignTop + ] + [ paragraph + [] + [ text (String.fromInt index ++ ". ") ] + ] + , column + [ E.width fill + , paddingEach + { top = 0 + , bottom = 0 + , left = 10 + , right = 10 + } + ] + [ paragraph + [] + [ el [ F.color colourTheme.textLightOrange ] <| + text terms.term + ] + , mobileBar terms + , paragraph + [ F.color colourTheme.textLightGrey + , F.regular + , F.size 16 + , F.alignLeft + ] + [ text + (case terms.explanation of + NoClue -> + "I have no fucking clue what this means." + + SpecificExplanation str -> + str + ) + ] + ] + ] + ] + + +desktopBar : Terms -> Element msg +desktopBar terms = + row + [ E.width fill + , height fill + ] + [ column + [ E.alignTop + , E.alignLeft + ] + [ paragraph + (paragraphBoldFormat + ++ [ F.size 18 + , E.alignLeft + , E.width fill + ] + ) + [ el + [ tooltip + "This represents my confidence that the term can be understood from at least one viewpoint." + ] + (el + [ paddingEach + { top = 0 + , right = 10 + , bottom = 0 + , left = 0 + } + ] + <| + text "Intelligibility:" + ) + ] + ] + , barPadding + [ barMaker getIntelligibilityTooltip terms.strength ] + ] + + +mobileBar : Terms -> Element msg +mobileBar terms = + column + [ E.width fill + , height fill + ] + [ column + [ E.alignTop + , E.alignLeft + ] + [ paragraph + (paragraphBoldFormat + ++ [ F.size 18 + , E.alignLeft + , E.width fill + ] + ) + [ el + [ tooltip + "This represents my confidence that the term can be understood from at least one viewpoint." + ] + (text "Intelligibility:") + ] + ] + , barPadding + [ barMaker getIntelligibilityTooltip terms.strength ] + ] + + getIntelligibilityTooltip : Int -> String getIntelligibilityTooltip num = case num of diff --git a/frontend/src/Donate/Helpers.elm b/frontend/src/Donate/Helpers.elm index 6424904..cd697f7 100755 --- a/frontend/src/Donate/Helpers.elm +++ b/frontend/src/Donate/Helpers.elm @@ -231,7 +231,17 @@ preferenceMaker donate = [ tooltip "This represents how strongly I prefer a given platform relative to other platforms." ] - (text "Preference:") + (el + [ paddingEach + { top = 0 + , right = 10 + , bottom = 0 + , left = 0 + } + ] + <| + text "Preference:" + ) ] ] , barPadding diff --git a/frontend/src/Interviews/Helpers.elm b/frontend/src/Interviews/Helpers.elm index 18d5ea3..644119d 100755 --- a/frontend/src/Interviews/Helpers.elm +++ b/frontend/src/Interviews/Helpers.elm @@ -189,7 +189,17 @@ experienceMaker appearanceEntry = [ tooltip "This represents how pleasant it was to interact with the host(s)." ] - (text "Pleasantness:") + (el + [ paddingEach + { top = 0 + , right = 10 + , bottom = 0 + , left = 0 + } + ] + <| + text "Pleasantness:" + ) ] ] , barPadding diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index e66205a..0655b5f 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -5,6 +5,7 @@ import Config.Format as O exposing (..) import Config.Identity as I exposing (..) import Effect exposing (Effect) import Element as E exposing (..) +import Element.Events as Events import Element.Background as B exposing (..) import Element.Border as D exposing (..) import Element.Font as F @@ -180,6 +181,12 @@ desktopNavbar = , F.color colourTheme.textLightGrey , F.size 17 , spacing 8 + , paddingEach + { top = 0 + , right = 0 + , bottom = 0 + , left = 10 + } ] (desktopHomeButtonMaker :: List.map desktopPagesButtonMaker @@ -440,7 +447,7 @@ desktopFooterIcons = , spacing 20 , paddingEach { top = 25 - , bottom = 10 + , bottom = 25 , left = 0 , right = 0 } @@ -507,7 +514,7 @@ footerImageMaker : -> Element msg footerImageMaker config = column [ centerX ] - [ link [] + [ newTabLink [] { url = config.url , label = row [] diff --git a/frontend/src/Pages/Arguments.elm b/frontend/src/Pages/Arguments.elm index 159a949..551be91 100755 --- a/frontend/src/Pages/Arguments.elm +++ b/frontend/src/Pages/Arguments.elm @@ -19,7 +19,6 @@ import Html.Attributes as H exposing (style, title, wrap) import Layouts import List.Extra as L exposing (..) import Page exposing (Page) -import Ports exposing (gotArgHeight) import Route exposing (Route) import Shared import View exposing (View) diff --git a/frontend/src/Pages/Gibberish.elm b/frontend/src/Pages/Gibberish.elm index 111fcd4..fa0b79f 100755 --- a/frontend/src/Pages/Gibberish.elm +++ b/frontend/src/Pages/Gibberish.elm @@ -26,7 +26,6 @@ import Html.Attributes as H exposing (style, title, wrap) import Layouts import List.Extra as L exposing (..) import Page exposing (Page) -import Ports exposing (gotArgHeight) import Route exposing (Route) import Shared import View exposing (View) diff --git a/frontend/src/Ports.elm b/frontend/src/Ports.elm index dd565e5..be628bb 100755 --- a/frontend/src/Ports.elm +++ b/frontend/src/Ports.elm @@ -1,7 +1,2 @@ -port module Ports exposing (getArgHeight, gotArgHeight) +port module Ports exposing (..) - -port getArgHeight : Int -> Cmd msg - - -port gotArgHeight : (List Int -> msg) -> Sub msg diff --git a/frontend/src/Shared.elm b/frontend/src/Shared.elm index c90eedc..ac0378b 100755 --- a/frontend/src/Shared.elm +++ b/frontend/src/Shared.elm @@ -54,9 +54,10 @@ type alias Model = init : Result Json.Decode.Error Flags -> Route () -> ( Model, Effect Msg ) init flagsResult route = - ( modelFromFlagsResult flagsResult - , Effect.none - ) + Debug.log "Debug: " + ( modelFromFlagsResult flagsResult + , Effect.none + ) modelFromFlagsResult : Result Error Flags -> Model @@ -68,7 +69,11 @@ modelFromFlagsResult f = , width = flags.width } - Err _ -> + Err e -> + let + _ = + Debug.log "error" e + in { device = E.classifyDevice { height = 0 diff --git a/frontend/src/interop.js b/frontend/src/interop.js index f2bf88f..2c5dffa 100755 --- a/frontend/src/interop.js +++ b/frontend/src/interop.js @@ -1,32 +1,16 @@ // This is called BEFORE your Elm app starts up -// -// The value returned here will be passed as flags +// +// The value returned here will be passed as flags // into your `Shared.init` function. export const flags = ({ env }) => { -return { -height: window.innerHeight, -width: window.innerWidth -} -} + return { + height: window.innerHeight, + width: window.innerWidth, + }; + }; // This is called AFTER your Elm app starts up // // Here you can work with `app.ports` to send messages // to your Elm application, or subscribe to incoming // messages from Elm -export const onReady = ({ app, env }) => { -app.ports.getArgHeight.subscribe((numArgs) => { - const heights = []; - for (let i = 0; i < numArgs; i++) { - const element = document.getElementById(`arg${i}`); - if (element) { - heights.push(element.offsetHeight); - } else { - console.error(`Element with ID 'arg${i}' not found.`); - heights.push(null); // Add null or any placeholder for missing elements - } - } - - app.ports.gotArgHeight.send(heights); -}); -}; - +export const onReady = ({ app, env }) => {}; diff --git a/frontend/static/cucks/trokalayjian/trokalayjian.png b/frontend/static/cucks/trokalayjian/trokalayjian.png index 1d5de1b..1299313 100755 Binary files a/frontend/static/cucks/trokalayjian/trokalayjian.png and b/frontend/static/cucks/trokalayjian/trokalayjian.png differ diff --git a/frontend/static/navbar/nutridex-dark.png b/frontend/static/navbar/nutridex-dark.png old mode 100755 new mode 100644 index 87c1703..55661ab Binary files a/frontend/static/navbar/nutridex-dark.png and b/frontend/static/navbar/nutridex-dark.png differ diff --git a/frontend/static/navbar/nutridex.png b/frontend/static/navbar/nutridex.png old mode 100755 new mode 100644 index da498a9..e4eb8d5 Binary files a/frontend/static/navbar/nutridex.png and b/frontend/static/navbar/nutridex.png differ