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

Adding subscription status data #181

Merged
merged 11 commits into from Sep 10, 2018
Merged

Adding subscription status data #181

merged 11 commits into from Sep 10, 2018

Conversation

@zarembsky
Copy link
Contributor

@zarembsky zarembsky commented Sep 2, 2018

  • [x ] Have you followed the guidelines in CONTRIBUTING.md?
  • [ x] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • [ x] Have you added an explanation of what your changes do?
  • [x ] Does your submission pass tests?
  • [ x] Did you lint your code prior to submission?
@zarembsky
Adding support for Subscriber information
Loading status checks…
5945cc8
@zarembsky zarembsky requested a review from ghostery/ghostery as a code owner Sep 2, 2018
@zarembsky zarembsky changed the title Adding live subscription status data Adding subscription status data Sep 2, 2018
zarembsky and others added 4 commits Sep 3, 2018
@zarembsky
Change in display logic
Loading status checks…
e73abd4
@jsignanini
Merge branch 'develop' into feature/accountStatus
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…
1d554bd
@zarembsky
A round of improvements
fcb135a
@zarembsky
Merge branch 'feature/accountStatus' of https://github.com/ghostery/g…
Loading status checks…
47aa3af 
…hostery-extension into feature/accountStatus
@jsignanini
jsignanini requested changes Sep 5, 2018
View changes
app/panel/components/Subscription/SubscriptionMenu.jsx Outdated
<li className="s-tabs-title">
<NavLink to="/subscription/trackerstats">
<span>{ t('subscription_tracker_stats') }</span>
</NavLink>
</li>
*/}

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Sep 5, 2018
Member

@zarembsky please remove.
app/panel/components/Subscribe.jsx Outdated
@@ -11,7 +11,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0
*/
import React from 'react';
import { Link } from 'react-router-dom';
import { openSupporterPage } from '../utils/msg';

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Sep 5, 2018
Member

@zarembsky let's rename openSupporterPage to openSubscriptionPage everywhere
app/panel/components/Subscription.jsx Outdated
@@ -74,7 +99,7 @@ class Subscription extends React.Component {
<Route path="/subscription/info" render={this.SubscriptionInfoComponent} />
<Route path="/subscription/themes" render={this.SubscriptionThemesComponent} />
<Route path="/subscription/prioritysupport" render={this.PrioritySupportComponent} />
<Route path="/subscription/trackerstats" render={this.TrackerStatsComponent} />
{/* <Route path="/subscription/trackerstats" render={this.TrackerStatsComponent} /> */}

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Sep 5, 2018
Member

@zarembsky let's remove this.
@jsignanini
Copy link
Member

@jsignanini jsignanini commented Sep 5, 2018

@zarembsky and let's get rid of the localization of links (the web server can take care of that).
@zarembsky
Requested changes
Loading status checks…
4467a90
@christophertino
christophertino requested changes Sep 10, 2018
View changes
src/background.js Outdated
if (conf.account && conf.account.user) {
if (conf.account.user.subscriptionsSupporter) {
tabUrl = `https://account.${globals.GHOSTERY_DOMAIN}.com/${langToken}/subscription`;
tabUrl = `https://account.${globals.GHOSTERY_DOMAIN}.com/en/subscription`;

This comment has been minimized.

Sign in to view
@christophertino

christophertino Sep 10, 2018
Member

@zarembsky you can remove the /en from these links
zarembsky and others added 3 commits Sep 10, 2018
@zarembsky
Requested changes
Loading status checks…
fe8cc1e
@zarembsky
Fix for Account page
Loading status checks…
fd5acba
@christophertino
Merge branch 'develop' into feature/accountStatus
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…
81452f3
@christophertino
christophertino approved these changes Sep 10, 2018
View changes
@jsignanini
jsignanini requested changes Sep 10, 2018
View changes
app/panel/components/Subscription.jsx
};
}
return { loading: true };
}

This comment has been minimized.

Sign in to view
@jsignanini

jsignanini Sep 10, 2018
Member

@zarembsky we don't need to localize the currency since we're only taking USD for the time being, please remove it.

This comment has been minimized.

Sign in to view
@zarembsky

zarembsky Sep 10, 2018
Author Contributor

Implemented
zarembsky added 2 commits Sep 10, 2018
@zarembsky
Requested changes
Loading status checks…
a89bf44
@zarembsky
Requested changes
Loading status checks…
2df681d
@jsignanini
jsignanini approved these changes Sep 10, 2018
View changes
@jsignanini jsignanini merged commit 58a019b into develop Sep 10, 2018
@jsignanini jsignanini deleted the feature/accountStatus branch Sep 10, 2018
@jsignanini jsignanini restored the feature/accountStatus branch Sep 10, 2018
@jsignanini jsignanini deleted the feature/accountStatus branch Sep 10, 2018
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Adding subscription status data (#181)
64f5c25
jsignanini added a commit that referenced this pull request Nov 20, 2018
@zarembsky @jsignanini
Adding subscription status data (#181)
90bc476
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsignanini jsignanini

@christophertino christophertino

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

Successfully merging this pull request may close these issues.

None yet

3 participants
@zarembsky @jsignanini @christophertino