Skip to content

Merging MVP into master#13

Merged
stak21 merged 90 commits into
masterfrom
frontend
May 24, 2019
Merged

Merging MVP into master#13
stak21 merged 90 commits into
masterfrom
frontend

Conversation

@jozsa
Copy link
Copy Markdown
Collaborator

@jozsa jozsa commented May 24, 2019

Bug: Redirects immediately to github login page or ranking page if user is already logged in.

suhearsawho and others added 30 commits May 23, 2019 18:19
@suhearsawho
index page
e3ac508
@jozsa
Barebones flask app for everyone to work with
c0366a3
@jozsa
Added user tier path and setup for User class to be passed into tier
d24e624
@suhearsawho
Merge branch 'backend' of https://github.com/stak19/TripleTail into b…
4fafcbc 
…ackend
@suhearsawho
Frontend basic
016b81e
first commit
1f2d4b3
@suhearsawho
Removed jinja for block content
769a849
@suhearsawho
Settign up file structure for flask
22a113f
@suhearsawho
Preparations for OAuth:
75b2a6a
@jozsa
Feature: get the percentage of repos that have a README
ee85c27
added account_age method
b22e1fe
@suhearsawho
Reorganized template structure
df382b7
fixed conflicts
bfda26e
@jozsa
Change 'userinfo' to 'username' for User object instantiation
88fc8f4
@jozsa
Merge branch 'backend' of github.com:stak21/TripleTail into backend
4536cf4
@stak21
Merge branch 'master' of github.com:stak21/TripleTail into frontend
3dea87f
@stefansilverio
resolved conflicts
81b7449
@stefansilverio
added more basic methods to get data about user
1e0931c
@suhearsawho
more setup for frontend
322cd3c
@suhearsawho
erge branch 'frontend' of https://github.com/stak20/TripleTail into f…
cb188b7 
…rontend
added methods for retrieving user's pic and tier
d2de324
resolved conflicts
9b1f9b2
@stak21
Initial Commit: New gitignore
3a2fd71
@stak21
Initial Commit: adding out package.json
4e2e7f3
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
4c82827
@jozsa
Fixing instance attribute setter methods, TODO: remove user_dict from…
610494d 
… instance
@jozsa
erge branch 'backend' of github.com:stak21/TripleTail into backend
2ce3091
@suhearsawho
more html for frontend
c8a3251
@stak21 @suhearsawho
Adding out MIT license
9167849
@stak21 @suhearsawho
Initial Commit: Adding A blank README.md file
c7c6144
jozsa and others added 29 commits May 24, 2019 18:03
@jozsa
Restructure app and user class to work with oauth token instead of ba…
bc01004 
…sic authentication
@jozsa
Merge branch 'backend' of github.com:stak21/TripleTail into backend
ea5781c
Updating requirements.txt with bs4
23867eb
@suhearsawho
Merge branch 'backend' of https://github.com/stak20/TripleTail into b…
146c329 
…ackend
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
822dae1
@suhearsawho
Merge branch 'backend' of https://github.com/stak21/TripleTail into b…
e949d00 
…ackend
@stak21
Added: a login and oauth authenticator
7fa91e4
@stak21
Changed the jquery import
f675cc7
@suhearsawho
app conflicts
4415739
@suhearsawho
merged backend and frontend
4e7a2d2
@truong21
added logo for login page
805ba13
@truong21
Merge branch 'frontend' of https://github.com/stak21/TripleTail into …
d57d8b7 
…frontend
@stak21
feat(github oauth): Added a handle for the github callback
54bf99a
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
1331f57
Updating app.py to use 0.0.0.0 as host
5204129
Updating app.py file
b6467a2
@truong21
links is open in new tabs; buttons are in line
4f8628d
@truong21
Merge branch 'frontend' of https://github.com/stak21/TripleTail into …
836d5d3 
…frontend
Updating html files with typing for css and javascript
abe126a
@stak21
new method to signing in to github
a5f9aeb
@truong21
added additional description for rankings
28b0eac
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
963fdea 
Conflicts:
	backend/static/scripts/auth.js
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
5b137e4
@stak21
click event is now a simple redirect
c4dff6c
@stak21
Merge branch 'frontend' of github.com:stak21/TripleTail into frontend
e6b74c6
@stak21
added jquery form google cdn
ae4618b
@jozsa
Oauth working but redirects too early before serving up login page
4532dc2
@suhearsawho
changes to ranking html
976ef08
@suhearsawho
Added button
0cf2209
@stak21 stak21 merged commit db1637d into master May 24, 2019
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.

5 participants

@jozsa @stak21 @suhearsawho @stefansilverio @truong21