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-2211: Onboarding - Status Bar #641

Merged
merged 10 commits into from Dec 7, 2020

Merge branch 'ghostery-browser-intro-hub' into GH-2211

  • Loading branch information
benstrumeyer committed Dec 7, 2020
commit ef904f006bf9cf5a62ef4f4c8c3d0607af4cb4d7
@@ -1734,15 +1734,48 @@
"hub_create_account_toast_error": {
"message": "That email address is already in use. Please choose another."
},
"hub_onboarding_privacy": {
"ghostery_browser_hub_onboarding_page_title": {
"message": "Ghostery Browser Hub - Welcome"
},
"ghostery_browser_hub_onboarding_header_title_login": {
"message": "Ghostery Browser Hub - Login"
},
"ghostery_browser_hub_onboarding_header_title_block_settings": {
"message": "Ghostery Browser Hub - Block Settings"
},
"ghostery_browser_hub_onboarding_header_title_search_choice": {
"message": "Ghostery Browser Hub - Search Choice"
},
"ghostery_browser_hub_onboarding_header_title_plan_choices": {
"message": "Ghostery Browser Hub - Plan Choices"
},
"ghostery_browser_hub_onboarding_privacy": {
"message": "Privacy"
},
"hub_onboarding_search": {
"ghostery_browser_hub_onboarding_search": {
"message": "Search"
},
"hub_onboarding_plan": {
"ghostery_browser_hub_onboarding_plan": {
"message": "Plan"
},
"ghostery_browser_hub_onboarding_welcome": {
"message": "Welcome to Ghostery Browser"
},
"ghostery_browser_hub_onboarding_lets_begin": {
"message": "Let's begin by choosing your privacy settings. This will be quick, we promise!"
},
"ghostery_browser_hub_onboarding_lets_do_this": {
"message": "Let's do this"
},
"ghostery_browser_hub_onboarding_yay_youre_all_set": {
"message": "Yay! You're all set."
},
"ghostery_browser_hub_onboarding_start_browsing_the_web_with": {
"message": "Start browsing the web with"
},
"ghostery_browser_hub_onboarding_lets_search": {
"message": "Let's search"
},
"enable_when_paused": {
"message": "To use this function, Resume Ghostery."
},
@@ -22,15 +22,15 @@ const steps = [
route: 'LINK_TO_STEP_1'
},
{
label: t('hub_onboarding_privacy'),
label: t('ghostery_browser_hub_onboarding_privacy'),
route: 'LINK_TO_STEP_2'
},
{
label: t('hub_onboarding_search'),
label: t('ghostery_browser_hub_onboarding_search'),
route: 'LINK_TO_STEP_3'
},
{
label: t('hub_onboarding_plan'),
label: t('ghostery_browser_hub_onboarding_plan'),
route: 'LINK_TO_STEP_4'
}
];
@@ -0,0 +1,16 @@
/**
* Point of entry index.js file for Ghostery Browser Hub Step Progress Bar
*
* Ghostery Browser Extension
* https://www.ghostery.com/
*
* Copyright 2020 Ghostery, Inc. All rights reserved.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/

import StepProgressBar from './StepProgressBar';

export default StepProgressBar;

This file was deleted.

@@ -86,7 +86,9 @@ html, body, #root {
@import '../hub/Views/LogInView/LogInView.scss';
@import '../hub/Views/CreateAccountView/CreateAccountView.scss';
@import '../hub/Views/UpgradePlanView/UpgradePlanView.scss';
@import '../hub/Views/StepProgressBar/StepProgressBar.scss';
@import '../ghostery-browser-hub/Views/OnboardingViews/StepProgressbar/StepProgressbar.scss';
@import '../ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss';
@import '../ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.scss';

// Imports from ../shared-components directory
@import '../shared-components/ExitButton/ExitButton.scss';
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.