Report store merge#11
Open
JacobLind1 wants to merge 60 commits intotest123:masterfrom
Open
Conversation
This reverts commit 0ae235d. # Conflicts: # testquery.py
…, with model for AnalysisTask including request structure, user, language etc. Some simple tests on creation, APIView endpoint for analysis task and status endpoint. Uses serializer to interpret data from frontend
# Conflicts: # front-end/index.html
User Interface
Initial backend commit: barebones backend inside app folder GroupFive…
Postgres_db_connection
…ts. Added database integration lacking actual database and user
… Renamed testquery,py as it was conflicting with some python test naming.
Simple Login and Register pages. Needs to be linked to backend
Pre scan
Backendtoo
- changed group5 into a new app called scanner - updated everything to fully remove eel functionality - cleaned up duplicate code and unneeded testing code
…paste code button is broke. good news login page is almost fully connected
Refactored everything in main branch
Logout button
# Conflicts: # front-end/index.html # front-end/scripts/upload.js # front-end/styles/style.css
Frontend 2
Connected register to database, modified login to refer to our user model
vulnerability page added
fixed merging errors and updated everything with the changes
# Conflicts: # api/urls.py # api/views.py # front-end/index.html
…ration to refer to code_submission table
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Recent scans now provides true history, and are selectable to regenerate a functioning report. Added fields to codesubmission model and then needed to modify migration 0002_codesubmission_incident_id... in order to point to the correct table in our database. Also removed/edited some references to default user and related packages and changed to refer to our user model and use our manual password required method.