Skip to content
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

GH-2210: Onboarding - Step 4 - Choose Plan #640

Merged
merged 32 commits into from Dec 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
81e9177
Create ghostery-search promo in plan view
benstrumeyer Nov 24, 2020
0a36f46
Add scroll arrow and cards
benstrumeyer Nov 24, 2020
6e38e7c
Add value prop list to cards
benstrumeyer Nov 25, 2020
890315d
Add radio button and hover effects to cards
benstrumeyer Nov 30, 2020
c475484
Add click handler to full card, not only radio button
benstrumeyer Nov 30, 2020
81bf436
Select default plan depending on current plan
benstrumeyer Nov 30, 2020
3609b8e
Add logic to display title and subtitle texts
benstrumeyer Nov 30, 2020
8a32f7b
Style radio button alt design
benstrumeyer Nov 30, 2020
cdcef84
Touch up radio button alt design
benstrumeyer Nov 30, 2020
40685f9
Make responsive
benstrumeyer Nov 30, 2020
2e299cc
Change CTA button to a button
benstrumeyer Dec 1, 2020
b452c0c
Add back backgrounds on small screens and add checkmarks for free card
benstrumeyer Dec 3, 2020
2ab5254
Add working links
benstrumeyer Dec 3, 2020
8dc513b
Refactor basic/plus/premium states
benstrumeyer Dec 5, 2020
ae09663
Make cards responsive with OR
benstrumeyer Dec 5, 2020
6154223
Add padding and change CTA button strings
benstrumeyer Dec 5, 2020
f61e456
Add hover effects to search and premium CTA buttons
benstrumeyer Dec 6, 2020
0865b2e
Conditionally show cards based on users subscriptions and refactor ar…
benstrumeyer Dec 6, 2020
dbe0507
Fix logic for showing caret
benstrumeyer Dec 6, 2020
957a436
Fix and refactor cta button links
benstrumeyer Dec 6, 2020
b56ca6e
Fix color of premium CTA button when displaying to a basic user
benstrumeyer Dec 6, 2020
cd0f937
Refactor and add comments
benstrumeyer Dec 6, 2020
11cbdbe
Remove unused css
benstrumeyer Dec 6, 2020
b1c585c
Update plus and premium checkout links to specify english
benstrumeyer Dec 6, 2020
3e37ddd
Merge branch 'ghostery-browser-intro-hub' into GH-2210-2
benstrumeyer Dec 6, 2020
9fccb04
Move RadioButton and RadioButtonGroup to shared components
benstrumeyer Dec 6, 2020
a6d647e
Rename Step4_ChoosePlanView to ChoosePlanView
benstrumeyer Dec 6, 2020
2bebdab
Use BASIC, PLUS, and PREMIUM constants from UpgradePlanViewConstants …
benstrumeyer Dec 6, 2020
e04c652
Update copywrite year
benstrumeyer Dec 6, 2020
cd70f46
Replace hex color codes with variables
benstrumeyer Dec 6, 2020
c9c5eed
Add border to unchecked radio button
benstrumeyer Dec 6, 2020
5775130
Merge branch 'ghostery-browser-intro-hub' into GH-2210-2
wlycdgr Dec 10, 2020
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Use BASIC, PLUS, and PREMIUM constants from UpgradePlanViewConstants …

…and fix search.svg path
  • Loading branch information
benstrumeyer committed Dec 6, 2020
commit 2bebdaba24b06a9da0b19695449d73313c9569f4
@@ -21,7 +21,7 @@ import WelcomeView from '../OnboardingViews/Step0_WelcomeView';
import LoginView from '../OnboardingViews/Step1_LoginView';
import BlockSettingsView from '../OnboardingViews/Step2_BlockSettingsView';
import ChooseDefaultSearchView from '../OnboardingViews/Step3_ChooseDefaultSearchView';
import ChoosePlanView from '../OnboardingViews/ChoosePlanView';
import ChoosePlanView from '../OnboardingViews/Step4_ChoosePlanView';
import SuccessView from '../OnboardingViews/Step5_SuccessView';

/**
@@ -1,5 +1,5 @@
/**
* Plan View Component
* Ghostery Browser Hub Choose Plan View Component
*
* Ghostery Browser Extension
* https://www.ghostery.com/
@@ -16,10 +16,7 @@ import ClassNames from 'classnames';
import PropTypes from 'prop-types';
import RadioButton from '../../../../shared-components/RadioButton';
import globals from '../../../../../src/classes/Globals';

const BASIC = 0;
const PLUS = 1;
const PREMIUM = 2;
import { BASIC, PLUS, PREMIUM } from '../../../../hub/Views/UpgradePlanView/UpgradePlanViewConstants';

const plusCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/plus`;
const premiumCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/premium`;
@@ -203,7 +200,7 @@ class ChoosePlanView extends React.Component {
constructor(props) {
super(props);
this.state = {
selectedPlan: -1,
selectedPlan: '',
expanded: false
};
// User object doesn't get populated immediately, let's delay the first render
ProTip! Use n and p to navigate between commits in a pull request.