From 985763e3fcb6762fa76b81c059a97648905b3761 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 18 Jul 2020 21:54:58 +0200
Subject: Started fileview
---
src/handler/fileView.ts | 6 ++++++
src/handler/user.ts | 5 +++++
src/main.ts | 13 ++++++-------
src/public/script.js | 0
src/public/style.css | 0
src/util/files.ts | 7 +++++++
src/views/index.html | 11 +++++++++++
7 files changed, 35 insertions(+), 7 deletions(-)
create mode 100644 src/handler/fileView.ts
create mode 100644 src/public/script.js
create mode 100644 src/public/style.css
create mode 100644 src/util/files.ts
create mode 100644 src/views/index.html
(limited to 'src')
diff --git a/src/handler/fileView.ts b/src/handler/fileView.ts
new file mode 100644
index 0000000..90c7176
--- /dev/null
+++ b/src/handler/fileView.ts
@@ -0,0 +1,6 @@
+import type { HandlerFunc, Context } from "https://deno.land/x/abc@master/mod.ts";
+import { cleanPath } from "../util/files.ts";
+
+export const handlePath: HandlerFunc = async (c: Context) => {
+ return await c.render("./src/views/index.html", { path: cleanPath(c.path) });
+};
diff --git a/src/handler/user.ts b/src/handler/user.ts
index 28d6fbd..fe65eaa 100644
--- a/src/handler/user.ts
+++ b/src/handler/user.ts
@@ -2,3 +2,8 @@ import type { HandlerFunc, Context } from "https://deno.land/x/abc@master/mod.ts
import db from "../db/user.ts";
export const index: HandlerFunc = async (c: Context) => c.params.name;
+export const register: HandlerFunc = async (c: Context) => {
+ const { username, email, password } = await c.body();
+ await db.createUser(email, username, password);
+
+}
diff --git a/src/main.ts b/src/main.ts
index 1772e97..94f8b33 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,14 +3,11 @@ import { Application } from "https://deno.land/x/abc@master/mod.ts";
import type { Context } from "https://deno.land/x/abc@master/mod.ts";
import { renderFile } from "https://deno.land/x/dejs/mod.ts";
import * as groups from "./groups/index.ts";
+import { handlePath } from "./handler/fileView.ts";
import DBController from "./db/DBController.ts";
-let dbc: DBController;
// Ugly solution
-(async () => {
- dbc = new DBController();
- await dbc.init();
-})();
+(async () => await new DBController().init())();
const port = parseInt(Deno.env.get("PORT") || "8080");
const app = new Application();
@@ -21,8 +18,10 @@ app.renderer = {
},
};
-app.static("/", "./src/public/"); // Manage static files - TODO: Consider serving css/js files separately
-app.get("/", async (c: Context) => await c.render("./src/public/test.html", { name: "test" })); // Render index on /
+app.static("/public/", "./src/public/"); // Manage static files
+app.get("/", async (c: Context) => await c.render("./src/views/index.html")); // Render index on /
+
+app.get("/files/*", handlePath);
// Load groups dynamically
// deno-lint-ignore ban-ts-comment
diff --git a/src/public/script.js b/src/public/script.js
new file mode 100644
index 0000000..e69de29
diff --git a/src/public/style.css b/src/public/style.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/util/files.ts b/src/util/files.ts
new file mode 100644
index 0000000..ec1f584
--- /dev/null
+++ b/src/util/files.ts
@@ -0,0 +1,7 @@
+export const cleanPath = (path: string) => {
+ return path
+ .replace("/files/", "")
+ .replace("../", "") // TODO: Fix relative ../
+ .replace("./", "")
+ .replace(/([^:]\/)\/+/g, "$1");
+};
diff --git a/src/views/index.html b/src/views/index.html
new file mode 100644
index 0000000..ffeb948
--- /dev/null
+++ b/src/views/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+ Index
+
+
+ <% if (path) { %> <%= path %>! <% } %>
+
+
--
cgit v1.2.3