Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
51d16ba
Merge pull request #9 from OFO323/patch-3
akwon20 Nov 21, 2020
11d9fbe
Began back-end; currently working on queries
Nov 23, 2020
5e6df11
Created software page route for requests
OFO323 Nov 23, 2020
3a624a9
Update main.js
OFO323 Nov 23, 2020
ce93380
Merge pull request #10 from OFO323/patch-4
akwon20 Nov 23, 2020
62c5469
Cleaning up copy files
akwon20 Dec 6, 2020
e552d6d
Cleaning up copy files
akwon20 Dec 6, 2020
c092650
Cleaning up copy files
akwon20 Dec 6, 2020
beead11
Cleaning up copy files
akwon20 Dec 6, 2020
0e9ffa2
Delete queries.sql
akwon20 Dec 6, 2020
c0d070b
Delete relTables.sql
akwon20 Dec 6, 2020
341e717
Delete tst.js
akwon20 Dec 6, 2020
647e9bc
Delete view.html
akwon20 Dec 6, 2020
5d3c282
added software.js to routes
Dec 6, 2020
3aae6c9
Added home.js to pages in client
Dec 6, 2020
108acc9
Merge branch 'phase2' of https://github.com/akwon20/CSE111_Project in…
Dec 6, 2020
5bfee86
Delete relate.sqlite
akwon20 Dec 6, 2020
9d79add
Delete logger.js
akwon20 Dec 6, 2020
ce24a1f
Delete main.html
akwon20 Dec 6, 2020
a676bb8
Delete style.css
akwon20 Dec 6, 2020
b0eb295
Delete products.js
akwon20 Dec 6, 2020
9205f20
added view for tracking new products
OFO323 Dec 6, 2020
757fad5
Update relTables.sql
OFO323 Dec 6, 2020
7a1c47c
Merge pull request #12 from OFO323/patch-6
akwon20 Dec 6, 2020
c66ae1f
Merge pull request #13 from OFO323/patch-7
akwon20 Dec 6, 2020
6ce1de6
Started process of pulling data
OFO323 Dec 7, 2020
32a9e4b
Hardware page
OFO323 Dec 7, 2020
b8dc3d6
added Routers to pages
OFO323 Dec 7, 2020
d23a5af
Merge pull request #14 from OFO323/patch-8
akwon20 Dec 7, 2020
eebcb6d
Added bootstrap import
Dec 7, 2020
aa30355
Merge branch 'phase2' of https://github.com/akwon20/CSE111_Project in…
Dec 7, 2020
1a7bc61
Linked buttons to navigate
Dec 7, 2020
8ac6bf3
Fine-tuned select queries in all routes to search by keywords
Dec 8, 2020
b2229d5
Update s_Page.js
OFO323 Dec 8, 2020
8a0bbe4
Update software.js
OFO323 Dec 8, 2020
896ad08
added route to software queries
OFO323 Dec 8, 2020
937c9ac
Added more queries to hardware and software routes
Dec 8, 2020
3e01f24
Merge pull request #15 from OFO323/patch-9
akwon20 Dec 8, 2020
1bdd43a
Merged with Rodlfo's changes; Updated s_Page.js
Dec 8, 2020
50b5b27
Attempted to use axios to fetch db; got nowhere; added possible trigg…
Dec 9, 2020
a6b8a74
Pushing attempts on hardware page; added possible triggers to queries…
Dec 9, 2020
efa8d8b
Merge branch 'main' into phase2
akwon20 Dec 9, 2020
c63006a
Merge pull request #16 from akwon20/phase2
akwon20 Dec 9, 2020
cd05327
Add files via upload
OFO323 Dec 11, 2020
cc3aab6
Update h_Page.js
OFO323 Dec 11, 2020
a1dfe5c
Update s_Page.js
OFO323 Dec 11, 2020
9d91ef2
Update App.js
OFO323 Dec 11, 2020
9768dde
Merge branch 'main' into patch-8
OFO323 Dec 11, 2020
7e9f18e
Update products.js
OFO323 Dec 11, 2020
ea9c89c
Update home.js
OFO323 Dec 11, 2020
e01c9c1
Update h_Page.js
OFO323 Dec 11, 2020
41141ba
Update prod_Page.js
OFO323 Dec 11, 2020
389f770
Update s_Page.js
OFO323 Dec 11, 2020
ebc36da
Add files via upload
OFO323 Dec 11, 2020
fb8db42
Update App.js
OFO323 Dec 11, 2020
82cd98c
Update products.js
OFO323 Dec 11, 2020
b6442ec
Update queries.sql
OFO323 Dec 11, 2020
93bfa3f
Update relTables.sql
OFO323 Dec 11, 2020
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions api/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# CSE111_Project
File renamed without changes.
30 changes: 16 additions & 14 deletions main.js → api/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/*
Notes:
- Download postman to check data being sent to and from our server port
- review js DB lecture
routes completed

Next Steps:
-Start Design of 4 pages [main page [w/searchbar], product caetgory pages [2 Pages : software page/harware page], and product info page]
-look into how react use react to create page that interfaces with DB
*/

// Express server components
Expand All @@ -11,6 +13,8 @@ const app = express();

const sqlite3 = require('sqlite3').verbose();

const cors = require("cors");

//path module helps locate directories for file reads/transfers
const path = require('path');

Expand All @@ -36,7 +40,7 @@ let db = new sqlite3.Database('./data/relate.sqlite', sqlite3.OPEN_READWRITE, (e
//makes folder 'public' static so easily accessible may get
//may need to delete once new routes are created
app.use(express.static(path.join(__dirname, 'public')));

app.use(cors()); //enables cross origin requests
app.use(express.json()); //can now handle raw json data (will use testing requests later)
app.use(express.urlencoded({extended : false})); // can now handle encoded url data (values in url request)
//purpose of this is that it can now interpret json and url data to input new values w/ post function
Expand All @@ -46,18 +50,16 @@ app.use(express.urlencoded({extended : false})); // can now handle encoded url d
app.use(logger);

//allows for use of router to functions in 'products' file / can now be accessed through requests on localhost:5000/api/products
app.use('/api/products').require('./routes/api/products');
var productsRouter = require('./routes/products');
var hardwareRouter = require('./routes/hardware');
var softwareRouter = require('./routes/software');

//express listen on port and report success message
app.listen(PORT, () => console.log(`Server started in port: ${PORT}`));

app.use('/routes/products', productsRouter);
app.use('/routes/hardware', hardwareRouter);
app.use('/routes/software', softwareRouter);

//access main page
// app.get('/', (req, res) => {
// res.sendFile(path.join(__dirname, 'public', 'main.html'));

//express listen on port and report success message
app.listen(PORT, () => console.log(`Server started in port: ${PORT}`));

// Test method (check for outputs on webpage)
// app.get('/', (req, res) => {
// res.send('<h1>Hello World</h1>');
// });
File renamed without changes.
1 change: 1 addition & 0 deletions api/node_modules/.bin/atob

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/detect-libc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/ejs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/is-ci

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/jake

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/knex

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/mime

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/mkdirp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/needle

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/node-gyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/node-pre-gyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/nodemon

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/nodetouch

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/nopt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/rc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/rimraf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/semver

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/sshpk-conv

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/sshpk-sign

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/sshpk-verify

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/uuid

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/node_modules/.bin/which

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

132 changes: 132 additions & 0 deletions api/node_modules/@sindresorhus/is/dist/index.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading