Update chatbox userID

.editorconfig

@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true

.env.example

@@ -5,4 +5,4 @@ CLIENT_SECRET=...
 NEO4J_USERNAME=...
 NEO4J_PASSWORD=...
 // OAuth callback URL
-CALLBACK_URL=...
+CALLBACK_URL=...

.eslintignore

@@ -0,0 +1,3 @@
+#folders#
+public/
+node_modules/

.eslintrc.json

@@ -1,7 +1,24 @@
 {
-    "extends": "airbnb",
-    "env": {
-      "browser": true,
-      "node": true
-    }
+  "extends": "airbnb",
+  "plugins": ["prettier"],
+  "env": {
+    "browser": true,
+    "node": true,
+    "es6": true
+  },
+  "rules": {
+    "arrow-parens": ["error", "as-needed"],
+    "no-console": 0,
+    "react/prop-types": 0,
+    "comma-dangle": [
+      "error",
+      {
+        "arrays": "never",
+        "objects": "never",
+        "imports": "never",
+        "exports": "never",
+        "functions": "ignore"
+      }
+    ]
+  }
 }

.gitignore

@@ -4,3 +4,4 @@ dist/bundle.js
 npm-debug.log
 .env
 *hot-update*
+c855bcf167bb6f333cfe6dfb9f3771ba.bmp

CONTRIBUTING.md

@@ -33,7 +33,7 @@
 Use github’s interface to make a fork of the repo, then add that repo as an upstream remote:
 
 ```
-git remote add upstream https://github.com/cranebaes/gitbud.git
+git remote add upstream https://github.com/Toucans456/gitpal.git
 ```
 
 ### Cut a namespaced feature branch from master

PRESS_RELEASE.md

@@ -1,8 +1,8 @@
-## Gitbud
+## GitPal
 
 ### Sub-Heading
 
-> Gitbud is an application that allows users to connect with others who are either at the same level or higher to work on open source projects. Users can view current projects, interested users, and pair up to work on a project together.
+> GitPal is an application that allows users to connect with others who are either at the same level or higher to work on open source projects. Users can view current projects, interested users, and pair up to work on a project together.
 
 ### Summary
 
@@ -18,16 +18,12 @@
 
 ### Quote from You
 
-> "GitBud provides new coders with their first real challenge; pushing them beyond tutorials on syntax and online games like CodeWars. It gets developers' hands dirty with their first real project or experience with with real-world code".
+> "GitPal provides new coders with their first real challenge; pushing them beyond tutorials on syntax and online games like CodeWars. It gets developers' hands dirty with their first real project or experience with with real-world code".
 
 ### How to Get Started
 
-> Login to Gitbud with your Github account. From there, navigate through the list of projects and select a project that you want to get started on. Inside the project's detail, you can find a list of users who are also interested. Feel free to message them and let them know you want to pair up with them. Once the two of you are paired up, you can begin on the project.
+> Login to GitPal with your Github account. From there, navigate through the list of projects and select a project that you want to get started on. Inside the project's detail, you can find a list of users who are also interested. Feel free to message them and let them know you want to pair up with them. Once the two of you are paired up, you can begin on the project.
 
 ### Customer Quote
 
-> "Gitbud helped me get started on my first open source project with ease."
-
-### Closing and Call to Action
-
-> FILL_ME_IN
+> "GitPal helped me get started on my first open source project with ease."

README.md

@@ -1,26 +1,54 @@
-# GitBud
+# GitPal
 
-> GitBud is an application that allows users to connect with others who are either at the same level or higher to work on open source projects. Users can view current projects, interested users, and pair up to work on a project together.
+> GitPal is an application that was forked from GitBud that allows users to connect with others who are either at the same level or higher to work on open source projects. Users can view current projects, interested users, and pair up to work on a project together.
 
-## Team
-
-  - __Product Owner__: Shaikat Haque
-  - __Scrum Master__: Francis Ngo
-  - __Development Team Members__: Peter Warner-Medley, Brian Kim
+![Alt text](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/7b1e3bb1d52fba7f60c382df3dc03a0b-original.png)
 
 ## Table of Contents
 
