consolidate all repos to one for archive
This commit is contained in:
130
semester_4/razvoj_aplikacij_za_internet/react/backend/.gitignore
vendored
Normal file
130
semester_4/razvoj_aplikacij_za_internet/react/backend/.gitignore
vendored
Normal file
@@ -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.*
|
||||
88
semester_4/razvoj_aplikacij_za_internet/react/backend/app.js
Normal file
88
semester_4/razvoj_aplikacij_za_internet/react/backend/app.js
Normal file
@@ -0,0 +1,88 @@
|
||||
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/vaja4";
|
||||
mongoose.connect(mongoDB);
|
||||
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 app = express();
|
||||
|
||||
var cors = require('cors');
|
||||
var allowedOrigins = ['http://localhost:3000', 'http://localhost:3001'];
|
||||
app.use(cors({
|
||||
credentials: true,
|
||||
origin: function(origin, callback){
|
||||
// Allow requests with no origin (mobile apps, curl)
|
||||
if(!origin) return callback(null, true);
|
||||
if(allowedOrigins.indexOf(origin)===-1){
|
||||
var msg = "The CORS policy does not allow access from the specified Origin.";
|
||||
return callback(new Error(msg), false);
|
||||
}
|
||||
return callback(null, true);
|
||||
}
|
||||
}));
|
||||
|
||||
// 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);
|
||||
|
||||
// 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');
|
||||
res.json(err);
|
||||
});
|
||||
|
||||
module.exports = app;
|
||||
@@ -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 || '3001');
|
||||
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);
|
||||
}
|
||||
@@ -0,0 +1,209 @@
|
||||
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')
|
||||
.sort({createdAt: -1})
|
||||
.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);
|
||||
return res.json(photos);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* photoController.show()
|
||||
*/
|
||||
show: function (req, res) {
|
||||
var id = req.params.id;
|
||||
|
||||
PhotoModel.findOne({_id: id}).populate('postedBy').exec(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,
|
||||
reports : 0,
|
||||
likes : 0,
|
||||
comments : []
|
||||
});
|
||||
|
||||
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('/photos');
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* 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');
|
||||
},
|
||||
|
||||
increaseValue: async function (req, res) {
|
||||
const id = req.params.id;
|
||||
const type = req.params.type;
|
||||
|
||||
try {
|
||||
if(type == "like"){
|
||||
const photo = await PhotoModel.findByIdAndUpdate(
|
||||
{ _id: id },
|
||||
{ $inc: { likes: 1 } },
|
||||
{ new: true }
|
||||
);
|
||||
}else if(type == "report"){
|
||||
const photo = await PhotoModel.findByIdAndUpdate(
|
||||
{ _id: id },
|
||||
{ $inc: { reports: 1 } },
|
||||
{ new: true }
|
||||
);
|
||||
if(photo.reports >= 5){
|
||||
await PhotoModel.findByIdAndRemove(id);
|
||||
}
|
||||
|
||||
}else{
|
||||
return res.status(500).json({
|
||||
message: 'Error when updating photo increment.',
|
||||
});
|
||||
}
|
||||
|
||||
if (!photo) {
|
||||
return res.status(404).json({
|
||||
message: 'No such photo'
|
||||
});
|
||||
}
|
||||
|
||||
return res.status(200).json(photo);
|
||||
} catch (err) {
|
||||
return res.status(500).json({
|
||||
message: 'Error when updating photo.',
|
||||
error: err
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
addComment: async function (req, res) {
|
||||
const id = req.params.id;
|
||||
const comment = req.body.comment;
|
||||
|
||||
try {
|
||||
const photo = await PhotoModel.findByIdAndUpdate(
|
||||
{ _id: id },
|
||||
{ $push: { comments: comment } },
|
||||
{ new: true }
|
||||
);
|
||||
|
||||
if (!photo) {
|
||||
return res.status(404).json({
|
||||
message: 'No such photo'
|
||||
});
|
||||
}
|
||||
|
||||
return res.json(photo);
|
||||
} catch (err) {
|
||||
return res.status(500).json({
|
||||
message: 'Error when updating photo.',
|
||||
error: err
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,211 @@
|
||||
var UserModel = require('../models/userModel.js');
|
||||
var PhotoModel = require('../models/photoModel.js');
|
||||
const { use } = require('../routes/userRoutes.js');
|
||||
var mongoose = require('mongoose');
|
||||
/**
|
||||
* 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,
|
||||
posts : 0,
|
||||
totalLikes : 0
|
||||
});
|
||||
|
||||
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 = 402;
|
||||
return next(err);
|
||||
}
|
||||
req.session.userId = user._id;
|
||||
//res.redirect('/users/profile');
|
||||
return res.json(user);
|
||||
});
|
||||
},
|
||||
|
||||
profile: async function(req, res,next){
|
||||
const userId = req.session.userId;
|
||||
|
||||
UserModel.findById(req.session.userId)
|
||||
.exec(function(error, user){
|
||||
if(error){
|
||||
return next(error);
|
||||
} else{
|
||||
if(user===null){
|
||||
var err = new Error('Not authorized, go back!');
|
||||
err.status = 400;
|
||||
return next(err);
|
||||
} else{
|
||||
// Counting the number of posts based on the user id
|
||||
PhotoModel.countDocuments({ postedBy: userId })
|
||||
.then((count) => {
|
||||
// Update the user's post count
|
||||
user.posts = count;
|
||||
return user.save();
|
||||
}).catch((error) => {
|
||||
console.error('Error counting likes:', error);
|
||||
return next(error);
|
||||
});
|
||||
|
||||
// const objectId = Types.objectId(userId);
|
||||
var objectId = mongoose.Types.ObjectId(userId);
|
||||
|
||||
PhotoModel.aggregate([
|
||||
{ $match: { postedBy: objectId } },
|
||||
{ $group: { _id: null, totalLikes: { $sum: "$likes" } } }
|
||||
]).then((result) => {
|
||||
// Update the user's total likes
|
||||
user.totalLikes = result[0].totalLikes;
|
||||
return user.save();
|
||||
}).catch((error) => {
|
||||
console.error('Error counting likes:', error);
|
||||
return next(error);
|
||||
});
|
||||
|
||||
return res.json(user);
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
logout: function(req, res, next){
|
||||
if(req.session){
|
||||
req.session.destroy(function(err){
|
||||
if(err){
|
||||
return next(err);
|
||||
} else{
|
||||
//return res.redirect('/');
|
||||
return res.status(201).json({});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,16 @@
|
||||
var mongoose = require('mongoose');
|
||||
var Schema = mongoose.Schema;
|
||||
|
||||
var photoSchema = new Schema({
|
||||
'name' : String,
|
||||
'path' : String,
|
||||
'postedBy' : {
|
||||
type: Schema.Types.ObjectId,
|
||||
ref: 'user'
|
||||
},
|
||||
'reports' : Number,
|
||||
'likes' : Number,
|
||||
'comments' : Array
|
||||
}, {timestamps: true});
|
||||
|
||||
module.exports = mongoose.model('photo', photoSchema);
|
||||
@@ -0,0 +1,48 @@
|
||||
var mongoose = require('mongoose');
|
||||
var bcrypt = require('bcrypt');
|
||||
var Schema = mongoose.Schema;
|
||||
|
||||
var userSchema = new Schema({
|
||||
'username' : String,
|
||||
'password' : String,
|
||||
'email' : String,
|
||||
'posts' : Number,
|
||||
'totalLikes' : Number
|
||||
});
|
||||
|
||||
// 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();
|
||||
// }
|
||||
// });
|
||||
|
||||
return callback(null, user);
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
var User = mongoose.model('user', userSchema);
|
||||
module.exports = User;
|
||||
2924
semester_4/razvoj_aplikacij_za_internet/react/backend/package-lock.json
generated
Normal file
2924
semester_4/razvoj_aplikacij_za_internet/react/backend/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"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",
|
||||
"cors": "^2.8.5",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
var express = require('express');
|
||||
var router = express.Router();
|
||||
|
||||
/* GET home page. */
|
||||
router.get('/', function(req, res, next) {
|
||||
res.render('index', { title: 'Express' });
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,33 @@
|
||||
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('/', photoController.list);
|
||||
//router.get('/publish', requiresLogin, photoController.publish);
|
||||
router.get('/increase/:type/:id', photoController.show);
|
||||
router.get('/comment/:id', photoController.show);
|
||||
router.get('/:id', photoController.show);
|
||||
|
||||
router.post('/', requiresLogin, upload.single('image'), photoController.create);
|
||||
|
||||
router.put('/increase/:type/:id', photoController.increaseValue);
|
||||
router.put('/comment/:id', photoController.addComment);
|
||||
router.put('/:id', photoController.update);
|
||||
|
||||
router.delete('/:id', photoController.remove);
|
||||
|
||||
module.exports = router;
|
||||
@@ -0,0 +1,20 @@
|
||||
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('/profile', userController.profile);
|
||||
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;
|
||||
@@ -0,0 +1,3 @@
|
||||
<h1>{{message}}</h1>
|
||||
<h2>{{error.status}}</h2>
|
||||
<pre>{{error.stack}}</pre>
|
||||
@@ -0,0 +1,2 @@
|
||||
<h1>{{title}}</h1>
|
||||
<p>Welcome to {{title}}</p>
|
||||
@@ -0,0 +1,25 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>{{title}}</title>
|
||||
<link rel='stylesheet' href='/stylesheets/style.css' />
|
||||
</head>
|
||||
<body>
|
||||
<!--
|
||||
<nav>
|
||||
<ul>
|
||||
<li><a href='/'>Domov</a></li>
|
||||
{{#if session.userId}}
|
||||
<li><a href='/users/profile'>Profil</a></li>
|
||||
<li><a href='/photos/publish'>Objavi sliko</a></li>
|
||||
<li><a href='/users/logout'>Odjava</a></li>
|
||||
{{else}}
|
||||
<li><a href='/users/login'>Prijava</a></li>
|
||||
<li><a href='/users/register'>Registracija</a></li>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</nav>
|
||||
-->
|
||||
{{{body}}}
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,7 @@
|
||||
<h1>Slike:</h1>
|
||||
{{#each photos}}
|
||||
<h2>slika:</h2>
|
||||
<img src="{{path}}" title="{{name}}" width="400"/><br/>
|
||||
Objavil: <span>{{postedBy.username}}</span>
|
||||
<hr/>
|
||||
{{/each}}
|
||||
@@ -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>
|
||||
@@ -0,0 +1,8 @@
|
||||
<h1>Prijava</h1>
|
||||
<form action="login" method="post">
|
||||
<input type="text" name="username" placeholder="Uporabniško ime" required>
|
||||
<input type="password" name="password" placeholder="Geslo" required>
|
||||
<div class="tp">
|
||||
<input type="submit" value="prijava">
|
||||
</div>
|
||||
</form>
|
||||
@@ -0,0 +1,6 @@
|
||||
<h1>Profil uporabnika</h1>
|
||||
<h2>Ime: </h2>
|
||||
<h3>{{username}}</h3>
|
||||
<h2>Mail:</h2>
|
||||
<h3>{{email}}</h3>
|
||||
<br><a type="button" href="logout">Odjava </a>
|
||||
@@ -0,0 +1,8 @@
|
||||
<h1>Registracija</h1>
|
||||
<form action="/users" method="post">
|
||||
<input type="text" name="email" placeholder="E-mail" required="">
|
||||
<input type="text" name="username" placeholder="Username" required="">
|
||||
<input type="password" name="password" placeholder="Password" required="">
|
||||
|
||||
<input type="submit" value="REGISTER">
|
||||
</form>
|
||||
Reference in New Issue
Block a user