embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,880 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

485 Commits

Author SHA1 Message Date
Iuri Matias 6a9c067167
Merge pull request #177 from status-im/feature/deployment-header-improvement 
Fix contract deployment headers
 2018-10-29 12:07:22 +01:00
Iuri Matias 896debefbd
Merge pull request #176 from status-im/packaging_improvements 
Packaging improvements
 2018-10-29 12:05:52 +01:00
Iuri Matias c10185c0f9
Merge pull request #181 from status-im/fix/editor-tool-bar-tabs 
fix(cockpit/TextEditorToolbar): set active state on selected tabs
 2018-10-29 11:59:49 +01:00
Anthony Laibe 360df5f6ef Display better error message 2018-10-28 17:10:38 +01:00
Pascal Precht 2e4e6a3381
fix(cockpit/TextEditorToolbar): set active state on selected tabs 
This commit ensures that the `activeTab` state for the Editor toolbar tabs
is properly passed down to `TextEditorToolbar` component, so it can be used
to set the active state accordingly.
 2018-10-28 16:07:41 +01:00
Andre Medeiros aa136b470d Change contract folder icon 
CHange it to something that indicates text files
 2018-10-28 14:41:14 +01:00
Andre Medeiros dafd81ecbf Fix contract deployment headers 
This will make the only linkable section of the title be the contract
name.
 2018-10-28 13:43:29 +01:00
Michael Bradley, Jr dfd741ee8a don't gen source maps for production builds of embark-ui 
don't include .env files in the pkg tarball
 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 59326e6500 embark-ui pkg lock -- http:// -> https:// 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 7b241743aa rev embark-ui .npmignore 2018-10-28 13:16:20 +01:00
Iuri Matias 1576db38d5 Merge branch 'develop_51' of github.com:status-im/embark-area-51 into develop_51 2018-10-28 12:10:28 +01:00
Iuri Matias d1d5450747 decrease file size in 'show hidden files' text 2018-10-28 12:10:15 +01:00
Iuri Matias 6f626179ac
Merge pull request #173 from status-im/chores/linter 
Add linter to embark-ui
 2018-10-28 11:31:20 +01:00
Iuri Matias 3c93151750
Merge pull request #174 from status-im/feature/tabs-colored 
Color tabs for text editor
 2018-10-28 11:29:38 +01:00
Anthony Laibe d1170d3cef Reset content if empty 2018-10-28 11:21:05 +01:00
Anthony Laibe f1e1c4a143 Color tabs for text editor 2018-10-28 10:39:40 +01:00
Anthony Laibe 5c19dcf672 Add linter to embark-ui 2018-10-28 10:13:09 +01:00
Iuri Matias eb8759083c
Merge pull request #172 from status-im/minor_style_improvements 
fix button text colors and table background colors in the dark theme
 2018-10-28 09:42:45 +01:00
Iuri Matias b20b872256 fix button text colors and table background colors in the dark theme 2018-10-28 09:34:04 +01:00
Iuri Matias 3487265100
Merge pull request #169 from status-im/feature/do-not-close-expanded-folder 
Do not close expanded node
 2018-10-27 21:36:04 +02:00
Iuri Matias 9f6f7af3f7
Merge pull request #171 from status-im/global_vars 
display globals in the debugger; display vars found in failing line
 2018-10-27 21:33:00 +02:00
Iuri Matias 40ed7b960f display globals in the debugger; display vars found in failing line 2018-10-27 21:31:13 +02:00
Jonathan Rainville e77e08c84e Merge branch 'features/improve-gas-estimator' into develop_51 2018-10-27 06:06:14 -04:00
Anthony Laibe 40cab4a06a Do not close expanded node 2018-10-26 17:06:14 +02:00
Iuri Matias b02cafe672
Merge pull request #133 from status-im/bug_fix/double-auth 
Don't authenticate twice
 2018-10-26 16:58:08 +02:00
Anthony Laibe ed9a910f4a Add tooltip to header external link 2018-10-26 16:40:34 +02:00
Iuri Matias 87dfffef4d
Merge pull request #166 from status-im/features/improve-gas-estimator 
Add gas estimator to the functions that need it
 2018-10-25 15:43:39 -04:00
