Feedback

.github/workflows/event-logger.yml

@@ -0,0 +1,59 @@
+# DO NOT TOUCH THIS FILE!!!
+name: log github events
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    types: [opened, closed]
+    branches: [main, master]
+jobs:
+  log:
+    runs-on: ubuntu-latest
+    env:
+      COMMIT_LOG_API: ${{ secrets.COMMIT_LOG_API }}
+      COMMITS: ${{ toJSON(github.event.commits) }}
+      REPOSITORY_URL: ${{ github.repositoryUrl }}
+      EVENT_TYPE: ${{ github.event_name }}
+      EVENT_ACTION: ${{ github.event.action }}
+      EVENT_USERNAME: ${{ github.actor }}
+      EVENT_EMAIL: "${{ github.event.pull_request.sender.email }}"
+      PR_MERGED: ${{ github.event.pull_request.merged }}
+      PR_CREATED_AT: ${{ github.event.pull_request.created_at}}
+      PR_CLOSED_AT: ${{ github.event.pull_request.closed_at}}
+      PR_MERGE_USER: ${{ github.event.pull_request.merged_by.login}}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # this is important so git fetches all history.. the actions/checkout by default fetches all history as one commit which throws off stats
+      - uses: actions/setup-python@v3
+        with:
+          python-version: "^3.9"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install --user pipenv
+          pipenv install pytz
+          pipenv install python-dateutil
+          pipenv install build
+          pipenv install requests
+          pipenv install gitcommitlogger
+      - name: Log pull request opened
+        if: github.event_name == 'pull_request' && github.event.action == 'opened'
+        run: |
+          pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_opened -d $(echo $PR_CREATED_AT) -un $(echo $EVENT_USERNAME) -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
+      - name: Log pull request closed and merged
+        if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
+        run: |
+          echo $COMMITS > commits.json
+          cat commits.json # debugging
+          pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_merged -d $(echo $PR_CLOSED_AT) -un $(echo $PR_MERGE_USER) -i commits.json -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
+      - name: Log pull request closed without merge
+        if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == false
+        run: |
+          pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t pull_request_closed -d $(echo $PR_CLOSED_AT) -un $(echo $EVENT_USERNAME) -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v
+      - name: Log push
+        if: github.event_name == 'push'
+        run: |
+          echo $COMMITS > commits.json
+          cat commits.json # debugging
+          pipenv run gitcommitlogger -r $(echo $REPOSITORY_URL) -t $(echo $EVENT_TYPE) -i commits.json -o commit_stats.csv -u $(echo $COMMIT_LOG_API) -v

.gitignore

@@ -39,6 +39,9 @@ Thumbs.db
 # Typical Node.js artifacts #
 #############################
 
+#ignore lock file to reduce git log stats bloat 
+# package-lock.json
+
 # Logs
 logs
 *.log

CONTRIBUTING.md

@@ -1,2 +1,61 @@
-# Guide to Contributing
-Delete the contents of this file and replace with the contents of a proper guide to contributing to this project, as described in the [instructions](./instructions.md)
+# Team Norms
+
+## Team Values
+- We will work together in weekly meetings where we discuss what needs to be done, what has been completed, and the things each person will be working going forwards.
+
+- If anyone needs help, they can message the discord at any time or discuss their problems in our weekly meetings if they are not urgent.
+
+### Resolving Conflicts
+
+- Disagreements: If any disagreements come up regarding any part of the process that cannot be easily resolved, we will create a vote on the direction that we want the project to move in.
+
+- Failing to meet obligations: If any individual is failing to meet their obligations, we will first assess why they are not able to complete their work and/or adjust our roles accordingly. If this problem becomes reocurring despite attempts to accomodate their personal issues, we will need to contact course administrators.   
+
+- Time to respond to messages: If any message is directed at you, you are expected to respond to the message or at least acknowledge you have seen it within the day that it is sent.
+
+## Sprint Cadence
+
+Each Sprint should take approximately two to three weeks, depending on the course schedule. 
+
+## Daily Standups
+
+We will have a daily standup on 3/06, 3/08, 3/27, 3/29, 4/03, 4/12, 4/17, 4/19, 4/26, 5/01. The exact times will be organized through the discord in the days leading up to the standup. 
+
+The standups will take place either syncronously through a Discord voice call or in-person on campus.
+
+We agree to attend every standup and other members will not cover for members who do not attend.
+
+Members who do not attend or make any notable progress on a task for two standups or more without communication with the rest of the members may be reported to course administration.
+
+## Coding Standards
+
+-Everyone uses Visual Studio Code
+
+-Use camelCase
+
+-Use Semicolons
+
+-Write comments for all code
+
+-Keep code as simple as possible
+
+-Keep function definitions at the bottom of your code
+
+-Make sure code is not redundant (Reuse code as much as possible)
+
+-Make comprehensible debug statements
+
+-Comment out any debugging lines that are not used
+
+-Remove all dead code
+
+## Contributions
+
+- Each person will take on the role of scrum master and product owner at least once
+- Work will be divided amongst the members equally throughout the duration of the project
+
+## Set Up
+
+- Each member must use Visual Studio Code
+- All members must use Github
+- All members must run 'npm install' to install the necessary packages