-1. [Usage](#Usage)
+1. [Team](#team)
+1. [Preview](#preview)
+    1. [Demo](#demo)
+    1. [Screenshots](#screenshots)
+1. [Usage](#usage)
 1. [Requirements](#requirements)
 1. [Development](#development)
     1. [Installing Dependencies](#installing-dependencies)
     1. [Tasks](#tasks)
-1. [Team](#team)
+    1. [Roadmap](#roadmap)
+1. [More Information](#more-information)
+    1. [Server README](#server-readme)
+    1. [Client README](#client-readme)
+1. [GitBud Repo](#gitbud-repo)
 1. [Contributing](#contributing)
 
+## Team
+
+  - __Product Owner__: Scott Schaefer
+  - __Scrum Master__: Rick Gallegos
+  - __Development Team Members__: Christine Zimmerman, Scott Mitchell, Sonrisa Chen
+
+## Preview
+
+### Demo
+
+Click [here](https://gitpal.herokuapp.com/) to try out GitPal
+
+### Screenshots
+
+[Sample projects](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/3857f3ab5dc89ba8668d64090a631d09-original.png)
+
+[Project page](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/2e76e08872778c681adc67e8eb0edac7-original.png)
+
+[User Profile](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/f8b4f7744d08fe5d166b127b7ca88fdd-original.png)
+
+[Navigation Drawer](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/1177499d4beb39863b539f274faf0d9a-original.png)
+
+[My Partners page](https://s3.amazonaws.com/poly-screenshots.angel.co/Project/c6/610187/b762fd98fafa7ec781ca2af220a948f6-original.png)
+
 ## Usage
 
-> __Environment Variables__ GitBud has hardcoded a username of 'neo4j' and a password of 'neo' for neo4j. You can change these in the code or override them by setting the appropriate environment variables. You will also need a GitHub Client ID and Client Secret to use the GitHub API. These, too, are set as environment variables. We have used the .env package, which allows environment variables to be set easily with the .env file in the root directory of the project. An example of the necessary variables for GitBud been provided here in this repo.
+> __Environment Variables__ GitPal has hardcoded a username of 'neo4j' and a password of 'neo' for neo4j. You can change these in the code or override them by setting the appropriate environment variables. You will also need a GitHub Client ID and Client Secret to use the GitHub API. These, too, are set as environment variables. We have used the .env package, which allows environment variables to be set easily with the .env file in the root directory of the project. An example of the necessary variables for GitPal been provided here in this repo.
 
 - Fork and clone the repo
 - Install dependencies from the root of the repo by running
@@ -63,8 +91,22 @@ npm install
 
 ### Roadmap
 
-View the project roadmap [here](https://github.com/cranebaes/gitbud/issues)
+View the project roadmap [here](https://github.com/Toucans456/GitPal/issues)
+
+## More Information
+
+### Server README
+
+View the GitPal server README [here](client/README.md)
+
+### Client README
+
+View the GitPal client README [here](server/README.md)
+
+## GitBud Repo
 
+View the original Repo
+[here](https://github.com/cranebaes/gitbud/)
 
 ## Contributing
 

client/README.md

@@ -1,54 +1,79 @@
+# GitPal Client
+
+## Table of Contents
+
+1. [Login/Signup](#login/signup)
+1. [Questionnaire](#questionnaire)
+1. [Project List](#project-list)
+1. [Project Details](#project-details)
+1. [User Details](#user-details)
+1. [Project Status](#project-status)
+1. [My Projects](#my-projects)
+1. [My Partners](#my-partners)
+1. [My Account](#my-account)
+
 ## Login/Signup
 
-- The landing page is the entry point to the app. 
-- Handled by the Landing react component, the user has the option to login with Github. 
+- The landing page is the entry point to the app.
+- Handled by the Landing react component, the user has the option to login with Github.
 - Clicking the login button will send a GET request to the url /auth/github.
 - If this is the user's first time, the user will be routed to the Questionnaire component.
   - This logic is handled App component, where a check is made to see if the user's loggedIn state has certain properties.
 - If the user has logged in before, then they will be redirected to a project list page.
 
-## Questionniare
+## Questionnaire
 
 - This page asks the user for:
     - Experience Level
     - Interested Language
-    - Profile Descripion
+    - Profile Description
 - This info is stored in the user's node in the database and is displayed in the user's profile.
 - After completing the questionnaire, user is taken to the Project List page.
 
 ## Project List
+
 - This can be considered the home page.
-- The list of available projects to work on will be displated
-- Clicking on a project will have 2 possibe outcomes:
+- The list of available projects to work on will be displayed
+- Clicking on a project will have 2 possible outcomes:
     - If the user is not working on the project, they will be taken to the project details page.
     - If the user is already working on the project with a pair, they will be taken to the Project Status page.
 - This logic is handled inside a 'smart' Project container.
 - The container checks the user's state to see whether the user is paired on a project or not, and renders the appropriate component.
 
 ## Project Details
+
 - This page displays information about a project such description, link to GitHub repo, and a list of recommended users to pair with.
 - An Interest button allows user to express interest in the project.
 - The Project Details component uses a UserList Component to display a list of recommended users who have also expressed interest in the project.
-- The list is sorted by an aglorithm on the server side that calculates the difference in coding activity by language between users.
+- The list is sorted by an algorithm on the server side that calculates the difference in coding activity by language between users.
 - Clicking on a recommended user will route the user to the User Details component
 
 ## User Details
+
 - This page displays user information collected from the questionnaire by a user
 - There are options to message the user, and pairing with the user.
 - Pairing with a user will establish a pairing between the 2 users, represented by a PAIRED_WITH relationship in neo4j.
 - The 2 users will also officially start working on the project, established by a WORKING_ON relationship in neo4j.
-- The next time the user clicks the Project through the the project list page, they will be taken to the Project Status page.
+- The next time the user clicks the Project through the project list page, they will be taken to the Project Status page.
 
 ## Project Status
+
 - This page has multiple checkboxes to that allow users to track their project progress.
 - Clicking 'Submit Progress' after checking checkboxes will save the users progress.
 - The next time the user enters the Project Status component, the boxes will remain checked.
+- This page also comes with a socket.io chat allowing the partnered users to collaborate on the project together in realtime.
 
 ## My Projects
+
 - This component is accessible through the app bar.
 - It displays the list of projects the user is currently WORKING_ON
 
+## My Partners
+
+- This component is accessible through the app bar.
+- It displays the list of users the currently logged in user is partnered with.
 
 ## My Account
+
 - This component is accessible through the app bar
-- It displays the the user's information that was entered in the questionnaire
+- It displays the user's information that was entered in the questionnaire