Skip to content

Commit

Permalink
Convert vars to consts/lets
Browse files Browse the repository at this point in the history
  • Loading branch information
NavidK0 committed Oct 6, 2020
1 parent 5ba59f2 commit d8a8ca9
Show file tree
Hide file tree
Showing 32 changed files with 253 additions and 201 deletions.
2 changes: 1 addition & 1 deletion client/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ module.exports = {
"vue/multiline-html-element-content-newline": "off",
"semi": [2, "always"]
}
}
};
2 changes: 1 addition & 1 deletion client/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ export default {
}
}
}
}
};
2 changes: 1 addition & 1 deletion client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "singlelink-client",
"version": "1.5.0",
"version": "1.5.1",
"private": true,
"scripts": {
"dev": "nuxt",
Expand Down
2 changes: 1 addition & 1 deletion client/pages/analytics.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
this.projected_users = this.projected_users.toFixed(0);
},
time_difference: function(dt2, dt1) {
var diff =(dt2.getTime() - dt1.getTime()) / 1000;
let diff = (dt2.getTime() - dt1.getTime()) / 1000;
diff /= (60 * 60);
return Math.abs(Math.round(diff));
},
Expand Down
2 changes: 1 addition & 1 deletion client/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ module.exports = {
'nuxt.config.js'
]
}
}
};
4 changes: 2 additions & 2 deletions server/functions/Analytics/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Third-party assets & dependancies
var express = require('express');
const express = require('express');

var AnalyticsController = express();
const AnalyticsController = express();

// Routing
AnalyticsController.get('/fetch', require('./fetch'));
Expand Down
6 changes: 3 additions & 3 deletions server/functions/Link/create.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Link = mongoose.model('Link');
const Link = mongoose.model('Link');

module.exports = (req, res) => {
if(!req.user.active_profile) return res.status(400).send('You need an active profile to do this');
Expand All @@ -21,4 +21,4 @@ module.exports = (req, res) => {
return res.send(link);
});
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Link/destroy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Link = mongoose.model('Link');
const Link = mongoose.model('Link');

module.exports = async (req, res) => {
if(!req.body.target) return res.status(400).send('Target required');
Expand All @@ -16,4 +16,4 @@ module.exports = async (req, res) => {
links = await Link.find({parent:req.user.active_profile._id});
return res.send(links);
})
}
}
6 changes: 3 additions & 3 deletions server/functions/Link/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Third-party assets & dependancies
var express = require('express');
var mongoose = require('mongoose');
const express = require('express');
const mongoose = require('mongoose');

var LinkController = express();
const LinkController = express();

// Routing
//ProfileController.all('/', require('./'));
Expand Down
6 changes: 3 additions & 3 deletions server/functions/Link/reorder.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Link = mongoose.model('Link');
const Link = mongoose.model('Link');

module.exports = async (req, res) => {
if(!req.user.active_profile) return res.status(400).send('You need an active profile to do this');
Expand Down Expand Up @@ -38,4 +38,4 @@ module.exports = async (req, res) => {

return res.send(links);

}
}
6 changes: 3 additions & 3 deletions server/functions/Link/update.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Link = mongoose.model('Link');
const Link = mongoose.model('Link');

module.exports = (req, res) => {
if(!req.body.target) return res.status(400).send('Target required');
Expand All @@ -22,4 +22,4 @@ module.exports = (req, res) => {
});
})
})
}
}
6 changes: 3 additions & 3 deletions server/functions/Profile/activate-theme.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
const Profile = mongoose.model('Profile');

module.exports = (req, res) => {
req.user.active_profile.theme = req.body.theme || null;
req.user.active_profile.save((err, profile) => {
if(err) return res.send(err);
return res.send(profile);
});
}
}
4 changes: 2 additions & 2 deletions server/functions/Profile/create.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

const Profile = mongoose.model('Profile');

Expand All @@ -17,4 +17,4 @@ module.exports = async function(req, res) {
return res.send(profile);
});
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Profile/destroy.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
const Profile = mongoose.model('Profile');

module.exports = async (req, res) => {
if(!req.user.active_profile) return res.status(400).send('Active profile required');
Expand All @@ -11,4 +11,4 @@ module.exports = async (req, res) => {
req.user.active_profile = remaining_profiles[0];
await req.user.save();
return res.send(remaining_profiles[0]);
}
}
28 changes: 14 additions & 14 deletions server/functions/Profile/fetch-preview.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
var Link = mongoose.model('Link');
var User = mongoose.model('User');
var Theme = mongoose.model('Theme');
const Profile = mongoose.model('Profile');
const Link = mongoose.model('Link');
const User = mongoose.model('User');
const Theme = mongoose.model('Theme');

module.exports = async (req, res) => {
var payload = {
profile: req.user.active_profile,
profiles: await Profile.find({parent: req.user._id}),
links: null,
user: req.user,
theme: null
};
Link.find({
const payload = {
profile: req.user.active_profile,
profiles: await Profile.find({parent: req.user._id}),
links: null,
user: req.user,
theme: null
};
Link.find({
parent: req.user.active_profile._id
}, async (err, links) => {
if(payload.profile.theme) payload.theme = await Theme.findOne({_id: payload.profile.theme || ''});
if(err) return res.send(err);
payload.links = links || [];
res.send(payload);
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Profile/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Third-party assets & dependancies
var express = require('express');
var mongoose = require('mongoose');
const express = require('express');
const mongoose = require('mongoose');

var ProfileController = express();
const ProfileController = express();

// Routing
//ProfileController.all('/', require('./'));
Expand Down
8 changes: 4 additions & 4 deletions server/functions/Profile/links.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
var Link = mongoose.model('Link');
const Profile = mongoose.model('Profile');
const Link = mongoose.model('Link');

module.exports = (req, res) => {
if(!req.user.active_profile) return res.status(400).send('You need an active profile to do this');
Expand All @@ -10,4 +10,4 @@ module.exports = (req, res) => {
if(err) return res.send(err);
return res.send(links);
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Profile/list.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
const Profile = mongoose.model('Profile');

module.exports = (req, res) => {
Profile.find({parent:req.user._id})
.exec((err, profiles) => {
if(err) return res.send(err);
return res.send(profiles);
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Profile/update.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Profile = mongoose.model('Profile');
const Profile = mongoose.model('Profile');

module.exports = (req, res) => {
req.user.active_profile.image_url = req.body.image_url || null;
Expand All @@ -15,4 +15,4 @@ module.exports = (req, res) => {
if(err) return res.send(err);
res.send(profile);
})
}
}
6 changes: 3 additions & 3 deletions server/functions/Theme/create.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var mongoose = require('mongoose');
const mongoose = require('mongoose');

var Theme = mongoose.model('Theme');
const Theme = mongoose.model('Theme');

module.exports = (req, res) => {
if(!req.body.label) return res.status(400).send('Theme label required');
Expand All @@ -14,4 +14,4 @@ module.exports = (req, res) => {
if(err) return res.send(err);
return res.send(link);
});
}
}
6 changes: 3 additions & 3 deletions server/functions/Theme/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Third-party assets & dependencies
var express = require('express');
var mongoose = require('mongoose');
const express = require('express');
const mongoose = require('mongoose');

var ThemeController = express();
const ThemeController = express();

// From here on out, require authentication
ThemeController.use(require('../../middleware/auth'));
Expand Down
14 changes: 7 additions & 7 deletions server/functions/User/create.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
var bcrypt = require('bcrypt-nodejs');
var jwt = require('jsonwebtoken');
var mongoose = require('mongoose');
var md5 = require('md5');
const bcrypt = require('bcrypt-nodejs');
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');
const md5 = require('md5');

var User = mongoose.model('User');
var Profile = mongoose.model('Profile');
const User = mongoose.model('User');
const Profile = mongoose.model('Profile');

module.exports = (req, res) => {
if(!req.body.email) return res.status(400).send('Missing email');
Expand Down Expand Up @@ -41,4 +41,4 @@ module.exports = (req, res) => {
});
});
});
}
}
7 changes: 4 additions & 3 deletions server/functions/User/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
// Third-party assets & dependancies
var express = require('express');
var mongoose = require('mongoose');
const express = require('express');
const mongoose = require('mongoose');

var UserController = express();
const UserController = express();

// Routing
UserController.all('/login', require('./login'));
UserController.all('/create', require('./create'));
UserController.all('/reset-password', require('./reset-password'));

// From here on out, require authentication
UserController.use(require('../../middleware/auth'));
Expand Down
10 changes: 5 additions & 5 deletions server/functions/User/login.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var bcrypt = require('bcrypt-nodejs');
var jwt = require('jsonwebtoken');
var mongoose = require('mongoose');
const bcrypt = require('bcrypt-nodejs');
const jwt = require('jsonwebtoken');
const mongoose = require('mongoose');

var User = mongoose.model('User');
const User = mongoose.model('User');

module.exports = (req, res) => {
if(!req.body.email) return res.status(400).send('Missing email');
Expand All @@ -29,4 +29,4 @@ module.exports = (req, res) => {
});
});
});
}
}
Loading

0 comments on commit d8a8ca9

Please sign in to comment.