feat: refactored a shit ton of stuff

This commit is contained in:
Nick 2024-12-09 22:08:35 -06:00
parent 08f5d8e198
commit aa6413e78d
20 changed files with 88 additions and 156 deletions

View file

@ -17,6 +17,7 @@ import Config.Style.Glow
( glowDeepDarkGrey ( glowDeepDarkGrey
, glowDeepDarkOrange , glowDeepDarkOrange
) )
import Config.Style.Svgs exposing (construction)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
( transitionStyleMedium ( transitionStyleMedium
@ -48,7 +49,6 @@ cardMaker =
column column
[ E.width fill [ E.width fill
, D.width 5 , D.width 5
, alignTop
, D.color colourTheme.backgroundDarkGrey , D.color colourTheme.backgroundDarkGrey
, D.rounded 32 , D.rounded 32
, glowDeepDarkGrey , glowDeepDarkGrey
@ -81,15 +81,13 @@ cardFormatter =
cardSubTitleMaker : List (Element msg) -> Element msg cardSubTitleMaker : List (Element msg) -> Element msg
cardSubTitleMaker = cardSubTitleMaker =
paragraph paragraph
([ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, paragraphSpacing , paragraphSpacing
, paragraphFontSize , paragraphFontSize
] , F.size 18
++ [ F.size 18
, centerX , centerX
, F.center , F.center
] ]
)
cardContentSpacing : List (Element msg) -> Element msg cardContentSpacing : List (Element msg) -> Element msg
@ -113,11 +111,7 @@ imageTransitionStyle =
, glowDeepDarkGrey , glowDeepDarkGrey
, D.color colourTheme.backgroundDarkGrey , D.color colourTheme.backgroundDarkGrey
, B.color colourTheme.backgroundDarkGrey , B.color colourTheme.backgroundDarkGrey
, mouseOver , hoverCircleButtonDarkOrange
[ D.color colourTheme.textDarkOrange
, B.color colourTheme.textDarkOrange
, glowDeepDarkOrange
]
, transitionStyleSlow , transitionStyleSlow
] ]
@ -262,3 +256,37 @@ fieldSpacer =
[ spacing 8 [ spacing 8
, width fill , width fill
] ]
underConstructionMaker : String -> Element msg
underConstructionMaker name =
row
topLevelBox
[ cardMaker
[ cardTitleMaker name
, cardFormatter
[ cardContentSpacing
[ column
fieldSpacer
[ cardSubTitleMaker
[ column []
[ row
[ spacing 10
]
[ column [ width <| px 35 ] [ html construction ]
, column
[ width fill
, F.color colourTheme.textLightOrange
, F.bold
, alignBottom
]
[ text "under construction"
]
]
]
]
]
]
]
]
]

View file

@ -1,5 +1,6 @@
module Config.Pages.Contact.Helpers exposing (..) module Config.Pages.Contact.Helpers exposing (..)
import Config.Data.Identity exposing (pageNames)
import Config.Format.CardFormat exposing (..) import Config.Format.CardFormat exposing (..)
import Config.Format.Format exposing (..) import Config.Format.Format exposing (..)
import Config.Helpers.StrengthBar import Config.Helpers.StrengthBar
@ -8,6 +9,11 @@ import Config.Helpers.StrengthBar
, barPadding , barPadding
) )
import Config.Helpers.ToolTip exposing (..) import Config.Helpers.ToolTip exposing (..)
import Config.Pages.Contact.Methods.Discord exposing (contactDiscord)
import Config.Pages.Contact.Types exposing (..)
import Config.Pages.Headers.Types exposing (..)
import Config.Pages.Interviews.Types exposing (..)
import Config.Pages.Products.Types exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Transitions import Config.Style.Transitions
exposing exposing
@ -15,24 +21,11 @@ import Config.Style.Transitions
, transitionStyleFast , transitionStyleFast
, transitionStyleSlow , transitionStyleSlow
) )
import Config.Pages.Contact.Methods.Discord exposing (contactDiscord) import Element as E exposing (..)
import Config.Pages.Contact.Types exposing (..) import Element.Background as B
import Effect exposing (Effect)
import Element exposing (..)
import Element.Background as B exposing (..)
import Element.Border as D import Element.Border as D
import Element.Events exposing (onClick)
import Element.Font as F import Element.Font as F
import Config.Pages.Headers.Types exposing (..)
import Html.Attributes as H exposing (style) import Html.Attributes as H exposing (style)
import Html.Events exposing (onMouseOver)
import Config.Pages.Interviews.Types exposing (..)
import Layouts
import Page exposing (Page)
import Config.Pages.Products.Types exposing (..)
import Route exposing (Route)
import Shared
import View exposing (View)
contactMaker : Contact -> Element msg contactMaker : Contact -> Element msg
@ -100,15 +93,13 @@ makeDescription method =
linkMaker : Contact -> Element msg linkMaker : Contact -> Element msg
linkMaker contact = linkMaker contact =
paragraph paragraph
([ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, paragraphSpacing , paragraphSpacing
, paragraphFontSize , paragraphFontSize
, F.bold , F.bold
] , F.size 18
++ [ F.size 18
, spacing 8 , spacing 8
] ]
)
[ newTabLink [ newTabLink
[ paragraphFontSize [ paragraphFontSize
, F.color colourTheme.textLightOrange , F.color colourTheme.textLightOrange
@ -130,7 +121,7 @@ instructionMaker =
row row
topLevelBox topLevelBox
[ cardMaker [ cardMaker
[ cardTitleMaker "CONTACT" [ cardTitleMaker (String.toUpper pageNames.pageContact)
, cardFormatter , cardFormatter
[ cardContentSpacing [ cardContentSpacing
[ column [ column
@ -323,7 +314,7 @@ darkFormat =
orangeFormat : List (Attr () msg) orangeFormat : List (Attr () msg)
orangeFormat = orangeFormat =
[ F.color colourTheme.textLightOrange [ F.color colourTheme.textLightOrange
, mouseOver [ F.color colourTheme.textDarkOrange ] , hoverFontDarkOrange
, transitionStyleFast , transitionStyleFast
] ]

View file

@ -177,15 +177,13 @@ dodgeMaker cuck =
socialMaker : Cuck -> Element msg socialMaker : Cuck -> Element msg
socialMaker cuck = socialMaker cuck =
paragraph paragraph
([ F.color colourTheme.textLightGrey [ F.color colourTheme.textLightGrey
, paragraphSpacing , paragraphSpacing
, paragraphFontSize , paragraphFontSize
, F.bold , F.bold
] , F.size 18
++ [ F.size 18
, spacing 8 , spacing 8
] ]
)
[ text "Social: " [ text "Social: "
, newTabLink , newTabLink
[ paragraphFontSize [ paragraphFontSize

View file

@ -27,63 +27,16 @@ headerMaker : Header -> Element msg
headerMaker header = headerMaker header =
row row
topLevelBox topLevelBox
[ column [ cardMaker
[ E.width fill [ cardTitleMaker header.headerTitle
-- E.width <| px 785
, D.width 5
, D.color colourTheme.backgroundDarkGrey
, D.roundEach
{ topLeft = 32
, topRight = 32
, bottomRight = 32
, bottomLeft = 32
}
, glowDeepDarkGrey
]
[ paragraph
[ F.size 20
, F.bold
, F.color colourTheme.textLightGrey
, B.color colourTheme.textDarkOrange
, paddingEach
{ top = 6
, bottom = 3
, left = 25
, right = 15
}
, alignBottom
, width fill
, F.center
, D.roundEach
{ topLeft = 26
, topRight = 26
, bottomRight = 0
, bottomLeft = 0
}
]
[ text header.headerTitle ]
, cardFormatter , cardFormatter
[ cardContentSpacing [ cardContentSpacing
[ column [ column
fieldSpacer fieldSpacer
[ paragraph [ cardSubTitleMaker
([ F.color colourTheme.textLightGrey
, paragraphSpacing
, paragraphFontSize
]
++ [ F.size 18
, F.center
]
)
[ text header.headerBody ] [ text header.headerBody ]
] ]
] ]
] ]
] ]
] ]
headerTitle : Header -> String
headerTitle header =
header.headerTitle

View file

@ -10,6 +10,5 @@ argumentHeader =
"Arguments" "Arguments"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "This page features arguments that I hold to be sound. I'm open to hearing all challenges, as I am ready to engage with and defend any argument listed." , headerBody = "This page features arguments that I hold to be sound. I'm open to hearing all challenges, as I am ready to engage with and defend any argument listed."
} }

View file

@ -10,6 +10,5 @@ contactHeader =
"Contact" "Contact"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj"
} }

View file

@ -10,6 +10,5 @@ cuckListHeader =
"Cucklist" "Cucklist"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "This page features a list of morons who wrote cheques with their mouths that their asses couldn't cash. Each person included in this list has dodged debating me." , headerBody = "This page features a list of morons who wrote cheques with their mouths that their asses couldn't cash. Each person included in this list has dodged debating me."
} }

View file

@ -10,6 +10,5 @@ debateHeader =
"Debate" "Debate"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name , headerBody = "fill me senpai"
, headerBody = "fill my senpai"
} }

View file

@ -10,6 +10,5 @@ donateHeader =
"Donate" "Donate"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "My site, research, and content all cost time and money to run. If you find my contributions valuable, please consider supporting my work on any of the platforms listed below!" , headerBody = "My site, research, and content all cost time and money to run. If you find my contributions valuable, please consider supporting my work on any of the platforms listed below!"
} }

View file

@ -10,6 +10,6 @@ gibberishHeader =
"Gibberish" "Gibberish"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "This page is specifically for terms and ostensible concepts that I think are either nonsensical or so practically useless that its intelligiblity is irrelevant." , headerBody = "This page is specifically for terms and ostensible concepts that I think are either nonsensical or so practically useless that its intelligiblity is irrelevant."
} }

View file

@ -10,6 +10,5 @@ hyperBlogHeader =
"HyperBlog" "HyperBlog"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj"
} }

View file

@ -10,6 +10,5 @@ interviewHeader =
"Interviews" "Interviews"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "This page showcases various podcasts and shows I've been on. If youd like to have me as a guest on your podcast, feel free to reach outId love to share my perspectives with your audience!" , headerBody = "This page showcases various podcasts and shows I've been on. If youd like to have me as a guest on your podcast, feel free to reach outId love to share my perspectives with your audience!"
} }

