mirror of
https://gitlab.com/upRootNutrition/website.git
synced 2025-06-16 04:25:11 -05:00
feat: refactored a shit ton of stuff
This commit is contained in:
parent
fbdfde8680
commit
7704839038
20 changed files with 54 additions and 45 deletions
|
@ -48,7 +48,7 @@ cardMaker =
|
||||||
column
|
column
|
||||||
[ E.width fill
|
[ E.width fill
|
||||||
, D.width 5
|
, D.width 5
|
||||||
, centerX
|
, alignTop
|
||||||
, D.color colourTheme.backgroundDarkGrey
|
, D.color colourTheme.backgroundDarkGrey
|
||||||
, D.rounded 32
|
, D.rounded 32
|
||||||
, glowDeepDarkGrey
|
, glowDeepDarkGrey
|
||||||
|
|
|
@ -5,7 +5,7 @@ import Element.Font as F
|
||||||
|
|
||||||
paragraphFontSize : Attr decorative msg
|
paragraphFontSize : Attr decorative msg
|
||||||
paragraphFontSize =
|
paragraphFontSize =
|
||||||
F.size 17
|
F.size 16
|
||||||
|
|
||||||
|
|
||||||
paragraphSpacing : Attribute msg
|
paragraphSpacing : Attribute msg
|
||||||
|
|
|
@ -10,19 +10,30 @@ topLevelContainer =
|
||||||
el
|
el
|
||||||
[ width fill
|
[ width fill
|
||||||
, height fill
|
, height fill
|
||||||
, centerX
|
|
||||||
, B.color colourTheme.backgroundLightGrey
|
, B.color colourTheme.backgroundLightGrey
|
||||||
, height fill
|
, height fill
|
||||||
, scrollbarY
|
, scrollbarY
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
pageListDesktop : List (Attribute msg)
|
pageList : List (Attribute msg)
|
||||||
pageListDesktop =
|
pageList =
|
||||||
|
[ alignTop
|
||||||
|
]
|
||||||
|
++ pageListFormat
|
||||||
|
|
||||||
|
|
||||||
|
pageListCenter : List (Attribute msg)
|
||||||
|
pageListCenter =
|
||||||
|
[ centerY
|
||||||
|
]
|
||||||
|
++ pageListFormat
|
||||||
|
|
||||||
|
|
||||||
|
pageListFormat : List (Attribute msg)
|
||||||
|
pageListFormat =
|
||||||
[ spacing 30
|
[ spacing 30
|
||||||
, centerX
|
, centerX
|
||||||
, alignTop
|
|
||||||
, height fill
|
|
||||||
, paddingEach { top = 30, bottom = 30, left = 30, right = 30 }
|
, paddingEach { top = 30, bottom = 30, left = 30, right = 30 }
|
||||||
, width (fill |> minimum 100)
|
, width (fill |> minimum 100)
|
||||||
, width (fill |> maximum 875)
|
, width (fill |> maximum 875)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
module Config.Helpers.StrengthBar exposing (..)
|
module Config.Helpers.StrengthBar exposing (..)
|
||||||
|
|
||||||
import Config.Helpers.ToolTip exposing (..)
|
import Config.Helpers.ToolTip exposing (..)
|
||||||
import Config.Style.Colour exposing (..)
|
import Config.Style.Colour exposing (colourTheme)
|
||||||
import Element as E exposing (..)
|
import Element as E exposing (..)
|
||||||
import Element.Background as B
|
import Element.Background as B
|
||||||
import Element.Border as D
|
import Element.Border as D
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module Config.Helpers.ToolTip exposing (..)
|
module Config.Helpers.ToolTip exposing (..)
|
||||||
|
|
||||||
import Config.Style.Colour exposing (..)
|
import Config.Style.Colour exposing (colourTheme)
|
||||||
import Config.Style.Transitions exposing (transitionStyleSlow)
|
import Config.Style.Transitions exposing (transitionStyleSlow)
|
||||||
import Element as E exposing (..)
|
import Element as E exposing (..)
|
||||||
import Element.Background as B
|
import Element.Background as B
|
||||||
|
|
|
@ -8,7 +8,7 @@ import Config.Helpers.StrengthBar
|
||||||
, barPadding
|
, barPadding
|
||||||
)
|
)
|
||||||
import Config.Helpers.ToolTip exposing (..)
|
import Config.Helpers.ToolTip exposing (..)
|
||||||
import Config.Style.Colour exposing (..)
|
import Config.Style.Colour exposing (colourTheme)
|
||||||
import Config.Style.Transitions
|
import Config.Style.Transitions
|
||||||
exposing
|
exposing
|
||||||
( hoverFontDarkOrange
|
( hoverFontDarkOrange
|
||||||
|
|
|
@ -564,7 +564,7 @@ desktopFormalizationMaker argument =
|
||||||
|
|
||||||
mobileFormalizationMaker : Argument -> Element msg
|
mobileFormalizationMaker : Argument -> Element msg
|
||||||
mobileFormalizationMaker argument =
|
mobileFormalizationMaker argument =
|
||||||
formalizationMaker argument argumentDesktopPadding
|
formalizationMaker argument argumentMobilePadding
|
||||||
|
|
||||||
|
|
||||||
formalizationMaker : Argument -> Attribute msg -> Element msg
|
formalizationMaker : Argument -> Attribute msg -> Element msg
|
||||||
|
@ -619,12 +619,6 @@ formalizationMaker argument padding =
|
||||||
[ F.color colourTheme.textLightGrey
|
[ F.color colourTheme.textLightGrey
|
||||||
, F.regular
|
, F.regular
|
||||||
, E.width fill
|
, E.width fill
|
||||||
, paddingEach
|
|
||||||
{ top = 0
|
|
||||||
, right = 0
|
|
||||||
, bottom = 0
|
|
||||||
, left = 5
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
, paragraph
|
, paragraph
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Arguments exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -105,7 +105,7 @@ debateList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Contact exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -99,7 +99,7 @@ contactContainer device =
|
||||||
|
|
||||||
contactList : Device -> Element msg
|
contactList : Device -> Element msg
|
||||||
contactList device =
|
contactList device =
|
||||||
column pageListDesktop <|
|
column pageList <|
|
||||||
List.concat
|
List.concat
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Cucklist exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -100,7 +100,7 @@ dodgersList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -3,8 +3,9 @@ module Pages.Debate exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
|
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
import Config.Pages.Debate.Debate.Helpers exposing (..)
|
import Config.Pages.Debate.Debate.Helpers exposing (..)
|
||||||
|
@ -103,7 +104,7 @@ debateList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
module Pages.Donate exposing (Model, Msg, page)
|
module Pages.Donate exposing (Model, Msg, page)
|
||||||
|
|
||||||
import Config.Data.Identity as I exposing (..)
|
import Config.Data.Identity as I exposing (..)
|
||||||
import Config.Format.Format as O exposing (..)
|
import Config.Format.Response
|
||||||
import Config.Format.Response exposing (..)
|
exposing
|
||||||
|
( pageList
|
||||||
|
, topLevelContainer
|
||||||
|
)
|
||||||
import Config.Helpers.Viewport exposing (..)
|
import Config.Helpers.Viewport exposing (..)
|
||||||
import Config.Pages.Donate.Helpers exposing (..)
|
import Config.Pages.Donate.Helpers exposing (..)
|
||||||
import Config.Pages.Donate.Methods.Cardano exposing (donateCardano)
|
import Config.Pages.Donate.Methods.Cardano exposing (donateCardano)
|
||||||
|
@ -14,11 +17,11 @@ import Config.Pages.Donate.Methods.PayPal exposing (donatePayPal)
|
||||||
import Config.Pages.Donate.Methods.Stripe exposing (donateStripe)
|
import Config.Pages.Donate.Methods.Stripe exposing (donateStripe)
|
||||||
import Config.Pages.Donate.Methods.YouTube exposing (donateYouTube)
|
import Config.Pages.Donate.Methods.YouTube exposing (donateYouTube)
|
||||||
import Config.Pages.Donate.Types exposing (..)
|
import Config.Pages.Donate.Types exposing (..)
|
||||||
|
import Config.Pages.Headers.Helpers exposing (headerMaker)
|
||||||
|
import Config.Pages.Headers.Pages.Donate exposing (donateHeader)
|
||||||
import Config.Style.Colour as T exposing (..)
|
import Config.Style.Colour as T exposing (..)
|
||||||
import Effect exposing (Effect)
|
import Effect exposing (Effect)
|
||||||
import Element as E exposing (..)
|
import Element as E exposing (..)
|
||||||
import Config.Pages.Headers.Helpers exposing (headerMaker)
|
|
||||||
import Config.Pages.Headers.Pages.Donate exposing (donateHeader)
|
|
||||||
import Layouts
|
import Layouts
|
||||||
import Page exposing (Page)
|
import Page exposing (Page)
|
||||||
import Route exposing (Route)
|
import Route exposing (Route)
|
||||||
|
@ -108,7 +111,7 @@ donateList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Gibberish exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -113,7 +113,7 @@ gibberishList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Home_ exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageListCenter
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -96,7 +96,7 @@ homeContainer device =
|
||||||
|
|
||||||
homeList : Device -> Element msg
|
homeList : Device -> Element msg
|
||||||
homeList device =
|
homeList device =
|
||||||
column pageListDesktop
|
column pageListCenter
|
||||||
[ case device.class of
|
[ case device.class of
|
||||||
Desktop ->
|
Desktop ->
|
||||||
desktopHomePage
|
desktopHomePage
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Hyperblog exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -98,7 +98,7 @@ hyperBlogContainer device =
|
||||||
|
|
||||||
hyperBlogList : Device -> Element msg
|
hyperBlogList : Device -> Element msg
|
||||||
hyperBlogList device =
|
hyperBlogList device =
|
||||||
column pageListDesktop <|
|
column pageList <|
|
||||||
List.concat
|
List.concat
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Interviews exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -109,7 +109,7 @@ interviewList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -2,7 +2,7 @@ module Pages.NotFound_ exposing (Model, Msg, page)
|
||||||
|
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Effect exposing (Effect)
|
import Effect exposing (Effect)
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Nutridex exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -103,7 +103,7 @@ nutriDexList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
|
@ -3,7 +3,7 @@ module Pages.Services exposing (Model, Msg, page)
|
||||||
import Config.Data.Identity exposing (pageNames)
|
import Config.Data.Identity exposing (pageNames)
|
||||||
import Config.Format.Response
|
import Config.Format.Response
|
||||||
exposing
|
exposing
|
||||||
( pageListDesktop
|
( pageList
|
||||||
, topLevelContainer
|
, topLevelContainer
|
||||||
)
|
)
|
||||||
import Config.Helpers.Viewport exposing (resetViewport)
|
import Config.Helpers.Viewport exposing (resetViewport)
|
||||||
|
@ -106,7 +106,7 @@ servicesList device =
|
||||||
column
|
column
|
||||||
(case ( device.class, device.orientation ) of
|
(case ( device.class, device.orientation ) of
|
||||||
_ ->
|
_ ->
|
||||||
pageListDesktop
|
pageList
|
||||||
)
|
)
|
||||||
<|
|
<|
|
||||||
List.concat
|
List.concat
|
||||||
|
|
BIN
frontend/static/debate/cucklist1.png
Normal file
BIN
frontend/static/debate/cucklist1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 387 KiB |
Loading…
Add table
Add a link
Reference in a new issue