Commit Graph

2811 Commits

Author SHA1 Message Date
Sanne de Vries
494e8c5c20 Fixed spacing bug in AMP settings 2021-04-22 09:59:53 +02:00
Kevin Ansfield
58759b3069 Added option to disable member subscriptions (#1925)
refs https://github.com/TryGhost/Team/issues/579

- new Access settings screen that moves subscription access and default post visibility from the Payments settings screen
- expanded "Free signup" toggle into three signup access options
  - "anyone" - same as previous "allow free member signup" option set to `true`
  - "invite only" -  same as previous "allow free member signup" option set to `false`
  - "nobody" - completely disables member signup and login. Removes injected portal and stripe scripts on the front-end and hides member related sections on the admin dashboard

(this commit moves the above changes out from behind the developer experiments flag and cleans up now-unused code)
2021-04-21 12:09:40 +01:00
Sanne de Vries
dda67edd82 Fixed marketplace link in theme settings 2021-04-21 12:22:02 +02:00
Thibaut Patel
53d77d82df Added an upgrade modal to the custom theme activation failure scenario
no issue

- The modal only appears when the user hits a limitation trying to activate a custom theme not part of the allowlist (if the custom theme allowlist is configured)
- Changed the upgrade button to green to match the design
2021-04-20 19:15:33 +02:00
Kevin Ansfield
89b9f6cfc6 Added unsaved changes modal to members-payments screen
no issue

Unsaved changes handling hadn't been moved across fully to the payments screen when settings were re-jigged meaning changes on the payments screen would make settings dirty and show unsaved changes modal unexpectedly on other screens.

- refactored `members-payments` route to use native classes
- used same unsaved changes pattern as `members-access` route/controller
2021-04-20 17:41:21 +01:00
Kevin Ansfield
4febcdf7ae Refactored members-payments controller to native class style
no issue

- refactored to use more modern Ember style native classes, no functionality change
2021-04-20 17:25:30 +01:00
Kevin Ansfield
1dcc83aad5 Removed unused code from members-payments route
no issue

- unused code was left over from settings re-jig copy and paste
2021-04-20 17:23:20 +01:00
Kevin Ansfield
04760132e9 Moved payment settings access control to route
no issue

- having owner-only access control in the template meant the route was accessible but would show a blank page
- updated access control in the `members-payments` route to redirect admins to the settings index screen and non-admins to the default home screen
2021-04-20 17:08:54 +01:00
Kevin Ansfield
4e2a7b9af5 Removed unused code from members-payments controller
no issue

- unused code was left over from settings re-jig copy and paste
2021-04-20 17:02:43 +01:00
Kevin Ansfield
5337a96074 Removed unused code from <GhMembersPaymentSettings>
no issue

- code relating to "portal settings" and "leave settings" modals was unused, presumably left over from settings re-jig copy and paste
2021-04-20 16:55:31 +01:00
Sanne de Vries
62159390fd Fixed modal overflow responsive issue 2021-04-20 15:57:14 +02:00
Kevin Ansfield
ecf82fbfe8 Fixed invite staff modal button not reflecting validation state (#1924)
no issue

- when the role selection was extracted to an external component the limit validation was also extracted but had no way of feeding back to the consumer
- added `onValidationSuccess` and `onValidationFailure` arguments to the role selection component to allow validation feedback to the consumer
- updated staff invite modal with actions to update state based on validation so the modal's buttons can update accordingly
2021-04-20 13:39:03 +01:00
Sanne de Vries
a4b9c1f253 Styled access settings
Refs https://github.com/TryGhost/Team/issues/579
2021-04-20 11:31:22 +02:00
Kevin Ansfield
139ba9413a Hid members data in dashboard when signup access is "Nobody"
refs https://github.com/TryGhost/Team/issues/579

Members is essentially disabled when signup access is set to "Nobody" so it doesn't make sense to show members related charts and actions in the dashboard.

- adds `showMembersData` property to the dashboard controller that returns `false` when members is disabled
- wraps members related sections of the dashboard in conditionals
2021-04-20 09:08:15 +01:00
Kevin Ansfield
a271aa53fd Compacted dashboard controller tracked property code style 2021-04-20 09:01:04 +01:00
Kevin Ansfield
889f90f494 Added "Nobody" option to members signup access
refs https://github.com/TryGhost/Team/issues/579

- adds "Nobody" option that will set `members_signup_access` setting to `'none'`
- when selected also sets `default_content_visibility` setting to `'public'`, expands it if collapsed and disables other options (that setting doesn't make sense when members is disabled, individual post access can still be set manually if needed)
2021-04-19 16:37:00 +01:00
Kevin Ansfield
4e82ea38ea Updated setting model for new members_signup_access setting
requires https://github.com/TryGhost/Ghost/pull/12886

- renamed `membersAllowFreeSignup` to `membersSignupAccess` and changed type to match new setting
- added `membersAllowFreeSignup` computed property to map to the new setting to avoid having to migrate code elsewhere that will be removed once the new options are out of developer experiments
2021-04-19 16:37:00 +01:00
Peter Zimon
6986c4f424 Added mock product assignment modal
Created modal for adding products to members with mock data
2021-04-19 14:45:14 +02:00
Peter Zimon
5af33b3f21 Updated member product list mock design 2021-04-19 10:42:53 +02:00
Peter Zimon
96faf27ba8 Added mock member details component
Prepring for custom products we'll change the overall layout of member forms. This commit has a component that's loaded when dev flag is on for the new layout with mocked product data.
2021-04-15 17:58:35 +02:00
Peter Zimon
01c2facccc Removed member count from product list mock page 2021-04-15 11:09:44 +02:00
Peter Zimon
5a5d6398fd Updated product details mock screen
Updated product details mock screen for the first version:
- removed icon and chart
- added status to price list
- changed icons to text links on price list
2021-04-15 11:08:43 +02:00
Kevin Ansfield
82d8261a56 Added subscription access settings to Access screen
refs https://github.com/TryGhost/Team/issues/579

- moved "Allow free member signup" toggle from Payments screen to Settings screen and switched to a radio selection that allows for better description and further selection of options
2021-04-14 23:43:10 +01:00
Sanne de Vries
4f10e611b0 Moved default post access from Payments to Access screen (#1879)
refs https://github.com/TryGhost/Team/issues/579

- updated access section on Payments screen to only show when not running developer experiments
- added default post access settings to Access screen

Co-authored-by: Kevin Ansfield <kevin@lookingsideways.co.uk>
2021-04-14 19:02:36 +01:00
Kevin Ansfield
cf7a763199 Removed usage of deprecated EmberSimpleAuth mixins (#1910)
refs https://github.com/TryGhost/Admin/pull/1901

Ember has deprecated mixins in preparation for 4.0 and `ember-simple-auth` has now done the same in 3.1.0.

- removed all imports of Ember Simple Auth mixins
- moved authenticated and invalidated handling from application route to session service
- moved server-notification loading from application route to session service
- updated `AuthenticatedRoute` to use the session service directly rather than authenticated route mixin
- added `UnauthenticatedRoute` that incorporates the behaviour from our overridden `UnauthenticatedRouteMixin` and switches to using the session service directly
2021-04-12 13:21:57 +01:00
Sanne de Vries
eb28e42ad4 Updated styles for change-user-role modal 2021-04-12 14:09:24 +02:00
Kevin Ansfield
ffe5416b77 Swapped staff role selector from <select> to new role selection modal
closes https://github.com/TryGhost/Team/issues/572

Role selection when inviting users was updated to show information about each staff role. This change updates the staff edit screen to use the same UI for changing the role of an existing user.

- added `select-user-role` modal which uses `<GhRoleSelection>` to allow role selection
- replaced the `<select>` input for changing a user's role with a button that triggers the role selection modal
  - role is not set unless the "Set role" button is clicked after making a selection, cancel or close will leave the original role selected
2021-04-12 11:35:50 +01:00
Kevin Ansfield
824953d162 Fixed initial role selection and layout shift in <GhRoleSelection>
no issue

- initial role was always being set to Contributor due to incorrect argument being used when checking if the default role should be applied
- there was considerable layout shift of the `<GhRoleSelection>` container after role loading was finished, quick-fix applied by specifying a width and height to the loading spinner container that matches the final width/height
2021-04-12 11:27:37 +01:00
Kevin Ansfield
c3c383ae69 Fixed role validation when inviting new users
no issue

- the `role` argument was not being passed to the `validateRole` method when changing roles
2021-04-12 11:15:09 +01:00
Kevin Ansfield
e7ac8731b0 Extracted role selector to <GhRoleSelection> component
refs https://github.com/TryGhost/Team/issues/572

- preparation for re-using the new role selector in a model when changing an existing user's role
2021-04-10 08:16:16 +01:00
Peter Zimon
80357855aa Added mock product price modal
no refs.
- added static price modal to product detail page
2021-04-09 13:01:28 +02:00
Thibaut Patel
7b99c555c5 Fix the limit service when querying an empty config
commit d350a58769
2021-04-09 11:16:37 +02:00
Thibaut Patel
47f0969ac2 Fix customThemes flag
commit f65c5a7f8b

 - disabled = true means that the feature is disabled
2021-04-08 20:23:21 +02:00
Thibaut Patel
f65c5a7f8b Fix UploadThemeController to support disable:true customThemes flag
no issue
2021-04-08 19:32:46 +02:00
Peter Zimon
f172fedb58 Updated settings icon colors 2021-04-08 17:25:32 +02:00
Peter Zimon
c6bb423a26 Updated product detail page mockup
- updated layout for static product detail page
2021-04-08 17:20:32 +02:00
Kevin Ansfield
733f76d571 Added automatic CSV export when bulk deleting members
refs https://github.com/TryGhost/Team/issues/585

- updated bulk destroy task to first use the current query params to fetch from the appropriate CSV export endpoint and trigger a download
  - fetches via JS and triggers download from a blob URL link instead of an iframe so that we can be sure the download is successful before we hit the bulk delete endpoint
  - works differently to user deletion download because the server is not generating an export file and saving it meaning the client has to be sure we don't delete data before it's exported
- updated copy in the confirmation modal to reflect the download behaviour
2021-04-08 16:06:00 +01:00
Kevin Ansfield
51b0cfb199 Fixed members list query not always matching route params
refs e25e36352d

- referenced refactor accidentally removed direct usage of `params` in `fetchMembersTask()`
- because it's called from the `model()` hook the query param properties on `this` have not yet been updated to the new params meaning we were querying the API with stale params
2021-04-08 16:00:43 +01:00
Sanne de Vries
ee5da7a5d2 Updated members deleted info-box style 2021-04-08 16:14:06 +02:00
Kevin Ansfield
e25e36352d Refactored duplicated members query generation
no issue

- code for generating a members API query was duplicated across listing, export, and bulk delete
- extracted the duplicated code into a reusable method
- removed `?all=true` param generation for bulk members delete because we don't provide that option in the UI
2021-04-08 15:12:14 +01:00
Peter Zimon
6ee31e206b Added static components for custom products
- added link to Products in Settings main screen
- added product list page with static content
- added product detail page with static content
2021-04-08 14:40:13 +02:00
Thibaut Patel
d350a58769 Revert "Replaced the config service by the limiter service"
This reverts commit fc30aebd21.
2021-04-08 13:53:52 +02:00
Kevin Ansfield
72590083f3 Added ability to bulk delete members by label or status (#1883)
refs https://github.com/TryGhost/Team/issues/585
requires https://github.com/TryGhost/Ghost/pull/12082

When a label or status filter is selected on the members screen show a "Delete selected" option in the actions dropdown. Bulk deleted members will _not_ have any subscription data modified in Stripe, if a member should be deleted and have their subscription cancelled it's necessary to do that on a per-member basis.

- updated bulk delete handling to match API
- added link to bulk delete confirmation modal in members actions dropdown (only shown when label, status, or search is used)
- updated testing framework for members
  - added label factory for easier test setup
  - updated `GET /members` and `DEL /members` endpoints to work with label filters
  - updated test selectors for easier reference in tests
2021-04-08 12:06:27 +01:00
Sanne de Vries
556141d613 Styled staff limit notification in invite-modal 2021-04-08 11:53:15 +02:00
Naz
8756ddac53 Fixed staff limit check to filter out "Contributors"
refs https://github.com/TryGhost/Team/issues/587

- Invites and users with "Contributor" roles should not be counted towards the limit
2021-04-08 21:11:16 +12:00
Thibaut Patel
fc30aebd21 Replaced the config service by the limiter service
comment 634d2daa13 (r49241858)
2021-04-08 10:56:00 +02:00
Naz
de97328c42 Fixed staff limit check query to take into account inactive users
refs https://github.com/TryGhost/Team/issues/587

- Users with 'inactive' status should not be counted towards the "staff" limit
2021-04-08 20:07:24 +12:00
Naz
25debab71d Added staff limit check to invite people modal
refs https://github.com/TryGhost/Team/issues/587

- When user's instance reaches a "staff" limit we need a way to proactively notify them about reached limit and give enough information about why it was reached and what the next action would be to unblock them
- The implementeation uses a frontend implementation of the limit-service which allows to do preventative checks for the reached limits
2021-04-08 17:28:37 +12:00
Naz
40cedb84ff Added integration with limit service
refs https://github.com/TryGhost/Team/issues/587

- This is first pass on the frontend limit-service integration. Max count queries are substituted with HTTP requests to mimick backend checks. Note, they are not meant to substitute backend checks only to suplment them.
2021-04-08 16:59:56 +12:00
Sanne de Vries
2e8109d05f Clarified staff user roles in Admin (#1874)
refs https://github.com/TryGhost/Team/issues/572

- Replaced dropdown in invite-user modal with radio buttons
- Added description for each user role
- Added icon to provide more info on hover for each role
- Got rid of unused box styling
2021-04-07 15:20:30 +01:00
Thibaut Patel
634d2daa13 Added configurable limit on custom themes
issue https://github.com/TryGhost/Team/issues/590
2021-04-07 15:51:22 +02:00
Rish
6932d826f8 Updated member stats refresh to new counts endpoint
refs 72e8894eac

Switches the stats refresh method to use new `/members/stats/counts` endpoint instead of the old one at `/members/stats`
2021-04-06 14:13:01 +05:30
naz
238632402c 🐛 Fixed host limit error when resending a pending invite (#1881)
refs https://github.com/TryGhost/Team/issues/587
refs e30b9735fa

- It was not possible to invite a new Contributor to a site that has reached its limit
- This fix divides the resend invite action into two separate steps: 1. Deleting existing invite 2. Creating a new one for the same data
- It was hitting the limit because the permissions were correctly checking for "add" action being executed when the limit of invites/staff users was already used up. By removing existing invite we mimic the behavior the server would do for us anyway (2111992dd4/core/server/services/invites/invites.js (L18-L22))

Co-authored-by: Rish <zrishabhgarg@gmail.com>
2021-04-06 15:10:03 +12:00
Kevin Ansfield
15561efd48 Fixed url formatting in search engine result previews
no issue

- `config.blogDomain` includes subdirectory and `config.ghostPaths.subdir` includes a leading `/` which resulted in the search engine result preview url incorrectly showing as `mysite.com/subdir > /subdir > slug`
- replaced the in-template construction of the url previews with a getter on the backing class that constructs the preview url based on parsing the configured url
2021-03-30 10:10:34 +01:00
Sanne de Vries
d3ace95ff6 Fixed PSM seo preview title overflowing bug 2021-03-30 10:41:36 +02:00
Sanne de Vries
c41a1f77f8 Reverted color updates 2021-03-29 16:21:54 +02:00
Sanne de Vries
7e92306a77 Updated icon/color access screen in settings 2021-03-29 16:09:58 +02:00
Kevin Ansfield
c1904d7d84 Added blank members access settings screen behind dev flag
refs https://github.com/TryGhost/Team/issues/579

- empty screen ready for signup access and default post access level settings to be moved to
- has unsaved settings changes modal ready
2021-03-29 12:49:09 +01:00
Kevin Ansfield
ae4d15d237 Removed empty init() calls
no issue

- `init()` methods that do nothing but call `super()` aren't adding anything but add noise to class/object definitions
2021-03-29 10:32:03 +01:00
Kevin Ansfield
65e07109a9 Updated test selectors on settings screen
no issue

- navigation test selectors were duplicated and did not match the respective link destinations
2021-03-29 10:19:33 +01:00
Thibaut Patel
0944fb39ba Updated the staff access token to use the existing patterns
issue https://github.com/TryGhost/Team/issues/497
2021-03-25 15:08:29 +01:00
Rish
e91e8f73fd Removed www subdomain from default newsletter/support address
closes https://github.com/TryGhost/Team/issues/397

The default newsletter/support email address for a site is currently setup as noreply@DOMAIN , which means for a custom domain setup with www the email address becomes noreply@www.somesite.com which is not the expected behavior.

Note: This fix only removes `www` subdomain from addresses and no other subdomains
2021-03-24 23:51:13 +05:30
Rish
803523c31d 🐛 Fixed incorrect member count on dashboard
closes https://github.com/TryGhost/Team/issues/561

In case the last event for a new member on site was before 30 day period, the count for members was showing 0 instead of the actual value. The change fixes the count to show the correct value even if there is no new recent member activity.
2021-03-24 21:56:35 +05:30
Rish
43c83c77f2 Updated MRR display value on dashboard
closes https://github.com/TryGhost/Team/issues/568

Displaying amount in cents in context of overall MRR forecast/estimate doesn't add much value, the change rounds MRR value to nearest whole number on dashboard
2021-03-24 21:56:35 +05:30
Rish
fde76becc4 Updated default MRR currency from settings
closes https://github.com/TryGhost/Team/issues/550

The MRR chart relied on first currency from the list in case of data for multiple currencies, falling back to USD in case of no MRR data for the site. This can be misleading, specially when the active currency set in payment settings is different from one picked to show on MRR chart.

The change updates dashboard to always pick the currency from Payment settings as default for showing chart data.
2021-03-24 21:56:35 +05:30
Sanne de Vries
6213587ad9 Fixed editor text selection bug in Safari dark mode 2021-03-24 15:12:40 +01:00
Rishabh Garg
4148db6fd6 Removed hardcoded accent color fallbacks (#1875)
refs TryGhost/Team#536

From 4.0, we ensure and require that accent colour is always set. This change removes hardcoded accent color fallbacks to avoid confusion as well as cause accidental fallback that is undesired.
2021-03-24 18:26:09 +05:30
Aileen Nowak
d2dd33411a Changed /billing route to /pro (#1871)
no issue

The current `/billing` route needs to be renamed into `/pro`, so we can use sub-routes like `/pro/billing` and `/pro/domain` in the billing app.
2021-03-23 11:59:52 +00:00
Sanne de Vries
abbb5cb314 Updated info box styles 2021-03-23 12:17:47 +01:00
Sanne de Vries
e0b9d64875 Fixed dashboard graphs responsive issue 2021-03-22 15:59:18 +01:00
Peter Zimon
50c41c18f8 Fixed box alignment on Dashboard 2021-03-22 15:42:16 +01:00
Peter Zimon
6cdd79e0b5 Updated settings button copy on Dashboard 2021-03-22 15:37:46 +01:00
Peter Zimon
48f44b9093 Fixed placeholder of tag color 2021-03-22 15:16:09 +01:00
Sanne de Vries
6f3ae6e4ed Fixed arrow widths for avatar and canvas title 2021-03-22 10:53:39 +01:00
Sanne de Vries
2937df8212 Fixed logo icons in Integrations/Zapier for dark mode 2021-03-22 10:33:28 +01:00
Sanne de Vries
12abd4c2c9 Changed dashboard button style in dark mode 2021-03-19 12:14:24 +01:00
Sanne de Vries
a231c8970d Fixed email preview height Safari bug 2021-03-19 11:57:22 +01:00
Peter Zimon
105140ef3f New logo (#1868)
refs TryGhost/Team#547

- Updated Admin to use new Ghost logo
2021-03-18 17:26:35 +00:00
Kevin Ansfield
7286ae9fcf 🐛 Fixed link contrast in editor with very light/dark accent colors (#1870)
refs https://github.com/TryGhost/Team/issues/551
refs https://github.com/TryGhost/Ghost/issues/12767#issuecomment-800177254

- calculate contrast color of accent color against light/dark mode background color
- lighten (dark mode) or darken (light mode) the accent color used in the editor to ensure it has enough contrast to be legible
2021-03-18 16:46:38 +00:00
Fabien 'egg' O'Carroll
6d324e31f1 🐛 Fixed deleting members to prompt cancellation (#1869)
closes https://github.com/TryGhost/Team/issues/546

Since https://github.com/TryGhost/Ghost/commit/26ee6483 and
https://github.com/TryGhost/Admin/commit/fbd42ef3 member
subscriptions have not been on the `stripe` property.

This meant that all members were considered to not have subscriptions,
and so the modal would not display to option to cancel subscriptions.
2021-03-18 14:45:29 +00:00
Sanne de Vries
eec670a859 Fixed Safari bug social previews icon height 2021-03-18 15:14:23 +01:00
Sanne de Vries
5ade9fe201 Updated links style 2021-03-18 14:56:33 +01:00
Kevin Ansfield
df2301e1c0 Revert "Refactored ApplicationController to use native class"
This reverts commit 9b6d4822e7.

- there is an issue with properties not being tracked correctly and the menu not being shown when returning from the editor
- reverting to working version with computed properties for now
2021-03-17 12:00:14 +00:00
Kevin Ansfield
9b6d4822e7 Refactored ApplicationController to use native class
no issue

- updated to use Ember Octane idioms
2021-03-17 11:48:36 +00:00
Kevin Ansfield
efdde1f4a6 Fixed billing/update links showing for admins
no issue

- only owners can generate tokens to identify as the publication so the billing app won't work for non-owners
2021-03-15 12:33:48 +00:00
Rishabh Garg
74e2d3ef8c 🐛 Fixed MRR start date value in chart (#1865)
no refs

MRR start date value for charts was being calculated with start value as 0, assuming we have the data for first date in our range to use as start value. Since the events data returned only has data on dates where any MRR event happened, in case the first date in our range didn't have any. data we started from 0 instead of value on previous date. This fix

- updates calculation to pick the start value for chart based on value on last date in our range(30 days)
- adds unit tests for stats
2021-03-15 15:23:55 +05:30
Peter Zimon
5d158aa7c5 Updated launch site banner on Dashboard 2021-03-10 22:18:44 +01:00
Peter Zimon
8210116c28 Added 'create content' card to Dashboard 2021-03-10 22:15:51 +01:00
Peter Zimon
73500dc712 Updated internal link cards on Dashboard 2021-03-10 21:49:55 +01:00
Peter Zimon
0eaf1abfe6 Added 'crunched' card to Dashboard 2021-03-10 21:39:06 +01:00
Peter Zimon
61334c0014 Added community card to Dashboard 2021-03-10 20:49:23 +01:00
Peter Zimon
9667293a42 Added blog post to Dashboard 2021-03-10 20:21:26 +01:00
Peter Zimon
f9f8c4019a Updated link cards on Dashboard 2021-03-10 20:16:24 +01:00
Peter Zimon
4c9297b04d Added blog post to Dashboard 2021-03-10 20:12:21 +01:00
Peter Zimon
0c1be1c132 Added TheBrowser card to Dashboard 2021-03-10 19:23:06 +01:00
Peter Zimon
f6fe6127ca Fixed test 2021-03-10 18:05:24 +01:00
Peter Zimon
6f2fe2d80e Fixed top members 'since' column on Dashboard
- removed from time from Top members list
2021-03-10 18:01:21 +01:00
Kevin Ansfield
ddbeec3945 Fixed billing nav menu item not showing as active
no issue

- the billing nav menu item isn't a regular route link so we don't get "active" classes by default
- added active class manually based on the service property that controls billing screen visibility
2021-03-10 16:16:42 +00:00
Kevin Ansfield
cce71e5517 Fixed preview shortcut not working when billing app is enabled
no issue

- the billing modal is always rendered, it's contents being shown/hidden via CSS
- when the billing modal was rendered it was changing the `key` scope and binding the enter key, however because it's always rendered this was messing with the default key scope for all other areas of the app
- removed all keyboard handling from the billing modal because it wasn't actually doing anything (there is nothing to handle the "confirm" action when Enter is pressed) which fixes the unexpected key scope change
2021-03-10 16:15:19 +00:00
Peter Zimon
d3b3a0117d Updated squirlce logo ref to 4.0 repo 2021-03-10 15:54:22 +01:00