ghost 5.48.1 → 5.49.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.48%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.49%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-4f32549fd7f27543889f729a10be18b4.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-c4f5365681d093dace25873e79b1e841.css" title="light">
 
     
 </head>
@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-171b41e446763449417a8687279d2270.js"></script>
 <script src="assets/chunk.362.6bb7cbc3fd3afda65ae1.js"></script>
-<script src="assets/chunk.143.7ffa4fa3e2ad37094023.js"></script>
-    <script src="assets/ghost-f902f5e70d4a27fb3c35f775e50e65ff.js"></script>
+<script src="assets/chunk.143.c84e66067cd00cfdfb1a.js"></script>
+    <script src="assets/ghost-c74cada1daf3e4f04e7ef4dfd2c77eea.js"></script>
 </body>
 </html>

package/core/frontend/src/cards/css/signup.css

@@ -0,0 +1,183 @@
+.kg-signup-card,
+.kg-signup-card * {
+    box-sizing: border-box;
+}
+
+.kg-signup-card {
+    min-height: 40vh;
+}
+
+.kg-signup-card.kg-width-wide {
+    min-height: 60vh;
+}
+
+.kg-signup-card.kg-width-full {
+    min-height: 80vh;
+}
+
+.kg-signup-card a,
+.kg-signup-card a span {
+    color: currentColor;
+}
+
+.kg-signup-card-container {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    height: 100%;
+    padding: 12vmin 6em;
+    background-size: cover;
+    background-position: center;
+    text-align: left;
+}
+
+.kg-signup-card-container.align-center {
+    align-items: center;
+    text-align: center;
+}
+
+.kg-signup-card-container.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-signup-card.kg-style-image h2.kg-signup-card-heading,
+.kg-signup-card.kg-style-image h3.kg-signup-card-subheading,
+.kg-signup-card.kg-style-image .kg-signup-card-button {
+    z-index: 999;
+}
+
+
+/* Heading */
+
+.kg-signup-card h2.kg-signup-card-heading {
+    font-size: 4em;
+    font-weight: 700;
+    line-height: 1.1em;
+    letter-spacing: -0.01em;
+    margin: 0;
+}
+
+.kg-signup-card h2.kg-signup-card-heading strong {
+    font-weight: 800;
+}
+
+.kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
+    font-size: 5em;
+}
+
+.kg-signup-card.kg-width-full h2.kg-signup-card-heading {
+    font-size: 6em;
+}
+
+
+/* Subheading */
+
+.kg-signup-card-subheading {
+    margin: 0 0 2em;
+}
+
+.kg-signup-card h3.kg-signup-card-subheading {
+    font-size: 1.25em;
+    font-weight: 500;
+    line-height: 1.4em;
+    margin: 0;
+    max-width: 40em;
+}
+
+.kg-signup-card h2 + h3.kg-signup-card-subheading {
+    margin: 0.35em 0 0;
+}
+
+.kg-signup-card h3.kg-signup-card-subheading strong {
+    font-weight: 600;
+}
+
+.kg-signup-card.kg-width-wide h3.kg-signup-card-subheading {
+    font-size: 1.5em;
+}
+
+.kg-signup-card.kg-width-full h3.kg-signup-card-subheading {
+    font-size: 1.75em;
+}
+
+
+/* Subscribe form */
+
+.kg-signup-card-form {
+    display: flex;
+    margin: 2.8em 0 0;
+}
+
+.kg-width-regular .kg-signup-card-form {
+    margin: 2em 0 0;
+}
+
+.kg-width-full .kg-signup-card-form {
+    margin: 4em 0 0;
+}
+
+.kg-signup-card-input {
+    min-width: 300px;
+    border: solid 1px;
+    padding: 12px 16px;
+    font-size: 1.1em;
+}
+
+.kg-signup-card-button {
+    display: flex;
+    position: static;
+    align-items: center;
+    outline: none;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    height: 3em;
+    padding: 0 1.2em;
+    transition: opacity .2s ease;
+}
+
+.kg-signup-card-button.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-signup-card h2 + .kg-signup-card-button,
+.kg-signup-card h3 + .kg-signup-card-button {
+    margin: 1.5em 0 0;
+}
+
+.kg-signup-card .kg-signup-card-button:hover {
+    opacity: 0.85;
+}
+
+.kg-signup-card.kg-width-wide .kg-signup-card-button {
+    font-size: 1.05em;
+}
+
+.kg-signup-card.kg-width-wide h2 + .kg-signup-card-button,
+.kg-signup-card.kg-width-wide h3 + .kg-signup-card-button {
+    margin-top: 1.75em;
+}
+
+.kg-signup-card.kg-width-full .kg-signup-card-button {
+    font-size: 1.1em;
+}
+
+.kg-signup-card.kg-width-full h2 + .kg-signup-card-button,
+.kg-signup-card.kg-width-full h3 + .kg-signup-card-button {
+    margin-top: 2em;
+}
+
+
+/* Disclaimer */
+
+.kg-signup-card-disclaimer {
+    margin: .8em 0 0;
+}

