diff --git a/package.json b/package.json
index 54b8c5e..3dbeeb9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "start": "node server",
     "server": "nodemon server",
     "client": "npm start --prefix client --trace-depracation",
-    "dev": "concurrently \"npm run server\" \"npm run client\""
+    "dev": "concurrently \"npm run server\" \"npm run client\"",
+    "heroku-postbuild":"NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
   },
   "author": "",
   "license": "ISC",
diff --git a/server.js b/server.js
index 8b5ec56..0a1793a 100644
--- a/server.js
+++ b/server.js
@@ -1,16 +1,23 @@
 const express = require('express');
 const connectDB= require('./config/db')
+const path = require('path')
 const app = express();
 
 connectDB();
 
 app.use(express.json({extended:false}));
-app.get('/',(req,res)=> res.send('API Running'));
 
 app.use('/api/users', require('./routers/api/users'))
 app.use('/api/auth', require('./routers/api/auth'))
 app.use('/api/profile', require('./routers/api/profile'))
 app.use('/api/posts', require('./routers/api/posts'))
+// Serve static assets in production
+if (process.env.NODE_ENV==='production'){
+    app.use(express.static('client/build'));
+    app.get('*',(req, res)=>[
+        res.sendFile(path.resolve(__dirname, 'client', 'build','index.html'))
+    ])
+}
 const PORT = process.env.PORT || 5000;
 
 app.listen(PORT,()=> console.log(`Server started on port ${PORT}`));
\ No newline at end of file