feat: worked on some stuff

This commit is contained in:
Nick 2024-12-06 22:03:24 -06:00
parent d8ac47c5ee
commit cfbab179e2
48 changed files with 45 additions and 47 deletions

0
backend/dist-newstyle/cache/compiler vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/config vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/elaborated-plan vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/improved-plan vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/plan.json vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/solver-plan vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/source-hashes vendored Normal file → Executable file
View file

0
backend/dist-newstyle/cache/up-to-date vendored Normal file → Executable file
View file

View file

View file

View file

@ -16,6 +16,8 @@ topLevelContainer =
, height fill , height fill
, centerX , centerX
, B.color colourTheme.backgroundLightGrey , B.color colourTheme.backgroundLightGrey
, E.height E.fill
, scrollbarY
] ]

View file

@ -19,7 +19,7 @@ type alias PageInput =
pageNames : PageInput pageNames : PageInput
pageNames = pageNames =
{ pageRoot = "home" { pageRoot = "home"
, pageHome = "upRootNutrition" , pageHome = "uRN"
, pageServices = "services" , pageServices = "services"
, pageDodgers = "cuckList" , pageDodgers = "cuckList"
, pageDebate = "arguments" , pageDebate = "arguments"

3
frontend/src/Config/Response.elm Normal file → Executable file
View file

@ -18,4 +18,5 @@ pageListDesktop =
, paddingEach { top = 30, bottom = 30, left = 30, right = 30 } , paddingEach { top = 30, bottom = 30, left = 30, right = 30 }
, E.width (fill |> minimum 100) , E.width (fill |> minimum 100)
, E.width (fill |> maximum 875) , E.width (fill |> maximum 875)
] , scrollbarY
]

View file

