Bit of code cleaning

Author: kelson42

res/js/index.ts

@@ -37,96 +37,3 @@ const currentLanguage = (localStorage && localStorage[window.lsPrefix + 'current
 
 const currentCategory = (localStorage && localStorage[window.lsPrefix + 'currentCategory']) ?
   localStorage[window.lsPrefix + 'currentCategory'] : 'all';
-
-const ractive = new Ractive({
-  el: '#ractive-target',
-  template: reactiveTemplate,
-  computed: {
-    languages() {
-      return Object.entries(this.get('languageMappings'));
-    },
-    categories() {
-      const lang = this.get('selectedLanguage');
-      const sims = this.get(`simulationsByLanguage.${lang}`);
-      const makeCategoryId = this.get('makeCategoryId');
-      return sims.reduce((acc, sim) => acc.concat(sim.categories), [])
-        .sort((a, b) => makeCategoryId(a) < makeCategoryId(b) ? -1 : 1)
-        .filter((val, index, arr) => makeCategoryId(val) !== makeCategoryId(arr[index - 1] || []));
-    },
-    simulations() {
-      const lang = this.get('selectedLanguage');
-      const sims = this.get(`simulationsByLanguage.${lang}`);
-      const category = this.get('selectedCategory') || 'all';
-
-      if (category === 'all') {
-        return sims;
-      } else {
-        return sims.filter(sim => {
-          return !!~sim.categories.map(c => c.slug).indexOf(category);
-        });
-      }
-    }
-  },
-  data: {
-    simulationsByLanguage: window.importedData.simsByLanguage,
-    selectedLanguage: currentLanguage,
-    selectedCategory: currentCategory,
-    languageMappings: window.importedData.languageMappings,
-
-    makeCategoryId(category: Category) {
-      return category.slug;
-    },
-    makeCategoryName(category: Category) {
-      return category.title;
-    },
-    getSlug: (item) => {
-      return JSON.stringify(item);
-    }
-  },
-  oninit() {
-    this.observe('selectedLanguage', function (selectedLanguage) {
-      if (localStorage) localStorage[window.lsPrefix + 'currentLanguage'] = selectedLanguage;
-    });
-    this.observe('selectedCategory', function (selectedCategory) {
-      if (localStorage) localStorage[window.lsPrefix + 'currentCategory'] = selectedCategory;
-    });
-    this.on('showConfirm', function (ev) {
-      const simulation: Simulation = ev.context;
-
-      const categoryHTML = simulation.categories.map(cat => `<li>${cat.title}</li>`).join('');
-      const topicsHTML = simulation.topics.map(t => `<li>${t}</li>`).join('');
-
-      swal.fire({
-        title: `${simulation.title}`,
-        html: `
-          <div>
-            <img src='../I/${simulation.id}.png' />
-          </div>
-          <div class='flex-cont'>
-            <div>
-              <span>Categories</span>
-              <ul>${categoryHTML}</ul>
-            </div>
-            <div>
-              <span>Topics</span>
-              <ul class='topics'>${topicsHTML}</ul>
-            </div>
-          </div>
-          <div class='description'>${simulation.description}</div>`,
-        showCloseButton: true,
-        showCancelButton: true,
-        confirmButtonText: 'Load'
-      }).then(({dismiss}) => {
-        const reasonsToCancel = [
-          swal.DismissReason.cancel,
-          swal.DismissReason.close,
-          swal.DismissReason.esc,
-        ];
-        if (reasonsToCancel.includes(dismiss)) return;
-        const a = document.createElement('a');
-        a.href = `${simulation.id}_${simulation.language}.html`;
-        document.body.appendChild(a).click();
-      });
-    });
-  }
-});

steps/export.ts

@@ -62,9 +62,7 @@ const getNamespaceByExt = (ext: string): string => namespaces[ext] || '-';
 
 const getKiwixPrefix = (ext: string): string => `../${getNamespaceByExt(ext)}/`;
 
-const getLanguage = (fileName) => fileName.split('_').pop().split('.')[0];
-
-const addKiwixPrefixes = function addKiwixPrefixes(file, targetDir) {
+const addKiwixPrefixes = function addKiwixPrefixes(file) {
   const resources = file.match(/[0-9a-f]{32}\.(svg|jpg|jpeg|png|js)/g) || [];
   return resources
     .reduce((file, resName) => {
@@ -99,7 +97,7 @@ const extractResources = async (target, targetDir: string): Promise<void> => {
         html = html.replace(fileName, `${getKiwixPrefix(ext)}${fileName}`);
 
         let file = await fs.promises.readFile(`${inDir}${fileName}`, 'utf8');
-        file = addKiwixPrefixes(file, targetDir);
+        file = addKiwixPrefixes(file);
         return await fs.promises.writeFile(`${targetDir}${path.basename(fileName)}`, file, 'utf8');
       }));
       await fs.promises.writeFile(`${targetDir}${path.basename(file)}`, html, 'utf8');

steps/transform.ts

@@ -1,9 +1,7 @@
 import * as fs from 'fs';
 import md5 from 'md5';
-import * as glob from 'glob';
 import * as path from 'path';
 import * as dotenv from 'dotenv';
-import op from 'object-path';
 import * as cheerio from 'cheerio';
 import imagemin from 'imagemin';
 
@@ -110,7 +108,7 @@ const removeStrings = (html): string => {
 };
 
 const extractBase64 = async (fileName, html): Promise<string> => {
-  const b64files = html.match(/( src=)?'data:([A-Za-z-+\/]+);base64,[^']*/g);
+  const b64files = html.match(/( src=)?'data:([A-Za-z-+/]+);base64,[^']*/g);
 
   await Promise.all((b64files || [])
     .map(async b64entry => {