aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE.txt15
-rw-r--r--app/wikiparser.mjs40
-rw-r--r--package.json2
-rw-r--r--pages/index.wiki8
4 files changed, 41 insertions, 24 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..6f214ab
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (c) 2021 Leonardo Bishop
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
diff --git a/app/wikiparser.mjs b/app/wikiparser.mjs
index e49a09c..e0e06df 100644
--- a/app/wikiparser.mjs
+++ b/app/wikiparser.mjs
@@ -1,23 +1,25 @@
'use strict';
-
-// This file is a modified version of Nixinova/Wikity, whose license is given below:
-// Original: https://www.npmjs.com/package/wikity
-//
-// ISC License
-//
-// Copyright © 2021 Nixinova
-//
-// Permission to use, copy, modify, and/or distribute this software for any purpose with or
-// without fee is hereby granted, provided that the above copyright notice and this
-// permission notice appear in all copies.
-//
-// The software is provided "as is" and the author disclaims all warranties with regard to
-// this software including all implied warranties of merchantability and fitness. In no
-// event shall the author be liable for any special, direct, indirect, or consequential
-// damages or any damages whatsoever resulting from loss of use, data or profits, whether
-// in an action of contract, negligence or other tortious action, arising out of or in
-// connection with the use or performance of this software.
-
+/*
+ * This file is a modified version of Nixinova/Wikity, whose license is given below:
+ * Original: https://www.npmjs.com/package/wikity
+ *
+ * > ISC License
+ * >
+ * > Copyright © 2021 Nixinova
+ * >
+ * > Permission to use, copy, modify, and/or distribute this software for any purpose with or
+ * > without fee is hereby granted, provided that the above copyright notice and this
+ * > permission notice appear in all copies.
+ * >
+ * > The software is provided "as is" and the author disclaims all warranties with regard to
+ * > this software including all implied warranties of merchantability and fitness. In no
+ * > event shall the author be liable for any special, direct, indirect, or consequential
+ * > damages or any damages whatsoever resulting from loss of use, data or profits, whether
+ * > in an action of contract, negligence or other tortious action, arising out of or in
+ * > connection with the use or performance of this software.
+ *
+ * Additonally, this project and my modifications are also licensed under the ISC license.
+ */
import dateFormat from 'dateformat';
import htmlEscape from 'escape-html';
import * as fs from 'fs';
diff --git a/package.json b/package.json
index 055a7dc..0519db1 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"start": "node -r dotenv/config app/index.mjs"
},
"author": "Leonardo Bishop",
- "license": "UNLICENSED",
+ "license": "ISC",
"dependencies": {
"dateformat": "^5.0.2",
"dotenv": "^10.0.0",
diff --git a/pages/index.wiki b/pages/index.wiki
index 8286e6f..a6ae4bb 100644
--- a/pages/index.wiki
+++ b/pages/index.wiki
@@ -6,7 +6,7 @@ Hello! 👋
I'm '''Leonardo Bishop''', a programmer studying Computer Science full-time at university.
-You can view my projects on the [[about]] page.
+You can check out my projects on the [[about]] page.
== Accessing old content ==
@@ -18,11 +18,11 @@ https://leonardobishop.com/nextbus/
</pre>
will become
<pre>
-https://leonardobishop.com/~nextbus/
+https://leonardobishop.com/~/nextbus/
</pre>
== New website ==
-This new website is built in NodeJS and these pages are witten in wikitext.
+This new website is written in TypeScript and these pages are witten in wikitext.
-The source code for this website is available on [https://github.com/LMBishop/website GitHub], for everyone to rip apart and laugh at how poorly written it is. (If you do have suggestions on how to improve it though, please do let me know!)
+The source code for this website is available on [https://github.com/LMBishop/website GitHub], freely available under the ISC licence. (If you have suggestions on how to improve it, specifically how the code is designed, please let me know!)