diff --git a/ghost/admin/app/components/gh-nav-menu.js b/ghost/admin/app/components/gh-nav-menu.js index 2006e15e4f..dabccca349 100644 --- a/ghost/admin/app/components/gh-nav-menu.js +++ b/ghost/admin/app/components/gh-nav-menu.js @@ -25,6 +25,7 @@ export default Component.extend(ShortcutsMixin, { iconStyle: '', showSearchModal: false, + showBillingModal: false, shortcuts: null, @@ -78,6 +79,9 @@ export default Component.extend(ShortcutsMixin, { }, toggleSearchModal() { this.toggleProperty('showSearchModal'); + }, + toggleBillingModal() { + this.toggleProperty('showBillingModal'); } }, diff --git a/ghost/admin/app/components/modal-billing.js b/ghost/admin/app/components/modal-billing.js new file mode 100644 index 0000000000..e083ba9a3c --- /dev/null +++ b/ghost/admin/app/components/modal-billing.js @@ -0,0 +1,4 @@ +import ModalComponent from 'ghost-admin/components/modal-base'; + +export default ModalComponent.extend({ +}); diff --git a/ghost/admin/app/routes/billing.js b/ghost/admin/app/routes/billing.js deleted file mode 100644 index b70cd6016d..0000000000 --- a/ghost/admin/app/routes/billing.js +++ /dev/null @@ -1,25 +0,0 @@ -import AuthenticatedRoute from 'ghost-admin/routes/authenticated'; -import {inject as service} from '@ember/service'; - -export default AuthenticatedRoute.extend({ - config: service(), - router: service(), - - beforeModel() { - // Transition to home if billing is not available - if (!this.get('config.billingUrl')) { - return this.transitionTo('home'); - } - }, - - model() { - return (new Date()).valueOf(); - }, - - buildRouteInfoMetadata() { - return { - titleToken: 'Billing' - }; - } -}); - diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css index 044b7af4d1..b4057bec8d 100644 --- a/ghost/admin/app/styles/app-dark.css +++ b/ghost/admin/app/styles/app-dark.css @@ -60,6 +60,7 @@ @import "layouts/labs.css"; @import "layouts/whats-new.css"; @import "layouts/preview-email.css"; +@import "layouts/billing.css"; :root { @@ -513,4 +514,4 @@ input:focus, } .gh-members-chart-header .gh-contentfilter-type .gh-contentfilter-menu-trigger { box-shadow: 0 0 0 1px color-mod(var(--darkgrey) l(-27%) blackness(+15%) alpha(50%)); -} \ No newline at end of file +} diff --git a/ghost/admin/app/styles/app.css b/ghost/admin/app/styles/app.css index 6882fd9a2e..ff5dcf47ec 100644 --- a/ghost/admin/app/styles/app.css +++ b/ghost/admin/app/styles/app.css @@ -60,6 +60,7 @@ @import "layouts/labs.css"; @import "layouts/whats-new.css"; @import "layouts/preview-email.css"; +@import "layouts/billing.css"; /* ---------------------------✈️----------------------------- */ diff --git a/ghost/admin/app/styles/layouts/billing.css b/ghost/admin/app/styles/layouts/billing.css new file mode 100644 index 0000000000..288ed827f8 --- /dev/null +++ b/ghost/admin/app/styles/layouts/billing.css @@ -0,0 +1,37 @@ +.fullscreen-modal-billing { + margin: 0; + max-width: 100%; +} + +.fullscreen-modal-billing .modal-content { + position: relative; + height: 100%; + padding: 0; +} + +.fullscreen-modal-billing .modal-body { + margin: 0; +} + +.fullscreen-modal-billing .billing-frame { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: 100%; + height: 100%; + border: none; + transform: translate3d(0, 0, 0); +} + +.gh-billing-close { + width: calc(50vw - 200px) +} + +.gh-billing-close button { + stroke: var(--midgrey); + opacity: 0.6; + transition: all 0.2s ease-in-out; + top: 25px; +} diff --git a/ghost/admin/app/templates/components/gh-billing-iframe.hbs b/ghost/admin/app/templates/components/gh-billing-iframe.hbs index 8484315bc9..9b872f5573 100644 --- a/ghost/admin/app/templates/components/gh-billing-iframe.hbs +++ b/ghost/admin/app/templates/components/gh-billing-iframe.hbs @@ -1,15 +1 @@ - - - + \ No newline at end of file diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/templates/components/gh-nav-menu.hbs index 0386a66987..efe5443a46 100644 --- a/ghost/admin/app/templates/components/gh-nav-menu.hbs +++ b/ghost/admin/app/templates/components/gh-nav-menu.hbs @@ -14,6 +14,12 @@ @modifier="action wide" /> {{/if}} +{{#if this.showBillingModal}} + +{{/if}} +
diff --git a/ghost/admin/app/templates/components/modal-billing.hbs b/ghost/admin/app/templates/components/modal-billing.hbs new file mode 100644 index 0000000000..2066093125 --- /dev/null +++ b/ghost/admin/app/templates/components/modal-billing.hbs @@ -0,0 +1,7 @@ +
+ +
+ +