Merge branch 'Development'

Dockerfile

@@ -5,8 +5,7 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
     nodejs \
   && apt-get upgrade -qq \
   && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && npm install -g yarn@1
+  && rm -rf /var/lib/apt/lists/*
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 # RUN bundle config --global frozen 1
@@ -14,6 +13,10 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
+RUN curl -sL https://deb.nodesource.com/setup_12.x  | bash -
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
 RUN apt-get update && apt-get install -y nodejs --no-install-recommends && rm -rf /var/lib/apt/lists/*
 RUN apt-get update && apt-get install -y default-mysql-client postgresql-client sqlite3 yarn --no-install-recommends && rm -rf /var/lib/apt/lists/*
 #RUN gem install bundler -v 1.17.3
@@ -25,7 +28,10 @@ COPY Gemfile.lock /usr/src/app/
 RUN bundle install
 RUN bundle exec rails assets:precompile
 
-COPY . /usr/src/app
+COPY package.json /usr/src/app/
+RUN npm install
+
+COPY . /usr/src/app/
 
 # COPY entrypoint.sh /usr/bin/
 # RUN chmod +x /usr/bin/entrypoint.sh

README.md

 # Group 10 Habit Tracker Web App
 ### How to run it?
+#### Docker:
 1. Make sure docker is installed
 2. Clone the repository
 3. cd into root repository
@@ -9,3 +10,9 @@
 [![docker-compose up](https://gitlab.eps.surrey.ac.uk/group-10/habit-tracker-web-app/-/wikis/uploads/1b0c612ebe165e45fe7f0c071e55bfe3/image.png "docker-compose up")](https://gitlab.eps.surrey.ac.uk/group-10/habit-tracker-web-app/-/wikis/uploads/1b0c612ebe165e45fe7f0c071e55bfe3/image.png "docker-compose up")
 6. Access the website on  localhost:3000 or 127.0.0.1:3000.
 7. For some machines (especially when using Windows) site might be running on another ip, to find it run `docker-machine ip default`
+
+NOTE: This process was tested on Docker for Windows and might change depending on your platform.
+#### Alternatively (rails server):
+ Run as normal rails application with `bundle install` and `rails server`
+#### Alternatively (visit deployed version):
+[Use this link to access our site on Heroku](hthttps://group-ten-habits-deployment.herokuapp.com/#_=_tp:// "Use this link to access our site on Heroku")

package.json

 {
   "name": "Group10HabitTracker",
   "private": true,
+  "scripts": {
+    "start": "webpack-dev-server --host 0.0.0.0 --inline --content-base ."
+  },
   "dependencies": {
     "@babel/preset-react": "^7.12.13",
     "@fontsource/roboto": "^4.2.2",
@@ -14,7 +17,7 @@
     "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "webpack": "^4.4.0",
+    "webpack": "^4.46.0",
     "webpack-dev-server": "^3.11.2"
   },
   "devDependencies": {