Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix feedback @moufmouf strategy of maps managing by back.

Browse source
This commit is contained in:
gparant 2020-05-10 18:34:55 +02:00
parent 68ac145882
commit 58b65030bd
11 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

4
back/src/Assets/Maps/Floor0/floor0.json
View file

@ -47,9 +47,9 @@
"opacity":1,
"properties":[
{
"name":"exitSceneKey",
"name":"exitSceneUrl",
"type":"string",
"value":"floor1"
"value":"\/map\/files\/Floor1\/floor1.json"
}],
"type":"tilelayer",
"visible":true,

4
back/src/Assets/Maps/Floor1/floor1.json
View file

@ -41,9 +41,9 @@
"opacity":1,
"properties":[
{
"name":"exitSceneKey",
"name":"exitSceneUrl",
"type":"string",
"value":"floor0"
"value":"\/map\/files\/Floor0\/floor0.json"
}],
"type":"tilelayer",
"visible":true,

4
back/src/Controller/AuthenticateController.ts
View file

@ -1,7 +1,7 @@
import {Application, Request, Response} from "express";
import Jwt from "jsonwebtoken";
import {BAD_REQUEST, OK} from "http-status-codes";
import {SECRET_KEY, ROOM_STARTED, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import {SECRET_KEY, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
import { uuid } from 'uuidv4';
export class AuthenticateController{
@ -26,7 +26,7 @@ export class AuthenticateController{
let token = Jwt.sign({email: param.email, userId: userId}, SECRET_KEY, {expiresIn: '24h'});
return res.status(OK).send({
token: token,
startedRoom: {key: ROOM_STARTED, url: URL_ROOM_STARTED},
mapUrlStart: URL_ROOM_STARTED,
userId: userId,
});
});

5
back/src/Controller/MapController.ts
View file

@ -1,7 +1,7 @@
import express from "express";
import {Application, Request, Response} from "express";
import {OK} from "http-status-codes";
import {ROOM_STARTED, ROOMS, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable";
import {URL_ROOM_STARTED} from "../Enum/EnvironmentVariable";
export class MapController {
App: Application;
@ -20,8 +20,7 @@ export class MapController {
getMaps() {
this.App.get("/maps", (req: Request, res: Response) => {
return res.status(OK).send({
mapStart: {key: ROOM_STARTED, url: URL_ROOM_STARTED},
maps: ROOMS
mapUrlStart: URL_ROOM_STARTED
});
});
}

9
back/src/Enum/EnvironmentVariable.ts
View file

@ -1,18 +1,11 @@
const SECRET_KEY = process.env.SECRET_KEY || "THECODINGMACHINE_SECRET_KEY";
const ROOM_STARTED = "floor0";
const URL_ROOM_STARTED = "/map/files/Floor0";
const ROOMS = [
{key: "floor0", url: "/map/files/Floor0"},
{key: "floor1", url: "/map/files/Floor1"},
]
const URL_ROOM_STARTED = "/map/files/Floor0/floor0.json";
const MINIMUM_DISTANCE = process.env.MINIMUM_DISTANCE ? Number(process.env.MINIMUM_DISTANCE) : 64;
const GROUP_RADIUS = process.env.GROUP_RADIUS ? Number(process.env.GROUP_RADIUS) : 48;
export {
SECRET_KEY,
ROOM_STARTED,
URL_ROOM_STARTED,
ROOMS,
MINIMUM_DISTANCE,
GROUP_RADIUS
}