Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b52a0c1
Merge pull request #2 from winzerprince/backend
winzerprince Feb 5, 2025
75d86b0
Update README.md with styles
winzerprince Feb 5, 2025
b419e21
Adding the header section of index page with it's half design
Josemiles1-droid Feb 5, 2025
ce0578e
Update README.md
winzerprince Feb 5, 2025
9ca4e98
Starting with the header section with half design for desktop
Josemiles1-droid Feb 5, 2025
fa491b1
Create README.md
winzerprince Feb 5, 2025
c9475e0
Settling a merge conflict in the readmefile
Josemiles1-droid Feb 5, 2025
7563f8d
Conflict at readme file
Josemiles1-droid Feb 5, 2025
9a439fd
Starting with the basic dashboard design with other placeholders
Josemiles1-droid Feb 27, 2025
e7a6909
Merging the starter design withe the new dashboard design
Josemiles1-droid Feb 27, 2025
902d72f
Deleted uncecessary first pages
Josemiles1-droid Feb 27, 2025
e501609
Deleting the index.js file
Josemiles1-droid Feb 27, 2025
c3ef813
'Merging the jose.new.feature wit the main'
Josemiles1-droid Feb 27, 2025
bf4ab29
'Another merge from the jose.feature'
Josemiles1-droid Feb 27, 2025
b216b79
Added vite as a dev dependency
jwamani Feb 27, 2025
7acd2fe
Merge pull request #6 from winzerprince/worms
jwamani Feb 27, 2025
7db8e1e
Added React Router DOM library to Project using 'npm install react-ro…
ssentongojosh Feb 27, 2025
6e3fff9
modified the App.jsx file to handle client side: Also included routin…
ssentongojosh Feb 27, 2025
89f5374
Imported the useNavigate function in the Dashboard.jsx file and also …
ssentongojosh Feb 27, 2025
29f1af9
Created a .jsx file for the user dashboard and made it the base page
ssentongojosh Feb 27, 2025
b3dd9eb
updated the dependecies of the package-lock.json files
ssentongojosh Feb 27, 2025
8d8e9ab
created a css file for the userDashBoard and imported it in the UserD…
ssentongojosh Feb 27, 2025
ff8e782
adjusted the layout of the UserDashBoard using CSS
ssentongojosh Mar 5, 2025
40b065f
Created an additional CSS file for styling DashBoard
ssentongojosh Mar 5, 2025
ab3c046
Adjusted the css properties of the admin dashboard specifically in th…
jwamani Mar 6, 2025
fdecb7e
Updated Dashboard CSS to include flex property and fixed background c…
jwamani Mar 6, 2025
7068897
Removed the react import n the userDashboard jsx file as it is not ne…
jwamani Mar 6, 2025
5b10f15
Update index.html title and favicon; refactor UserDashBoard to use Na…
jwamani Mar 10, 2025
9f25192
modified the background color of the calendar
jwamani Mar 10, 2025
df727c1
modified the background color of the calendar
jwamani Mar 10, 2025
31de99f
Merge branch 'main' https://githu:wq#http://localhost:5174/ Please e…
Josemiles1-droid Mar 11, 2025
0c3161f
Merge pull request #7 from winzerprince/main
Josemiles-ctr Mar 13, 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
70 changes: 35 additions & 35 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@

const express = require('express');
const express = require('express');
const sql = require('sql2');
const genres = require('./routes/genres');
const customers = require('./routes/customers');
const home = require('./routes/home');
const debug = require('debug')('app:startup');
const config = require('config');
const morgan = require('morgan');
const helmet = require('helmet');
const logger = require('./middleware/logger');
const port = process.env.PORT || 3000;
const app = express();
const customers = require('./routes/customers');
const home = require('./routes/home');
const debug = require('debug')('app:startup');
const config = require('config');
const morgan = require('morgan');
const helmet = require('helmet');
const logger = require('./middleware/logger');
const port = process.env.PORT || 3000;
const app = express();
const mongoose = require('mongoose');
//create database with a document for each genre designing their sturcture
mongoose.connect('mongodb://127.0.0.1/vidly')
.then(() => console.log('Connected to MongoDB...'))
//create database with a document for each genre designing their sturcture
mongoose.connect('mongodb://127.0.0.1/vidly')
.then(() => console.log('Connected to MongoDB...'))
.catch(err => console.log('Failed to connect to MongoDB...\n' + err));
app.use(express.json());
app.use(logger.log);
app.use(logger.auth);
app.use(express.static('public'));

app.use(express.json());
app.use(logger.log);
app.use(logger.auth);
app.use(express.static('public'));
app.use('/api/genres', genres);
app.use('/api/customers', customers);
app.use('/', home);
console.log(app.get('env'));
app.use(helmet());
app.use('/api/customers', customers);
app.use('/', home);
console.log(app.get('env'));
app.use(helmet());
app.set('view engine', 'pug');
app.set('views', './views');
if(app.get('env') === 'development'){
app.use(morgan('tiny'));
debug('Morgan enabled...', );
}
//console.log('App name:' + config.get('name'));
//console.log('Mail: ' + config.get('mail.host'));
//console.log('password: ' + config.get('mail.password'));
app.listen(port, () => console.log(`Listening on port ${port}`));
app.set('views', './views');
if (app.get('env') === 'development') {
app.use(morgan('tiny'));
debug('Morgan enabled...',);
}
//console.log('App name:' + config.get('name'));
//console.log('Mail: ' + config.get('mail.host'));
//console.log('password: ' + config.get('mail.password'));




app.listen(port, () => console.log(`Listening on port ${port}`));
24 changes: 24 additions & 0 deletions my-react-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
8 changes: 8 additions & 0 deletions my-react-app/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
38 changes: 38 additions & 0 deletions my-react-app/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import js from '@eslint/js'
import globals from 'globals'
import react from 'eslint-plugin-react'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'

export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
settings: { react: { version: '18.3' } },
plugins: {
react,
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
...reactHooks.configs.recommended.rules,
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
13 changes: 13 additions & 0 deletions my-react-app/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/tk.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>TicketMaster</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
Loading