aboutsummaryrefslogtreecommitdiffstats
path: root/pysite/websockets.py (unfollow)
Commit message (Collapse)AuthorLines
2018-03-29Make flake8 happierGravatar Gareth Coles-1/+1
2018-03-29Oauth (#45)Gravatar Nate the great-24/+305
* Creating a OAUTH login for the site. We still need to have a way to fill in credentials however. Signed-off-by: Zwork101 <[email protected]> * How ya like me now Travis? Signed-off-by: Zwork101 <[email protected]> * Fix slight error in database insertion * Revert "Fix slight error in database insertion" (wrong branch) This reverts commit 9ac6cbb * Don't have snekchek working, but I'll try again. Signed-off-by: Zwork101 <[email protected]> * Please enter the commit message for your changes. Lines starting * Adding Oauth2 login to site. * Add prefix * Add prefix * This never happened * Flipping Travis I still can't get snekchek to work locally. * Added a whole bunch of stuff, ready to be used. Signed-off-by: Zwork101 <[email protected]> * Making sessions more secure, and future safe. Signed-off-by: Zwork101 <[email protected]> * Adding some quick stuff Signed-off-by: Zwork101 <[email protected]> * Appease the flake8 gods Signed-off-by: Zwork101 <[email protected]> * Appease the flake8 gods Signed-off-by: Zwork101 <[email protected]> * Whoops Signed-off-by: Zwork101 <[email protected]> * Add comments, fix user_data function. Signed-off-by: Zwork101 <[email protected]> * Whooops, forgot to flake :/ Signed-off-by: Zwork101 <[email protected]> * Make it look nicer, thanks Aperture. Signed-off-by: Zwork101 <[email protected]> * Fixing login issues and added button * Add a OauthMixin to allow for easy data access. Clean stuff up. Signed-off-by: Zwork101 <[email protected]> * Fix a test, and use self.assertEqual rather then self.assertEquals! Signed-off-by: Zwork101 <[email protected]> * Please don't ask how that happened. Signed-off-by: Zwork101 <[email protected]> * Added some tests, moved a bunch of stuff around. Mainly cleaned stuff up. Signed-off-by: Zwork101 <[email protected]> * Add a ton of tests, try to please the coverall gods :D, moved some code into a function for testing. Signed-off-by: Zwork101 <[email protected]> * Just some stupid stuff I missed. Signed-off-by: Zwork101 <[email protected]> * Fix an issue with the test, and add docs Signed-off-by: Zwork101 <[email protected]> * Remove pointless function. (join_user) Signed-off-by: Zwork101 <[email protected]> * Fix test consistency
2018-03-28Reorder resources.jsonGravatar Gareth Coles-6/+6
2018-03-28Added the Flask Mega-Tutorial to resourcesGravatar Jeremiah Boby-0/+6
2018-03-25Docker compose (#40)Gravatar Christopher Baklid-1/+69
* adds docker-compose file * cleanup * adds template auto reload to vagrant box * Update index.html
2018-03-24Made .travis.yml a bit more consistent (#44)Gravatar Sam Wedgwood-2/+5
Reordered the location of `cache: pip` to be consistent with https://github.com/discord-python/bot/blob/master/.travis.yml on the bot, and disabled email notifications like the bot repo.
2018-03-23Fix countdown textGravatar Gareth Coles-1/+1
2018-03-21Prevent countdown popup from suddenly expanding on load, and add a small ↵Gravatar Gareth Coles-1/+2
piece of text about dismissing it
2018-03-21Some front-page restylingGravatar Gareth Coles-1/+14
2018-03-21Reformat message arg for UIkit notificationGravatar Gareth Coles-7/+7
2018-03-21Rewrite countdown; Now a notification present on all pagesGravatar Gareth Coles-51/+79
2018-03-21CountdownGravatar JoeBanks13-76/+49
2018-03-21Pushing the footer to the bottom of the pageGravatar Leon Sandøy-42/+63
2018-03-21Update countdown.jsGravatar Joseph-2/+2
2018-03-21Added a Code Jam Countdown (#1eevq) (#43)Gravatar Sam Wedgwood-0/+101
* added countdown * updated jam dates * added test * flake8 * flake8 (i did it on wrong file)
2018-03-21Copy code from API error view over to normal error views because that's the ↵Gravatar JoeBanks13-21/+24
way it should be.
2018-03-20Update PR documentation to mention team number in titleGravatar Gareth Coles-1/+2
2018-03-18Change styling for price icons on resources pageGravatar Gareth Coles-9/+11
2018-03-17Fixed footer padding, fixed firefox vertical align issues, and improved the ↵Gravatar Leon Sandøy-3/+21
footer text. (#41)
2018-03-17`Github` => `GitHub`Gravatar Joseph-1/+1
2018-03-17Add a brief footer with a link to the repo (#37)Gravatar Andrew Schwartz-0/+7
* add environment varibales to a .env file specifically useful if using an IDE maybe this also warrants an update of the wiki.. * add newline * Add a brief footer with a link to the github rep * Update README.md * Update README.md * Remove command line about running locally * add styling for the footer * rm config vars file * use html bullet point code instead of literal
2018-03-15@1mn plsGravatar Gareth Coles-1/+1
2018-03-15Fix comprehension errorGravatar Gareth Coles-1/+1
2018-03-15Fix missing textGravatar Gareth Coles-1/+1
2018-03-15Update code jams page with tutorialGravatar Gareth Coles-6/+103
2018-03-14Early bersion of the code jams pageGravatar Gareth Coles-0/+118
2018-03-14Dynamic OpenGraph metadata in page templatesGravatar Gareth Coles-5/+20
2018-03-14Add payment info for resources, and two more resourcesGravatar Gareth Coles-9/+74
* Code Combat * Corey Schafer's Python tutorials playlist
2018-03-13Datadog TCP loggingGravatar Gareth Coles-2/+28
2018-03-13Remove unused importGravatar Gareth Coles-2/+0
2018-03-13Update info section with an indexGravatar Gareth Coles-9/+50
2018-03-13Minor bugfix to allow tag.delete to return success as False if the tag ↵Gravatar Leon Sandøy-5/+8
doesn't exist
2018-03-10Logging fixesGravatar Gareth Coles-3/+3
2018-03-10Logging with PapertrailGravatar Gareth Coles-2/+22
2018-03-07removes gunicorn config as it is no longer being used (#39)Gravatar Christopher Baklid-46/+0
2018-03-06API for tags (#34)Gravatar Leon Sandøy-79/+254
* Help page and misc improvements Committing so I can go home >:| * [WIP] - API improvements for the tag features. Not completed. * renaming tag.py to tags.py and refactoring the nomenclature of docs to tags * fixed error message in tags, cleaning up app_test.py * tests for the tags feature * ignoring jsonify returns cause coverall can't handle them * Catch-all error view for the API blueprint * cleaning up APIErrorView a little * bringing coverage for tags.py to 100% * how did this get in here? * how did this get in here? ROUND 2 * Removing the 503 database error handling. It's not in use and we should probably rethink that whole custom error handling system anyway. * Converting the tags file to use the @api_params decorator instead of validating manually. Tested with bot staging.
2018-03-04Fix user API testGravatar Gareth Coles-6/+6
2018-03-04Fixes for the API validation decoratorGravatar Gareth Coles-6/+10
2018-03-04Info pages #13xan #13xak (#36)Gravatar Gareth Coles-57/+351
* Info pages and templates * Info pages and templates * Info pages and templates * Update navigation and fix up HTML * Navigation HTML spacing for readability * Fix error views not using `self.render()` * `render()` method should accept Any for context values * Change header linking CSS to a dedicated class * Rules page * Basic resources page setup * Fix headers for new CSS class * Resource categories and initial resource data * Add link to JSON file on GH - won't work until the branch is merged * Remove info overview page and redirect info root url to resources * Flake8 * Add some tests * Line lengths
2018-03-03Fix navbar dropdownGravatar Gareth Coles-8/+8
2018-03-03Mobile optimisation (#33)Gravatar Joseph-90/+121
* Fix squished logo & button * Hide terminal on mobile * A misc set of fixes * Newline in window.css * Add extra_head block to base template * Move script/CSS loading to extra_head block in error view * Move terminal JS into window.onload * Replace `var` with `let` and enable strict mode in 500.js * Stop typewriter when the terminal is closed * Move terminal onclick assignment to 500.js * Move error page <style> contents into window.css * Tidy up error page HTML and remove unmatched tags
2018-03-01Switch type from NotFound to HTTPException & add post support to 5XX and 4XXGravatar JoeBanks13-2/+26
2018-03-01Gdude got nit picky and made me change the Mac OS terminal to say it's on MacGravatar JoeBanks13-1/+1
2018-03-01Change 418 error descriptionGravatar JoeBanks13-1/+1
2018-03-01Add safe so it is not escapedGravatar JoeBanks13-1/+1
2018-03-01noscript should use templated errorGravatar JoeBanks13-1/+1
2018-03-01OpenGraph metadata (#32)Gravatar Joseph-18/+25
Better embedding for the url to the site.
2018-03-01Fix spacing issuesGravatar JoeBanks13-2/+2
2018-03-01Instead of making flask error when rendering unsupported status codes just ↵Gravatar JoeBanks13-1/+4
send 500
2018-03-01Change link to enclose more textGravatar JoeBanks13-7/+6