From d0617b7a90c9bb4876a9af78bd568639066b32c1 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 11 Dec 2024 03:48:49 -0600 Subject: [PATCH] feat: refactored some stuff --- Navbar.elm | 6 +- frontend/src/Config/Data/LocalPath.elm | 59 -------- .../Config/{Format => Helpers}/CardFormat.elm | 135 +++++++++--------- .../src/Config/{Format => Helpers}/Format.elm | 2 +- .../Config/{Format => Helpers}/Response.elm | 2 +- frontend/src/Config/Pages/Contact/Helpers.elm | 4 +- .../Config/Pages/Debate/Arguments/Helpers.elm | 8 +- .../Config/Pages/Debate/Cuckery/Helpers.elm | 8 +- .../Config/Pages/Debate/Debate/Helpers.elm | 11 +- .../Config/Pages/Debate/Gibberish/Helpers.elm | 8 +- frontend/src/Config/Pages/Donate/Helpers.elm | 8 +- frontend/src/Config/Pages/Headers/Helpers.elm | 4 +- .../Config/Pages/Headers/Pages/HyperBlog.elm | 2 +- frontend/src/Config/Pages/Home/Helpers.elm | 6 +- .../src/Config/Pages/HyperBlog/Helpers.elm | 4 +- .../src/Config/Pages/Interviews/Helpers.elm | 8 +- .../src/Config/Pages/Products/Helpers.elm | 6 +- .../src/Config/Pages/Services/Helpers.elm | 19 +-- .../Services/Services/DebateAnalysis.elm | 6 +- .../Services/Services/DebateTutoring.elm | 6 +- .../Pages/Services/Services/ElmBuilds.elm | 3 +- .../Pages/Services/Services/NixBuilds.elm | 3 +- .../Services/Services/NutritionScience.elm | 3 +- frontend/src/Config/Pages/Services/Types.elm | 1 - .../Config/Style/{Svgs => Icons}/Helpers.elm | 4 +- .../Style/{Svgs.elm => Icons/Icons.elm} | 6 +- .../Config/Style/{Svgs => Icons}/Types.elm | 2 +- frontend/src/Layouts/Navbar.elm | 11 +- frontend/src/Pages/Contact.elm | 2 +- frontend/src/Pages/Debate.elm | 2 +- frontend/src/Pages/Debate/Arguments.elm | 2 +- frontend/src/Pages/Debate/Cucklist.elm | 2 +- frontend/src/Pages/Debate/Gibberish.elm | 2 +- frontend/src/Pages/Donate.elm | 2 +- frontend/src/Pages/Home_.elm | 4 +- .../Pages/{Hyperblog.elm => HyperBlog.elm} | 8 +- frontend/src/Pages/Interviews.elm | 2 +- frontend/src/Pages/NotFound_.elm | 2 +- frontend/src/Pages/Nutridex.elm | 2 +- frontend/src/Pages/Services.elm | 2 +- frontend/src/Pages/Services/Coaching.elm | 7 +- 41 files changed, 161 insertions(+), 223 deletions(-) delete mode 100644 frontend/src/Config/Data/LocalPath.elm rename frontend/src/Config/{Format => Helpers}/CardFormat.elm (75%) rename frontend/src/Config/{Format => Helpers}/Format.elm (82%) rename frontend/src/Config/{Format => Helpers}/Response.elm (94%) rename frontend/src/Config/Style/{Svgs => Icons}/Helpers.elm (85%) rename frontend/src/Config/Style/{Svgs.elm => Icons/Icons.elm} (99%) rename frontend/src/Config/Style/{Svgs => Icons}/Types.elm (92%) rename frontend/src/Pages/{Hyperblog.elm => HyperBlog.elm} (90%) diff --git a/Navbar.elm b/Navbar.elm index ce946bd..016712c 100755 --- a/Navbar.elm +++ b/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 diff --git a/frontend/src/Config/Data/LocalPath.elm b/frontend/src/Config/Data/LocalPath.elm deleted file mode 100644 index f616385..0000000 --- a/frontend/src/Config/Data/LocalPath.elm +++ /dev/null @@ -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 diff --git a/frontend/src/Config/Format/CardFormat.elm b/frontend/src/Config/Helpers/CardFormat.elm similarity index 75% rename from frontend/src/Config/Format/CardFormat.elm rename to frontend/src/Config/Helpers/CardFormat.elm index 0c86c09..0b0b1ec 100755 --- a/frontend/src/Config/Format/CardFormat.elm +++ b/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 diff --git a/frontend/src/Config/Format/Format.elm b/frontend/src/Config/Helpers/Format.elm similarity index 82% rename from frontend/src/Config/Format/Format.elm rename to frontend/src/Config/Helpers/Format.elm index 1d279a2..b63d23c 100755 --- a/frontend/src/Config/Format/Format.elm +++ b/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 diff --git a/frontend/src/Config/Format/Response.elm b/frontend/src/Config/Helpers/Response.elm similarity index 94% rename from frontend/src/Config/Format/Response.elm rename to frontend/src/Config/Helpers/Response.elm index 193cddd..57f28ce 100755 --- a/frontend/src/Config/Format/Response.elm +++ b/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 (..) diff --git a/frontend/src/Config/Pages/Contact/Helpers.elm b/frontend/src/Config/Pages/Contact/Helpers.elm index c886773..2ccb38f 100755 --- a/frontend/src/Config/Pages/Contact/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm b/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm index e6b7d5b..fc5c896 100755 --- a/frontend/src/Config/Pages/Debate/Arguments/Helpers.elm +++ b/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 ] diff --git a/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm b/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm index 9121711..ec84389 100755 --- a/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Debate/Debate/Helpers.elm b/frontend/src/Config/Pages/Debate/Debate/Helpers.elm index a5a357d..21cf454 100755 --- a/frontend/src/Config/Pages/Debate/Debate/Helpers.elm +++ b/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 ] [] diff --git a/frontend/src/Config/Pages/Debate/Gibberish/Helpers.elm b/frontend/src/Config/Pages/Debate/Gibberish/Helpers.elm index f5166ec..bbb6250 100755 --- a/frontend/src/Config/Pages/Debate/Gibberish/Helpers.elm +++ b/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 ] diff --git a/frontend/src/Config/Pages/Donate/Helpers.elm b/frontend/src/Config/Pages/Donate/Helpers.elm index ecc6618..9638e74 100755 --- a/frontend/src/Config/Pages/Donate/Helpers.elm +++ b/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 ] diff --git a/frontend/src/Config/Pages/Headers/Helpers.elm b/frontend/src/Config/Pages/Headers/Helpers.elm index 3e68076..4c51084 100755 --- a/frontend/src/Config/Pages/Headers/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm b/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm index e4c8fe4..961b9ed 100755 --- a/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm +++ b/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" diff --git a/frontend/src/Config/Pages/Home/Helpers.elm b/frontend/src/Config/Pages/Home/Helpers.elm index 85d36b1..e52db55 100755 --- a/frontend/src/Config/Pages/Home/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/HyperBlog/Helpers.elm b/frontend/src/Config/Pages/HyperBlog/Helpers.elm index 8d71907..fc03319 100755 --- a/frontend/src/Config/Pages/HyperBlog/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Interviews/Helpers.elm b/frontend/src/Config/Pages/Interviews/Helpers.elm index 6059f0b..24c676a 100755 --- a/frontend/src/Config/Pages/Interviews/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Products/Helpers.elm b/frontend/src/Config/Pages/Products/Helpers.elm index 803bd01..b0279fc 100755 --- a/frontend/src/Config/Pages/Products/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Services/Helpers.elm b/frontend/src/Config/Pages/Services/Helpers.elm index 59c9c62..a0f4247 100755 --- a/frontend/src/Config/Pages/Services/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Pages/Services/Services/DebateAnalysis.elm b/frontend/src/Config/Pages/Services/Services/DebateAnalysis.elm index 2c13e42..864c49c 100755 --- a/frontend/src/Config/Pages/Services/Services/DebateAnalysis.elm +++ b/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 = diff --git a/frontend/src/Config/Pages/Services/Services/DebateTutoring.elm b/frontend/src/Config/Pages/Services/Services/DebateTutoring.elm index 5e87178..d68a56f 100755 --- a/frontend/src/Config/Pages/Services/Services/DebateTutoring.elm +++ b/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 = diff --git a/frontend/src/Config/Pages/Services/Services/ElmBuilds.elm b/frontend/src/Config/Pages/Services/Services/ElmBuilds.elm index 8eeb22c..d90e472 100755 --- a/frontend/src/Config/Pages/Services/Services/ElmBuilds.elm +++ b/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 = diff --git a/frontend/src/Config/Pages/Services/Services/NixBuilds.elm b/frontend/src/Config/Pages/Services/Services/NixBuilds.elm index a426b6f..313cba1 100755 --- a/frontend/src/Config/Pages/Services/Services/NixBuilds.elm +++ b/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 = diff --git a/frontend/src/Config/Pages/Services/Services/NutritionScience.elm b/frontend/src/Config/Pages/Services/Services/NutritionScience.elm index 8bdcbb0..9ca6041 100755 --- a/frontend/src/Config/Pages/Services/Services/NutritionScience.elm +++ b/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 = diff --git a/frontend/src/Config/Pages/Services/Types.elm b/frontend/src/Config/Pages/Services/Types.elm index f61f383..b4160a0 100755 --- a/frontend/src/Config/Pages/Services/Types.elm +++ b/frontend/src/Config/Pages/Services/Types.elm @@ -13,4 +13,3 @@ type alias Service = type alias Description = { point : String } - diff --git a/frontend/src/Config/Style/Svgs/Helpers.elm b/frontend/src/Config/Style/Icons/Helpers.elm similarity index 85% rename from frontend/src/Config/Style/Svgs/Helpers.elm rename to frontend/src/Config/Style/Icons/Helpers.elm index b8834b6..11afdfd 100755 --- a/frontend/src/Config/Style/Svgs/Helpers.elm +++ b/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 diff --git a/frontend/src/Config/Style/Svgs.elm b/frontend/src/Config/Style/Icons/Icons.elm similarity index 99% rename from frontend/src/Config/Style/Svgs.elm rename to frontend/src/Config/Style/Icons/Icons.elm index eefb451..196a8e4 100755 --- a/frontend/src/Config/Style/Svgs.elm +++ b/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 (..) diff --git a/frontend/src/Config/Style/Svgs/Types.elm b/frontend/src/Config/Style/Icons/Types.elm similarity index 92% rename from frontend/src/Config/Style/Svgs/Types.elm rename to frontend/src/Config/Style/Icons/Types.elm index b071aa0..76be2f4 100755 --- a/frontend/src/Config/Style/Svgs/Types.elm +++ b/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. -} diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index ec0dcca..a28c29a 100644 --- a/frontend/src/Layouts/Navbar.elm +++ b/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 diff --git a/frontend/src/Pages/Contact.elm b/frontend/src/Pages/Contact.elm index 3decbfd..9ca9b4a 100755 --- a/frontend/src/Pages/Contact.elm +++ b/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 diff --git a/frontend/src/Pages/Debate.elm b/frontend/src/Pages/Debate.elm index a218cdb..828b512 100755 --- a/frontend/src/Pages/Debate.elm +++ b/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 diff --git a/frontend/src/Pages/Debate/Arguments.elm b/frontend/src/Pages/Debate/Arguments.elm index a0c5892..d8e1f36 100755 --- a/frontend/src/Pages/Debate/Arguments.elm +++ b/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 diff --git a/frontend/src/Pages/Debate/Cucklist.elm b/frontend/src/Pages/Debate/Cucklist.elm index 9a66ed9..34652bf 100755 --- a/frontend/src/Pages/Debate/Cucklist.elm +++ b/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 diff --git a/frontend/src/Pages/Debate/Gibberish.elm b/frontend/src/Pages/Debate/Gibberish.elm index a743cd4..7f62f74 100755 --- a/frontend/src/Pages/Debate/Gibberish.elm +++ b/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 diff --git a/frontend/src/Pages/Donate.elm b/frontend/src/Pages/Donate.elm index 6d09bdd..c6f06a5 100755 --- a/frontend/src/Pages/Donate.elm +++ b/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 diff --git a/frontend/src/Pages/Home_.elm b/frontend/src/Pages/Home_.elm index 0c7ef93..aa32144 100755 --- a/frontend/src/Pages/Home_.elm +++ b/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 (..) diff --git a/frontend/src/Pages/Hyperblog.elm b/frontend/src/Pages/HyperBlog.elm similarity index 90% rename from frontend/src/Pages/Hyperblog.elm rename to frontend/src/Pages/HyperBlog.elm index d936535..30530ce 100755 --- a/frontend/src/Pages/Hyperblog.elm +++ b/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 diff --git a/frontend/src/Pages/Interviews.elm b/frontend/src/Pages/Interviews.elm index 92d5760..2c97751 100755 --- a/frontend/src/Pages/Interviews.elm +++ b/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 diff --git a/frontend/src/Pages/NotFound_.elm b/frontend/src/Pages/NotFound_.elm index ac3467b..a90a5f3 100755 --- a/frontend/src/Pages/NotFound_.elm +++ b/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 diff --git a/frontend/src/Pages/Nutridex.elm b/frontend/src/Pages/Nutridex.elm index dbefa65..09ac555 100755 --- a/frontend/src/Pages/Nutridex.elm +++ b/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 diff --git a/frontend/src/Pages/Services.elm b/frontend/src/Pages/Services.elm index 45afc79..aacef12 100755 --- a/frontend/src/Pages/Services.elm +++ b/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 diff --git a/frontend/src/Pages/Services/Coaching.elm b/frontend/src/Pages/Services/Coaching.elm index 9147f7e..a759331 100755 --- a/frontend/src/Pages/Services/Coaching.elm +++ b/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 _ -> - [ [ ] ] + [ [] ] )