Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New UI overhaul #610

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

New UI overhaul #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
71a0e53
Staging Area (#604)
subru-37 Dec 17, 2024
e001b02
removed fastMode (#606)
midhununni457 Dec 18, 2024
07724bc
build verified
subru-37 Dec 18, 2024
5fadedf
New UI (#607)
subru-37 Dec 18, 2024
d536e2a
build verified
subru-37 Dec 18, 2024
f3c5d29
New UI (#609)
subru-37 Dec 19, 2024
2ec0cd0
Made Sidebar uniform (#611)
subru-37 Dec 19, 2024
5f3e6b4
Integrated Org Details (#613)
subru-37 Dec 19, 2024
c2d746a
Dashboard complete UI 1.0 (#615)
subru-37 Dec 20, 2024
393134b
New UI (#617)
subru-37 Dec 23, 2024
69d46c8
Final Settings page (#619)
subru-37 Dec 23, 2024
633d64f
Updated settings UI and messages (#623)
subru-37 Dec 25, 2024
c70d186
feat: Added 5 modals instead of route.push (#628)
Ajay-Krishna00 Jan 6, 2025
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
2 changes: 1 addition & 1 deletion apps/core-admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "npm run clean & webpack --config webpack.config.js",
"clean": "rimraf dist & rimraf build",
"dev": "concurrently \"npx tsc --watch\" \"nodemon -q build/index.js\"",
"setup": "node -e \"require('fs').copyFile('.env.example', '.env', (err) => {if (err) {console.log(err);} else {console.log('Environment variables set up successfully');}});\"",
"setup": "node -e \"require('fs').copyFile('.env.example', '.env', (err) => {if (err) {//console.log(err);} else {//console.log('Environment variables set up successfully');}});\"",
"start": "node dist/app.js",
"test": "mocha -r ts-node/register 'tests/**/*.ts' --timeout 10000 --exit",
"lint": "eslint --ext .ts src"
Expand Down
2 changes: 1 addition & 1 deletion apps/core-admin/src/controllers/extras.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const getAllExtras = async (req: Request, res: Response) => {
return res.status(404).json({ error: 'No extras found' });
}

console.log(extras);
//console.log(extras);

extras = extras.map((extra: any) => {
return {
Expand Down
70 changes: 35 additions & 35 deletions apps/core-admin/src/controllers/mail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { marked } from 'marked';
const MAILER_URL = process.env.MAILER_URL;
const MAILER_DATABASE_URL = process.env.MAILER_DATABASE_URL;
const AUTHORIZATION_TOKEN = process.env.AUTHORIZATION_TOKEN;
// console.log(AUTHORIZATION_TOKEN);
// //console.log(AUTHORIZATION_TOKEN);
export const getStatusOfEmails = async (req: Request, res: Response) => {
try {
const { emailArray } = req.body;
Expand Down Expand Up @@ -46,14 +46,14 @@ export const getStatusOfEmails = async (req: Request, res: Response) => {
authorization: AUTHORIZATION_TOKEN,
},
});
console.log(emailStatus);
//console.log(emailStatus);

if (
emailStatus &&
emailStatus.status === 200 &&
emailStatus.data.status.status == 'SENT'
) {
console.log({ ...emailStatus.data.status });
//console.log({ ...emailStatus.data.status });
// return res.status(200).json({
// ...emailStatus.data.status,
// });
Expand Down Expand Up @@ -109,9 +109,9 @@ export const sendMailWithQR = async (req: Request, res: Response) => {
if (recipient.emailSent) {
numberOfRecipientsAlreadyMailed++;
recipientAlreadyMailed.push(recipient);
console.log(`Project: ${projectId} - Mail already sent to ${recipient.email}`);
//console.log(`Project: ${projectId} - Mail already sent to ${recipient.email}`);
} else {
console.log(`Project: ${projectId} - Sending mail to ${recipient.email}`);
//console.log(`Project: ${projectId} - Sending mail to ${recipient.email}`);
await sleepAsync(5); // Assuming you have this function defined for waiting

const form = new FormData();
Expand All @@ -134,7 +134,7 @@ export const sendMailWithQR = async (req: Request, res: Response) => {
authorization: AUTHORIZATION_TOKEN,
},
});
console.log(response.data);
//console.log(response.data);
if (response && response.status == 200) {
// Update the recipient's record in Prisma
await prisma.Recipients.update({
Expand All @@ -155,9 +155,9 @@ export const sendMailWithQR = async (req: Request, res: Response) => {
});
} else {
try {
console.log(response.data);
//console.log(response.data);
} catch (e) {
console.log('error', e);
//console.log('error', e);
}
numberOfRecipientsFailed++;
RecipientsNotMailed.push({
Expand Down Expand Up @@ -192,7 +192,7 @@ function sleepAsync(ms: number) {
export const getRecipients = async (req: Request, res: Response) => {
try {
const { projectId, orgId } = req?.params;
// console.log('Hello')
// //console.log('Hello')
if (!projectId || !orgId) {
return res.status(400).send({ message: 'Missing required fields' });
}
Expand Down Expand Up @@ -241,7 +241,7 @@ export const getMailStatus = async (req: Request, res: Response) => {
});

if (emailStatus && emailStatus.status === 200) {
console.log({ ...emailStatus.data.status });
//console.log({ ...emailStatus.data.status });
return res.status(200).json({
...emailStatus.data.status,
});
Expand All @@ -267,14 +267,14 @@ export const updateMailProject = async (req: Request, res: Response) => {
if (!projectId || !orgId) {
return res.status(400).send({ message: 'Missing required fields!' });
}
console.log(projectId);
//console.log(projectId);

// console.log(html_template);
// //console.log(html_template);
const response = await prisma.Projects.update({
where: { id: projectId },
data: { html_template: html_template },
});
console.log(response);
//console.log(response);

if (response) {
return res.status(200).json({
Expand All @@ -287,7 +287,7 @@ export const updateMailProject = async (req: Request, res: Response) => {
});
}
} catch (e) {
console.log(e);
//console.log(e);
return res.status(400).send({ message: e });
}
};
Expand All @@ -299,7 +299,7 @@ export const newMailProject = async (req: Request, res: Response) => {
if (!name || !desc || !orgId || !html_template) {
return res.status(400).send({ message: 'Missing required fields' });
}
console.log(name, desc, orgId);
//console.log(name, desc, orgId);
// if (supabase) {
// const response = await supabase.from('Projects').select('name').eq('name', name);
const response = await prisma.Projects.findMany({
Expand All @@ -310,7 +310,7 @@ export const newMailProject = async (req: Request, res: Response) => {
name: true,
},
});
// console.log(response);
// //console.log(response);
if (response) {
if (response && response?.length == 0) {
// const response = await supabase
Expand All @@ -324,7 +324,7 @@ export const newMailProject = async (req: Request, res: Response) => {
html_template: html_template,
},
});
// console.log(response)
// //console.log(response)
if (response) {
// const currentProject = await supabase.from('Projects').select('*').eq('name', name);
const currentProject = await prisma.Projects.findFirst({
Expand Down Expand Up @@ -358,7 +358,7 @@ export const newMailProject = async (req: Request, res: Response) => {
export const getMailProjects = async (req: Request, res: Response) => {
try {
const { orgId } = req?.params;
console.log(orgId);
//console.log(orgId);
if (!orgId) {
return res.status(400).send({ message: 'Missing required fields' });
}
Expand Down Expand Up @@ -416,7 +416,7 @@ export const addNewRecipient = async (req: Request, res: Response) => {
},
});

// console.log('Insert:', response);
// //console.log('Insert:', response);
return res.status(200).json({ message: 'User successfully Added' });
}
} catch (e: any) {
Expand All @@ -433,12 +433,12 @@ type mytype = {
export const addNewRecipients = async (req: Request, res: Response) => {
try {
const { data, projectId } = req.body;
console.log(data.length);
//console.log(data.length);
const arrayOfElements = data as mytype[];
let nonProcessed = [];
let processed = [];
if (!arrayOfElements || !projectId) {
console.log(arrayOfElements, projectId);
//console.log(arrayOfElements, projectId);
return res.status(400).send({ message: 'Missing required fields' });
} else if (Array.isArray(arrayOfElements)) {
for (const element of arrayOfElements) {
Expand Down Expand Up @@ -469,7 +469,7 @@ export const addNewRecipients = async (req: Request, res: Response) => {
} else {
nonProcessed.push(element);
}
// console.log('Insert:', response);
// //console.log('Insert:', response);
// return res.status(200).json({ message: 'User successfully Added' });
}
}
Expand All @@ -482,7 +482,7 @@ export const addNewRecipients = async (req: Request, res: Response) => {
return res.status(400).send({ message: 'Element not an array' });
}
} catch (e: any) {
console.log(e);
//console.log(e);
return res.status(400).send({ message: e.message || 'Something went wrong' });
}
};
Expand All @@ -494,7 +494,7 @@ const generateOTP = () => {
export const sendOTP = async (req: Request, res: Response) => {
try {
const { email, name, projectId } = req.body;
console.log(req.body);
//console.log(req.body);

// Check for required fields
if (!email || !name || !projectId) {
Expand All @@ -515,40 +515,40 @@ export const sendOTP = async (req: Request, res: Response) => {
email: email,
},
});
console.log(otpRecord);
//console.log(otpRecord);
if (otpRecord) {
// OTP already exists, update the OTP code
const otp = generateOTP();
const otpUpdateResponse = await prisma.Otp.update({
where: { email: email },
data: { code: otp },
});
// console.log(otpUpdateResponse)
// //console.log(otpUpdateResponse)
if (otpUpdateResponse) {
// Send OTP email
console.log(AUTHORIZATION_TOKEN);
//console.log(AUTHORIZATION_TOKEN);
const form = new FormData();
form.append('name', name);
form.append('to', email);
form.append('subject', 'Confirm your OTP');
let emailText: string = await marked(markdown.html_template);
emailText = emailText.replace('((otp))', otp.toString());
emailText = emailText.replace('{{name}}', name);
console.log(emailText);
//console.log(emailText);
emailText = emailText.replace(/\n/g, '');
emailText = emailText.replace(/"/g, "'");
form.append('html', emailText);
form.append('text', 'Confirm your OTP');
console.log(`${MAILER_URL}/mail`);
//console.log(`${MAILER_URL}/mail`);
const response = await axios.post(`${MAILER_URL}/mail`, form, {
headers: {
...form.getHeaders(),
authorization: AUTHORIZATION_TOKEN,
},
});

console.log(response.data);
console.log(response);
//console.log(response.data);
//console.log(response);
if (response.status === 200) {
return res.status(200).json({
message: 'OTP successfully sent',
Expand Down Expand Up @@ -583,7 +583,7 @@ export const sendOTP = async (req: Request, res: Response) => {
let emailText: string = await marked(markdown.html_template);
emailText = emailText.replace('((otp))', otp.toString());
emailText = emailText.replace('{{name}}', name);
console.log(emailText);
//console.log(emailText);
emailText = emailText.replace(/\n/g, '');
emailText = emailText.replace(/"/g, "'");
form.append('html', emailText);
Expand All @@ -596,7 +596,7 @@ export const sendOTP = async (req: Request, res: Response) => {
},
});

console.log(response.data);
//console.log(response.data);

if (response.status === 200) {
return res.status(200).json({
Expand Down Expand Up @@ -627,7 +627,7 @@ export const verifyOTP = async (req: Request, res: Response) => {
if (!email || !otp) {
return res.status(400).send({ message: 'Missing required fields' });
}
console.log(email, otp);
//console.log(email, otp);
// Fetch OTP record for the provided email
const otpRecord = await prisma.Otp.findFirst({
where: {
Expand All @@ -636,7 +636,7 @@ export const verifyOTP = async (req: Request, res: Response) => {
});

if (otpRecord) {
console.log(otpRecord);
//console.log(otpRecord);
// Check if the provided OTP matches the stored one
if (otpRecord.code.toString() === otp.toString()) {
return res.status(200).json({
Expand Down
Loading