diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5616695 Binary files /dev/null and b/.DS_Store differ diff --git a/.vscode/launch.json b/.vscode/launch.json index c7bd6b0..dea6290 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,30 +1,18 @@ { - // Usare IntelliSense per informazioni sui possibili attributi. - // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti. - // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ { - "console": "integratedTerminal", - "internalConsoleOptions": "neverOpen", - "name": "nodemon", - "program": "${workspaceFolder}", + "name": "ServerSide", + "program": "${workspaceFolder}/src/server/server.js", "request": "launch", - "restart": true, - "runtimeExecutable": "nodemon", "skipFiles": [ "/**" ], - "type": "node" - }, - { "type": "node", - "request": "launch", - "name": "Launch Program", - "skipFiles": [ - "/**" - ], - "program": "${file}" - } + "env": { + "NODE_ENV":"development", + "TESTING_ON":"1" + } + }, ] } \ No newline at end of file diff --git a/src/server/MYAPP.code-workspace b/src/server/MYAPP.code-workspace new file mode 100644 index 0000000..3950b21 --- /dev/null +++ b/src/server/MYAPP.code-workspace @@ -0,0 +1,11 @@ +{ + "folders": [ + { + "path": "../.." + }, + { + "path": "../../../newfreeplanet" + } + ], + "settings": {} +} \ No newline at end of file diff --git a/src/server/models/myelem.js b/src/server/models/myelem.js index 60b4443..f9f7280 100755 --- a/src/server/models/myelem.js +++ b/src/server/models/myelem.js @@ -2,7 +2,7 @@ const mongoose = require('mongoose').set('debug', false) const Schema = mongoose.Schema; const tools = require('../tools/general'); -const {ObjectID} = require('mongodb'); +const {ObjectID, ObjectId} = require('mongodb'); mongoose.Promise = global.Promise; mongoose.level = "F"; @@ -15,9 +15,9 @@ mongoose.plugin(schema => { const MyElemSchema = new Schema({ _id: { - type: ObjectID, + type: ObjectId, default: function() { - return new ObjectID(); + return new ObjectId(); }, }, idapp: { @@ -29,7 +29,7 @@ const MyElemSchema = new Schema({ type: { type: Number, }, - title: { + img: { type: String, }, container: { @@ -41,6 +41,9 @@ const MyElemSchema = new Schema({ container3: { type: String, }, + align: { + type: Number, + }, parambool: { type: Boolean, }, @@ -73,10 +76,10 @@ const MyElemSchema = new Schema({ type: Number, }, heightimg: { - type: Number, + type: String, }, widthimg: { - type: Number, + type: String, }, width: { type: Number, @@ -84,6 +87,9 @@ const MyElemSchema = new Schema({ link: { type: String, }, + fit: { + type: String, + }, onlyif_logged: { type: Boolean, },