Commit Graph

121 Commits

Author SHA1 Message Date
Aaron Kimbrell
39b2f1376e Merge branch 'master' into submission 2019-04-04 16:29:10 -05:00
Jordan Stremming
694906e59f formy forms 2019-04-03 14:18:15 -05:00
Aaron Kimbrell
55dea340e4 Docker, wooo!
Can be built and run in docker
2019-04-03 00:05:21 -05:00
Aaron Kimbrell
38f27f3dfe Cleanup
Remove old config base
removed unused form field
Reconfigrued the init_db command to work the way I should have done it in the first place, but did not know about (it's built into flask now, so flask scripts is unnecessary)
So just run `flask init_db` and it'll work
2019-04-02 22:46:42 -05:00
Jordan Stremming
b571611cdf Merge remote-tracking branch 'origin/master' into submission 2019-04-01 11:21:01 -05:00
Aaron Kimbrell
dfb8802839 Fixed registration and profile edit forms
the re-usable address form was breaking both forms due to how flask-user works, since it compares form field name directly to the database, this type of sub-fielding(?) does not work
2019-03-28 19:01:43 -05:00
Aaron Kimbrell
8035e7ae17 updated requirements
argon2i
2019-03-28 18:22:46 -05:00
Jordan Stremming
cbb1321cd8 DB Integration 2019-03-28 17:50:58 -05:00
Aaron Kimbrell
e2137e7bb2 Setup Script
Database initialization
`python manage.py init_db`
2019-03-28 17:49:48 -05:00
Jordan Stremming
e62ee424b9 Code organization and display 2019-03-25 13:36:12 -05:00
Jordan Stremming
d84b463bb5 Code organization and display 2019-03-25 13:35:19 -05:00
Jordan Stremming
e5501d8a2c Code organization 2019-03-25 13:27:50 -05:00
Jordan Stremming
a65bd69954 Tab indexing 2019-03-25 13:19:00 -05:00
Jordan Stremming
0710562705 Reorder contact info 2019-03-25 13:18:12 -05:00
Jordan Stremming
4829d8bf06 Move login info to bottom of form, so password info is decided last 2019-03-25 13:17:01 -05:00
Jordan Stremming
1853951880 Merge remote-tracking branch 'origin/master' into submission 2019-03-25 13:03:33 -05:00
Jordan Stremming
0526ca69c2 Merge remote-tracking branch 'origin/auth' into submission 2019-03-24 14:59:57 -05:00
Aaron Kimbrell
feebbe613b User Profiles
Made it where the profiles display the user's info and then then user can edit their info
2019-03-23 20:12:01 -05:00
905315aa0b Merge pull request #1 from aronwk-aaron/auth
Auth
2019-03-23 18:24:03 -05:00
Jordan Stremming
f3c7c2f2c1 SCSS Variable for default link color 2019-03-23 18:15:04 -05:00
Jordan Stremming
87c499d521 Merge remote-tracking branch 'origin/auth' into auth
# Conflicts:
#	app/static/scss/site.scss
2019-03-23 18:13:55 -05:00
Jordan Stremming
d21980e416 SCSS Variable for default link color 2019-03-23 18:13:28 -05:00
Aaron Kimbrell
2eaa9649f4 added signout icon 2019-03-23 18:12:50 -05:00
Aaron Kimbrell
b1fbda12ac styling fix
made links maroon without making every a tag maroon
2019-03-23 18:07:35 -05:00
Aaron Kimbrell
f4b9a2b5d7 Registration form completion
it should now work completely
Added logout button to header (need to get the icon to work)
Switched to using email to login, since that is what Flask-user uses
Added signin link to the signout page
2019-03-23 17:11:05 -05:00
Jordan Stremming
421ab78e46 Merge branch 'auth' into submission
# Conflicts:
#	app/__init__.py
2019-03-23 12:12:50 -05:00
Jordan Stremming
fafb17f110 Merge remote-tracking branch 'origin/Database' into submission
# Conflicts:
#	app/__init__.py
2019-03-23 12:11:33 -05:00
Jordan Stremming
e0796f2609 Visual improvement for forms 2019-03-23 08:02:04 -05:00
Jordan Stremming
8cf8db9b69 Visual improvement for forms 2019-03-23 08:01:27 -05:00
Jordan Stremming
acc367ae07 Add content override 2019-03-23 08:01:09 -05:00
Jordan Stremming
b553d19cf7 Registration form, mostly 2019-03-23 07:54:05 -05:00
Jordan Stremming
4de15c4f38 Merge remote-tracking branch 'origin/Database' into auth 2019-03-23 07:24:00 -05:00
Aaron Kimbrell
d05c41d09b Database typing
So the data types are mostly correct
Ones that need work I have marked TODO:
These are just the ones for files, and ones that could be Enum typed, they don't have to be
I hate checkboxes, this is dumb but works very well
2019-03-23 00:13:44 -05:00
Jordan Stremming
a27c3f2b77 Unused file 2019-03-22 13:06:21 -05:00
Jordan Stremming
4df83e8ff4 CSS link coloring 2019-03-22 13:04:58 -05:00
Jordan Stremming
bb4765ae71 Disable splash, go to login by default 2019-03-22 13:03:04 -05:00
Jordan Stremming
a2117109ae No more CAS :( 2019-03-22 13:01:44 -05:00
Jordan Stremming
3a87e2ab56 Conventions and formatting 2019-03-22 13:00:03 -05:00
Jordan Stremming
f39f470f8a Unused import 2019-03-22 12:52:19 -05:00
Jordan Stremming
52bd32fcbe Form styling 2019-03-22 12:43:29 -05:00
Jordan Stremming
152afaaed8 Use argon2 for hashing 2019-03-22 12:43:21 -05:00
Jordan Stremming
c28f9fa5f3 Typo 2019-03-22 10:33:48 -05:00
Jordan Stremming
2de51ccc10 Whoops wrong setting file 2019-03-22 10:32:50 -05:00
Jordan Stremming
b310f34c21 Drop auth and replace sign out page 2019-03-22 10:31:46 -05:00
Jordan Stremming
57ecef68c0 Login form implemented 2019-03-22 10:28:11 -05:00
Jordan Stremming
4affd1e71f typo 2019-03-21 18:13:43 -05:00
Jordan Stremming
92de7e5c5a Register form page 2019-03-21 18:11:08 -05:00
Jordan Stremming
3e7e7c3abc Logout, but doesn't work properly 2019-03-21 18:11:00 -05:00
Jordan Stremming
1c8757d9e3 comment 2019-03-21 18:04:39 -05:00
Jordan Stremming
28987b5c05 Login function yay 2019-03-21 18:04:13 -05:00