package/core/server/api/endpoints/collections.js

@@ -0,0 +1,115 @@
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+const collectionsService = require('../../services/collections');
+
+const messages = {
+    collectionNotFound: 'Collection not found.'
+};
+
+module.exports = {
+    docName: 'collections',
+
+    browse: {
+        options: [
+            'limit',
+            'order',
+            'page'
+        ],
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        query(frame) {
+            return collectionsService.api.browse(frame.options);
+        }
+    },
+
+    read: {
+        data: [
+            'id'
+        ],
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            const model = await collectionsService.api.read(frame.data.id, frame.options);
+
+            if (!model) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.collectionNotFound)
+                });
+            }
+
+            return model;
+        }
+    },
+
+    add: {
+        statusCode: 201,
+        headers: {
+            cacheInvalidate: true
+        },
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            return await collectionsService.api.add(frame.data.collections[0], frame.options);
+        }
+    },
+
+    edit: {
+        headers: {},
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            const model = await collectionsService.api.edit(Object.assign(frame.data.collections[0], {
+                id: frame.options.id
+            }), frame.options);
+
+            if (!model) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.collectionNotFound)
+                });
+            }
+
+            // @NOTE: cache invalidation has to be done manually for now
+            //        because the model's wasChanged is not returned from
+            //        the service using in-memory repository layer
+            // if (model.wasChanged()) {
+            this.headers.cacheInvalidate = true;
+            // } else {
+            //     this.headers.cacheInvalidate = false;
+            // }
+
+            return model;
+        }
+    },
+
+    destroy: {
+        statusCode: 204,
+        headers: {
+            cacheInvalidate: true
+        },
+        options: [
+            'id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            }
+        },
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            return await collectionsService.api.destroy(frame.options.id);
+        }
+    }
+};

package/core/server/api/endpoints/index.js

@@ -12,6 +12,10 @@ module.exports = {
         return apiFramework.pipeline(require('./authentication'), localUtils);
     },
 
+    get collections() {
+        return apiFramework.pipeline(require('./collections'), localUtils);
+    },
+
     get db() {
         return apiFramework.pipeline(require('./db'), localUtils);
     },

package/core/server/run-update-check.js

@@ -40,6 +40,9 @@ if (parentPort) {
 
     const settings = require('./services/settings/settings-service');
     await settings.init();
+
+    const tiers = require('./services/tiers');
+    await tiers.init();
     // Finished INIT
 
     await updateCheck({

package/core/server/services/collections/index.js

@@ -0,0 +1,22 @@
+const {CollectionsService, CollectionsRepositoryInMemory} = require('@tryghost/collections');
+
+class CollectionsServiceWrapper {
+    api;
+
+    constructor() {
+        const inMemoryCollectionsRepository = new CollectionsRepositoryInMemory();
+        const collectionsService = new CollectionsService({
+            repository: inMemoryCollectionsRepository
+        });
+
+        this.api = {
+            browse: collectionsService.getAll.bind(collectionsService),
+            read: collectionsService.getById.bind(collectionsService),
+            add: collectionsService.save.bind(collectionsService),
+            edit: collectionsService.edit.bind(collectionsService),
+            destroy: collectionsService.destroy.bind(collectionsService)
+        };
+    }
+}
+
+module.exports = new CollectionsServiceWrapper();

package/core/server/services/members/content-gating.js

@@ -46,7 +46,7 @@ function checkPostAccess(post, member) {
             return BLOCK_ACCESS;
         }
         visibility = post.tiers.map((product) => {
-            return `product:${product.slug}`;
+            return `product:'${product.slug}'`;
         }).join(',');
     }
 

package/core/server/web/api/endpoints/admin/routes.js

@@ -18,6 +18,13 @@ module.exports = function apiRoutes() {
     // ## Public
     router.get('/site', mw.publicAdminApi, http(api.site.read));
 
+    // ## Collections
+    router.get('/collections', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.browse));
+    router.get('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.read));
+    router.post('/collections', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.add));
+    router.put('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.edit));
+    router.del('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.destroy));
+
     // ## Configuration
     router.get('/config', mw.authAdminApi, http(api.config.read));
 

package/core/shared/labs.js

@@ -32,7 +32,6 @@ const BETA_FEATURES = [
 
 const ALPHA_FEATURES = [
     'urlCache',
-    'migrateApp',
     'lexicalEditor',
     'lexicalMultiplayer',
     'websockets',