diff --git a/app.js b/app.js index 8c75a02..385888c 100644 --- a/app.js +++ b/app.js @@ -5,14 +5,20 @@ var logger = require('morgan'); var cookieParser = require('cookie-parser'); var bodyParser = require('body-parser'); var cors = require('cors') +var db = require('./model/db'); + + // route imports var index = require('./routes/index'); var events = require('./routes/events'); +<<<<<<< HEAD +======= +>>>>>>> add events route and fetching from the database // TODO: add your route file here: var events = require('./routes/events'); diff --git a/data/myevents.js b/data/myevents.js index 11be410..c0d0266 100644 --- a/data/myevents.js +++ b/data/myevents.js @@ -6,7 +6,6 @@ title: "Test3", subtitle: "This is a subtitle", date: "17/Dec/2017 12:00", location: "Athens, Greece", -shortdescription: "Hello421", organizer: "IEEE ATEITH SB", image:image, description: "Greatly hearted has who believe. Drift allow green son walls"+ @@ -24,7 +23,6 @@ title: "Test4", subtitle: "", date: "22/Dec/2017 13:00", location: "Athens, Greece", -shortdescription: "Hello235", organizer: "IEEE ATEITH SB", image:"./img/ReactJS.png", description: "Greatly hearted has who believe. Drift allow green son walls"+ @@ -43,7 +41,6 @@ title: "Test5", subtitle: "This is a subtitle", date: "29/Dec/2017 14:30", location: "Athens, Greece", -shortdescription: "Hello63278", organizer: "IEEE ATEITH SB", image:"./img/ReactJS.png", description: "Greatly hearted has who believe. Drift allow green son walls"+ @@ -62,7 +59,6 @@ title: "Test1", subtitle: "This is a subtitle", date: "10/Dec/2016 15:00", location: "Thessaloniki, Greece", -shortdescription: "Hello", organizer: "IEEE ATEITH SB", image:"./img/ReactJS.png", description: "Greatly hearted has who believe. Drift allow green son walls"+ @@ -81,7 +77,6 @@ title: "Test2", subtitle: "This is a subtitle", date: "15/Dec/2016 16:00", location: "Athens, Greece", -shortdescription: "Hello3", organizer: "IEEE ATEITH SB", image:"./img/ReactJS.png", description: "Greatly hearted has who believe. Drift allow green son walls"+ diff --git a/model/db.js b/model/db.js new file mode 100644 index 0000000..ae7c150 --- /dev/null +++ b/model/db.js @@ -0,0 +1,15 @@ +var mongoose = require('mongoose') + +var user = encodeURIComponent('branch_webpage'); +var passwd = encodeURIComponent('passwd'); +var authMechanism = 'DEFAULT'; + +var url = `mongodb://${user}:${passwd}@cluster0-shard-00-00-vyvir.mongodb.net:27017,cluster0-shard-00-01-vyvir.mongodb.net:27017,cluster0-shard-00-02-vyvir.mongodb.net:27017/test?ssl=true&replicaSet=Cluster0-shard-0&authSource=admin`; +mongoose.connect(url); + +var connection = mongoose.connection; +connection.on('error', console.error.bind(console, 'connection error:')); +connection.once('open', function() { + console.log("Connected to the database"); + console.log(`using ${user} and ${passwd}`); +}); diff --git a/model/event.js b/model/event.js new file mode 100644 index 0000000..8df64b4 --- /dev/null +++ b/model/event.js @@ -0,0 +1,13 @@ +var mongoose = require('mongoose'); + +const eventSchema = new mongoose.Schema({ + title: {type: String, default: 'empty_title', trim: true}, + body: {type: String, default: 'empty_body', trim: true} +}); + +var EventData = mongoose.model('Event', eventSchema); + +var exports = module.exports = { + mongoose, + EventData +}; diff --git a/package.json b/package.json index 7953955..799679e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "debug": "~2.6.9", "ejs": "~2.5.7", "express": "~4.15.5", + "mongoose": "^5.0.7", "morgan": "~1.9.0", "serve-favicon": "~2.4.5" } diff --git a/public/images/expressjs.jpg b/public/images/expressjs.jpg new file mode 100644 index 0000000..4ee55e9 Binary files /dev/null and b/public/images/expressjs.jpg differ diff --git a/routes/events.js b/routes/events.js new file mode 100644 index 0000000..5def312 --- /dev/null +++ b/routes/events.js @@ -0,0 +1,23 @@ +var eventsData = require('./../data/myevents'); + +var express = require('express'); +var router = express.Router(); + +var EventModel = require('./../model/event.js'); +var EventData = EventModel.EventData; + + +/* GET home page. */ +router.get('/', function(req, res, next) { + console.log("this is a line"); + const empty = {empty: "error"} + + EventData.find((err, lalas)=>{ + if (err) return console.error(err); + res.setHeader('Content-Type', 'application/json'); + res.send(lalas); + }) + //res.send(empty); +}); + +module.exports = router; diff --git a/views/error.ejs b/views/error.ejs new file mode 100644 index 0000000..7cf94ed --- /dev/null +++ b/views/error.ejs @@ -0,0 +1,3 @@ +

<%= message %>

+

<%= error.status %>

+
<%= error.stack %>