From 58ce2a053a4621b17e9c6fe090e0b40d6161d29e Mon Sep 17 00:00:00 2001
From: AADHAVAN <52933187+Aadhavanbi@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:48:39 +0530
Subject: [PATCH] aadhavan
---
app/config/db.config.js | 16 -
app/controllers/data.json | 8 +
.../rosy-semiotics-399007-a9066914a24a.json | 13 +
app/controllers/test.controller.js | 347 +++++----
app/models/Test.js | 31 -
app/models/index.js | 39 -
app/routes/routes.js | 18 +-
app/services/logger.js | 47 +-
app/views/Screenshot 2023-09-16 170601.png | Bin 0 -> 1545 bytes
app/views/Y4Pb2E.png | Bin 0 -> 90290 bytes
app/views/adduser.ejs | 250 +++++++
app/views/displaydata.ejs | 338 ++++++---
app/views/google.png | Bin 0 -> 56292 bytes
app/views/login.ejs | 73 +-
package-lock.json | 669 +++++++++++++++++-
package.json | 7 +
server.js | 10 +-
17 files changed, 1473 insertions(+), 393 deletions(-)
delete mode 100644 app/config/db.config.js
create mode 100644 app/controllers/data.json
create mode 100644 app/controllers/rosy-semiotics-399007-a9066914a24a.json
delete mode 100644 app/models/Test.js
delete mode 100644 app/models/index.js
create mode 100644 app/views/Screenshot 2023-09-16 170601.png
create mode 100644 app/views/Y4Pb2E.png
create mode 100644 app/views/adduser.ejs
create mode 100644 app/views/google.png
diff --git a/app/config/db.config.js b/app/config/db.config.js
deleted file mode 100644
index ceea409..0000000
--- a/app/config/db.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-require('dotenv').config();
-
-const { logMsg } = require('../services/logger');
-module.exports = {
-
- "development": {
- "username": process.env.USER_NAME,
- "password": process.env.PASSWORD,
- "database": process.env.DATABASE,
- "port": process.env.PORT,
- "host": process.env.HOST,
- "dialect": "mssql",
- "logging": (message) =>(logMsg.info(message))
-
- }
- };
\ No newline at end of file
diff --git a/app/controllers/data.json b/app/controllers/data.json
new file mode 100644
index 0000000..388b2d8
--- /dev/null
+++ b/app/controllers/data.json
@@ -0,0 +1,8 @@
+[
+ {
+ "email": "aadhavanvalli@gmail.com"
+ },
+ {
+ "email": "aadhavancarousell@gmail.com"
+ }
+]
\ No newline at end of file
diff --git a/app/controllers/rosy-semiotics-399007-a9066914a24a.json b/app/controllers/rosy-semiotics-399007-a9066914a24a.json
new file mode 100644
index 0000000..5592760
--- /dev/null
+++ b/app/controllers/rosy-semiotics-399007-a9066914a24a.json
@@ -0,0 +1,13 @@
+{
+ "type": "service_account",
+ "project_id": "rosy-semiotics-399007",
+ "private_key_id": "a9066914a24a4cf1892ec3d5e73dcbdd9e0c5690",
+ "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDnrREnBGg7V35b\nxF4754WUdPniqyIojGO0NzThMHDzcLtu+bD7PTlkE1yYT7oUk8ncw7ogKEymuAoY\nnIvqkgEnmulva+stBIqRVVcUndhFTXB/mw4g0TfjW9MZgD4fkK+B2UpPnsWPZikf\n2zECHDTQ/mhXFlv70R8arCnsGY3dOEupdfEyO6mt2i0Z0YG1Ni8TJBdV7HvGAFt5\nsFTS/igxQYUAZQ+uIbC1NbdCgWIQdlsB83YQy2gvHXxtL+7Luyd0kK0SY1lun0bC\nJk2HsE3OWpgiyFi646eoHXuzs6J2TANVPwsLsMCxRO1EkKFRSVDGimmE0FMumbi1\nVCDHZpdPAgMBAAECggEAAMIuTQ2Lf4iGqIbUWUwlnT6IOuoKz3IIgq2vBcgCiPKm\n+CnC1bjjmBJJTMCmEnYIRJdXdhd9+MEyErH78iWFX3Jk94y1edZBrwePEklaA6Jb\n2DhA4rsxM12mdLc0M7kcsNmStG0sXY74Wu19E9/Ve0rVX3p6Z8M7Ox/7dpWSQ1W4\n00uM8j+5xAyosTiMfsPxS2fnAZTB6cXtgy0vowsHL8ffmFZWdW0kxOI2djvcXTsg\nzm2Cz0Tk8a/RVFhvithBIIhtvXBy6ECQb+WUbw1nlWbUITt9Wc9ob5L7fWsRDY9v\n3U5QmN1yTBrhyx0lidOcYDTMkeHJXLVhNSidILn/gQKBgQD/Gj7B51p8q6Ce8ERQ\ngaH67DUAZD5z69Mp+Rj4mHuCldhHM+aZs013GpeDRhOIWfBDsTiZrt6KZqoyK1zf\nD2qr68BTRcxFOk6z22tv9A5pNcU8RhN4MdwRehk9bsxLWLpF7ARXzgQHKSy2Z+WG\n3CYrQSSvTTuVHuqVlEOQ5LuEIQKBgQDofbkcyItButCzzWWl6yGYzpTyZ5CjADQu\nevxQBj6JtnB2eWZU2uuDM4YZi+UgVfqgiZ50gaOp9Tgg0O7Odq08NtnpIDiVPiYq\nCtfJZHFpQjCtQmbNQj6D9s56d7Zfkj9AceDS5gROsJ2efnylvQ4ciRvaeEN+ES9o\nXfREqA6tbwKBgQCIQr6O2ELvIMWU4AW9cuDQpObSpLjvNmH+o32BHAGtCNkTf1eH\ndczE98FCb2XziQbbQYhYHp3kE16JmbvrsdJqrmx2jmvD9pcfXu6OSDCCZiRKQ6wW\noZtJAo0E0W/yNxyYSK8xL2vbX1TwwaJKXMFOjWdI89oFlxP6fc1xUZwPwQKBgBg/\nPHYfCD8Dr86AxnAmdKuOKASb/n6xf7+1PelOrWkJaPNCOATzjApz7jFt4KidrvTd\nRXRbLOmF1KO/hphr0idshQ+GN8CA6dQKq3SqkBVtPMxlF3mixghXTjOBlrii9QvQ\nlKUKLjrSuq2T/YX/kKAzQH9peYiFXE9jNR2P9W/rAoGBAKitQDMBZ7Ov1vLsL3ZK\nhkx4cbFV9pQcjTQr62VVyNKXgq/gfwq57YnErQyRTtYVMkJT2D5cNOiiV5nwOrjT\nz34YqYb8T7jbfcdRO/QQ60wgcx5eJDeCX1gqRKMl+0PoS3l58yZ0n30eulBCUwtv\nnrO/gauaV/QcXqSEkvzU0W5s\n-----END PRIVATE KEY-----\n",
+ "client_email": "test-google-sheet@rosy-semiotics-399007.iam.gserviceaccount.com",
+ "client_id": "106850194283146982068",
+ "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+ "token_uri": "https://oauth2.googleapis.com/token",
+ "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+ "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/test-google-sheet%40rosy-semiotics-399007.iam.gserviceaccount.com",
+ "universe_domain": "googleapis.com"
+}
diff --git a/app/controllers/test.controller.js b/app/controllers/test.controller.js
index 747e869..cfcd2a1 100644
--- a/app/controllers/test.controller.js
+++ b/app/controllers/test.controller.js
@@ -1,21 +1,49 @@
-const { sequelize,Test} = require('../models')
+// const { sequelize,Test} = require('../models')
const { logMsg } = require('../services/logger.js');
const { GoogleSpreadsheet } = require('google-spreadsheet');
const fs = require('fs');
+const path = require('path');
+// const { log } = require('util');
require('dotenv').config();
let dropdown = [];
let column_name;
let doc;
+let CREDENTIALS;
// use in addRow and getRow api
let tempData = [];
+const filePath = path.join(__dirname, 'data.json');
+const datafromjson = require('./data.json');
+const { log } = require('console');
+// const { col } = require('sequelize');
+
+let number; // Declare number as a global variable
+
+async function fetchSheetData() {
+ try {
+ let sheet1 = doc.sheetsByIndex[0];
+ let rows1 = await sheet1.getRows();
+ number = rows1.length+1; // Assign the value to the global variable 'number'
+
+ // You can now use the 'number' variable as a global variable.
+ console.log(`Number of rows: ${number}`);
+ } catch (error) {
+ console.error('Error fetching sheet data:', error);
+ }
+}
+
+// Call the async function to fetch and work with sheet data.
+// You can use 'number' outside of the function.
+console.log(`Global number variable: ${number}`);
exports.Welcome = (req, res) =>
{
+ // number=0;
+ console.log(datafromjson.length);
try
{
- const Msg = "Welcome....!";
+ const Msg = "Welcom....!";
console.log(Msg);
logMsg.info("Api Call Success");
res.send({'status':200 , message:"Success." ,'data': Msg});
@@ -27,8 +55,6 @@ exports.Welcome = (req, res) =>
};
-
-
exports.loginPage = async (req, res ) =>
{
try
@@ -40,130 +66,178 @@ exports.loginPage = async (req, res ) =>
};
-
-
-exports.getRow = async (req, res) =>
+exports.adduser = async (req, res ) =>
{
try
{
- email = req.query.email;
- // arr for ejs
- const empData = [];
- // clear array
- tempData = [];
- // clear temp data
- tempData = [];
- await doc.loadInfo();
- // Index of the sheet
- let sheet = doc.sheetsByIndex[0];
- // Get all the rows
- let rows = await sheet.getRows();
-
- // dropdown array for each dropdown column
- category = []; age_Category = [];
- basthi = []; varga = [];
- milan_shaka = []; poruppu = [];
- blood_group = []; ganavesh_2w_4w_basg = [];
- new_index = 0;
-
- category.push('');
- age_Category.push('');
- basthi.push('');
- varga.push('');
- milan_shaka.push('');
- poruppu.push('');
- blood_group.push('');
- ganavesh_2w_4w_basg.push('')
-
- for (let index = 0; index < rows.length; index++) {
- const row = rows[index];
- category.push(row['Çategory']);
- age_Category.push(row['Age Category']);
- basthi.push(row['Basthi']);
- varga.push(row['Varga']);
- milan_shaka.push(row['Milan / Shaka']);
- poruppu.push(row['Poruppu']);
- blood_group.push(row['Blood Group']);
- ganavesh_2w_4w_basg.push(row['Ganavesh']);
- if (index == rows.length-1) {
- new_index = Number(row['Sl.']) + 1;
- }
- };
- dropdown =
- {
- "category": [...new Set(category)],
- "age_Category" : [...new Set(age_Category)],
- "basthi" : [...new Set(basthi)],
- "varga" : [...new Set(varga)],
- "milan_shaka" : [...new Set(milan_shaka)],
- "poruppu" : [...new Set(poruppu)],
- "blood_group" : [...new Set(blood_group)],
- "ganavesh_2w_4w_basg" : [...new Set(ganavesh_2w_4w_basg)],
- "new_index" : new_index
- }
- for (let index = 0; index < rows.length; index++) {
- const row = rows[index];
- // get sheet column name for dynamic insertion
- if(index == 0){ column_name = row._sheet.headerValues; }
- if (row.email == email) {
- // store login person data from sheet because get person id that is used to match other person manager_id
- var obj = {}
- for (let i = 0; i < column_name.length; i++){
- // get email position in dynamic array
- Object.assign( obj , { [column_name[i]] : row[column_name[i]] });
- }
- tempData.push(obj);
- }
- };
- if (tempData.length > 0)
- {
- for (let index = 0; index < rows.length; index++) {
- const row = rows[index];
- if (row.email == email || row.Gatnayak == tempData[0]['email'] ) {
- var obj = {}
- for (let i = 0; i < column_name.length; i++){
- // get email position in dynamic array
- Object.assign( obj , { [column_name[i]] : row[column_name[i]] });
- }
- empData.push(obj);
- }
- };
- res.render( 'displaydata' , { "data" : empData , "dropdown" : dropdown} , function (err, html ) { res.send(html) });
- }
- else
- {
- res.send('No Data
');
- }
+ res.render( 'adduser' ,function (err, html ) { res.send(html) })
} catch(err) {
res.send({'status':404,message: err.message || "Some error occurred while retrieving data." ,'data': "No data" });
} //end of try catch
};
-
-
-exports.addRow = async (req, res) =>
+exports.addjson = async (req, res ) =>
{
try
{
- newData = req.body.data;
- // key value mapping
- var obj = {}
- for (let i = 0; i < column_name.length; i++){
- // get email position in dynamic array
- Object.assign( obj , { [column_name[i]] : newData[i] });
- }
- let rows = [obj];
- // load the documents info
- await doc.loadInfo();
- // Index of the sheet
- let sheet = doc.sheetsByIndex[0];
- for (let index = 0; index < rows.length; index++) {
- const row = rows[index];
- await sheet.addRow(row);
- }
- if (rows[0]['Gatnayak'] == tempData[0].email ) {res.send({'status':200 , message:"Success." ,'data': "success" , 'statusCode' : 1 }); }
+
+ const getvalue = req.body.data;
+ // console.log(req.body.data);
+ let newData={"email":getvalue};
+ fs.readFile(filePath, 'utf8', (readErr, data) => {
+ if (readErr) {
+ console.error('Error reading file:', readErr);
+ return;
+ }
+ let existingData = [];
+
+ try {
+ // Parse the existing JSON data (if any)
+ existingData = JSON.parse(data);
+ } catch (parseErr) {
+ console.error('Error parsing existing data:', parseErr);
+ }
+
+ // Append the new data to the existing array
+ existingData.push(newData);
+
+ // Write the updated data back to the JSON file
+ fs.writeFile(filePath, JSON.stringify(existingData, null, 2), (writeErr) => {
+ if (writeErr) {
+ console.error('Error writing to file:', writeErr);
+ } else {
+ console.log('Data appended and saved to file successfully.');
+ }
+ });
+ })
+ if(rows[0]['Gatnayak'] == tempData[0].email ) {res.send({'status':200 , message:"Success." ,'data': "success" , 'statusCode' : 1 }); }
else{res.send({'status':200 , message:"Success." ,'data': "success", 'statusCode' : 0 }); }
+ } catch(err) {
+ res.send({'status':404,message: err.message || "Some error occurred while retrieving data." ,'data': "No data" });
+ } //end of try catch
+
+};
+
+exports.getRow = async (req, res) =>
+{
+ try
+ {
+ fetchSheetData();
+ for (let index = 0; index < datafromjson.length; index++) {
+ // console.log(req.query.email);
+ // email = req.query.email;
+ const email=req.body.email;
+ req.session.user = { email };
+ // console.log(req.session.user.email);
+ // console.log(email);
+ aadhaemail= datafromjson[0].email;
+ let emaill = datafromjson[index].email;
+ if (email == emaill) {
+ const empData = [];
+ tempData = ['fdd'];
+ await doc.loadInfo();
+ let sheet = doc.sheetsByIndex[0];
+ let rows = await sheet.getRows();
+ // const number = rows.length+1;
+ category = []; age_Category = [];
+ basthi = []; varga = [];
+ milan_shaka = []; poruppu = [];
+ blood_group = []; ganavesh_2w_4w_basg = [];
+ // new_index = 0;
+
+ category.push('Redmi','Samsung','ONEPLUS');
+ age_Category.push('18-21','22-25','26-30');
+ basthi.push('Niruha/Kashaya Basthi','Anuvasana Basthi');
+ varga.push('Rasi','Hora','Chaturthamsa','Dasamsa','Shodasamsa');
+ milan_shaka.push('');
+ poruppu.push('');
+ blood_group.push('A+','A-','B+','B-','AB+','AB-','O+','O-');
+ ganavesh_2w_4w_basg.push('')
+ for (let index = 0; index < rows.length; index++) {
+ const row = rows[index];
+ category.push(row['Category']);
+ age_Category.push(row['Age Category']);
+ basthi.push(row['Basthi']);
+ varga.push(row['Varga']);
+ milan_shaka.push(row['Milan / Shaka']);
+ poruppu.push(row['Poruppu']);
+ blood_group.push(row['Blood Group']);
+ ganavesh_2w_4w_basg.push(row['Ganavesh']);
+ // if (index == rows.length-1) {
+ // new_index = Number(row.Sl) + 1;
+ // }
+ };
+ dropdown ={
+ "category": [...new Set(category)],
+ "age_Category" : [...new Set(age_Category)],
+ "basthi" : [...new Set(basthi)],
+ "varga" : [...new Set(varga)],
+ "milan_shaka" : [...new Set(milan_shaka)],
+ "poruppu" : [...new Set(poruppu)],
+ "blood_group" : [...new Set(blood_group)],
+ "ganavesh_2w_4w_basg" : [...new Set(ganavesh_2w_4w_basg)],
+ // "new_index" : new_index
+ }
+ for (let index = 0; index < rows.length; index++) {
+ const row = rows[index];
+ if(index == 0){ column_name = row._sheet.headerValues; }
+ if (row.email == email) {
+ var obj = {}
+ for (let i = 0; i < column_name.length; i++){
+ Object.assign( obj , { [column_name[i]] : row[column_name[i]] });
+ }
+ tempData.push(obj);
+ }
+ };
+ // if (tempData.length > 0) {
+ for (let index = 0; index < rows.length; index++) {
+ const row = rows[index];
+ // console.log(rows[0]._rawData[22]);
+ // if (row == email || row.Gatnayak == tempData[0]['email'] ) {
+ if(true){
+ // console.log(row.);
+ var obj = {}
+ for (let i = 0; i < column_name.length; i++){
+ Object.assign( obj , { [column_name[i]] : row[column_name[i]] });
+ }
+ empData.push(obj);
+ }
+ };
+
+ res.render( 'displaydata' , { "data" : empData , "dropdown" : dropdown , aadhaemail,email,number} , function (err, html ) { res.send(html) });
+ // }
+ // else{
+ // res.send('No Data
');
+ // }
+ }
+ }
+
+ res.end("No Data
");
+ }catch(err) {
+ res.send({'status':404,message: err.message || "Some error occurred while retrieving data." ,'data': "No data" });
+ }
+};
+
+
+exports.addRow = async (req, res) =>{
+ try{
+ newData = req.body.data;
+ console.log(newData);
+ var obj = {}
+ for (let i = 0; i < column_name.length; i++){
+ Object.assign( obj , { [column_name[i]] : newData[i] });
+ }
+ let rows = [obj];
+ await doc.loadInfo();
+ let sheet = doc.sheetsByIndex[0];
+ for (let index = 0; index < rows.length; index++) {
+ const row = rows[index];
+ await sheet.addRow(row);
+ }
+ if(rows[0]['Gatnayak'] == tempData[0].email ) {res.send({'status':200 , message:"Success." ,'data': "success" , 'statusCode' : 1 }); }
+ else{res.send({'status':200 , message:"Success." ,'data': "success", 'statusCode' : 0 }); }
+ number++;
} catch(err) {
res.status(500).send({'status':404,
message: err.message || "Some error occurred while inserting statements." ,'data': "No data"
@@ -171,45 +245,54 @@ exports.addRow = async (req, res) =>
};
-
-
exports.updateRow = async (req, res ) =>
{
try
{
Olddata = req.body.Old;
Newdata = req.body.New;
+// console.log('old'+Olddata[1]);// this will give old number same
+// console.log('new'+Newdata[1]);// this will give new number sam
Old = {}; New = {};
+
column_name.forEach(async(element , index) => {
- Object.assign( Old , { [element] : Olddata[index]});
- Object.assign( New , { [element] : Newdata[index]});
+ Object.assign( Old , { [element] : Olddata[index]});//oldata
+ Object.assign( New , { [element] : Newdata[index]});//newdata
});
arrKeys = [ ];
- arrKeys = Object.keys(Old)
+ arrKeys = Object.keys(Old);//keys -> heading values -> datas
var updateVal = [];
for (let i = 0; i < arrKeys.length ; i++) {
- if (Old[arrKeys[i]] != New[arrKeys[i]]) {
+ if (Old[arrKeys[i]] != New[arrKeys[i]]) {
+ // if (Old[arrKeys[i]] == New[arrKeys[i]]) {
obj = { "keyValue" : arrKeys[i] , oldValue : Old[arrKeys[i]] , newValue : New[arrKeys[i]] };
updateVal.push(obj)
- obj = { }
+ obj = { };
}
}
console.log(updateVal);
+ //console.log(updateVal[0].newValue); // this is the value for compare and update the value in sheet
// load the documents info
await doc.loadInfo();
// Index of the sheet
- let sheet = doc.sheetsByIndex[0];
+ let sheet = doc.sheetsByIndex[0]; //it will detials of googlesheet
let rows = await sheet.getRows();
+ // console.log(rows[0]._rawData); //this is give the googlesheet values by changin the [] value to get different
updateVal.forEach(async(element) => {
+ // console.log(rows.length);//check in
+ // console.log(rows[0]._rawData[4]); //this will get the phone number
for (let index = 0; index < rows.length; index++) {
- const row = rows[index];
- if (element.keyValue != "Sl.") {
- if (row[element.keyValue] === element.oldValue) {
+ const row = rows[index]._rawData[1];
+
+ // console.log("Row->"+row);
+ // if (updateVal[0].newValue) {
+ //if (row[element.keyValue] === element.oldValue) {//row[element.keyValue]-> categry value one by one
+ if(Newdata[1]==row){
rows[index][element.keyValue] = element.newValue;
await rows[index].save();
break;
}
- }
+ // }
};
});
res.send({'status':200 , message:"Success." ,'data': "Msg"})
@@ -219,15 +302,15 @@ exports.updateRow = async (req, res ) =>
};
-
-
(async function ( req , res ) {
+ const private_keyy = process.env.PRIVATE_KEY.replace(/\\n/g, '\n');
+
// spreadsheet key is the long id in the sheets URL
const RESPONSES_SHEET_ID = process.env.RESPONSES_SHEET_ID;
// Create a new document
doc = new GoogleSpreadsheet(RESPONSES_SHEET_ID);
// use service account creds
-await doc.useServiceAccountAuth({ client_email: process.env.CLIENT_EMAIL , private_key: process.env.PRIVATE_KEY });
+await doc.useServiceAccountAuth({ client_email: process.env.CLIENT_EMAIL , private_key: private_keyy });
// load the documents info
await doc.loadInfo();
// Index of the sheet
@@ -236,7 +319,3 @@ let sheet = doc.sheetsByIndex[0];
let rows = await sheet.getRows();
})();
-
-
-
-
diff --git a/app/models/Test.js b/app/models/Test.js
deleted file mode 100644
index 88a5cf7..0000000
--- a/app/models/Test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict'
-const { Model } = require('sequelize')
-module.exports = (sequelize, DataTypes) => {
- class Test extends Model {
- /**
- * Helper method for defining associations.
- * This method is not a part of Sequelize lifecycle.
- * The `models/index` file will call this method automatically.
- */
- // define association here
- // static associate({ Financials }) {
- // this.hasMany(Financials, { foreignKey: 'entity_id', as: 'financialsData' })
- // }
-
-
- }
- Test.init(
- {
- losid: { type: DataTypes.STRING },
- createdby: { type: DataTypes.INTEGER },
- updatedby: { type: DataTypes.INTEGER },
-
- },
- {
- sequelize,
- tableName: 'test',
- modelName: 'Test',
- }
- )
- return Test
-}
diff --git a/app/models/index.js b/app/models/index.js
deleted file mode 100644
index abe34a1..0000000
--- a/app/models/index.js
+++ /dev/null
@@ -1,39 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const Sequelize = require('sequelize');
-const basename = path.basename(__filename);
-const env = process.env.NODE_ENV || 'development';
-const config = require(__dirname + '/../config/db.config.js')[env];
-//console.log(env);
-//console.log(config);
-const db = {};
-
-let sequelize;
-if (config.use_env_variable) {
- sequelize = new Sequelize(process.env[config.use_env_variable], config);
-} else {
- sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
-
-fs
- .readdirSync(__dirname)
- .filter(file => {
- return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
- })
- .forEach(file => {
- const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes);
- db[model.name] = model;
- });
-
-Object.keys(db).forEach(modelName => {
- if (db[modelName].associate) {
- db[modelName].associate(db);
- }
-});
-
-db.sequelize = sequelize;
-db.Sequelize = Sequelize;
-
-module.exports = db;
diff --git a/app/routes/routes.js b/app/routes/routes.js
index 99d2d6d..b414459 100644
--- a/app/routes/routes.js
+++ b/app/routes/routes.js
@@ -5,10 +5,6 @@ module.exports = app => {
const { logMsg } = require('../services/logger.js');
var router = require("express").Router();
-
-
-
-
/**
* @swagger
* /api/demo:
@@ -19,18 +15,24 @@ module.exports = app => {
* 200:
* description: success
*/
- router.get("/demo", Mycontroller.Welcome);
+// router.get("/demo", Mycontroller.Welcome);
- router.get("/loginPage", Mycontroller.loginPage);
+ router.get("/home", Mycontroller.loginPage);
- router.get("/getRow", Mycontroller.getRow);
+ router.get("/adduser", Mycontroller.adduser);
+
+ router.post("/addjson", Mycontroller.addjson);
+
+// router.get("/getRow", Mycontroller.get);
+
+ router.post("/getRow", Mycontroller.getRow);
router.post("/addRow", Mycontroller.addRow);
router.post("/updateRow", Mycontroller.updateRow);
// routes started here
- app.use('/api', router);
+ app.use('/', router);
};
diff --git a/app/services/logger.js b/app/services/logger.js
index 7970433..f6d0910 100644
--- a/app/services/logger.js
+++ b/app/services/logger.js
@@ -1,27 +1,26 @@
-/**
- * Configurations of logger.
- */
- var winston = require('winston');
- require('winston-daily-rotate-file');
+/*Configurations of logger*/
+var winston = require('winston');
+const {createLogger,transports} = require('winston');
+require('winston-daily-rotate-file');
- var transport = new winston.transports.DailyRotateFile({
- filename: 'storage/log/msg.log',
- datePattern: 'YYYY-MM-DD',
- zippedArchive: true,
- maxSize: '20m',
- maxFiles: '14d'
- });
- transport.on('rotate', function(oldFilename, newFilename) {
- // do something fun
- });
+var transport = new transports.DailyRotateFile({
+ filename: 'storage/log/msg.log',
+ datePattern: 'YYYY-MM-DD',
+ zippedArchive: true,
+ maxSize: '20m',
+ maxFiles: '14d'
+});
- const logger = winston.createLogger({
- transports: [
- transport
- ]
- });
- module.exports = {
- 'logMsg': logger,
- };
-
\ No newline at end of file
+transport.on('rotate', function(oldFilename, newFilename) {
+ // do something fun
+});
+
+const logger = createLogger({
+ transports: [
+ transport
+ ]
+});
+module.exports = {
+ 'logMsg': logger,
+};
diff --git a/app/views/Screenshot 2023-09-16 170601.png b/app/views/Screenshot 2023-09-16 170601.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2165a179515e022a6826122877c50cd62d6c20a
GIT binary patch
literal 1545
zcmV+k2KM=hP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1)fPnK~!i%?V3+$
z99100e>1yHw@KPf#FC_er2eaa4ozvHm((g$(t`yrf`>@FC@7vZwg;i2t#~ljn<&(a
zX$l^^2o>DgA{s>yEKLO4gS1w$NvN1?P1F3_UElXN@0WeM*_p}i?2-vPpYWJBZ)d~r
zz3=<|d6QT<1x17gTVEqWLL^AYhy)24ksu)>5+r0qf`p7nkdRT6bI8nGj?$|A@lTeo
zp!;5%TT7$G_Zx+r`VlPkQ){X!$YeT4L+2Lg@{NohS5_tVgUV|ui9R4rtEHo8dtAI+^2qj=#{n5IOYT9U444&s8GwA;wXBcmX^A
z8#+O^p4!h1c6!;kRsxm1r@vjK&wp}477}-q=*%@o^pyUUi@U;>GdC0BX
zj+S0$im^YPr0?Dq^^?RqPG}r>i5GwC(YII#fQ2xh$xVN^A_f-UzVA52_I^Y5W1sRp
zd(QQf{G0#}5HVmk79E8M1n`=N0M8IHu;`|p0H3Gdc$xc^P?eAcR}TsnT5<*^*rX;3
zArgm=6o@jPI>*9*?Dco~3haFs*b}VQC&-3ZsC$S4L^RlmO#ra?sP-iHL6|=6sb0*T
z$%iG_C3cFf0P}#Il@LgfM|R}D?sm|_L=n!4o9sp@1Z0tAawgb`vIBt#Cp#aWA&W0a
zxB~DLJUca$51plQ9x6aTFA+Pj_^=bUAa@{#hzOO2D-cMKM?3RXRq9voBv_1iRhwP_
zS!B1#nB$qLiGnahTMESxtk#3N=WtntPeJllF@BYz*omtY9dkOFBYfR6@+CL%mU0Ou
zi1LsKr=ZGG&!d14+`{aXPxuu(;VG~c_Yh+H
zg`YWmxoxPm5=anmRD~n~3EEujQkW-uiQm9(+riiD)XkEjm@zrl)=?0maua8CuMl$_
z&zs>WHJ(4v3J}S!`Vu<71zNd9hZIbg}>7E1Z
zlyg(1!c^_`yBxGc1TRFy;&_ckHxnavqa;xQ6__M_E^BcBl!ZqkSBsCciAnrW-fMYd
zjNDzZQ$p^fO8BPjUgwZ`#}&d7f(E!;OC2pKd_6e
z=B;XSmnb(otHM`)mto?`cZLckX~kPu09}#kOpq{x++pSu6TH^~2v=^UaV-g))HfO^ERgHWJR)FRSgSWz
zo4WIm;=gVpZ|v@}XQ&T(E(K@;_btFQn!MHmAXsn;fCmc0A~fa-STm_00000NkvXXu0mjf8!OsK
literal 0
HcmV?d00001
diff --git a/app/views/Y4Pb2E.png b/app/views/Y4Pb2E.png
new file mode 100644
index 0000000000000000000000000000000000000000..6838733558d4db6b9a3af3649ee8f36110cf5543
GIT binary patch
literal 90290
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