View file

@ -10,6 +10,5 @@ nutriDexHeader =
"NutriDex" "NutriDex"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj"
} }

View file

@ -10,6 +10,5 @@ servicesHeader =
"Services" "Services"
in in
{ headerTitle = String.toUpper name { headerTitle = String.toUpper name
, headerName = name
, headerBody = "Bundle any of the services below to receive a $10 discount per hour. For example, two Debate Analysis sessions would cost $140 total, instead of $80/hr. All prices are in CAD." , headerBody = "Bundle any of the services below to receive a $10 discount per hour. For example, two Debate Analysis sessions would cost $140 total, instead of $80/hr. All prices are in CAD."
} }

View file

@ -3,6 +3,5 @@ module Config.Pages.Headers.Types exposing (..)
type alias Header = type alias Header =
{ headerTitle : String { headerTitle : String
, headerName : String
, headerBody : String , headerBody : String
} }

View file

@ -2,41 +2,11 @@ module Config.Pages.HyperBlog.Helpers exposing (..)
import Config.Format.CardFormat exposing (..) import Config.Format.CardFormat exposing (..)
import Config.Style.Colour exposing (colourTheme) import Config.Style.Colour exposing (colourTheme)
import Config.Style.Svgs exposing (..) import Config.Style.Svgs 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
underConstructionMaker : Element msg hyperBlogMaker =
underConstructionMaker = none
row
topLevelBox
[ cardMaker
[ cardTitleMaker "HYPERBLOG"
, cardFormatter
[ cardContentSpacing
[ column
fieldSpacer
[ cardSubTitleMaker
[ column []
[ row
[ spacing 10
]
[ column [ width <| px 35 ] [ html construction ]
, column
[ width fill
, F.color colourTheme.textLightOrange
, F.bold
, alignBottom
]
[ text "under construction"
]
]
]
]
]
]
]
]
]