Jonathan Rainville b85f8aff8c fix margins by using a padding on the container instead 2018-10-25 14:34:54 -04:00
Jonathan Rainville 79cb60f164 style improvments to functions, explorer and icon 2018-10-25 14:16:45 -04:00
Jonathan Rainville 22f94563fe add a title to the auto-set button to explain 2018-10-25 12:04:25 -04:00
Jonathan Rainville 8886f6b0f2 add gas price estimator is functions as well as a button to auto-set 2018-10-25 11:59:25 -04:00
Jonathan Rainville 92d433ff9a impore contract overview style 2018-10-25 10:23:47 -04:00
Jonathan Rainville 8ec1199074 fix file-tree height 2018-10-25 09:51:54 -04:00
Iuri Matias 7df05fdce3
Merge pull request #164 from status-im/feature/light-theme-editor 
Add light theme to editor
 2018-10-25 07:50:15 -04:00
Pascal Precht 6dccbd8902
fix: Ensure Embark process live updates are being retrieved by Cockpit 2018-10-25 13:04:33 +02:00
Anthony Laibe 079a2dbba4 Add light theme to editor 2018-10-25 12:02:13 +01:00
Michael Bradley, Jr 8a9b8f25ab separate "should authenticate" logic from "do authenticate" logic 
but don't maintain separate methods for query string vs. props
 2018-10-25 05:50:59 -05:00
Michael Bradley, Jr a5c972903b formatting 2018-10-25 05:50:58 -05:00
Michael Bradley, Jr 10fa3fec9f consolidate DEFAULT_HOST logic 2018-10-25 05:50:58 -05:00
Michael Bradley, Jr 9533b57627 formatting 2018-10-25 05:50:58 -05:00
Michael Bradley, Jr d861b0b1af prefer an empty React Fragment to an empty div 2018-10-25 05:50:58 -05:00
Michael Bradley, Jr 56177346df set error null for action.type AUTHENTICATE[REQUEST] 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr d150deb572 error is `null` in DEFAULT_CREDENTIALS_STATE 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 9ce967ca03 prefer `import` to `require()` 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 754266da17 formatting 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr a594b14f27 combine token stripping logic, use utils 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 53d6b9d704 reorg getQueryToken, stripQueryToken in utils/utils 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 8d684bf1ef make requireAuthentication clearer 
if authenticating or authenticated, do not require authentication
 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 8add299f53 whitespace 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 8b23d012eb don't return Layout while authenticating 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 2088624d83 on autho failure trigger logout, which clears localStorage 
We don't presently have a way to cleanly distinguish between auth attempts with
query string vs. credentials from localStorage, particularly with respect to
one kind failing vs. the other. This can create confusing behavior when
e.g. copy/pasting an old/wrong URL+token, but then it works when refreshing the
window/tab with URL minus the token.

So, this commit simplifies the situation somewhat by triggering a logout
if there's an auth failure. That will affect all open tabs/windows of the
same browser but not other browsers, e.g. if one has embark-ui open in Chrome
and Firefox.
 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 0ce26e4479 include default credentials state on auth failure 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 8d40c04107 strip token from URL if auth fails 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr d02d2f1522 make token stripping logic reusable 2018-10-25 05:50:53 -05:00
Michael Bradley, Jr 3071c489a7 introduce props.credentials.authenticating 
helps prevent auth dupes and allows "flash" of Login component to be avoided
while waiting for an authentication attempt that may succeed
 2018-10-25 05:50:52 -05:00
Michael Bradley, Jr ee13fcf3ad getToken -> getQueryToken 2018-10-25 05:50:52 -05:00
Michael Bradley, Jr 2abcfe5de0 remove token from URL and replace location in history if auth'd 2018-10-25 05:50:52 -05:00
Michael Bradley, Jr 1b20bbbeb8 invoke queryStringAuthenticate before requireAuthentication 2018-10-25 05:50:52 -05:00
Michael Bradley, Jr 2432489943 remove useless constructor 2018-10-25 05:50:52 -05:00
Michael Bradley, Jr fe1a0a6f3b only auth w/ stored token if there is no query string token 2018-10-25 05:50:52 -05:00
Iuri Matias 4b00145e4b
Merge pull request #160 from status-im/feature/file-tree-icons 
Add icons to file tree
 2018-10-25 06:13:25 -04:00
Iuri Matias 21fd3292b8
Merge pull request #161 from status-im/chores/warning 
Fix warnings
 2018-10-25 06:11:00 -04:00
Iuri Matias 767b81da63
Merge pull request #162 from status-im/feature/add-contracts-overview-to-deployment 
Add function to contract deployment
 2018-10-25 06:10:44 -04:00
