fixed names, added reset.css

krlenell · krlenell · commit 8184fdb79696 · 2021-05-04T15:57:07.000-07:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A sample boilerplate that has the [postgres movie rental database](https://www.postgresqltutorial.com/postgresql-sample-database/) to play with.
 
-Requires Docker.
+Requires Docker for use of PostgreSQL.
 
 To use:
 
diff --git a/dist/index.html b/dist/index.html
@@ -3,6 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" href="reset.css">
   <link rel="stylesheet" href="style.css">
   <title>Boilerplate</title>
 </head>
diff --git a/dist/reset.css b/dist/reset.css
@@ -0,0 +1,7 @@
+* {
+  box-sizing: border-box;
+}
+
+body{
+  margin: 0;
+}
diff --git a/dist/style.css b/dist/style.css
@@ -1,3 +1,4 @@
+/* You can get rid of all this, it is just for testing */
 body{
   display: flex;
   justify-content: center;
diff --git a/index.js b/index.js
@@ -13,6 +13,7 @@ app.use(staticMiddleware);
 
 app.use(express.json());
 
+// Feel free to delete these tests once you've gotten things working
 app.get('/api/test', (req, res) => {
   res.status(200).json({ success: 'Server test successful' });
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/webpack.config.js b/webpack.config.js
@@ -2,16 +2,16 @@
 require('dotenv/config');
 const path = require('path');
 
-const clientPath = path.join(__dirname, 'src/');
-const publicPath = path.join(__dirname, 'dist/');
+const srcPath = path.join(__dirname, 'src/');
+const distPath = path.join(__dirname, 'dist/');
 
 module.exports = {
   resolve: {
     extensions: ['.js', '.jsx']
   },
-  entry: clientPath,
+  entry: srcPath,
   output: {
-    path: publicPath
+    path: distPath
   },
   module: {
     rules: [
@@ -24,7 +24,7 @@ module.exports = {
   },
   devtool: 'source-map',
   devServer: {
-    contentBase: publicPath,
+    contentBase: distPath,
     port: process.env.DEV_SERVER_PORT,
     proxy: {
       '/api': `http://localhost:${process.env.PORT}`

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +* {
 +  box-sizing: border-box;
 +}
++
 +body{
 +  margin: 0;
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* You can get rid of all this, it is just for testing */`
`1`	`2`	`body{`
`2`	`3`	`display: flex;`
`3`	`4`	`justify-content: center;`