diff --git a/frontend/src/Config/Format/CardFormat.elm b/frontend/src/Config/Format/CardFormat.elm index 8964821..6112e04 100755 --- a/frontend/src/Config/Format/CardFormat.elm +++ b/frontend/src/Config/Format/CardFormat.elm @@ -17,6 +17,7 @@ import Config.Style.Glow ( glowDeepDarkGrey , glowDeepDarkOrange ) +import Config.Style.Svgs exposing (construction) import Config.Style.Transitions exposing ( transitionStyleMedium @@ -48,7 +49,6 @@ cardMaker = column [ E.width fill , D.width 5 - , alignTop , D.color colourTheme.backgroundDarkGrey , D.rounded 32 , glowDeepDarkGrey @@ -81,15 +81,13 @@ cardFormatter = cardSubTitleMaker : List (Element msg) -> Element msg cardSubTitleMaker = paragraph - ([ F.color colourTheme.textLightGrey - , paragraphSpacing - , paragraphFontSize - ] - ++ [ F.size 18 - , centerX - , F.center - ] - ) + [ F.color colourTheme.textLightGrey + , paragraphSpacing + , paragraphFontSize + , F.size 18 + , centerX + , F.center + ] cardContentSpacing : List (Element msg) -> Element msg @@ -113,11 +111,7 @@ imageTransitionStyle = , glowDeepDarkGrey , D.color colourTheme.backgroundDarkGrey , B.color colourTheme.backgroundDarkGrey - , mouseOver - [ D.color colourTheme.textDarkOrange - , B.color colourTheme.textDarkOrange - , glowDeepDarkOrange - ] + , hoverCircleButtonDarkOrange , transitionStyleSlow ] @@ -262,3 +256,37 @@ fieldSpacer = [ spacing 8 , 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" + ] + ] + ] + ] + ] + ] + ] + ] + ] diff --git a/frontend/src/Config/Pages/Contact/Helpers.elm b/frontend/src/Config/Pages/Contact/Helpers.elm index 56fec7a..33012fe 100755 --- a/frontend/src/Config/Pages/Contact/Helpers.elm +++ b/frontend/src/Config/Pages/Contact/Helpers.elm @@ -1,5 +1,6 @@ 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.StrengthBar @@ -8,6 +9,11 @@ import Config.Helpers.StrengthBar , barPadding ) 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.Transitions exposing @@ -15,24 +21,11 @@ import Config.Style.Transitions , transitionStyleFast , transitionStyleSlow ) -import Config.Pages.Contact.Methods.Discord exposing (contactDiscord) -import Config.Pages.Contact.Types exposing (..) -import Effect exposing (Effect) -import Element exposing (..) -import Element.Background as B exposing (..) +import Element as E exposing (..) +import Element.Background as B import Element.Border as D -import Element.Events exposing (onClick) import Element.Font as F -import Config.Pages.Headers.Types exposing (..) 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 @@ -100,15 +93,13 @@ makeDescription method = linkMaker : Contact -> Element msg linkMaker contact = paragraph - ([ F.color colourTheme.textLightGrey - , paragraphSpacing - , paragraphFontSize - , F.bold - ] - ++ [ F.size 18 - , spacing 8 - ] - ) + [ F.color colourTheme.textLightGrey + , paragraphSpacing + , paragraphFontSize + , F.bold + , F.size 18 + , spacing 8 + ] [ newTabLink [ paragraphFontSize , F.color colourTheme.textLightOrange @@ -130,7 +121,7 @@ instructionMaker = row topLevelBox [ cardMaker - [ cardTitleMaker "CONTACT" + [ cardTitleMaker (String.toUpper pageNames.pageContact) , cardFormatter [ cardContentSpacing [ column @@ -323,7 +314,7 @@ darkFormat = orangeFormat : List (Attr () msg) orangeFormat = [ F.color colourTheme.textLightOrange - , mouseOver [ F.color colourTheme.textDarkOrange ] + , hoverFontDarkOrange , transitionStyleFast ] diff --git a/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm b/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm index 4b6012b..ed4c711 100755 --- a/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm +++ b/frontend/src/Config/Pages/Debate/Cuckery/Helpers.elm @@ -177,15 +177,13 @@ dodgeMaker cuck = socialMaker : Cuck -> Element msg socialMaker cuck = paragraph - ([ F.color colourTheme.textLightGrey - , paragraphSpacing - , paragraphFontSize - , F.bold - ] - ++ [ F.size 18 - , spacing 8 - ] - ) + [ F.color colourTheme.textLightGrey + , paragraphSpacing + , paragraphFontSize + , F.bold + , F.size 18 + , spacing 8 + ] [ text "Social: " , newTabLink [ paragraphFontSize diff --git a/frontend/src/Config/Pages/Headers/Helpers.elm b/frontend/src/Config/Pages/Headers/Helpers.elm index 029d1d3..3e68076 100755 --- a/frontend/src/Config/Pages/Headers/Helpers.elm +++ b/frontend/src/Config/Pages/Headers/Helpers.elm @@ -27,63 +27,16 @@ headerMaker : Header -> Element msg headerMaker header = row topLevelBox - [ column - [ E.width fill - - -- 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 ] + [ cardMaker + [ cardTitleMaker header.headerTitle , cardFormatter [ cardContentSpacing [ column fieldSpacer - [ paragraph - ([ F.color colourTheme.textLightGrey - , paragraphSpacing - , paragraphFontSize - ] - ++ [ F.size 18 - , F.center - ] - ) + [ cardSubTitleMaker [ text header.headerBody ] ] ] ] ] ] - - -headerTitle : Header -> String -headerTitle header = - header.headerTitle diff --git a/frontend/src/Config/Pages/Headers/Pages/Arguments.elm b/frontend/src/Config/Pages/Headers/Pages/Arguments.elm index 32719f0..9ba2021 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Arguments.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Arguments.elm @@ -10,6 +10,5 @@ argumentHeader = "Arguments" in { 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." } diff --git a/frontend/src/Config/Pages/Headers/Pages/Contact.elm b/frontend/src/Config/Pages/Headers/Pages/Contact.elm index 72d9dc4..b6a1a69 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Contact.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Contact.elm @@ -10,6 +10,5 @@ contactHeader = "Contact" in { headerTitle = String.toUpper name - , headerName = name , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" } diff --git a/frontend/src/Config/Pages/Headers/Pages/CuckList.elm b/frontend/src/Config/Pages/Headers/Pages/CuckList.elm index 7ebcec6..62e4542 100755 --- a/frontend/src/Config/Pages/Headers/Pages/CuckList.elm +++ b/frontend/src/Config/Pages/Headers/Pages/CuckList.elm @@ -10,6 +10,5 @@ cuckListHeader = "Cucklist" in { 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." } diff --git a/frontend/src/Config/Pages/Headers/Pages/Debate.elm b/frontend/src/Config/Pages/Headers/Pages/Debate.elm index 51d001a..95cf584 100644 --- a/frontend/src/Config/Pages/Headers/Pages/Debate.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Debate.elm @@ -10,6 +10,5 @@ debateHeader = "Debate" in { headerTitle = String.toUpper name - , headerName = name - , headerBody = "fill my senpai" + , headerBody = "fill me senpai" } diff --git a/frontend/src/Config/Pages/Headers/Pages/Donate.elm b/frontend/src/Config/Pages/Headers/Pages/Donate.elm index 0244ede..37f4516 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Donate.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Donate.elm @@ -10,6 +10,5 @@ donateHeader = "Donate" in { 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!" } diff --git a/frontend/src/Config/Pages/Headers/Pages/Gibberish.elm b/frontend/src/Config/Pages/Headers/Pages/Gibberish.elm index ba22390..cbc6c65 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Gibberish.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Gibberish.elm @@ -10,6 +10,6 @@ gibberishHeader = "Gibberish" in { 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." } diff --git a/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm b/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm index 9ef7186..e4c8fe4 100755 --- a/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm +++ b/frontend/src/Config/Pages/Headers/Pages/HyperBlog.elm @@ -10,6 +10,5 @@ hyperBlogHeader = "HyperBlog" in { headerTitle = String.toUpper name - , headerName = name , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" } diff --git a/frontend/src/Config/Pages/Headers/Pages/Interviews.elm b/frontend/src/Config/Pages/Headers/Pages/Interviews.elm index 8a08e6c..3551cd4 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Interviews.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Interviews.elm @@ -10,6 +10,5 @@ interviewHeader = "Interviews" in { headerTitle = String.toUpper name - , headerName = name , headerBody = "This page showcases various podcasts and shows I've been on. If you’d like to have me as a guest on your podcast, feel free to reach out—I’d love to share my perspectives with your audience!" } diff --git a/frontend/src/Config/Pages/Headers/Pages/NutriDex.elm b/frontend/src/Config/Pages/Headers/Pages/NutriDex.elm index 1eceaaf..fc8f822 100755 --- a/frontend/src/Config/Pages/Headers/Pages/NutriDex.elm +++ b/frontend/src/Config/Pages/Headers/Pages/NutriDex.elm @@ -10,6 +10,5 @@ nutriDexHeader = "NutriDex" in { headerTitle = String.toUpper name - , headerName = name , headerBody = "fasdklfjasdlk;fjasdl;fjasdfl;kasjdfl;askdja;lsdkjas;ldfj" } diff --git a/frontend/src/Config/Pages/Headers/Pages/Services.elm b/frontend/src/Config/Pages/Headers/Pages/Services.elm index 23d5678..49e2c77 100755 --- a/frontend/src/Config/Pages/Headers/Pages/Services.elm +++ b/frontend/src/Config/Pages/Headers/Pages/Services.elm @@ -10,6 +10,5 @@ servicesHeader = "Services" in { 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." } diff --git a/frontend/src/Config/Pages/Headers/Types.elm b/frontend/src/Config/Pages/Headers/Types.elm index 0062bb5..1a54621 100755 --- a/frontend/src/Config/Pages/Headers/Types.elm +++ b/frontend/src/Config/Pages/Headers/Types.elm @@ -3,6 +3,5 @@ module Config.Pages.Headers.Types exposing (..) type alias Header = { headerTitle : String - , headerName : String , headerBody : String } diff --git a/frontend/src/Config/Pages/HyperBlog/Helpers.elm b/frontend/src/Config/Pages/HyperBlog/Helpers.elm index 8e1bec9..8d71907 100755 --- a/frontend/src/Config/Pages/HyperBlog/Helpers.elm +++ b/frontend/src/Config/Pages/HyperBlog/Helpers.elm @@ -2,41 +2,11 @@ module Config.Pages.HyperBlog.Helpers exposing (..) import Config.Format.CardFormat exposing (..) import Config.Style.Colour exposing (colourTheme) -import Config.Style.Svgs exposing (..) +import Config.Style.Svgs exposing (construction) import Effect exposing (Effect) import Element as E exposing (..) import Element.Font as F -underConstructionMaker : Element msg -underConstructionMaker = - 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" - ] - ] - ] - ] - ] - ] - ] - ] - ] +hyperBlogMaker = + none diff --git a/frontend/src/Config/Pages/Interviews/Helpers.elm b/frontend/src/Config/Pages/Interviews/Helpers.elm index 4c1f9a9..6059f0b 100755 --- a/frontend/src/Config/Pages/Interviews/Helpers.elm +++ b/frontend/src/Config/Pages/Interviews/Helpers.elm @@ -200,7 +200,7 @@ episodeMaker appearanceEntry = [ text ("#" ++ appearanceEntry.appearanceEpisode ++ ": " ++ appearanceEntry.appearanceTitle) |> el [ F.color colourTheme.textLightOrange - , mouseOver [ F.color colourTheme.textDarkOrange ] + , hoverFontDarkOrange ] ] } diff --git a/frontend/src/Config/Pages/Products/Helpers.elm b/frontend/src/Config/Pages/Products/Helpers.elm index 7458379..07bbb91 100755 --- a/frontend/src/Config/Pages/Products/Helpers.elm +++ b/frontend/src/Config/Pages/Products/Helpers.elm @@ -12,6 +12,7 @@ import Config.Helpers.StrengthBar , barPadding ) 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.Transitions exposing (transitionStyleFast) @@ -22,7 +23,6 @@ import Element.Border as D import Element.Events as V import Element.Font as F import Html.Attributes as H -import Config.Pages.Products.Types exposing (..) nutriDexMaker : NutriDex -> Element msg @@ -408,7 +408,7 @@ referenceFormat = ++ [ F.color colourTheme.textLightOrange , F.size 12 , alignTop - , mouseOver [ F.color colourTheme.textDarkOrange ] + , hoverFontDarkOrange , transitionStyleFast ] @@ -1020,7 +1020,7 @@ makeReference references index = [ newTabLink [ F.bold , F.color colourTheme.textLightOrange - , mouseOver [ F.color colourTheme.textDarkOrange ] + , hoverFontDarkOrange , transitionStyleFast ] { url = references.link, label = text (String.fromInt index ++ ". ") } diff --git a/frontend/src/Layouts/Navbar.elm b/frontend/src/Layouts/Navbar.elm index 3e84800..7f7d5e0 100755 --- a/frontend/src/Layouts/Navbar.elm +++ b/frontend/src/Layouts/Navbar.elm @@ -1,11 +1,11 @@ module Layouts.Navbar exposing (Model, Msg, Props, layout) +import Config.Data.Identity exposing (..) import Config.Format.Format exposing ( paragraphFontSize , paragraphSpacing ) -import Config.Data.Identity exposing (..) import Config.Style.Colour exposing (colourTheme) import Config.Style.Fonts exposing (spartanFont) import Config.Style.Glow exposing (glowDeepDarkGrey) @@ -373,7 +373,7 @@ desktopButtonMaker name icon = [ html icon ] , column - [ mouseOver [ F.color colourTheme.textLightOrange ] + [ hoverFontLightOrange , F.color colourTheme.textLightGrey , transitionStyleMedium , alignBottom diff --git a/frontend/src/Pages/Hyperblog.elm b/frontend/src/Pages/Hyperblog.elm index 8e98a4e..d936535 100755 --- a/frontend/src/Pages/Hyperblog.elm +++ b/frontend/src/Pages/Hyperblog.elm @@ -1,18 +1,20 @@ 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 exposing ( pageList , topLevelContainer ) 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.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 Page exposing (Page) import Route exposing (Route) @@ -102,5 +104,5 @@ hyperBlogList device = List.concat (case ( device.class, device.orientation ) of _ -> - [ [ underConstructionMaker ] ] + [ [ C.underConstructionMaker (String.toUpper pageNames.pageHyperBlog) ] ] )