feat: refactored some stuff

Navbar.elm

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

frontend/src/Config/Data/LocalPath.elm

@@ -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

frontend/src/Config/Helpers/CardFormat.elm

@@ -1,23 +1,23 @@
-module Config.Format.CardFormat exposing (..)
+module Config.Helpers.CardFormat exposing (..)
 
 import Config.Data.Identity
     exposing
         ( pageNames
         , url
         )
-import Config.Format.Format
+import Config.Helpers.Converters exposing (formatName)
+import Config.Helpers.Format
     exposing
         ( paragraphFontSize
         , paragraphSpacing
         )
-import Config.Helpers.Converters exposing (formatName)
 import Config.Style.Colour exposing (colourTheme)
 import Config.Style.Glow
     exposing
         ( glowDeepDarkGrey
         , glowDeepDarkOrange
         )
-import Config.Style.Svgs exposing (construction)
+import Config.Style.Icons.Icons exposing (construction)
 import Config.Style.Transitions
     exposing
         ( hoverCircleButtonDarkOrange
@@ -114,21 +114,43 @@ imageTransitionStyle =
     , D.color colourTheme.backgroundDarkGrey
     , B.color colourTheme.backgroundDarkGrey
     , hoverCircleButtonDarkOrange
-    , transitionStyleSlow
+    , transitionStyleMedium
     ]
 
 
-cardImageMaker : { src : String, description : String } -> String -> Element msg
-cardImageMaker image urlLink =
+desktopCardMaker :
+    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
-        [ E.width <| px 115
-        , E.height <| px 115
-        , alignTop
-        , alignRight
-        ]
-        [ column
+        size1
+        [ el
             imageTransitionStyle
-            [ if
+            (if
                 urlLink
                     == Path.toString Path.Home_
                     || urlLink
@@ -144,7 +166,7 @@ cardImageMaker image urlLink =
                     || urlLink
                     == Path.toString Path.Donate
                     || urlLink
-                    == Path.toString Path.Hyperblog
+                    == Path.toString Path.HyperBlog
                     || urlLink
                     == Path.toString Path.Interviews
                     || urlLink
@@ -161,24 +183,24 @@ cardImageMaker image urlLink =
                     == Path.toString Path.Services_Nix
                     || urlLink
                     == Path.toString Path.Services_Nutrition
-              then
+             then
                 link []
                     { url = urlLink
                     , label =
                         E.image
-                            desktopImageSize
+                            size2
                             image
                     }
 
-              else
+             else
                 newTabLink []
                     { url = urlLink
                     , label =
                         E.image
-                            desktopImageSize
+                            size2
                             image
                     }
-            ]
+            )
         ]
 
 
@@ -193,56 +215,6 @@ desktopImageSize =
     ]
 
 
