Fix, update, and cleanup Skaianet Systems page (resolves #606)

Makefile

@@ -41,12 +41,16 @@ src/imods.tar.gz: $(wildcard src/imods/*) $(wildcard src/imods/*/*)
 
 ## Running live
 
-# Run 'SERVE_FLAGS="--reset-last-version" make src/imods.tar.gz test' to make imods and pass --reset-last-version through
+# Run 'rm src/imods.tar.gz; SERVE_FLAGS="--reset-last-version" make src/imods.tar.gz test' to make imods and pass --reset-last-version through
 .PHONY: test
 test: install src/imods.tar.gz
 	yarn run vue-cli-service electron:serve $(SERVE_FLAGS)
 	# yarn dev
 
+.PHONY: itest
+	-rm src/imods.tar.gz
+	SERVE_FLAGS="--reset-last-version" make src/imods.tar.gz test
+
 ## Building output
 
 .PHONY: build

package.json

@@ -14,7 +14,7 @@
   "engines": {
     "node": "18.20"
   },
-  "version": "2.5.3",
+  "version": "2.5.4",
   "license": "GPL-3.0",
   "repository": "github:Bambosh/unofficial-homestuck-collection",
   "private": true,

src/components/Extras/Skaianet.vue

@@ -116,6 +116,17 @@
                     </span>
                     <br>
                     <table class="centercolumn promotion" summary="" border="2" v-for="promotion in promotions">
+                      <tr v-if="promotion.pretitle">
+                        <td width="74px" height="64">
+                          <MediaEmbed :url="promotion.preicon || promotion.icon" style="display: block;"/>
+                        </td>
+                        <td width="2"></td>
+                        <td height="64">
+                          <center>
+                            <div class="title" v-html="promotion.pretitle" />
+                          </center>
+                        </td>
+                      </tr>
                       <tr>
                         <td width="74px" height="64">
                           <MediaEmbed :url="promotion.icon" style="display: block;"/>
@@ -142,7 +153,7 @@
         </tr>
         <tr>
           <td colspan="3" class="grey">
-            <center> © 1889-2029 Skaianet Systems Incorporated. All rights reserved. </center>
+            <center>☺1889-2029 Skaianet Systems Incorporated. All rights reserved. </center>
           </td>
         </tr>
       </table>
@@ -156,6 +167,13 @@ import NavBanner from '@/components/UIElements/NavBanner.vue'
 import MediaEmbed from '@/components/UIElements/MediaEmbed.vue'
 import SpoilerBox from '@/components/UIElements/SpoilerBox.vue'
 
+var fs
+if (!window.isWebApp) {
+  fs = require('fs')
+} else {
+  fs = undefined
+}
+
 export default {
   name: 'skaianet',
   props: [
@@ -267,7 +285,13 @@ export default {
               <a>Act 4</a>
             </em></p>
             <p><em><a href="https://store.steampowered.com/curator/35533744-Homestuck-Universe/list/49536/">Steam store page</a></em></p>
-            <p><em>14 September 2017 - Ongoing</em></p>`
+            <p>
+              <em>14 September 2017 - Present</em></p>
+            <p>
+              <em>Kickstarter: 4 September 2012</em><br />
+              <em>Act 1: 14 September 2017</em><br />
+              <em>Act 2: 25 November 2020</em>
+            </p>`
         },
         {
           icon: "archive/skaianet/viz.gif",
@@ -282,11 +306,12 @@ export default {
         {
           icon: "archive/skaianet/spoon.gif",
           title: `
-            <a href="https://topatoco.com/products/mspa-sb-spoon" target="_blank">SPOON.PDF</a>
+            <a href="https://archive.org/details/sbahj-and-the-quest-for-the-missing-spoon" target="_blank">SPOON.PDF</a>
             <img src="${this.$getResourceURL('archive/skaianet/book.gif')}" align="middle" />`,
           content: `
              <p>Journey with Sweet Bro as he joroneys to recover his spoon over a long jounrey. </p>
              <p><a href='https://www.kickstarter.com/projects/1724736026/sweet-bro-and-hella-jeff-by-hussie-dril-and-kc-gre/'>Kickstarter</a></p>
+             <p><a href='https://web.archive.org/web/20230203203700/https://topatoco.com/products/mspa-sb-spoon'>Topatoco (Archive, discontinued)</a></p>
              <p><em>8 November 2018</em></p>`
         },
         {
@@ -308,14 +333,13 @@ export default {
             <a href="/epilogues">EPILOGUES.TXT</a>
             <img src="${this.$getResourceURL('archive/skaianet/txt.gif')}" align="middle" />
             <a href="https://www.homestuck.com/epilogues" target="_blank">WWW</a>
-            <img src="${this.$getResourceURL('archive/skaianet/www.gif')}" align="middle" />
-            <a href="https://www.viz.com/read/graphic-novel/homestuck-epilogues/product/6154" target="_blank">VIZ</a>
-            <img src="${this.$getResourceURL('archive/skaianet/book.gif')}" align="middle" />`,
+            <img src="${this.$getResourceURL('archive/skaianet/www.gif')}" align="middle" />`,
           content: `<p>Tales of dubious authenticity.</p>
 
             <p>Ten years ago, a young man stood in his bedroom. The events set in motion that day would change his and his friends' lives forever, for the better and the worse (and the ridiculous). Now, in the aftermath, he has to make a choice: Meat or Candy?</p>
-            <p><em><a href="https://www.viz.com/read/graphic-novel/homestuck-epilogues/product/6154">Description from VIZ Media.</a></em></p>
-            <p><em>Online release: 13 - 20 April 2019</em></p>
+            <p><a href="https://web.archive.org/web/20200307172211/https://www.viz.com/read/graphic-novel/homestuck-epilogues/product/6154">VIZ Media print release (Archive, discontinued)</a></p>
+            <p><em>Prologue release: 13 April 2019</em><br />
+               <em>Online release: 20 April 2019</em></p>
             <p><em>VIZ Media print release: 14 January 2020</em></p>`
         },
         {
@@ -336,21 +360,42 @@ export default {
             <p><em>4 September 2019 - 1 April 2020</em></p>`
         },
         {
+          preicon: "assets://archive/skaianet/snake.png",
+          pretitle: `<del>
+            <a href="https://web.archive.org/web/20210122001639/https://www.homestuck2.com/" target="_blank">HOMESTUCK^2.TXT</a></del>
+            <img src="${this.$getResourceURL('archive/skaianet/txt.gif')}" align="middle" />`,
           icon: "archive/skaianet/hs2.gif",
           title: `
-            <a href="https://www.homestuck2.com" target="_blank">HOMESTUCK^2.TXT</a>
+            <a href="https://www.beyondcanon.com" target="_blank">BEYONDCANON.TXT</a>
             <img src="${this.$getResourceURL('archive/skaianet/txt.gif')}" align="middle" />`,
           content: `
-            <p>This is not Homestuck. But it is not <em>not</em> Homestuck. This is...</p>
+            <p>Homestuck: Beyond Canon (HS:BC) is a further continuation of the Homestuck story, after the events of The Homestuck Epilogues and Pesterquest.</p>
+
+            <p>It is a story about the consequences of the pursuit of relevancy and growing up. As this work is a direct followup to The Homestuck Epilogues it is highly recommended you be familiar with what happens in that story.</p>
+
+            <p><em><a href="https://beyondcanon.com/about">Description from the website's About page.</a></em></p>
+
+            <hr />
+
+            <p><b>Homestuck^2: Beyond Canon</b> was a <a href='https://web.archive.org/web/20200107061917/https://www.homestuck2.com/faq'>What Pumpkin/Snake Solutions collaboration</a> from 25 October 2019 until 29 December 2020, when it was put on an <a href='https://www.patreon.com/posts/hiatus-and-45570563'>indefinite hiatus.</a> <br />Snake Solutions Studio LLP was disbanded January 2021.</p>
+
+            <p>On 8 October 2023, the project was rebranded as <b>Homestuck: Beyond Canon (HS:BC)</b> and was continued <a href='https://beyondcanon.com/news/under-new-management'>by a new team</a> known as the <a href='https://web.archive.org/web/20240305093005/https://beyondcanon.com/about'>Homestuck independent creative union.</a> The story picked up from where it had left off.</p>
+            <p><em>Homestuck^2: Beyond Canon: 25 October 2019 - 29 December 2020</em></p>
+            <p><em>Homestuck: Beyond Canon: 8 October 2023 - Present</em></p>`
+        },
+        {
+          icon: "archive/skaianet/psycholonials.gif",
+          title: `
+            <a href="https://www.psycholonials.com" target="_blank">PSYCHOLONIALS.EXE</a>
+            <img src="${this.$getResourceURL('archive/skaianet/exe.gif')}" align="middle" />`,
+          content: `
+             <p>While in communication with supernatural forces, two influencers launch a daring new social media brand.</p>
 
-            <h2>HOMESTUCK^2: BEYOND CANON</h2>
+             <p>A visual novel by Andrew Hussie.<br />
+             <a href='https://psycholonials.bandcamp.com/album/psycholonials'>Soundtrack by Clark Powell.</a></p>
 
-            <p>Homestuck^2: Beyond Canon is an official continuation of the cult-classic webcomic Homestuck and a follow-up to The Homestuck Epilogues, dropped as a major event in April of 2019.</p>
-            <p>Homestuck 2: Beyond Canon takes a combination of Andrew Hussie's original writing and plot outlines and concepts and joins him with a team of new, diverse voices to expand the compelling narratives of Homestuck's most (and least) beloved characters.</p>
-            <p><em><a href="https://www.patreon.com/homestuck">Description from the Homestuck Patreon.</a></em></p>
-            <p><em>25 October 2019 -</em></p>`
+             <p><em>3 Feburary 2021</em></p>`
         }
-        // <p>On an indefinite hiatus as of Feb 2021. You can see the announcement post <a href='https://homestuck.net/official/patreon/posts/future-approach-47431875/'>here</a></p>
       ],
       cursedText: { }
     }
@@ -370,21 +415,21 @@ export default {
     setApophis() {
       // Get todays date and time
       let now = new Date().getTime()
-      
+
       // Find the distance between now and the count down date
       let distance = this.countDownDate - now
-      
+
       // Time calculations for days, hours, minutes and seconds
       let years = Math.floor(distance / (1000 * 60 * 60 * 24 * 365))
       let days = Math.floor(distance / (1000 * 60 * 60 * 24)) - (years * 365)
       let hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
       let minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60))
       let seconds = Math.floor((distance % (1000 * 60)) / 1000)
-      
+
       // Output the result in an element with class="Apophis"
       this.apophis = years + "y " + days + "d " + hours + "h " + minutes + "m " + seconds + "s "
-      
-      // If the count down is over, write some text 
+
+      // If the count down is over, write some text
       if (distance < 0) {
         clearInterval(this.marqueeInterval)
         this.apophis = "EXPIRED"
@@ -407,8 +452,7 @@ export default {
       } else {
         return fs.readFileSync(this.$mspaFileStream(url), 'utf8')
       }
-      // require('fs').readFileSync(this.$mspaFileStream(url), 'utf8')
-    },
+    }
   },
   updated() {
   },