diff --git a/public/assets/css/login.css b/public/assets/css/login.css index 9fec471..04d99b3 100644 --- a/public/assets/css/login.css +++ b/public/assets/css/login.css @@ -1,7 +1,11 @@ .wrapper { display: flex; + flex-flow: column; min-height: 100vh; } +header { + margin: 35px 0; +} .account-form-wrapper { margin: auto; @@ -9,34 +13,19 @@ overflow: hidden; } -.account-form-wrapper .logotype { - display: block; - position: relative; - left: -6px; - margin-bottom: 30px; -} - -.account-form-wrapper .logotype svg { - width: 140px; -} -.account-form-wrapper .logotype svg text { - font-size: 20px; - transform: translate(593px, 495px); -} - form.account { display: block; padding: 40px 48px; - background-color: #292E53; + background-color: #292e53; color: var(--text-secondary); border-radius: 12px; - width: 360px; - max-width: calc(90vw - 96px); + width: min(480px, 90vw); + box-sizing: border-box; } form.account h2 { margin: 0; - color: var(--text) + color: var(--text); } form.account p { @@ -53,7 +42,7 @@ form.account input { display: block; font-family: Poppins, Arial, Helvetica, sans-serif; font-size: 1rem; - background-color: #353C6A; + background-color: #353c6a; border: none; border-radius: 4px; padding: 12px; @@ -62,7 +51,7 @@ form.account input { } form.account input:focus { - background-color: #4B5595; + background-color: #4b5595; outline: none; transition: 150ms; } @@ -84,7 +73,7 @@ form.account button { font-size: 1rem; color: var(--text); padding: 12px 30px; - background: #353C6A; + background: #353c6a; margin-top: 18px; cursor: pointer; width: 100%; @@ -99,7 +88,7 @@ form.account button[type="submit"] { form.account a { text-decoration: none; display: block; - color: var(--text-secondary); + color: var(--text-secondary); text-align: right; margin: 6px 0; width: fit-content; @@ -114,19 +103,23 @@ form.account a.pwdreset { } form.account a.register { - margin:auto; + margin: auto; margin-top: 18px; } -form.account.register div:last-child { - margin-top: 42px; -} - @keyframes banner-notice { - 0% {top: -150px} - 20% {top: 35px} - 80% {top: 35px} - 100% {top: -150px} + 0% { + top: -150px; + } + 20% { + top: 35px; + } + 80% { + top: 35px; + } + 100% { + top: -150px; + } } .banner-notice { display: flex; @@ -142,5 +135,35 @@ form.account.register div:last-child { z-index: 3; } .banner-notice.error div { - background: #A9375B; -} \ No newline at end of file + background: #a9375b; +} + +form.account.register { + display: grid; + grid-template-columns: repeat(2, 1fr); + width: min(780px, 90vw); + column-gap: 24px; + margin-bottom: 48px; +} +form.account.register div.h-captcha { + grid-column: 1 / span 2; + display: flex; + justify-content: center; +} +form.account.register p, +form.account.register div.email, +form.account.register div.buttons { + grid-column: 1 / span 2; +} + +@media screen and (max-width: 720px) { + form.account.register { + grid-template-columns: 1fr; + } + form.account.register div.h-captcha, + form.account.register p, + form.account.register div.email, + form.account.register div.buttons { + grid-column: unset; + } +} diff --git a/src/routers/account.js b/src/routers/account.js index 74bdfa0..e6c6873 100644 --- a/src/routers/account.js +++ b/src/routers/account.js @@ -28,13 +28,25 @@ router.get('/', async (request, response) => { return response.redirect('/account/login'); } + const { upgrade_success } = request.query; + console.log(upgrade_success); + const stripe = {}; + if (upgrade_success === 'true') { + stripe.showNotice = true; + stripe.success = true; + } else if (upgrade_success === 'false') { + stripe.showNotice = true; + stripe.error = true; + } + // Setup the data to be sent to the handlebars renderer const renderData = { layout: 'main', locale: util.getLocale(request.locale.region, request.locale.language), localeString: request.locale.toString(), linked: request.cookies.linked, - error: request.cookies.error + error: request.cookies.error, + stripe: stripe }; // Reset message cookies diff --git a/views/account/account.handlebars b/views/account/account.handlebars index e9d5d0e..870300b 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -52,8 +52,9 @@
-

Servers

-
+

Beta access

+ {{#if isTester}} +
{{#if discordUser}} - {{#if isTester }} -

Connected as {{ discordUser.username }}#{{ discordUser.discriminator }}

+

Connected to Discord as {{ discordUser.username }}#{{ discordUser.discriminator }}

- {{else}} -

Beta servers are exclusive to testers. To become a tester, check us out on Patreon and link your Discord account to your Patreon and PNID accounts

- {{/if}} {{else}} -

Beta servers are exclusive to testers. If you're already a tester, connect your Discord account here.

+

To gain access to the developer chats, run /command in the server.

{{/if}} + {{else}} +

Beta servers are exclusive to testers. To upgrade to a higher tier, click here.

+ {{/if}}

Sign in and security

@@ -154,4 +154,22 @@ {{/if}} +{{#if stripe.showNotice}} + {{#if stripe.success}} + + {{/if}} + + {{#if stripe.error}} + + {{/if}} +{{/if}} + \ No newline at end of file diff --git a/views/account/login.handlebars b/views/account/login.handlebars index c5373c8..2a27ba7 100644 --- a/views/account/login.handlebars +++ b/views/account/login.handlebars @@ -1,32 +1,10 @@
-
- - - - - - Pretendo - - - - + {{> header}} + +