From 62ee42ebe1a47eeafaae2c36c3a87dd2295dc7b7 Mon Sep 17 00:00:00 2001 From: Anne-Greeth van Herwijnen Date: Sat, 25 Nov 2023 20:15:49 +0100 Subject: [PATCH] Make it possible to have both our inputs running --- app/components/day.hbs | 4 ++-- app/controllers/puzzles/base.js | 4 ++-- app/routes/puzzles/1.js | 9 ++++++--- app/routes/puzzles/10.js | 9 ++++++--- app/routes/puzzles/11.js | 9 ++++++--- app/routes/puzzles/12.js | 9 ++++++--- app/routes/puzzles/13.js | 9 ++++++--- app/routes/puzzles/14.js | 9 ++++++--- app/routes/puzzles/15.js | 9 ++++++--- app/routes/puzzles/16.js | 9 ++++++--- app/routes/puzzles/17.js | 9 ++++++--- app/routes/puzzles/18.js | 9 ++++++--- app/routes/puzzles/19.js | 9 ++++++--- app/routes/puzzles/2.js | 9 ++++++--- app/routes/puzzles/20.js | 9 ++++++--- app/routes/puzzles/21.js | 9 ++++++--- app/routes/puzzles/22.js | 9 ++++++--- app/routes/puzzles/23.js | 9 ++++++--- app/routes/puzzles/24.js | 9 ++++++--- app/routes/puzzles/25.js | 9 ++++++--- app/routes/puzzles/3.js | 9 ++++++--- app/routes/puzzles/4.js | 9 ++++++--- app/routes/puzzles/5.js | 9 ++++++--- app/routes/puzzles/6.js | 9 ++++++--- app/routes/puzzles/7.js | 9 ++++++--- app/routes/puzzles/8.js | 9 ++++++--- app/routes/puzzles/9.js | 9 ++++++--- public/inputs/day1/{full.txt => full-liulangzhe.txt} | 0 .../inputs/{day10/full.txt => day1/full-minthamie.txt} | 0 .../inputs/{day11/full.txt => day10/full-liulangzhe.txt} | 0 .../inputs/{day12/full.txt => day10/full-minthamie.txt} | 0 .../inputs/{day13/full.txt => day11/full-liulangzhe.txt} | 0 .../inputs/{day14/full.txt => day11/full-minthamie.txt} | 0 .../inputs/{day15/full.txt => day12/full-liulangzhe.txt} | 0 .../inputs/{day16/full.txt => day12/full-minthamie.txt} | 0 .../inputs/{day17/full.txt => day13/full-liulangzhe.txt} | 0 .../inputs/{day18/full.txt => day13/full-minthamie.txt} | 0 .../inputs/{day19/full.txt => day14/full-liulangzhe.txt} | 0 .../inputs/{day2/full.txt => day14/full-minthamie.txt} | 0 .../inputs/{day20/full.txt => day15/full-liulangzhe.txt} | 0 .../inputs/{day21/full.txt => day15/full-minthamie.txt} | 0 .../inputs/{day22/full.txt => day16/full-liulangzhe.txt} | 0 .../inputs/{day23/full.txt => day16/full-minthamie.txt} | 0 .../inputs/{day24/full.txt => day17/full-liulangzhe.txt} | 0 .../inputs/{day25/full.txt => day17/full-minthamie.txt} | 0 .../inputs/{day3/full.txt => day18/full-liulangzhe.txt} | 0 .../inputs/{day4/full.txt => day18/full-minthamie.txt} | 0 .../inputs/{day5/full.txt => day19/full-liulangzhe.txt} | 0 .../inputs/{day6/full.txt => day19/full-minthamie.txt} | 0 .../inputs/{day7/full.txt => day2/full-liulangzhe.txt} | 0 public/inputs/{day8/full.txt => day2/full-minthamie.txt} | 0 .../inputs/{day9/full.txt => day20/full-liulangzhe.txt} | 0 public/inputs/day20/full-minthamie.txt | 0 public/inputs/day21/full-liulangzhe.txt | 0 public/inputs/day21/full-minthamie.txt | 0 public/inputs/day22/full-liulangzhe.txt | 0 public/inputs/day22/full-minthamie.txt | 0 public/inputs/day23/full-liulangzhe.txt | 0 public/inputs/day23/full-minthamie.txt | 0 public/inputs/day24/full-liulangzhe.txt | 0 public/inputs/day24/full-minthamie.txt | 0 public/inputs/day25/full-liulangzhe.txt | 0 public/inputs/day25/full-minthamie.txt | 0 public/inputs/day3/full-liulangzhe.txt | 0 public/inputs/day3/full-minthamie.txt | 0 public/inputs/day4/full-liulangzhe.txt | 0 public/inputs/day4/full-minthamie.txt | 0 public/inputs/day5/full-liulangzhe.txt | 0 public/inputs/day5/full-minthamie.txt | 0 public/inputs/day6/full-liulangzhe.txt | 0 public/inputs/day6/full-minthamie.txt | 0 public/inputs/day7/full-liulangzhe.txt | 0 public/inputs/day7/full-minthamie.txt | 0 public/inputs/day8/full-liulangzhe.txt | 0 public/inputs/day8/full-minthamie.txt | 0 public/inputs/day9/full-liulangzhe.txt | 0 public/inputs/day9/full-minthamie.txt | 0 77 files changed, 154 insertions(+), 79 deletions(-) rename public/inputs/day1/{full.txt => full-liulangzhe.txt} (100%) rename public/inputs/{day10/full.txt => day1/full-minthamie.txt} (100%) rename public/inputs/{day11/full.txt => day10/full-liulangzhe.txt} (100%) rename public/inputs/{day12/full.txt => day10/full-minthamie.txt} (100%) rename public/inputs/{day13/full.txt => day11/full-liulangzhe.txt} (100%) rename public/inputs/{day14/full.txt => day11/full-minthamie.txt} (100%) rename public/inputs/{day15/full.txt => day12/full-liulangzhe.txt} (100%) rename public/inputs/{day16/full.txt => day12/full-minthamie.txt} (100%) rename public/inputs/{day17/full.txt => day13/full-liulangzhe.txt} (100%) rename public/inputs/{day18/full.txt => day13/full-minthamie.txt} (100%) rename public/inputs/{day19/full.txt => day14/full-liulangzhe.txt} (100%) rename public/inputs/{day2/full.txt => day14/full-minthamie.txt} (100%) rename public/inputs/{day20/full.txt => day15/full-liulangzhe.txt} (100%) rename public/inputs/{day21/full.txt => day15/full-minthamie.txt} (100%) rename public/inputs/{day22/full.txt => day16/full-liulangzhe.txt} (100%) rename public/inputs/{day23/full.txt => day16/full-minthamie.txt} (100%) rename public/inputs/{day24/full.txt => day17/full-liulangzhe.txt} (100%) rename public/inputs/{day25/full.txt => day17/full-minthamie.txt} (100%) rename public/inputs/{day3/full.txt => day18/full-liulangzhe.txt} (100%) rename public/inputs/{day4/full.txt => day18/full-minthamie.txt} (100%) rename public/inputs/{day5/full.txt => day19/full-liulangzhe.txt} (100%) rename public/inputs/{day6/full.txt => day19/full-minthamie.txt} (100%) rename public/inputs/{day7/full.txt => day2/full-liulangzhe.txt} (100%) rename public/inputs/{day8/full.txt => day2/full-minthamie.txt} (100%) rename public/inputs/{day9/full.txt => day20/full-liulangzhe.txt} (100%) create mode 100644 public/inputs/day20/full-minthamie.txt create mode 100644 public/inputs/day21/full-liulangzhe.txt create mode 100644 public/inputs/day21/full-minthamie.txt create mode 100644 public/inputs/day22/full-liulangzhe.txt create mode 100644 public/inputs/day22/full-minthamie.txt create mode 100644 public/inputs/day23/full-liulangzhe.txt create mode 100644 public/inputs/day23/full-minthamie.txt create mode 100644 public/inputs/day24/full-liulangzhe.txt create mode 100644 public/inputs/day24/full-minthamie.txt create mode 100644 public/inputs/day25/full-liulangzhe.txt create mode 100644 public/inputs/day25/full-minthamie.txt create mode 100644 public/inputs/day3/full-liulangzhe.txt create mode 100644 public/inputs/day3/full-minthamie.txt create mode 100644 public/inputs/day4/full-liulangzhe.txt create mode 100644 public/inputs/day4/full-minthamie.txt create mode 100644 public/inputs/day5/full-liulangzhe.txt create mode 100644 public/inputs/day5/full-minthamie.txt create mode 100644 public/inputs/day6/full-liulangzhe.txt create mode 100644 public/inputs/day6/full-minthamie.txt create mode 100644 public/inputs/day7/full-liulangzhe.txt create mode 100644 public/inputs/day7/full-minthamie.txt create mode 100644 public/inputs/day8/full-liulangzhe.txt create mode 100644 public/inputs/day8/full-minthamie.txt create mode 100644 public/inputs/day9/full-liulangzhe.txt create mode 100644 public/inputs/day9/full-minthamie.txt diff --git a/app/components/day.hbs b/app/components/day.hbs index dcdc092..fcf9a69 100644 --- a/app/components/day.hbs +++ b/app/components/day.hbs @@ -8,11 +8,11 @@
- Solution 1 is {{if this.input @solution1 @example1}} + Part 1:
{{if this.input @solution1 @example1}}
- Solution 2 is {{if this.input @solution2 @example2}} + Part 2:
{{if this.input @solution2 @example2}}
diff --git a/app/controllers/puzzles/base.js b/app/controllers/puzzles/base.js index 05bcbdb..c9e6324 100644 --- a/app/controllers/puzzles/base.js +++ b/app/controllers/puzzles/base.js @@ -5,12 +5,12 @@ export default class PuzzlesBaseController extends Controller { return this.solve1(this.model.example); } get solution1() { - return this.solve1(this.model.full); + return `MinThaMie's solution: ${this.solve1(this.model.fullMinThaMie)}

LiuLangZhe's solution: ${this.solve1(this.model.fullLiuLangzhe)}`;; } get example2() { return this.solve2(this.model.example); } get solution2() { - return this.solve2(this.model.full); + return `MinThaMie's solution: ${this.solve2(this.model.fullMinThaMie)}

LiuLangZhe's solution: ${this.solve2(this.model.fullLiuLangzhe)}`; } } diff --git a/app/routes/puzzles/1.js b/app/routes/puzzles/1.js index 816b9f9..8de3bb5 100644 --- a/app/routes/puzzles/1.js +++ b/app/routes/puzzles/1.js @@ -8,11 +8,14 @@ export default class Puzzles1Route extends Route { async model() { const resIntro = await fetch('/inputs/day1/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day1/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day1/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day1/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/10.js b/app/routes/puzzles/10.js index 5abad14..6706b74 100644 --- a/app/routes/puzzles/10.js +++ b/app/routes/puzzles/10.js @@ -8,11 +8,14 @@ export default class Puzzles10Route extends Route { async model() { const resIntro = await fetch('/inputs/day10/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day10/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day10/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day10/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/11.js b/app/routes/puzzles/11.js index 4ef807a..8527574 100644 --- a/app/routes/puzzles/11.js +++ b/app/routes/puzzles/11.js @@ -8,11 +8,14 @@ export default class Puzzles11Route extends Route { async model() { const resIntro = await fetch('/inputs/day11/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day11/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day11/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day11/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/12.js b/app/routes/puzzles/12.js index 35a3f25..4ebe32d 100644 --- a/app/routes/puzzles/12.js +++ b/app/routes/puzzles/12.js @@ -8,11 +8,14 @@ export default class Puzzles12Route extends Route { async model() { const resIntro = await fetch('/inputs/day12/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day12/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day12/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day12/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/13.js b/app/routes/puzzles/13.js index aba5ac3..fa511cd 100644 --- a/app/routes/puzzles/13.js +++ b/app/routes/puzzles/13.js @@ -8,11 +8,14 @@ export default class Puzzles13Route extends Route { async model() { const resIntro = await fetch('/inputs/day13/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day13/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day13/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day13/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/14.js b/app/routes/puzzles/14.js index 020249a..965045f 100644 --- a/app/routes/puzzles/14.js +++ b/app/routes/puzzles/14.js @@ -8,11 +8,14 @@ export default class Puzzles14Route extends Route { async model() { const resIntro = await fetch('/inputs/day14/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day14/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day14/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day14/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/15.js b/app/routes/puzzles/15.js index 4be0be6..30e1c75 100644 --- a/app/routes/puzzles/15.js +++ b/app/routes/puzzles/15.js @@ -8,11 +8,14 @@ export default class Puzzles15Route extends Route { async model() { const resIntro = await fetch('/inputs/day15/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day15/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day15/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day15/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/16.js b/app/routes/puzzles/16.js index 7b1c04d..b50219e 100644 --- a/app/routes/puzzles/16.js +++ b/app/routes/puzzles/16.js @@ -8,11 +8,14 @@ export default class Puzzles16Route extends Route { async model() { const resIntro = await fetch('/inputs/day16/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day16/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day16/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day16/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/17.js b/app/routes/puzzles/17.js index 2d93721..101805f 100644 --- a/app/routes/puzzles/17.js +++ b/app/routes/puzzles/17.js @@ -8,11 +8,14 @@ export default class Puzzles17Route extends Route { async model() { const resIntro = await fetch('/inputs/day17/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day17/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day17/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day17/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/18.js b/app/routes/puzzles/18.js index f328bb4..26f991d 100644 --- a/app/routes/puzzles/18.js +++ b/app/routes/puzzles/18.js @@ -8,11 +8,14 @@ export default class Puzzles18Route extends Route { async model() { const resIntro = await fetch('/inputs/day18/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day18/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day18/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day18/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/19.js b/app/routes/puzzles/19.js index 792db0f..f9e655c 100644 --- a/app/routes/puzzles/19.js +++ b/app/routes/puzzles/19.js @@ -8,11 +8,14 @@ export default class Puzzles19Route extends Route { async model() { const resIntro = await fetch('/inputs/day19/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day19/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day19/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day19/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/2.js b/app/routes/puzzles/2.js index cae6546..a2679b0 100644 --- a/app/routes/puzzles/2.js +++ b/app/routes/puzzles/2.js @@ -8,11 +8,14 @@ export default class Puzzles2Route extends Route { async model() { const resIntro = await fetch('/inputs/day2/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day2/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day2/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day2/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/20.js b/app/routes/puzzles/20.js index 7e2b75f..2a0863b 100644 --- a/app/routes/puzzles/20.js +++ b/app/routes/puzzles/20.js @@ -8,11 +8,14 @@ export default class Puzzles20Route extends Route { async model() { const resIntro = await fetch('/inputs/day20/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day20/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day20/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day20/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/21.js b/app/routes/puzzles/21.js index beef64d..0afbf45 100644 --- a/app/routes/puzzles/21.js +++ b/app/routes/puzzles/21.js @@ -8,11 +8,14 @@ export default class Puzzles21Route extends Route { async model() { const resIntro = await fetch('/inputs/day21/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day21/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day21/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day21/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/22.js b/app/routes/puzzles/22.js index 3a3a6e6..51be9ec 100644 --- a/app/routes/puzzles/22.js +++ b/app/routes/puzzles/22.js @@ -8,11 +8,14 @@ export default class Puzzles22Route extends Route { async model() { const resIntro = await fetch('/inputs/day22/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day22/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day22/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day22/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/23.js b/app/routes/puzzles/23.js index b109f03..d5f48d2 100644 --- a/app/routes/puzzles/23.js +++ b/app/routes/puzzles/23.js @@ -8,11 +8,14 @@ export default class Puzzles23Route extends Route { async model() { const resIntro = await fetch('/inputs/day23/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day23/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day23/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day23/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/24.js b/app/routes/puzzles/24.js index b262abb..fd3b804 100644 --- a/app/routes/puzzles/24.js +++ b/app/routes/puzzles/24.js @@ -8,11 +8,14 @@ export default class Puzzles24Route extends Route { async model() { const resIntro = await fetch('/inputs/day24/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day24/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day24/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day24/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/25.js b/app/routes/puzzles/25.js index 1b9c9d4..b70e075 100644 --- a/app/routes/puzzles/25.js +++ b/app/routes/puzzles/25.js @@ -8,11 +8,14 @@ export default class Puzzles25Route extends Route { async model() { const resIntro = await fetch('/inputs/day25/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day25/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day25/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day25/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/3.js b/app/routes/puzzles/3.js index 8b61ade..e858951 100644 --- a/app/routes/puzzles/3.js +++ b/app/routes/puzzles/3.js @@ -8,11 +8,14 @@ export default class Puzzles3Route extends Route { async model() { const resIntro = await fetch('/inputs/day3/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day3/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day3/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day3/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/4.js b/app/routes/puzzles/4.js index c9bab1a..703e397 100644 --- a/app/routes/puzzles/4.js +++ b/app/routes/puzzles/4.js @@ -8,11 +8,14 @@ export default class Puzzles4Route extends Route { async model() { const resIntro = await fetch('/inputs/day4/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day4/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day4/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day4/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/5.js b/app/routes/puzzles/5.js index 1822ccc..21eb14e 100644 --- a/app/routes/puzzles/5.js +++ b/app/routes/puzzles/5.js @@ -8,11 +8,14 @@ export default class Puzzles5Route extends Route { async model() { const resIntro = await fetch('/inputs/day5/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day5/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day5/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day5/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/6.js b/app/routes/puzzles/6.js index 3fcf352..2df765d 100644 --- a/app/routes/puzzles/6.js +++ b/app/routes/puzzles/6.js @@ -8,11 +8,14 @@ export default class Puzzles6Route extends Route { async model() { const resIntro = await fetch('/inputs/day6/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day6/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day6/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day6/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/7.js b/app/routes/puzzles/7.js index c962b19..cf760a6 100644 --- a/app/routes/puzzles/7.js +++ b/app/routes/puzzles/7.js @@ -8,11 +8,14 @@ export default class Puzzles7Route extends Route { async model() { const resIntro = await fetch('/inputs/day7/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day7/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day7/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day7/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/8.js b/app/routes/puzzles/8.js index 9d43d3f..870a841 100644 --- a/app/routes/puzzles/8.js +++ b/app/routes/puzzles/8.js @@ -8,11 +8,14 @@ export default class Puzzles8Route extends Route { async model() { const resIntro = await fetch('/inputs/day8/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day8/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day8/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day8/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/app/routes/puzzles/9.js b/app/routes/puzzles/9.js index e1cb44f..34bbef1 100644 --- a/app/routes/puzzles/9.js +++ b/app/routes/puzzles/9.js @@ -8,11 +8,14 @@ export default class Puzzles9Route extends Route { async model() { const resIntro = await fetch('/inputs/day9/intro.txt'); const introFile = await resIntro.text(); - const res = await fetch('/inputs/day9/full.txt'); - const fullFile = await res.text(); + const resMinThamie = await fetch('/inputs/day9/full-minthamie.txt'); + const resLiuLangZhe = await fetch('/inputs/day9/full-liulangzhe.txt'); + const fullMinThamieFile = await resMinThamie.text(); + const fullLiuLangzheFile = await resLiuLangZhe.text(); return { example: this.parseInput(introFile), - full: this.parseInput(fullFile), + fullMinThaMie: this.parseInput(fullMinThamieFile), + fullLiuLangzhe: this.parseInput(fullLiuLangzheFile), }; } } diff --git a/public/inputs/day1/full.txt b/public/inputs/day1/full-liulangzhe.txt similarity index 100% rename from public/inputs/day1/full.txt rename to public/inputs/day1/full-liulangzhe.txt diff --git a/public/inputs/day10/full.txt b/public/inputs/day1/full-minthamie.txt similarity index 100% rename from public/inputs/day10/full.txt rename to public/inputs/day1/full-minthamie.txt diff --git a/public/inputs/day11/full.txt b/public/inputs/day10/full-liulangzhe.txt similarity index 100% rename from public/inputs/day11/full.txt rename to public/inputs/day10/full-liulangzhe.txt diff --git a/public/inputs/day12/full.txt b/public/inputs/day10/full-minthamie.txt similarity index 100% rename from public/inputs/day12/full.txt rename to public/inputs/day10/full-minthamie.txt diff --git a/public/inputs/day13/full.txt b/public/inputs/day11/full-liulangzhe.txt similarity index 100% rename from public/inputs/day13/full.txt rename to public/inputs/day11/full-liulangzhe.txt diff --git a/public/inputs/day14/full.txt b/public/inputs/day11/full-minthamie.txt similarity index 100% rename from public/inputs/day14/full.txt rename to public/inputs/day11/full-minthamie.txt diff --git a/public/inputs/day15/full.txt b/public/inputs/day12/full-liulangzhe.txt similarity index 100% rename from public/inputs/day15/full.txt rename to public/inputs/day12/full-liulangzhe.txt diff --git a/public/inputs/day16/full.txt b/public/inputs/day12/full-minthamie.txt similarity index 100% rename from public/inputs/day16/full.txt rename to public/inputs/day12/full-minthamie.txt diff --git a/public/inputs/day17/full.txt b/public/inputs/day13/full-liulangzhe.txt similarity index 100% rename from public/inputs/day17/full.txt rename to public/inputs/day13/full-liulangzhe.txt diff --git a/public/inputs/day18/full.txt b/public/inputs/day13/full-minthamie.txt similarity index 100% rename from public/inputs/day18/full.txt rename to public/inputs/day13/full-minthamie.txt diff --git a/public/inputs/day19/full.txt b/public/inputs/day14/full-liulangzhe.txt similarity index 100% rename from public/inputs/day19/full.txt rename to public/inputs/day14/full-liulangzhe.txt diff --git a/public/inputs/day2/full.txt b/public/inputs/day14/full-minthamie.txt similarity index 100% rename from public/inputs/day2/full.txt rename to public/inputs/day14/full-minthamie.txt diff --git a/public/inputs/day20/full.txt b/public/inputs/day15/full-liulangzhe.txt similarity index 100% rename from public/inputs/day20/full.txt rename to public/inputs/day15/full-liulangzhe.txt diff --git a/public/inputs/day21/full.txt b/public/inputs/day15/full-minthamie.txt similarity index 100% rename from public/inputs/day21/full.txt rename to public/inputs/day15/full-minthamie.txt diff --git a/public/inputs/day22/full.txt b/public/inputs/day16/full-liulangzhe.txt similarity index 100% rename from public/inputs/day22/full.txt rename to public/inputs/day16/full-liulangzhe.txt diff --git a/public/inputs/day23/full.txt b/public/inputs/day16/full-minthamie.txt similarity index 100% rename from public/inputs/day23/full.txt rename to public/inputs/day16/full-minthamie.txt diff --git a/public/inputs/day24/full.txt b/public/inputs/day17/full-liulangzhe.txt similarity index 100% rename from public/inputs/day24/full.txt rename to public/inputs/day17/full-liulangzhe.txt diff --git a/public/inputs/day25/full.txt b/public/inputs/day17/full-minthamie.txt similarity index 100% rename from public/inputs/day25/full.txt rename to public/inputs/day17/full-minthamie.txt diff --git a/public/inputs/day3/full.txt b/public/inputs/day18/full-liulangzhe.txt similarity index 100% rename from public/inputs/day3/full.txt rename to public/inputs/day18/full-liulangzhe.txt diff --git a/public/inputs/day4/full.txt b/public/inputs/day18/full-minthamie.txt similarity index 100% rename from public/inputs/day4/full.txt rename to public/inputs/day18/full-minthamie.txt diff --git a/public/inputs/day5/full.txt b/public/inputs/day19/full-liulangzhe.txt similarity index 100% rename from public/inputs/day5/full.txt rename to public/inputs/day19/full-liulangzhe.txt diff --git a/public/inputs/day6/full.txt b/public/inputs/day19/full-minthamie.txt similarity index 100% rename from public/inputs/day6/full.txt rename to public/inputs/day19/full-minthamie.txt diff --git a/public/inputs/day7/full.txt b/public/inputs/day2/full-liulangzhe.txt similarity index 100% rename from public/inputs/day7/full.txt rename to public/inputs/day2/full-liulangzhe.txt diff --git a/public/inputs/day8/full.txt b/public/inputs/day2/full-minthamie.txt similarity index 100% rename from public/inputs/day8/full.txt rename to public/inputs/day2/full-minthamie.txt diff --git a/public/inputs/day9/full.txt b/public/inputs/day20/full-liulangzhe.txt similarity index 100% rename from public/inputs/day9/full.txt rename to public/inputs/day20/full-liulangzhe.txt diff --git a/public/inputs/day20/full-minthamie.txt b/public/inputs/day20/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day21/full-liulangzhe.txt b/public/inputs/day21/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day21/full-minthamie.txt b/public/inputs/day21/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day22/full-liulangzhe.txt b/public/inputs/day22/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day22/full-minthamie.txt b/public/inputs/day22/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day23/full-liulangzhe.txt b/public/inputs/day23/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day23/full-minthamie.txt b/public/inputs/day23/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day24/full-liulangzhe.txt b/public/inputs/day24/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day24/full-minthamie.txt b/public/inputs/day24/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day25/full-liulangzhe.txt b/public/inputs/day25/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day25/full-minthamie.txt b/public/inputs/day25/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day3/full-liulangzhe.txt b/public/inputs/day3/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day3/full-minthamie.txt b/public/inputs/day3/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day4/full-liulangzhe.txt b/public/inputs/day4/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day4/full-minthamie.txt b/public/inputs/day4/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day5/full-liulangzhe.txt b/public/inputs/day5/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day5/full-minthamie.txt b/public/inputs/day5/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day6/full-liulangzhe.txt b/public/inputs/day6/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day6/full-minthamie.txt b/public/inputs/day6/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day7/full-liulangzhe.txt b/public/inputs/day7/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day7/full-minthamie.txt b/public/inputs/day7/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day8/full-liulangzhe.txt b/public/inputs/day8/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day8/full-minthamie.txt b/public/inputs/day8/full-minthamie.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day9/full-liulangzhe.txt b/public/inputs/day9/full-liulangzhe.txt new file mode 100644 index 0000000..e69de29 diff --git a/public/inputs/day9/full-minthamie.txt b/public/inputs/day9/full-minthamie.txt new file mode 100644 index 0000000..e69de29