OpenServer/OpenAuth_server
1
1
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Adding views as git submodule

Browse Source
This commit is contained in:
Fabian Stamm 2020-03-09 18:09:30 +01:00
parent 8edfaba134
commit 78927bffe1
6 changed files with 54 additions and 2029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "views_repo"]
path = views_repo
url = ./views_repo/

77
locales/de.json
View File

@ -1,39 +1,40 @@
{ {
"User not found": "Benutzer nicht gefunden", "User not found": "Benutzer nicht gefunden",
"Password or username wrong": "Passwort oder Benutzername falsch", "Password or username wrong": "Passwort oder Benutzername falsch",
"Authorize %s": "Authorize %s", "Authorize %s": "Authorize %s",
"Login": "Einloggen", "Login": "Einloggen",
"You are not logged in or your login is expired": "Du bist nicht länger angemeldet oder deine Anmeldung ist abgelaufen.", "You are not logged in or your login is expired": "Du bist nicht länger angemeldet oder deine Anmeldung ist abgelaufen.",
"Username or Email": "Benutzername oder Email", "Username or Email": "Benutzername oder Email",
"Password": "Passwort", "Password": "Passwort",
"Next": "Weiter", "Next": "Weiter",
"Register": "Registrieren", "Register": "Registrieren",
"Mail": "Mail", "Mail": "Mail",
"Repeat Password": "Passwort wiederholen", "Repeat Password": "Passwort wiederholen",
"Username": "Benutzername", "Username": "Benutzername",
"Name": "Name", "Name": "Name",
"Registration code": "Registrierungs Schlüssel", "Registration code": "Registrierungs Schlüssel",
"You need to select one of the options": "Du musst eine der Optionen auswälen", "You need to select one of the options": "Du musst eine der Optionen auswälen",
"Male": "Mann", "Male": "Mann",
"Female": "Frau", "Female": "Frau",
"Other": "Anderes", "Other": "Anderes",
"Registration code required": "Registrierungs Schlüssel benötigt", "Registration code required": "Registrierungs Schlüssel benötigt",
"Username required": "Benutzername benötigt", "Username required": "Benutzername benötigt",
"Name required": "Name benötigt", "Name required": "Name benötigt",
"Mail required": "Mail benötigt", "Mail required": "Mail benötigt",
"The passwords do not match": "Die Passwörter stimmen nicht überein", "The passwords do not match": "Die Passwörter stimmen nicht überein",
"Password is required": "Password benötigt", "Password is required": "Password benötigt",
"Invalid registration code": "Ungültiger Registrierungs Schlüssel", "Invalid registration code": "Ungültiger Registrierungs Schlüssel",
"Username taken": "Benutzername nicht verfügbar", "Username taken": "Benutzername nicht verfügbar",
"Mail linked with other account": "Mail ist bereits mit einem anderen Account verbunden", "Mail linked with other account": "Mail ist bereits mit einem anderen Account verbunden",
"Registration code already used": "Registrierungs Schlüssel wurde bereits verwendet", "Registration code already used": "Registrierungs Schlüssel wurde bereits verwendet",
"Administration": "Administration", "Administration": "Administration",
"Field {{field}} is not defined": "Feld {{field}} fehlt", "Field {{field}} is not defined": "Feld {{field}} fehlt",
"Field {{field}} has wrong type. It should be from type {{type}}": "Feld {{field}} hat den falschen Typ. Es sollte vom Typ {{type}} sein", "Field {{field}} has wrong type. It should be from type {{type}}": "Feld {{field}} hat den falschen Typ. Es sollte vom Typ {{type}} sein",
"Client has no permission for acces password auth": "Dieser Client hat keine Berechtigung password auth zu benutzen", "Client has no permission for acces password auth": "Dieser Client hat keine Berechtigung password auth zu benutzen",
"Invalid token": "Ungültiger Token", "Invalid token": "Ungültiger Token",
"By clicking on ALLOW, you allow this app to access the requested recources.": "Wenn sie ALLOW drücken, berechtigen sie die Applikation die beantragten Resourcen zu benutzen.", "By clicking on ALLOW, you allow this app to access the requested recources.": "Wenn sie ALLOW drücken, berechtigen sie die Applikation die beantragten Resourcen zu benutzen.",
"User": "User", "User": "User",
"No special token": "No special token", "No special token": "No special token",
"Login token invalid": "Login token invalid" "Login token invalid": "Login token invalid",
"No login token": "No login token"
} }

