Merge pull request #278 from aeadedoyin/feat/redirect-assets

Feat/redirect assets

Author: adedoyin-paystack

.eslintignore

@@ -0,0 +1 @@
+npx lint-staged

.eslintrc

@@ -0,0 +1 @@
+20

.husky/pre-commit

@@ -0,0 +1,43 @@
+import js from '@eslint/js';
+import eslintConfigPrettier from 'eslint-config-prettier';
+import prettierPlugin from 'eslint-plugin-prettier';
+
+export default [
+	{
+		ignores: ['node_modules/**', 'templates/**', 'gulpfile.js', 'css/**', 'eslint.config.js'],
+	},
+	js.configs.recommended,
+	{
+		languageOptions: {
+			ecmaVersion: 2022,
+			sourceType: 'script',
+			globals: {
+				window: 'readonly',
+				document: 'readonly',
+				navigator: 'readonly',
+				console: 'readonly',
+			},
+		},
+		plugins: {
+			prettier: prettierPlugin,
+		},
+		rules: {
+			'prettier/prettier': ['error'],
+			'no-use-before-define': ['error', { functions: false, classes: false }],
+			'no-param-reassign': ['warn'],
+			'no-unused-vars': ['error', { argsIgnorePattern: '^_', caughtErrorsIgnorePattern: '^_' }],
+			'max-len': [
+				'error',
+				{
+					code: 150,
+					ignoreTemplateLiterals: true,
+					ignoreStrings: true,
+				},
+			],
+			'no-shadow': ['error'],
+			'no-plusplus': ['off'],
+			'no-mixed-operators': ['error'],
+		},
+	},
+	eslintConfigPrettier,
+];

.nvmrc

@@ -54,7 +54,7 @@
         <div class="scroll-show">
             <div class="white-bg"></div>
             <div class="site-logo">
-                <a href="/"><img src="images/nigerialogos_logo.svg" alt="NigeriaLogos logo"></a>
+                <a href="/"><img src="images/NigeriaLogos_logo.svg" alt="NigeriaLogos logo"></a>
             </div>
             <div class="secondary-alphabet"><a href="##">#</a></div>
             <div class="searchbar">
@@ -72,7 +72,7 @@
         </div>
         <div class="heading">
             <div class="site-logo">
-                <a href="/"><img src="images/nigerialogos_logo.svg" alt="NigeriaLogos logo"></a>
+                <a href="/"><img src="images/NigeriaLogos_logo.svg" alt="NigeriaLogos logo"></a>
             </div>
             <h1>NigeriaLogos, an <a href="https://github.com/PaystackHQ/nigerialogos" target="_blank">open source</a>
                 collection<br>of high quality, pixel perfect Nigerian<br>company logos for free use.</h1>

eslint.config.js

@@ -18,7 +18,7 @@ const loadJSON = callback => {
 };
 
 const sortObjectArray = (array, key) => {
-	return array.sort(function(a1, a2) {
+	return array.sort(function (a1, a2) {
 		const b1 = a1[key].toLowerCase();
 		const b2 = a2[key].toLowerCase();
 
@@ -32,12 +32,12 @@ const sortObjectArray = (array, key) => {
 
 const isValidURL = url => {
 	let urlInstance;
-  try {
-    urlInstance = new URL(url);
-  } catch (_) {
-    return false;  
-  }
-  return urlInstance.protocol === "http:" || urlInstance.protocol === "https:";
+	try {
+		urlInstance = new URL(url);
+	} catch (_) {
+		return false;
+	}
+	return urlInstance.protocol === 'http:' || urlInstance.protocol === 'https:';
 };
 
 const setLogoCompanyLink = logoArray => {

index.html

@@ -1,15 +1,14 @@
-window.addEventListener('load', ()=> {
-    const links = document.querySelectorAll('.logo__download__overlay a');
-    let clicks = 0; 
-    const stopLink = function (e) {
-        clicks ++;
-        // Prevent download on first clicks so as to enable hover effect on mobile
-        if (clicks % 2 !== 0) e.preventDefault();
-        
-    }
-    if ('ontouchstart' in window || 'ontouch' in window) {
-        links.forEach(link => {
-            link.addEventListener('click', stopLink);
-        })
-    }
-})
+window.addEventListener('load', () => {
+	const links = document.querySelectorAll('.logo__download__overlay a');
+	let clicks = 0;
+	const stopLink = function (e) {
+		clicks++;
+		// Prevent download on first clicks so as to enable hover effect on mobile
+		if (clicks % 2 !== 0) e.preventDefault();
+	};
+	if ('ontouchstart' in window || 'ontouch' in window) {
+		links.forEach(link => {
+			link.addEventListener('click', stopLink);
+		});
+	}
+});

js/imageLoad.js

@@ -1,4 +1,4 @@
-(function() {
+(function () {
 	const main = document.querySelector('main');
 	const scrollShow = document.querySelector('.scroll-show');
 	const secondaryAlphabet = document.querySelector('.secondary-alphabet');

js/mobileDownload.js

@@ -28,38 +28,33 @@ const updateSearchState = () => {
 
 // Escape meta-characters to prevent DOM->HTML XSS
 function escapeHtml(text) {
-    return text
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#39;");
+	return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
 }
 
 const highlightSearchTerm = (logo, term) => {
-    const logoText = logo.querySelector('.logo__text--link');
-    const logoTextTitle = logoText.textContent;
-    if (!term) {
-        logoText.innerHTML = escapeHtml(logoTextTitle);
-        return;
-    }
-    // Escape and highlight term
-    // Use a global, case-insensitive regex
-    // We escape fragments, but wrap matches in <mark>
-    const regex = new RegExp(term, 'gi');
-    let lastIndex = 0;
-    let html = '';
-    let match;
-    while ((match = regex.exec(logoTextTitle)) !== null) {
-        // Escape the text before the match
-        html += escapeHtml(logoTextTitle.substring(lastIndex, match.index));
-        // Highlight the match (escape just in case)
-        html += `<mark>${escapeHtml(match[0])}</mark>`;
-        lastIndex = regex.lastIndex;
-    }
-    // Escape the rest after last match
-    html += escapeHtml(logoTextTitle.substring(lastIndex));
-    logoText.innerHTML = html;
+	const logoText = logo.querySelector('.logo__text--link');
+	const logoTextTitle = logoText.textContent;
+	if (!term) {
+		logoText.innerHTML = escapeHtml(logoTextTitle);
+		return;
+	}
+	// Escape and highlight term
+	// Use a global, case-insensitive regex
+	// We escape fragments, but wrap matches in <mark>
+	const regex = new RegExp(term, 'gi');
+	let lastIndex = 0;
+	let html = '';
+	let match;
+	while ((match = regex.exec(logoTextTitle)) !== null) {
+		// Escape the text before the match
+		html += escapeHtml(logoTextTitle.substring(lastIndex, match.index));
+		// Highlight the match (escape just in case)
+		html += `<mark>${escapeHtml(match[0])}</mark>`;
+		lastIndex = regex.lastIndex;
+	}
+	// Escape the rest after last match
+	html += escapeHtml(logoTextTitle.substring(lastIndex));
+	logoText.innerHTML = html;
 };
 
 const onSearch = e => {