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
+301 −19
Merged

GH-1960 Intro Hub Forgot Password #507

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ba5d040
Add ForgotPassword view to hub. Move related code from panel to share…
benstrumeyer Mar 5, 2020
6474c4a
Remove unused scss
benstrumeyer Mar 5, 2020
1cbf85c
Update and remove comments
benstrumeyer Mar 5, 2020
c97b10c
Move ForgotPassword to shared-components
benstrumeyer Apr 7, 2020
2e1a3f7
Hook up redux. Start merging panel and hub jsx and scss
benstrumeyer Apr 9, 2020
665c985
Reuse panel css inside hub
benstrumeyer Apr 13, 2020
b6a8814
Use shared ForgotPassword component in hub and panel
benstrumeyer Apr 16, 2020
ddd9ddd
Move functions back to app/panel/utils
benstrumeyer Apr 16, 2020
1e249b1
Delete functions from app/panel/utils. Remove console log
benstrumeyer Apr 16, 2020
083fa31
Fix imports for shared utils functions
benstrumeyer Apr 16, 2020
53681db
Minor css changes
benstrumeyer Apr 16, 2020
bb862bd
More minor css changes
benstrumeyer Apr 16, 2020
e438ce8
Merge branch 'develop' into feature/intro-hub-forgot-password
christophertino Apr 16, 2020
2beef10
Add document header to sass file
benstrumeyer Apr 16, 2020
9e2d393
Merge branch 'feature/intro-hub-forgot-password' of github.com:ghoste…
benstrumeyer Apr 16, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

Reuse panel css inside hub

  • Loading branch information
@benstrumeyer
benstrumeyer committed Apr 13, 2020
commit 665c985b630411ce97355f280689a7b85c935b00
1 app/Account/AccountActions.js
View file
Open in desktop
@@ -166,6 +166,7 @@ export const logout = () => dispatch => (
);

