Skip to content

2
2022-066
Commit 07e711e3 authored by Pasqual N. T.'s avatar Pasqual N. T. 🗿
Browse files
Options

Merge branch 'IT19408316' into 'master' 

updated folder structures

See merge request 2022-066/evsdh!2
parents 17dddb66 e3fa89b0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1108 additions and 331 deletions
Backend/Node/server.js
View file @ 07e711e3
...@@ -3,16 +3,11 @@ const mongoose = require('mongoose'); ...@@ -3,16 +3,11 @@ const mongoose = require('mongoose');
const dotenv = require('dotenv'); const dotenv = require('dotenv');
const cors = require('cors'); const cors = require('cors');
const bodyParser = require('body-parser'); const bodyParser = require('body-parser');
const SiteRoute = require('./src/routes/route.site');
const SupplierRoute = require('./src/routes/route.supplier');
dotenv.config(); dotenv.config();
const app = express(); const app = express();
app.use(cors()); app.use(cors());
//
// parse requests of content-type - application/json // parse requests of content-type - application/json
app.use(bodyParser.json()); app.use(bodyParser.json());
// parse requests of content-type - application/x-www-form-urlencoded // parse requests of content-type - application/x-www-form-urlencoded
...@@ -44,17 +39,12 @@ mongoose.connection.once('open', () => { ...@@ -44,17 +39,12 @@ mongoose.connection.once('open', () => {
}); });
app.route('/').get((req, res) => { app.route('/').get((req, res) => {
res.send('CSSE Group Project'); res.send('Research Project');
}); });
require('./src/routes/auth.routes')(app); require('./src/routes/auth.routes')(app);
require('./src/routes/user.routes')(app); require('./src/routes/user.routes')(app);
app.use('/site', SiteRoute());
app.use('/supplier', SupplierRoute());
app.listen(PORT, () => { app.listen(PORT, () => {
console.log('######################################################'); console.log('######################################################');
console.log(`Server is ON and running on PORT : ${PORT}`); console.log(`Server is ON and running on PORT : ${PORT}`);
......
Backend/Node/src/controllers/controller.site.js deleted 100644 → 0
View file @ 17dddb66
const Site = require('../modules/module.site');
const {next} = require("lodash");
const createSite = (req, res) => {
const {siteID,name,location} = req.body
// validate fields
if(!siteID || !name || !location) {
return res.status(400).json({
error: "All fields are required"
});
}
Site.create({siteID,name,location},(err,name) => {
if(err) {
return res.status(400).json({
error: 'Error Found'
});
}
res.json(name);
});
}
const getAllSites = (req, res) => {
let order = req.query.order ? req.query.order : 'asc'
let sortBy = req.query.sortBy ? req.query.sortBy : '_id'
Site.find()
.sort([[sortBy, order]])
.exec((err, site) => {
if(err) {
return res.status(400).json ({
error: 'No data Found'
});
}
res.json(site);
});
}
const siteById = async (req, res) => {
Site.findById(req.params.id, (error, data) =>{
if (error) {
return next(error)
} else {
res.json(data)
}
})
};
const updateById = async(req, res) => {
const { slug } = req.params
const {siteID,name,location} = req.body
Site.findOneAndUpdate({slug}, {siteID,name,location}, {new: true})
.exec((err,site) => {
if(err) console.log(err)
res.json(site);
})
};
const deleteById = async (req, res) => {
const id = req.params.id
await Site.findByIdAndRemove(id).exec()
res.send("Deleted");
};
const countSites = (req, res) => {
Site.count({ }, function(err, result) {
if (err) {
res.send(err);
} else {
res.json(result);
}
});
};
module.exports = {
createSite,
siteById,
getAllSites,
updateById,
deleteById,
countSites
}
\ No newline at end of file
Backend/Node/src/controllers/controller.supplier.js deleted 100644 → 0
View file @ 17dddb66
const Supplier = require('../modules/module.supplier');
const {next} = require("lodash");
const createSupplier = (req, res) => {
const {supplierID,name,address,contactNo} = req.body
// validate fields
if(!supplierID || !name || !address || !contactNo) {
return res.status(400).json({
error: "All fields are required"
});
}
Supplier.create({supplierID,name,address,contactNo},(err,name) => {
if(err) {
return res.status(400).json({
error: 'Error Found'
});
}
res.json(name);
});
}
const getAllSuppliers = (req, res) => {
let order = req.query.order ? req.query.order : 'asc'
let sortBy = req.query.sortBy ? req.query.sortBy : '_id'
Supplier.find()
.sort([[sortBy, order]])
.exec((err, supplier) => {
if(err) {
return res.status(400).json ({
error: 'No data Found'
});
}
res.json(supplier);
});
}
const siteById = async (req, res) => {
Supplier.findById(req.params.id, (error, data) =>{
if (error) {
return next(error)
} else {
res.json(data)
}
})
};
const updateById = async(req, res) => {
const { slug } = req.params
const {supplierID,name,address,contactNo} = req.body
Supplier.findOneAndUpdate({slug}, {supplierID,name,address,contactNo}, {new: true})
.exec((err,supplier) => {
if(err) console.log(err)
res.json(supplier);
})
};
const deleteById = async (req, res) => {
const id = req.params.id
await Supplier.findByIdAndRemove(id).exec()
res.send("Deleted");
};
const countSuppliers = (req, res) => {
Supplier.count({ }, function(err, result) {
if (err) {
res.send(err);
} else {
res.json(result);
}
});
};
module.exports = {
createSupplier,
siteById,
getAllSuppliers,
updateById,
deleteById,
countSuppliers
}
\ No newline at end of file
Backend/Node/src/modules/module.site.js deleted 100644 → 0
View file @ 17dddb66
const mongoose = require('mongoose');
const { ObjectId } = mongoose.Schema;
const SiteSchema = new mongoose.Schema(
{
siteID: {
type: String,
required: true,
trim: true,
min: 1,
max: 50
},
name: {
type: String,
required: true,
trim: true,
min: 1,
max: 50
},
location : {
type: String,
required: true,
trim: true,
min: 1,
max: 50
}
},
{ timestamps: true}
);
module.exports = mongoose.model('sites', SiteSchema);
\ No newline at end of file
Backend/Node/src/modules/module.supplier.js deleted 100644 → 0
View file @ 17dddb66
const mongoose = require('mongoose');
const { ObjectId } = mongoose.Schema;
const SupplierSchema = new mongoose.Schema(
{
supplierID: {
type: String,
required: true,
trim: true,
min: 1,
max: 50
},
name: {
type: String,
required: true,
trim: true,
min: 1,
max: 50
},
address : {
type: String,
required: true,
trim: true,
min: 1,
max: 50
},
contactNo : {
type: String,
required: true,
trim: true,
min: 1,
max: 50
}
},
{ timestamps: true}
);
module.exports = mongoose.model('suppliers', SupplierSchema);
\ No newline at end of file
Backend/Node/src/routes/route.site.js deleted 100644 → 0
View file @ 17dddb66
const express = require('express');
const router = express.Router();
const controller = require('../controllers/controller.site');
module.exports = function () {
router.post('/create', controller.createSite);
router.get('/', controller.getAllSites);
router.get('/:id', controller.siteById);
router.delete('/delete/:id', controller.deleteById);
router.put('/update/:id', controller.updateById);
router.get('/sites/count', controller.countSites);
return router;
}
\ No newline at end of file
Backend/Node/src/routes/route.supplier.js deleted 100644 → 0
View file @ 17dddb66
const express = require('express');
const router = express.Router();
const controller = require('../controllers/controller.supplier');
module.exports = function () {
router.post('/create', controller.createSupplier);
router.get('/', controller.getAllSuppliers);
router.get('/:id', controller.siteById);
router.delete('/delete/:id', controller.deleteById);
router.put('/update/:id', controller.updateById);
router.get('/suppliers/count', controller.countSuppliers);
return router;
}
\ No newline at end of file
frontend/package-lock.json
View file @ 07e711e3
This diff is collapsed.
frontend/package.json
View file @ 07e711e3
...@@ -9,7 +9,13 @@ ...@@ -9,7 +9,13 @@
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-scripts": "5.0.0", "react-scripts": "5.0.0",
"web-vitals": "^2.1.4" "web-vitals": "^2.1.4",
"axios": "^0.21.4",
"bootstrap": "^5.1.1",
"react-bootstrap-validation": "^0.1.11",
"react-router-dom": "^5.3.0",
"react-select": "^5.0.0",
"react-validation": "^3.0.7"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
......
frontend/src/App.css
View file @ 07e711e3
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
frontend/src/App.js
View file @ 07e711e3
import logo from './logo.svg'; import PageRoutes from "./routes/pageRoutes";
import './App.css';
function App() { function App() {
return ( return (
<div className="App"> <div className="App">
<header className="App-header"> <PageRoutes/>
<img src={logo} className="App-logo" alt="logo" />
<p>
Development in Progress
</p>
</header>
</div> </div>
); );
} }
......
frontend/src/index.css
View file @ 07e711e3
...@@ -7,7 +7,10 @@ body { ...@@ -7,7 +7,10 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
code { code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace; monospace;
} }
frontend/src/index.js
View file @ 07e711e3
...@@ -11,7 +11,4 @@ ReactDOM.render( ...@@ -11,7 +11,4 @@ ReactDOM.render(
document.getElementById('root') document.getElementById('root')
); );
// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals(); reportWebVitals();
frontend/src/logo.svg deleted 100644 → 0
View file @ 17dddb66
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
\ No newline at end of file
frontend/src/main/home.js 0 → 100644
View file @ 07e711e3
import React, {Component} from 'react';
class Home extends Component {
render() {
return (
<div>
welcome
</div>
)
}
}
export default Home;
\ No newline at end of file
frontend/src/routes/pageRoutes.js 0 → 100644
View file @ 07e711e3
import React from 'react';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
//import pages
import Home from "../main/home";
function PageRoutes() {
return (
<div>
<Router>
<section className="content">
<Switch>
<Route path="/" component={Home} exact/>
</Switch>
</section>
</Router>
</div>
);
}
export default PageRoutes;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment