Skip to content

Updated Changes to the frontend and backend that were previously unco… #2

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

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

Updated Changes to the frontend and backend that were previously unco… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662f209
Updated Changes to the frontend and backend that were previously unco…
E1spencer Nov 13, 2025
ce0eeb5
new update. worked on the CTA button on the top left corner. It work…
E1spencer Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions backend/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
DB_HOST = localhost
DB_PORT = 5432
DB_NAME = novus_consultations
DB_USER = postgres
DB_PASSWORD = jaiyeolaeva
44 changes: 22 additions & 22 deletions config/database.js → backend/config/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
const { Pool } = require('pg');
const pool = new Pool({
host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432,
database: process.env.DB_NAME || 'novus_consultations',
user: process.env.DB_USER || 'postgres',
password: process.env.DB_PASSWORD || 'jaiyeolaeva',
max: 20,
idleTimeoutMillis: 30000,
connectionTimeoutMillis: 2000,
});
pool.on('connect', () => {
console.log('Connected to PostgreSQL database');
});
pool.on('error', (err) => {
console.error('Unexpected error on idle client', err);
process.exit(-1);
});
const { Pool } = require('pg');

const pool = new Pool({
host: process.env.DB_HOST || 'localhost',
port: process.env.DB_PORT || 5432,
database: process.env.DB_NAME || 'novus_consultations',
user: process.env.DB_USER || 'postgres',
password: process.env.DB_PASSWORD || 'jaiyeolaeva',
max: 20,
idleTimeoutMillis: 30000,
connectionTimeoutMillis: 2000,
});

pool.on('connect', () => {
console.log('Connected to PostgreSQL database');
});

pool.on('error', (err) => {
console.error('Unexpected error on idle client', err);
process.exit(-1);
});

module.exports = pool;
226 changes: 113 additions & 113 deletions config/initDatabase.js → backend/config/initDatabase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
const pool = require('./database');
const initDatabase = async () => {
try {
// Create admins table
await pool.query(`
CREATE TABLE IF NOT EXISTS admins (
id SERIAL PRIMARY KEY,
username VARCHAR(255) UNIQUE NOT NULL,
email VARCHAR(255) UNIQUE NOT NULL,
password VARCHAR(255) NOT NULL,
role VARCHAR(50) DEFAULT 'admin',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Create bookings table
await pool.query(`
CREATE TABLE IF NOT EXISTS bookings (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
email VARCHAR(255) NOT NULL,
company VARCHAR(255),
notes TEXT,
date DATE NOT NULL,
time_slot VARCHAR(10) NOT NULL,
status VARCHAR(50) DEFAULT 'pending',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UNIQUE(date, time_slot)
)
`);
// Create contacts table
await pool.query(`
CREATE TABLE IF NOT EXISTS contacts (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
email VARCHAR(255) NOT NULL,
subject VARCHAR(255),
message TEXT NOT NULL,
status VARCHAR(50) DEFAULT 'new',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Create newsletter table
await pool.query(`
CREATE TABLE IF NOT EXISTS newsletter (
id SERIAL PRIMARY KEY,
email VARCHAR(255) UNIQUE NOT NULL,
subscribed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
is_active BOOLEAN DEFAULT true
)
`);
// Create settings table
await pool.query(`
CREATE TABLE IF NOT EXISTS settings (
id SERIAL PRIMARY KEY,
working_hours_start VARCHAR(10) DEFAULT '09:00',
working_hours_end VARCHAR(10) DEFAULT '17:00',
working_days INTEGER[] DEFAULT ARRAY[1,2,3,4,5],
meeting_duration INTEGER DEFAULT 30,
timezone VARCHAR(50) DEFAULT 'America/New_York',
max_bookings_per_day INTEGER DEFAULT 10,
email_notifications BOOLEAN DEFAULT true,
company_email VARCHAR(255) DEFAULT 'contact@novus.com',
company_phone VARCHAR(50) DEFAULT '+234 708 279 5914'
)
`);
// ==================== config/initDatabase.js (ADD THIS TABLE) ====================
// Add this to your existing initDatabase.js file
await pool.query(`
CREATE TABLE IF NOT EXISTS blog_posts (
id SERIAL PRIMARY KEY,
title VARCHAR(255) NOT NULL,
content TEXT NOT NULL,
excerpt TEXT,
category VARCHAR(100),
author VARCHAR(100),
image_url TEXT,
status VARCHAR(50) DEFAULT 'draft',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);
// Insert default settings if not exists
const settingsCheck = await pool.query('SELECT * FROM settings LIMIT 1');
if (settingsCheck.rows.length === 0) {
await pool.query('INSERT INTO settings DEFAULT VALUES');
}
// Create indexes
await pool.query('CREATE INDEX IF NOT EXISTS idx_bookings_date ON bookings(date)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_bookings_status ON bookings(status)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_contacts_status ON contacts(status)');
// Create indexes for better performance
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_status ON blog_posts(status)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_category ON blog_posts(category)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_created ON blog_posts(created_at DESC)');
console.log('Database initialized successfully');
} catch (error) {
console.error('Error initializing database:', error);
throw error;
}
};
const pool = require('./database');

const initDatabase = async () => {
try {
// Create admins table
await pool.query(`
CREATE TABLE IF NOT EXISTS admins (
id SERIAL PRIMARY KEY,
username VARCHAR(255) UNIQUE NOT NULL,
email VARCHAR(255) UNIQUE NOT NULL,
password VARCHAR(255) NOT NULL,
role VARCHAR(50) DEFAULT 'admin',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);

// Create bookings table
await pool.query(`
CREATE TABLE IF NOT EXISTS bookings (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
email VARCHAR(255) NOT NULL,
company VARCHAR(255),
notes TEXT,
date DATE NOT NULL,
time_slot VARCHAR(10) NOT NULL,
status VARCHAR(50) DEFAULT 'pending',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UNIQUE(date, time_slot)
)
`);

// Create contacts table
await pool.query(`
CREATE TABLE IF NOT EXISTS contacts (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL,
email VARCHAR(255) NOT NULL,
subject VARCHAR(255),
message TEXT NOT NULL,
status VARCHAR(50) DEFAULT 'new',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);

// Create newsletter table
await pool.query(`
CREATE TABLE IF NOT EXISTS newsletter (
id SERIAL PRIMARY KEY,
email VARCHAR(255) UNIQUE NOT NULL,
subscribed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
is_active BOOLEAN DEFAULT true
)
`);

// Create settings table
await pool.query(`
CREATE TABLE IF NOT EXISTS settings (
id SERIAL PRIMARY KEY,
working_hours_start VARCHAR(10) DEFAULT '09:00',
working_hours_end VARCHAR(10) DEFAULT '17:00',
working_days INTEGER[] DEFAULT ARRAY[1,2,3,4,5],
meeting_duration INTEGER DEFAULT 30,
timezone VARCHAR(50) DEFAULT 'America/New_York',
max_bookings_per_day INTEGER DEFAULT 10,
email_notifications BOOLEAN DEFAULT true,
company_email VARCHAR(255) DEFAULT 'contact@novus.com',
company_phone VARCHAR(50) DEFAULT '+234 708 279 5914'
)
`);

// ==================== config/initDatabase.js (ADD THIS TABLE) ====================
// Add this to your existing initDatabase.js file

await pool.query(`
CREATE TABLE IF NOT EXISTS blog_posts (
id SERIAL PRIMARY KEY,
title VARCHAR(255) NOT NULL,
content TEXT NOT NULL,
excerpt TEXT,
category VARCHAR(100),
author VARCHAR(100),
image_url TEXT,
status VARCHAR(50) DEFAULT 'draft',
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
)
`);

// Insert default settings if not exists
const settingsCheck = await pool.query('SELECT * FROM settings LIMIT 1');
if (settingsCheck.rows.length === 0) {
await pool.query('INSERT INTO settings DEFAULT VALUES');
}

// Create indexes
await pool.query('CREATE INDEX IF NOT EXISTS idx_bookings_date ON bookings(date)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_bookings_status ON bookings(status)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_contacts_status ON contacts(status)');
// Create indexes for better performance
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_status ON blog_posts(status)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_category ON blog_posts(category)');
await pool.query('CREATE INDEX IF NOT EXISTS idx_blog_created ON blog_posts(created_at DESC)');


console.log('Database initialized successfully');
} catch (error) {
console.error('Error initializing database:', error);
throw error;
}
};

module.exports = initDatabase;
84 changes: 42 additions & 42 deletions controllers/adminController.js → backend/controllers/adminController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
// ==================== controllers/adminController.js ====================
const Booking = require('../models/Booking');
const Contact = require('../models/Contact');
const Newsletter = require('../models/Newsletter');
exports.getDashboardStats = async (req, res) => {
try {
const today = new Date().toISOString().split('T')[0];
// Get statistics
const totalBookings = await Booking.countTotal();
const todayBookings = await Booking.countByDate(today);
const pendingBookings = await Booking.countByStatus('pending');
const newContacts = await Contact.countByStatus('new');
const activeSubscribers = await Newsletter.countActive();
// Get recent bookings
const recentBookings = await Booking.getRecentBookings(5);
// Get booking statistics by status
const confirmedBookings = await Booking.countByStatus('confirmed');
const cancelledBookings = await Booking.countByStatus('cancelled');
const completedBookings = await Booking.countByStatus('completed');
res.json({
stats: {
totalBookings,
todayBookings,
pendingBookings,
newContacts,
activeSubscribers,
confirmedBookings,
cancelledBookings,
completedBookings
},
recentBookings
});
} catch (error) {
console.error('Get dashboard stats error:', error);
res.status(500).json({ error: 'Failed to get dashboard statistics' });
}
};
// ==================== controllers/adminController.js ====================
const Booking = require('../models/Booking');
const Contact = require('../models/Contact');
const Newsletter = require('../models/Newsletter');

exports.getDashboardStats = async (req, res) => {
try {
const today = new Date().toISOString().split('T')[0];

// Get statistics
const totalBookings = await Booking.countTotal();
const todayBookings = await Booking.countByDate(today);
const pendingBookings = await Booking.countByStatus('pending');
const newContacts = await Contact.countByStatus('new');
const activeSubscribers = await Newsletter.countActive();

// Get recent bookings
const recentBookings = await Booking.getRecentBookings(5);

// Get booking statistics by status
const confirmedBookings = await Booking.countByStatus('confirmed');
const cancelledBookings = await Booking.countByStatus('cancelled');
const completedBookings = await Booking.countByStatus('completed');

res.json({
stats: {
totalBookings,
todayBookings,
pendingBookings,
newContacts,
activeSubscribers,
confirmedBookings,
cancelledBookings,
completedBookings
},
recentBookings
});
} catch (error) {
console.error('Get dashboard stats error:', error);
res.status(500).json({ error: 'Failed to get dashboard statistics' });
}
};
Loading