From 7b39ebc6dfffe3a641c59a11fa0ea6e30c97a587 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 9 Dec 2024 20:42:33 -0600 Subject: [PATCH] feat: refactored a shit ton of stuff --- frontend/src/Config/Format/CardFormat.elm | 123 ++++++++++-------- .../Config/Pages/Debate/Arguments/Helpers.elm | 18 +-- 2 files changed, 76 insertions(+), 65 deletions(-) diff --git a/frontend/src/Config/Format/CardFormat.elm b/frontend/src/Config/Format/CardFormat.elm index 6a8b229..8964821 100755 --- a/frontend/src/Config/Format/CardFormat.elm +++ b/frontend/src/Config/Format/CardFormat.elm @@ -106,6 +106,22 @@ cardContentSpacing = ] +imageTransitionStyle : List (Attribute msg) +imageTransitionStyle = + [ D.rounded 100 + , D.width 5 + , glowDeepDarkGrey + , D.color colourTheme.backgroundDarkGrey + , B.color colourTheme.backgroundDarkGrey + , mouseOver + [ D.color colourTheme.textDarkOrange + , B.color colourTheme.textDarkOrange + , glowDeepDarkOrange + ] + , transitionStyleSlow + ] + + cardImageMaker : { src : String, description : String } -> String -> Element msg cardImageMaker image urlLink = column @@ -115,18 +131,7 @@ cardImageMaker image urlLink = , alignRight ] [ column - [ D.rounded 100 - , D.width 5 - , glowDeepDarkGrey - , D.color colourTheme.backgroundDarkGrey - , B.color colourTheme.backgroundDarkGrey - , mouseOver - [ D.color colourTheme.textDarkOrange - , B.color colourTheme.textDarkOrange - , glowDeepDarkOrange - ] - , transitionStyleSlow - ] + imageTransitionStyle [ if urlLink == (url ++ formatName pageNames.pageArguments) @@ -139,13 +144,7 @@ cardImageMaker image urlLink = { url = urlLink , label = E.image - [ alignRight - , alignTop - , D.rounded 100 - , clip - , E.width <| px 90 - , E.height <| px 90 - ] + desktopImageSize image } @@ -154,19 +153,24 @@ cardImageMaker image urlLink = { url = urlLink , label = E.image - [ alignRight - , alignTop - , D.rounded 100 - , clip - , E.width <| px 90 - , E.height <| px 90 - ] + desktopImageSize image } ] ] +desktopImageSize : List (Attribute msg) +desktopImageSize = + [ alignRight + , alignTop + , D.rounded 100 + , clip + , E.width <| px 90 + , E.height <| px 90 + ] + + cardImageMakerMobile : { src : String, description : String } -> String -> Element msg cardImageMakerMobile image urlLink = column @@ -181,36 +185,51 @@ cardImageMakerMobile image urlLink = } ] [ column - [ D.rounded 100 - , D.width 5 - , centerX - , alignBottom - , glowDeepDarkGrey - , D.color colourTheme.backgroundDeepDarkGrey - , B.color colourTheme.backgroundDeepDarkGrey - , mouseOver - [ D.color colourTheme.textDarkOrange - , B.color colourTheme.textDarkOrange - , glowDeepDarkOrange - ] - , transitionStyleSlow - ] - [ newTabLink [] - { url = urlLink - , label = - E.image - [ D.rounded 100 - , clip - , centerX - , E.width <| px 45 - , E.height <| px 45 - ] - image - } + imageTransitionStyle + [ if + urlLink + == (url ++ formatName pageNames.pageArguments) + || urlLink + == (url ++ formatName pageNames.pageCucks) + || urlLink + == (url ++ formatName pageNames.pageGibberish) + then + link [] + { url = urlLink + , label = + E.image + ([ alignRight + , alignTop + ] + ++ mobileImageSize + ) + image + } + + else + newTabLink [] + { url = urlLink + , label = + E.image + ([ centerX + ] + ++ mobileImageSize + ) + image + } ] ] +mobileImageSize : List (Attribute msg) +mobileImageSize = + [ D.rounded 100 + , clip + , E.width <| px 45 + , E.height <| px 45 + ] + + cardTitleMaker : String -> Element msg cardTitleMaker title = paragraph diff --git a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm b/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm index d8d6197..7748ad2 100755 --- a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm +++ b/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm @@ -92,7 +92,7 @@ argumentMaker argument = [ propositionMakerDesktop argument , reductioMakerDesktop argument , summaryMakerDesktop argument - , strengthMakerDesktop argument + , strengthBar argument , tableMaker argument , desktopFormalizationMaker argument ] @@ -121,7 +121,7 @@ argumentMakerMobile argument = ] , reductioMakerMobile argument , summaryMakerMobile argument - , strengthMakerMobile argument + , strengthBar argument , tableMaker argument , mobileFormalizationMaker argument ] @@ -345,22 +345,14 @@ summaryMakerTitle argument = ] -strengthMakerDesktop : Argument -> Element msg -strengthMakerDesktop argument = +strengthBar : Argument -> Element msg +strengthBar argument = row [ E.width fill ] [ strengthMaker , strengthMakerBar argument ] -strengthMakerMobile : Argument -> Element msg -strengthMakerMobile argument = - column [ E.width fill ] - [ strengthMaker - , strengthMakerBar argument - ] - - strengthMaker : Element msg strengthMaker = column @@ -384,7 +376,7 @@ strengthMaker = (el [ paddingEach { top = 0 - , right = 10 + , right = 5 , bottom = 0 , left = 0 }