Merge branch 'master' of https://github.com/Star-Nosed-Mole/Bubble-Stack

.gitignore

@@ -1,2 +1,3 @@
 /node_modules
 .vscode
+.env

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "scratch-og",
+  "name": "bubble-stack",
   "version": "1.0.0",
-  "description": "scratch",
-  "main": "index.js",
+  "description": "bubble-stack",
+  "main": "index.ts",
   "scripts": {
     "start": "cross-env NODE_ENV=production webpack & cross-env NODE_ENV=production nodemon server/server.js",
     "server": "cross-env NODE_ENV=production webpack",
@@ -21,6 +21,7 @@
   "homepage": "https://github.com/Star-Nosed-Mole/Scratch#readme",
   "dependencies": {
     "@nivo/circle-packing": "^0.62.0",
+    "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "npm-stats-api": "^1.1.3",
     "pg": "^8.3.0",

server/controllers/stackControllers.js

@@ -0,0 +1,41 @@
+const db = require('../models/stackModels');
+const { stack } = require('../routes/api');
+
+const stackController = {};
+
+
+stackController.getAll = (req, res, next) => {
+
+    const queryAll = `SELECT libraries.name, types.name AS type, framework.name AS framework FROM libraries 
+                    INNER JOIN types ON libraries.type_id = types.type_id
+                    INNER JOIN framework ON libraries.framework_id = framework.framework_id;`;
+
+    db.query(queryAll)
+    .then(data=> {
+        res.locals.all = data.rows;
+        return next();
+    })
+    .catch((err) => {
+        return next(err);
+    });
+}
+
+
+stackController.findOne = (req, res, next) => {
+    const name = req.body.name;
+    const queryOne = `SELECT libraries.name, types.name AS type, framework.name AS framework FROM libraries 
+                        INNER JOIN types ON libraries.type_id = types.type_id
+                        INNER JOIN framework ON libraries.framework_id = framework.framework_id
+                        WHERE libraries.name = '${name}'; `;
+    db.query(queryOne)
+    .then(data=> {
+        console.log(data.rows);
+        res.locals.one = data.rows[0];
+        return next();
+    })
+    .catch((err) => {
+        return next(err);
+    });
+}
+
+module.exports = stackController;

server/models/stackModels.js

@@ -0,0 +1,19 @@
+// import PG_URI from '../../.env';
+const { Pool } = require('pg');
+
+require("dotenv").config();
+
+// create a new pool here using the connection string above
+const pool = new Pool({
+  connectionString: process.env.PG_URI
+});
+
+// We export an object that contains a property called query,
+// which is a function that returns the invocation of pool.query() after logging the query
+// This will be required in the controllers to be the access point to the database
+module.exports = {
+  query: (text, params, callback) => {
+    console.log('executed query', text);
+    return pool.query(text, params, callback);
+  }
+};

server/routes/api.js

@@ -0,0 +1,19 @@
+const express = require('express');
+const modelsController = require('../controllers/stackControllers');
+const router = express.Router();
+
+
+router.get('/',
+modelsController.getAll,
+ (req, res) => {
+  res.status(200).json(res.locals.all);
+  });
+
+router.post('/one',
+modelsController.findOne,
+ (req, res) => {
+  res.status(200).json(res.locals.one);
+  });
+
+module.exports = router;
+

server/server.js

@@ -3,17 +3,19 @@ const express = require('express');
 const app = express();
 
 const path = require('path');
+const PORT = 3000;
+const apiRouter = require('./routes/api');
 
-const PORT = 3000
+app.use(express.json());
 
-app.use(express.json())
-// app.use('/', express.static('client')); 
-// app.use('/build', express.static(path.join(__dirname, '../build')));
 // statically serve everything in the build folder on the route '/build
 if (process.env.NODE_ENV === 'production') {
     app.use('/', express.static('client')); 
     app.use('/build', express.static(path.join(__dirname, '../build')));
   }
+
+app.use('/api', apiRouter);
+
 // global error handler
 app.use('*', (req,res) => res.sendStatus(404) )
 

tsconfig.json

@@ -10,4 +10,4 @@
     "exclude": [
       "node_modules"
     ]
-  }
+ }