Anthony Laibe df86bae377 Remove footer 2018-10-25 10:43:26 +01:00
Anthony Laibe 7e1a6848ae Add function to contract deployment 2018-10-25 09:43:50 +01:00
Anthony Laibe 48715efec8 Fix warnings 2018-10-25 08:23:09 +01:00
Anthony Laibe 8ae6c6c154 Add icons to file tree 2018-10-25 08:06:37 +01:00
Iuri Matias 2821c3deb1 improve sidebars width 2018-10-24 17:20:36 -04:00
Iuri Matias 886b78f497
Merge pull request #158 from status-im/feature/move-contracts-page-to-explorer 
Move contracts to explorer
 2018-10-24 17:13:37 -04:00
Iuri Matias 90c033187d
Merge pull request #156 from status-im/features/explorer-pagination 
Add pagination to explorer
 2018-10-24 17:13:16 -04:00
Jonathan Rainville 60c07072cf review comments 2018-10-24 16:41:05 -04:00
Andre Medeiros d02edf869b Move contracts to explorer 2018-10-24 16:03:46 -04:00
Jonathan Rainville d8145e80b1 fix tabs 2018-10-24 16:03:40 -04:00
Jonathan Rainville e268c5b8c8 remove hard-coded color 2018-10-24 15:23:31 -04:00
Jonathan Rainville c50390fb01 fix dark-theme layout 2018-10-24 15:20:31 -04:00
Jonathan Rainville 90fafd0158 fix linting on the explorer 2018-10-24 15:09:32 -04:00
Jonathan Rainville 3d3ce559e9 add pagination to transactions too 2018-10-24 14:51:09 -04:00
Jonathan Rainville ab3fa97592 change page when clicking on it for blocks 2018-10-24 14:51:09 -04:00
Jonathan Rainville 8bdc8d41d4 start pagination at the end 2018-10-24 14:51:09 -04:00
Jonathan Rainville a1b18b74f8 conflict in css 2018-10-24 14:50:07 -04:00
Jonathan Rainville 6c92e7b24d display correct pagination whatever the page 2018-10-24 14:48:48 -04:00
Jonathan Rainville 09e21f3386 conflict in layout 2018-10-24 14:48:48 -04:00
Jonathan Rainville 78e9d3257d conflict in explorer 2018-10-24 14:48:48 -04:00
André Medeiros 5fd69b60fa
Merge branch 'develop_51' into restyle-code-editor-top-bar 2018-10-24 14:14:59 -04:00
Iuri Matias 7175bc506c
Merge pull request #153 from status-im/restyle-explorer 
Restyle explorer
 2018-10-24 14:13:11 -04:00
Iuri Matias 8e6272d75f fix merge conflict 2018-10-24 14:11:24 -04:00
Anthony Laibe f0eb03bf05 Add editor tabs 2018-10-24 14:02:31 -04:00
Andre Medeiros 690788899e Refactor the toggle to show it on the file tree 2018-10-24 13:57:57 -04:00
Andre Medeiros 69482bda42 Refactor the right navigation 2018-10-24 13:37:40 -04:00
Iuri Matias 21d1e1e423
Merge pull request #151 from status-im/chores/fix-class-and-remove-dup 
Remove usage of class and duplicate component
 2018-10-24 13:20:16 -04:00
Iuri Matias 5efda2c428 move debugger to sidebar; fix config issue 2018-10-24 13:10:31 -04:00
Jonathan Rainville 991066a1f5 use bootstrap border utility 2018-10-24 11:54:21 -04:00
Jonathan Rainville e456a76d19 better position columns 2018-10-24 11:01:03 -04:00
Jonathan Rainville 54ee9417db remove unused references 2018-10-24 10:56:36 -04:00
Jonathan Rainville ee3d23567e remove useless align class 2018-10-24 10:54:25 -04:00
Jonathan Rainville 28a1303adf conflict in explorer layout 2018-10-24 10:52:53 -04:00
Jonathan Rainville 3a1042d7a9 conflict in blocks and accounts 2018-10-24 10:46:58 -04:00
Jonathan Rainville bc0a89fd6d conflict in transactions 2018-10-24 10:45:06 -04:00
Jonathan Rainville 2ed2f9388b conflict in blocks 2018-10-24 10:42:06 -04:00
Anthony Laibe 31ea6cbbb1 Remove usage of class and duplicate component 2018-10-24 09:18:42 +01:00