export const resetPassword = email => dispatch => (
// console.log('resetting password...');
This conversation was marked as resolved by christophertino

This comment has been minimized.

Sign in to view
@christophertino

christophertino Apr 16, 2020
Member

Remove

This comment has been minimized.

Sign in to view
@benstrumeyer

benstrumeyer Apr 16, 2020
Author Contributor

Removed!
sendMessageInPromise('account.resetPassword', { email })
.then((res) => {
const { errors } = res;
2 app/shared-components/ForgotPassword/ForgotPassword.jsx
View file
Open in desktop
@@ -60,7 +60,7 @@ class ForgotPassword extends React.Component {
.then((success) => {
this.setState({ loading: false });
if (success) {
// this.props.history.push('/login');
// this.props.history.push('/log-in');
// go back to hub sign in screen
}
});
299 app/shared-components/ForgotPassword/ForgotPassword.scss
View file
Open in desktop
@@ -51,148 +51,171 @@
}
}


.ForgotPasswordView--addPaddingTop {
padding-top: 40px;
}
.ForgotPasswordView__inputLabel {
font-size: 14px;
font-weight: 500;
line-height: 40px;
color: #4a4a4a;
&.error {
color: #e74055;
}
}
.ForgotPasswordView__asterisk {
display: none;
&.error {
display: inline;
color: #e74055;
}
}
.ForgotPasswordView__inputBox {
font-size: 14;
line-height: 24px;
color: #4a4a4a;
margin-bottom: 35px;
width: 456px;

// Foundation Overrides
border-radius: 0;
box-shadow: none;
border: 1px solid #c8c7c2;
}
.ForgotPasswordView__inputBox.error {
margin-bottom: 8px;
border-color: #e74055;
}
.ForgotPasswordView__inputBox:focus {
// Foundation Overrides
box-shadow: none;
border-color: #4a4a4a;
}
.ForgotPasswordView__inputError {
font-size: 12;
line-height: 14px;
color: #e74055;
margin-bottom: 13px;
p.warning {
margin: 0;
font-size: 12px;
line-height: 12px;
font-weight: 400;
font-style: italic;
color: #CC5F5A;
opacity: 0;
@include transition(opacity 0.2s, color 0.2s);
}
.ForgotPasswordView__link {
font-size: 14px;
line-height: 30px;
margin: 4px 0 0 40px;
}
.ForgotPasswordView__button {
min-width: 180px;
.loader {
display: none;
.panel-error {
span.asterisk {display: inline;}
p.warning {
opacity: 1;
}
&.loading {
pointer-events: none;
.loader {
display: inline-block;
height: 12px;
width: 12px;
}
.title {
display: none;
}
input {
border-color: #E0B4B4;
background-color: #FFF6F6;
}
&:focus {
outline: 0;

.loader:after {
background: #760176;
}
label {
color: #CC5F5A;
}
}
.loader {
font-size: 10px;
text-indent: -9999em;
width: 10rem;
height: 10rem;
border-radius: 50%;
background: #ffffff;
background: -moz-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
background: -webkit-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
background: -o-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
background: -ms-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
background: linear-gradient(to right, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
position: relative;
-webkit-animation: load3 1.4s infinite linear;
animation: load3 1.4s infinite linear;
-webkit-transform: translateZ(0);
-ms-transform: translateZ(0);
transform: translateZ(0);
}
.loader:before {
width: 50%;
height: 50%;
background: #ffffff;
border-radius: 100% 0 0 0;
position: absolute;
top: 0;
left: 0;
content: '';
}
.loader:after {
background: #930194;
width: 75%;
height: 75%;
border-radius: 50%;
content: '';
margin: auto;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}

@-webkit-keyframes load3 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes load3 {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@media only screen and (max-width: 740px) {
.ForgotPasswordView__header {
flex-direction: column;
}
}
// .ForgotPasswordView--addPaddingTop {
// padding-top: 40px;
// }
// .ForgotPasswordView__inputLabel {
// font-size: 14px;
// font-weight: 500;
// line-height: 40px;
// color: #4a4a4a;
// &.error {
// color: #e74055;
// }
// }
// .ForgotPasswordView__asterisk {
// display: none;
// &.error {
// display: inline;
// color: #e74055;
// }
// }
// .ForgotPasswordView__inputBox {
// font-size: 14;
// line-height: 24px;
// color: #4a4a4a;
// margin-bottom: 35px;
// width: 456px;

// // Foundation Overrides
// border-radius: 0;
// box-shadow: none;
// border: 1px solid #c8c7c2;
// }
// .ForgotPasswordView__inputBox.error {
// margin-bottom: 8px;
// border-color: #e74055;
// }
// .ForgotPasswordView__inputBox:focus {
// // Foundation Overrides
// box-shadow: none;
// border-color: #4a4a4a;
// }
// .ForgotPasswordView__inputError {
// font-size: 12;
// line-height: 14px;
// color: #e74055;
// margin-bottom: 13px;
// font-style: italic;
// }
// .ForgotPasswordView__link {
// font-size: 14px;
// line-height: 30px;
// margin: 4px 0 0 40px;
// }
// .ForgotPasswordView__button {
// min-width: 180px;
// .loader {
// display: none;
// }
// &.loading {
// pointer-events: none;
// .loader {
// display: inline-block;
// height: 12px;
// width: 12px;
// }
// .title {
// display: none;
// }
// }
// &:focus {
// outline: 0;

// .loader:after {
// background: #760176;
// }
// }
// }
// .loader {
// font-size: 10px;
// text-indent: -9999em;
// width: 10rem;
// height: 10rem;
// border-radius: 50%;
// background: #ffffff;
// background: -moz-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
// background: -webkit-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
// background: -o-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
// background: -ms-linear-gradient(left, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
// background: linear-gradient(to right, #ffffff 10%, rgba(255, 255, 255, 0) 42%);
// position: relative;
// -webkit-animation: load3 1.4s infinite linear;
// animation: load3 1.4s infinite linear;
// -webkit-transform: translateZ(0);
// -ms-transform: translateZ(0);
// transform: translateZ(0);
// }
// .loader:before {
// width: 50%;
// height: 50%;
// background: #ffffff;
// border-radius: 100% 0 0 0;
// position: absolute;
// top: 0;
// left: 0;
// content: '';
// }
// .loader:after {
// background: #930194;
// width: 75%;
// height: 75%;
// border-radius: 50%;
// content: '';
// margin: auto;
// position: absolute;
// top: 0;
// left: 0;
// bottom: 0;
// right: 0;
// }

// @-webkit-keyframes load3 {
// 0% {
// -webkit-transform: rotate(0deg);
// transform: rotate(0deg);
// }
// 100% {
// -webkit-transform: rotate(360deg);
// transform: rotate(360deg);
// }
// }
// @keyframes load3 {
// 0% {
// -webkit-transform: rotate(0deg);
// transform: rotate(0deg);
// }
// 100% {
// -webkit-transform: rotate(360deg);
// transform: rotate(360deg);
// }
// }
// @media only screen and (max-width: 740px) {
// .ForgotPasswordView__header {
// flex-direction: column;
// }
// }
2 app/shared-components/index.js
View file
Open in desktop
@@ -22,7 +22,7 @@ import SteppedNavigation from './SteppedNavigation';
import ToastMessage from './ToastMessage';
import ToggleCheckbox from './ToggleCheckbox';
import ToggleSwitch from './ToggleSwitch';
import ForgotPassword from './ForgotPassword';
import ForgotPassword from './ForgotPassword/ForgotPasswordContainer';

export {
ExitButton,
ProTip! Use n and p to navigate between commits in a pull request.