Skip to content
Open

Main #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
9c64f3c
Update README.md
Cozhee May 30, 2022
c0098a2
added env sample
May 30, 2022
bfa2f4b
removed previous team agreements
kath-a-rine May 30, 2022
3b7375b
Merge pull request #1 from teamRed-d85/day1-K
stanwilder May 30, 2022
22c5705
Merge pull request #2 from teamRed-d85/devs
dLeigh01 May 30, 2022
37e75bd
updated formatting of header. Also fixed login/out buttons to function
May 30, 2022
148d272
Merge pull request #3 from teamRed-d85/header
kath-a-rine May 30, 2022
0c682e7
updated header components and logout button
May 30, 2022
4cbd50d
Merge pull request #4 from teamRed-d85/header
kath-a-rine May 30, 2022
baa1cb8
Merge pull request #5 from teamRed-d85/main
dLeigh01 May 31, 2022
5cb36ba
Update README.md
Cozhee May 31, 2022
a5a0f82
Merge pull request #7 from teamRed-d85/Cozhee-patch-2
stanwilder May 31, 2022
13bdac7
Update README.md
Cozhee May 31, 2022
3fe70dc
Merge pull request #8 from teamRed-d85/Cozhee-readme-3
stanwilder May 31, 2022
00df426
updated redirect path and changed button sizes
May 31, 2022
9ef5dc0
added notes
kath-a-rine May 31, 2022
ade288c
Merge branch 'devs' of https://github.com/teamRed-d85/techperspective…
kath-a-rine May 31, 2022
146448d
Merge pull request #9 from teamRed-d85/redirect
dLeigh01 May 31, 2022
c01fe36
Merge branch 'devs' into day2
kath-a-rine May 31, 2022
02a25eb
Merge pull request #10 from teamRed-d85/day2
kath-a-rine May 31, 2022
6917cbc
updated admin layout page
Jun 1, 2022
03bf96f
updated admin page
Jun 1, 2022
31e08f9
graph
stanwilder Jun 1, 2022
aa49575
Merge branch 'devs' into adminPage
dLeigh01 Jun 1, 2022
3b9db81
Merge pull request #11 from teamRed-d85/adminPage
dLeigh01 Jun 1, 2022
083e128
dont know why this didint push
Jun 1, 2022
23331c6
Merge branch 'devs' into activeSurvey
Cozhee Jun 1, 2022
d61685a
Merge pull request #12 from teamRed-d85/activeSurvey
kath-a-rine Jun 1, 2022
d51a6f4
Merge pull request #13 from teamRed-d85/day3
kath-a-rine Jun 1, 2022
76aa282
Updating front page
dLeigh01 Jun 1, 2022
880189a
merge fix
dLeigh01 Jun 1, 2022
13e8498
Working on results button
dLeigh01 Jun 1, 2022
1f77dda
day3 changes
kath-a-rine Jun 2, 2022
b3b86d4
day 3
kath-a-rine Jun 2, 2022
63d6bad
Merge pull request #14 from teamRed-d85/day3
kath-a-rine Jun 2, 2022
876ff6e
added welcome and about us pages
kath-a-rine Jun 2, 2022
7592454
added new survey modal
kath-a-rine Jun 2, 2022
ca51beb
got chart working and fixed results button
stanwilder Jun 2, 2022
2bec86a
Merge pull request #15 from teamRed-d85/day4
kath-a-rine Jun 2, 2022
9acc061
Merge branch 'devs' of https://github.com/teamRed-d85/techperspective…
stanwilder Jun 2, 2022
afbd172
Merge pull request #16 from teamRed-d85/day4
dLeigh01 Jun 2, 2022
9c675e3
added profile images, and updated new survey modal
kath-a-rine Jun 2, 2022
4ffa21b
resized image
kath-a-rine Jun 2, 2022
72e1ec4
Merge pull request #17 from teamRed-d85/day4
dLeigh01 Jun 2, 2022
99bdbd3
edited active survey container
kath-a-rine Jun 2, 2022
f58e998
Merge pull request #18 from teamRed-d85/day4
Cozhee Jun 2, 2022
76dbaff
edited active survey
kath-a-rine Jun 2, 2022
95ae984
Merge pull request #19 from teamRed-d85/day4
dLeigh01 Jun 2, 2022
ae613e1
Attempting to fix netlify
dLeigh01 Jun 3, 2022
f35955b
Merge pull request #20 from teamRed-d85/day4
kath-a-rine Jun 3, 2022
bfe5c29
i think we are done
stanwilder Jun 3, 2022
0602bf4
Merge pull request #21 from teamRed-d85/lastone
kath-a-rine Jun 3, 2022
3b40120
last one
stanwilder Jun 3, 2022
196b566
Merge pull request #22 from teamRed-d85/lastlastone
kath-a-rine Jun 3, 2022
54d14a5
final push
stanwilder Jun 3, 2022
1ce82c8
Merge pull request #23 from teamRed-d85/final
kath-a-rine Jun 3, 2022
d734a89
Update App.js
kath-a-rine Jun 3, 2022
85f3e43
Merge pull request #24 from teamRed-d85/kath-a-rine-patch-1
kath-a-rine Jun 3, 2022
8570b72
Merge pull request #25 from teamRed-d85/devs
Cozhee Jun 3, 2022
1983b75
added comments, formatted docs
kath-a-rine Jun 3, 2022
83f510c
added comments, formatted docs
kath-a-rine Jun 3, 2022
a015028
Merge pull request #26 from teamRed-d85/day5
stanwilder Jun 3, 2022
6332a4a
added note to readme
kath-a-rine Jun 3, 2022
2f10906
Merge pull request #27 from teamRed-d85/day5
dLeigh01 Jun 3, 2022
ebe5560
Merge pull request #28 from teamRed-d85/devs
dLeigh01 Jun 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REACT_APP_AUTH_DOMAIN=<your-key-here>
REACT_APP_AUTH_CLIENT_ID=<your-key-here>

