change url structure

Author: encse

docs/build.js

@@ -80,6 +80,10 @@ function copyDirectory(src, dest) {
   };
 
 
+function linkToDay(year, day) {
+    return `/${year}/day/${day}`;
+}
+
 function loadTemplate(templatePath) {
     return fs.readFileSync(templatePath, 'utf8');
 }
@@ -93,7 +97,7 @@ function generateYearPicker(year, day, yearToDays) {
     let options = '';
     for (let y of Object.keys(yearToDays).sort()){
         let lastDay =  yearToDays[y][yearToDays[y].length-1];
-        let target = `/${y}/${lastDay}/`
+        let target = linkToDay(y, lastDay);
         options += `<a href="${target}">${y}</a>`
     }
 
@@ -108,7 +112,7 @@ function generateYearPicker(year, day, yearToDays) {
 function generateDayPicker(year, day, yearToDays) {
     let res = '';
     for (i = 1; i <= yearToDays[year].length; i++) {
-        const link = `<a href="/${year}/${i}">${i.toString().padStart(2, '0')}</a>`;
+        const link = `<a href="${linkToDay(year, i)}">${i.toString().padStart(2, '0')}</a>`;
         res +=  i == day ? `<span class="current">${link}</span>` : `<span>${link}</span>`;
     }
     return res;
@@ -134,7 +138,7 @@ const lastDay = Math.max(...yearToDays[lastYear]);
 copyDirectory('docs/static', 'build');
 
 const filledRedirectTemplate = fillTemplate(redirectTemplate, {
-    'default-page': `/${lastYear}/${lastDay}/`,
+    'default-page': linkToDay(lastYear, lastDay),
 });
 
 fs.writeFileSync(path.join('build', 'index.html'), filledRedirectTemplate);
@@ -143,7 +147,7 @@ const currentYear = new Date().getFullYear();
 // Iterate over readme.md files and print filled templates
 for (const { year, day, name, notes, code, illustration } of findReadmes('.')) {
     const filledHtml = fillTemplate(template, {
-        url: `https://aoc.csokavar.hu/${year}/${day}/`,
+        url: `https://aoc.csokavar.hu/${linkToDay(year, day)}`,
         'problem-id': `${year}/${day}`,
         'problem-name': `${name}`,
         'year-picker': generateYearPicker(year,day, yearToDays),
@@ -152,7 +156,7 @@ for (const { year, day, name, notes, code, illustration } of findReadmes('.')) {
         notes,
         code,
     });
-    const dst = `build/${year}/${day}`;
+    const dst = `build/${year}/day/${day}`;
     fs.mkdirSync(dst, { recursive: true });
     fs.writeFileSync(path.join(dst, 'index.html'), filledHtml);
     fs.copyFileSync(illustration, path.join(dst, 'illustration.jpeg'));

docs/redirect_template.html

@@ -3,7 +3,8 @@
 <script>
     const url = new URL(window.location.href);
     if (url.search.match(/^\?(\d{4})\/\d{1,2}/)) {
-        window.location = url.search.substring(1);
+        let m = url.search.match(/^\?(\d{4})\/(\d{1,2})/);
+        window.location = m[1] + "/day/"+m[2];
     } else {
         window.location = '{{default-page}}';
     }