@ -67,7 +67,7 @@ descriptionMaker contact =
[ width fill [ width fill
, height fill , height fill
] ]
[ column [ width fill, F.size 15, spacing 10 ] <| [ paragraph [ width fill, F.size 15, spacing 10 ] <|
List.map makeDescription List.map makeDescription
contact.contactEntry contact.contactEntry
] ]
@ -79,19 +79,17 @@ makeDescription method =
[ F.regular [ F.regular
, F.alignLeft , F.alignLeft
] ]
[ row [] [ paragraph
[ paragraph [ F.color colourTheme.textLightGrey
[ F.color colourTheme.textLightGrey ]
] [ text method.contactInstructions
[ text method.contactInstructions
]
] ]
] ]
linkMaker : Contact -> Element msg linkMaker : Contact -> Element msg
linkMaker contact = linkMaker contact =
row paragraph
(paragraphBoldFormat (paragraphBoldFormat
++ [ F.size 18 ++ [ F.size 18
, spacing 8 , spacing 8
@ -277,7 +275,7 @@ rounding =
termsAndConditions : List (List (Element msg)) termsAndConditions : List (List (Element msg))
termsAndConditions = termsAndConditions =
[ [ row [ alignLeft ] [ [ paragraph [ alignLeft ]
[ text "You will register an account with " [ text "You will register an account with "
, newTabLink [] , newTabLink []
{ url = "https://discord.com/login" { url = "https://discord.com/login"
@ -296,7 +294,7 @@ termsAndConditions =
] ]
] ]
, [ el [ alignLeft ] <| text "You will click the \"😃\" emoji to enter the server (if you haven't already)." ] , [ el [ alignLeft ] <| text "You will click the \"😃\" emoji to enter the server (if you haven't already)." ]
, [ row [ alignLeft ] , [ paragraph [ alignLeft ]
[ text "You will locate the " [ text "You will locate the "
, newTabLink [] , newTabLink []
{ url = "https://discord.com/channels/692563032546476062/826225570219687956" { url = "https://discord.com/channels/692563032546476062/826225570219687956"
@ -323,7 +321,7 @@ termsAndConditions =
} }
, alignLeft , alignLeft
] ]
[ column [ paragraph
[ paddingEach [ paddingEach
{ top = 15 { top = 15
, bottom = 15 , bottom = 15
@ -341,7 +339,7 @@ termsAndConditions =
] ]
] ]
, [ el [ alignLeft ] <| text "You will then receive the @Critic role." ] , [ el [ alignLeft ] <| text "You will then receive the @Critic role." ]
, [ row [ alignLeft ] , [ paragraph [ alignLeft ]
[ text "You will locate the " [ text "You will locate the "
, newTabLink [] , newTabLink []
{ url = "https://discord.com/channels/692563032546476062/1301247050796634182" { url = "https://discord.com/channels/692563032546476062/1301247050796634182"
@ -350,7 +348,7 @@ termsAndConditions =
, text " channel in the General category." , text " channel in the General category."
] ]
] ]
, [ row [ alignLeft ] , [ paragraph [ alignLeft ]
[ paragraph [ F.alignLeft ] [ paragraph [ F.alignLeft ]
[ text "You will post your criticism in the " [ text "You will post your criticism in the "
, newTabLink [] , newTabLink []
@ -417,7 +415,7 @@ termsAndConditions =
] ]
] ]
, [ el [ alignLeft ] <| text "You will not post additional criticisms until the last one has been resolved." ] , [ el [ alignLeft ] <| text "You will not post additional criticisms until the last one has been resolved." ]
, [ row [ alignLeft ] , [ paragraph [ alignLeft ]
[ text "You will not post anything other than criticisms in the " [ text "You will not post anything other than criticisms in the "
, newTabLink [ alignLeft ] , newTabLink [ alignLeft ]
{ url = "https://discord.com/channels/692563032546476062/1301247050796634182" { url = "https://discord.com/channels/692563032546476062/1301247050796634182"

0
frontend/src/Home/Helpers.elm Normal file → Executable file
View file

View file

@ -18,7 +18,7 @@ import View exposing (View)
type alias Props = type alias Props =
{ currentRoute : String } {}
layout : Props -> Shared.Model -> Route () -> Layout () Model Msg contentMsg layout : Props -> Shared.Model -> Route () -> Layout () Model Msg contentMsg
@ -95,6 +95,8 @@ view { content, model, toContentMsg, props } =
[ E.width fill [ E.width fill
, height fill , height fill
, B.color colourTheme.backgroundDarkGrey , B.color colourTheme.backgroundDarkGrey
, E.height E.fill
, scrollbarY
] ]
[ column [ column
[ htmlAttribute (H.style "position" "fixed") [ htmlAttribute (H.style "position" "fixed")
@ -157,8 +159,8 @@ view { content, model, toContentMsg, props } =
, F.size 17 , F.size 17
, spacing 8 , spacing 8
] ]
(buttonMaker props.currentRoute pageNames.pageRoot (buttonMaker pageNames.pageRoot
:: List.map (buttonMaker props.currentRoute) :: List.map buttonMaker
[ pageNames.pageServices [ pageNames.pageServices
, pageNames.pageHyperBlog , pageNames.pageHyperBlog
, pageNames.pageDebate , pageNames.pageDebate
@ -241,8 +243,8 @@ iconList =
] ]
buttonMaker : String -> String -> Element msg buttonMaker : String -> Element msg
buttonMaker currentRoute name = buttonMaker name =
row row
[] []
[ column [ E.width <| px 36 ] [ column [ E.width <| px 36 ]
@ -263,12 +265,7 @@ buttonMaker currentRoute name =
, label = , label =
el el
[ mouseOver [ F.color colourTheme.textLightOrange ] [ mouseOver [ F.color colourTheme.textLightOrange ]
, F.color <| , F.color colourTheme.textLightGrey
if String.toLower name == currentRoute then
colourTheme.textLightOrange
else
colourTheme.textLightGrey
, htmlAttribute <| style "transition" "all 0.1s ease-in-out" , htmlAttribute <| style "transition" "all 0.1s ease-in-out"
] ]
<| <|

View file

@ -88,7 +88,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = debateName } Layouts.Navbar { }

View file

@ -35,7 +35,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = contactName } Layouts.Navbar { }
@ -104,25 +104,25 @@ contactList device =
List.concat List.concat
(case ( device.class, device.orientation ) of (case ( device.class, device.orientation ) of
( Phone, Portrait ) -> ( Phone, Portrait ) ->
[ [] ] [ [ instructionMaker ] ]
( Phone, Landscape ) -> ( Phone, Landscape ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( Tablet, Portrait ) -> ( Tablet, Portrait ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( Tablet, Landscape ) -> ( Tablet, Landscape ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( Desktop, Portrait ) -> ( Desktop, Portrait ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( Desktop, Landscape ) -> ( Desktop, Landscape ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( BigDesktop, Portrait ) -> ( BigDesktop, Portrait ) ->
[ [instructionMaker] ] [ [ instructionMaker ] ]
( BigDesktop, Landscape ) -> ( BigDesktop, Landscape ) ->
[ [ instructionMaker ] ] [ [ instructionMaker ] ]

View file

@ -99,7 +99,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = dodgersName } Layouts.Navbar { }

View file

@ -44,7 +44,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = donateName } Layouts.Navbar {}

View file

@ -45,7 +45,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = donateName } Layouts.Navbar { }

View file

@ -33,7 +33,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = homeName } Layouts.Navbar { }

View file

@ -30,7 +30,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar {currentRoute = hyperBlogName} Layouts.Navbar {}

View file

@ -44,7 +44,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = interviewsName } Layouts.Navbar { }

View file

@ -39,7 +39,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = nutriDexName } Layouts.Navbar { }

View file

@ -37,7 +37,7 @@ page shared route =
toLayout : Model -> Layouts.Layout Msg toLayout : Model -> Layouts.Layout Msg
toLayout model = toLayout model =
Layouts.Navbar { currentRoute = servicesName } Layouts.Navbar {}

View file

@ -43,7 +43,6 @@ nutriDexMaker nutridex =
, nutriDexMinerals , nutriDexMinerals
, nutriDexAminoAcids , nutriDexAminoAcids
] ]
, nutriDexReferenceTitleMaker
, nutriDexReferences nutridex , nutriDexReferences nutridex
] ]
] ]
@ -73,7 +72,6 @@ nutriDexMakerMobile nutridex =
, nutriDexMinerals , nutriDexMinerals
, nutriDexAminoAcids , nutriDexAminoAcids
] ]
, nutriDexReferenceTitleMaker
, nutriDexReferences nutridex , nutriDexReferences nutridex
] ]
] ]
@ -276,6 +274,7 @@ nutriDexTitleMaker title =
[ width fill [ width fill
, height fill , height fill
, spacing 20 , spacing 20
, paddingEach { top = 0, bottom = 0, left = 100, right = 100 }
] ]
[ row [ row
[ width fill [ width fill
@ -829,7 +828,8 @@ nutriDexReferences nutridex =
[ width fill [ width fill
, height fill , height fill
] ]
[ column [ width fill, F.size 15, spacing 10 ] <| [ nutriDexTitleMaker "Reference"
, column [ width fill, F.size 15, spacing 10 ] <|
List.map2 (\x y -> makeReference x y) List.map2 (\x y -> makeReference x y)
nutridex.nutriDexReference nutridex.nutriDexReference
(List.range 1 (List.length nutridex.nutriDexReference)) (List.range 1 (List.length nutridex.nutriDexReference))

0
frontend/static/assets/logo.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Before After
Before After

0
frontend/static/assets/logo_extended.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Before After
Before After

0
frontend/static/assets/logo_lambda.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

Before After
Before After

0
frontend/static/assets/logo_lambda_square.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Before After
Before After

0
frontend/static/assets/logo_r.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Before After
Before After

0
frontend/static/assets/logo_r_square.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Before After
Before After

0
frontend/static/assets/logo_u.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before After
Before After

0
frontend/static/assets/logo_u_square.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Before After
Before After

0
frontend/static/assets/nutridex.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 103 KiB

Before After
Before After

0
frontend/static/styles.css Normal file → Executable file
View file