upRootNutrition/website
1
0
Fork 0
mirror of https://gitlab.com/upRootNutrition/website.git synced 2025-06-16 04:25:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: added new images

Browse source
This commit is contained in:
Nick 2024-12-24 03:08:39 -06:00
parent b1a190d9ad
commit 6763b6a860
11 changed files with 332 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Config/Helpers/ServiceFormat.elm
View file

@ -36,8 +36,7 @@ bodyFormat =
chunkMaker : List (Element msg) -> Element msg chunkMaker : List (Element msg) -> Element msg
chunkMaker elements = chunkMaker elements =
row [ alignLeft, spacing 10 ] paragraph
[ paragraph
[ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, paragraphSpacing , paragraphSpacing
, paragraphFontSize , paragraphFontSize
@ -45,7 +44,6 @@ chunkMaker elements =
, width fill , width fill
] ]
elements elements
]
titleMaker : String -> Element msg titleMaker : String -> Element msg

41
frontend/src/Config/Style/Images.elm Normal file
View file

@ -0,0 +1,41 @@
module Config.Style.Images exposing (..)
import Config.Helpers.ImageFolders exposing (..)
import Config.Style.Colour exposing (colourTheme)
import Element as E exposing (..)
import Element.Background as B exposing (color)
import Element.Border as D
exposing
( color
, rounded
, width
)
imageSquareMaker : Device -> String -> Bool -> String -> Element msg
imageSquareMaker device imagePath isLeft size =
E.image
[ D.rounded 10
, clip
, E.width <| px (imageSizer size)
, E.height <| px (imageSizer size)
]
{ src = imagePath
, description = ""
}
imageSizer : String -> Int
imageSizer size =
case size of
"Fatty" ->
80
"Big" ->
65
"Medium" ->
45
_ ->
35

56
frontend/src/Pages/Blog.elm
View file

@ -18,6 +18,7 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (blogHeader) import Config.Helpers.Headers.Records exposing (blogHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Markdown import Config.Helpers.Markdown
exposing exposing
( renderDeviceMarkdown ( renderDeviceMarkdown
@ -43,6 +44,7 @@ import Config.Pages.Blog.Records.SweetDeception exposing (articleSweetDeception)
import Config.Pages.Blog.Types exposing (..) import Config.Pages.Blog.Types exposing (..)
import Config.Style.Colour as T exposing (..) import Config.Style.Colour as T exposing (..)
import Config.Style.Icons.Icons exposing (construction) import Config.Style.Icons.Icons exposing (construction)
import Config.Style.Images exposing (imageSquareMaker)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Element.Background as B import Element.Background as B
@ -145,7 +147,7 @@ blogList device =
[ [ headerMaker (R.BlogPage blogHeader) ] [ [ headerMaker (R.BlogPage blogHeader) ]
, List.map , List.map
(\article -> (\article ->
cardMaker device (C.BlogCard article) (contentList article) cardMaker device (C.BlogCard article) (contentList device article)
) )
[ articleShenanigans [ articleShenanigans
, articleSweetDeception , articleSweetDeception
@ -162,9 +164,9 @@ blogList device =
] ]
contentList : BlogArticle -> List (Element msg) contentList : Device -> BlogArticle -> List (Element msg)
contentList article = contentList device article =
[ articleMaker article ] [ articleMaker device article ]
articleImage : articleImage :
@ -179,19 +181,48 @@ articleImage article =
} }
articleMaker : BlogArticle -> Element msg articleMaker : Device -> BlogArticle -> Element msg
articleMaker article = articleMaker device article =
let
image : String -> Element msg
image size =
el
[ alignLeft
, alignTop
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
]
<|
imageSquareMaker device (imagePathMaker M.BlogCard article.articleImage) True size
in
column column
[ E.width fill [ E.width fill
, centerX , centerX
, spacing 8
] ]
[ column [ row
[ width fill [ width fill
] ]
(articleRows article [ case ( device.class, device.orientation ) of
++ [ row [] ( Phone, Portrait ) ->
[ paragraph none
( Tablet, Portrait ) ->
none
_ ->
image "Big"
, column
[ width fill
, alignTop
]
(articleRows article)
]
, el [] <|
paragraph
[ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, paragraphSpacing , paragraphSpacing
, paragraphFontSize , paragraphFontSize
@ -207,9 +238,6 @@ articleMaker article =
] ]
[ renderDeviceMarkdownNoToc (extractFirstWords article.articleBody) ] [ renderDeviceMarkdownNoToc (extractFirstWords article.articleBody) ]
] ]
]
)
]
infoRow : String -> String -> Element msg infoRow : String -> String -> Element msg

66
frontend/src/Pages/Debate.elm
View file

@ -23,6 +23,7 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (debateHeader) import Config.Helpers.Headers.Records exposing (debateHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
@ -40,6 +41,7 @@ import Config.Style.Glow
( glowDeepDarkGrey ( glowDeepDarkGrey
, glowDeepDarkOrange , glowDeepDarkOrange
) )
import Config.Style.Images exposing (imageSquareMaker)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( transitionStyleSlow ( transitionStyleSlow
@ -148,7 +150,7 @@ debateList device =
[ [ headerMaker (R.Debate debateHeader) ] [ [ headerMaker (R.Debate debateHeader) ]
, List.map , List.map
(\debate -> (\debate ->
cardMaker device (C.Debate debate) (contentList debate) cardMaker device (C.Debate debate) (contentList device debate)
) )
[ debateArguments [ debateArguments
, debateCuckList , debateCuckList
@ -157,27 +159,50 @@ debateList device =
] ]
contentList : Debate -> List (Element msg) contentList : Device -> Debate -> List (Element msg)
contentList debate = contentList device debate =
[ descriptionMaker debate ] [ descriptionMaker device debate ]
descriptionMaker : Debate -> Element msg descriptionMaker : Device -> Debate -> Element msg
descriptionMaker debate = descriptionMaker device debate =
column [ alignTop ] let
[ column image : String -> Element msg
[ spacing 3 image size =
, alignTop el
[ alignLeft
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
] ]
[ row [ spacing 5 ] <|
[ paragraph imageSquareMaker device (imagePathMaker M.Debate debate.debateImage) True size
in
chunkMaker
[ image "Fatty"
, el [] <|
inferenceMaker debate
, el [ width fill, height (px 0) ] none
, el
[ F.color colourTheme.textLightGrey ]
(text debate.debateDescription)
]
inferenceMaker : Debate -> Element msg
inferenceMaker debate =
row [ spacing 5 ]
[ el
[ F.color colourTheme.textLightOrange [ F.color colourTheme.textLightOrange
, paragraphSpacing , paragraphSpacing
, F.bold , F.bold
, headerFontSizeSmall , headerFontSizeSmall
, E.width fill
] ]
[ if debate.debateTitle == "Arguments" then <|
if debate.debateTitle == "Arguments" then
text "Inferences: " text "Inferences: "
else if debate.debateTitle == "Cucklist" then else if debate.debateTitle == "Cucklist" then
@ -188,19 +213,14 @@ descriptionMaker debate =
else else
text "" text ""
] , el
, text (String.fromInt debate.debateCount)
|> el
[ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, F.regular , F.regular
, paragraphFontSize , paragraphFontSize
] ]
] <|
, el [ width fill ] <| text
chunkMaker (String.fromInt debate.debateCount)
[ text debate.debateDescription
]
]
] ]

58
frontend/src/Pages/Debate/Arguments.elm
View file

@ -37,6 +37,7 @@ import Config.Style.Glow
( glowDeepDarkGrey ( glowDeepDarkGrey
, glowDeepDarkOrange , glowDeepDarkOrange
) )
import Config.Style.Images exposing (imageSquareMaker)
import Config.Style.Transitions exposing (transitionStyleSlow) import Config.Style.Transitions exposing (transitionStyleSlow)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
@ -151,6 +152,22 @@ debateList device =
contentList : Device -> Argument -> List (Element msg) contentList : Device -> Argument -> List (Element msg)
contentList device argument = contentList device argument =
let
image : String -> Element msg
image size =
el
[ alignLeft
, alignTop
, paddingEach
{ top = 0
, right = 0
, bottom = 0
, left = 10
}
]
<|
imageSquareMaker device (imagePathMaker M.Argument argument.argumentImage) False size
in
[ row [ row
[ width fill [ width fill
, paddingEach , paddingEach
@ -169,7 +186,10 @@ contentList device argument =
, left = 0 , left = 0
} }
] ]
[ column [ width fill, spacing 8 ] [ column
[ width fill
, spacing 8
]
[ summaryMakerDesktop device argument [ summaryMakerDesktop device argument
, strengthBar device argument , strengthBar device argument
] ]
@ -181,7 +201,7 @@ contentList device argument =
none none
_ -> _ ->
argumentImageMaker argument image "Fatty"
] ]
, tableMaker device argument , tableMaker device argument
, desktopFormalizationMaker argument , desktopFormalizationMaker argument
@ -189,40 +209,6 @@ contentList device argument =
] ]
argumentImageMaker : Argument -> Element msg
argumentImageMaker argument =
el
[ alignRight
, alignTop
, centerY
, paddingEach
{ top = 0
, right = 0
, bottom = 0
, left = 20
}
]
<|
el
[ D.rounded 10
, D.width 3
, D.color colourTheme.backgroundLightGrey
, B.color colourTheme.backgroundLightGrey
]
<|
E.image
[ alignRight
, alignTop
, D.rounded 10
, clip
, E.width <| px 65
, E.height <| px 65
]
{ src = imagePathMaker M.Argument argument.argumentImage
, description = ""
}
proofTreeButton : String -> Element msg proofTreeButton : String -> Element msg
proofTreeButton url = proofTreeButton url =
newTabLink newTabLink

41
frontend/src/Pages/Debate/Cucklist.elm
View file

@ -14,6 +14,7 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (cuckListHeader) import Config.Helpers.Headers.Records exposing (cuckListHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
@ -28,6 +29,7 @@ import Config.Pages.Debate.Cuckery.List
) )
import Config.Pages.Debate.Cuckery.Types exposing (..) import Config.Pages.Debate.Cuckery.Types exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Images exposing (imageSquareMaker)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( hoverFontDarkOrange ( hoverFontDarkOrange
@ -143,7 +145,33 @@ cucksList device =
contentList : Device -> Cuck -> List (Element msg) contentList : Device -> Cuck -> List (Element msg)
contentList device cuck = contentList device cuck =
[ column let
image : String -> Element msg
image size =
el
[ alignRight
, alignTop
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
]
<|
imageSquareMaker device (imagePathMaker M.Cuck cuck.cuckImage) True size
in
[ row [ width fill ]
[ case ( device.class, device.orientation ) of
( Phone, Portrait ) ->
image "Small"
( Tablet, Portrait ) ->
image "Small"
_ ->
image "Fatty"
, column
[ width fill [ width fill
, spacing 3 , spacing 3
, paddingEach , paddingEach
@ -167,6 +195,7 @@ contentList device cuck =
, dodgeMaker device cuck , dodgeMaker device cuck
] ]
] ]
]
dodgeMaker : Device -> Cuck -> Element msg dodgeMaker : Device -> Cuck -> Element msg
@ -230,7 +259,15 @@ makeDodge device cuck dodge index =
] ]
[ row [ row
[ width fill [ width fill
, paddingEach , case ( device.class, device.orientation ) of
( Phone, Portrait ) ->
moveLeft 40
( Tablet, Portrait ) ->
moveLeft 40
_ ->
paddingEach
{ top = 0 { top = 0
, right = 0 , right = 0
, bottom = 0 , bottom = 0

34
frontend/src/Pages/Debate/Gibberish.elm
View file

@ -13,11 +13,13 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (gibberishHeader) import Config.Helpers.Headers.Records exposing (gibberishHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer
) )
import Config.Helpers.ServiceFormat exposing (chunkMaker)
import Config.Helpers.StrengthBar import Config.Helpers.StrengthBar
exposing exposing
( barMaker ( barMaker
@ -36,6 +38,7 @@ import Config.Pages.Debate.Gibberish.Records.PhilOfMind exposing (philOfMindGibb
import Config.Pages.Debate.Gibberish.Records.Theology exposing (theologyGibberish) import Config.Pages.Debate.Gibberish.Records.Theology exposing (theologyGibberish)
import Config.Pages.Debate.Gibberish.Types exposing (..) import Config.Pages.Debate.Gibberish.Types exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Images exposing (imageSquareMaker)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Element.Background as B import Element.Background as B
@ -140,7 +143,7 @@ gibberishList device =
[ [ headerMaker (R.Gibberish gibberishHeader) ] [ [ headerMaker (R.Gibberish gibberishHeader) ]
, List.map , List.map
(\gibberish -> (\gibberish ->
cardMaker device (C.Gibberish gibberish) (contentList gibberish) cardMaker device (C.Gibberish gibberish) (contentList device gibberish)
) )
[ epistemologyGibberish [ epistemologyGibberish
, theologyGibberish , theologyGibberish
@ -153,9 +156,32 @@ gibberishList device =
] ]
contentList : Gibberish -> List (Element msg) contentList : Device -> Gibberish -> List (Element msg)
contentList gibberish = contentList device gibberish =
[ descriptionMaker gibberish let
image : String -> Element msg
image size =
el
[ alignLeft
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
]
<|
imageSquareMaker device (imagePathMaker M.Gibberish gibberish.gibberishImage) True size
in
[ paragraph
[ F.color colourTheme.textLightGrey
, paragraphSpacing
, paragraphFontSize
, width fill
]
[ image "Big"
, text gibberish.gibberishDescription
]
, gibberishMakerBody gibberish , gibberishMakerBody gibberish
] ]

23
frontend/src/Pages/Donate.elm
View file

@ -12,6 +12,7 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (donateHeader) import Config.Helpers.Headers.Records exposing (donateHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
@ -34,6 +35,7 @@ import Config.Pages.Donate.Records.Stripe exposing (donateStripe)
import Config.Pages.Donate.Records.YouTube exposing (donateYouTube) import Config.Pages.Donate.Records.YouTube exposing (donateYouTube)
import Config.Pages.Donate.Types exposing (..) import Config.Pages.Donate.Types exposing (..)
import Config.Style.Colour as T exposing (..) import Config.Style.Colour as T exposing (..)
import Config.Style.Images exposing (imageSquareMaker)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Element.Background as B import Element.Background as B
@ -151,8 +153,29 @@ donateList device =
contentList : Device -> Donate -> List (Element msg) contentList : Device -> Donate -> List (Element msg)
contentList device donate = contentList device donate =
let
image : String -> Element msg
image size =
el
[ alignLeft
, alignTop
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
]
<|
imageSquareMaker device (imagePathMaker M.Donate donate.donateImage) True size
in
[ row [ width fill ]
[ image "Small"
, column [ width fill ]
[ feeMaker donate [ feeMaker donate
, preferenceMaker donate , preferenceMaker donate
]
]
, tableMaker donate device , tableMaker donate device
, proTitleMaker donate , proTitleMaker donate
, proMaker donate , proMaker donate

34
frontend/src/Pages/Services.elm
View file

@ -14,6 +14,7 @@ import Config.Helpers.Format
import Config.Helpers.Headers.Helpers exposing (..) import Config.Helpers.Headers.Helpers exposing (..)
import Config.Helpers.Headers.Records exposing (servicesHeader) import Config.Helpers.Headers.Records exposing (servicesHeader)
import Config.Helpers.Headers.Types as R exposing (..) import Config.Helpers.Headers.Types as R exposing (..)
import Config.Helpers.ImageFolders as M exposing (..)
import Config.Helpers.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
@ -28,6 +29,7 @@ import Config.Pages.Services.Records.NutritionScience exposing (..)
import Config.Pages.Services.Types exposing (..) import Config.Pages.Services.Types exposing (..)
import Config.Style.Colour as T exposing (..) import Config.Style.Colour as T exposing (..)
import Config.Style.Glow exposing (glowDeepDarkGrey, glowDeepDarkOrange) import Config.Style.Glow exposing (glowDeepDarkGrey, glowDeepDarkOrange)
import Config.Style.Images exposing (imageSquareMaker)
import Config.Style.Transitions exposing (transitionStyleMedium) import Config.Style.Transitions exposing (transitionStyleMedium)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
@ -130,7 +132,7 @@ servicesList device =
] ]
, List.map , List.map
(\service -> (\service ->
cardMaker device (C.Service service) (contentList service) cardMaker device (C.Service service) (contentList device service)
) )
[ servicesDebateAnalysis [ servicesDebateAnalysis
, servicesDebateCoaching , servicesDebateCoaching
@ -141,10 +143,30 @@ servicesList device =
] ]
contentList : Service msg -> List (Element msg) contentList : Device -> Service msg -> List (Element msg)
contentList service = contentList device service =
let
image : String -> Element msg
image size =
el
[ alignLeft
, paddingEach
{ top = 0
, right = 10
, bottom = 0
, left = 0
}
]
<|
imageSquareMaker device (imagePathMaker M.ServicePage service.serviceImage) True size
in
[ row []
[ image "Small"
, column [ alignBottom ]
[ rateMaker service [ rateMaker service
, descriptionMaker service , descriptionMaker service
]
]
, offeringMaker service , offeringMaker service
] ]
@ -205,12 +227,6 @@ offeringMaker service =
column column
[ spacing 8 [ spacing 8
, width fill , width fill
, paddingEach
{ top = 0
, right = 0
, bottom = 0
, left = 35
}
] ]
<| <|
List.map2 (\x y -> makeDescription x) List.map2 (\x y -> makeDescription x)

BIN
frontend/static/donate/patreon.png Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Before After
Before After

BIN
frontend/static/donate/youtube.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Before After
Before After