Merge pull request #285 from unisonweb/share-appModal

Move modals out of UnisonShare.App

Author: hojberg

README.md

@@ -15,7 +15,7 @@ Running Development Server
 
 2. Make sure the latest dependencies are installed with by running `npm install`
 
-3. Start the development server, run: `API_URL="<API URL FROM UCM>" npm start`
+3. Start the Unison Share dev server with: `API_URL="<API URL FROM UCM>" npm run start:unisonShare` or the Unison Local dev server with: `API_URL="<API URL FROM UCM>" npm run start:unisonLocal`
 
 4. Visit `http://localhost:1234` in a browser.
 

package.json

@@ -10,6 +10,8 @@
     "build": "webpack --mode production --config webpack.prod.js",
     "clean": "rm -rf dist",
     "start": "webpack serve --mode development --port 1234 --config webpack.dev.js",
+    "start:unisonLocal": "webpack serve --mode development --port 1234 --config webpack.unisonLocal.dev.js",
+    "start:unisonShare": "webpack serve --mode development --port 1234 --config webpack.unisonShare.dev.js",
     "test": "elm-test",
     "review": "elm-review"
   },

src/UI/Button.elm

@@ -6,6 +6,7 @@ module UI.Button exposing
     , contained
     , danger
     , default
+    , github
     , icon
     , iconThenLabel
     , large
@@ -310,6 +311,17 @@ withSize size button_ =
 
 
 
+-- COMMON INSTANCES
+
+
+github : String -> Button msg
+github repo =
+    linkIconThenLabel ("https://github.com/" ++ repo) I.github repo
+        |> small
+        |> contained
+
+
+
 -- INTERNAL
 
 

src/UnisonLocal/App.elm

@@ -572,7 +572,7 @@ viewMainSidebar model =
                     (List.map
                         (\( l, c ) -> Click.view [] [ text l ] c)
                         subMenu
-                        ++ [ a [ class "show-help", onClick (ShowModal HelpModal) ]
+                        ++ [ a [ class "show-keyboard-shortcuts", onClick (ShowModal HelpModal) ]
                                 [ text "Keyboard Shortcuts"
                                 , KeyboardShortcut.view model.keyboardShortcut (KeyboardShortcut.single QuestionMark)
                                 ]
@@ -584,7 +584,7 @@ viewMainSidebar model =
             [ unisonSubmenu
             , Tooltip.tooltip
                 (a
-                    [ class "show-help-collapsed", onClick (ShowModal HelpModal) ]
+                    [ class "show-keyboard-shortcuts-collapsed", onClick (ShowModal HelpModal) ]
                     [ KeyboardShortcut.view model.keyboardShortcut (KeyboardShortcut.single QuestionMark)
                     ]
                 )