Submission

.gitignore

@@ -0,0 +1,103 @@
+
+# Created by https://www.gitignore.io/api/osx,node,macos
+
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+secrets.env
+
+
+### OSX ###
+
+# Icon must end with two \r
+
+# Thumbnails
+
+# Files that might appear in the root of a volume
+
+# Directories potentially created on remote AFP share
+
+
+# End of https://www.gitignore.io/api/osx,node,macos

Procfile

@@ -0,0 +1 @@
+web: yarn start:prod

README.md

@@ -1,65 +1,84 @@
-# Your Project Name
+# ![](https://ga-dash.s3.amazonaws.com/production/assets/logo-9f88ae6c9c3871690e33280fcf557f33.png) Project 4 – TripCollab Expanded
 
-This is the starter code for WDI projects. Please update this README file with information specific to your project. Replace this paragraph for instance, with a short description of your project. Then update the sections below. Refer to your project specificaion for instructions on how to submit your projects.
+Our group is developing a website with a centralised, easy-to-use travel itinerary in a single view which can be collaborated and shared with travel friends making travel planning more fun without any hassle.
 
-## Getting Started
-
-Provide instructions here about how to get your project running on our local machine. Do we just need to clone and open a certain file or do we need to install anything first.
-
-### Prerequisites
+Live version: https://tripcollab-v2.herokuapp.com/
 
-What is needed to install and run the project, how do we install them
-
-```
-Code example
-```
+---
 
+## Getting Started
 ### How to Use
+* Fork and clone this repository.
+* Open terminal and run ```yarn install``` to install dependencies.
+* Run ```yarn start```.
 
-A step by step guide on how to install and use the project, for example if this is a game, how do we play it.
+---
 
+## Built With
+* Technologies: React, Node.js
+* Database: MongoDB
+* CSS Framework: Bootstrap 4.0
 
-```
-Code example
-```
+---
 
-More steps...
+## Deployment & Versioning
+* Github
+* Heroku
 
-```
-until finished
-```
+---
 
+## Workflow
+### Entity-Relationship Diagram
+![p4_erd](https://user-images.githubusercontent.com/31798170/36540300-cb5d74a6-1814-11e8-92b7-dd616885589a.png)
 
-## Tests
+---
 
-Did you write automated tests? If so, how do we run them.
+### User Stories
+![p4 user stories](https://user-images.githubusercontent.com/31798170/36518579-f591fde4-17c1-11e8-86fa-507fc7c83dca.png)
 
+---
 
-```
-Code example
-```
+### Use Case
+![p4 use case](https://user-images.githubusercontent.com/31798170/36517157-31ab1938-17bc-11e8-8c09-ffcb18f84878.png)
 
-## Live Version
+---
 
-Where is this deployed online (github pages, heroku etc), give us the link and any access details we need.
+### Flowchart
+![p4 flowchart](https://user-images.githubusercontent.com/31798170/36543397-9fb85cd0-181e-11e8-8d5b-a90f7354bb96.png)
 
-## Built With
+---
 
-What did you use to build it, list the technologies, plugins, gems, packages etc.
+### Wireframe
+![p4_wireframe](https://user-images.githubusercontent.com/31798170/36517183-58883ca2-17bc-11e8-90c0-e9d5028f26f0.png)
 
-* [jQuery](http://jquery.com/) - jQuery for example is something you likely used
+![wireframe](https://user-images.githubusercontent.com/31798170/36540329-e53e5174-1814-11e8-8fa0-f153f6e1f86f.png)
+---
 
-## Workflow
+# Scalable Areas
+* Share trip url via email.
+* Allow upvote and downvote on each location.
+
+---
 
-Did you write user stories, draw wireframes, use task tracking, produce ERDs? Did you use source control, with regular commits? Include links to them here.
+## Project Collaboration
+* Trello Project Management application
 
-## Authors
+![trello](https://user-images.githubusercontent.com/31798170/36472250-3cf73956-172c-11e8-9582-d4665b5f220c.jpeg)
 
-Did you collaborate with others on this project, list them here
+### Authors
+* [Darren Koh](https://github.com/keed) 
+* [Chong Ching Tong](https://github.com/chongct)
+* [Edmund Teo](https://github.com/edmundtck)
+* [Wong Kin Ting](https://github.com/strisen)
+* [Speed Chan](https://github.com/knownopear)
+* [Lim Jiechao](https://github.com/limjiechao)
+* [Poh Yan Jie](https://github.com/empludo)
+* [Jo Sho](https://github.com/emjys)
 
-* **John McClain** - *Responsible for keeping vests white* - [GithubUserName](https://github.com/GithubUserName)
+---
 
 ## Acknowledgments
 
-* Hat tip to anyone who's code was used, for example [this was a useful starting point for creating this template](https://gist.github.com/PurpleBooth/109311bb0361f32d87a2).
+* Homepage Photo by Helena Lopes on Unsplash
 
+---

package.json

@@ -0,0 +1,17 @@
+{
+  "name": "tripcollab-v2-project4",
+  "main": "index.js",
+  "license": "MIT",
+  "dependencies": {
+    "concurrently": "^3.5.1",
+    "dotenv": "^5.0.0",
+    "react-fontawesome": "^1.6.1"
+  },
+  "scripts": {
+    "build": "concurrently \"cd tripcollab-client && yarn build\" \"cd tripcollab-server && yarn build\"",
+    "install": "(cd tripcollab-client && yarn) && (cd tripcollab-server && yarn)",
+    "start": "concurrently \"cd tripcollab-client && PORT=3000 yarn start\" \"cd tripcollab-server && PORT=3001 yarn start\"",
+    "start:prod": "cd tripcollab-server && yarn start:prod",
+    "heroku-postbuild": "cd tripcollab-client && npm install && npm install --only=dev --no-shrinkwrap && npm run build"
+  }
+}

tripcollab-client/.gitignore

@@ -0,0 +1,21 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

tripcollab-client/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "tripcollab-client",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "bootstrap": "^4.0.0",
+    "react": "^16.2.0",
+    "react-dom": "^16.2.0",
+    "react-fontawesome": "^1.6.1",
+    "react-google-maps": "^9.4.5",
+    "react-modal": "^3.3.1",
+    "react-router-dom": "^4.2.2",
+    "react-scripts": "1.1.1",
+    "reactstrap": "^5.0.0-beta",
+    "recompose": "^0.26.0"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  },
+  "proxy": "http://localhost:3001/"
+}