ghost 4.37.0 → 4.39.0

package/core/frontend/apps/private-blogging/lib/middleware.js

@@ -13,7 +13,7 @@ const privateRoute = '/private/';
 
 const messages = {
     pageNotFound: 'Page not found.',
-    wrongPassword: 'Wrong password'
+    wrongPassword: 'Incorrect password.'
 };
 
 function verifySessionHash(salt, hash) {

package/core/frontend/apps/private-blogging/lib/views/private.hbs

@@ -22,23 +22,22 @@
                 <main class="gh-main" role="main">
                     <div class="gh-flow">
                         <div class="gh-flow-content-wrap">
-                            <section class="gh-flow-content">
+                            {{#if @site.icon}}
+                                <img class="site-icon" src="{{img_url @site.icon absolute="true"}}" alt="icon">
+                            {{/if}}
+                            <section class="gh-flow-content private">
                                 <header>
-                                    <h1>This site is private</h1>
+                                    <h1>This site is private.</h1>
                                 </header>
                                 <form class="gh-signin" method="post" novalidate="novalidate">
                                     <div class="form-group{{#if error}} error{{/if}}">
-                                        <span class="gh-input-icon gh-icon-lock">
-                                            <svg version="1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g><path d="M12 14c-.552 0-1 .449-1 1 0 .365.207.672.5.846v2.654c0 .276.224.5.5.5s.5-.224.5-.5v-2.654c.293-.174.5-.481.5-.846 0-.551-.448-1-1-1zM20.5 9h-2.5v-3c0-3.309-2.691-6-6-6s-6 2.691-6 6v3h-2.5c-.276 0-.5.224-.5.5v14c0 .276.224.5.5.5h17c.276 0 .5-.224.5-.5v-14c0-.276-.224-.5-.5-.5zm-13.5-3c0-2.757 2.243-5 5-5s5 2.243 5 5v3h-10v-3zm13 17h-16v-13h16v13z"/></g></svg>
                                             {{input_password class="gh-input" placeholder="Password"}}
-                                        </span>
+                                            {{#if error}}
+                                                <p class="main-error">{{error.message}}</p>
+                                            {{/if}}
                                     </div>
-                                    <button class="gh-btn gh-btn-blue gh-btn-block" type="submit"><span>Enter Now</span></button>
+                                    <button class="gh-btn" type="submit"><span>Access site &rarr;</span></button>
                                 </form>
-
-                                {{#if error}}
-                                    <p class="main-error">{{error.message}}</p>
-                                {{/if}}
                             </section>
                         </div>
                     </div>

package/core/frontend/helpers/get.js

@@ -31,6 +31,9 @@ const RESOURCES = {
     },
     authors: {
         alias: 'authorsPublic'
+    },
+    tiers: {
+        alias: 'tiersPublic'
     }
 };
 
@@ -153,6 +156,7 @@ module.exports = function get(resource, options) {
 
     // Parse the options we're going to pass to the API
     apiOptions = parseOptions(ghostGlobals, this, apiOptions);
+    apiOptions.context = {member: data.member};
 
     // @TODO: https://github.com/TryGhost/Ghost/issues/10548
     return controller[action](apiOptions).then(function success(result) {

package/core/frontend/helpers/match.js

@@ -45,6 +45,18 @@ const handleMatch = (data, operator, value) => {
     case '!=':
         result = data !== value;
         break;
+    case '<':
+        result = data < value;
+        break;
+    case '>':
+        result = data > value;
+        break;
+    case '>=':
+        result = data >= value;
+        break;
+    case '<=':
+        result = data <= value;
+        break;
     default:
         result = data === value;
     }

package/core/frontend/helpers/prev_post.js

@@ -32,7 +32,8 @@ const buildApiOptions = function buildApiOptions(options, post) {
         limit: 1,
         // This line deliberately uses double quotes because GQL cannot handle either double quotes
         // or escaped singles, see TryGhost/GQL#34
-        filter: "slug:-" + slug + "+published_at:" + op + "'" + publishedAt + "'" // eslint-disable-line quotes
+        filter: "slug:-" + slug + "+published_at:" + op + "'" + publishedAt + "'", // eslint-disable-line quotes
+        context: {member: options.data.member}
     };
 
     if (get(options, 'hash.in')) {
@@ -48,6 +49,11 @@ const buildApiOptions = function buildApiOptions(options, post) {
     return apiOptions;
 };
 
+/**
+ * @param {*} options 
+ * @param {*} data 
+ * @returns {Promise<any>}
+ */
 const fetch = function fetch(options, data) {
     const self = this;
     const apiOptions = buildApiOptions(options, this);
@@ -77,6 +83,10 @@ const fetch = function fetch(options, data) {
 // If prevNext method is called without valid post data then we must return a promise, if there is valid post data
 // then the promise is handled in the api call.
 
+/**
+ * @param {*} options 
+ * @returns {Promise<any>}
+ */
 module.exports = function prevNext(options) {
     options = options || {};
 

package/core/frontend/helpers/tiers.js

@@ -0,0 +1,59 @@
+// # Tiers Helper
+// Usage: `{{tiers}}`, `{{tiers separator=' - ' prefix=' : ' suffix=''}}`
+//
+// Returns a string of the tiers with access to the post.
+// By default, tiers are separated by commas.
+const {labs} = require('../services/proxy');
+const {SafeString, escapeExpression} = require('../services/rendering');
+
+const isString = require('lodash/isString');
+
+function tiers(options = {}) {
+    options = options || {};
+    options.hash = options.hash || {};
+
+    const separator = isString(options.hash.separator) ? options.hash.separator : ', ';
+    const lastSeparator = isString(options.hash.lastSeparator) ? options.hash.lastSeparator : ' and ';
+    const prefix = isString(options.hash.prefix) ? options.hash.prefix : '';
+    let suffix = isString(options.hash.suffix) ? options.hash.suffix : '';
+
+    let output = '';
+
+    let accessProductsList = this.tiers;
+
+    if (accessProductsList && accessProductsList.length > 0) {
+        const tierNames = accessProductsList.map((tier) => {
+            return escapeExpression(tier.name);
+        });
+
+        if (tierNames.length === 1) {
+            output = tierNames[0];
+            suffix = isString(options.hash.suffix) ? options.hash.suffix : ' tier';
+        } else {
+            suffix = isString(options.hash.suffix) ? options.hash.suffix : ' tiers';
+            const firsts = tierNames.slice(0, tierNames.length - 1);
+            const last = tierNames[tierNames.length - 1];
+            output = firsts.join(separator) + lastSeparator + last;
+        }
+    }
+
+    if (output) {
+        output = prefix + output + suffix;
+    }
+
+    return new SafeString(output);
+}
+
+module.exports = function productsLabsWrapper() {
+    let self = this;
+    let args = arguments;
+
+    return labs.enabledHelper({
+        flagKey: 'multipleProducts',
+        flagName: 'Tiers',
+        helperName: 'tiers',
+        helpUrl: 'https://ghost.org/docs/themes/'
+    }, () => {
+        return tiers.apply(self, args);
+    });
+};

package/core/frontend/helpers/tpl/content-cta.hbs

@@ -8,7 +8,7 @@
             <h2>This post is for subscribers only</h2>
         {{/has}}
         {{#has visibility="tiers"}}
-            <h2>This post is for subscribers on the {{products}} only </h2>
+            <h2>This post is for subscribers on the {{tiers}} only </h2>
         {{/has}}
         {{#if @member}}
             <a class="gh-btn" data-portal="account/plans" style="color:{{accentColor}}">Upgrade your account</a>

package/core/frontend/public/ghost.css

@@ -349,49 +349,66 @@ th {
 }
 /* Colour classes
 /* ---------------------------------------------------------- */
+.black {
+    color: #15171A;
+}
+
 .darkgrey {
-    color: #343f44;
+    color: #394047;
 }
+
 .midgrey {
-    color: #738a94;
+    color: #7C8B9A;
 }
+
 .lightgrey {
-    color: #e5eff5;
+    color: #CED4D9;
 }
+
 .blue {
-    color: #3eb0ef;
+    color: #14b8ff;
 }
+
 .red {
-    color: #f05230;
+    color: #f50b23;
 }
+
 .orange {
-    color: #fecd35;
+    color: #ffb41f;
 }
+
 .green {
-    color: #a4d037;
+    color: #30cf43;
 }
+
 /* Colour classes (hover)
 /* ---------------------------------------------------------- */
 .darkgrey-hover:hover {
-    color: #343f44;
+    color: #394047
 }
+
 .midgrey-hover:hover {
-    color: #738a94;
+    color: #7C8B9A;
 }
+
 .lightgrey-hover:hover {
-    color: #e5eff5;
+    color: #CED4D9;
 }
+
 .blue-hover:hover {
-    color: #3eb0ef;
+    color: #14b8ff;
 }
+
 .red-hover:hover {
-    color: #f05230;
+    color: #f50b23;
 }
+
 .orange-hover:hover {
-    color: #fecd35;
+    color: #ffb41f;
 }
+
 .green-hover:hover {
-    color: #a4d037;
+    color: #30cf43;
 }
 
 /* Layout
@@ -493,7 +510,6 @@ h2 {
     outline: none;
     border: 1px solid rgb(214, 227, 235);
     color: rgb(130, 154, 168);
-    text-shadow: 0 1px 0 #fff;
     text-decoration: none !important;
     -webkit-user-select: none;
        -moz-user-select: none;
@@ -608,6 +624,7 @@ h2 {
     overflow: hidden;
     height: 100%;
 }
+
 /* Content viewport, contains everything else */
 .gh-viewport {
     -ms-flex-positive: 1;
@@ -617,6 +634,7 @@ h2 {
     overflow: hidden;
     max-height: 100%;
 }
+
 .gh-main {
     position: relative;
     -ms-flex-positive: 1;
@@ -630,185 +648,229 @@ h2 {
 /* Full screen workflow
 /* ---------------------------------------------------------- */
 .gh-flow {
-    -ms-flex-positive: 1;
-        flex-grow: 1;
-    display: -ms-flexbox;
+    flex-grow: 1;
     display: flex;
-    -ms-flex-direction: column;
-        flex-direction: column;
+    flex-direction: column;
     overflow-y: auto;
     min-height: 100%;
+    background: linear-gradient(315deg,#efefef,#fff);
 }
-.gh-flow-head {
-    -ms-flex-negative: 0;
-        flex-shrink: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-pack: justify;
-        justify-content: space-between;
-    padding-top: 4vh;
-    padding-bottom: 20px;
-}
+
 .gh-flow-content-wrap {
-    -ms-flex-positive: 1;
-        flex-grow: 1;
-    -ms-flex-negative: 0;
-        flex-shrink: 0;
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-pack: center;
-        justify-content: center;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 5%;
+    flex-direction: column;
+    flex-grow: 1;
+    flex-shrink: 0;
+    justify-content: center;
+    align-items: center;
+    margin: 0 24px;
     padding-bottom: 8vh;
 }
-.gh-flow-back {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 0 0 3%;
-    padding: 2px 9px 2px 5px;
-    border: transparent 1px solid;
-    border-radius: 4px;
-    color: #7d878a;
-    font-weight: 100;
-    transition: all 0.3s ease;
-}
-.gh-flow-back svg {
-    margin-right: 4px;
-    height: 12px;
-    line-height: 14px;
-}
-.gh-flow-back svg path {
-    stroke: #7d878a;
-    stroke-width: 1.2px;
-}
-.gh-flow-back:hover {
-    border: #dae1e3 1px solid;
-}
-.gh-flow-back-plain {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-        align-items: center;
-    margin: 0 0 0 3%;
-    padding: 2px 9px 2px 5px;
-    color: #7d878a;
-    font-weight: 300;
-    transition: all 0.3s ease;
-    text-decoration: none;
-}
-.gh-flow-back-plain svg {
-    margin-right: 4px;
-    height: 12px;
-    line-height: 14px;
-}
-.gh-flow-back-plain svg path {
-    stroke: #7d878a;
-    stroke-width: 1.2px;
-}
-.gh-flow-back-plain:hover {
-    color: #15212A;
-}
-.gh-flow-nav {
-    position: relative;
-    -ms-flex: 1;
-        flex: 1;
+
+.gh-flow-content-wrap .site-icon {
+    width: 70px;
+    height: 70px;
+    border-radius: 3px;
 }
+
 .gh-flow-content {
-    display: -ms-flexbox;
     display: flex;
-    -ms-flex-direction: column;
-        flex-direction: column;
-    max-width: 700px;
+    flex-direction: column;
+    max-width: 520px;
     width: 100%;
-    color: #738a94;
-    text-align: center;
+    margin: 4rem 0 6rem;
+    padding: 40px;
+    background: #fff;
+    color: var(--darkgrey);
     font-size: 1.9rem;
     line-height: 1.5em;
-    font-weight: 100;
-}
-
-.gh-flow-content .gh-input-icon input {
-    padding-left: 35px;
+    font-weight: 300;
+    border-radius: 3px;
+    box-shadow: 
+        0 2.8px 2.2px rgba(0,0,0,.02),
+        0 6.7px 5.3px rgba(0,0,0,.02),
+        0 12.5px 10px rgba(0,0,0,.02),
+        0 22.3px 17.9px rgba(0,0,0,.03),
+        0 41.8px 33.4px rgba(0,0,0,.03),
+        0 100px 80px rgba(0,0,0,.05);
 }
 
-.gh-flow-content-unsubscribe {
-    font-weight: 300;
+.gh-flow-content.unsubscribe {
+        align-items: center;
+        justify-content: center;
+        max-width: 560px;
+        min-height: 200px;
+        margin: 4rem 0;
+        text-align: center;
 }
 
 @media (max-width: 500px) {
-    .gh-flow-head-unsubscribe {
-        padding-top: 2.8vh;
-    }
     .gh-flow-content {
-        font-size: 4vw;
-    }
-    .gh-flow-content-unsubscribe {
-        font-size: 1.8rem;
-        line-height: 1.6em;
+        padding: 0;
+        background: transparent;
+        box-shadow: none;
     }
 }
+
 .gh-flow-content header {
-    margin: 0 auto;
-    max-width: 520px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 }
+
 .gh-flow-content h1 {
-    font-size: 4.2rem;
-    font-weight: 100;
+    margin-bottom: 24px;
+    color: #15171A;
+    font-size: 4.1rem;
+    font-weight: 700;
+    line-height: 1.15em;
+}
+
+.gh-flow-content.unsubscribe h1 {
+    font-size: 3.2rem;
 }
+
 @media (max-width: 600px) {
-    .gh-flow-content h1 {
-        font-size: 7vw;
+    .gh-flow-content h1,
+    .gh-flow-content.unsubscribe h1 {
+        font-size: 6vw;
+    }
+}
+
+.gh-flow-content.unsubscribe p {
+    margin: 0 0 .4em;
+    color: #394047;
+    font-size: 1.8rem;
+}
+
+@media (max-width: 500px) {
+    .gh-flow-content.unsubscribe p {
+        font-size: 1.6rem;
+        line-height: 1.5;
     }
 }
+
 .gh-flow-content .gh-btn {
     display: block;
     margin: 20px auto 0;
     max-width: 400px;
 }
+
 .gh-flow-content .form-group {
+    position: relative;
     margin-bottom: 2.5rem;
 }
-.gh-flow-content input {
-    padding: 10px;
-    border: #dae1e3 1px solid;
-    font-size: 1.6rem;
-    line-height: 1.4em;
-    font-weight: 100;
+
+.gh-flow-content .form-group.error .gh-input {
+    border-color: #f50b23;
+    box-shadow: 0 0 0 3px rgba(239,24,24,.15);
+}
+
+.gh-flow-content .main-error {
+    position: absolute;
+    right: 0;
+    margin: 0;
+    color: #7C8B9A;
+    font-size: 1.35rem;
+    font-weight: 400;
+    text-align: center;
+    user-select: text;
 }
+
 .gh-flow-em {
     font-weight: 500;
 }
 
+.unsubscribe-footer {
+    text-align: center;
+    font-size: 1.5rem;
+}
+
+@media (max-width: 500px) {
+    .unsubscribe-footer {
+        padding: 0 24px;
+        font-size: 1.4rem;
+        line-height: 1.4em;
+    }
+}
+
+.unsubscribe-footer p {
+    color: #7C8B9A;
+    margin: 0 0 .4rem;
+}
+
+.unsubscribe-footer a {
+    color: #15171A;
+    text-decoration: none;
+}
+
+.unsubscribe-footer a:hover {
+    text-decoration: underline;
+}
+
 /* Sign in
 /* ---------------------------------------------------------- */
 .gh-signin {
-    position: relative;
-    margin: 30px auto;
-    padding: 40px;
-    max-width: 400px;
-    width: 100%;
-    border: #dae1e3 1px solid;
-    background: #f8fbfd;
-    border-radius: 5px;
-    text-align: left;
-}
-.gh-signin .form-group {
     margin-bottom: 1.5rem;
 }
+
+.gh-signin .gh-input,
+.gh-signin .gh-input:-webkit-autofill::first-line {
+    height: 54px;
+    padding: 12px 16px;
+    font-size: 1.8rem;
+    border-radius: 8px;
+}
+
+.gh-signin .gh-input::placeholder {
+    color: #abb4be;
+    font-weight: 400;
+    opacity: 1;
+}
+
+.gh-signin .gh-input::-webkit-input-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+}
+
+.gh-signin .gh-input:-ms-input-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+}
+
+.gh-signin .gh-input::-moz-placeholder {
+    color: #abb4be;
+    font-weight: 400;
+    opacity: 1;
+}
+
+.gh-signin .gh-input:focus {
+    border-color: #30cf43;
+    box-shadow: 0 0 0 3px rgba(26,170,96,.15);
+}
+
 .gh-signin .gh-btn {
     margin: 0;
 }
 
+.gh-signin .gh-btn {
+    width: 100%;
+    height: 54px;
+    max-width: unset;
+    margin-top: 32px;
+    background: #15171A;
+    font-weight: 300;
+    line-height: 54px;
+    border-radius: 8px;
+    transition: all 0.4s ease;
+    -webkit-font-smoothing: subpixel-antialiased;
+}
+
+.gh-signin .gh-btn span {
+    color: #fff;
+    font-size: 1.8rem;
+}
+
 /* Error /ghost/404/
 /* ---------------------------------------------------------- */
 

package/core/frontend/services/routing/router-manager.js

@@ -35,7 +35,7 @@ class RouterManager {
     routerCreated(router) {
         // NOTE: this event should be become an "internal frontend even"
         //       and should not be consumed by the modules outside the frontend
-        events.emit('router.created', this);
+        events.emit('router.created', router);
 
         // CASE: there are router types which do not generate resource urls
         //       e.g. static route router, in this case we don't want ot notify the URL service