Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f80ecfe
merging initializeProject branch
NinaCL2049 Jun 26, 2024
9b6575e
Merge pull request #1 from NinaCL2049/initializeProject
JonasNon Jun 27, 2024
9ab8e8d
express set up complete, server running
cyberkatrina Jun 28, 2024
a18f5d0
Merge pull request #2 from JonasNon/katrina1
JonasNon Jun 28, 2024
02aed6e
set up router file
eflaatten Jun 28, 2024
83c5cb4
Merge pull request #3 from JonasNon/eflaatten
eflaatten Jun 28, 2024
593bf38
getEmployees controller func.
eflaatten Jun 28, 2024
df7cbe4
added router for controller func
eflaatten Jun 28, 2024
5bb1a67
Merge pull request #4 from JonasNon/eflaatten
eflaatten Jun 28, 2024
d5044d0
mySQL connection finished
cyberkatrina Jun 28, 2024
c2bbd37
Merge branch 'master' into katrina2
cyberkatrina Jun 28, 2024
acf4ab4
Merge pull request #5 from JonasNon/katrina2
cyberkatrina Jun 28, 2024
9921e7a
added sql functions for get all employees and by id
JonasNon Jun 28, 2024
f384c3b
Merge pull request #6 from JonasNon/Jonas!
JonasNon Jun 28, 2024
c2c69eb
found typo
JonasNon Jun 28, 2024
ec3120d
Merge pull request #7 from JonasNon/fixingMyTypo
JonasNon Jun 28, 2024
7eaf478
removed things that were breaking it
JonasNon Jun 28, 2024
293aef2
Merge pull request #8 from JonasNon/Jonassss
JonasNon Jun 28, 2024
84e87f2
added get employee by id
JSingleton81 Jun 28, 2024
e94c293
route for get employee first name
JSingleton81 Jun 28, 2024
32cae2c
Merge pull request #10 from JonasNon/josephEmployeesById
JonasNon Jun 30, 2024
084f7f7
Merge branch 'master' into josephGetEmployeeByName
cyberkatrina Jun 30, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
node_modules
.env
29 changes: 29 additions & 0 deletions controller/employees.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const mysql = require('mysql')
const pool = require('../mysql/connection') //update this folder location when its made



const getEmployees = (req, res) => {
pool.query("SELECT * FROM employees LIMIT 50", (err, rows) => {
// if (err) return handleSQLError(res, err)
return res.json(rows);
})
}

const getEmployeeById = (req, res) => {
let sql = "SELECT * FROM employees WHERE emp_no = ?"
let id = req.params.id
sql = mysql.format(sql, [id])

pool.query(sql, (err, rows) => {
// if (err) return handleSQLError(res, err)
return res.json(rows);
})
}


const getEmployeeByFirstName = (req, res) => {
res.send("getting getEmployeeByFirstName")
}

module.exports = { getEmployees, getEmployeeById, getEmployeeByFirstName }
22 changes: 22 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const express = require("express");
const bodyParser = require("body-parser");

const pool = require('./mysql/connection')

const employeesRouter = require('./routes/employees')


const app = express();
const port = process.env.PORT || 4001;

app.use(bodyParser.json())
app.use('/employees', employeesRouter)


app.get('/', (req, res) => {
res.send('Welcome to our server!')
})

app.listen(port, () => {
console.log(`Web server is listening on port ${port}!`);
});
31 changes: 31 additions & 0 deletions mysql/connection.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
const mysql = require('mysql')
require('dotenv').config()

const host = process.env.HOST
const username = process.env.USERNAME
const password = process.env.PASSWORD
const database = process.env.DATABASE

class Connection {
constructor() {
if (!this.pool) {
console.log('creating connection...')
console.log(host, username, password, database)
this.pool = mysql.createPool({
connectionLimit: 100,
host: host,
user: username,
password: password,
database: database
})
console.log("success")
return this.pool
}

return this.pool
}
}

const instance = new Connection()

module.exports = instance;
Loading