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

Supporter panels and partial theme handling #154

Merged
merged 66 commits into from Aug 31, 2018
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
7e5a5e7
Adding Supporter menu item (GH-1253)
zarembsky Jul 17, 2018
5a9307b
Implementing conditional enabling/disabling of Supporter menu item.
zarembsky Jul 17, 2018
e051b0d
Header badge implemented
zarembsky Jul 18, 2018
fc686bb
Adding Subscription components.
zarembsky Jul 18, 2018
e12966d
Adding react files to support Subscription view in the panel.
zarembsky Jul 18, 2018
4a8bab4
Adding Golden Badge panel.
zarembsky Jul 19, 2018
aa750d0
Moving inline styles for subscriber panel to scss.
zarembsky Jul 19, 2018
f1fb5a4
Merge branch 'develop' into feature/supporter
zarembsky Jul 19, 2018
9e556a8
Merge discrepancies
zarembsky Jul 19, 2018
63878dd
Working on Themes
zarembsky Jul 20, 2018
a5c94f5
Styling
zarembsky Jul 20, 2018
bff0710
Merge branch 'develop' into feature/supporter
zarembsky Jul 20, 2018
c837bdc
Good state #1.
zarembsky Jul 20, 2018
9193671
Adding fields to Subscription info
zarembsky Jul 24, 2018
fba7cb7
Merge branch 'develop' into feature/supporter
zarembsky Jul 24, 2018
3b5b2a4
Continue styling.
zarembsky Jul 25, 2018
8497b93
Adding Subscribe panel.
zarembsky Jul 25, 2018
d793e65
Merge branch 'develop' into feature/supporter
zarembsky Jul 25, 2018
19e867a
Adding support for subscription data in the background.
zarembsky Jul 25, 2018
6f1e508
Merge branch 'develop' into feature/supporter
zarembsky Jul 25, 2018
6cdbead
Connecting background
zarembsky Jul 26, 2018
c3438bc
Implementing supporter connection.
zarembsky Jul 26, 2018
f2632df
Code cleanup
zarembsky Jul 30, 2018
d8c2066
Working on Midnight theme
zarembsky Jul 31, 2018
f4a7be0
Working on Midnight theme.
zarembsky Jul 31, 2018
e280db5
Adding persisting of selected theme.
zarembsky Aug 1, 2018
3b338f8
Persisting selected theme.
zarembsky Aug 1, 2018
bfa6e43
Style adjustments.
zarembsky Aug 6, 2018
77a79d7
Lint and simplification.
zarembsky Aug 7, 2018
5f5bcb1
Merge branch 'develop' into feature/supporter
zarembsky Aug 7, 2018
2c65044
Merge branch 'develop' into feature/supporter
zarembsky Aug 13, 2018
7398858
Adjustments according to changed requirements
zarembsky Aug 13, 2018
c35fe55
Merge branch 'develop' into feature/supporter
zarembsky Aug 13, 2018
38f699e
More or less stable.
zarembsky Aug 14, 2018
eab146a
Multiple fixes.
zarembsky Aug 15, 2018
1e3405c
Adding tracker stats
zarembsky Aug 15, 2018
28b8b02
Fix for a bug.
zarembsky Aug 15, 2018
b8d7602
Commiting lint changes
zarembsky Aug 15, 2018
d4313d6
Removing inlined svg. Replacing supporter to subscriber.
zarembsky Aug 16, 2018
4f3e735
Adding svg files for menu item and badge
zarembsky Aug 16, 2018
93eb1e9
Adding react-svg package.
zarembsky Aug 16, 2018
d4f33a5
Adding manage-subscription.svg
zarembsky Aug 16, 2018
2b37dfd
Adding subscribe-badge.svg
zarembsky Aug 16, 2018
356344c
Merge branch 'develop' into feature/supporter
zarembsky Aug 16, 2018
85c18bf
Merge branch 'develop' into feature/supporter
jsignanini Aug 22, 2018
ec62793
Merge branch 'develop' into feature/supporter
jsignanini Aug 22, 2018
9de5889
Removing context menu from menu item
zarembsky Aug 22, 2018
78aca6f
Improving UI.
zarembsky Aug 22, 2018
e3ab906
Lint fixes.
zarembsky Aug 22, 2018
9807cc8
Merge branch 'develop' into feature/supporter
jsignanini Aug 24, 2018
9c9f99f
Adding $2
zarembsky Aug 24, 2018
b85cf3e
Merge branch 'feature/supporter' of https://github.com/ghostery/ghost…
zarembsky Aug 24, 2018
38f4402
Changing $gold color
zarembsky Aug 24, 2018
eb16f19
Changing highlight color
zarembsky Aug 24, 2018
9cc45be
Requested changes.
zarembsky Aug 27, 2018
ecbd039
Additional requested changes
zarembsky Aug 27, 2018
97d530c
Merge branch 'develop' into feature/supporter
jsignanini Aug 28, 2018
1f1f911
Merge branch 'develop' into feature/supporter
jsignanini Aug 30, 2018
b941ae6
Minor fixes.
jsignanini Aug 30, 2018
98227db
Improve setTheme remove logic.
jsignanini Aug 30, 2018
0405e35
Fixes for theme.
zarembsky Aug 30, 2018
3100863
Implement NavLink to ensure the correct route is marked as active.
jsignanini Aug 31, 2018
8bb7958
Replace Link with NavLink.
jsignanini Aug 31, 2018
a244867
Minor fixes.
jsignanini Aug 31, 2018
c3c8b62
More minor fixes.
jsignanini Aug 31, 2018
e352834
Merge branch 'develop' into feature/supporter
jsignanini Aug 31, 2018
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Adding fields to Subscription info
  • Loading branch information
zarembsky committed Jul 24, 2018
commit 91936717ea003ddc3a281bd7e91a682ad966e179
@@ -1727,5 +1727,14 @@
},
"subscription_midnight_theme": {
"message": "Midnight Theme"
},
"subscription_account_status": {
"message": "Status"
},
"subscription_account_active": {
"message": "Active"
},
"subscription_account_canceled": {
"message": "Canceled on"
}
}
@@ -25,12 +25,18 @@ const IS_CLIQZ = (globals.BROWSER_INFO.name === 'cliqz');
* @memberOf SubscriptionComponents
*/
const SubscriptionInfo = (props) => {
const { subscriptionData } = props;
//const { subscriptionData } = props;
const subscriptionData = {};
subscriptionData.canceled = "August 5, 2018";
return (
<div className="content-subscription s-tabs-panel">
<div className="row">
<div className="columns column-subscription">
<h1>{ t('subscription_info_title') }</h1>
<h1>{ t('subscription_info_title') }</h1>
<div>
<span>{`${t('subscription_account_status')}: `}</span>
<span>{subscriptionData.canceled ? `${t ('subscription_account_canceled')} ${subscriptionData.canceled}` : t('subscription_account_active') }</span>
</div>
</div>
</div>
</div>
@@ -12,8 +12,6 @@
"version_name": "8.2.1",
"default_locale": "en",
"description": "__MSG_short_description__",
"debug": true,
"log": true,
"icons": {
"16": "app/images/icon16.png",
"48": "app/images/icon48.png",
ProTip! Use n and p to navigate between commits in a pull request.