Initial import of new UI (compiled JS code) #2220

tomusdrw · 2016-09-21T10:35:47Z

Signer on http://127.0.0.1:8180 replaced with new UI.
New Dapps are also accessible, served from http://localhost:8080 though.

Old Dapps still included, but should be removed in near future.

parity-dapps-glue is just a copy of parity-dapps in parity-ui repository. When we get rid of old dapps it will be renamed to parity-dapps.

Related: #2155

coveralls · 2016-09-21T11:15:04Z

Coverage increased (+0.01%) to 85.29% when pulling e26ae7f on signer-dapps into 93f82a1 on master.

jacogr · 2016-09-21T12:38:01Z

I think it does show us the work still outstanding -

compilation of the code and making it accessible to the build process (at this point as soon as integrated, it will fall behind unless manually updated)
actual dapps to be served from a different location when integrated (so they don't go via the ws interface)

I'm wondering if this should be merged or rather just kept open until we can address the above 2 points.

coveralls · 2016-09-21T13:11:06Z

Coverage increased (+0.01%) to 85.288% when pulling 542c0dd on signer-dapps into 93f82a1 on master.

tomusdrw · 2016-09-21T13:43:19Z

Yes - that's the tough one. We can utilize existing "compile JS as part of rust build" on CI + "use precompiled js" by default. Where does the pre-compiled JS comes from - that's a separate issue.
That one is addressed partially. Dapps are served from 8080, although the address is hardcoded currently.

My proposal is:

8080 (dapps) - serving built-in dapps
8081 (dapps+1) - serving "unsafe" dapps
8180/8546 - WS interface (currently only Signer, in future Pub/Sub + Signer)

jacogr · 2016-09-21T13:56:00Z

The build process is easy to integrate, we already have thing done part-way from a GitLab perspective with running lint & test, next step is just running npm run build and pushing the results.

It is just which location to push this to from CI that is the issue. My suggestion - having a js-compiled branch (in the same vein as gh-pages) or even a separate ethcore/js-compiled repo that we can push to from CI. Whichever makes most sense and is easiest/best from a Rust integration perspective. (Obviously from a JS perspective we want to publish to npm as well in this build script, but that is a separate issue, not affecting the binary builds which is primary concern at this point.)

I would like to hear @gavofyork 's views on this as well, if we can reach agreement on destination the implementation of this "build & make available" will be quick.

I have no issues with your locations suggestions (we have discussed it).

gavofyork · 2016-09-22T10:50:16Z

yeah - happy with @jacogr 's suggestion - pushing precompiled stuff to a separate repo, CI process to build it. will need to work with @General-Beck on this, i guess.

General-Beck · 2016-09-23T14:39:54Z

Yes, we're working on it

jacogr · 2016-10-12T13:24:44Z

We do the have js-precompiled repo operational now. It builds and pushes from GitLab to the branch being built, i.e. js branch will push to js, master to master, beta to beta, etc. (Currently since we treat js as the master for js changes, it is the most up-to-date)

So we can adapt to instead of including the built files in here, pull it from there.

rphmeier · 2016-10-12T13:35:35Z

signer/src/ws_server/session.rs

-		None
+	#[derive(Default)]
+	pub struct Handler {
+	}


pub struct Handler;

Conflicts: dapps/Cargo.toml dapps/src/lib.rs

coveralls · 2016-10-13T14:15:10Z

Coverage increased (+0.03%) to 86.39% when pulling 8ff80b5 on signer-dapps into 4bcc9e3 on master.

jacogr · 2016-10-13T19:40:42Z

Closes https://github.com/ethcore/parity/issues/2155 (Related UI source-code PRs are https://github.com/ethcore/parity/issues/2607 & https://github.com/ethcore/parity/pull/2612.)

Tested this branch locally, it new ui loads at http://127.0.0.1:8180, token images show up as expected (content addressing work), new dapps load as expected, sending works.

In short: functionally happy with the PR, it does what it says on the tin.

(Not adding A7-looksgood, since I'm not 100% qualified for a code review, but from my side, consider it added)

coveralls · 2016-10-13T19:47:28Z

Coverage increased (+0.06%) to 86.425% when pulling 96ddf18 on signer-dapps into 4bcc9e3 on master.

coveralls · 2016-10-14T08:55:03Z

Coverage increased (+0.1%) to 86.513% when pulling cf1a746 on signer-dapps into 4bcc9e3 on master.

@tomusdrw

@tomusdrw please note the alterations - no mixing tabs and spaces in the indentation portion and always just one tab per indent.

GitCop · 2016-10-15T13:48:57Z

There were the following issues with your Pull Request

Commit: 7c23bb2
- Your commit message body contains a line that is longer than 72 characters

Guidelines are available at https://github.com/ethcore/parity

This message was auto-generated by https://gitcop.com

gavofyork · 2016-10-15T13:49:23Z

dapps/js-glue/src/lib.rs.in

+mod tests {
+	#[test]
+	fn it_works() {
+	}


meant to be empty?

Conflicts: Cargo.lock ethcore/res/ethereum/tests signer/Cargo.toml signer/src/lib.rs signer/src/ws_server/session.rs

GitCop · 2016-10-17T08:08:32Z

There were the following issues with your Pull Request

Commit: 7c23bb2
- Your commit message body contains a line that is longer than 72 characters

Guidelines are available at https://github.com/ethcore/parity

This message was auto-generated by https://gitcop.com

coveralls · 2016-10-17T08:48:15Z

Coverage increased (+0.05%) to 86.7% when pulling d3998a1 on signer-dapps into b5c65e3 on master.

tomusdrw added 3 commits September 20, 2016 15:31

Normalizing dapps format for signer.

f1f8876

Adding new ui

a0b2f7e

Adding New UI to dapps

e26ae7f

tomusdrw added the A0-pleasereview 🤓 Pull request needs code review. label Sep 21, 2016

Adding parity styles for signer errors

542c0dd

tomusdrw added M4-core ⛓ Core client code / Rust. M-ui labels Sep 21, 2016

rphmeier reviewed Oct 12, 2016

View reviewed changes

signer/src/ws_server/session.rs

None

#[derive(Default)]

pub struct Handler {

}

Copy link

Contributor

rphmeier Oct 12, 2016 •

edited

Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pub struct Handler;

Tomasz Drwięga added 3 commits October 13, 2016 15:25

Merge branch 'master' into signer-dapps

9171831

Conflicts: dapps/Cargo.toml dapps/src/lib.rs

Adding pre-compiled JS as submodule

8ff80b5

Fixing struct declaration [ci:skip]

f99f451

This was referenced Oct 13, 2016

Initial new UI source code import #2607

Merged

Update /api/* to point to :8080/api/* (first generation interface) #2612

Merged

Bumping js

96ddf18

Adding styles

cf1a746

Tomasz Drwięga and others added 2 commits October 15, 2016 01:18

build dest

f6d279f

Correct whitespace

7c23bb2

@tomusdrw please note the alterations - no mixing tabs and spaces in the indentation portion and always just one tab per indent.

gavofyork reviewed Oct 15, 2016

View reviewed changes

dapps/js-glue/src/lib.rs.in

mod tests {

#[test]

fn it_works() {

}

Copy link

Contributor

gavofyork Oct 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meant to be empty?

gavofyork added A8-looksgood 🦄 Pull request is reviewed well. A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. A8-looksgood 🦄 Pull request is reviewed well. labels Oct 15, 2016

Merge branch 'master' into signer-dapps

d3998a1

Conflicts: Cargo.lock ethcore/res/ethereum/tests signer/Cargo.toml signer/src/lib.rs signer/src/ws_server/session.rs

gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels Oct 17, 2016

gavofyork merged commit 6c7af57 into master Oct 17, 2016

gavofyork deleted the signer-dapps branch October 17, 2016 09:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial import of new UI (compiled JS code) #2220

Initial import of new UI (compiled JS code) #2220

tomusdrw commented Sep 21, 2016 •

edited

Loading

coveralls commented Sep 21, 2016

jacogr commented Sep 21, 2016

coveralls commented Sep 21, 2016

tomusdrw commented Sep 21, 2016 •

edited

Loading

jacogr commented Sep 21, 2016

gavofyork commented Sep 22, 2016

General-Beck commented Sep 23, 2016

jacogr commented Oct 12, 2016 •

edited

Loading

rphmeier Oct 12, 2016 •

edited

Loading

coveralls commented Oct 13, 2016

jacogr commented Oct 13, 2016 •

edited

Loading

coveralls commented Oct 13, 2016

coveralls commented Oct 14, 2016

GitCop commented Oct 15, 2016

gavofyork Oct 15, 2016

GitCop commented Oct 17, 2016

coveralls commented Oct 17, 2016

Initial import of new UI (compiled JS code) #2220

Initial import of new UI (compiled JS code) #2220

Conversation

tomusdrw commented Sep 21, 2016 • edited Loading

coveralls commented Sep 21, 2016

jacogr commented Sep 21, 2016

coveralls commented Sep 21, 2016

tomusdrw commented Sep 21, 2016 • edited Loading

jacogr commented Sep 21, 2016

gavofyork commented Sep 22, 2016

General-Beck commented Sep 23, 2016

jacogr commented Oct 12, 2016 • edited Loading

rphmeier Oct 12, 2016 • edited Loading

Choose a reason for hiding this comment

coveralls commented Oct 13, 2016

jacogr commented Oct 13, 2016 • edited Loading

coveralls commented Oct 13, 2016

coveralls commented Oct 14, 2016

GitCop commented Oct 15, 2016

gavofyork Oct 15, 2016

Choose a reason for hiding this comment

GitCop commented Oct 17, 2016

coveralls commented Oct 17, 2016

tomusdrw commented Sep 21, 2016 •

edited

Loading

tomusdrw commented Sep 21, 2016 •

edited

Loading

jacogr commented Oct 12, 2016 •

edited

Loading

rphmeier Oct 12, 2016 •

edited

Loading

jacogr commented Oct 13, 2016 •

edited

Loading