1982
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@ -6,13 +6,14 @@
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"start": "node lib/index.js", "start": "node lib/index.js",
"install": "cd views && npm install", "install": "cd views && npm install && cd .. && git submodule init && git submodule update && cd views_repo && npm i ",
"build-doc": "apidoc -i src/ -p apidoc/", "build-doc": "apidoc -i src/ -p apidoc/",
"build-ts": "tsc", "build-ts": "tsc",
"build": "tsc && cd views && npm run build && cd ..", "build": "tsc && cd views && npm run build && cd .. && cd views_repo && npm run build",
"build-server": "tsc", "build-server": "tsc",
"watch-ts": "tsc -w", "watch-ts": "tsc -w",
"watch-views": "cd views && npm run watch", "watch-views": "cd views && npm run watch",
"watch-views_repo": "cd views_repo && npm run dev",
"watch-node": "nodemon --ignore ./views lib/index.js", "watch-node": "nodemon --ignore ./views lib/index.js",
"watch": "concurrently \"npm:watch-*\"" "watch": "concurrently \"npm:watch-*\""
}, },
@ -40,7 +41,6 @@
"@hibas123/config": "^1.1.0", "@hibas123/config": "^1.1.0",
"@hibas123/nodelogging": "^2.1.4", "@hibas123/nodelogging": "^2.1.4",
"@hibas123/nodeloggingserver_client": "^1.1.2", "@hibas123/nodeloggingserver_client": "^1.1.2",
"@hibas123/openauth-views": "file:../Views",
"@hibas123/safe_mongo": "^1.6.1", "@hibas123/safe_mongo": "^1.6.1",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"compression": "^1.7.4", "compression": "^1.7.4",
@ -61,4 +61,4 @@
"u2f": "^0.1.3", "u2f": "^0.1.3",
"uuid": "^7.0.2" "uuid": "^7.0.2"
} }
} }

12
src/views/views.ts
View File

@ -1,4 +1,4 @@
import { Router, IRouter, Request } from "express" import { Router, IRouter, Request, static as ServeStatic } from "express"
import GetLoginPage from "./login"; import GetLoginPage from "./login";
import GetAuthPage from "./authorize"; import GetAuthPage from "./authorize";
import promiseMiddleware from "../helper/promiseMiddleware"; import promiseMiddleware from "../helper/promiseMiddleware";
@ -29,10 +29,12 @@ ViewRouter.get("/register", (req, res) => {
res.send(GetRegistrationPage(req.__)); res.send(GetRegistrationPage(req.__));
}) })
ViewRouter.get("/login", (req, res) => { ViewRouter.use("/login", ServeStatic("./views_repo/build/login"));
res.setHeader("Cache-Control", "public, max-age=" + cacheTime);
res.send(GetLoginPage(req.__)) // ViewRouter.use("/login", (req, res) => {
}) // res.setHeader("Cache-Control", "public, max-age=" + cacheTime);
// res.send(GetLoginPage(req.__))
// })
ViewRouter.get("/code", (req, res) => { ViewRouter.get("/code", (req, res) => {
res.setHeader("Cache-Control", "no-cache"); res.setHeader("Cache-Control", "no-cache");

1
views_repo Submodule

@ -0,0 +1 @@
Subproject commit 415200de4fc88a905f5865c5fb1d98832114dfad