REACT_APP_AUTH_REDIRECT_URI=<your-key-here>
235 changes: 38 additions & 197 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# **The Tech Prospective Survey**
[Team Collaboration Agreement](https://docs.google.com/document/d/1Ei7RcvOaHzeyUDbDCYfNEVa91ktPXAih2gQk4I0Fmmc/edit#heading=h.y52avp42q2jv)

## **Survey URL**

[Tech Perspective Survey](https://tech-perspective-survey.netlify.app/admin)

## **The vision**

![Survey](./public/assets/survey.png)

- The vision compiling diversity data and using it as a teaching tool to bring to light internal biases and ways to be more conscious with regard to inclusivity and diversity .

## **The Problem Domain**

- This project will revolutionize the existing survey data, making it more user friendly and potentially caching historical data.
- This project will revolutionize the existing survey data, making it more user friendly and caching historical data.

## **The Importance**

Expand All @@ -31,216 +30,58 @@
- View data on a stylized graph.
- Compare data by multiple students in one class.
- See how many students participate in the survey.
- Have multiple active surveys each being for an individual class

#### *Out of Scope*

- Data from other schools and students will not be visible.
- New students' data from other schools cannot be added.

### Minimum Viable Product

![Survey Questions](./public/assets/surveyquestion.png)

- **What will your MVP functionality be?**
- Access and complete the survey.
- Store immediate survey data in the DB.
- Render a stylized graph of the immediate data.

### Stretch Goals

- **What are your stretch goals?**
- Cache historical data.
- Develop a graph modeling historical data.
- Allow the user to access historical data and trends.
- **What stretch goals are you going to aim for?**
- The ability to store historical data.

## **Software Requirements**

### **Functional Requirements**

- User will be able to complete the survey and submit data.
- User will be able to access a stylized graph of the immediate data.
- User will be able to secure data and login information.

### **Non-Functional Requirements**

- **Security**
- Our app will use Auth0 to make sure we have authorized users
- This will allow us to track and personalize to our users
- Our backend will validate requests to make sure it is coming from our front end
- Managing the uses of our api and databases so only our users are able to access those resources

- **Database**
- Each item belongs to a single location
- The two databases will be a Student database and a Class database
- There will be a identifier in the DB associated with the class
- Each student will have a single class

### **Data Flow**

![Data flow for the survey](./public/assets/surveydata.png)

### DataBase Schemas

```js

ClassSurvey = {
ClassNumber : Number,
Identifier : String,
ClassCount : Number,
Instructor : String,
thumbnail : String, //url
note: String //optional
}
```

## How To Use **The Tech Perspective Survey**

## Step One
Be sure you are in the directory in which you want these repos to live before you clone.

- begin by running:
- `git clone` then copy and paste `git@github.com:Meltingpot-Data/techperspective-front.git`
Begin by running:
`git clone https://github.com/teamRed-d85/techperspective-front.git`

- Do the same for the backend repo:
- `git clone` then copy and paste `git@github.com:Meltingpot-Data/techperspective-back.git`
Do the same for the backend repo:
`git clone https://github.com/teamRed-d85/techperspective-back.git`

## Step Two

- run: `cd techperspective-front`
- then (installs node modules): `npm install`
- then (installs dependencies): `npm i express bootstrap nodemon cors dotenv mongoose jwt bcrypt base-64 supertest sqlite3 jsonwebtoken`
- repeat **step two** for 'back'

## Step Three

- Your are going to need to create a `.env` in order to use the server, follow the guide in the provided `.sample.env` file.

## How to Use

- Click on the provided link here: [Survey Admin Portal](https://tech-perspective-survey.netlify.app/admin)

## To start server

- run: `npm start`
*To test the server*

- run: `npm run test`
*To run the tests*

## **Team Meltingpot-Data**

![MPD](./public/assets/MeltingpotData.jpg)

## Our Cooperation Plan
In your terminal and inside of the root directory of the project `cd techperspective-front`
- then `npm install`
- then `npm install`

### Team Key Strengths?
- repeat **step two** for 'techperspective-back'

**Erik** Program Management, React, JavaScript, teamwork, bootstrap-react
**Joey** Front-end Design, creative, communication, leadership, team building, all-around BA
**Emily** Front-end design, layout and CSS
**Ryan** Cool bird Dad, testing/bug hunting, Master of parrot gifs
**Michael** Backend creation, Javascript development and problem solving

**How are we going to utilize these strengths?**

- **Emily** and **Joey** will take point on the creative styling and UI.
- **Ryan** and **Michael** will tackle the backend development.
- **Joey** and **Erik** will co-lead the team and ensure all docs and details are submitted and taken care of.

### Team Professional Competencies

1. **Joey** wants to work on leadership and project management.
2. **Erik** wants to work on communication and making his presentations sound more natural.
3. **Emily** would like to refine her teamwork skills.
4. **Michael** Would like to improve his communication and public speaking.
5. **Ryan** endeavors to hone his technical skills.

### Day to day work schedule

- 9:00am to 6:00pm 12pm-2pm lunch designed but open to interpretation.
- Morning standup to go over what is planned.
- Afternoon (~5:00PM) will be bringing all the code together and planning for the next day/

## Conflict Plan

- **Conflict Resolution**
- One-on-one discussion,
- Mediation with another group member,
- Group discussion,
- Elevate to the next level as necessary.

## Communication Plan

### **Availability**

- **Joey** 12AM cutoff (but is an insomniac - available for friends at all times)
- **Erik** 12AM
- **Emily** 12AM (EST)
- **Michael** 12AM
- **Ryan** 12AM but also available whenever

### **Communication Platforms?**

- Slack
- Remo
- Zoom/Discord

### Breaks an off hours

- As needed but will have planned lunch
- If we start to fall behind?
- Reevaluate what is MVP for us
- *Communication on off hours*
- Slack
- text (for urgent needs)

### Making sure to hear all voices

- Everyone will be sharing at stand up and stand down.
- Frame responses with mutual respect.

## Diversity Equity and Inclusion Plan

- **Joey** is going to do his best to check his internal biases and assumptions of others.
- **Erik** speak up in challenging situations and bravery.
- **Emily** wants to work on not being so mean to men and take action to reduce stressful situations.
- **Michael** wants to ensure all voices are heard.
- **Ryan** wants to work on examining his assumptions.

## Work Plan

### **Tools for collaboration and workflow**

- We will be creating a task list to manage things from our Trello board.
- LiveShare on VS code.

### **Git Process**

- Frontend and backend will live on the GitHub
- Making an organization
- Working on own branches
- Push to staging and test
- Otherwise push as needed

### **PR Processes**

- Two other reviews for main
- One for staging
- Merging hopeful once a day but as necessary
## Step Three

### **Credit and Co-Conspirators**
- Your are going to need to create a `.env` file in your frontend and backend root directories. Below are the env variables you will need.

- This amazing final project was thoughtfully created and masterfully crafted by the master-minds of **Erik Savage**, **Michael Metcalf**, **Joey Hernandez**, **Emily Landers**, and **Ryan Lee**!
FRONT END!
```
REACT_APP_AUTH_DOMAIN=<your-value-here>
REACT_APP_AUTH_CLIENT_ID=<your-value-here>
REACT_APP_AUTH_REDIRECT_URI=<your-value-here>
REACT_APP_SERVER_URL=<your-value-here>
```

### **Contact the Team**
BACK END!
```
MONGO_DB=mongodb+srv://<username>:<password>@cluster0.uj68i.mongodb.net/?retryWrites=true&w=majority
JOTFORM_API=<your-value-here>
JOTFORM_TEMPLATE=212435934626054
JWKS_URI=<your-value-here>
```

[Follow Joey on LinkedIn](https://www.linkedin.com/in/jmhernandez2six/)
You can obtain your JotForm API key from [JotForm](https://www.jotform.com/)
1. Make an account
2. Log in
3. Click on profile icon picture in the top right and select `Settings`
4. In the left column click `API` and then click the `Create New Key` button to generate an API key

[Follow Erik on LinkedIn](https://www.linkedin.com/in/erikksavage/)

[Follow Emily on LinkedIn](https://www.linkedin.com/in/emily-landers-/)
## To start server

[Follow Michael on LinkedIn](https://www.linkedin.com/in/mt-metcalf/)
- Within your backend root directory type `npm start` or `nodemon` if you have that installed globally
This will start the backend services.

[Follow Ryan on LinkedIn](https://www.linkedin.com/in/ryanyinlee/)
- Within your frontend root directory type `npm run`
This will start up your frontend React project files
Loading