View file

@ -200,7 +200,7 @@ episodeMaker appearanceEntry =
[ text ("#" ++ appearanceEntry.appearanceEpisode ++ ": " ++ appearanceEntry.appearanceTitle) [ text ("#" ++ appearanceEntry.appearanceEpisode ++ ": " ++ appearanceEntry.appearanceTitle)
|> el |> el
[ F.color colourTheme.textLightOrange [ F.color colourTheme.textLightOrange
, mouseOver [ F.color colourTheme.textDarkOrange ] , hoverFontDarkOrange
] ]
] ]
} }

View file

@ -12,6 +12,7 @@ import Config.Helpers.StrengthBar
, barPadding , barPadding
) )
import Config.Helpers.ToolTip exposing (tooltip) import Config.Helpers.ToolTip exposing (tooltip)
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.Svgs exposing (nutriDexLogo)
import Config.Style.Transitions exposing (transitionStyleFast) import Config.Style.Transitions exposing (transitionStyleFast)
@ -22,7 +23,6 @@ import Element.Border as D
import Element.Events as V import Element.Events as V
import Element.Font as F import Element.Font as F
import Html.Attributes as H import Html.Attributes as H
import Config.Pages.Products.Types exposing (..)
nutriDexMaker : NutriDex -> Element msg nutriDexMaker : NutriDex -> Element msg
@ -408,7 +408,7 @@ referenceFormat =
++ [ F.color colourTheme.textLightOrange ++ [ F.color colourTheme.textLightOrange
, F.size 12 , F.size 12
, alignTop , alignTop
, mouseOver [ F.color colourTheme.textDarkOrange ] , hoverFontDarkOrange
, transitionStyleFast , transitionStyleFast
] ]
@ -1020,7 +1020,7 @@ makeReference references index =
[ newTabLink [ newTabLink
[ F.bold [ F.bold
, F.color colourTheme.textLightOrange , F.color colourTheme.textLightOrange
, mouseOver [ F.color colourTheme.textDarkOrange ] , hoverFontDarkOrange
, transitionStyleFast , transitionStyleFast
] ]
{ url = references.link, label = text (String.fromInt index ++ ". ") } { url = references.link, label = text (String.fromInt index ++ ". ") }

View file

@ -1,11 +1,11 @@
module Layouts.Navbar exposing (Model, Msg, Props, layout) module Layouts.Navbar exposing (Model, Msg, Props, layout)
import Config.Data.Identity exposing (..)
import Config.Format.Format import Config.Format.Format
exposing exposing
( paragraphFontSize ( paragraphFontSize
, paragraphSpacing , paragraphSpacing
) )
import Config.Data.Identity exposing (..)
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 (glowDeepDarkGrey) import Config.Style.Glow exposing (glowDeepDarkGrey)
@ -373,7 +373,7 @@ desktopButtonMaker name icon =
[ html icon [ html icon
] ]
, column , column
[ mouseOver [ F.color colourTheme.textLightOrange ] [ hoverFontLightOrange
, F.color colourTheme.textLightGrey , F.color colourTheme.textLightGrey
, transitionStyleMedium , transitionStyleMedium
, alignBottom , alignBottom

View file

@ -1,18 +1,20 @@
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.Format.Response import Config.Format.Response
exposing exposing
( pageList ( pageList
, topLevelContainer , topLevelContainer
) )
import Config.Helpers.Viewport exposing (resetViewport) import Config.Helpers.Viewport exposing (resetViewport)
import Config.Pages.HyperBlog.Helpers exposing (..)
import Config.Style.Colour as T exposing (..)
import Effect exposing (Effect)
import Element as E exposing (..)
import Config.Pages.Headers.Helpers exposing (headerMaker) 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.Style.Colour as T exposing (..)
import Config.Style.Svgs exposing (construction)
import Effect exposing (Effect)
import Element as E exposing (..)
import Layouts import Layouts
import Page exposing (Page) import Page exposing (Page)
import Route exposing (Route) import Route exposing (Route)
@ -102,5 +104,5 @@ hyperBlogList device =
List.concat List.concat
(case ( device.class, device.orientation ) of (case ( device.class, device.orientation ) of
_ -> _ ->
[ [ underConstructionMaker ] ] [ [ C.underConstructionMaker (String.toUpper pageNames.pageHyperBlog) ] ]
) )