Merge pull request #38 from DushanSenadheera/dev

setup docker composer

README.md

@@ -17,7 +17,7 @@ Navigate to the project directory
 ```bash
 cd project_rover
 ```
-Install the dependencies
+Install the server & client dependencies in relevent directories
 ```bash
 npm install
 ```

client/.dockerignore

@@ -0,0 +1 @@
+node_modules

client/Dockerfile

@@ -0,0 +1,18 @@
+# Base image for client
+FROM node:alpine
+
+WORKDIR /app/client
+
+# Install client dependencies
+COPY ./package.json .
+COPY ./package-lock.json .
+RUN npm install
+
+# Copy client source code
+COPY ./ .
+
+# Expose port
+EXPOSE 8000
+
+# Set entry point
+CMD ["npm", "run", "dev"]

client/src/components/Contact/Contact.tsx

@@ -10,7 +10,7 @@ import {
   } from '@mantine/core';
   import { IconBrandTwitter, IconBrandYoutube, IconBrandInstagram } from '@tabler/icons-react';
   import { ContactIconsList } from './ContactIcon';
-  import classes from './Contact.module.scss';
+  import classes from './contact.module.scss';
 
   const social = [IconBrandTwitter, IconBrandYoutube, IconBrandInstagram];
 

client/vite.config.ts

@@ -4,4 +4,12 @@ import react from '@vitejs/plugin-react-swc'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
+  server: {
+    watch: {
+      usePolling: true,
+    },
+    host: true,
+    port: 3000,
+    strictPort: true,
+  }
 })

compose.yml

@@ -0,0 +1,21 @@
+version: '3'
+services:
+  server:
+    build: ./server
+    ports:
+      - 8000:8000
+    networks:
+      - mynetwork
+
+  client:
+    build: ./client
+    ports:
+      - 3000:3000
+    networks:
+      - mynetwork
+    depends_on:
+      - server
+
+networks:
+  mynetwork:
+    driver: bridge

localhost.sh

@@ -12,4 +12,4 @@ cd ../client
 npm run dev
 
 # Once the client has finished, kill the server
-kill $server_pid
+kill $server_pid

server/.dockerignore

@@ -0,0 +1 @@
+node_modules

server/Dockerfile

@@ -0,0 +1,18 @@
+# Base image for server
+FROM node:alpine
+
+WORKDIR /app/server
+
+# Install server dependencies
+COPY ./package.json .
+COPY ./package-lock.json .
+RUN npm install
+
+# Copy server source code
+COPY ./ .
+
+# Expose ports
+EXPOSE 3000
+
+# Set entry point
+CMD ["npm", "start"]

server/index.js

@@ -17,6 +17,10 @@ app.use('/', foodRoute)
 app.use('/', stayRoute)
 app.use('/', locationRoute)
 
+app.get('/', (req, res) => {
+    res.send('Welcome to Rover API')
+})
+
 app.listen(process.env.PORT, () => {
     console.log(`server is listening on port ${process.env.PORT}!`)
 })