fix discord url bug i think

Author: bristermitten

src/Main.elm

@@ -24,10 +24,10 @@ main =
 
 init : () -> Url -> Nav.Key -> ( Model, Cmd Msg )
 init _ url key =
-    ( { route = ( Route.fromUrl url )
+    ( { route = Route.fromUrl url
       , key = key
       }
-      , Cmd.none
+    , Cmd.none
     )
 
 
@@ -47,10 +47,19 @@ update : Msg -> Model -> ( Model, Cmd Msg )
 update msg model =
     case msg of
         ChangedUrl url ->
-            ( { route = (Route.fromUrl url)
-              , key = model.key }
-            , Cmd.none
-            )
+            let
+                route =
+                    Route.maybeFromUrl url
+            in
+            case route of
+                Nothing ->
+                    ( { route = Route.Home, key = model.key }, Cmd.none )
+
+                Just Discord ->
+                    ( model, Nav.load (Route.routeToString Route.Discord) )
+
+                Just other ->
+                    ( { route = other, key = model.key }, Cmd.none )
 
         ClickedLink request ->
             case request of
@@ -70,6 +79,7 @@ update msg model =
             )
 
 
+
 -- SUBSCRIPTIONS
 
 
@@ -85,12 +95,16 @@ subscriptions _ =
 view : Model -> Document Msg
 view model =
     let
-        page = case model.route of
-            Home ->
-                Page.view Page.Home ( Home.view { key = model.key } )
+        page =
+            case model.route of
+                Home ->
+                    Page.view Page.Home (Home.view { key = model.key })
 
-            Rules ->
-                Page.view Page.Rules ( Rules.view { key = model.key } )
-    in
-    { title = page.title, body = List.map ( Html.map (\_ -> NewPage) ) page.body }
+                Rules ->
+                    Page.view Page.Rules (Rules.view { key = model.key })
 
+                Discord ->
+                    -- default to home, this should never happen
+                    Page.view Page.Home (Home.view { key = model.key })
+    in
+    { title = page.title, body = List.map (Html.map (\_ -> NewPage)) page.body }

src/Page.elm

@@ -40,12 +40,12 @@ navbarLink page route name =
         a (Route.href route :: deselected) [ text name ]
 
 
-selected : List ( Attribute msg )
+selected : List (Attribute msg)
 selected =
     [ Tw.font_bold, Tw.rounded_2xl, Tw.px_3, Tw.py_1, Tw.bg_gradient_to_r, Tw.from_blue_700, Tw.to_pink_700, Tw.text_gray_50 ]
 
 
-deselected : List ( Attribute msg )
+deselected : List (Attribute msg)
 deselected =
     [ Tw.hover__bg_gray_300, Tw.rounded_2xl, Tw.px_3, Tw.py_1, Tw.ease_in_out, Tw.duration_300 ]
 

src/Route.elm

@@ -1,4 +1,4 @@
-module Route exposing (Route(..), fromUrl, href)
+module Route exposing (Route(..), fromUrl, href, maybeFromUrl, routeToString)
 
 import Html exposing (Attribute)
 import Html.Attributes as Attr
@@ -9,13 +9,15 @@ import Url.Parser as Parser exposing ((</>), Parser, oneOf)
 type Route
     = Home
     | Rules
+    | Discord
 
 
 parser : Parser (Route -> a) a
 parser =
     oneOf
         [ Parser.map Home Parser.top
         , Parser.map Rules (Parser.s "rules")
+        , Parser.map Discord (Parser.s "discord")
         ]
 
 
@@ -24,10 +26,15 @@ href target =
     Attr.href (routeToString target)
 
 
+maybeFromUrl : Url -> Maybe Route
+maybeFromUrl url =
+    Parser.parse parser url
+
+
 fromUrl : Url -> Route
 fromUrl url =
-    case ( Parser.parse parser url ) of
-        (Just route) ->
+    case Parser.parse parser url of
+        Just route ->
             route
 
         Nothing ->
@@ -47,3 +54,6 @@ routeToPieces route =
 
         Rules ->
             [ "rules" ]
+
+        Discord ->
+            [ "discord" ]

src/Views/Home.elm

@@ -24,34 +24,36 @@ view _ =
             [ h1 [ Tw.text_center, Tw.text_9xl, class "horta" ] [ text "Developer Den" ]
             , h2 [ Tw.text_center, Tw.font_titillium, Tw.text_2xl, Tw.py_4 ] [ text "A closely-knit community anchored in a common passion for programming." ]
             , div [ Tw.py_7 ]
-                  [ a [ href discordURL, Tw.bg_indigo_500, Tw.text_2xl, Tw.p_5, Tw.rounded_2xl, Tw.shadow_md, Tw.hover__bg_indigo_600, Tw.ease_in_out, Tw.duration_300 ]
-                      [ button [ Tw.font_titillium, Tw.font_bold ]
-                               [ i [ Tw.px_1, Tw.pr_3, class "fab fa-discord" ] []
-                               , text "Interested? Join our Discord!" ]
-                      ]
-                  ]
+                [ a [ href discordURL, Tw.bg_indigo_500, Tw.text_2xl, Tw.p_5, Tw.rounded_2xl, Tw.shadow_md, Tw.hover__bg_indigo_600, Tw.ease_in_out, Tw.duration_300 ]
+                    [ button [ Tw.font_titillium, Tw.font_bold ]
+                        [ i [ Tw.px_1, Tw.pr_3, class "fab fa-discord" ] []
+                        , text "Interested? Join our Discord!"
+                        ]
+                    ]
+                ]
             , div [ Tw.inline_flex, Tw.flex_row, Tw.ml_5, Tw.mt_5 ]
-                [ projectOf [ ] "web frontend" "the frontend website that you're viewing now that is written in elm and tailwind css" "https://github.com/TheDeveloperDen/devden-web-frontend"
-                , projectOf [ ] "discord bot" "the discord bot that manages many aspects of our discord server (ex. xp, leaderboards)" "https://github.com/TheDeveloperDen/DevDenBot"
-                , projectOf [ ] "learning resources" "a repository containing crowd-sourced information on how to learn different languages" "https://github.com/TheDeveloperDen/LearningResources"
+                [ projectOf [] "web frontend" "the frontend website that you're viewing now that is written in elm and tailwind css" "https://github.com/TheDeveloperDen/devden-web-frontend"
+                , projectOf [] "discord bot" "the discord bot that manages many aspects of our discord server (ex. xp, leaderboards)" "https://github.com/TheDeveloperDen/DevDenBot"
+                , projectOf [] "learning resources" "a repository containing crowd-sourced information on how to learn different languages" "https://github.com/TheDeveloperDen/LearningResources"
                 ]
             , div [ Tw.absolute, Tw.bottom_5, Tw.right_5, Tw.flex, Tw.flex_row, Tw.space_x_1, Tw.rounded_xl, Tw.py_2, Tw.px_2, Tw.bg_gray_200, Tw.shadow_md ]
-                  [ a [ href discordURL ] [ button (class "hover:bg-indigo-500 hover:text-white" :: buttonStyles) [ i [ Tw.px_1, class "fab fa-discord" ] [] ] ]
-                  , a [ href githubURL ] [ button (class "hover:bg-gray-900 hover:text-white" :: buttonStyles) [ i [ Tw.px_1, class "fab fa-github" ] [] ] ]
-                  ]
+                [ a [ href discordURL ] [ button (class "hover:bg-indigo-500 hover:text-white" :: buttonStyles) [ i [ Tw.px_1, class "fab fa-discord" ] [] ] ]
+                , a [ href githubURL ] [ button (class "hover:bg-gray-900 hover:text-white" :: buttonStyles) [ i [ Tw.px_1, class "fab fa-github" ] [] ] ]
+                ]
             ]
     }
 
+
 projectOf : List (Attribute Msg) -> String -> String -> String -> Html Msg
 projectOf attr name desc url =
-    div attr [ fieldset [ Tw.p_3, Tw.border_gray_300, Tw.border_2, Tw.border_opacity_50, Tw.m_5, Tw.rounded_2xl, Tw.shadow_md, Tw.w_auto ]
-                [ legend [ Tw.px_1_dot_5, Tw.py_0, Tw.hover__bg_gray_200, Tw.rounded_2xl, Tw.duration_300, Tw.ease_in_out ]
+    div attr
+        [ fieldset [ Tw.p_3, Tw.border_gray_300, Tw.border_2, Tw.border_opacity_50, Tw.m_5, Tw.rounded_2xl, Tw.shadow_md, Tw.w_auto ]
+            [ legend [ Tw.px_1_dot_5, Tw.py_0, Tw.hover__bg_gray_200, Tw.rounded_2xl, Tw.duration_300, Tw.ease_in_out ]
                 [ a [ href url, Tw.font_poppins, Tw.font_bold, Tw.hover__text_black, Tw.p_0_dot_5, Tw.duration_300, Tw.ease_in_out ] [ text name ] ]
-                , p [ Tw.font_titillium, Tw.break_words ] [ text desc ]
-                ]
+            , p [ Tw.font_titillium, Tw.break_words ] [ text desc ]
             ]
+        ]
+
 
 buttonStyles =
     [ Tw.font_titillium, Tw.rounded_full, Tw.text_black, Tw.font_semibold, Tw.py_2, Tw.px_2, Tw.transform, Tw.transition, Tw.duration_300, Tw.ease_in_out ]
-
-

src/Views/Rules.elm

@@ -60,7 +60,7 @@ ruleHeader body =
 ruleLine text =
     h4 [ Tw.pl_8, Tw.font_titillium, Tw.text_lg ] text
 
+
 inlineLink : String -> String -> Html Msg
 inlineLink val link =
     a [ Tw.text_indigo_300, Tw.underline, Tw.hover__text_blue_500, Tw.duration_300, Tw.ease_in_out, href link ] [ text val ]
-