Skip to content

Team 17 Project Submission #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
theratzoo wants to merge 87 commits into
base: master
Choose a base branch
from
Open

Team 17 Project Submission #60

theratzoo wants to merge 87 commits into from

Conversation

@theratzoo
Copy link

@theratzoo theratzoo commented Oct 17, 2020

No description provided.

theratzoo and others added 30 commits October 8, 2020 20:44
@theratzoo
proposal
3427c21
@theratzoo
added react stuff as template
3de206d
@theratzoo
added some basic server stuff
bccecd8
@theratzoo
added barebones implementations could be buggy
ca53bc9
@theratzoo
a bit of reorganization, websocket, misc
9338761
@theratzoo
basics for showing completed stories
d6eb233
@theratzoo
cleaning up and commenting todo stuff
4dcbfe6
@edkazcarlson
i think working login
7e8b515
@MargaretEarnest
Added story parameters and additional input fields for story creation
9bc4c22
@MargaretEarnest
Switched back to default starting names for stories and removed story…
535d0b5 
… name input
merged
67b9bb4
@edkazcarlson
Merge pull request #1 from theratzoo/edBranch
9fc2478 
made login and github OAuth
keys
74e36a3
@edkazcarlson
Merge pull request #2 from theratzoo/edBranch
2f160d6 
keys
@MargaretEarnest
Added data validation in CreateStory.js
22e50c2
@MargaretEarnest
Merge remote-tracking branch 'origin/master'
e3b697d 
# Conflicts:
#	react-app/src/CreateStory.js
@MargaretEarnest
Updated completedStories page to show all finished stories in the dat…
bccd55b 
…abase
@edkazcarlson
hashbrowser fix
926b473
@edkazcarlson
fixing # browser
78bde52
@edkazcarlson
Merge branch 'master' into fixBranch
9a25943
@edkazcarlson
fix mistakes
3ffca67
@edkazcarlson
Merge pull request #3 from theratzoo/fixBranch
6f5c281 
Fix branch
@MargaretEarnest
Updated CompletedStoryIndividualPage.jsx page to show individual stories
3f94a28
@MargaretEarnest
Changed CreateStory to set first contributor to user ID
07baa69
@MargaretEarnest
Gave stories voting buttons
2ec6651
@theratzoo
re-added the CurrentStory.js file that was lost
137a63a
@MargaretEarnest
Added time data to story pages
3f8dcd3
@edkazcarlson
material UI changes, remember to npm install
08d7b37
@edkazcarlson
material ui changes rembmer to npm install
ade3314
@edkazcarlson
readding what i deleted from luke
30aff19
chaarke and others added 30 commits October 16, 2020 18:28
@chaarke
Completed List now pretty
75c46da
@chaarke
Merge branch 'master' of https://github.com/theratzoo/final-project
010764f
@MargaretEarnest
Added skip functionality
b29e178
@MargaretEarnest
Merge remote-tracking branch 'origin/master'
0609ecd 
# Conflicts:
#	react-app/src/CurrentStory.js
@edkazcarlson
initial README
6719eaa
@MargaretEarnest
Added contributor back to story creation
66818ed
@MargaretEarnest
Merge remote-tracking branch 'origin/master'
9d374fd
@chaarke
completed story page now pretty
eea1c55
@chaarke
Merge branch 'master' of https://github.com/theratzoo/final-project
db47c75
@MargaretEarnest
Fixed adding skip to story
214b994
@MargaretEarnest
Merge remote-tracking branch 'origin/master'
4e56922
@MargaretEarnest
Period consistency
6d0b970
@MargaretEarnest
Fixed a skip bug for new contributors to a story
468abc4
@chaarke
pretty edit button
8fe6072
@chaarke
Merge branch 'master' of https://github.com/theratzoo/final-project
c3d05d1
@MargaretEarnest
Changed edit button to edit title
ab797ec
@MargaretEarnest
Fixed edit button because I broke it
1542ab7
@edkazcarlson
style changes
ffb34dc
@edkazcarlson
Merge branch 'master' of https://github.com/theratzoo/final-project
bf4110d
@chaarke
Changed green to purple, fancy edit button.
46824f3
@chaarke
git is making me do this 10 times
91dabfc
@chaarke
one last style
3458f86
@MargaretEarnest
Cleaning and reformatting
44b7655
@MargaretEarnest
Merge remote-tracking branch 'origin/master'
2395d19 
# Conflicts:
#	react-app/src/CurrentStory.js
@MargaretEarnest
Cleaning and reformatting again
9655040
@theratzoo
removed test button and some comments
3bed69d
@chaarke
Updated readme with video link
0041fb3
@theratzoo
youtube link
280666e
@theratzoo
made mongodb a secret shhh
5f1c5b2
@edkazcarlson
Update README.md
9f03cb6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@theratzoo @MargaretEarnest @edkazcarlson @chaarke