From 4b780ada1333c07fc76228eb356d9d9cc0e3c5b1 Mon Sep 17 00:00:00 2001 From: Monty Date: Mon, 13 Sep 2021 15:26:08 +0200 Subject: [PATCH] Linting --- public/assets/js/locale-dropdown-handler.js | 79 +++++++++++---------- public/assets/js/locale-tester-handler.js | 10 +-- src/routers/home.js | 2 +- src/routers/localization.js | 2 +- src/routers/progress.js | 6 +- src/server.js | 12 ++-- src/trello.js | 2 +- src/util.js | 2 +- 8 files changed, 57 insertions(+), 58 deletions(-) diff --git a/public/assets/js/locale-dropdown-handler.js b/public/assets/js/locale-dropdown-handler.js index 82c0c48..6db36aa 100644 --- a/public/assets/js/locale-dropdown-handler.js +++ b/public/assets/js/locale-dropdown-handler.js @@ -1,61 +1,62 @@ +/* eslint-disable no-undef, no-unused-vars */ function setDefaultDropdownLocale(localeString) { - const selected = document.querySelector(".selected-locale"); - let item = document.querySelector(`label[for=${localeString}`); - if (!item) { // if locale cant be find, default to en-US - localeString = "en-US"; - item = document.querySelector(`label[for=${localeString}`); - } - selected.innerHTML = item.innerHTML + const selected = document.querySelector('.selected-locale'); + let item = document.querySelector(`label[for=${localeString}`); + if (!item) { // if locale can't be found, default to en-US + localeString = 'en-US'; + item = document.querySelector(`label[for=${localeString}`); + } + selected.innerHTML = item.innerHTML; } function localeDropdownHandler(selectedLocale) { - document.cookie = `preferredLocale=${selectedLocale};max-age=31536000`; - window.location.reload(); + document.cookie = `preferredLocale=${selectedLocale};max-age=31536000`; + window.location.reload(); } -const dropdowns = document.querySelectorAll("*[data-dropdown]"); +const dropdowns = document.querySelectorAll('*[data-dropdown]'); const dropdownOptions = document.querySelectorAll( - "*[data-dropdown] .options-container" + '*[data-dropdown] .options-container' ); dropdowns.forEach((el) => { - const selected = el.querySelector(".selected-locale"); - const optionsContainer = el.querySelector(".options-container"); - const optionsList = el.querySelectorAll(".option"); + const selected = el.querySelector('.selected-locale'); + const optionsContainer = el.querySelector('.options-container'); + const optionsList = el.querySelectorAll('.option'); - // click dropdown element will open dropdown - selected.addEventListener("click", () => { - optionsContainer.classList.toggle("active"); - }); + // click dropdown element will open dropdown + selected.addEventListener('click', () => { + optionsContainer.classList.toggle('active'); + }); - // clicking on any option will close dropdown and change value - optionsList.forEach((option) => { - option.addEventListener("click", () => { - selected.innerHTML = option.querySelector("label").innerHTML; - optionsContainer.classList.remove("active"); - const selectedLocale = option.querySelector("label").getAttribute("for"); - localeDropdownHandler(selectedLocale); - }); - }); + // clicking on any option will close dropdown and change value + optionsList.forEach((option) => { + option.addEventListener('click', () => { + selected.innerHTML = option.querySelector('label').innerHTML; + optionsContainer.classList.remove('active'); + const selectedLocale = option.querySelector('label').getAttribute('for'); + localeDropdownHandler(selectedLocale); + }); + }); }); // close all dropdowns on scroll -document.addEventListener("scroll", () => { - dropdownOptions.forEach((el) => el.classList.remove("active")); +document.addEventListener('scroll', () => { + dropdownOptions.forEach((el) => el.classList.remove('active')); }); // click outside of dropdown will close all dropdowns -document.addEventListener("click", (e) => { - const targetElement = e.target; +document.addEventListener('click', (e) => { + const targetElement = e.target; - // check if target is from a dropdown - let found = false; - dropdowns.forEach((v) => { - if (v == targetElement || v.contains(targetElement)) found = true; - }); + // check if target is from a dropdown + let found = false; + dropdowns.forEach((v) => { + if (v == targetElement || v.contains(targetElement)) found = true; + }); - if (found) return; + if (found) return; - // click outside of dropdowns - dropdownOptions.forEach((el) => el.classList.remove("active")); + // click outside of dropdowns + dropdownOptions.forEach((el) => el.classList.remove('active')); }); diff --git a/public/assets/js/locale-tester-handler.js b/public/assets/js/locale-tester-handler.js index ca8250d..8e79f99 100644 --- a/public/assets/js/locale-tester-handler.js +++ b/public/assets/js/locale-tester-handler.js @@ -1,8 +1,8 @@ -const form = document.querySelector(".localization-form"); +/* eslint-disable no-undef */ +const form = document.querySelector('.localization-form'); form.addEventListener('submit', (e) => { - e.preventDefault(); - e.stopPropagation(); - window.location.href=`https://pretendo-locale-tester.herokuapp.com/?url=${e.target[0].value}` + e.preventDefault(); + e.stopPropagation(); + window.location.href=`https://pretendo-locale-tester.herokuapp.com/?url=${e.target[0].value}`; }); - diff --git a/src/routers/home.js b/src/routers/home.js index 0888bab..d956afc 100644 --- a/src/routers/home.js +++ b/src/routers/home.js @@ -7,7 +7,7 @@ const { getTrelloCache } = require('../trello'); router.get('/', async (request, response) => { - const reqLocale = request.locale + const reqLocale = request.locale; const locale = util.getLocale(reqLocale.region, reqLocale.language); const cache = await getTrelloCache(); diff --git a/src/routers/localization.js b/src/routers/localization.js index 433772e..3de3365 100644 --- a/src/routers/localization.js +++ b/src/routers/localization.js @@ -4,7 +4,7 @@ const router = new Router(); router.get('/', async (request, response) => { - const reqLocale = request.locale + const reqLocale = request.locale; const locale = util.getLocale(reqLocale.region, reqLocale.language); response.render('localization', { diff --git a/src/routers/progress.js b/src/routers/progress.js index f19016c..1e03892 100644 --- a/src/routers/progress.js +++ b/src/routers/progress.js @@ -7,18 +7,16 @@ const { getTrelloCache } = require('../trello'); router.get('/', async (request, response) => { - const reqLocale = request.locale + const reqLocale = request.locale; const locale = util.getLocale(reqLocale.region, reqLocale.language); - const localeString = reqLocale.toString() - const cache = await getTrelloCache(); response.render('progress', { layout: 'main', boards, locale, - localeString, + localeString: reqLocale.toString(), progressLists: cache }); }); diff --git a/src/server.js b/src/server.js index 6701226..0f7d9e7 100644 --- a/src/server.js +++ b/src/server.js @@ -4,7 +4,7 @@ const express = require('express'); const handlebars = require('express-handlebars'); const morgan = require('morgan'); const expressLocale = require('express-locale'); -const cookieParser = require('cookie-parser') +const cookieParser = require('cookie-parser'); const logger = require('./logger'); const util = require('./util'); const config = require('../config.json'); @@ -26,11 +26,11 @@ const routers = { localization: require('./routers/localization') }; -app.use(cookieParser()) +app.use(cookieParser()); // Locale express middleware setup app.use(expressLocale({ - "priority": ['cookie', 'accept-language', 'map', 'default'], + 'priority': ['cookie', 'accept-language', 'map', 'default'], cookie: {name: 'preferredLocale'}, // Map unavailable regions to available locales from the same language @@ -59,8 +59,8 @@ app.use(expressLocale({ 'ru', 'ru-RU', 'tr', 'tr-TR', ], - "default": "en-US" -})) + 'default': 'en-US' +})); @@ -109,7 +109,7 @@ app.engine('handlebars', handlebars({ })); app.set('view engine', 'handlebars'); -logger.info('Starting server') +logger.info('Starting server'); app.listen(port, () => { logger.success(`Server listening on *:${port}`); }); \ No newline at end of file diff --git a/src/trello.js b/src/trello.js index a37f824..476d4d3 100644 --- a/src/trello.js +++ b/src/trello.js @@ -1,4 +1,4 @@ -const Trello =require("trello") +const Trello =require('trello'); const Redis = require('ioredis'); const JSONCache = require('redis-json'); const config = require('../config.json'); diff --git a/src/util.js b/src/util.js index bd5433e..f31c1c5 100644 --- a/src/util.js +++ b/src/util.js @@ -20,4 +20,4 @@ function getLocale(region, language) { module.exports = { fullUrl, getLocale -} \ No newline at end of file +}; \ No newline at end of file