Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Add support for welcome page #8097

Merged
merged 1 commit into from
May 26, 2017
Merged

Add support for welcome page #8097

merged 1 commit into from
May 26, 2017

Conversation

cezaraugusto
Copy link
Contributor

@cezaraugusto cezaraugusto commented Apr 6, 2017

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).

Auditors: @bsclifton
Closes #7821

Test Plan:

npm run test -- --grep="AboutWelcome component"

QA steps:

@cezaraugusto cezaraugusto added this to the 0.14.2 milestone Apr 6, 2017
@cezaraugusto cezaraugusto self-assigned this Apr 6, 2017
@cezaraugusto cezaraugusto requested a review from bsclifton April 6, 2017 03:45
@bsclifton bsclifton modified the milestones: 0.14.3, 0.14.2 Apr 9, 2017
@bsclifton
Copy link
Member

Moving to 0.14.3

@cezaraugusto
Copy link
Contributor Author

just as a heads-up, blocker for PR fixed by https://github.com/brave/brave-website/commit/774bf249ebc3d356ae52f2d18d6e106cd7d55cf2. Needs landing on master for this being approved.

@@ -0,0 +1,35 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed to Enzyme instead of Webdriver

@@ -0,0 +1,18 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
Copy link
Contributor Author

@cezaraugusto cezaraugusto Apr 18, 2017

Choose a reason for hiding this comment

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

future refactoring of about pages will benefit from this instead of relying on common.less file so I took advantage of this PR to add it since it's needed anyway for welcome page

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

Code changes LGTM 😄

I wasn't able to get it working locally though, because master seems to be having an issue causing a crash. I know there's still more work to be done- ping me and I'll follow up 😄

@alexwykoff alexwykoff modified the milestones: 0.15.4, 0.15.3 May 5, 2017
@cezaraugusto cezaraugusto modified the milestones: 0.15.3, 0.15.4 May 5, 2017
@cezaraugusto
Copy link
Contributor Author

moving to 0.15.4

@cezaraugusto cezaraugusto modified the milestones: 0.15.4, 0.15.3 May 8, 2017
@srirambv
Copy link
Collaborator

srirambv commented May 9, 2017

@cezaraugusto this shows double vertical scroll bar on about:welcome. Is that expected??

@cezaraugusto
Copy link
Contributor Author

thanks @srirambv, fixed. the joy of having it hidden by default :)

@bsclifton
Copy link
Member

@cezaraugusto @bradleyrichter this is ready for review, right? 😄

@cezaraugusto
Copy link
Contributor Author

@bradleyrichter just pushed website to prod so yes, ready

let AboutWelcome
require('../braveUnit')

describe('AboutWelcome component', function () {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this intentional? The test plan says npm run test -- --grep="about:welcome", which does not trigger that.

Copy link
Member

Choose a reason for hiding this comment

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

I just updated it 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks し( ・∀・)/\(・∀・) ///

Copy link
Contributor

@luixxiul luixxiul left a comment

Choose a reason for hiding this comment

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

I think it would be better if the import dialog is directly displayed when you click I'm ready button.

@luixxiul
Copy link
Contributor

screenshot 2017-05-18 11 21 19

@bradleyrichter
Copy link
Contributor

bradleyrichter commented May 18, 2017 via email

@luixxiul
Copy link
Contributor

unless you have a new idea?

how about moving import button on about:preferences#general up so that it would get displayed without scrolling? On MBP you have to scroll to find out the button.

@bsclifton
Copy link
Member

bsclifton commented May 18, 2017

We could create a deep link using the URL, like about:preferences#general?import. It would take a little work to get that to parse out and then interpreted in the React component, but it's possible. We should be able to make that URL pop up the modal

@NejcZdovc
Copy link
Contributor

NejcZdovc commented May 18, 2017

@bsclifton we need to do this anyway for ledger as well. I would suggest that we create a separate issue and do it in 0.15.400 (ledger needs it in this version).

@bsclifton
Copy link
Member

@NejcZdovc good call- can you create the issue (capturing this use case and also the one for ledger)

@bsclifton
Copy link
Member

bsclifton commented May 19, 2017

@cezaraugusto @bradleyrichter is this screen supposed to show on first launch? When I have a new session, it still just loads a new tab with the dashboard (and of course, I didn't see any code changes for this functionality)

We could always make a new issue like "load about:welcome on first launch" if we wanted to follow up this PR with the fix

@bsclifton
Copy link
Member

bsclifton commented May 19, 2017

Since there's an iframe inside the page, it's showing a scrollbar which looks kind of weird:
screen shot 2017-05-19 at 11 58 25 am

The iframe should have the scrollbar (this makes sense), but the page itself shouldn't. This is happening in part because the height is set as 100% (for a quick demo, open dev tools and set to 99%)

@bsclifton
Copy link
Member

@NejcZdovc I created the issue for the deep link functionality 😄
#8966

@cezaraugusto
Copy link
Contributor Author

ok rebased & updated

}

.welcomePage {
overflow: hidden;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

here's our hero for double scrollbars

Copy link
Contributor

@luixxiul luixxiul left a comment

Choose a reason for hiding this comment

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

Both manual and automated test pass. LGTM.

@luixxiul luixxiul merged commit 123f609 into brave:master May 26, 2017
@cezaraugusto cezaraugusto deleted the about/welcome branch July 25, 2017 07:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants