Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/v1/general/general.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const sequelize = require("../../../config/db");

const createApi = async (req, res, next) => {
try {
console.log("Create Api");
} catch (error) {
next(error);
}
Expand Down
10 changes: 5 additions & 5 deletions models/init-models.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
var DataTypes = require("sequelize").DataTypes;
var _casbin_rule = require("./casbin_rule");
var _sys_dropdown_list = require("./sys_dropdown_list");
var _sys_otp_template = require("./sys_otp_template");
var _sys_tables = require("./sys_tables");
let DataTypes = require("sequelize").DataTypes;
let _casbin_rule = require("./casbin_rule");
let _sys_dropdown_list = require("./sys_dropdown_list");
let _sys_otp_template = require("./sys_otp_template");
let _sys_tables = require("./sys_tables");

function initModels(sequelize) {
var casbin_rule = _casbin_rule(sequelize, DataTypes);
Expand Down
19 changes: 18 additions & 1 deletion package-lock.json

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

1 change: 0 additions & 1 deletion service/v1/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// const ReplaceWithService = require("./replace-with-service");

module.exports = {
// ReplaceWithService
Expand Down
6 changes: 4 additions & 2 deletions utils/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ module.exports = {

const hashedPassword = await new Promise((resolve, reject) => {
bcrypt.hash(password, saltRounds, function (err, hash) {
if (err) reject(err);
if (err) {
return reject(err instanceof Error ? err : new Error(err));
}
resolve(hash);
});
});
Expand All @@ -21,7 +23,7 @@ module.exports = {
return new Promise(function (resolve, reject) {
bcrypt.compare(password, original, function (err, isMatch) {
if (err) {
reject(err);
return reject(err instanceof Error ? err : new Error(err));
} else {
resolve(isMatch);
}
Expand Down
2 changes: 1 addition & 1 deletion utils/message-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = {
return enc;
} catch (error) {
console.error(error);
return 0;
return "0";
}
},
hashGenerator: async (USERNAME, SENDERID, messgae, KEY) => {
Expand Down
3 changes: 1 addition & 2 deletions utils/notifications.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ const Sequelize = require("sequelize");
module.exports = {
notification: async function (body, subject) {
try {
const sender = new gcm.Sender(process.env.GCMSENDER),
createdDate = getDate("YYYY-MM-DD HH:mm:ss");
const sender = new gcm.Sender(process.env.GCMSENDER);

const message = new gcm.Message({
notification: {
Expand Down
10 changes: 6 additions & 4 deletions utils/search-util.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { LINK, TEXT } = require("./constant");

getSearchAbleData = ({ data: { uri, link_title }, children }) => {
const getSearchAbleData = ({ data: { uri, link_title }, children }) => {
let mData = [];
mData = [...mData, uri, ...(link_title ? [link_title] : [])];
if (!children) return mData;
Expand All @@ -12,20 +12,22 @@ getSearchAbleData = ({ data: { uri, link_title }, children }) => {
return mData;
};

checkForMatch = (a, b) => {
const checkForMatch = (a, b) => {
let c = 0;
a.map((v) => {
let d = 0;
b.map((v1) => {
if (v1.toLowerCase().includes(v.toLowerCase())) d++;
});
d > 0 ? c++ : false;
if (d > 0) {
c++;
}
});

return c >= a.length;
};

getSearchType = (type) => {
const getSearchType = (type) => {
switch (type) {
case 0:
return `AND type = '${LINK}'`;
Expand Down
12 changes: 8 additions & 4 deletions utils/time.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ module.exports = {

let m = Math.floor(p / 60);

p -= m * 60;

let tmp = [];

d && tmp.push(d + "d");
Expand All @@ -45,7 +43,7 @@ module.exports = {

(d || h || m) && tmp.push(m + "m");

var datetime = tmp.join(" ");
let datetime = tmp.join(" ");
return datetime;
},
dateSort: date => {
Expand All @@ -54,7 +52,13 @@ module.exports = {
date.sort(function (a, b) {
let aa = a.split("-").join(),
bb = b.split("-").join();
return aa < bb ? -1 : aa > bb ? 1 : 0;
if (aa < bb) {
return -1;
} else if (aa > bb) {
return 1;
} else {
return 0;
}
});

return {
Expand Down
4 changes: 2 additions & 2 deletions utils/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const formidableUpload = async (req) => {
const formfields = await new Promise(function (resolve, reject) {
form.parse(req, function (err, fields, files) {
if (err) {
reject(err);
reject(new Error("Form Not parsed "));
return;
}

Expand All @@ -59,7 +59,7 @@ const formidableUpload = async (req) => {

return formfields;
} catch (error) {
throw error;
console.error("Error in formidable upload:", error.message);
}
};

Expand Down