Commit Graph

9611 Commits

Author SHA1 Message Date
Daniel Lockyer
ad209f3a7d
Improved yarn dev development tooling
- this commit switches our `yarn dev` workflow from heavily relying on
  Grunt, to using `nodemon` and `concurrently`
- we're doing this to reduce reliance on Grunt, but also to fix several
  nits with the way `yarn dev` works in the monorepo
- we now use `nodemon` to run the Ghost backend, and it should
  auto-refresh whenever you change a file in any of the packages (except
  `admin`)
- we use `concurrently` to simultaneously run `ghost` and `admin` at
  the same time. it seems to handle process cleanup well and has nice
  colored prefixes to help with differentiating between log output
- this commit ends up removing a handful of Grunt dependencies and
  reduces the functionality stored in the Gruntfile
- on the whole, it should keep existing functionality but there may be
  some small underlying changes to get used to
2022-08-05 15:54:37 +02:00
Rishabh
a016834427 Fixed cancel button on tier modal with free trials
refs https://github.com/TryGhost/Team/issues/1724
2022-08-05 18:34:28 +05:30
Salih Candir
1f9fadf4c7
🐛 Fixed avatar overlapping with initials (#15167) 2022-08-05 14:57:00 +02:00
Rishabh
6ce3e8efd6 Wired trial days to tiers UI in Admin
refs https://github.com/TryGhost/Team/issues/1724

- allows site owners to add trial days to tiers (behind feature flag)
2022-08-05 17:23:40 +05:30
Daniel Lockyer
a0dca653e7
Updated @tryghost/* packages
- these were all published from the SDK repo
2022-08-05 13:30:50 +02:00
arsereg
182a7ea07c
💡 Upgraded Tenor API to v2 (#15087)
closes: https://github.com/TryGhost/Ghost/issues/14980
refs: cc276486f0

- Tenor is now operated by Google, and the old v1 Tenor API has been decommissioned
- At present anyone with a pre-configured tenor integration will get intermittent errors, whilst it is impossible to setup a new tenor API integration
- Sadly old keys do not work with the new API, and new keys do not work with the old API, so there is no happy path forward.
- After this lands, everyone will need to go and get a new Google API Key for Tenor, update their config, and then the integration will work properly again.
- This particular change renames the API key from `publicReadOnlyApiKey` to `googleApiKey` to reflect that the key itself changes in type and behaviour

Co-authored-by: Hannah Wolfe <github.erisds@gmail.com>
2022-08-05 12:13:27 +01:00
Daniel Lockyer
949d3e7508
Updated error copy when running an unsupported database
refs https://ghost.org/docs/faq/supported-databases/

- the supported database changes we were putting in place for v5 are
  now applicable, so the copy needs to change
- also including minor design updates to make it look like an error
2022-08-05 12:23:21 +02:00
Aileen Nowak
085958d53d Added Ghost Explore integration
no issue

- bumps Ghost Explore to GA from alpha
2022-08-05 10:06:10 +01:00
Daniel Lockyer
dd41929251
Removed Grunt from Admin
- as part of our effort to reduce our usage of Grunt in favor of more
  maintainable (and maintained) alternatives, this commit removes Grunt
  from Admin
- the main difference here is switching from subgrunt to shell, which
  should be a nice stepping stone to removing Grunt altogether one day
2022-08-05 09:53:08 +02:00
renovate[bot]
a78925e13d
Update dependency @html-next/vertical-collection to v3.1.0 (#15170)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-04 21:24:40 +01:00
Sanne de Vries
a16dd5e8dd Fixed post title placeholder being invisible in dark mode 2022-08-04 18:04:55 +02:00
Sanne de Vries
7ab1d0eb40 Added more visual contrast to publish button 2022-08-04 17:57:40 +02:00
Sanne de Vries
175c3d645f Added styles to react editor wrapper 2022-08-04 17:32:36 +02:00
Kevin Ansfield
677f2961f4 Added wrapper element around react editor loading/error/editor states
no issue

- has a default class of `koenig-react-editor` which can be added to by using `@className`
- adds classes of `koenig-react-editor-loading` and `koenig-react-editor-error` to the `<p>` elements rendered during loading or when loading fails
2022-08-04 15:55:52 +01:00
Kevin Ansfield
03c5201d51 Made koenig-react async import protocol agnostic
no issue

- when running locally with local development version of koenig-react without any proxies we were previously forcing `https://` even if the specific url in config was `http://` meaning a proxy was required
- switched to allowing both http and https urls in config
2022-08-04 14:54:41 +01:00
Daniel Lockyer
b66969501c
Deleted csscomb plugin from Admin
- we're meant to be running our CSS through csscomb in order to apply
  specific code styles, but the reality is that it never gets used
- keeping csscomb around just adds to the package cruft and so this
  commit cleans up references to it in order to
2022-08-04 12:05:37 +02:00
Daniel Lockyer
7cf4f595f7 🐛 Fixed missing published Admin assets when running in development
refs https://forum.ghost.org/t/admin-template-issues-default-install/31750

- we recently switched to using different folders within `core/built`, to
  indicate the assets that are applicable for development/production
  environments
- unfortunately, this came with the side effect of the "development" assets
  missing in the published tarball, which meant Admin wouldn't load when
  running in development mode
- this was a regression from how it previously worked because we used to
  just copy the production HTML file to the development HTML name, and
  use the same assets
- after thinking about it, I think we can get rid of the split folders
  for assets, because I don't think the use-case is there for having
  them:
  - if you run Ghost from source, you're 99% only using the
    development-built assets
  - if you want production ones, you can run with a flag, but the
    development ones get wiped anyway
  - those running Ghost from a published package are using the same
    assets and HTML file
- therefore, I think we can make our lives simpler by removing the env
  folders and using a folder under `core/built/admin/...`
- this commit implements that across Ghost and Admin
2022-08-04 10:55:35 +02:00
renovate[bot]
feff2e5d26
Pinned dependencies (#15163)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-04 08:21:51 +02:00
renovate[bot]
30ccb45fe8
Update dependency ember-template-lint to v4.11.0 2022-08-03 20:40:50 +00:00
Daniel Lockyer
37f910965b
Tidied up Admin README
- removed links that are no longer needed now the Admin code is in the
  main monorepo
2022-08-03 21:16:04 +02:00
Daniel Lockyer
a398a0e57d
Cleaned up subgrunt usage between Ghost and Admin
refs https://github.com/TryGhost/Toolbox/issues/365

- some of this was barely used anyway, but now Admin is a package in the
  monorepo, we don't need to be installing dependencies twice
2022-08-03 17:05:57 +02:00
Daniel Lockyer
cb7273c7fd
Deleted Admin yarn.lock
refs https://github.com/TryGhost/Toolbox/issues/365

- this is no longer needed because we use the top-level lockfile in the
  monorepo
2022-08-03 16:56:14 +02:00
Daniel Lockyer
b0a776fd25
Migrated production build test from Admin
refs https://github.com/TryGhost/Toolbox/issues/365

- the .github/workflows/test.yml in Admin needed to be merged with the
  top-level GHA folder so this test needed porting
- there is still the browser matrix testing to port once things are
  stable
2022-08-03 16:14:52 +02:00
Daniel Lockyer
425473ff88
Added yarn lint to Admin
refs https://github.com/TryGhost/Toolbox/issues/365

- without this, `yarn lint` from the monorepo will fail because there is
  no script in this directory
2022-08-03 16:08:21 +02:00
Daniel Lockyer
2854f6151c
Cleaned up extraneous files and references in Admin
refs https://github.com/TryGhost/Toolbox/issues/365

- these files are no longer needed now they're in the main Ghost repo
- re-adds the Renovate rules into the top-level Renovate config
2022-08-03 16:05:04 +02:00
Daniel Lockyer
b1d6b434b5
Fixed yarn dev
refs https://github.com/TryGhost/Toolbox/issues/365

- this fixes the path of the admin assets to the ghost package dir and
  points the subgrunt path to the admin dir
2022-08-03 16:00:40 +02:00
arsereg
cc276486f0 Updated Tenor API to v2 (#2418)
refs: https://github.com/TryGhost/Ghost/issues/14980
refs: https://github.com/TryGhost/Ghost/pull/15087

- The Tenor v1 API has been decommissioned https://developers.google.com/tenor/guides/migrate-from-v1
- Updated the API to v2, but there are some differences we have to account for 
- Swapped from using the old "trending" API to the new "featured" API, which at present seem to be the same thing
- Added a new client_key, which identifies the integration using the google API key, as google API keys can be used for multiple APIs and projects
-  Fixed up the error handling to support Google's error format, and also caught and replaced the error that everyone with old keys will see to make it clearer. This includes adding an htmlError property so that we can output HTML safely in the frontend.

There is still an active TODO with the naming of the config key, but we will resolve this after merging admin into the monorepo.

Co-authored-by: Hannah Wolfe <github.erisds@gmail.com>
2022-08-03 14:11:55 +01:00
Daniel Lockyer
cf64dc89d0 v5.7.1 2022-08-03 12:56:44 +01:00
Simon Backx
407760e1cd Fixed clicking on member in dashboard activity feed comment events
refs https://github.com/TryGhost/Team/issues/1731#issuecomment-1203007918

- The memberId property was not parsed correctly for comment events
- Updated code to fallback on member.id instead of member_id
2022-08-03 13:40:51 +02:00
Simon Backx
235ede719c Updated comment activity feed text and styles
refs https://github.com/TryGhost/Team/issues/1731
2022-08-03 13:35:24 +02:00
Kevin Ansfield
90a080e0b8 Update dependency eslint-plugin-ghost to v2.14.0 (#2441)
no issue

- bumped dependency
- fixed all new lint failures
- removed deprecated `ember-cli-eslint`
  - it was tying us to an old version of `eslint` resulting in missing rule definition errors when linting was run as part of `yarn dev` and `ember test`
  - we run linting separately in CI so we don't need linting to run _again_ on each of our ember test runs
2022-08-03 12:21:16 +01:00
Aileen Nowak
c263f48b79 Fixed using the correct token for Explore
no issue

- The `adminKey.secret` property is already in the correct format of `admiKey.Id:adminKey.secret` so we were returning the id twice as query param
- Minor style adjustments for Explore
2022-08-03 11:51:18 +01:00
Kevin Ansfield
38a12f4e18 Update dependency ember-template-lint to v4.10.1 2022-08-03 11:40:12 +01:00
Kevin Ansfield
4a15083453 Pinned eslint related dependencies 2022-08-03 11:39:04 +01:00
Kevin Ansfield
ce9d2577ca Update dependency eslint to v8.21.0 2022-08-03 11:37:03 +01:00
renovate[bot]
d612199e46 Update dependency reframe.js to v4 (#2370)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-03 11:34:20 +01:00
Sanne de Vries
9729ec11be Removed bottom margin on post preview 2022-08-03 12:23:04 +02:00
Kukhyeon Heo
3780e80b14 🐛 Fixed pasting into the post tags input not working (#1739)
closes https://github.com/tryghost/ghost/issues/12294
refs https://github.com/TryGhost/Admin/pull/1707

- cache registered shortcuts and check KeyboardEvent before dispatching event to the root
2022-08-03 11:14:12 +01:00
Scott Beinlich
08b31ebadb 🐛 Fixed impersonate modal not closing correctly when navigating away from member page. (#1753)
closes https://github.com/TryGhost/Ghost/issues/12214

- previously, when navigating back from the members page with the impersonate modal open, opening a new member showed the impersonate modal.
2022-08-03 10:13:16 +01:00
James Morris
7af8ef0c10 Tidied up the comments post title style for events
- Following styling from email events
- Includes other tweaks to bring consistency
- Added in text truncating for member activity page

refs https://github.com/TryGhost/Team/issues/1731
2022-08-02 18:11:50 +01:00
Kevin Ansfield
577a749e12 Updated modifiers to resolve ember-modifier@4.x deprecations
no issue

- followed the migration guide to switch to from lifecycle hooks to single `modify()` method
  - https://togithub.com/ember-modifier/ember-modifier/blob/master/MIGRATIONS.md
- forced resolution of `ember-in-viewport@4.0.2` to avoid older version of `ember-modifier` being pulled in through `ember-infinity`
2022-08-02 16:54:34 +01:00
Renovate Bot
7af2747257 Update dependency ember-modifier to v3.2.7 2022-08-02 16:54:34 +01:00
Simon Backx
2d5c9ff5d7 Added POC for activity feed comment post name
refs https://github.com/TryGhost/Team/issues/1731

- Includes the post title and url in the activity feed
- For now only implemented on the member page (not yet in remaining 2 activity feeds)
- No styling added
2022-08-02 17:02:42 +02:00
Kevin Ansfield
a5ec6cca06 Fixed "Could not find module 'ember-keyboard'" error thrown by gif card
no issue

- the Koenig in-repo-addon's package.json didn't include `ember-keyboard` and with the recent `ember-auto-import` upgrade it wasn't being picked up correctly
- adding the dependency line fixed things
2022-08-02 15:51:59 +01:00
Kevin Ansfield
d066f68f0b Bumped ember-basic-dropdown to 4.x
no issue

- partial version bump to get past the outdated `ember-modifier` import without breaking changes
2022-08-02 14:25:50 +01:00
renovate[bot]
4c93699f48 Update dependency tracked-built-ins to v3 (#2398)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 14:24:57 +01:00
renovate[bot]
79458bce88 Update dependency ember-in-viewport to v4 (#2160)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 14:24:40 +01:00
renovate[bot]
864fe787fd Update dependency ember-moment to v10 (#2217)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 14:24:14 +01:00
renovate[bot]
28a9909316 Update dependency ember-keyboard to v8 (#2307)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 14:23:49 +01:00
renovate[bot]
93371131fd Update dependency @sentry/ember to v7 (#2411)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 14:06:48 +01:00