Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-1960 Intro Hub Forgot Password #507

Merged
merged 15 commits into from Apr 16, 2020
Merged

GH-1960 Intro Hub Forgot Password #507

merged 15 commits into from Apr 16, 2020
+301 −19

Conversation

@benstrumeyer
Copy link
Contributor

@benstrumeyer benstrumeyer commented Mar 5, 2020 •
edited

  • [*] Have you followed the guidelines in CONTRIBUTING.md?
  • [*] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • [*] Have you added an explanation of what your changes do?
  • [*] Does your submission pass tests?
  • [*] Did you lint your code prior to submission?
  • Add forgot password to intro hub

Ticket: https://cliqztix.atlassian.net/browse/GH-1960
@benstrumeyer
Add ForgotPassword view to hub. Move related code from panel to share…
Loading status checks…
ba5d040 
…d folder
@benstrumeyer benstrumeyer requested review from christophertino, Eden12345, jsignanini, zarembsky and ghostery/ghostery as code owners Mar 5, 2020
@benstrumeyer benstrumeyer changed the base branch from master to develop Mar 5, 2020
benstrumeyer added 2 commits Mar 5, 2020
@benstrumeyer
Remove unused scss
Loading status checks…
6474c4a
@benstrumeyer
Update and remove comments
Loading status checks…
1cbf85c
@christophertino christophertino added this to the 8.4.8 milestone Mar 9, 2020
@wlycdgr
wlycdgr reviewed Mar 13, 2020
View changes
Copy link
Member

@wlycdgr wlycdgr left a comment

Let's make a structural change here. Since ForgotPassword looks and works basically the same in the panel and in the hub, as per GI-508 spec, factor it out to shared-components and use a context prop to adjust the styling based on where the component is being displayed.
@christophertino christophertino modified the milestones: 8.4.8, 8.5.0 Mar 25, 2020
benstrumeyer added 3 commits Apr 7, 2020
@benstrumeyer
Move ForgotPassword to shared-components
c97b10c
@benstrumeyer
Hook up redux. Start merging panel and hub jsx and scss
2e1a3f7
@benstrumeyer
Reuse panel css inside hub
Loading status checks…
665c985
@christophertino
christophertino requested changes Apr 14, 2020
View changes
src/utils/utils.js Outdated Show resolved Hide resolved
@benstrumeyer
Use shared ForgotPassword component in hub and panel
Loading status checks…
b6a8814
@benstrumeyer
Move functions back to app/panel/utils
Loading status checks…
ddd9ddd
@benstrumeyer benstrumeyer requested review from christophertino and wlycdgr Apr 16, 2020
@christophertino
christophertino requested changes Apr 16, 2020
View changes
app/Account/AccountActions.js Outdated Show resolved Hide resolved
app/hub/Views/LogInView/LogInViewContainer.jsx Outdated Show resolved Hide resolved
app/panel/components/CreateAccount.jsx Outdated Show resolved Hide resolved
app/panel/components/Login.jsx Outdated Show resolved Hide resolved
app/shared-components/ForgotPassword/ForgotPassword.jsx Outdated Show resolved Hide resolved
src/utils/utils.js Outdated Show resolved Hide resolved
benstrumeyer and others added 5 commits Apr 16, 2020
@benstrumeyer
Delete functions from app/panel/utils. Remove console log
Loading status checks…
1e249b1
@benstrumeyer
Fix imports for shared utils functions
Loading status checks…
083fa31
@benstrumeyer
Minor css changes
Loading status checks…
53681db
@benstrumeyer
More minor css changes
Loading status checks…
bb862bd
@christophertino
Merge branch 'develop' into feature/intro-hub-forgot-password
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
Loading status checks…
e438ce8
@christophertino
christophertino reviewed Apr 16, 2020
View changes
app/shared-components/ForgotPassword/ForgotPassword.scss Show resolved Hide resolved
@benstrumeyer
Add document header to sass file
2beef10
@benstrumeyer
Merge branch 'feature/intro-hub-forgot-password' of github.com:ghoste…
Loading status checks…
9e2d393 
…ry/ghostery-extension into feature/intro-hub-forgot-password
@christophertino
christophertino approved these changes Apr 16, 2020
View changes
@christophertino christophertino merged commit 89e8cce into develop Apr 16, 2020
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@christophertino christophertino deleted the feature/intro-hub-forgot-password branch Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophertino christophertino

@Eden12345 Eden12345

@jsignanini jsignanini

@zarembsky zarembsky

@wlycdgr wlycdgr

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
8.5.0
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@benstrumeyer @christophertino @wlycdgr