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: refactored some stuff

Browse source
This commit is contained in:
Nick 2024-12-11 03:48:49 -06:00
parent a7000d6302
commit d0617b7a90
41 changed files with 161 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Navbar.elm
View file

@ -1,7 +1,7 @@
module Layouts.Navbar exposing (Model, Msg, Props, layout) module Layouts.Navbar exposing (Model, Msg, Props, layout)
import Config.Data.Identity exposing (..) import Config.Data.Identity exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -9,7 +9,7 @@ import Config.Format.Format
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Fonts exposing (spartanFont) import Config.Style.Fonts exposing (spartanFont)
import Config.Style.Glow exposing (glowDeepDarkGreyNavbar) import Config.Style.Glow exposing (glowDeepDarkGreyNavbar)
import Config.Style.Svgs import Config.Style.Icons.Icons
exposing exposing
( contact ( contact
, debate , debate
@ -384,7 +384,7 @@ desktopButtonMaker route name icon =
<| <|
html icon html icon
, el , el
((if route.path == Path.Hyperblog then ((if route.path == Path.Blog then
F.color colourTheme.textLightOrange F.color colourTheme.textLightOrange
else else

59
frontend/src/Config/Data/LocalPath.elm
View file

@ -1,59 +0,0 @@
module Config.Data.LocalPath exposing (..)module Config.Data.LocalPath exposing (..)
import Route
import Route.Path as Path
isLocalPath : Route.Path -> Bool
isLocalPath path =
case Route.Path.current path of
Route.Path.Home_ ->
True
Route.Path.Contact ->
True
Route.Path.Debate ->
True
Route.Path.Debate_Arguments ->
True
Route.Path.Debate_Cucklist ->
True
Route.Path.Debate_Gibberish ->
True
Route.Path.Donate ->
True
Route.Path.Hyperblog ->
True
Route.Path.Interviews ->
True
Route.Path.Nutridex ->
True
Route.Path.Services ->
True
Route.Path.Services_Analysis ->
True
Route.Path.Services_Coaching ->
True
Route.Path.Services_Elm ->
True
Route.Path.Services_Nix ->
True
Route.Path.Services_Nutrition ->
True
_ ->
False

125
frontend/src/Config/Format/CardFormat.elm → frontend/src/Config/Helpers/CardFormat.elm
View file

@ -1,23 +1,23 @@
module Config.Format.CardFormat exposing (..) module Config.Helpers.CardFormat exposing (..)
import Config.Data.Identity import Config.Data.Identity
exposing exposing
( pageNames ( pageNames
, url , url
) )
import Config.Format.Format import Config.Helpers.Converters exposing (formatName)
import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
) )
import Config.Helpers.Converters exposing (formatName)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Glow import Config.Style.Glow
exposing exposing
( glowDeepDarkGrey ( glowDeepDarkGrey
, glowDeepDarkOrange , glowDeepDarkOrange
) )
import Config.Style.Svgs exposing (construction) import Config.Style.Icons.Icons exposing (construction)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( hoverCircleButtonDarkOrange ( hoverCircleButtonDarkOrange
@ -114,21 +114,43 @@ imageTransitionStyle =
, D.color colourTheme.backgroundDarkGrey , D.color colourTheme.backgroundDarkGrey
, B.color colourTheme.backgroundDarkGrey , B.color colourTheme.backgroundDarkGrey
, hoverCircleButtonDarkOrange , hoverCircleButtonDarkOrange
, transitionStyleSlow , transitionStyleMedium
] ]
cardImageMaker : { src : String, description : String } -> String -> Element msg desktopCardMaker :
cardImageMaker image urlLink = List (Attribute msg)
-> List (Attribute msg)
->
{ src : String
, description : String
}
-> String
-> Element msg
desktopCardMaker size1 size2 image urlLink =
cardImageMaker size1 size2 image urlLink
mobileCardMaker :
List (Attribute msg)
-> List (Attribute msg)
->
{ src : String
, description : String
}
-> String
-> Element msg
mobileCardMaker size1 size2 image urlLink =
cardImageMaker size1 size2 image urlLink
cardImageMaker : List (Attribute msg) -> List (Attribute msg) -> { src : String, description : String } -> String -> Element msg
cardImageMaker size1 size2 image urlLink =
column column
[ E.width <| px 115 size1
, E.height <| px 115 [ el
, alignTop
, alignRight
]
[ column
imageTransitionStyle imageTransitionStyle
[ if (if
urlLink urlLink
== Path.toString Path.Home_ == Path.toString Path.Home_
|| urlLink || urlLink
@ -144,7 +166,7 @@ cardImageMaker image urlLink =
|| urlLink || urlLink
== Path.toString Path.Donate == Path.toString Path.Donate
|| urlLink || urlLink
== Path.toString Path.Hyperblog == Path.toString Path.HyperBlog
|| urlLink || urlLink
== Path.toString Path.Interviews == Path.toString Path.Interviews
|| urlLink || urlLink
@ -166,7 +188,7 @@ cardImageMaker image urlLink =
{ url = urlLink { url = urlLink
, label = , label =
E.image E.image
desktopImageSize size2
image image
} }
@ -175,10 +197,10 @@ cardImageMaker image urlLink =
{ url = urlLink { url = urlLink
, label = , label =
E.image E.image
desktopImageSize size2
image image
} }
] )
] ]
@ -193,9 +215,26 @@ desktopImageSize =
] ]
cardImageMakerMobile : { src : String, description : String } -> String -> Element msg mobileImageSize : List (Attribute msg)
cardImageMakerMobile image urlLink = mobileImageSize =
column [ D.rounded 100
, clip
, E.width <| px 45
, E.height <| px 45
]
desktopImageBoxSize : List (Attribute msg)
desktopImageBoxSize =
[ E.width <| px 115
, E.height <| px 115
, alignTop
, alignRight
]
mobileImageBoxSize : List (Attribute msg)
mobileImageBoxSize =
[ alignTop [ alignTop
, centerX , centerX
, alignLeft , alignLeft
@ -206,50 +245,6 @@ cardImageMakerMobile image urlLink =
, right = 0 , right = 0
} }
] ]
[ column
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 : String -> Element msg

2
frontend/src/Config/Format/Format.elm → frontend/src/Config/Helpers/Format.elm
View file

@ -1,4 +1,4 @@
module Config.Format.Format exposing (..) module Config.Helpers.Format exposing (..)
import Element exposing (..) import Element exposing (..)
import Element.Font as F import Element.Font as F

2
frontend/src/Config/Format/Response.elm → frontend/src/Config/Helpers/Response.elm
View file

@ -1,4 +1,4 @@
module Config.Format.Response exposing (..) module Config.Helpers.Response exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Element as E exposing (..) import Element as E exposing (..)

4
frontend/src/Config/Pages/Contact/Helpers.elm
View file

@ -1,8 +1,8 @@
module Config.Pages.Contact.Helpers exposing (..) module Config.Pages.Contact.Helpers exposing (..)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format exposing (..) import Config.Helpers.Format exposing (..)
import Config.Helpers.StrengthBar import Config.Helpers.StrengthBar
exposing exposing
( barMaker ( barMaker

8
frontend/src/Config/Pages/Debate/Arguments/Helpers.elm
View file

@ -1,8 +1,8 @@
module Config.Pages.Debate.Arguments.Helpers exposing (..) module Config.Pages.Debate.Arguments.Helpers exposing (..)
import Config.Data.Hashtags.Helpers exposing (..) import Config.Data.Hashtags.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -83,7 +83,7 @@ argumentMaker : Argument -> Element msg
argumentMaker argument = argumentMaker argument =
row row
topLevelBox topLevelBox
[ cardImageMaker (argumentImage argument) (argumentLink argument) [ desktopCardMaker desktopImageBoxSize desktopImageSize (argumentImage argument) (argumentLink argument)
, cardMaker , cardMaker
[ cardTitleMaker argument.argumentTitle [ cardTitleMaker argument.argumentTitle
, cardFormatter , cardFormatter
@ -115,7 +115,7 @@ argumentMakerMobile argument =
[ column [ column
fieldSpacer fieldSpacer
[ row [ spacing 10, E.width fill ] [ row [ spacing 10, E.width fill ]
[ cardImageMakerMobile (argumentImage argument) (argumentLink argument) [ mobileCardMaker mobileImageBoxSize mobileImageSize (argumentImage argument) (argumentLink argument)
, column [ E.width fill ] , column [ E.width fill ]
[ propositionMakerMobile argument [ propositionMakerMobile argument
] ]

8
frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Debate.Cuckery.Helpers exposing (..) module Config.Pages.Debate.Cuckery.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -92,7 +92,7 @@ desktopCuckMaker : Cuck -> Element msg
desktopCuckMaker cuck = desktopCuckMaker cuck =
row row
topLevelBox topLevelBox
[ cardImageMaker (cuckImage cuck) (cuckSocial cuck) [ desktopCardMaker desktopImageBoxSize desktopImageSize (cuckImage cuck) (cuckSocial cuck)
, cardMaker , cardMaker
[ cardTitleMaker (cuckTitle cuck) [ cardTitleMaker (cuckTitle cuck)
, cardFormatter , cardFormatter
@ -127,7 +127,7 @@ mobileCuckMaker cuck =
, spacing 3 , spacing 3
] ]
[ row [ spacing 10 ] [ row [ spacing 10 ]
[ cardImageMakerMobile (cuckImage cuck) (cuckSocial cuck) [ mobileCardMaker mobileImageBoxSize mobileImageSize (cuckImage cuck) (cuckSocial cuck)
, socialMaker cuck , socialMaker cuck
] ]
, dodgeTitle cuck , dodgeTitle cuck

11
frontend/src/Config/Pages/Debate/Debate/Helpers.elm
View file

@ -5,8 +5,8 @@ import Config.Data.Identity
( pageNames ( pageNames
, url , url
) )
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -29,8 +29,7 @@ import Config.Style.Glow
) )
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( hoverPageButtonDeepDarkOrange ( transitionStyleSlow
, transitionStyleSlow
) )
import Element as E exposing (..) import Element as E exposing (..)
import Element.Background as B import Element.Background as B
@ -44,7 +43,7 @@ desktopDebateMaker : Debate -> Element msg
desktopDebateMaker debate = desktopDebateMaker debate =
row row
topLevelBox topLevelBox
[ cardImageMaker (debateImage debate) debate.debateLink [ desktopCardMaker desktopImageBoxSize desktopImageSize (debateImage debate) debate.debateLink
, cardMaker , cardMaker
[ cardTitleMaker debate.debateTitle [ cardTitleMaker debate.debateTitle
, cardFormatter , cardFormatter
@ -70,7 +69,7 @@ mobileDebateMaker debate =
[ column [ column
fieldSpacer fieldSpacer
[ row [ width fill, spacing 10 ] [ row [ width fill, spacing 10 ]
[ cardImageMakerMobile (debateImage debate) debate.debateLink [ mobileCardMaker mobileImageBoxSize mobileImageSize (debateImage debate) debate.debateLink
, column , column
[ width fill ] [ width fill ]
[] []

8
frontend/src/Config/Pages/Debate/Gibberish/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Debate.Gibberish.Helpers exposing (..) module Config.Pages.Debate.Gibberish.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -32,7 +32,7 @@ desktopGibberishMaker : Gibberish -> Element msg
desktopGibberishMaker gibberish = desktopGibberishMaker gibberish =
row row
topLevelBox topLevelBox
[ cardImageMaker (gibberishImage gibberish) gibberish.gibberishLink [ desktopCardMaker desktopImageBoxSize desktopImageSize (gibberishImage gibberish) gibberish.gibberishLink
, cardMaker , cardMaker
[ cardTitleMaker (gibberishTitle gibberish) [ cardTitleMaker (gibberishTitle gibberish)
, cardFormatter , cardFormatter
@ -53,7 +53,7 @@ mobileGibberishMaker gibberish =
[ cardTitleMaker (gibberishTitle gibberish) [ cardTitleMaker (gibberishTitle gibberish)
, cardFormatter , cardFormatter
[ row [ spacing 20, padding 10 ] [ row [ spacing 20, padding 10 ]
[ column [] [ cardImageMakerMobile (gibberishImage gibberish) gibberish.gibberishLink ] [ column [] [ mobileCardMaker mobileImageBoxSize mobileImageSize (gibberishImage gibberish) gibberish.gibberishLink ]
, column [ width fill ] , column [ width fill ]
[ descriptionMaker gibberish [ descriptionMaker gibberish
] ]

8
frontend/src/Config/Pages/Donate/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Donate.Helpers exposing (..) module Config.Pages.Donate.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -32,7 +32,7 @@ donateMaker : Donate -> Element msg
donateMaker donate = donateMaker donate =
row row
topLevelBox topLevelBox
[ cardImageMaker (donateImage donate) (donateLink donate) [ desktopCardMaker desktopImageBoxSize desktopImageSize (donateImage donate) (donateLink donate)
, cardMaker , cardMaker
[ cardTitleMaker (donateTitle donate) [ cardTitleMaker (donateTitle donate)
, cardFormatter , cardFormatter
@ -65,7 +65,7 @@ donateMakerMobile donate =
[ column [ column
fieldSpacer fieldSpacer
[ row [ width fill, spacing 10 ] [ row [ width fill, spacing 10 ]
[ cardImageMakerMobile (donateImage donate) [ mobileCardMaker mobileImageBoxSize mobileImageSize (donateImage donate)
(donateLink donate) (donateLink donate)
, column , column
[ width fill ] [ width fill ]

4
frontend/src/Config/Pages/Headers/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Headers.Helpers exposing (..) module Config.Pages.Headers.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing

2
frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm
View file

@ -7,7 +7,7 @@ hyperBlogHeader : Header
hyperBlogHeader = hyperBlogHeader =
let let
name = name =
"HyperBlog" "Blog"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj"

6
frontend/src/Config/Pages/Home/Helpers.elm
View file

@ -1,17 +1,17 @@
module Config.Pages.Home.Helpers exposing (..) module Config.Pages.Home.Helpers exposing (..)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
) )
import Config.Format.Response exposing (topLevelContainer) import Config.Helpers.Response exposing (topLevelContainer)
import Config.Helpers.Viewport exposing (resetViewport) import Config.Helpers.Viewport exposing (resetViewport)
import Config.Pages.HyperBlog.Helpers exposing (..) import Config.Pages.HyperBlog.Helpers exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Glow exposing (glowDeepDarkGrey) import Config.Style.Glow exposing (glowDeepDarkGrey)
import Config.Style.Svgs import Config.Style.Icons.Icons
exposing exposing
( upRootLarge ( upRootLarge
, upRootMedium , upRootMedium

4
frontend/src/Config/Pages/HyperBlog/Helpers.elm
View file

@ -1,8 +1,8 @@
module Config.Pages.HyperBlog.Helpers exposing (..) module Config.Pages.HyperBlog.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Svgs exposing (construction) import Config.Style.Icons.Icons exposing (construction)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Element.Font as F import Element.Font as F

8
frontend/src/Config/Pages/Interviews/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Interviews.Helpers exposing (..) module Config.Pages.Interviews.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -32,7 +32,7 @@ interviewMaker : Interview -> Element msg
interviewMaker interview = interviewMaker interview =
row row
topLevelBox topLevelBox
[ cardImageMaker (interviewImage interview) (interviewSocial interview) [ desktopCardMaker desktopImageBoxSize desktopImageSize (interviewImage interview) (interviewSocial interview)
, cardMaker , cardMaker
[ cardTitleMaker (interviewTitle interview) [ cardTitleMaker (interviewTitle interview)
, cardFormatter , cardFormatter
@ -61,7 +61,7 @@ interviewMakerMobile interview =
[ column [ column
fieldSpacer fieldSpacer
[ row [ spacing 10 ] [ row [ spacing 10 ]
[ cardImageMakerMobile (interviewImage interview) (interviewSocial interview) [ mobileCardMaker mobileImageBoxSize mobileImageSize (interviewImage interview) (interviewSocial interview)
, socialMaker interview , socialMaker interview
] ]
, appearanceTitle interview , appearanceTitle interview

6
frontend/src/Config/Pages/Products/Helpers.elm
View file

@ -1,7 +1,7 @@
module Config.Pages.Products.Helpers exposing (..) module Config.Pages.Products.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -14,7 +14,7 @@ import Config.Helpers.StrengthBar
import Config.Helpers.ToolTip exposing (tooltip) import Config.Helpers.ToolTip exposing (tooltip)
import Config.Pages.Products.Types exposing (..) import Config.Pages.Products.Types exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Svgs exposing (nutriDexLogo) import Config.Style.Icons.Icons exposing (nutriDexLogo)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( hoverFontDarkOrange ( hoverFontDarkOrange

19
frontend/src/Config/Pages/Services/Helpers.elm
View file

@ -1,27 +1,27 @@
module Config.Pages.Services.Helpers exposing (..) module Config.Pages.Services.Helpers exposing (..)
import Browser import Browser
import Config.Format.CardFormat exposing (..) import Config.Helpers.CardFormat exposing (..)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
) )
import Config.Pages.Services.Types exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Element as E exposing (..) import Element as E exposing (..)
import Element.Background as B import Element.Background as B
import Element.Border as D import Element.Border as D
import Element.Font as F import Element.Font as F
import Config.Pages.Services.Types exposing (..)
serviceMaker : Service -> Element msg serviceMaker : Service -> Element msg
serviceMaker service = serviceMaker service =
row row
topLevelBox topLevelBox
[ cardImageMaker (serviceImage service) "" [ desktopCardMaker desktopImageBoxSize desktopImageSize (serviceImage service) service.serviceLink
, cardMaker , cardMaker
[ cardTitleMaker (serviceTitle service) [ cardTitleMaker service.serviceName
, cardFormatter , cardFormatter
[ cardContentSpacing [ cardContentSpacing
[ column [ column
@ -42,12 +42,12 @@ serviceMakerMobile service =
topLevelBox topLevelBox
[ column [] [] [ column [] []
, cardMaker , cardMaker
[ cardTitleMaker (serviceTitle service) [ cardTitleMaker service.serviceName
, cardFormatter , cardFormatter
[ cardContentSpacing [ cardContentSpacing
[ column [ column
fieldSpacer fieldSpacer
[ row [ spacing 10 ] [ cardImageMakerMobile (serviceImage service) "", rateMaker service ] [ row [ spacing 10 ] [ mobileCardMaker mobileImageBoxSize mobileImageSize (serviceImage service) service.serviceLink, rateMaker service ]
, descriptionMaker service , descriptionMaker service
, offeringMaker service , offeringMaker service
] ]
@ -64,11 +64,6 @@ serviceImage service =
} }
serviceTitle : Service -> String
serviceTitle service =
service.serviceName
serviceWidth = serviceWidth =
width <| px 45 width <| px 45

6
frontend/src/Config/Pages/Services/Services/DebateAnalysis.elm
View file

@ -1,7 +1,9 @@
module Config.Pages.Services.Services.DebateAnalysis exposing (..) module Config.Pages.Services.Services.DebateAnalysis exposing (..)
import Config.Pages.Services.Types exposing (..)
import Config.Helpers.Converters exposing (formatName) import Config.Helpers.Converters exposing (formatName)
import Config.Pages.Services.Types exposing (..)
import Route.Path as Path
servicesDebateAnalysis : Service servicesDebateAnalysis : Service
servicesDebateAnalysis = servicesDebateAnalysis =
@ -11,7 +13,7 @@ servicesDebateAnalysis =
"Debate Analysis" "Debate Analysis"
in in
{ serviceImage = formatName name { serviceImage = formatName name
, serviceLink = "https://the-nutrivore.social/" , serviceLink = Path.toString Path.Services_Analysis
, serviceName = name , serviceName = name
, serviceRate = "$80/hr" , serviceRate = "$80/hr"
, serviceDescription = , serviceDescription =

6
frontend/src/Config/Pages/Services/Services/DebateTutoring.elm
View file

@ -1,7 +1,9 @@
module Config.Pages.Services.Services.DebateTutoring exposing (..) module Config.Pages.Services.Services.DebateTutoring exposing (..)
import Config.Pages.Services.Types exposing (..)
import Config.Helpers.Converters exposing (formatName) import Config.Helpers.Converters exposing (formatName)
import Config.Pages.Services.Types exposing (..)
import Route.Path as Path
servicesDebateTutoring : Service servicesDebateTutoring : Service
servicesDebateTutoring = servicesDebateTutoring =
@ -11,7 +13,7 @@ servicesDebateTutoring =
"Debate Coaching" "Debate Coaching"
in in
{ serviceImage = formatName name { serviceImage = formatName name
, serviceLink = "https://the-nutrivore.social/" , serviceLink = Path.toString Path.Services_Coaching
, serviceName = name , serviceName = name
, serviceRate = "$60/hr" , serviceRate = "$60/hr"
, serviceDescription = , serviceDescription =

3
frontend/src/Config/Pages/Services/Services/ElmBuilds.elm
View file

@ -3,6 +3,7 @@ module Config.Pages.Services.Services.ElmBuilds exposing (..)
import Element exposing (..) import Element exposing (..)
import Config.Pages.Services.Types exposing (..) import Config.Pages.Services.Types exposing (..)
import Config.Helpers.Converters exposing (formatName) import Config.Helpers.Converters exposing (formatName)
import Route.Path as Path
servicesElmBuilds : Service servicesElmBuilds : Service
servicesElmBuilds = servicesElmBuilds =
@ -12,7 +13,7 @@ servicesElmBuilds =
"Custom Elm Sites" "Custom Elm Sites"
in in
{ serviceImage = formatName name { serviceImage = formatName name
, serviceLink = "" , serviceLink = Path.toString Path.Services_Elm
, serviceName = name , serviceName = name
, serviceRate = "$20/hr" , serviceRate = "$20/hr"
, serviceDescription = , serviceDescription =

3
frontend/src/Config/Pages/Services/Services/NixBuilds.elm
View file

@ -2,6 +2,7 @@ module Config.Pages.Services.Services.NixBuilds exposing (..)
import Config.Pages.Services.Types exposing (..) import Config.Pages.Services.Types exposing (..)
import Config.Helpers.Converters exposing (formatName) import Config.Helpers.Converters exposing (formatName)
import Route.Path as Path
servicesNixBuilds : Service servicesNixBuilds : Service
servicesNixBuilds = servicesNixBuilds =
@ -11,7 +12,7 @@ servicesNixBuilds =
"Custom Nix Configs" "Custom Nix Configs"
in in
{ serviceImage = formatName name { serviceImage = formatName name
, serviceLink = "https://the-nutrivore.social/" , serviceLink = Path.toString Path.Services_Nix
, serviceName = name , serviceName = name
, serviceRate = "$40/hr" , serviceRate = "$40/hr"
, serviceDescription = , serviceDescription =

3
frontend/src/Config/Pages/Services/Services/NutritionScience.elm
View file

@ -2,6 +2,7 @@ module Config.Pages.Services.Services.NutritionScience exposing (..)
import Config.Helpers.Converters exposing (formatName) import Config.Helpers.Converters exposing (formatName)
import Config.Pages.Services.Types exposing (..) import Config.Pages.Services.Types exposing (..)
import Route.Path as Path
servicesNutritionScience : Service servicesNutritionScience : Service
@ -12,7 +13,7 @@ servicesNutritionScience =
"Nutrition Science" "Nutrition Science"
in in
{ serviceImage = formatName name { serviceImage = formatName name
, serviceLink = "https://the-nutrivore.social/" , serviceLink = Path.toString Path.Services_Nutrition
, serviceName = name , serviceName = name
, serviceRate = "$50/hr" , serviceRate = "$50/hr"
, serviceDescription = , serviceDescription =

1
frontend/src/Config/Pages/Services/Types.elm
View file

@ -13,4 +13,3 @@ type alias Service =
type alias Description = type alias Description =
{ point : String { point : String
} }

4
frontend/src/Config/Style/Svgs/Helpers.elm → frontend/src/Config/Style/Icons/Helpers.elm
View file

@ -1,6 +1,6 @@
module Config.Style.Svgs.Helpers exposing (..) module Config.Style.Icons.Helpers exposing (..)
import Config.Style.Svgs.Types as SvgTypes exposing (..) import Config.Style.Icons.Types as SvgTypes exposing (..)
import Element as E exposing (..) import Element as E exposing (..)
import Svg import Svg

6
frontend/src/Config/Style/Svgs.elm → frontend/src/Config/Style/Icons/Icons.elm
View file

@ -1,8 +1,8 @@
module Config.Style.Svgs exposing (..) module Config.Style.Icons.Icons exposing (..)
import Config.Helpers.Viewport exposing (Msg) import Config.Helpers.Viewport exposing (Msg)
import Config.Style.Svgs.Helpers as HeSvg exposing (buildSvg) import Config.Style.Icons.Helpers as HeSvg exposing (buildSvg)
import Config.Style.Svgs.Types as SvgTypes exposing (..) import Config.Style.Icons.Types as SvgTypes exposing (..)
import Element as E exposing (..) import Element as E exposing (..)
import Html exposing (Html) import Html exposing (Html)
import Svg exposing (..) import Svg exposing (..)

2
frontend/src/Config/Style/Svgs/Types.elm → frontend/src/Config/Style/Icons/Types.elm
View file

@ -1,4 +1,4 @@
module Config.Style.Svgs.Types exposing (..) module Config.Style.Icons.Types exposing (..)
{-| The types used for SVG management. {-| The types used for SVG management.
-} -}

11
frontend/src/Layouts/Navbar.elm
View file

@ -1,7 +1,7 @@
module Layouts.Navbar exposing (Model, Msg, Props, layout) module Layouts.Navbar exposing (Model, Msg, Props, layout)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Format import Config.Helpers.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
@ -9,7 +9,7 @@ import Config.Format.Format
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Fonts exposing (spartanFont) import Config.Style.Fonts exposing (spartanFont)
import Config.Style.Glow exposing (glowDeepDarkGreyNavbar) import Config.Style.Glow exposing (glowDeepDarkGreyNavbar)
import Config.Style.Svgs import Config.Style.Icons.Icons
exposing exposing
( circleDots ( circleDots
, circleX , circleX
@ -30,7 +30,7 @@ import Config.Style.Svgs
, upRootMedium , upRootMedium
, upRootSmall , upRootSmall
) )
import Config.Style.Svgs.Types as TySvg exposing (..) import Config.Style.Icons.Types as TySvg exposing (..)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( hoverFontLightOrange ( hoverFontLightOrange
@ -308,6 +308,7 @@ sidebar input =
, left = 0 , left = 0
, right = 3 , right = 3
} }
, glowDeepDarkGreyNavbar
, D.color colourTheme.textDarkOrange , D.color colourTheme.textDarkOrange
, if input.model.isNavbarExpanded then , if input.model.isNavbarExpanded then
width <| px 225 width <| px 225
@ -411,11 +412,11 @@ items input =
, url = Path.toString Path.Services , url = Path.toString Path.Services
} }
, { icon = hyperBlog , { icon = hyperBlog
, isCurrent = input.route.path == Path.Hyperblog , isCurrent = input.route.path == Path.HyperBlog
, isNewTabLink = False , isNewTabLink = False
, isSubscriberOnly = False , isSubscriberOnly = False
, name = String.toUpper pageNames.pageHyperBlog , name = String.toUpper pageNames.pageHyperBlog
, url = Path.toString Path.Hyperblog , url = Path.toString Path.HyperBlog
} }
, { icon = debate , { icon = debate
, isCurrent = input.route.path == Path.Debate , isCurrent = input.route.path == Path.Debate

2
frontend/src/Pages/Contact.elm
View file

@ -1,7 +1,7 @@
module Pages.Contact exposing (Model, Msg, page) module Pages.Contact exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Debate exposing (Model, Msg, page) module Pages.Debate exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Debate.Arguments exposing (Model, Msg, page) module Pages.Debate.Arguments exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Debate.Cucklist exposing (Model, Msg, page) module Pages.Debate.Cucklist exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Debate.Gibberish exposing (Model, Msg, page) module Pages.Debate.Gibberish exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Donate exposing (Model, Msg, page) module Pages.Donate exposing (Model, Msg, page)
import Config.Data.Identity as I exposing (..) import Config.Data.Identity as I exposing (..)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

4
frontend/src/Pages/Home_.elm
View file

@ -1,7 +1,7 @@
module Pages.Home_ exposing (Model, Msg, page) module Pages.Home_ exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageListCenter ( pageListCenter
, topLevelContainer , topLevelContainer
@ -9,7 +9,7 @@ import Config.Format.Response
import Config.Helpers.Viewport exposing (resetViewport) import Config.Helpers.Viewport exposing (resetViewport)
import Config.Pages.Home.Helpers exposing (..) import Config.Pages.Home.Helpers exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Svgs exposing (construction2) import Config.Style.Icons.Icons exposing (construction2)
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 (..)

8
frontend/src/Pages/Hyperblog.elm → frontend/src/Pages/HyperBlog.elm
View file

@ -1,8 +1,8 @@
module Pages.Hyperblog exposing (Model, Msg, page) module Pages.HyperBlog exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.CardFormat as C exposing (underConstructionMaker) import Config.Helpers.CardFormat as C exposing (underConstructionMaker)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer
@ -12,7 +12,7 @@ import Config.Pages.Headers.Helpers exposing (headerMaker)
import Config.Pages.Headers.Pages.NutriDex exposing (nutriDexHeader) import Config.Pages.Headers.Pages.NutriDex exposing (nutriDexHeader)
import Config.Pages.HyperBlog.Helpers exposing (..) import Config.Pages.HyperBlog.Helpers exposing (..)
import Config.Style.Colour as T exposing (..) import Config.Style.Colour as T exposing (..)
import Config.Style.Svgs exposing (construction) import Config.Style.Icons.Icons exposing (construction)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Layouts import Layouts

2
frontend/src/Pages/Interviews.elm
View file

@ -1,7 +1,7 @@
module Pages.Interviews exposing (Model, Msg, page) module Pages.Interviews exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

2
frontend/src/Pages/NotFound_.elm
View file

@ -1,6 +1,6 @@
module Pages.NotFound_ exposing (Model, Msg, page) module Pages.NotFound_ exposing (Model, Msg, page)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

2
frontend/src/Pages/Nutridex.elm
View file

@ -1,7 +1,7 @@
module Pages.Nutridex exposing (Model, Msg, page) module Pages.Nutridex exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

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

@ -1,7 +1,7 @@
module Pages.Services exposing (Model, Msg, page) module Pages.Services exposing (Model, Msg, page)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer

5
frontend/src/Pages/Services/Coaching.elm
View file

@ -1,12 +1,13 @@
module Pages.Services.Coaching exposing (Model, Msg, page) module Pages.Services.Coaching exposing (Model, Msg, page)
-- import Config.Pages.Services.Coaching.Helpers exposing (instructionMaker)
import Config.Data.Identity exposing (pageNames) import Config.Data.Identity exposing (pageNames)
import Config.Format.Response import Config.Helpers.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer
) )
-- import Config.Pages.Services.Coaching.Helpers exposing (instructionMaker)
import Effect exposing (Effect) import Effect exposing (Effect)
import Element as E exposing (..) import Element as E exposing (..)
import Html import Html