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 all commits
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

@@ -579,6 +579,9 @@
"panel_about_panel_header": {
"message": "About Ghostery Browser Extension"
},
"panel_subscriber_panel_header": {
"message": "Ghostery Supporter"
},
"panel_about_version_header": {
"message": "Ghostery for $BROWSER$ version $VERSION$",
"placeholders": {
@@ -619,6 +622,9 @@
"panel_menu_about": {
"message": "About"
},
"panel_menu_ghostery_subscriber": {
"message": "Ghostery Supporter"
},
"panel_menu_signin": {
"message": "Sign in"
},
@@ -1911,5 +1917,78 @@
},
"popup_apply_code_button": {
"message": "Apply code"
},
"subscription_info": {
"message": "Subscription Info"
},
"subscription_themes": {
"message": "Themes"
},
"subscription_priority_support": {
"message": "Priority Support"
},
"subscription_info_title": {
"message": "Subscription Info"
},
"subscription_themes_title": {
"message": "Themes"
},
"subscription_priority_support_title": {
"message": "Priority Support"
},
"subscription_priority_support": {
"message": "Priority Support"
},
"subscribe_pitch": {
"message": "We work hard to keep Ghostery's privacy protection free for all our users. If you like what we do, you can support us with a small subscription of $$2 per month."
},
"subscribe_pitch_learn_more": {
"message": "Learn more"
},
"subscribe_pitch_button_label": {
"message": "BECOME A GHOSTERY SUPPORTER"
},
"subscribe_pitch_sign_here": {
"message": "Already a Ghostery Supporter? Sign in here"
},
"subscription_midnight_theme": {
"message": "Midnight Theme"
},
"subscription_status": {
"message": "Status"
},
"subscription_active": {
"message": "Active"
},
"subscription_inactive": {
"message": "Inactive"
},
"subscription_active_tooltip": {
"message": "Your Ghostery Supporter subscription is now active"
},
"subscription_inactive_tooltip": {
"message": "Your Ghostery Supporter subscription is now inactive"
},

"subscription_manage": {
"message": "Manage My Subscription"
},
"subscription_themes_tooltip": {
"message": "Change the color scheme of Ghostery!"
},
"subscription_tracker_stats": {
"message": "Historical Tracker Stats"
},
"subscription_tracker_stats_title" : {
"message": "Historical Tracker Stats"
},
"subscription_charge_date" : {
"message": "Next Charge Date"
},
"subscription_expired": {
"message": "Account expired"
},
"subscription_auto_renewal": {
"message": "Auto Renewal"
}
}
@@ -0,0 +1,9 @@
<svg width="8px" height="13px" viewBox="0 0 8 13" xmlns="http://www.w3.org/2000/svg">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Priority-Support" transform="translate(-9.000000, -13.000000)" fill="#FFFFFF">
<g id="Group" transform="translate(2.000000, -19.000000)">
<path d="M9.97923761,38.216699 L14.8755284,33.3205611 C14.9585604,33.2375291 15,33.1419581 15,33.0340012 C15,32.9260443 14.9585604,32.8304733 14.8755284,32.7475942 L14.2525587,32.1246245 C14.1695267,32.0415925 14.0739557,32 13.9661517,32 C13.8581948,32 13.7626238,32.0415925 13.6795918,32.1246245 L7.87392431,37.9301391 C7.79089227,38.0131711 7.74945271,38.1087421 7.74945271,38.216699 C7.74945271,38.3246559 7.79089227,38.4202269 7.87392431,38.5032589 L13.6794389,44.3087735 C13.7624709,44.3919584 13.8580419,44.433398 13.9659988,44.433398 C14.0738028,44.433398 14.1693738,44.3919584 14.2524058,44.3087735 L14.8753755,43.6861097 C14.9584075,43.6030776 14.9998471,43.5075067 14.9998471,43.3993968 C14.9998471,43.2915928 14.9584075,43.1960218 14.8753755,43.1129898 L9.97923761,38.216699 L9.97923761,38.216699 Z" />
</g>
</g>
</g>
</svg>
@@ -0,0 +1,8 @@
<svg width="75" height="22" viewBox="0 0 75 22" xmlns="http://www.w3.org/2000/svg">
<g fill="none" fill-rule="evenodd">
<path d="M16.415 9.158c0 3.493-2.94 6.325-6.566 6.325-3.627 0-6.567-2.832-6.567-6.325 0-3.494 2.94-6.326 6.566-6.326 3.625 0 6.565 2.832 6.565 6.326" fill="#FFF" />
<path d="M18.65 17.774c-.91-1.995-1.067-3.686-1.09-4.35V7.96C17.56 3.783 13.992.4 9.594.4 5.195.4 1.63 3.783 1.63 7.96v5.543c-.034.715-.213 2.354-1.087 4.27-1.176 2.578-.203 2.27.668 2.06.873-.212 2.818-1.04 3.426-.02.608 1.018 1.115 1.903 2.533 1.326s2.086-.77 2.29-.77h.274c.202 0 .87.193 2.29.77 1.418.576 1.925-.31 2.533-1.328.607-1.02 2.553-.19 3.424.02.873.212 1.845.52.67-2.058" fill="#FFF" />
<path d="M7.136 4.52c.858 0 1.554 1.046 1.554 2.335 0 1.288-.696 2.333-1.554 2.333-.857 0-1.553-1.045-1.553-2.333 0-1.29.696-2.334 1.553-2.334M9.595 13.847c-1.89 0-3.482-1.765-3.96-3.73.925 1.208 2.354 1.985 3.96 1.985 1.605 0 3.035-.777 3.96-1.985-.48 1.965-2.07 3.73-3.96 3.73M12.053 9.188c-.858 0-1.553-1.045-1.553-2.333 0-1.29.695-2.334 1.553-2.334.86 0 1.553 1.046 1.553 2.335 0 1.288-.694 2.333-1.553 2.333" fill="#00AEF0" />
<path d="M27.967 9.838h2.446v3.54c0 1.787-.89 2.808-2.605 2.808-1.716 0-2.605-1.02-2.605-2.807V7.572c0-1.787.89-2.807 2.605-2.807 1.715 0 2.605 1.02 2.605 2.807v1.085H28.76V7.46c0-.796-.348-1.1-.904-1.1-.557 0-.906.304-.906 1.1v6.03c0 .798.35 1.085.906 1.085s.905-.287.905-1.085v-2.057h-.793V9.838M33.462 15.938h-1.81V4.766h1.81v4.788h2.056V4.766h1.842v11.172h-1.842V11.15h-2.056v4.788M38.6 7.573c0-1.786.965-2.807 2.73-2.807 1.765 0 2.73 1.02 2.73 2.807v5.806c0 1.785-.965 2.806-2.73 2.806-1.765 0-2.73-1.02-2.73-2.807V7.572zm1.798 5.917c0 .798.36 1.1.932 1.1.572 0 .93-.302.93-1.1V7.46c0-.796-.358-1.1-.93-1.1-.572 0-.932.304-.932 1.1v6.03zM47.424 4.766c1.7 0 2.574 1.02 2.574 2.808v.35h-1.652v-.462c0-.798-.318-1.1-.875-1.1-.554 0-.872.302-.872 1.1 0 2.296 3.415 2.727 3.415 5.917 0 1.785-.89 2.806-2.605 2.806-1.715 0-2.605-1.02-2.605-2.807v-.687h1.652v.797c0 .798.35 1.085.906 1.085s.906-.287.906-1.085c0-2.297-3.415-2.727-3.415-5.916 0-1.787.874-2.808 2.574-2.808M50.51 4.766h5.458v1.597h-1.846v9.575h-1.766V6.363H50.51V4.766M58.78 9.474h2.497v1.596H58.78v3.27h3.142v1.598H56.96V4.766h4.962v1.596H58.78v3.112M66.585 15.938c-.095-.288-.16-.464-.16-1.373V12.81c0-1.038-.35-1.42-1.15-1.42h-.605v4.548h-1.755V4.766h2.65c1.82 0 2.6.846 2.6 2.57v.878c0 1.148-.366 1.9-1.148 2.265.877.366 1.165 1.212 1.165 2.377v1.724c0 .544.016.943.19 1.358h-1.787zM64.67 6.362v3.43h.687c.654 0 1.052-.286 1.052-1.18v-1.1c0-.8-.27-1.15-.893-1.15h-.847zM70.843 12.235l-2.222-7.47h1.84l1.343 5.092 1.342-5.09h1.68L72.6 12.234v3.703h-1.76v-3.703" fill="#FFF" />
</g>
</svg>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
<title>manage my subscription icon</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Account-info" transform="translate(-272.000000, -265.000000)" fill="#2092BF" fill-rule="nonzero">
<g id="manage-my-subscription-icon" transform="translate(272.000000, 265.000000)">
<path d="M13.7261009,8.1256701 L13.1618624,8.05608247 C13.1309725,7.97214433 13.0923761,7.88659794 13.0420917,7.78874227 L13.3884954,7.36286598 C13.4807798,7.25350515 13.472367,7.0957732 13.3691651,6.99538144 L12.6707064,6.32257732 C12.616633,6.2711134 12.545156,6.24284536 12.4693761,6.24284536 C12.404,6.24284536 12.3400367,6.26474227 12.2903945,6.30346392 L11.8472752,6.63773196 C11.7451009,6.58905155 11.6560917,6.55181443 11.5697156,6.52249485 L11.4975963,5.97859794 C11.479422,5.84783505 11.3671651,5.7474433 11.2305688,5.73983505 L10.2416422,5.7397732 C10.2241743,5.73835052 10.2065138,5.73847423 10.1891743,5.74014433 L10.1810183,5.74131959 C10.0583578,5.76457732 9.96633028,5.86057732 9.95220183,5.97909278 L9.88014679,6.5225567 C9.79274312,6.55224742 9.70386239,6.58936082 9.60245872,6.63779381 L9.16049541,6.30420619 C9.10969725,6.2645567 9.04573394,6.24272165 8.9803578,6.24272165 C8.90425688,6.24272165 8.83297248,6.27098969 8.77857798,6.32282474 L8.08018349,6.99550515 C7.97730275,7.09564948 7.96914679,7.25356701 8.06033945,7.36193814 L8.40744954,7.78861856 C8.35677982,7.88709278 8.31824771,7.9728866 8.2876789,8.05595876 L7.72299083,8.12554639 C7.58022936,8.14404124 7.47375229,8.26243299 7.47497248,8.40037113 L7.47497248,9.35189691 L7.47516514,9.35672165 C7.48312844,9.48841237 7.5873578,9.59653608 7.72344037,9.61404124 L8.28774312,9.68338144 C8.31863303,9.76731959 8.3570367,9.85298969 8.40744954,9.95084536 L8.06098165,10.3765979 C7.96901835,10.4859588 7.97717431,10.6439381 8.08044037,10.7442062 L8.77883486,11.4168866 C8.83277982,11.4683505 8.90425688,11.4966186 8.98029358,11.4966186 C9.0456055,11.4966186 9.10956881,11.4747216 9.15914679,11.4360619 L9.60226606,11.1016701 C9.70450459,11.1504742 9.79344954,11.1873402 9.87995413,11.2169072 L9.95220183,11.7608041 C9.97108257,11.8969485 10.0929083,11.9997526 10.2355413,11.9997526 L11.2251743,11.9997526 L11.2303119,11.9996289 C11.3670367,11.9918969 11.4791651,11.8915052 11.4973394,11.7601856 L11.5694587,11.2167835 C11.6568624,11.1870928 11.7458073,11.1499794 11.8470826,11.1016701 L12.2890459,11.435134 C12.3399083,11.4749072 12.4038716,11.4966186 12.4693119,11.4966186 C12.5450917,11.4966186 12.6165688,11.4683505 12.6709633,11.4166392 L13.3692936,10.7438351 C13.4721743,10.6438144 13.4805229,10.4857732 13.3892661,10.3776495 L13.0419633,9.95072165 C13.0928899,9.85224742 13.1311651,9.76657732 13.1618624,9.68325773 L13.726422,9.61404124 C13.862055,9.59641237 13.9665413,9.48816495 13.9743761,9.35672165 L13.9745688,8.40098969 C13.975789,8.2625567 13.8694404,8.14416495 13.7261009,8.1256701 Z M13.3831651,9.09859794 L12.9195596,9.15296907 C12.8021651,9.16410309 12.7071835,9.24538144 12.6761009,9.35591753 C12.6289633,9.53084536 12.5592844,9.69853608 12.4644954,9.85329897 C12.403422,9.95053608 12.4122844,10.0758557 12.4861376,10.1670309 L12.7916972,10.5261031 L12.4441376,10.8611134 L12.070055,10.5660619 C12.020156,10.5283918 11.9576055,10.5078557 11.8942202,10.5078557 C11.8418807,10.5078557 11.790633,10.5217732 11.7468349,10.5472577 C11.586156,10.6386186 11.412055,10.7080825 11.2287064,10.7541031 C11.114844,10.7837938 11.0305229,10.8769485 11.0192202,10.9885979 L10.9625138,11.4434845 L10.4874771,11.4434845 L10.4309633,10.9900825 C10.4194037,10.8770103 10.3350183,10.7825567 10.2203211,10.752433 C10.0388349,10.7071546 9.86479817,10.6383711 9.70399083,10.5470722 C9.6049633,10.4891753 9.47234862,10.4963505 9.37813761,10.5669897 L9.00540367,10.8609278 L8.65765138,10.5260412 L8.96398165,10.1655464 C9.03661468,10.0759175 9.04412844,9.95059794 8.98376147,9.85435052 C8.88884404,9.69958763 8.81672477,9.53202062 8.76894495,9.35517526 C8.73805505,9.24550515 8.64133945,9.16416495 8.52561468,9.15327835 L8.05301835,9.09865979 L8.05301835,8.64117526 L8.52355963,8.58705155 C8.64114679,8.57591753 8.73921101,8.49451546 8.77061468,8.38385567 C8.81749541,8.20905155 8.8890367,8.04148454 8.98376147,7.88647423 C9.04477064,7.78948454 9.03687156,7.66379381 8.96308257,7.57261856 L8.65874312,7.21465979 L9.00566055,6.88991753 L9.37993578,7.17383505 C9.4299633,7.21138144 9.4923211,7.23191753 9.55577064,7.23191753 C9.60798165,7.23191753 9.65916514,7.21824742 9.70315596,7.19263918 C9.8633211,7.10152577 10.037422,7.03193814 10.2212844,6.98579381 C10.3350183,6.95597938 10.4194679,6.86931959 10.4308991,6.75779381 L10.4874771,6.30946392 L10.962578,6.30946392 L11.0190275,6.75612371 C11.0304587,6.86919588 11.1147798,6.96068041 11.2297339,6.99074227 C11.4112844,7.03589691 11.5853853,7.10319588 11.7461927,7.19430928 C11.8450917,7.2523299 11.9785413,7.24348454 12.070633,7.17451546 L12.4443945,6.89047423 L12.7915046,7.21496907 L12.4858807,7.57428866 C12.4133761,7.66404124 12.4057339,7.78948454 12.466422,7.88585567 C12.5611468,8.04037113 12.6333945,8.20793814 12.6810459,8.38503093 C12.7119358,8.49451546 12.8020367,8.57579381 12.9176972,8.58668041 L13.3831651,8.64117526 L13.3831651,9.09859794 Z" id="Shape"></path>
<path d="M10.7246422,7.26210309 C9.80436697,7.26210309 9.05581651,7.98346392 9.05581651,8.86985567 C9.05581651,9.75637113 9.80436697,10.4776082 10.7246422,10.4776082 C11.6453028,10.4776082 12.3939817,9.75637113 12.3939817,8.86985567 C12.3939817,7.98346392 11.6453028,7.26210309 10.7246422,7.26210309 Z M11.5013853,9.61769072 C11.2948532,9.81692784 11.019156,9.92647423 10.7246422,9.92647423 C10.119945,9.92647423 9.62788991,9.45253608 9.62788991,8.86973196 C9.62788991,8.28729897 10.119945,7.81323711 10.7246422,7.81323711 C11.019156,7.81323711 11.2948532,7.92272165 11.5013853,8.1217732 C11.7081101,8.32101031 11.8217798,8.5865567 11.8217798,8.86973196 C11.8217798,9.15321649 11.7081101,9.41876289 11.5013853,9.61769072 Z" id="Shape"></path>
<path d="M0.667568807,9.93364948 L0.667568807,2.78839175 C0.667568807,2.51220619 0.901651376,2.28878351 1.18826606,2.28878351 L11.6414495,2.28878351 C11.9281284,2.28878351 12.1629817,2.51226804 12.1629817,2.78839175 L12.1629817,5.44342268 L12.8051835,5.44342268 L12.8051835,2.78839175 C12.8051835,2.15505155 12.2990642,1.6702268 11.6415138,1.6702268 L8.95197248,1.6702268 L8.95197248,0.514824742 C8.95197248,0.238701031 8.72476147,6.18556701e-05 8.43808257,6.18556701e-05 L4.39176147,6.18556701e-05 C4.10514679,6.18556701e-05 3.8786422,0.238762887 3.8786422,0.514824742 L3.8786422,1.67016495 L1.18826606,1.67016495 C0.530779817,1.67016495 0.0253669725,2.15498969 0.0253669725,2.7883299 L0.0253669725,9.93358763 C0.0253669725,10.566866 0.530779817,11.0722268 1.18826606,11.0722268 L7.21802752,11.0722268 L7.21802752,10.3918144 L1.18826606,10.3918144 C0.901651376,10.3918763 0.667568807,10.2098351 0.667568807,9.93364948 Z M4.585,0.680474227 L8.24555046,0.680474227 L8.24555046,1.67016495 L4.585,1.67016495 L4.585,0.680474227 Z" id="Shape"></path>
</g>
</g>
</g>
</svg>
ProTip! Use n and p to navigate between commits in a pull request.