+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/src/views/partials/MapList.vue b/client/src/views/partials/MapList.vue
new file mode 100644
index 00000000..2231aa0b
--- /dev/null
+++ b/client/src/views/partials/MapList.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/client/src/views/partials/Toast.vue b/client/src/views/partials/Toast.vue
index dfc2a54f..69a9705a 100644
--- a/client/src/views/partials/Toast.vue
+++ b/client/src/views/partials/Toast.vue
@@ -74,6 +74,8 @@ emitter.on('toast', data => {
border-radius: 6px;
text-align: center;
+ z-index: 9999999;
+
animation: slide-in 0.4s ease-in-out;
@keyframes slide-in {
diff --git a/client/src/views/partials/game/IconButton.vue b/client/src/views/partials/game/IconButton.vue
index 5f88a9a4..64c4ce5e 100644
--- a/client/src/views/partials/game/IconButton.vue
+++ b/client/src/views/partials/game/IconButton.vue
@@ -1,15 +1,16 @@
-
+
![]()
@@ -25,6 +26,15 @@ let size = props.size;
width: 42px;
}
+ &.small {
+ height: 24px;
+ width: 24px;
+ }
+
+ &.toggled {
+ filter: invert(0.9);
+ }
+
background-color: var(--color-background-soft);
border-radius: 6px;
display: flex;
@@ -42,10 +52,19 @@ let size = props.size;
.icon {
height: 24px;
width: 24px;
+
+ &.big {
+ height: 38px;
+ width: 38px;
+ }
+
+ &.small {
+ height: 18px;
+ width: 18px;
+ }
}
-.big {
- height: 38px;
- width: 38px;
-}
+
+
+
\ No newline at end of file
diff --git a/client/src/views/windows/dm/EnvironmentWindow.vue b/client/src/views/windows/dm/EnvironmentWindow.vue
index b1b6db26..302bc2a4 100644
--- a/client/src/views/windows/dm/EnvironmentWindow.vue
+++ b/client/src/views/windows/dm/EnvironmentWindow.vue
@@ -5,7 +5,7 @@ import { onMounted, onUpdated, ref, watch } from 'vue';
import { SetupHandle, SetSize, SetPosition, ResetPosition } from '@/services/Windows';
import IconButton from '@/views/partials/game/IconButton.vue'
import ColorValue from '../../partials/parameters/ColorValue.vue';
-import { GetBackgroundColor } from '../../../services/Map';
+import { GetBackgroundColor, ChangeBackgroundColor } from '../../../services/Map';
const props = defineProps(['data']);
const data = props.data;
@@ -24,7 +24,7 @@ onMounted(() => {
console.log(env_background.value.GetColor());
watch(env_background.value.GetColor(), () => {
- GetBackgroundColor().value = env_background.value.GetColor().value; // XD
+ ChangeBackgroundColor(env_background.value.GetColor().value);
});
});
diff --git a/client/src/views/windows/dm/MapButtons.vue b/client/src/views/windows/dm/MapButtons.vue
index 041c2223..db0e8a37 100644
--- a/client/src/views/windows/dm/MapButtons.vue
+++ b/client/src/views/windows/dm/MapButtons.vue
@@ -4,36 +4,22 @@ import WindowHandle from '@/views/partials/WindowHandle.vue';
import { onMounted, onUpdated, ref } from 'vue';
import { SetupHandle, SetSize, SetPosition, ResetPosition } from '@/services/Windows';
import IconButton from '@/views/partials/game/IconButton.vue'
-import { ImportDD2VTT } from '../../../services/Map';
import { CreateChildWindow, GetPosition } from '../../../services/Windows';
const props = defineProps(['data']);
const data = props.data;
const handle = ref(null);
-const mapUploader = ref(null);
let id = data.id;
onMounted(() => {
SetupHandle(id, handle);
- SetSize(id, {x: 40, y: 500});
+ SetSize(id, {x: 40, y: 200});
ResetPosition(id, {x: 10, y: 200});
-
- mapUploader.value.addEventListener('change', (event) => {
- let file = event.target.files[0];
- let reader = new FileReader();
- reader.addEventListener('load', (event) => {
- ImportDD2VTT(JSON.parse(event.target.result));
- });
-
- reader.readAsText(file);
- })
});
-function UploadButton(){
- mapUploader.value.click();
-}
+
function EditEnvironment(){
let winPos = GetPosition(id);
@@ -44,19 +30,13 @@ function EditEnvironment(){
-
+
+
+
+
+
diff --git a/server/models/Map.js b/server/models/Map.js
index 551cf8a4..2433a15e 100644
--- a/server/models/Map.js
+++ b/server/models/Map.js
@@ -2,11 +2,10 @@ const mongoose = require("mongoose");
const Schema = mongoose.Schema;
const MapSchema = new Schema({
- name: {type: String, required: true},
data: { type: Object }, // Data del format dd2vtt
campaign: {type: mongoose.Types.ObjectId, ref: "Campaign"},
image: { type: String },
entities: { type: Object }
});
-module.exports = mongoose.model('Entity', EntitySchema);
\ No newline at end of file
+module.exports = mongoose.model('Map', MapSchema);
\ No newline at end of file
diff --git a/server/routes/map.js b/server/routes/map.js
new file mode 100644
index 00000000..7f789b3e
--- /dev/null
+++ b/server/routes/map.js
@@ -0,0 +1,121 @@
+const express = require('express');
+const router = express.Router();
+
+const passport = require('passport');
+const rateLimitMiddleware = require("../config/rate-limiter");
+
+const Campaign = require("../models/Campaign");
+const CampaignUser = require("../models/CampaignUser");
+const Map = require("../models/Map");
+const fs = require('fs');
+
+const upload = require("../config/storage");
+
+router.post('/create-resource', upload.single("image"), passport.authenticate('jwt', {session: false}), (req, res) => {
+ const imageName = req.file.filename;
+
+ Campaign.findById(req.query.campaign).then((campaign) => {
+ CampaignUser.findOne({campaign, user: req.user}).then((data) => {
+ if(!data) {
+ res.json({status: "error", msg: "not-found"})
+ fs.unlink(imageName);
+ return;
+ }
+
+ if(data.is_dm){
+ res.json({
+ status: "ok",
+ data: imageName
+ });
+ return;
+ }
+
+ res.json({status: "error", msg: "not-dm"})
+ fs.unlink(imageName);
+ return;
+ }).catch((err) => res.json({status: "error", msg: "not-found"}));
+ }).catch((err) => res.json({status: "error", err}));
+});
+
+// rateLimitMiddleware?
+router.post('/create', passport.authenticate('jwt', {session: false}), (req, res) => {
+ Campaign.findById(req.body.campaign).then((campaign) => {
+ CampaignUser.findOne({campaign, user: req.user}).then((data) => {
+ if(!data) {
+ res.json({status: "error", msg: "not-found"})
+ return;
+ }
+
+ if(data.is_dm){
+ let mapData = req.body.data;
+ if(mapData){
+ let map = new Map({
+ data: mapData,
+ campaign
+ });
+ map.save().then(map => {
+ res.json({
+ status: "ok",
+ data: map
+ });
+ return;
+ });
+ } else res.json({status: "error", msg: "args"})
+ return;
+ }
+ }).catch((err) => res.json({status: "error", msg: "not-found"}));
+ }).catch((err) => res.json({status: "error", err}));
+});
+
+router.post('/update', passport.authenticate('jwt', {session: false}), (req, res) => {
+ Campaign.findById(req.query.campaign).then((campaign) => {
+ CampaignUser.findOne({campaign, user: req.user}).then((data) => {
+ if(!data) {
+ res.json({status: "error", msg: "not-found"})
+ return;
+ }
+
+ if(data.is_dm){
+ console.log("Ab");
+ let mapData = req.body.data;
+ if(mapData){
+ console.log("Map data:");
+ console.log(mapData)
+ Map.updateOne({_id: req.query.map, campaign}, {data: mapData}).then(map => {
+ res.json({
+ status: "ok",
+ data: map
+ });
+ });
+ } else res.json({status: "error", msg: "args"})
+ return;
+ }
+ }).catch((err) => res.json({status: "error", msg: "not-found"}));
+ }).catch((err) => res.json({status: "error", err}));
+});
+
+router.get('/list', passport.authenticate('jwt', {session: false}), (req, res) => {
+ Campaign.findById(req.query.campaign).then((campaign) => {
+ CampaignUser.findOne({campaign, user: req.user}).then((data) => {
+ if(!data) {
+ res.json({status: "error", msg: "not-found"})
+ return;
+ }
+
+ Map.find({campaign}).then(data => {
+ res.json({status: "ok", data});
+ return;
+ }).catch(err => res.json({status: "error", msg: "internal"}));
+ }).catch((err) => res.json({status: "error", msg: "not-found"}));
+ }).catch((err) => res.json({status: "error", err}));
+});
+
+router.get('/get', passport.authenticate('jwt', {session: false}), (req, res) => {
+
+});
+
+router.delete('/delete', passport.authenticate('jwt', {session: false}), (req, res) => {
+
+});
+
+module.exports = router;
\ No newline at end of file
diff --git a/server/server.js b/server/server.js
index 12ed1bbc..1b5dedf3 100755
--- a/server/server.js
+++ b/server/server.js
@@ -64,6 +64,7 @@ app.use(cors());
// Routes (/ només)
app.use('/user', require('./routes/user'));
app.use('/campaign', require('./routes/campaign'));
+app.use('/maps', require('./routes/map'))
app.use('/public', express.static('uploads'));