From 3f6f09c0334192e0c5428784311c4393cc385f12 Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Fri, 19 Aug 2022 20:46:13 +0200 Subject: [PATCH 01/20] chore: add weblate widget to readme --- README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 89b5bac..f7fe71d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,18 @@ -# Website for Pretendo Network +# Website -This is the Repository for the Website of the Pretendo Network. +This repository contains the source code for [our website](https://pretendo.network). All contributions should go in the [dev branch](https://github.com/PretendoNetwork/website/tree/dev). -Contributions should go in the [dev branch](https://github.com/PretendoNetwork/website/tree/dev). +### Localization +If you'd like to help localize Pretendo Network, you can check out our project on [Weblate](https://hosted.weblate.org/engage/pretendonetwork/). -Visit the [live version](https://pretendo.network) + + Translation status + + +* * * + +Join our Discord: - + \ No newline at end of file From 146c00731079b2b166b132cf2d5c93dfd545f525 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 22:02:16 +0000 Subject: [PATCH 02/20] chore(deps): bump mongoose from 6.4.0 to 6.4.6 Bumps [mongoose](https://github.com/Automattic/mongoose) from 6.4.0 to 6.4.6. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/6.4.0...6.4.6) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6ab64d..f4adcf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3078,9 +3078,9 @@ } }, "node_modules/mongoose": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.0.tgz", - "integrity": "sha512-eBDrueap1Zx3qFrcYylTiqTFlL5iTEaYAxoDF1MSRdipwAzChQRMJve+vxHtxPhI2q5tmf9RYHfZwXfTUHPd3g==", + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.6.tgz", + "integrity": "sha512-ZAfNCWgXhwev6k/+rMzjHIJ/+wLkundQU/i+aUTqmCgGoYqc+B5e4EC4Y3E1XaLzNXiWID1/vocSM6zs5IAGvA==", "dependencies": { "bson": "^4.6.2", "kareem": "2.4.1", @@ -6938,9 +6938,9 @@ } }, "mongoose": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.0.tgz", - "integrity": "sha512-eBDrueap1Zx3qFrcYylTiqTFlL5iTEaYAxoDF1MSRdipwAzChQRMJve+vxHtxPhI2q5tmf9RYHfZwXfTUHPd3g==", + "version": "6.4.6", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.6.tgz", + "integrity": "sha512-ZAfNCWgXhwev6k/+rMzjHIJ/+wLkundQU/i+aUTqmCgGoYqc+B5e4EC4Y3E1XaLzNXiWID1/vocSM6zs5IAGvA==", "requires": { "bson": "^4.6.2", "kareem": "2.4.1", From 7703ad51b96731d5ffda4559e87f228e174cb61b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 22:02:29 +0000 Subject: [PATCH 03/20] chore(deps): bump undici from 5.8.0 to 5.10.0 Bumps [undici](https://github.com/nodejs/undici) from 5.8.0 to 5.10.0. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](https://github.com/nodejs/undici/compare/v5.8.0...v5.10.0) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6ab64d..f8e47b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4354,9 +4354,9 @@ } }, "node_modules/undici": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.8.0.tgz", - "integrity": "sha512-1F7Vtcez5w/LwH2G2tGnFIihuWUlc58YidwLiCv+jR2Z50x0tNXpRRw7eOIJ+GvqCqIkg9SB7NWAJ/T9TLfv8Q==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.10.0.tgz", + "integrity": "sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g==", "engines": { "node": ">=12.18" } @@ -7928,9 +7928,9 @@ } }, "undici": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.8.0.tgz", - "integrity": "sha512-1F7Vtcez5w/LwH2G2tGnFIihuWUlc58YidwLiCv+jR2Z50x0tNXpRRw7eOIJ+GvqCqIkg9SB7NWAJ/T9TLfv8Q==" + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.10.0.tgz", + "integrity": "sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g==" }, "universalify": { "version": "2.0.0", From f45895790fc1d256a457ed70c773f88f2ef647fd Mon Sep 17 00:00:00 2001 From: mrjvs Date: Tue, 20 Sep 2022 18:54:49 +0200 Subject: [PATCH 04/20] Revert "hotfixes" --- docs/it_IT/welcome.md | 73 ++++++++++++++++++++++ locales/en_US.json | 27 +-------- src/routes/account.js | 7 +-- src/server.js | 51 ++++++++++++++++ src/util.js | 12 +--- views/account/account.handlebars | 81 +++++++++++++------------ views/account/login.handlebars | 14 ++--- views/account/register.handlebars | 18 +++--- views/account/upgrade.handlebars | 30 ++++----- views/blog/blog.handlebars | 8 +-- views/blog/blogpost.handlebars | 4 +- views/docs/docs.handlebars | 10 ++- views/docs/search.handlebars | 8 +-- views/docs/welcome.handlebars | 12 ++-- views/home.handlebars | 50 +++++++-------- views/localization.handlebars | 12 ++-- views/partials/docs-sidebar.handlebars | 12 ++-- views/partials/footer.handlebars | 28 ++++----- views/partials/header.handlebars | 18 +++--- views/partials/progress-list.handlebars | 2 +- views/progress.handlebars | 6 +- 21 files changed, 290 insertions(+), 193 deletions(-) create mode 100644 docs/it_IT/welcome.md diff --git a/docs/it_IT/welcome.md b/docs/it_IT/welcome.md new file mode 100644 index 0000000..1fbbc7a --- /dev/null +++ b/docs/it_IT/welcome.md @@ -0,0 +1,73 @@ +# Altra documentazione + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +```javascript +function returnTrue() { + class trueOrFalseObject { + constructor(trueOrFalse) { + this.trueOrFalse = trueOrFalse; + } + get trueOrFalse() { + return this.trueOrFalse(); + } + convertNumberToBoolean(trueOrFalse) { + if (convertStringToNumber(trueOrFalse) === 0) { + return true; + } else if (convertStringToNumber(trueOrFalse) == 1) { + return false; + } + } + convertStringToNumber(trueOrFalse) { + if (trueOrFalse === "true") { + return 0; + } else if (trueOrFalse === "false") { + return true * 69 - 1 - false * 69 * 420 - 69 + 2; + } + } + trueOrFalse() { + return this.convertNumberToBoolean(trueOrFalse); + } + } + + let objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); + + function checkIfTrueOrFalse(objectToCheckIfTrueOrFalse) { + if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { + return objectWhichWeKnowIsTrue.trueOrFalse; + console.log( + "Successfully checked if the object is true or false. Result: the object is true." + ); + // TODO: fix text not console logging + } else { + objectWhichWeKnowIsTrue = new trueOrFalseObject("false"); + if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { + return objectWhichWeKnowIsTrue.trueOrFalse; + console.log( + "Successfully checked if the object is true or false. Result: the object is false." + ); + // TODO: fix text not console logging + } else { + // something went horribly wrong + } + objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); + } + } + + const isTrueTrueOrFalse = checkIfTrueOrFalse("true"); + const isfalseTrueOrFalse = checkIfTrueOrFalse("false"); + + const trueOrFalseJSON = { + true: isTrueTrueOrFalse, + false: isfalseTrueOrFalse, + }; + + return trueOrFalseJSON.true +} + +console.log(returnTrue()) +``` diff --git a/locales/en_US.json b/locales/en_US.json index 936f6e7..1824f8b 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -7,7 +7,6 @@ "progress": "Progress", "blog": "Blog", "account": "Account", - "donate": "Donate", "accountWidget": { "settings": "Settings", "logout": "Logout" @@ -238,7 +237,6 @@ "publishedOn": "on" }, "account": { - "account": "Account", "loginForm": { "login": "Login", "register": "Register", @@ -256,9 +254,7 @@ "downloadFiles": "Download account files", "downloadFilesDescription": "(will not work on Nintendo Network)", "upgrade": "Upgrade account", - "unavailable": "Unavailable", "settingCards": { - "userSettings": "User settings", "profile": "Profile", "nickname": "Nickname", "birthDate": "Birth date", @@ -284,10 +280,7 @@ "linkDiscord": "Link Discord account", "newsletter": "Newsletter", "newsletterPrompt": "Receive project updates via email (you can opt-out at any time)", - "passwordPrompt": "Enter your PNID password to download Cemu files", - "no_signins_notice": "Sign in history not currently tracked. Check back again later!", - "no_newsletter_notice": "Newsletter not currently available. Check back again later", - "no_edit_from_dashboard": "Editing PNID settings from user dashboard is currently unavailable. Please update user settings from your linked game console" + "passwordPrompt": "Enter your PNID password to download Cemu files" } }, "accountLevel": [ @@ -337,26 +330,10 @@ "caption": "Search for it here" } ] - }, - "search": { - "title": "Got an error code?", - "caption": "Type it in the box below to get information on your issue!", - "label": "Error code", - "no_match": "No matches found" - }, - "sidebar": { - "getting_started": "Getting started", - "welcome": "Welcome", - "install_extended": "Install Pretendo", - "install": "Install", - "search": "Search", - "juxt_err": "Error codes - Juxt" - } }, "modals": { "cancel": "Cancel", - "confirm": "Confirm", - "close": "Close" + "confirm": "Confirm" } } diff --git a/src/routes/account.js b/src/routes/account.js index fb5f8df..166e185 100644 --- a/src/routes/account.js +++ b/src/routes/account.js @@ -70,11 +70,7 @@ router.get('/', requireLoginMiddleware, async (request, response) => { }); router.get('/login', async (request, response) => { - const renderData = { - error: request.cookies.error_message - }; - - response.render('account/login', renderData); + response.render('account/login'); }); router.post('/login', async (request, response) => { @@ -101,7 +97,6 @@ router.get('/register', async (request, response) => { email: request.cookies.email, username: request.cookies.username, mii_name: request.cookies.mii_name, - error: request.cookies.error_message }; response.clearCookie('email', { domain: '.pretendo.network' }); diff --git a/src/server.js b/src/server.js index c26f332..940ed15 100644 --- a/src/server.js +++ b/src/server.js @@ -12,6 +12,7 @@ const database = require('./database'); const util = require('./util'); const logger = require('./logger'); const config = require('../config.json'); +const defaultLocale = require('../locales/en_US.json'); const { http: { port } } = config; const app = express(); @@ -136,6 +137,56 @@ app.engine('handlebars', handlebars({ neq(value1, value2) { return value1 !== value2; }, + times(n, block) { + let accum = ''; + for(let i = 0; i < n; i++) { + accum += block.fn(i); + } + return accum; + }, + localeHelper(locale, propString, propVar, extra) { + /* + locale: the json locale object + propString: the "path" to the property to get (e.g. "faq.title") + propVar: the dynamic property name to get after the "path" (e.g. localeHelper locale "account.level" would result in ) + e.g. localeHelper locale "account.test" "account.level" would result in locale.account.test[account.level] + */ + + let value = locale; + const props = propString.split('.'); + + if ( typeof propVar === 'string' || propVar instanceof String || + typeof propVar === 'number' || propVar instanceof Number ) { + props.push(propVar); + } + + function getPropFromLocale(value, props) { + for (const p of props) { + value = value[p]; + } + + return value; + } + + // fall back to english if the prop doesn't exist in the current locale + try { + value = getPropFromLocale(value, props); + } catch (e) { + value = defaultLocale; + try { + value = getPropFromLocale(value, props); + } catch (e) { + logger.error(`Could not find locale property ${props.join('.')}`); + } + } + + // TODO: Make this more dynamic + if (extra) { + value = value[extra]; + } + + return value; + }, slug(string) { return string.toLowerCase().replaceAll(/ /g, '-'); } diff --git a/src/util.js b/src/util.js index 87149b4..6598b31 100644 --- a/src/util.js +++ b/src/util.js @@ -6,14 +6,11 @@ const Stripe = require('stripe'); const { marked } = require('marked'); const { REST: DiscordRest } = require('@discordjs/rest'); const { Routes: DiscordRoutes } = require('discord-api-types/v10'); -const merge = require('lodash.merge'); - const mailer = require('./mailer'); const database = require('./database'); const logger = require('./logger'); - const config = require('../config.json'); -const baseLocale = require(`${__dirname}/../locales/en_US.json`); + const discordRest = new DiscordRest({ version: '10' }).setToken(config.discord.bot_token); const stripe = new Stripe(config.stripe.secret_key); @@ -26,15 +23,12 @@ function getLocale(language, region) { const path = `${__dirname}/../locales/${language}_${region}.json`; if (fs.pathExistsSync(path)) { - const selectedLocale = require(path); - const finalLocale = merge(baseLocale, selectedLocale); - - return finalLocale; + return require(path); } logger.warn(`Could not find locale ${language}_${region}! Loading en_US`); - return baseLocale; + return require(`${__dirname}/../locales/en_US.json`); } function getRawDocs(locale, subpath, pageName) { diff --git a/views/account/account.handlebars b/views/account/account.handlebars index 230d70c..2ffe7f6 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -16,29 +16,29 @@

