Skip to content
This repository was archived by the owner on Jul 19, 2022. It is now read-only.

Move modals out of UnisonShare.App #285

Merged
merged 1 commit into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
12 changes: 12 additions & 0 deletions src/UI/Button.elm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module UI.Button exposing
, contained
, danger
, default
, github
, icon
, iconThenLabel
, large
Expand Down Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions src/UnisonLocal/App.elm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]
Expand All @@ -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)
]
)
Expand Down
Loading