summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetamuffin <metamuffin@yandex.com>2021-09-21 16:19:46 +0200
committermetamuffin <metamuffin@yandex.com>2021-09-21 16:19:46 +0200
commitc35da9dc7882f3b51054590e01349ee4e37a027c (patch)
tree45ec1c43adf4d87e1831c8c9cd2dc34fff50aa5f
parent3f0a762ace654e7d359c3f093dca7d1946cb14e2 (diff)
downloadmetamuffin-website-c35da9dc7882f3b51054590e01349ee4e37a027c.tar
metamuffin-website-c35da9dc7882f3b51054590e01349ee4e37a027c.tar.bz2
metamuffin-website-c35da9dc7882f3b51054590e01349ee4e37a027c.tar.zst
moved links to diffent file and added link to sofviic
-rw-r--r--package.json2
-rw-r--r--source/index.ts4
-rw-r--r--tsconfig.json76
-rw-r--r--views/about.pug5
-rw-r--r--views/layout.pug1
-rw-r--r--views/links.pug12
-rw-r--r--views/projects.pug2
7 files changed, 25 insertions, 77 deletions
diff --git a/package.json b/package.json
index 5662894..c110c6a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "metamuffin-org-website",
"version": "1.0.0",
"main": "index.js",
- "license": "MIT",
+ "license": "AGPL-3.0-only",
"scripts": {
"start": "tsc && node dist/index.js"
},
diff --git a/source/index.ts b/source/index.ts
index dac1b2d..2106b32 100644
--- a/source/index.ts
+++ b/source/index.ts
@@ -1,5 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
-
import express from "express"
import { readFileSync } from "fs"
import { readFile } from "fs/promises"
@@ -22,6 +21,7 @@ app.get("/", (req, res) => res.redirect("/about"))
app.get("/about", (req, res) => res.render("about", render_env))
app.get("/projects", (req, res) => res.render("projects", render_env))
app.get("/contact", (req, res) => res.render("contact", render_env))
+app.get("/links", (req, res) => res.render("links", render_env))
app.get("/licence", async (req, res) => {
const content = (await readFile(join(__dirname, "../LICENCE"))).toString()
@@ -30,7 +30,7 @@ app.get("/licence", async (req, res) => {
app.get("/favicon.ico", (req,res) => res.sendStatus(204)) // no content
app.get("/robots.txt", (req,res) => {
- res.send("User-Agent: *\nDisallow: /")
+ res.send("User-Agent: *\nDisallow: /\n")
})
const PORT = parseInt(process.env.PORT ?? "8080")
diff --git a/tsconfig.json b/tsconfig.json
index ee35985..f2a02f2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,72 +1,12 @@
{
"compilerOptions": {
- /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
- /* Basic Options */
- // "incremental": true, /* Enable incremental compilation */
- "target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
- "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
- // "lib": [], /* Specify library files to be included in the compilation. */
- // "allowJs": true, /* Allow javascript files to be compiled. */
- // "checkJs": true, /* Report errors in .js files. */
- // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
- // "declaration": true, /* Generates corresponding '.d.ts' file. */
- // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
- // "sourceMap": true, /* Generates corresponding '.map' file. */
- // "outFile": "./", /* Concatenate and emit output to single file. */
- "outDir": "./dist", /* Redirect output structure to the directory. */
- "rootDir": "./source", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
- // "composite": true, /* Enable project compilation */
- // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
- // "removeComments": true, /* Do not emit comments to output. */
- // "noEmit": true, /* Do not emit outputs. */
- // "importHelpers": true, /* Import emit helpers from 'tslib'. */
- // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
- // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
-
- /* Strict Type-Checking Options */
- "strict": true, /* Enable all strict type-checking options. */
- // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
- // "strictNullChecks": true, /* Enable strict null checks. */
- // "strictFunctionTypes": true, /* Enable strict checking of function types. */
- // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
- // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
- // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
- // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
-
- /* Additional Checks */
- // "noUnusedLocals": true, /* Report errors on unused locals. */
- // "noUnusedParameters": true, /* Report errors on unused parameters. */
- // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
- // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
- // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
- // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */
- // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
-
- /* Module Resolution Options */
- // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
- // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
- // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
- // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
- // "typeRoots": [], /* List of folders to include type definitions from. */
- // "types": [], /* Type declaration files to be included in compilation. */
- // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
- "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
- // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
- // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
-
- /* Source Map Options */
- // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
- // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
- // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
- // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
-
- /* Experimental Options */
- // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
- // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
-
- /* Advanced Options */
- "skipLibCheck": true, /* Skip type checking of declaration files. */
- "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
+ "target": "esnext",
+ "module": "commonjs",
+ "outDir": "./dist",
+ "rootDir": "./source",
+ "strict": true,
+ "esModuleInterop": true,
+ "skipLibCheck": true,
+ "forceConsistentCasingInFileNames": true
}
}
diff --git a/views/about.pug b/views/about.pug
index bdadbdf..d4a783e 100644
--- a/views/about.pug
+++ b/views/about.pug
@@ -10,11 +10,6 @@ block content
| i am also interested in the free software movement.
| i am *not* interested to use capitalization on this page.
- h3 my friends websites
- ul
- li: a(href="https://potatoxel.org/") potatoxel
- li: a(href="https://pixificial.xyz/") pixificial
- li: a(href="https://bgfxc4.de/") bgfxc4 (warning: proprietary javascript)
h3 notes
p
diff --git a/views/layout.pug b/views/layout.pug
index c1479b2..5d15f5e 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -12,6 +12,7 @@ html(lang="en")
ul
li: a(href="/about") about
li: a(href="/projects") projects
+ li: a(href="/links") links
li: a(href="/contact") contact
hr
diff --git a/views/links.pug b/views/links.pug
new file mode 100644
index 0000000..62c923a
--- /dev/null
+++ b/views/links.pug
@@ -0,0 +1,12 @@
+//- SPDX-License-Identifier: AGPL-3.0-only
+extends layout
+
+block content
+ h2 links
+
+ h3 my friends websites
+ ul
+ li: a(href="https://potatoxel.org/") potatoxel
+ li: a(href="https://pixificial.xyz/") pixificial
+ li: a(href="http://sofviic.com/") sofviic
+ li: a(href="https://bgfxc4.de/") bgfxc4 (warning: 10 lines of proprietary javascript)
diff --git a/views/projects.pug b/views/projects.pug
index cea0aaf..735ea68 100644
--- a/views/projects.pug
+++ b/views/projects.pug
@@ -3,5 +3,5 @@ extends layout
block content
h2 projects
- h3 todo
+ span todo