{{tierName}}

{{else}} {{#if (neq account.access_level -1)}} -

{{ lookup locale.account.accountLevel account.access_level }}

+

{{ localeHelper locale "account.accountLevel" account.access_level }}

{{else}} -

{{ locale.account.banned }}

+

{{ localeHelper locale "account.banned" }}

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

{{ locale.account.settings.downloadFiles }}

-

{{ locale.account.settings.downloadFilesDescription }}

+

{{ localeHelper locale "account.settings.downloadFiles" }}

+

{{ localeHelper locale "account.settings.downloadFilesDescription" }}

 -

{{ locale.account.settings.upgrade }}

+

{{ localeHelper locale "account.settings.upgrade" }}
-

{{ locale.account.settings.settingCards.userSettings }}

+

User settings

-

{{ locale.account.settings.settingCards.profile }}

+

{{ localeHelper locale "account.settings.settingCards.profile" }}

@@ -46,30 +46,30 @@
  • -

    {{ locale.account.settings.settingCards.nickname }}

    +

    {{ localeHelper locale "account.settings.settingCards.nickname" }}

    {{account.mii.name}}

  • -

    {{ locale.account.settings.settingCards.birthDate }}

    +

    {{ localeHelper locale "account.settings.settingCards.birthDate" }}

    {{account.birthdate}}

  • -

    {{ locale.account.settings.settingCards.gender }}

    +

    {{ localeHelper locale "account.settings.settingCards.gender" }}

    {{account.gender}}

  • -

    {{ locale.account.settings.settingCards.country }}

    +

    {{ localeHelper locale "account.settings.settingCards.country" }}

    {{account.country}}

  • -

    {{ locale.account.settings.settingCards.timezone }}

    +

    {{ localeHelper locale "account.settings.settingCards.timezone" }}

    {{account.timezone.name}}

-

{{ locale.account.settings.settingCards.serverEnv }}

+

{{ localeHelper locale "account.settings.settingCards.serverEnv" }}

@@ -82,7 +82,7 @@ -

{{ locale.account.settings.settingCards.production }}

+

{{ localeHelper locale "account.settings.settingCards.production" }}

{{#if isTester}} @@ -90,21 +90,21 @@ -

{{ locale.account.settings.settingCards.beta }}

+

{{ localeHelper locale "account.settings.settingCards.beta" }}

{{/if}}
{{#unless isTester}} -

{{{ locale.account.settings.settingCards.upgradePrompt }}}

+

{{{ localeHelper locale "account.settings.settingCards.upgradePrompt" }}}

{{else}} -

{{ locale.account.settings.settingCards.hasAccessPrompt }}

+

{{ localeHelper locale "account.settings.settingCards.hasAccessPrompt" }}

{{/unless}}
-

{{ locale.account.settings.settingCards.signInSecurity }}

+

{{ localeHelper locale "account.settings.settingCards.signInSecurity" }}

-

{{ locale.account.account }}

+

Account

@@ -112,20 +112,20 @@
  • -

    {{ locale.account.settings.settingCards.email }}

    +

    {{ localeHelper locale "account.settings.settingCards.email" }}

    {{account.email.address}}

  • -

    {{ locale.account.settings.settingCards.password }}

    +

    {{ localeHelper locale "account.settings.settingCards.password" }}

    ●●●●●●●●

-

{{ locale.account.settings.settingCards.passwordResetNotice }}

+

{{ localeHelper locale "account.settings.settingCards.passwordResetNotice" }}

-

{{ locale.account.settings.settingCards.otherSettings }}

+

{{ localeHelper locale "account.settings.settingCards.otherSettings" }}

-

{{ locale.account.settings.settingCards.discord }}

+

{{ localeHelper locale "account.settings.settingCards.discord" }}

{{#if discordUser}} -

{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}#{{ discordUser.discriminator }}

+

{{ localeHelper locale "account.settings.settingCards.connectedToDiscord" }} {{ discordUser.username }}#{{ discordUser.discriminator }}

- + {{else}} -

{{ locale.account.settings.settingCards.noDiscordLinked }} {{ locale.account.settings.settingCards.linkDiscord }}

+

{{ localeHelper locale "account.settings.settingCards.noDiscordLinked" }} {{ localeHelper locale "account.settings.settingCards.linkDiscord" }}

{{/if}}
-

{{ locale.account.settings.settingCards.newsletter }}

-

{{ locale.account.settings.settingCards.no_newsletter_notice }}

+

{{ localeHelper locale "account.settings.settingCards.newsletter" }}

+

Newsletter not currently available. Check back again later

@@ -185,22 +185,23 @@ + diff --git a/views/account/login.handlebars b/views/account/login.handlebars index 6ae3aa3..7664ed6 100644 --- a/views/account/login.handlebars +++ b/views/account/login.handlebars @@ -6,22 +6,22 @@ diff --git a/views/account/register.handlebars b/views/account/register.handlebars index 0c8b726..8419bad 100644 --- a/views/account/register.handlebars +++ b/views/account/register.handlebars @@ -7,33 +7,33 @@ diff --git a/views/account/upgrade.handlebars b/views/account/upgrade.handlebars index 5ef9a07..d353629 100644 --- a/views/account/upgrade.handlebars +++ b/views/account/upgrade.handlebars @@ -2,7 +2,7 @@
- {{ locale.upgrade.back }} + {{ localeHelper locale "upgrade.back" }}

- {{this.price}} / {{ locale.upgrade.month }} + {{this.price}} / {{ localeHelper locale "upgrade.month" }}

{{/each}}
- - + +
diff --git a/views/blog/blog.handlebars b/views/blog/blog.handlebars index ee03b0a..d5056e9 100644 --- a/views/blog/blog.handlebars +++ b/views/blog/blog.handlebars @@ -7,8 +7,8 @@
-

{{ locale.blogPage.title }}

-

{{{ locale.blogPage.description }}}

+

{{ localeHelper locale "blogPage.title" }}

+

{{{ localeHelper locale "blogPage.description" }}}

@@ -18,12 +18,12 @@

{{{ this.postInfo.title }}}

{{{ this.postInfo.caption }}}

- {{ ../locale.blogPage.published }} + {{ localeHelper ../locale "blogPage.published" }}
{{{ this.postInfo.author }}}
- {{ ../locale.blogPage.publishedOn }} + {{ localeHelper ../locale "blogPage.publishedOn" }} {{{ this.postInfo.date }}}
diff --git a/views/blog/blogpost.handlebars b/views/blog/blogpost.handlebars index 21ac56b..dfb61ec 100644 --- a/views/blog/blogpost.handlebars +++ b/views/blog/blogpost.handlebars @@ -9,12 +9,12 @@

{{{ postInfo.title }}}

- {{ locale.blogPage.published }} + {{ localeHelper locale "blogPage.published" }}
{{ postInfo.author }} {{{ postInfo.author }}}
- {{ locale.blogPage.publishedOn }} + {{ localeHelper locale "blogPage.publishedOn" }} {{{ postInfo.date }}}
diff --git a/views/docs/docs.handlebars b/views/docs/docs.handlebars index b080960..ec5394c 100644 --- a/views/docs/docs.handlebars +++ b/views/docs/docs.handlebars @@ -38,9 +38,15 @@
- +
+ Note! +
+ Pretendo Network is currently in closed beta! The servers are only accessible to testers. To become a tester, + upgrade your PNID here +
+ {{#if missingInLocale}} -

{{ locale.docs.missingInLocale }}

+

{{ localeHelper locale "docs.missingInLocale" }}

{{/if}} {{{ content }}} diff --git a/views/docs/search.handlebars b/views/docs/search.handlebars index b05907a..339a4a2 100644 --- a/views/docs/search.handlebars +++ b/views/docs/search.handlebars @@ -39,9 +39,9 @@
-

{{ locale.docs.search.title }}

-

{{ locale.docs.search.caption }}

- +

Got an error code?

+

Type it in the box below to get information on your issue!

+
@@ -107,7 +107,7 @@ }); } else { const noMatch = document.createElement('p'); - noMatch.innerText = '{{ locale.docs.search.no_match }}'; + noMatch.innerText = 'No matches found'; matchesContainer.appendChild(noMatch); } }); diff --git a/views/docs/welcome.handlebars b/views/docs/welcome.handlebars index 76d7b25..5424440 100644 --- a/views/docs/welcome.handlebars +++ b/views/docs/welcome.handlebars @@ -44,7 +44,7 @@
-

{{ locale.docs.quickLinks.header }}

+

{{ localeHelper locale "docs.quickLinks.header" }}

-

{{ locale.docs.quickLinks.links.[0].header }}

-

{{ locale.docs.quickLinks.links.[0].caption }}

+

{{ localeHelper locale "docs.quickLinks.links" 0 "header" }}

+

{{ localeHelper locale "docs.quickLinks.links" 0 "caption" }}

-

{{ locale.docs.quickLinks.links.[1].header }}

-

{{ locale.docs.quickLinks.links.[1].caption }}

+

{{ localeHelper locale "docs.quickLinks.links" 1 "header" }}

+

{{ localeHelper locale "docs.quickLinks.links" 1 "caption" }}

- + \ No newline at end of file diff --git a/views/home.handlebars b/views/home.handlebars index 7a41f4f..e96c33d 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -5,13 +5,15 @@
-

{{ locale.hero.subtitle }}

-

{{ locale.hero.title }}

-

{{ locale.hero.text }}

+

{{ localeHelper locale "hero.subtitle" }}

+

{{ localeHelper locale "hero.title" }}

+

+ {{ localeHelper locale "hero.text" }} +

@@ -73,7 +75,7 @@
-

{{ locale.aboutUs.title }}

+

{{ localeHelper locale "aboutUs.title" }}

{{#each locale.aboutUs.paragraphs}}

{{ this }}

{{/each}} @@ -81,7 +83,7 @@

- {{ locale.progress.title }} + {{ localeHelper locale "progress.title" }}

{{> progress-list data=featuredFeatureList purple=true }}
@@ -89,8 +91,8 @@
-

{{ locale.faq.title }}

-

{{ locale.faq.text }}

+

{{ localeHelper locale "faq.title" }}

+

{{ localeHelper locale "faq.text" }}

{{#doFaq locale.faq.QAs}} @@ -108,32 +110,32 @@
-

{{ locale.showcase.title }}

-

{{ locale.showcase.text }}

+

{{ localeHelper locale "showcase.title" }}

+

{{ localeHelper locale "showcase.text" }}

-

{{ locale.showcase.cards.0.title }}

-

{{ locale.showcase.cards.0.caption }}

+

{{ localeHelper locale "showcase.cards.0.title" }}

+

{{ localeHelper locale "showcase.cards.0.caption" }}

-

{{ locale.showcase.cards.1.title }}

-

{{ locale.showcase.cards.1.caption }}

+

{{ localeHelper locale "showcase.cards.1.title" }}

+

{{ localeHelper locale "showcase.cards.1.caption" }}

-

{{ locale.showcase.cards.2.title }}

-

{{ locale.showcase.cards.2.caption }}

+

{{ localeHelper locale "showcase.cards.2.title" }}

+

{{ localeHelper locale "showcase.cards.2.caption" }}

-

{{ locale.credits.title }}

-

{{ locale.credits.text }}

+

{{ localeHelper locale "credits.title" }}

+

{{ localeHelper locale "credits.text" }}

{{#each locale.credits.people}} @@ -158,8 +160,8 @@
-

{{ locale.specialThanks.title }}

-

{{ locale.specialThanks.text }}

+

{{ localeHelper locale "specialThanks.title" }}

+

{{ localeHelper locale "specialThanks.text" }}

@@ -196,12 +198,12 @@ diff --git a/views/localization.handlebars b/views/localization.handlebars index 83034b9..4db42b2 100644 --- a/views/localization.handlebars +++ b/views/localization.handlebars @@ -6,17 +6,17 @@
-

{{ locale.localizationPage.title" }}

-

{{ locale.localizationPage.description" }}

+

{{ localeHelper locale "localizationPage.title" }}

+

{{ localeHelper locale "localizationPage.description" }}

- {{ locale.localizationPage.instructions" }} + {{ localeHelper locale "localizationPage.instructions" }}
- +
- - + +
diff --git a/views/partials/docs-sidebar.handlebars b/views/partials/docs-sidebar.handlebars index 8c63f45..5737935 100644 --- a/views/partials/docs-sidebar.handlebars +++ b/views/partials/docs-sidebar.handlebars @@ -1,13 +1,13 @@
-
{{ locale.docs.sidebar.getting_started }}
- {{ locale.docs.sidebar.welcome }} - {{ locale.docs.sidebar.install_extended }} - {{ locale.docs.sidebar.search }} +
Getting started
+ Welcome + Install Pretendo + Search
-
{{ locale.docs.sidebar.install }}
+
Install
Wii U 3DS Cemu @@ -16,7 +16,7 @@
-
{{ locale.docs.sidebar.juxt_err }}
+
Error codes - Juxt
JXT-598-0009 JXT-598-0010 JXT-598-0011 diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars index a5c7b20..c9f3beb 100644 --- a/views/partials/footer.handlebars +++ b/views/partials/footer.handlebars @@ -28,30 +28,29 @@

Site by mrjvs, jipfr & monty

-

{{ locale.footer.socials }}

+

{{ localeHelper locale "footer.socials" }}

Twitter Discord GitHub
-

{{ locale.footer.widget.captions.[0] }}

-

{{ locale.footer.widget.captions.[1] }}

+

{{ localeHelper locale "footer.widget.captions.0" }}

+

{{ localeHelper locale "footer.widget.captions.1" }}

- {{ locale.footer.widget.button }} + {{ localeHelper locale "footer.widget.button" }}
@@ -74,11 +73,10 @@ return el.innerText; } - const randomSentences = [ - {{#each locale.footer.bandwidthRaccoonQuotes}} - `${unescapeHTML("{{this}}")}`, - {{/each}} + {{#times 9}} + `${unescapeHTML("{{localeHelper locale "footer.bandwidthRaccoonQuotes" this }}")}`, + {{/times}} ] bandwidthRaccoon.addEventListener("click", () => diff --git a/views/partials/header.handlebars b/views/partials/header.handlebars index b82936b..be2e392 100644 --- a/views/partials/header.handlebars +++ b/views/partials/header.handlebars @@ -27,13 +27,13 @@
@@ -156,12 +156,12 @@
diff --git a/views/partials/progress-list.handlebars b/views/partials/progress-list.handlebars index 4395bdf..fdeb9f5 100644 --- a/views/partials/progress-list.handlebars +++ b/views/partials/progress-list.handlebars @@ -13,7 +13,7 @@
{{/if}} diff --git a/views/progress.handlebars b/views/progress.handlebars index 9be28da..2f0f574 100644 --- a/views/progress.handlebars +++ b/views/progress.handlebars @@ -7,8 +7,8 @@
-

{{ locale.progressPage.title }}

-

{{ locale.progressPage.description }}

+

{{ localeHelper locale "progressPage.title" }}

+

{{ localeHelper locale "progressPage.description" }}

@@ -18,7 +18,7 @@
-

{{{ locale.donation.progress }}} {{{ locale.donation.upgradePush }}}

+

{{{ localeHelper locale "donation.progress" }}} {{{ localeHelper locale "donation.upgradePush" }}}

From 41fa468fcc93c7ccdb55a43b4c57d8f9baa25054 Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Tue, 20 Sep 2022 19:10:04 +0200 Subject: [PATCH 05/20] Revert "Merge pull request #159 from PretendoNetwork/revert-158-dev" This reverts commit d2213b595a81384f578d55d6a2554f737271eab1, reversing changes made to a01e9a1844f099820cb2f67b5440a3d434c9d2dc. --- docs/it_IT/welcome.md | 73 ---------------------- locales/en_US.json | 27 ++++++++- src/routes/account.js | 7 ++- src/server.js | 51 ---------------- src/util.js | 12 +++- views/account/account.handlebars | 81 ++++++++++++------------- views/account/login.handlebars | 14 ++--- views/account/register.handlebars | 18 +++--- views/account/upgrade.handlebars | 30 ++++----- views/blog/blog.handlebars | 8 +-- views/blog/blogpost.handlebars | 4 +- views/docs/docs.handlebars | 10 +-- views/docs/search.handlebars | 8 +-- views/docs/welcome.handlebars | 12 ++-- views/home.handlebars | 50 ++++++++------- views/localization.handlebars | 12 ++-- views/partials/docs-sidebar.handlebars | 12 ++-- views/partials/footer.handlebars | 28 +++++---- views/partials/header.handlebars | 18 +++--- views/partials/progress-list.handlebars | 2 +- views/progress.handlebars | 6 +- 21 files changed, 193 insertions(+), 290 deletions(-) delete mode 100644 docs/it_IT/welcome.md diff --git a/docs/it_IT/welcome.md b/docs/it_IT/welcome.md deleted file mode 100644 index 1fbbc7a..0000000 --- a/docs/it_IT/welcome.md +++ /dev/null @@ -1,73 +0,0 @@ -# Altra documentazione - -Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. - -Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. - -Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. - -```javascript -function returnTrue() { - class trueOrFalseObject { - constructor(trueOrFalse) { - this.trueOrFalse = trueOrFalse; - } - get trueOrFalse() { - return this.trueOrFalse(); - } - convertNumberToBoolean(trueOrFalse) { - if (convertStringToNumber(trueOrFalse) === 0) { - return true; - } else if (convertStringToNumber(trueOrFalse) == 1) { - return false; - } - } - convertStringToNumber(trueOrFalse) { - if (trueOrFalse === "true") { - return 0; - } else if (trueOrFalse === "false") { - return true * 69 - 1 - false * 69 * 420 - 69 + 2; - } - } - trueOrFalse() { - return this.convertNumberToBoolean(trueOrFalse); - } - } - - let objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); - - function checkIfTrueOrFalse(objectToCheckIfTrueOrFalse) { - if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { - return objectWhichWeKnowIsTrue.trueOrFalse; - console.log( - "Successfully checked if the object is true or false. Result: the object is true." - ); - // TODO: fix text not console logging - } else { - objectWhichWeKnowIsTrue = new trueOrFalseObject("false"); - if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { - return objectWhichWeKnowIsTrue.trueOrFalse; - console.log( - "Successfully checked if the object is true or false. Result: the object is false." - ); - // TODO: fix text not console logging - } else { - // something went horribly wrong - } - objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); - } - } - - const isTrueTrueOrFalse = checkIfTrueOrFalse("true"); - const isfalseTrueOrFalse = checkIfTrueOrFalse("false"); - - const trueOrFalseJSON = { - true: isTrueTrueOrFalse, - false: isfalseTrueOrFalse, - }; - - return trueOrFalseJSON.true -} - -console.log(returnTrue()) -``` diff --git a/locales/en_US.json b/locales/en_US.json index 1824f8b..936f6e7 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -7,6 +7,7 @@ "progress": "Progress", "blog": "Blog", "account": "Account", + "donate": "Donate", "accountWidget": { "settings": "Settings", "logout": "Logout" @@ -237,6 +238,7 @@ "publishedOn": "on" }, "account": { + "account": "Account", "loginForm": { "login": "Login", "register": "Register", @@ -254,7 +256,9 @@ "downloadFiles": "Download account files", "downloadFilesDescription": "(will not work on Nintendo Network)", "upgrade": "Upgrade account", + "unavailable": "Unavailable", "settingCards": { + "userSettings": "User settings", "profile": "Profile", "nickname": "Nickname", "birthDate": "Birth date", @@ -280,7 +284,10 @@ "linkDiscord": "Link Discord account", "newsletter": "Newsletter", "newsletterPrompt": "Receive project updates via email (you can opt-out at any time)", - "passwordPrompt": "Enter your PNID password to download Cemu files" + "passwordPrompt": "Enter your PNID password to download Cemu files", + "no_signins_notice": "Sign in history not currently tracked. Check back again later!", + "no_newsletter_notice": "Newsletter not currently available. Check back again later", + "no_edit_from_dashboard": "Editing PNID settings from user dashboard is currently unavailable. Please update user settings from your linked game console" } }, "accountLevel": [ @@ -330,10 +337,26 @@ "caption": "Search for it here" } ] + }, + "search": { + "title": "Got an error code?", + "caption": "Type it in the box below to get information on your issue!", + "label": "Error code", + "no_match": "No matches found" + }, + "sidebar": { + "getting_started": "Getting started", + "welcome": "Welcome", + "install_extended": "Install Pretendo", + "install": "Install", + "search": "Search", + "juxt_err": "Error codes - Juxt" + } }, "modals": { "cancel": "Cancel", - "confirm": "Confirm" + "confirm": "Confirm", + "close": "Close" } } diff --git a/src/routes/account.js b/src/routes/account.js index 166e185..fb5f8df 100644 --- a/src/routes/account.js +++ b/src/routes/account.js @@ -70,7 +70,11 @@ router.get('/', requireLoginMiddleware, async (request, response) => { }); router.get('/login', async (request, response) => { - response.render('account/login'); + const renderData = { + error: request.cookies.error_message + }; + + response.render('account/login', renderData); }); router.post('/login', async (request, response) => { @@ -97,6 +101,7 @@ router.get('/register', async (request, response) => { email: request.cookies.email, username: request.cookies.username, mii_name: request.cookies.mii_name, + error: request.cookies.error_message }; response.clearCookie('email', { domain: '.pretendo.network' }); diff --git a/src/server.js b/src/server.js index 940ed15..c26f332 100644 --- a/src/server.js +++ b/src/server.js @@ -12,7 +12,6 @@ const database = require('./database'); const util = require('./util'); const logger = require('./logger'); const config = require('../config.json'); -const defaultLocale = require('../locales/en_US.json'); const { http: { port } } = config; const app = express(); @@ -137,56 +136,6 @@ app.engine('handlebars', handlebars({ neq(value1, value2) { return value1 !== value2; }, - times(n, block) { - let accum = ''; - for(let i = 0; i < n; i++) { - accum += block.fn(i); - } - return accum; - }, - localeHelper(locale, propString, propVar, extra) { - /* - locale: the json locale object - propString: the "path" to the property to get (e.g. "faq.title") - propVar: the dynamic property name to get after the "path" (e.g. localeHelper locale "account.level" would result in ) - e.g. localeHelper locale "account.test" "account.level" would result in locale.account.test[account.level] - */ - - let value = locale; - const props = propString.split('.'); - - if ( typeof propVar === 'string' || propVar instanceof String || - typeof propVar === 'number' || propVar instanceof Number ) { - props.push(propVar); - } - - function getPropFromLocale(value, props) { - for (const p of props) { - value = value[p]; - } - - return value; - } - - // fall back to english if the prop doesn't exist in the current locale - try { - value = getPropFromLocale(value, props); - } catch (e) { - value = defaultLocale; - try { - value = getPropFromLocale(value, props); - } catch (e) { - logger.error(`Could not find locale property ${props.join('.')}`); - } - } - - // TODO: Make this more dynamic - if (extra) { - value = value[extra]; - } - - return value; - }, slug(string) { return string.toLowerCase().replaceAll(/ /g, '-'); } diff --git a/src/util.js b/src/util.js index 6598b31..87149b4 100644 --- a/src/util.js +++ b/src/util.js @@ -6,11 +6,14 @@ const Stripe = require('stripe'); const { marked } = require('marked'); const { REST: DiscordRest } = require('@discordjs/rest'); const { Routes: DiscordRoutes } = require('discord-api-types/v10'); +const merge = require('lodash.merge'); + const mailer = require('./mailer'); const database = require('./database'); const logger = require('./logger'); -const config = require('../config.json'); +const config = require('../config.json'); +const baseLocale = require(`${__dirname}/../locales/en_US.json`); const discordRest = new DiscordRest({ version: '10' }).setToken(config.discord.bot_token); const stripe = new Stripe(config.stripe.secret_key); @@ -23,12 +26,15 @@ function getLocale(language, region) { const path = `${__dirname}/../locales/${language}_${region}.json`; if (fs.pathExistsSync(path)) { - return require(path); + const selectedLocale = require(path); + const finalLocale = merge(baseLocale, selectedLocale); + + return finalLocale; } logger.warn(`Could not find locale ${language}_${region}! Loading en_US`); - return require(`${__dirname}/../locales/en_US.json`); + return baseLocale; } function getRawDocs(locale, subpath, pageName) { diff --git a/views/account/account.handlebars b/views/account/account.handlebars index 2ffe7f6..230d70c 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -16,29 +16,29 @@

{{tierName}}

{{else}} {{#if (neq account.access_level -1)}} -

{{ localeHelper locale "account.accountLevel" account.access_level }}

+

{{ lookup locale.account.accountLevel account.access_level }}

{{else}} -

{{ localeHelper locale "account.banned" }}

+

{{ locale.account.banned }}

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

{{ localeHelper locale "account.settings.downloadFiles" }}

-

{{ localeHelper locale "account.settings.downloadFilesDescription" }}

+

{{ locale.account.settings.downloadFiles }}

+

{{ locale.account.settings.downloadFilesDescription }}

 -

{{ localeHelper locale "account.settings.upgrade" }}

+

{{ locale.account.settings.upgrade }}
-

User settings

+

{{ locale.account.settings.settingCards.userSettings }}

-

{{ localeHelper locale "account.settings.settingCards.profile" }}

+

{{ locale.account.settings.settingCards.profile }}

@@ -46,30 +46,30 @@
  • -

    {{ localeHelper locale "account.settings.settingCards.nickname" }}

    +

    {{ locale.account.settings.settingCards.nickname }}

    {{account.mii.name}}

  • -

    {{ localeHelper locale "account.settings.settingCards.birthDate" }}

    +

    {{ locale.account.settings.settingCards.birthDate }}

    {{account.birthdate}}

  • -

    {{ localeHelper locale "account.settings.settingCards.gender" }}

    +

    {{ locale.account.settings.settingCards.gender }}

    {{account.gender}}

  • -

    {{ localeHelper locale "account.settings.settingCards.country" }}

    +

    {{ locale.account.settings.settingCards.country }}

    {{account.country}}

  • -

    {{ localeHelper locale "account.settings.settingCards.timezone" }}

    +

    {{ locale.account.settings.settingCards.timezone }}

    {{account.timezone.name}}

-

{{ localeHelper locale "account.settings.settingCards.serverEnv" }}

+

{{ locale.account.settings.settingCards.serverEnv }}

@@ -82,7 +82,7 @@ -

{{ localeHelper locale "account.settings.settingCards.production" }}

+

{{ locale.account.settings.settingCards.production }}

{{#if isTester}} @@ -90,21 +90,21 @@ -

{{ localeHelper locale "account.settings.settingCards.beta" }}

+

{{ locale.account.settings.settingCards.beta }}

{{/if}}
{{#unless isTester}} -

{{{ localeHelper locale "account.settings.settingCards.upgradePrompt" }}}

+

{{{ locale.account.settings.settingCards.upgradePrompt }}}

{{else}} -

{{ localeHelper locale "account.settings.settingCards.hasAccessPrompt" }}

+

{{ locale.account.settings.settingCards.hasAccessPrompt }}

{{/unless}}
-

{{ localeHelper locale "account.settings.settingCards.signInSecurity" }}

+

{{ locale.account.settings.settingCards.signInSecurity }}

-

Account

+

{{ locale.account.account }}

@@ -112,20 +112,20 @@
  • -

    {{ localeHelper locale "account.settings.settingCards.email" }}

    +

    {{ locale.account.settings.settingCards.email }}

    {{account.email.address}}

  • -

    {{ localeHelper locale "account.settings.settingCards.password" }}

    +

    {{ locale.account.settings.settingCards.password }}

    ●●●●●●●●

-

{{ localeHelper locale "account.settings.settingCards.passwordResetNotice" }}

+

{{ locale.account.settings.settingCards.passwordResetNotice }}

-

{{ localeHelper locale "account.settings.settingCards.otherSettings" }}

+

{{ locale.account.settings.settingCards.otherSettings }}

-

{{ localeHelper locale "account.settings.settingCards.discord" }}

+

{{ locale.account.settings.settingCards.discord }}

{{#if discordUser}} -

{{ localeHelper locale "account.settings.settingCards.connectedToDiscord" }} {{ discordUser.username }}#{{ discordUser.discriminator }}

+

{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}#{{ discordUser.discriminator }}

- + {{else}} -

{{ localeHelper locale "account.settings.settingCards.noDiscordLinked" }} {{ localeHelper locale "account.settings.settingCards.linkDiscord" }}

+

{{ locale.account.settings.settingCards.noDiscordLinked }} {{ locale.account.settings.settingCards.linkDiscord }}

{{/if}}
-

{{ localeHelper locale "account.settings.settingCards.newsletter" }}

-

Newsletter not currently available. Check back again later

+

{{ locale.account.settings.settingCards.newsletter }}

+

{{ locale.account.settings.settingCards.no_newsletter_notice }}

@@ -185,23 +185,22 @@ - diff --git a/views/account/login.handlebars b/views/account/login.handlebars index 7664ed6..6ae3aa3 100644 --- a/views/account/login.handlebars +++ b/views/account/login.handlebars @@ -6,22 +6,22 @@ diff --git a/views/account/register.handlebars b/views/account/register.handlebars index 8419bad..0c8b726 100644 --- a/views/account/register.handlebars +++ b/views/account/register.handlebars @@ -7,33 +7,33 @@ diff --git a/views/account/upgrade.handlebars b/views/account/upgrade.handlebars index d353629..5ef9a07 100644 --- a/views/account/upgrade.handlebars +++ b/views/account/upgrade.handlebars @@ -2,7 +2,7 @@
- {{ localeHelper locale "upgrade.back" }} + {{ locale.upgrade.back }}

- {{this.price}} / {{ localeHelper locale "upgrade.month" }} + {{this.price}} / {{ locale.upgrade.month }}

{{/each}}
- - + +
diff --git a/views/blog/blog.handlebars b/views/blog/blog.handlebars index d5056e9..ee03b0a 100644 --- a/views/blog/blog.handlebars +++ b/views/blog/blog.handlebars @@ -7,8 +7,8 @@
-

{{ localeHelper locale "blogPage.title" }}

-

{{{ localeHelper locale "blogPage.description" }}}

+

{{ locale.blogPage.title }}

+

{{{ locale.blogPage.description }}}

@@ -18,12 +18,12 @@

{{{ this.postInfo.title }}}

{{{ this.postInfo.caption }}}

- {{ localeHelper ../locale "blogPage.published" }} + {{ ../locale.blogPage.published }}
{{{ this.postInfo.author }}}
- {{ localeHelper ../locale "blogPage.publishedOn" }} + {{ ../locale.blogPage.publishedOn }} {{{ this.postInfo.date }}}
diff --git a/views/blog/blogpost.handlebars b/views/blog/blogpost.handlebars index dfb61ec..21ac56b 100644 --- a/views/blog/blogpost.handlebars +++ b/views/blog/blogpost.handlebars @@ -9,12 +9,12 @@

{{{ postInfo.title }}}

- {{ localeHelper locale "blogPage.published" }} + {{ locale.blogPage.published }}
{{ postInfo.author }} {{{ postInfo.author }}}
- {{ localeHelper locale "blogPage.publishedOn" }} + {{ locale.blogPage.publishedOn }} {{{ postInfo.date }}}
diff --git a/views/docs/docs.handlebars b/views/docs/docs.handlebars index ec5394c..b080960 100644 --- a/views/docs/docs.handlebars +++ b/views/docs/docs.handlebars @@ -38,15 +38,9 @@
-
- Note! -
- Pretendo Network is currently in closed beta! The servers are only accessible to testers. To become a tester, - upgrade your PNID here -
- + {{#if missingInLocale}} -

{{ localeHelper locale "docs.missingInLocale" }}

+

{{ locale.docs.missingInLocale }}

{{/if}} {{{ content }}} diff --git a/views/docs/search.handlebars b/views/docs/search.handlebars index 339a4a2..b05907a 100644 --- a/views/docs/search.handlebars +++ b/views/docs/search.handlebars @@ -39,9 +39,9 @@
-

Got an error code?

-

Type it in the box below to get information on your issue!

- +

{{ locale.docs.search.title }}

+

{{ locale.docs.search.caption }}

+
@@ -107,7 +107,7 @@ }); } else { const noMatch = document.createElement('p'); - noMatch.innerText = 'No matches found'; + noMatch.innerText = '{{ locale.docs.search.no_match }}'; matchesContainer.appendChild(noMatch); } }); diff --git a/views/docs/welcome.handlebars b/views/docs/welcome.handlebars index 5424440..76d7b25 100644 --- a/views/docs/welcome.handlebars +++ b/views/docs/welcome.handlebars @@ -44,7 +44,7 @@
-

{{ localeHelper locale "docs.quickLinks.header" }}

+

{{ locale.docs.quickLinks.header }}

-

{{ localeHelper locale "docs.quickLinks.links" 0 "header" }}

-

{{ localeHelper locale "docs.quickLinks.links" 0 "caption" }}

+

{{ locale.docs.quickLinks.links.[0].header }}

+

{{ locale.docs.quickLinks.links.[0].caption }}

-

{{ localeHelper locale "docs.quickLinks.links" 1 "header" }}

-

{{ localeHelper locale "docs.quickLinks.links" 1 "caption" }}

+

{{ locale.docs.quickLinks.links.[1].header }}

+

{{ locale.docs.quickLinks.links.[1].caption }}

- \ No newline at end of file + diff --git a/views/home.handlebars b/views/home.handlebars index e96c33d..7a41f4f 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -5,15 +5,13 @@
-

{{ localeHelper locale "hero.subtitle" }}

-

{{ localeHelper locale "hero.title" }}

-

- {{ localeHelper locale "hero.text" }} -

+

{{ locale.hero.subtitle }}

+

{{ locale.hero.title }}

+

{{ locale.hero.text }}

@@ -75,7 +73,7 @@
-

{{ localeHelper locale "aboutUs.title" }}

+

{{ locale.aboutUs.title }}

{{#each locale.aboutUs.paragraphs}}

{{ this }}

{{/each}} @@ -83,7 +81,7 @@

- {{ localeHelper locale "progress.title" }} + {{ locale.progress.title }}

{{> progress-list data=featuredFeatureList purple=true }}
@@ -91,8 +89,8 @@
-

{{ localeHelper locale "faq.title" }}

-

{{ localeHelper locale "faq.text" }}

+

{{ locale.faq.title }}

+

{{ locale.faq.text }}

{{#doFaq locale.faq.QAs}} @@ -110,32 +108,32 @@
-

{{ localeHelper locale "showcase.title" }}

-

{{ localeHelper locale "showcase.text" }}

+

{{ locale.showcase.title }}

+

{{ locale.showcase.text }}

-

{{ localeHelper locale "showcase.cards.0.title" }}

-

{{ localeHelper locale "showcase.cards.0.caption" }}

+

{{ locale.showcase.cards.0.title }}

+

{{ locale.showcase.cards.0.caption }}

-

{{ localeHelper locale "showcase.cards.1.title" }}

-

{{ localeHelper locale "showcase.cards.1.caption" }}

+

{{ locale.showcase.cards.1.title }}

+

{{ locale.showcase.cards.1.caption }}

-

{{ localeHelper locale "showcase.cards.2.title" }}

-

{{ localeHelper locale "showcase.cards.2.caption" }}

+

{{ locale.showcase.cards.2.title }}

+

{{ locale.showcase.cards.2.caption }}

-

{{ localeHelper locale "credits.title" }}

-

{{ localeHelper locale "credits.text" }}

+

{{ locale.credits.title }}

+

{{ locale.credits.text }}

{{#each locale.credits.people}} @@ -160,8 +158,8 @@
-

{{ localeHelper locale "specialThanks.title" }}

-

{{ localeHelper locale "specialThanks.text" }}

+

{{ locale.specialThanks.title }}

+

{{ locale.specialThanks.text }}

@@ -198,12 +196,12 @@ diff --git a/views/localization.handlebars b/views/localization.handlebars index 4db42b2..83034b9 100644 --- a/views/localization.handlebars +++ b/views/localization.handlebars @@ -6,17 +6,17 @@
-

{{ localeHelper locale "localizationPage.title" }}

-

{{ localeHelper locale "localizationPage.description" }}

+

{{ locale.localizationPage.title" }}

+

{{ locale.localizationPage.description" }}

- {{ localeHelper locale "localizationPage.instructions" }} + {{ locale.localizationPage.instructions" }}
- +
- - + +
diff --git a/views/partials/docs-sidebar.handlebars b/views/partials/docs-sidebar.handlebars index 5737935..8c63f45 100644 --- a/views/partials/docs-sidebar.handlebars +++ b/views/partials/docs-sidebar.handlebars @@ -1,13 +1,13 @@
-
Getting started
- Welcome - Install Pretendo - Search +
{{ locale.docs.sidebar.getting_started }}
+ {{ locale.docs.sidebar.welcome }} + {{ locale.docs.sidebar.install_extended }} + {{ locale.docs.sidebar.search }}
-
Install
+
{{ locale.docs.sidebar.install }}
Wii U 3DS Cemu @@ -16,7 +16,7 @@
-
Error codes - Juxt
+
{{ locale.docs.sidebar.juxt_err }}
JXT-598-0009 JXT-598-0010 JXT-598-0011 diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars index c9f3beb..a5c7b20 100644 --- a/views/partials/footer.handlebars +++ b/views/partials/footer.handlebars @@ -28,29 +28,30 @@

Site by mrjvs, jipfr & monty

-

{{ localeHelper locale "footer.socials" }}

+

{{ locale.footer.socials }}

Twitter Discord GitHub
-

{{ localeHelper locale "footer.widget.captions.0" }}

-

{{ localeHelper locale "footer.widget.captions.1" }}

+

{{ locale.footer.widget.captions.[0] }}

+

{{ locale.footer.widget.captions.[1] }}

- {{ localeHelper locale "footer.widget.button" }} + {{ locale.footer.widget.button }}
@@ -73,10 +74,11 @@ return el.innerText; } + const randomSentences = [ - {{#times 9}} - `${unescapeHTML("{{localeHelper locale "footer.bandwidthRaccoonQuotes" this }}")}`, - {{/times}} + {{#each locale.footer.bandwidthRaccoonQuotes}} + `${unescapeHTML("{{this}}")}`, + {{/each}} ] bandwidthRaccoon.addEventListener("click", () => diff --git a/views/partials/header.handlebars b/views/partials/header.handlebars index be2e392..b82936b 100644 --- a/views/partials/header.handlebars +++ b/views/partials/header.handlebars @@ -27,13 +27,13 @@
@@ -156,12 +156,12 @@
diff --git a/views/partials/progress-list.handlebars b/views/partials/progress-list.handlebars index fdeb9f5..4395bdf 100644 --- a/views/partials/progress-list.handlebars +++ b/views/partials/progress-list.handlebars @@ -13,7 +13,7 @@
{{/if}} diff --git a/views/progress.handlebars b/views/progress.handlebars index 2f0f574..9be28da 100644 --- a/views/progress.handlebars +++ b/views/progress.handlebars @@ -7,8 +7,8 @@
-

{{ localeHelper locale "progressPage.title" }}

-

{{ localeHelper locale "progressPage.description" }}

+

{{ locale.progressPage.title }}

+

{{ locale.progressPage.description }}

@@ -18,7 +18,7 @@
-

{{{ localeHelper locale "donation.progress" }}} {{{ localeHelper locale "donation.upgradePush" }}}

+

{{{ locale.donation.progress }}} {{{ locale.donation.upgradePush }}}

From 314fcf9be5b108a61ff9d5dbbd2a052d6b99a3f4 Mon Sep 17 00:00:00 2001 From: Jelle van Snik Date: Fri, 23 Sep 2022 20:08:25 +0200 Subject: [PATCH 06/20] error handling and bugfix for mii editor --- public/assets/js/miieditor.js | 75 +++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/public/assets/js/miieditor.js b/public/assets/js/miieditor.js index 58e7f8e..b0a9fe7 100644 --- a/public/assets/js/miieditor.js +++ b/public/assets/js/miieditor.js @@ -1,4 +1,11 @@ -// This file gets automatically bundled with browserify when running the start script. This also means that after any update you're gonna need to restart the server to see any changes. +/** + * Compilation note: + * This file gets automatically bundled with browserify when running the start script. + * This also means that after any update you're gonna need to restart the server to see any changes. + * + * browserify is needed for the use of require() in the browser + */ +const Mii = require('mii-js'); // Prevent the user from reloading or leaving the page window.onbeforeunload = function (e) { @@ -32,33 +39,57 @@ window.addEventListener('resize', () => { setCanvasScale(); }); -// MII RENDERER +let mii; // global mii object -const Mii = require('mii-js'); +// this initalizes a mii for editing +// returns if mii data was parsed successfully +function initializeMiiData(encodedUserMiiData) { + console.group('Initalizing Mii data'); + console.log('encoded mii data:', encodedUserMiiData); + + // We initialize the Mii object + try { + console.log('Attempting to parse mii data'); + mii = new Mii(Buffer.from(encodedUserMiiData, 'base64')); + } catch (err) { + console.error('failed to decode mii data', err); + console.groupEnd(); + return false; + } + + // We set the img sources for the unedited miis in the save animation + console.log('grabbing rendered miis for later use'); + const miiStudioNeutralUrl = mii.studioUrl({ + width: 512, + bgColor: '13173300', + }); + const miiStudioSorrowUrl = mii.studioUrl({ + width: 512, + bgColor: '13173300', + expression: 'sorrow', + }); + document.querySelector('.mii-comparison img.old-mii').src = miiStudioNeutralUrl; + document.querySelector('.mii-comparison.confirmed img.old-mii').src = miiStudioSorrowUrl; + console.log('initialization complete'); + console.groupEnd(); + return true; +} // The Mii data is stored in a script tag in the HTML, so we can just grab it and then remove the element const encodedUserMiiData = document.querySelector( 'script#encodedUserMiiData' ).textContent; document.querySelector('script#encodedUserMiiData').remove(); -console.log('encodedMiiData', encodedUserMiiData); -// We initialize the Mii object -const mii = new Mii(Buffer.from(encodedUserMiiData, 'base64')); - -// We set the img sources for the unedited miis in the save animation -const miiStudioNeutralUrl = mii.studioUrl({ - width: 512, - bgColor: '13173300', -}); -const miiStudioSorrowUrl = mii.studioUrl({ - width: 512, - bgColor: '13173300', - expression: 'sorrow', -}); -document.querySelector('.mii-comparison img.old-mii').src = miiStudioNeutralUrl; -document.querySelector('.mii-comparison.confirmed img.old-mii').src = - miiStudioSorrowUrl; +// is valid mii data +const validMiiData = initializeMiiData(encodedUserMiiData); +if (!validMiiData) { + const shouldContinue = window.confirm('Found corrupted mii data, want to continue with a new Mii?'); + if (!shouldContinue) + window.location.assign('/account'); + const newMii = 'AAEAQCpE2oVAJPDA1/vMZJrD1O74rwAAqWFCAEIAAAAAAAAAAAAAAAAAAAAAAGZfBABgAbFGYxYkFEUSwRITZg8ACCUwSqNYYQBzAGgAbQAAAAAAAAAAAAAAAAAAAKCF'; + initializeMiiData(newMii); +} // we keeep the images here so we can cache them when we need to change the build/height const miiFaceImg = new Image(); @@ -444,8 +475,8 @@ document const miiData = mii.encode().toString('base64'); const tokenType = document.cookie.split('; ').find(row => row.startsWith('token_type=')).split('=')[1]; const accessToken = document.cookie.split('; ').find(row => row.startsWith('access_token=')).split('=')[1]; - - fetch('http://api.pretendo.cc/v1/user', { + + fetch('https://api.pretendo.cc/v1/user', { method: 'POST', headers: { 'Accept': 'application/json', From 414e91073b3d08337fb5b0ede433210cd405d8d7 Mon Sep 17 00:00:00 2001 From: Jelle van Snik Date: Fri, 23 Sep 2022 20:33:35 +0200 Subject: [PATCH 07/20] Update default mii data Co-authored-by: ash --- public/assets/js/miieditor.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/assets/js/miieditor.js b/public/assets/js/miieditor.js index b0a9fe7..d919552 100644 --- a/public/assets/js/miieditor.js +++ b/public/assets/js/miieditor.js @@ -6,6 +6,7 @@ * browserify is needed for the use of require() in the browser */ const Mii = require('mii-js'); +const newMiiData = 'AwAAQOlVognnx0GC2qjhdwOzuI0n2QAAAGBzAHQAZQB2AGUAAAAAAAAAAAAAAEBAAAAhAQJoRBgmNEYUgRIXaA0AACkAUkhQAAAAAAAAAAAAAAAAAAAAAAAAAAAAANeC'; // Prevent the user from reloading or leaving the page window.onbeforeunload = function (e) { @@ -87,8 +88,6 @@ if (!validMiiData) { const shouldContinue = window.confirm('Found corrupted mii data, want to continue with a new Mii?'); if (!shouldContinue) window.location.assign('/account'); - const newMii = 'AAEAQCpE2oVAJPDA1/vMZJrD1O74rwAAqWFCAEIAAAAAAAAAAAAAAAAAAAAAAGZfBABgAbFGYxYkFEUSwRITZg8ACCUwSqNYYQBzAGgAbQAAAAAAAAAAAAAAAAAAAKCF'; - initializeMiiData(newMii); } // we keeep the images here so we can cache them when we need to change the build/height From 6286eee4391c09b37b7a3d04111f0517bd25ca5f Mon Sep 17 00:00:00 2001 From: Jelle van Snik Date: Fri, 23 Sep 2022 20:53:06 +0200 Subject: [PATCH 08/20] line disappeared, oops --- public/assets/js/miieditor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/assets/js/miieditor.js b/public/assets/js/miieditor.js index d919552..cd90a4c 100644 --- a/public/assets/js/miieditor.js +++ b/public/assets/js/miieditor.js @@ -88,6 +88,7 @@ if (!validMiiData) { const shouldContinue = window.confirm('Found corrupted mii data, want to continue with a new Mii?'); if (!shouldContinue) window.location.assign('/account'); + initializeMiiData(newMiiData); } // we keeep the images here so we can cache them when we need to change the build/height From 3f23708b11766d6f6a51988d447575c707e6fdeb Mon Sep 17 00:00:00 2001 From: Jelle van Snik Date: Fri, 23 Sep 2022 20:58:05 +0200 Subject: [PATCH 09/20] fix error codes doc redirect --- views/partials/docs-sidebar.handlebars | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/views/partials/docs-sidebar.handlebars b/views/partials/docs-sidebar.handlebars index 8c63f45..714fb5a 100644 --- a/views/partials/docs-sidebar.handlebars +++ b/views/partials/docs-sidebar.handlebars @@ -17,11 +17,10 @@
{{ locale.docs.sidebar.juxt_err }}
- JXT-598-0009 - JXT-598-0010 - JXT-598-0011 - JXT-598-0015 - JXT-598-0020 + JXT-598-0009 + JXT-598-0010 + JXT-598-0011 + JXT-598-0020
From 787a3fe41ee5f8321f6f9c8c6f625db7285b5473 Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sat, 24 Sep 2022 11:23:41 +0200 Subject: [PATCH 10/20] fix(style): bandwidth text bubble arrow --- public/assets/css/partials/footer.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/css/partials/footer.css b/public/assets/css/partials/footer.css index 8e64a29..da71bc4 100644 --- a/public/assets/css/partials/footer.css +++ b/public/assets/css/partials/footer.css @@ -127,8 +127,8 @@ footer .bandwidth-raccoon-wrapper .text-bubble:after { z-index: 1; border-style: solid; border-color: var(--bg-shade-3) transparent; - border-width: 10px 10px 0; - bottom: -10px; + border-width: 12px 12px 0; + bottom: -9px; right: 60px; margin-left: -10px; } From 0e3799983e5deb43a2c6ca34eafd1c46ba7ee75d Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sat, 24 Sep 2022 15:00:02 +0200 Subject: [PATCH 11/20] fix(style): tier name not being centered properly --- public/assets/css/account.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/assets/css/account.css b/public/assets/css/account.css index 47da37e..bbed44e 100644 --- a/public/assets/css/account.css +++ b/public/assets/css/account.css @@ -12,9 +12,11 @@ /* Account settings sidebar */ .account-sidebar .user { - text-align: center; margin: 55px auto; width: fit-content; + display: flex; + flex-flow: column; + align-items: center; } .account-sidebar .user .miiname { font-size: 1.2rem; @@ -341,4 +343,4 @@ footer { .setting-card .setting-list { grid-template-columns: auto; } -} \ No newline at end of file +} From 14db136c2478abd42e2380d087db4f4998d2186e Mon Sep 17 00:00:00 2001 From: Ash Monty Date: Sat, 24 Sep 2022 21:27:58 +0200 Subject: [PATCH 12/20] feat: new navbar --- locales/en_US.json | 9 + public/assets/css/documentation.css | 12 ++ public/assets/css/main.css | 10 +- public/assets/css/partials/header.css | 260 ++++++++++++++++++++++++-- public/assets/images/arrow-right.svg | 1 + public/assets/js/header-handler.js | 43 +++++ views/account/account.handlebars | 4 +- views/account/login.handlebars | 4 +- views/account/register.handlebars | 4 +- views/aprilfools.handlebars | 4 +- views/blog/blog.handlebars | 4 +- views/blog/blogpost.handlebars | 4 +- views/home.handlebars | 3 +- views/localization.handlebars | 4 +- views/partials/header.handlebars | 109 ++++++++++- views/progress.handlebars | 4 +- 16 files changed, 439 insertions(+), 40 deletions(-) create mode 100644 public/assets/images/arrow-right.svg diff --git a/locales/en_US.json b/locales/en_US.json index 936f6e7..0946d15 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -11,6 +11,15 @@ "accountWidget": { "settings": "Settings", "logout": "Logout" + }, + "dropdown": { + "captions": { + "credits": "Meet the team", + "about": "About the project", + "faq": "Frequently asked questions", + "blog": "Our latest updates, condensed", + "progress": "Check the project progress and goals" + } } }, "hero": { diff --git a/public/assets/css/documentation.css b/public/assets/css/documentation.css index 1f001a4..c7c728f 100644 --- a/public/assets/css/documentation.css +++ b/public/assets/css/documentation.css @@ -23,6 +23,7 @@ button#openSidebar { } .docs-wrapper header { + position: relative; box-sizing: border-box; margin: 20px; margin-left: 0; @@ -278,6 +279,7 @@ button#openSidebar { .docs-wrapper header { margin-left: 20px; width: 100%; + left: 0; } .docs-wrapper { @@ -327,6 +329,16 @@ button#openSidebar { grid-template-columns: 1fr; grid-auto-rows: 1fr; } + + .docs-wrapper header a.logo-link { + margin-right: 6px; + } +} + +@media screen and (max-width: 576px) { + .docs-wrapper header div.dropdown { + left: calc(-39.876px - 6px - 30px - 40px); + } } @media screen and (max-width: 492px) { diff --git a/public/assets/css/main.css b/public/assets/css/main.css index 2f52611..e32aaaa 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -4,7 +4,9 @@ --bg-shade-0: #131733; --bg-shade-1: #1B1F3B; --bg-shade-2: #23274A; + --bg-shade-2-5: #2D3258; --bg-shade-3: #373C65; + --bg-shade-3-5: #404673; --bg-shade-4: #494F81; --accent-shade-0: #673DB6; @@ -65,7 +67,7 @@ body, .main-body { .wrapper { width: 95%; max-width: 1590px; - margin: 0 auto; + margin: 48px auto 0; } h1.dot:not([data-title-suffix]):after, h2.dot:not([data-title-suffix]):after { @@ -864,8 +866,8 @@ section.update-signup div.circle { padding: 8px 27px; } .button.secondary.icon-btn { - width: 41px; - height: 41px; + width: 41px !important; + height: 41px !important; } .button.icon-btn svg { min-width: 30px; @@ -1009,4 +1011,4 @@ section.update-signup div.circle { .purple-circle { display: none; } -} \ No newline at end of file +} diff --git a/public/assets/css/partials/header.css b/public/assets/css/partials/header.css index 3d95b73..c418b22 100644 --- a/public/assets/css/partials/header.css +++ b/public/assets/css/partials/header.css @@ -1,7 +1,17 @@ header { + position: fixed; + top: 0; + left: 2.5%; display: flex; align-items: center; + width: 95%; margin-top: 35px; + z-index: 60; + transition: box-shadow 300ms, background 300ms; +} +header.dropdown-active { + box-shadow: 0 0 0 600vw rgba(27, 31, 59, 0.8); + background: rgba(27, 31, 59, 0.8); } header a { text-decoration: none; @@ -10,23 +20,187 @@ header .logo-link, header .logo-link svg { display: block; } -header nav a:first-child { + +header nav { + position: relative; + display: flex; + flex-flow: row nowrap; + align-items: center; margin-left: 40px; } -header nav a { +header div.dropdown-button-wrapper { + position: relative; + display: flex; + flex-flow: row nowrap; +} +/* these are safezones where the dropdown will not close */ +header div.dropdown-button-wrapper::before { + content: ""; + position: absolute; + top: -16px; + bottom: 100%; + left: 0; + right: -12px; +} +header div.dropdown-button-wrapper::after { + content: ""; + position: absolute; + top: 100%; + bottom: -32px; + left: 0; + right: -12px; +} + +header nav button { + background: none; color: var(--text-shade-1); margin: 0 17px; - text-decoration: none; + padding: 0; } -header nav a:hover { +header nav button:hover { + background: none; color: var(--text-shade-3); - transition: color 50ms ease-in-out; +} +header nav button.donate { + display: grid; + grid-auto-flow: column; + align-items: center; + gap: 4px; + font-weight: bold; + background: #332b61; + color: var(--accent-shade-3); + padding: 2px 12px; + border-radius: 24px; +} +header nav button.donate svg { + height: 1rem; + width: 1rem; +} +header nav button.donate:hover { + background: var(--accent-shade-0); + color: #fff; +} + +header div.dropdown { + position: absolute; + top: 100%; + margin-top: 24px; + left: 0; + display: block; + background: var(--bg-shade-3); + border-radius: 8px; + width: 420px; + height: 0; + overflow-y: hidden; + transition: height 300ms; +} + +header div.dropdown-content { + position: absolute; + top: 0; + width: 100%; + opacity: 0; + pointer-events: none; + transition: opacity 350ms; +} +header div.dropdown-content.show { + opacity: 1; + pointer-events: auto; +} + +header div.dropdown .top { + padding: 32px 18px; +} +header div.dropdown .top a { + position: relative; + display: grid; + grid-auto-flow: column; + gap: 16px; + justify-content: start; + align-items: center; + color: var(--text-shade-1); + padding: 16px; + border-radius: 8px; +} +header div.dropdown .top a .icon { + background: var(--bg-shade-2); + color: var(--accent-shade-3); + height: 56px; + width: 56px; + border-radius: 8px; +} +header div.dropdown .top a:hover .icon { + background: #151b44; + color: var(--accent-shade-1); +} +header div.dropdown .top a .icon svg { + width: 32px; + height: 32px; + margin: 12px; +} +header div.dropdown .top a .title { + margin: 0; + font-weight: bold; + color: var(--text-shade-3); +} +header div.dropdown .top a .caption { + margin: 0; +} +header div.dropdown .top a:hover { + background: var(--bg-shade-2-5); +} +header div.dropdown .top a:hover::after { + content: ""; + position: absolute; + top: 0; + right: 24px; + width: 24px; + height: 100%; + background: no-repeat center url("/assets/images/arrow-right.svg"); + /* garbage to make it look the same color */ + filter: brightness(0) invert(60%) sepia(70%) saturate(453%) hue-rotate(208deg) + brightness(113%) contrast(97%); +} +header div.dropdown .top a:hover .title { + color: var(--accent-shade-3); +} + +header div.dropdown .bottom { + display: grid; + grid-auto-flow: column; + justify-content: center; + gap: 24px; + background: var(--bg-shade-3-5); + padding: 22px; + width: 100%; + box-sizing: border-box; +} +header div.dropdown .bottom a { + width: 48px; + height: 48px; + background: var(--bg-shade-3); + color: var(--text-shade-3); + border-radius: 100%; + display: flex; + justify-content: center; + align-items: center; +} +header div.dropdown .bottom a:hover { + background: var(--bg-shade-2); +} +header div.dropdown .bottom a svg { + width: 24px; + height: auto; +} + +header div.dropdown .top a.show-on-mobile { + display: none; } header .right-section { display: grid; grid-auto-flow: column; - grid-gap: 24px; + gap: 24px; margin-left: auto; z-index: 2; color: var(--text-shade-1); @@ -128,8 +302,9 @@ header .user-widget .button.logout { } @media screen and (max-width: 900px) { - header nav a:not(.keep-on-mobile) { - display: none; + header { + width: 90%; + left: 5%; } header .logo-link { @@ -137,7 +312,19 @@ header .user-widget .button.logout { } } -@media screen and (max-width: 480px) { +@media screen and (max-width: 768px) { + header nav { + margin-left: 0; + } + header .hide-on-mobile { + display: none; + } + header div.dropdown .top a.show-on-mobile { + display: grid; + } +} + +@media screen and (max-width: 624px) { header .logo-link svg text { display: none; } @@ -147,9 +334,60 @@ header .user-widget .button.logout { } header .logo-link { - margin-right: 10px; + margin-right: 6px; } - header nav a { +} + +@media screen and (max-width: 576px) { + header div.dropdown { + left: calc(-39.876px - 6px - 5vw); + width: 100vw; + box-sizing: border-box; + border-radius: 0; + } +} + +@media screen and (max-width: 504px) { + header nav button.donate span { + display: none; + } + + header nav button.donate { + padding: 8px; + margin: 0; + } + + header nav > a { margin: 0 10px; } } + +@media screen and (max-width: 420px) { + header .right-section { + gap: 12px; + } + + header nav button, + header nav > a { + margin: 0 24px 0 0; + } + + header div.dropdown .top a .caption { + display: none; + } + + header div.dropdown .top a { + padding: 8px; + } +} + +@media screen and (max-width: 348px) { + header .right-section { + gap: 12px; + } + + header nav button, + header nav > a { + margin: 0 12px 0 0; + } +} diff --git a/public/assets/images/arrow-right.svg b/public/assets/images/arrow-right.svg new file mode 100644 index 0000000..88abada --- /dev/null +++ b/public/assets/images/arrow-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/assets/js/header-handler.js b/public/assets/js/header-handler.js index 4acbbfc..c09c2b4 100644 --- a/public/assets/js/header-handler.js +++ b/public/assets/js/header-handler.js @@ -1,5 +1,48 @@ /* eslint-disable no-undef, no-unused-vars */ +const header = document.querySelector('header'); +const dropdownButtonWrapper = document.querySelector('.dropdown-button-wrapper'); +const dropdown = document.querySelector('header div.dropdown'); +function navbarDropdownHandler(buttonID) { + const allDropdownContents = dropdown.querySelectorAll('div.dropdown-content'); + const dropdownContent = document.querySelector(`.dropdown-content#${buttonID}-dropdown-content`); + + // hide all contents + allDropdownContents.forEach((content) => { + content.classList.remove('show'); + }); + // show the content of the clicked button + dropdownContent.classList.add('show'); + // set the dropdown height to the height of the content + dropdown.style.height = `${dropdownContent.offsetHeight}px`; + + // dim the rest of the page + header.classList.add('dropdown-active'); + +} + +const navbarDropdownBtns = document.querySelectorAll('header .dropdown-button-wrapper button.dropdown-button'); +navbarDropdownBtns.forEach((btn) => { + [ 'click', 'mouseover' ].forEach((event) => { + btn.addEventListener(event, () => { + const id = btn.id.replace('-button', ''); + navbarDropdownHandler(id); + }); + }); +}); +dropdownButtonWrapper.addEventListener('mouseleave', (e) => { + if (e.toElement !== dropdown && !dropdown.contains(e.toElement)) { + dropdown.style.height = '0'; + header.classList.remove('dropdown-active'); + } +}); +dropdown.addEventListener('mouseleave', (e) => { + if (e.toElement !== dropdownButtonWrapper && !dropdown.contains(dropdownButtonWrapper)) { + dropdown.style.height = '0'; + header.classList.remove('dropdown-active'); + } +}); + // Account widget handler const userWidgetToggle = document.querySelector('.user-widget-toggle') ; const userWidget = document.querySelector('.user-widget'); diff --git a/views/account/account.handlebars b/views/account/account.handlebars index 230d70c..0e629c6 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -1,8 +1,8 @@ -
+{{> header}} - {{> header}} +