-cardImageMakerMobile : { src : String, description : String } -> String -> Element msg
-cardImageMakerMobile image urlLink =
-    column
-        [ alignTop
-        , centerX
-        , alignLeft
-        , paddingEach
-            { top = 0
-            , bottom = 10
-            , left = 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
@@ -252,6 +224,29 @@ mobileImageSize =
     ]
 
 
+desktopImageBoxSize : List (Attribute msg)
+desktopImageBoxSize =
+    [ E.width <| px 115
+    , E.height <| px 115
+    , alignTop
+    , alignRight
+    ]
+
+
+mobileImageBoxSize : List (Attribute msg)
+mobileImageBoxSize =
+    [ alignTop
+    , centerX
+    , alignLeft
+    , paddingEach
+        { top = 0
+        , bottom = 10
+        , left = 0
+        , right = 0
+        }
+    ]
+
+
 cardTitleMaker : String -> Element msg
 cardTitleMaker title =
     paragraph

frontend/src/Config/Helpers/Format.elm

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

frontend/src/Config/Helpers/Response.elm

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

frontend/src/Config/Pages/Contact/Helpers.elm

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

frontend/src/Config/Pages/Debate/Arguments/Helpers.elm

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

frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm

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

frontend/src/Config/Pages/Debate/Debate/Helpers.elm

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

frontend/src/Config/Pages/Debate/Gibberish/Helpers.elm

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

frontend/src/Config/Pages/Donate/Helpers.elm

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

frontend/src/Config/Pages/Headers/Helpers.elm

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

frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm

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

frontend/src/Config/Pages/Home/Helpers.elm

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

frontend/src/Config/Pages/HyperBlog/Helpers.elm

@@ -1,8 +1,8 @@
 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.Svgs exposing (construction)
+import Config.Style.Icons.Icons exposing (construction)
 import Effect exposing (Effect)
 import Element as E exposing (..)
 import Element.Font as F

frontend/src/Config/Pages/Interviews/Helpers.elm

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

frontend/src/Config/Pages/Products/Helpers.elm

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

frontend/src/Config/Pages/Services/Helpers.elm

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

frontend/src/Config/Pages/Services/Services/DebateAnalysis.elm

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

frontend/src/Config/Pages/Services/Services/DebateTutoring.elm

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

frontend/src/Config/Pages/Services/Services/ElmBuilds.elm

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

frontend/src/Config/Pages/Services/Services/NixBuilds.elm

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

frontend/src/Config/Pages/Services/Services/NutritionScience.elm

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

frontend/src/Config/Pages/Services/Types.elm

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

frontend/src/Config/Style/Icons/Helpers.elm

@@ -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 Svg
 

frontend/src/Config/Style/Icons/Icons.elm

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

frontend/src/Config/Style/Icons/Types.elm

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

frontend/src/Layouts/Navbar.elm

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

frontend/src/Pages/Contact.elm

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

frontend/src/Pages/Debate.elm

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

frontend/src/Pages/Debate/Arguments.elm

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

frontend/src/Pages/Debate/Cucklist.elm

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

frontend/src/Pages/Debate/Gibberish.elm

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

frontend/src/Pages/Donate.elm

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

frontend/src/Pages/Home_.elm

@@ -1,7 +1,7 @@
 module Pages.Home_ exposing (Model, Msg, page)
 
 import Config.Data.Identity exposing (pageNames)
-import Config.Format.Response
+import Config.Helpers.Response
     exposing
         ( pageListCenter
         , topLevelContainer
@@ -9,7 +9,7 @@ import Config.Format.Response
 import Config.Helpers.Viewport exposing (resetViewport)
 import Config.Pages.Home.Helpers exposing (..)
 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 Effect exposing (Effect)
 import Element as E exposing (..)

frontend/src/Pages/HyperBlog.elm

@@ -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.Format.CardFormat as C exposing (underConstructionMaker)
-import Config.Format.Response
+import Config.Helpers.CardFormat as C exposing (underConstructionMaker)
+import Config.Helpers.Response
     exposing
         ( pageList
         , topLevelContainer
@@ -12,7 +12,7 @@ import Config.Pages.Headers.Helpers exposing (headerMaker)
 import Config.Pages.Headers.Pages.NutriDex exposing (nutriDexHeader)
 import Config.Pages.HyperBlog.Helpers 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 Element as E exposing (..)
 import Layouts

frontend/src/Pages/Interviews.elm

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

frontend/src/Pages/NotFound_.elm

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

frontend/src/Pages/Nutridex.elm

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

frontend/src/Pages/Services.elm

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

frontend/src/Pages/Services/Coaching.elm

@@ -1,12 +1,13 @@
 module Pages.Services.Coaching exposing (Model, Msg, page)
 
+-- import Config.Pages.Services.Coaching.Helpers exposing (instructionMaker)
+
 import Config.Data.Identity exposing (pageNames)
-import Config.Format.Response
+import Config.Helpers.Response
     exposing
         ( pageList
         , topLevelContainer
         )
--- import Config.Pages.Services.Coaching.Helpers exposing (instructionMaker)
 import Effect exposing (Effect)
 import Element as E exposing (..)
 import Html
@@ -97,5 +98,5 @@ coachList device =
         List.concat
             (case ( device.class, device.orientation ) of
                 _ ->
-                    [ [  ] ]
+                    [ [] ]
             )