Compare commits

..

No commits in common. "1dbb310560a02a6946c852ced8d6cb951b3c1edc" and "c802056b2d0319ca6beb2b06488bb37ac4f2efe8" have entirely different histories.

4 changed files with 18 additions and 44 deletions

View File

@ -1,16 +1,6 @@
const mongoose = require('mongoose'); const mongoose = require('mongoose');
//const Schema = mongoose.Schema,
//ObjectId = Schema.ObjectId;
const MessageSchema = mongoose.Schema({ const MessageSchema = mongoose.Schema({
//_id: ObjectId,
/*id: {
type: String,
getter: function(val) { return this._id.toString(); },
unique: true
},*/
//id: {type: String, required: true},
subject: { type: String, required: true }, subject: { type: String, required: true },
message: { type: String, required: true }, message: { type: String, required: true },
user: { type: String, required: true }, user: { type: String, required: true },

View File

@ -5,19 +5,19 @@ const CreateMsgRouter = {
<form class="new-msg-form" @submit.prevent=createMsg> <form class="new-msg-form" @submit.prevent=createMsg>
<div class="form-group bmd-form-group"> <div class="form-group bmd-form-group">
<label class="bmd-label-floating">Betreff</label> <label class="bmd-label-floating">Betreff</label>
<input type="text" class="form-control" id="subject" value="WICHTIG!"> <input type="text" class="form-control" id="subject">
</div> </div>
<div class="form-group bmd-form-group"> <div class="form-group bmd-form-group">
<label class="bmd-label-floating">Tags</label> <label class="bmd-label-floating">Tags</label>
<input type="text" class="form-control" id="tag" value="#efi"> <input type="text" class="form-control" id="tag">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="bmd-label-floating">Nachricht</label> <label class="bmd-label-floating">Nachricht</label>
<textarea class="form-control" id="message" rows="5">Nachricht</textarea> <textarea class="form-control" id="message" rows="5"></textarea>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="bmd-label-floating">User</label> <label class="bmd-label-floating">User</label>
<input type="text" class="form-control" id="user" value="Dito27"> <textarea class="form-control" id="user"></textarea>
</div> </div>
<button class="btn btn-default"><a @click="$router.go(-1)">ABBRECHEN </a></button> <button class="btn btn-default"><a @click="$router.go(-1)">ABBRECHEN </a></button>
<button type="submit" class="btn btn-raised om-btn">SENDEN</button> <button type="submit" class="btn btn-raised om-btn">SENDEN</button>
@ -33,13 +33,13 @@ const CreateMsgRouter = {
var message=$("#message").val(); var message=$("#message").val();
var tag=$("#tag").val(); var tag=$("#tag").val();
var user=$("#user").val(); var user=$("#user").val();
console.log ("Message Created: "+tag+" "+message+" "+user); console.log ("Message Created: "+id+" "+tag+" "+message+" "+user);
$.ajax ({ url: "/api/createMsg", data: {sub: subject, mess: message, use: user, ta: tag}, method: "POST" }) .done (have_result) .fail (have_error); $.ajax ({ url: "/api/createMsg", data: {subject: subject, tag: tag, message: message, user: user}, method: "POST" }) .done (have_result) .fail (have_error);
function have_result (res) { function have_result (res) {
console.log (res); console.log (res);
} }
function have_error (err) { function have_error (err) {
console.log ("error: " + err.responseText); console.log ("error:" + err.responseText);
console.log (err); console.log (err);
} }
}, },

View File

@ -29,7 +29,6 @@ const HomeRouter = {
// NICHT SO wg. Vue: _messagelist = jd; // NICHT SO wg. Vue: _messagelist = jd;
_messagelist.splice(0, _messagelist.length); _messagelist.splice(0, _messagelist.length);
_messagelist.push.apply(_messagelist, jd); _messagelist.push.apply(_messagelist, jd);
console.log("jd: "+jd);
for (var e in jd) { for (var e in jd) {
if (!_messages[jd[e]]) { if (!_messages[jd[e]]) {
get_insert_message(jd[e]); get_insert_message(jd[e]);

View File

@ -103,14 +103,14 @@ mongoose.connect(dbConfig.url)
//require('./app/routes/message.route.js')(app); //require('./app/routes/message.route.js')(app);
app.get ('/api/ids', function (req, res) { app.get ('/api/ids', function (req, res) {
Message.find({},{id: true}) .exec () .then(results => { Message.find({},{_id: true}) .exec () .then(results => {
//selects id from message: /* selects id from message: var parsed = [];
var parsed = [];
for (var i in results) { for (var i in results) {
parsed.push (results[i].id); parsed.push (results[i]._id);
} } */
//var parsed = results.map (x => x._id); var parsed = results.map (x => x._id);
res.send(parsed); res.send(parsed);
} ) } )
.catch(err => { .catch(err => {
@ -131,29 +131,14 @@ app.get ("/api/msg/:id", function (req, res) {
}); });
}); });
function makeid() {
var text = "";
var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
for (var i = 0; i < 5; i++)
text += possible.charAt(Math.floor(Math.random() * possible.length));
return text;
}
app.post("/api/createMsg", function(req, res){ app.post("/api/createMsg", function(req, res){
//x = mongoose.Types.ObjectId(); var message = new Message(req.body);
//y = x.toString();
//var z = makeid();
console.log("SUbject: "+JSON.stringify(req.body));
var message = new Message( {subject: req.body.sub, message: req.body.mess, user: req.body.use, tag: req.body.ta } );
message.save(function(err,result){ message.save(function(err,result){
if(err){ if(err)
return res .status(401) .send(err.message); return res .status(401) .send(err.message);
}else{
res.json({message: "Message created!!"}); res.json({message: "Message created!!"});
}
}); });
}); });