Merge pull request #6 from oslabs-beta/ahsan-branch

Fixed tutorial and added production file static path

Author: BenCauffman

app/src/components/top/NavBar.tsx

@@ -173,6 +173,18 @@ const NavBar = (props) => {
           >
             ReacType
           </Typography>
+          <Link to="/tutorial" style={{ textDecoration: 'none' }}>
+          <Button
+            variant="contained"
+            color="secondary"
+            style={{ minWidth: '137.69px' }}
+            onClick={clearWorkspace}
+            className="navbarButton"
+            id="navbarButton"
+          >
+            Tutorial
+          </Button>
+          </Link>
           {/* ==================================Dashboard Button================================================== */}
           {state.isLoggedIn ? (
             <Link to="/dashboard" style={{ textDecoration: 'none' }}>

app/src/public/styles/style.css

@@ -14,7 +14,7 @@ body {
   margin: 0;
   padding: 0;
   font-family: 'Roboto','Raleway', sans-serif;
-  font-size: 0.8 em;
+  font-size: 0.9 em;
   font-weight: 400;
   overflow: hidden;
 }

app/src/tutorial/Tutorial.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Card from '@material-ui/core/Card';
+import CardContent from '@mui/material/CardContent';
 import CardActions from '@material-ui/core/CardActions';
 import Typography from '@material-ui/core/Typography';
 import Container from '@material-ui/core/Container';

package.json

@@ -162,6 +162,7 @@
     "js-cookie": "^3.0.1",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
+    "mongoose": "^5.9.22",
     "node-fetch": "^2.6.1",
     "passport": "^0.6.0",
     "passport-github2": "^0.1.12",
@@ -228,7 +229,7 @@
     "jest-environment-jsdom": "^28.1.3",
     "mini-css-extract-plugin": "^0.9.0",
     "mongodb": "^3.5.9",
-    "mongoose": "^5.9.22",
+
     "node-sass": "^7.0.1",
     "nodemon": "^2.0.19",
     "react": "^17.0.2",

server/server.js

@@ -188,6 +188,17 @@ app.delete(
   (req, res) => res.status(200).json(res.locals.deleted)
 );
 
+
+//if in production mode, statically serve everything in the build folder on the route '/dist'
+if (process.env.NODE_ENV == 'production'){
+  app.use('/dist', express.static(path.join(__dirname, '../dist')));
+
+// serve index.html on the route '/'
+  app.get('/', (req, res) => {
+    return res.status(200).sendFile(path.join(__dirname, '../index.html'));
+});
+}
+
 app.get('/', function(req, res) {
   res.send('Houston, Caret is in orbit!');
 });