README.md

@@ -1,19 +1,38 @@
-# Project Repository
+# Dinner Date
+Dinner Date is a social networking app that provides a platform for users to find others to dine with.
 
-This repository will be used for team projects.
+[Deployment Link](https://dinnerdate-vvwz2.ondigitalocean.app/login)
 
-Several sets of instructions are included in this repository. They should each be treated as separate assignments with their own due dates and sets of requirements.
+## Team Members
+[Andrew Huang](https://github.com/andrew0022), [Claire Guo](https://github.com/clairekguo), [Frank Weng](https://github.com/wengf2086), [Jeffrey Chen](https://github.com/FrozenEclipse), [Victoria Carroll](https://github.com/victoriacarroll323) 
 
-1. See the [App Map & Wireframes](instructions-0a-app-map-wireframes.md) and [Prototyping](./instructions-0b-prototyping.md) instructions for the requirements of the initial user experience design of the app.
+## Product Vision Statement
+With Dinner Date, users will need to register with an account. Once logged in, they will gain access to all the resturants and invitations in their geographic area. A map will display pins marking resturants that the user can click on to view exisitng invitations along with the creators' profiles and rating. The user has the option of accepting the invitation of another user or to post one of their own by filling out a form with time and description information. If the user has an active post, they will be able to view a list of other users that have accepted their invitation. The original creator of the post can either "accept" or "decline" each user. Once a date is set, the two parties will be able to engage in conversation over our app with our chat feature. The details of the date can also be edited or cancelled by either user. Following the scheduled time of the date, both users will be prompted to rate the other on a scale of 1-5 stars based on punctuality, behavior, etc. Users will also be allowed access to their chat history and to edit their own profile settings.
 
-1. Delete the contents of this file and replace with the contents of a proper README.md, as described in the [project setup instructions](./instructions-0c-project-setup.md)
+Our product is targeted towards adults looking to try new resturants while meeting new people with a simialr interest. Given the nature of our product, it is expected to have a larger presence in metropolitan areas. 
 
-1. See the [Sprint Planning instructions](instructions-0d-sprint-planning.md) for the requirements of Sprint Planning for each Sprint.
+The ultimate goal of Dinner Date is to provide a safe, reliable space for food loving adults to quickly connect with others looking to try the same restruant. 
 
-1. See the [Front-End Development instructions](./instructions-1-front-end.md) for the requirements of the initial Front-End Development.
+## History
+New York City arguably has the most prominent food scene in the wrold. The city is home to hundreds of unique resturants. However, while there is an endless number of places to try, it can prove difficult finding people to share the experiences with. With the current market flooded with various social networking and dating apps, it can be time consuming and cumbersome to find a stranger just to eat with. What are the chances of finding a post on Twitter looking for someone to go to dinner with? Pretty low. And planning a date with a Tinder match? That could take weeks. That's when we came up with Dinner Date. We wanted an easy and efficient way to quickly find other individuals near you who share the intention of looking for someone to dine with. With Dinner Date, we envision a future where no one will ever miss out on the opportunity of trying a new resturnat in fear of eating alone. 
 
-1. See the [Back-End Development instructions](./instructions-2-back-end.md) for the requirements of the initial Back-End Development.
+## Contribution
+If you are interesting in contributing, please refer to [CONTRIBUTING.md](./CONTRIBUTING.md).
 
-1. See the [Database Integration instructions](./instructions-3-database.md) for the requirements of integrating a database into the back-end.
+## Building & Testing 
+To build and test this project, follow these instructions:
+1. Go to /back-end
+2. Create an `.env` file with the following line:
+GOOGLE_MAPS_API_KEY=AIzaSyB8VORRZ3mEDvFhU8z9cxkZM4Bqautc85s
+3. Run `npm install --force`
+4. Run `nodemon`
+5. Open a new terminal and go to /front-end
+6. Create an `.env` file with the following line:
+REACT_APP_GOOGLE_MAPS_API_KEY=AIzaSyB8VORRZ3mEDvFhU8z9cxkZM4Bqautc85s
+7. Run `npm install --force`
+8. Run `npm start`
 
-1. See the [Deployment instructions](./instructions-4-deployment.md) for the requirements of deploying an app.
+Notes: 
+- Sometimes we reach the rate limit for the Mockaroo API. When this happens, we serve static data instead.
+- It may a take a while for data on `/restaurant-info` and `/home-lfd` to load. Please give it some time.
+- It is impossible to generate a random placeId for a random restaurant, so we've used static data for sample restaurant info. 

UX-DESIGN.md

@@ -1,8 +1,78 @@
 # User Experience Design
 
-This repository contains instructions and files for two assignments that together comprise the user experience design phase of a web app.
+## **[Prototype](https://www.figma.com/proto/NrtB8ONdhaRjqkqnG6YRrf/DinnerDate?node-id=30%3A96&scaling=scale-down&page-id=0%3A1&starting-point-node-id=30%3A96)**
 
-Replace the contents of this file with the completed assignments, as described in:
+### Login:
 
-- [app map & wireframe instructions](instructions-0a-app-map-wireframes.md).
-- [prototype instructions](instructions-0b-prototyping.md)
+<img src="./ux-design/login.png" width="25%">
+
+- The user must register and log in to use the app
+- Login will check the user's credentials 
+- Register will add the new user to the system 
+
+### Home - Find a Date:
+
+<img src="./ux-design/find_create_date.png" width="25%">
+
+- A map is displayed with various pins on resturants where people have active posts 
+- When the user chooses a restaurant, the app will direct to a page that shows information about the restaurant:
+
+### Location Info:
+
+<img src="./ux-design/location_info.png" width="25%">
+
+- Here, all the active posts are listed for the user to browse
+- The user can either create their own post or select one of the existing dates 
+- Once the user selects a date, the creator of the post will be able to accept or decline this request
+
+### Create Post:
+
+<img src="./ux-design/create_post.png" width="25%">
+
+- The user can create a post at the selected resturnat by filling out the form 
+
+### Home - Date Posted:
+
+<img src="./ux-design/post.png" width="25%">
+
+- When the user creates a post, this will become their new home screen 
+- Here the user can see all the people who have responded to their post and choose one to go on a date with
+- When the user clicks on a diner, you get brought to their profile
+
+### Date Profile:
+
+<img src="./ux-design/diner_profile.png" width="25%">
+
+- Here the user can view the profile of the user who accepted the post 
+- The user has the option to accept or decline 
+
+### Home - Date Confirmed:
+
+<img src="./ux-design/date_confirmed.png" width="25%">
+
+- When a date is confirmed, this will be the new home page
+- Here, the user can chat with the other user, get directions to the resturant (opens google maps), edit the date, or cancel 
+
+### Edit Post:
+
+<img src="./ux-design/edit_post.png" width="25%">
+
+- Here the user can edit the details of their active post 
+
+### All Conversations:
+
+<img src="./ux-design/conversations.png" width="25%">
+
+- This page displays all the user's prior and current conversations 
+
+### Chat:
+
+<img src="./ux-design/message.png" width="25%">
+
+- Here is the messaging feature where users can chat with their dates 
+
+### My Profile:
+
+<img src="./ux-design/my_profile.png" width="25%">
+
+- The user's profile info is displayed here with options to edit