consolidate all repos to one for archive

2025-01-28 13:46:42 +01:00
commit a6610fbc7a
5350 changed files with 2705721 additions and 0 deletions
--- a/semester_4/razvoj_aplikacij_za_internet/node/.gitignore
+++ b/semester_4/razvoj_aplikacij_za_internet/node/.gitignore
@@ -0,0 +1,130 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
--- a/semester_4/razvoj_aplikacij_za_internet/node/app.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/app.js
@@ -0,0 +1,79 @@
+var createError = require('http-errors');
+var express = require('express');
+var path = require('path');
+var cookieParser = require('cookie-parser');
+var logger = require('morgan');
+
+// vključimo mongoose in ga povežemo z MongoDB
+var mongoose = require('mongoose');
+var mongoDB = "mongodb://127.0.0.1/vaja3";
+mongoose.connect(mongoDB);
+mongoose.set('strictQuery', false);
+mongoose.Promise = global.Promise;
+var db = mongoose.connection;
+db.on('error', console.error.bind(console, 'MongoDB connection error:'));
+
+// vključimo routerje
+var indexRouter = require('./routes/index');
+var usersRouter = require('./routes/userRoutes');
+var photosRouter = require('./routes/photoRoutes');
+var mdataRouter = require('./routes/mdataRoutes');
+
+var app = express();
+
+// view engine setup
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'hbs');
+
+app.use(logger('dev'));
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(express.static(path.join(__dirname, 'public')));
+
+/**
+ * Vključimo session in connect-mongo.
+ * Connect-mongo skrbi, da se session hrani v bazi.
+ * Posledično ostanemo prijavljeni, tudi ko spremenimo kodo (restartamo strežnik)
+ */
+var session = require('express-session');
+var MongoStore = require('connect-mongo');
+app.use(session({
+  secret: 'work hard',
+  resave: true,
+  saveUninitialized: false,
+  store: MongoStore.create({mongoUrl: mongoDB})
+}));
+//Shranimo sejne spremenljivke v locals
+//Tako lahko do njih dostopamo v vseh view-ih (glej layout.hbs)
+app.use(function (req, res, next) {
+  res.locals.session = req.session;
+  next();
+});
+
+app.use('/', indexRouter);
+app.use('/users', usersRouter);
+app.use('/photos', photosRouter);
+app.use('/mdata', mdataRouter);
+
+// catch 404 and forward to error handler
+app.use(function(req, res, next) {
+  next(createError(404));
+});
+
+// error handler
+app.use(function(err, req, res, next) {
+  // set locals, only providing error in development
+  res.locals.message = err.message;
+  res.locals.error = req.app.get('env') === 'development' ? err : {};
+
+  // render the error page
+  res.status(err.status || 500);
+  res.render('error');
+});
+
+app.listen(4000, function () {
+  console.log('Example app listening on port 4000!');
+});
+
+module.exports = app;
--- a/semester_4/razvoj_aplikacij_za_internet/node/bin/www
+++ b/semester_4/razvoj_aplikacij_za_internet/node/bin/www
@@ -0,0 +1,90 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+var app = require('../app');
+var debug = require('debug')('vaja3:server');
+var http = require('http');
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+var port = normalizePort(process.env.PORT || '3000');
+app.set('port', port);
+
+/**
+ * Create HTTP server.
+ */
+
+var server = http.createServer(app);
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on('error', onError);
+server.on('listening', onListening);
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+  var port = parseInt(val, 10);
+
+  if (isNaN(port)) {
+    // named pipe
+    return val;
+  }
+
+  if (port >= 0) {
+    // port number
+    return port;
+  }
+
+  return false;
+}
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+  if (error.syscall !== 'listen') {
+    throw error;
+  }
+
+  var bind = typeof port === 'string'
+    ? 'Pipe ' + port
+    : 'Port ' + port;
+
+  // handle specific listen errors with friendly messages
+  switch (error.code) {
+    case 'EACCES':
+      console.error(bind + ' requires elevated privileges');
+      process.exit(1);
+      break;
+    case 'EADDRINUSE':
+      console.error(bind + ' is already in use');
+      process.exit(1);
+      break;
+    default:
+      throw error;
+  }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+  var addr = server.address();
+  var bind = typeof addr === 'string'
+    ? 'pipe ' + addr
+    : 'port ' + addr.port;
+  debug('Listening on ' + bind);
+}
--- a/semester_4/razvoj_aplikacij_za_internet/node/controllers/mdataController.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/controllers/mdataController.js
@@ -0,0 +1,186 @@
+const { now } = require('mongoose');
+var MdataModel = require('../models/mdataModel.js');
+
+/**
+ * mdataController.js
+ *
+ * @description :: Server-side logic for managing mdatas.
+ */
+module.exports = {
+
+    /**
+     * mdataController.list()
+     */
+    list: function (req, res) {
+        MdataModel.find({answering_id: null})
+            .sort({timestamp: -1})
+            .exec( function (err, mdatas) 
+            {
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when getting mdata.',
+                        error: err
+                    });
+                }
+                
+                var data =[];
+                data.mdatas = mdatas;
+                return res.render('mdata/list', data);
+            });
+    },
+
+    /**
+     * mdataController.show()
+     */
+    show: function (req, res) {
+        var id = req.params.id;
+
+        MdataModel.findOne({_id: id}, function (err, mdata) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting mdata.',
+                    error: err
+                });
+            }
+
+            if (!mdata) {
+                return res.status(404).json({
+                    message: 'No such mdata'
+                });
+            }
+
+            MdataModel.findOne({_id: mdata.answer}, function (err, currectAns) {
+
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when getting mdata.',
+                        error: err
+                    });
+                }
+
+                mdata.cur = currectAns;
+
+                MdataModel.find({answering_id: id, _id:{$ne: mdata.answer }})
+                    .sort({timestamp:-1})
+                    .exec( function (err, answers) {
+                    if (err) {
+                        return res.status(500).json({
+                            message: 'Error when getting mdata.',
+                            error: err
+                        });
+                    }
+                    
+                    mdata.answers = answers;
+                    mdata.selectAns = (mdata.user_id == req.session.userId)
+                    return res.render('mdata/show', mdata);
+                });
+            });
+
+            
+          
+        });
+    },
+
+    listmy: function (req, res) {
+        MdataModel.find( {user_id : req.session.userId }, function (err, mdatas) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting mdata.',
+                    error: err
+                });
+            }
+            
+            var data =[];
+            data.mdatas = mdatas;
+            return res.render('mdata/my', data);
+        });
+    },
+
+    /**
+     * mdataController.create()
+     */
+    create: function (req, res) {
+        var mdata = new MdataModel({
+			user_id : req.session.userId,
+			title : req.body.title,
+			question : req.body.question,
+            timestamp : Date.now(),
+            answering_id : req.body.answering_id
+        });
+
+        mdata.save(function (err, mdata) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when creating mdata',
+                    error: err
+                });
+            }
+            return res.redirect('/mdata');
+            //return res.status(201).json(mdata);
+        });
+    },
+
+    /**
+     * mdataController.update()
+     */
+    update: function (req, res) {
+        var id = req.params.id;
+        var ans = req.params.ans;
+
+        MdataModel.findOne({_id: id}, function (err, mdata) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting mdata',
+                    error: err
+                });
+            }
+
+            if (!mdata) {
+                return res.status(404).json({
+                    message: 'No such mdata'
+                });
+            }
+
+            mdata.user_id = req.body.user_id ? req.body.user_id : mdata.user_id;
+			mdata.title = req.body.title ? req.body.title : mdata.title;
+			mdata.question = req.body.question ? req.body.question : mdata.question;
+			mdata.timestamp = req.body.timestamp ? req.body.timestamp : mdata.timestamp;
+			mdata.tags = req.body.tags ? req.body.tags : mdata.tags;
+			mdata.answering_id = req.body.answering_id ? req.body.answering_id : mdata.answering_id;
+			mdata.answer = ans ? ans : mdata.answer;
+			
+            mdata.save(function (err, mdata) {
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when updating mdata.',
+                        error: err
+                    });
+                }
+
+                return res.redirect('/mdata');
+            });
+        });
+    },
+
+    /**
+     * mdataController.remove()
+     */
+    remove: function (req, res) {
+        var id = req.params.id;
+
+        MdataModel.findByIdAndRemove(id, function (err, mdata) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when deleting the mdata.',
+                    error: err
+                });
+            }
+
+            return res.redirect('/mdata/my');
+        });
+    },
+
+    publish: function(req, res){
+        return res.render('mdata/publish');
+    }
+};
--- a/semester_4/razvoj_aplikacij_za_internet/node/controllers/photoController.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/controllers/photoController.js
@@ -0,0 +1,138 @@
+var PhotoModel = require('../models/photoModel.js');
+
+/**
+ * photoController.js
+ *
+ * @description :: Server-side logic for managing photos.
+ */
+module.exports = {
+
+    /**
+     * photoController.list()
+     */
+    list: function (req, res) {
+        PhotoModel.find()
+        .populate('postedBy')
+        .exec(function (err, photos) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting photo.',
+                    error: err
+                });
+            }
+            var data = [];
+            data.photos = photos;
+            return res.render('photo/list', data);
+        });
+    },
+
+    /**
+     * photoController.show()
+     */
+    show: function (req, res) {
+        var id = req.params.id;
+
+        PhotoModel.findOne({_id: id}, function (err, photo) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting photo.',
+                    error: err
+                });
+            }
+
+            if (!photo) {
+                return res.status(404).json({
+                    message: 'No such photo'
+                });
+            }
+
+            return res.json(photo);
+        });
+    },
+
+    /**
+     * photoController.create()
+     */
+    create: function (req, res) {
+        var photo = new PhotoModel({
+			name : req.body.name,
+			path : "/images/"+req.file.filename,
+			postedBy : req.session.userId,
+			views : 0,
+			likes : 0
+        });
+
+        photo.save(function (err, photo) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when creating photo',
+                    error: err
+                });
+            }
+
+            //return res.status(201).json(photo);
+            return res.redirect('/mdata');
+        });
+    },
+
+    /**
+     * photoController.update()
+     */
+    update: function (req, res) {
+        var id = req.params.id;
+
+        PhotoModel.findOne({_id: id}, function (err, photo) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting photo',
+                    error: err
+                });
+            }
+
+            if (!photo) {
+                return res.status(404).json({
+                    message: 'No such photo'
+                });
+            }
+
+            photo.name = req.body.name ? req.body.name : photo.name;
+			photo.path = req.body.path ? req.body.path : photo.path;
+			photo.postedBy = req.body.postedBy ? req.body.postedBy : photo.postedBy;
+			photo.views = req.body.views ? req.body.views : photo.views;
+			photo.likes = req.body.likes ? req.body.likes : photo.likes;
+			
+            photo.save(function (err, photo) {
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when updating photo.',
+                        error: err
+                    });
+                }
+
+                return res.json(photo);
+            });
+        });
+    },
+
+    /**
+     * photoController.remove()
+     */
+    remove: function (req, res) {
+        var id = req.params.id;
+
+        PhotoModel.findByIdAndRemove(id, function (err, photo) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when deleting the photo.',
+                    error: err
+                });
+            }
+
+            return res.status(204).json();
+        });
+    },
+
+    publish: function(req, res){
+        return res.render('photo/publish');
+    }
+};
--- a/semester_4/razvoj_aplikacij_za_internet/node/controllers/tagsController.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/controllers/tagsController.js
@@ -0,0 +1,122 @@
+var TagsModel = require('../models/tagsModel.js');
+
+/**
+ * tagsController.js
+ *
+ * @description :: Server-side logic for managing tagss.
+ */
+module.exports = {
+
+    /**
+     * tagsController.list()
+     */
+    list: function (req, res) {
+        TagsModel.find(function (err, tagss) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting tags.',
+                    error: err
+                });
+            }
+
+            return res.json(tagss);
+        });
+    },
+
+    /**
+     * tagsController.show()
+     */
+    show: function (req, res) {
+        var id = req.params.id;
+
+        TagsModel.findOne({_id: id}, function (err, tags) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting tags.',
+                    error: err
+                });
+            }
+
+            if (!tags) {
+                return res.status(404).json({
+                    message: 'No such tags'
+                });
+            }
+
+            return res.json(tags);
+        });
+    },
+
+    /**
+     * tagsController.create()
+     */
+    create: function (req, res) {
+        var tags = new TagsModel({
+			name : req.body.name
+        });
+
+        tags.save(function (err, tags) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when creating tags',
+                    error: err
+                });
+            }
+
+            return res.status(201).json(tags);
+        });
+    },
+
+    /**
+     * tagsController.update()
+     */
+    update: function (req, res) {
+        var id = req.params.id;
+
+        TagsModel.findOne({_id: id}, function (err, tags) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting tags',
+                    error: err
+                });
+            }
+
+            if (!tags) {
+                return res.status(404).json({
+                    message: 'No such tags'
+                });
+            }
+
+            tags.name = req.body.name ? req.body.name : tags.name;
+			
+            tags.save(function (err, tags) {
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when updating tags.',
+                        error: err
+                    });
+                }
+
+                return res.json(tags);
+            });
+        });
+    },
+
+    /**
+     * tagsController.remove()
+     */
+    remove: function (req, res) {
+        var id = req.params.id;
+
+        TagsModel.findByIdAndRemove(id, function (err, tags) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when deleting the tags.',
+                    error: err
+                });
+            }
+
+            return res.status(204).json();
+        });
+    }
+};
--- a/semester_4/razvoj_aplikacij_za_internet/node/controllers/userController.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/controllers/userController.js
@@ -0,0 +1,161 @@
+var UserModel = require('../models/userModel.js');
+
+/**
+ * userController.js
+ *
+ * @description :: Server-side logic for managing users.
+ */
+module.exports = {
+
+    /**
+     * userController.list()
+     */
+    list: function (req, res) {
+        UserModel.find(function (err, users) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting user.',
+                    error: err
+                });
+            }
+
+            return res.json(users);
+        });
+    },
+
+    /**
+     * userController.show()
+     */
+    show: function (req, res) {
+        var id = req.params.id;
+
+        UserModel.findOne({_id: id}, function (err, user) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting user.',
+                    error: err
+                });
+            }
+
+            if (!user) {
+                return res.status(404).json({
+                    message: 'No such user'
+                });
+            }
+
+            return res.json(user);
+        });
+    },
+
+    /**
+     * userController.create()
+     */
+    create: function (req, res) {
+        var user = new UserModel({
+			username : req.body.username,
+			password : req.body.password,
+			email : req.body.email
+        });
+
+        user.save(function (err, user) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when creating user',
+                    error: err
+                });
+            }
+
+            //return res.status(201).json(user);
+            return res.redirect('/users/login');
+        });
+    },
+
+    /**
+     * userController.update()
+     */
+    update: function (req, res) {
+        var id = req.params.id;
+
+        UserModel.findOne({_id: id}, function (err, user) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when getting user',
+                    error: err
+                });
+            }
+
+            if (!user) {
+                return res.status(404).json({
+                    message: 'No such user'
+                });
+            }
+
+            user.username = req.body.username ? req.body.username : user.username;
+			user.password = req.body.password ? req.body.password : user.password;
+			user.email = req.body.email ? req.body.email : user.email;
+			
+            user.save(function (err, user) {
+                if (err) {
+                    return res.status(500).json({
+                        message: 'Error when updating user.',
+                        error: err
+                    });
+                }
+
+                return res.json(user);
+            });
+        });
+    },
+
+    /**
+     * userController.remove()
+     */
+    remove: function (req, res) {
+        var id = req.params.id;
+
+        UserModel.findByIdAndRemove(id, function (err, user) {
+            if (err) {
+                return res.status(500).json({
+                    message: 'Error when deleting the user.',
+                    error: err
+                });
+            }
+
+            return res.status(204).json();
+        });
+    },
+
+    showRegister: function(req, res){
+        res.render('user/register');
+    },
+
+    showLogin: function(req, res){
+        res.render('user/login');
+    },
+
+    login: function(req, res, next){
+        UserModel.authenticate(req.body.username, req.body.password, function(err, user){
+            if(err || !user){
+                var err = new Error('Wrong username or paassword');
+                err.status = 401;
+                return next(err);
+            }
+            req.session.userId = user._id;
+            res.redirect('/mdata');
+        });
+    },
+
+
+
+    logout: function(req, res, next){
+        if(req.session){
+            req.session.destroy(function(err){
+                if(err){
+                    return next(err);
+                } else{
+                    return res.redirect('/');
+                }
+            });
+        }
+    }
+};
--- a/semester_4/razvoj_aplikacij_za_internet/node/models/mdataModel.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/models/mdataModel.js
@@ -0,0 +1,23 @@
+var mongoose = require('mongoose');
+var Schema   = mongoose.Schema;
+
+var mdataSchema = new Schema({
+	'user_id' : {
+	 	type: Schema.Types.ObjectId,
+	 	ref: 'user'
+	},
+	'title' : String,
+	'question' : String,
+	'timestamp' : Date,
+	'tags' : Array,
+	'answering_id' : {
+	 	type: Schema.Types.ObjectId,
+	 	ref: 'mdata'
+	},
+	'answer' : {
+	 	type: Schema.Types.ObjectId,
+	 	ref: 'mdata'
+	}
+});
+
+module.exports = mongoose.model('mdata', mdataSchema);
--- a/semester_4/razvoj_aplikacij_za_internet/node/models/photoModel.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/models/photoModel.js
@@ -0,0 +1,15 @@
+var mongoose = require('mongoose');
+var Schema   = mongoose.Schema;
+
+var photoSchema = new Schema({
+	'name' : String,
+	'path' : String,
+	'postedBy' : {
+	 	type: Schema.Types.ObjectId,
+	 	ref: 'user'
+	},
+	'views' : Number,
+	'likes' : Number
+});
+
+module.exports = mongoose.model('photo', photoSchema);
--- a/semester_4/razvoj_aplikacij_za_internet/node/models/tagsModel.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/models/tagsModel.js
@@ -0,0 +1,8 @@
+var mongoose = require('mongoose');
+var Schema   = mongoose.Schema;
+
+var tagsSchema = new Schema({
+	'name' : String
+});
+
+module.exports = mongoose.model('tags', tagsSchema);
--- a/semester_4/razvoj_aplikacij_za_internet/node/models/userModel.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/models/userModel.js
@@ -0,0 +1,44 @@
+var mongoose = require('mongoose');
+var bcrypt = require('bcrypt');
+var Schema   = mongoose.Schema;
+
+var userSchema = new Schema({
+	'username' : String,
+	'password' : String,
+	'email' : String
+});
+
+userSchema.pre('save', function(next){
+	var user = this;
+	bcrypt.hash(user.password, 10, function(err, hash){
+		if(err){
+			return next(err);
+		}
+		user.password = hash;
+		next();
+	});
+});
+
+userSchema.statics.authenticate = function(username, password, callback){
+	User.findOne({username: username})
+	.exec(function(err, user){
+		if(err){
+			return callback(err);
+		} else if(!user) {
+			var err = new Error("User not found.");
+			err.status = 401;
+			return callback(err);
+		} 
+		bcrypt.compare(password, user.password, function(err, result){
+			if(result === true){
+				return callback(null, user);
+			} else{
+				return callback();
+			}
+		});
+		 
+	});
+}
+
+var User = mongoose.model('user', userSchema);
+module.exports = User;
--- a/semester_4/razvoj_aplikacij_za_internet/node/package-lock.json
+++ b/semester_4/razvoj_aplikacij_za_internet/node/package-lock.json
--- a/semester_4/razvoj_aplikacij_za_internet/node/package.json
+++ b/semester_4/razvoj_aplikacij_za_internet/node/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "vaja3",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start": "node ./bin/www",
+    "dev": "nodemon ./bin/www"
+  },
+  "dependencies": {
+    "bcrypt": "^5.0.1",
+    "connect-mongo": "^4.6.0",
+    "cookie-parser": "~1.4.4",
+    "debug": "~2.6.9",
+    "express": "~4.16.1",
+    "express-session": "^1.17.2",
+    "hbs": "~4.0.4",
+    "http-errors": "~1.6.3",
+    "mongoose": "^6.2.8",
+    "morgan": "~1.9.1",
+    "multer": "^1.4.4"
+  }
+}
--- a/semester_4/razvoj_aplikacij_za_internet/node/public/stylesheets/style.css
+++ b/semester_4/razvoj_aplikacij_za_internet/node/public/stylesheets/style.css
@@ -0,0 +1,18 @@
+body {
+  padding: 50px;
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+a {
+  color: #00B7FF;
+}
+
+nav ul{
+  list-style: none;
+  display: flex;
+  gap: 20px;
+}
+
+nav ul li a{
+  text-decoration: none;
+}
--- a/semester_4/razvoj_aplikacij_za_internet/node/routes/index.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/routes/index.js
@@ -0,0 +1,9 @@
+var express = require('express');
+var router = express.Router();
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+  res.redirect('/mdata');
+});
+
+module.exports = router;
--- a/semester_4/razvoj_aplikacij_za_internet/node/routes/mdataRoutes.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/routes/mdataRoutes.js
@@ -0,0 +1,44 @@
+var express = require('express');
+var router = express.Router();
+var mdataController = require('../controllers/mdataController.js');
+
+function requiresLogin(req, res, next){
+    if(req.session && req.session.userId){
+        return next();
+    } else{
+        return res.redirect('/mdata');
+    }
+}
+
+/*
+ * GET
+ */
+router.get('/', mdataController.list);
+router.get('/publish', requiresLogin, mdataController.publish);
+router.get('/my', requiresLogin, mdataController.listmy);
+router.get('/delete/:id', requiresLogin, mdataController.remove);
+router.get('/update/:id/:ans', requiresLogin, mdataController.update);
+
+
+
+/*
+ * GET
+ */
+router.get('/:id', mdataController.show);
+
+/*
+ * POST
+ */
+router.post('/', mdataController.create);
+
+/*
+ * PUT
+ */
+router.put('/:id', mdataController.update);
+
+/*
+ * DELETE
+ */
+router.delete('/:id', mdataController.remove);
+
+module.exports = router;
--- a/semester_4/razvoj_aplikacij_za_internet/node/routes/photoRoutes.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/routes/photoRoutes.js
@@ -0,0 +1,29 @@
+var express = require('express');
+// Vključimo multer za file upload
+var multer = require('multer');
+var upload = multer({dest: 'public/images/'});
+
+var router = express.Router();
+var photoController = require('../controllers/photoController.js');
+
+function requiresLogin(req, res, next){
+    if(req.session && req.session.userId){
+        return next();
+    } else{
+        var err = new Error("You must be logged in to view this page");
+        err.status = 401;
+        return next(err);
+    }
+}
+
+router.get('/list', photoController.list);
+router.get('/publish', requiresLogin, photoController.publish);
+router.get('/:id', photoController.show);
+
+router.post('/', requiresLogin, upload.single('image'), photoController.create);
+
+router.put('/:id', photoController.update);
+
+router.delete('/:id', photoController.remove);
+
+module.exports = router;
--- a/semester_4/razvoj_aplikacij_za_internet/node/routes/tagsRoutes.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/routes/tagsRoutes.js
@@ -0,0 +1,30 @@
+var express = require('express');
+var router = express.Router();
+var tagsController = require('../controllers/tagsController.js');
+
+/*
+ * GET
+ */
+router.get('/', tagsController.list);
+
+/*
+ * GET
+ */
+router.get('/:id', tagsController.show);
+
+/*
+ * POST
+ */
+router.post('/', tagsController.create);
+
+/*
+ * PUT
+ */
+router.put('/:id', tagsController.update);
+
+/*
+ * DELETE
+ */
+router.delete('/:id', tagsController.remove);
+
+module.exports = router;
--- a/semester_4/razvoj_aplikacij_za_internet/node/routes/userRoutes.js
+++ b/semester_4/razvoj_aplikacij_za_internet/node/routes/userRoutes.js
@@ -0,0 +1,19 @@
+var express = require('express');
+var router = express.Router();
+var userController = require('../controllers/userController.js');
+
+
+router.get('/', userController.list);
+router.get('/register', userController.showRegister);
+router.get('/login', userController.showLogin);
+router.get('/logout', userController.logout);
+router.get('/:id', userController.show);
+
+router.post('/', userController.create);
+router.post('/login', userController.login);
+
+router.put('/:id', userController.update);
+
+router.delete('/:id', userController.remove);
+
+module.exports = router;
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/error.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/error.hbs
@@ -0,0 +1,3 @@
+<h1>{{message}}</h1>
+<h2>{{error.status}}</h2>
+<pre>{{error.stack}}</pre>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/layout.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/layout.hbs
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{title}}</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+	  <script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
+    <script defer src="https://unpkg.com/htmx.org@1.8.6"></script>
+  </head>
+  <body class="container">
+    </br>
+    <nav class="navbar bg-light-subtle">
+			<div class="container-fluid navbar-expand-lg">
+				<div class="navbar-nav">
+          <a class="nav-link" href='/mdata'>Domov</a>
+          {{#if session.userId}}
+          <a class="nav-link" href='/mdata/publish'>Objavi uprasanje</a>
+          <a class="nav-link" href='/mdata/my'>Moji</a>
+          <a class="nav-link" href='/users/logout'>Odjava</a>
+          {{else}}
+          <a class="nav-link" href='/users/login'>Prijava</a>
+          <a class="nav-link" href='/users/register'>Registracija</a>
+          {{/if}}
+				</div>
+			</div>
+		</nav>
+    </br>
+    {{{body}}}
+  </body>
+</html>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/list.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/list.hbs
@@ -0,0 +1,11 @@
+<h1>Uprasanja:</h1>
+<hr>
+{{#each mdatas}}
+  <div class="card my-3">
+    <div class="card-body">
+      <h3 class="card-title">{{title}}</h3>
+      <p class="card-text">{{question}}</p>
+      <a href="/mdata/{{id}}" class="btn btn-primary">Podrobno</a>
+    </div>
+  </div>
+{{/each}}
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/my.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/my.hbs
@@ -0,0 +1,28 @@
+<h1>Moji Uprasanja:</h1>
+<hr/>
+
+
+<div class="container">
+{{#each mdatas}}
+
+  <div class="row m-1">
+    <div class="col-10">
+      <h2>{{title}}</h2>
+    </div>
+    <div class="col-2 text-end" >
+      <a class="btn btn-primary" href="/mdata/{{id}}">Podrobno</a>
+    </div>
+  </div>
+
+  <div class="row m-1">
+    <div class="col-10" >
+      <p>{{question}}</p>
+    </div>
+    <div class="col-2 text-end" >
+      <a class="btn btn-danger" href="/mdata/delete/{{id}}">izbrisi</a>
+    </div>
+  </div>
+
+  <hr/>
+{{/each}}
+</div>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/publish.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/publish.hbs
@@ -0,0 +1,14 @@
+<h1>Dodaj uprasanje</h1>
+<form action="/mdata" method="post">
+
+    <label class="form-label" >Naslov</label>
+    <input class="form-control" type="text" name="title">
+
+    <br/>
+    <label class="form-label" >Uprasanje</label>
+    <textarea class="form-control" rows="3" name="question"></textarea>
+
+    <br/>
+    <input class="btn btn-primary" type="submit" value="Dodaj">
+   
+</form>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/show.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/mdata/show.hbs
@@ -0,0 +1,57 @@
+{{#if answering_id}}
+  <h3>Odgovor: </h3> 
+{{else}}
+  <h3>Vprasanje: </h3>
+{{/if}}
+
+<div class="card my-3">
+  <div class="card-body">
+    <h3 class="card-title">{{title}}</h3>
+    <p class="card-text">{{question}}</p>
+  </div>
+</div>
+<hr>
+
+{{#if cur}}
+  <h3>Pravi odgovor: </h3>
+  <div class="card my-3 bg-warning">
+    <div class="card-body">
+      <p class="card-text">{{cur.question}}</p>
+      <a class="btn btn-primary me-2" href="/mdata/{{cur.id}}">Podrobno</a>
+    </div>
+  </div>
+  <hr>
+{{/if}}
+
+
+{{#if answers}}
+  <h3>Odgovori: </h3>
+  {{#each answers}}
+    <div class="card my-3">
+      <div class="card-body">
+        <p class="card-text">{{question}}</p>
+        <a class="btn btn-primary me-2" href="/mdata/{{id}}">Podrobno</a>
+        {{#if ../selectAns}}
+          <a class="btn btn-primary" href="/mdata/update/{{../id}}/{{id}}">Pravi</a>
+        {{/if}}
+      </div>
+    </div>
+  {{/each}}
+  <hr>
+{{/if}}
+
+
+
+
+{{#if session.userId}}
+  <form action="/mdata" method="post" class="mt-5">
+    <input type="hidden" name="answering_id" value="{{id}}">
+
+    <div class="mb-3">
+      <label class="form-label">Odgovor</label>
+      <textarea class="form-control" rows="3" name="question" required></textarea>
+    </div>
+
+    <button class="btn btn-primary" type="submit">Dodaj</button>
+  </form>
+{{/if}}
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/photo/list.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/photo/list.hbs
@@ -0,0 +1,8 @@
+<h1>Slike:</h1>
+{{#each photos}}
+<h2>slika:</h2>
+<img src="{{path}}" title="{{name}}" width="400"/><br/>
+Objavil: <span>{{postedBy.username}}</span>
+Objavil: <span>{{id}}</span>
+<hr/>
+{{/each}}
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/photo/publish.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/photo/publish.hbs
@@ -0,0 +1,8 @@
+<h1>Dodaj sliko</h1>
+<form action="/photos" method="post" enctype="multipart/form-data">
+    <input type="text" name="name" placeholder="ime slike" required>
+    <input type="file" name="image">
+    <div class="tp">
+        <input type="submit" value="Dodaj">
+    </div>
+</form>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/user/login.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/user/login.hbs
@@ -0,0 +1,17 @@
+<h1 class="text-center mb-5">Prijava</h1>
+
+<form action="login" method="post" class="mx-auto w-50">
+    <div class="mb-3">
+        <label class="form-label" >Uporabniško ime</label>
+        <input class="form-control" type="text" name="username" placeholder="Uporabniško ime" required>
+    </div>
+
+    <div class="mb-3">
+    <label class="form-label" >Geslo</label>
+    <input class="form-control" type="password" name="password" placeholder="Geslo" required>
+    </div>
+    <br/>
+    <div class="text-center">
+    <input class="btn btn-primary" type="submit" value="prijava">
+    </div>
+</form>
--- a/semester_4/razvoj_aplikacij_za_internet/node/views/user/register.hbs
+++ b/semester_4/razvoj_aplikacij_za_internet/node/views/user/register.hbs
@@ -0,0 +1,22 @@
+  <h1 class="text-center mb-5">Registracija</h1>
+
+  <form action="/users" method="post" class="mx-auto w-50">
+    <div class="mb-3">
+      <label class="form-label">Email</label>
+      <input class="form-control" type="text" name="email" placeholder="E-mail" required>
+    </div>
+
+    <div class="mb-3">
+      <label class="form-label">Uporabniško ime</label>
+      <input class="form-control" type="text" name="username" placeholder="Username" required>
+    </div>
+
+    <div class="mb-3">
+      <label class="form-label">Geslo</label>
+      <input class="form-control" type="password" name="password" placeholder="Password" required>
+    </div>
+
+    <div class="text-center">
+      <button class="btn btn-primary" type="submit">REGISTER</button>
+    </div>
+  </form>