Refactor (!15) · Merge requests · Jan Maximilian Michal / grady

Merged Jan Maximilian Michal requested to merge refactor into master 7 years ago

Nov 15, 2017

Merge branch 'pre-commit' into 'refactor' · 295379b6
Jan Maximilian Michal authored 7 years ago
```
Pre commit

See merge request !14
```
295379b6

Finally working prospector pre-commit check!!!! · 7147fbe8

To enable the pre-commit checks first run pip -Ur requierements.txt to install pre-commit. Next run pre-commit install to install the hook in your .git/hooks folder. Running pre-commit will now run prospector on all new or modified files in the backend/ directory (see pre-commit-scripts/prospector.sh for the arguments that are used). If you get an error saying prospector not found or smth. make sure you have the venvv activated or prospector installed globally.

7147fbe8

Nov 14, 2017
- Works for me. Should resolve the issues mentioned in #47 . · e5d0f2e6
  Jan Maximilian Michal authored 7 years ago
  
  e5d0f2e6
- Current status of pre-commit. · e684f25e
  robinwilliam.hundt authored 7 years ago
  
  Not working!
  e684f25e
Nov 13, 2017
- Fixing frontend tests · aade6c6e
  Jan Maximilian Michal authored 7 years ago
  
  aade6c6e
- Completely refactored CI and Dockerfiles · 047735d6
  Jan Maximilian Michal authored 7 years ago
  
  - the forntend will now be part of the main image since its static anyway - The frontend has a testing stage - reorganized .gitignore files - docker-compose works as expected - serving api on 8000 - serving frontend on 8080
  047735d6
- Added local prospector pre-commit hook · 0acfd677
  robinwilliam.hundt authored 7 years ago
  
  also removed unused arguments in delber.py that prospector didn't like
  0acfd677
- test · cdbec165
  robinwilliam.hundt authored 7 years ago
  
  cdbec165
- pre-commit test · 3c774236
  robinwilliam.hundt authored 7 years ago
  
  3c774236
- pre-commit test commit · f539d468
  robinwilliam.hundt authored 7 years ago
  
  f539d468
- Added pre-commit as a dependency. · 12ed6ce2
  robinwilliam.hundt authored 7 years ago
  
  12ed6ce2
Nov 11, 2017
- Merge branch 'refactor' of gitlab.gwdg.de:j.michal/grady into refactor · ce3ccdf0
  robinwilliam.hundt authored 7 years ago
  
  ce3ccdf0
- Migrated from bootstrap-vue to vuetify · 6f6f7eae
  robinwilliam.hundt authored 7 years ago
  
  Changed package.json mian.js App.vue accordingly. StudentPage Components need updating.
  6f6f7eae
Nov 10, 2017
- Adding missing database migrations · 43cb3c1d
  Jan Maximilian Michal authored 7 years ago
  
  43cb3c1d
- Removed slug fields from models · c6b41c86
  Jan Maximilian Michal authored 7 years ago
  
  c6b41c86
- Ran isort and fixed some post merging issues · 3fc4cbe2
  Jan Maximilian Michal authored 7 years ago
  
  3fc4cbe2
- Deleted custom_annotations · d82e1daa
  robinwilliam.hundt authored 7 years ago
  
  d82e1daa
- Merge branch 'student-page' into refactor · 83153212
  Jan Maximilian Michal authored 7 years ago
  
  83153212
- Cleaning up some merge conflict leftovers · a5acc134
  Jan Maximilian Michal authored 7 years ago
  
  a5acc134
- Removed *.json from gitignore · 1718c424
  robinwilliam.hundt authored 7 years ago
  
  1718c424
- First step towards REST + Vue Student Page · 074f4c33
  robinwilliam.hundt authored 7 years ago
  
  Backend - Added isStudent permission - Added serializers apropriate for StudentPage - Added api-endpoint urls - Added views regarding StudentPage - Migrated the Django Session Authentication to djangorestframework-jwt authentication Frontend - Migrated from vue-resource to axios because of better documentation & features - Added Login Component - Added First Part of StudentPage containing overview of exam and subissions Closes #41 References #39
  074f4c33
- Fixing eslint and removed unused dependency · cc434696
  Jan Maximilian Michal authored 7 years ago
  
  cc434696
- Finished an example test case for student page · bb1723ff
  Jan Maximilian Michal authored 7 years ago
  
  bb1723ff
- Added basic logging configuration. Enabled karma tests. Reverted changes · 4cb4134e
  Jan Maximilian Michal authored 7 years ago
  
  to User model - It is now possible to run tests in the frontend. - The backend authentication uses AbstractUser instead of AbsstractBaseuser
  4cb4134e
Nov 09, 2017
- Fixing the failing CI job, view is no longer a package but a file again. · eb8b8603
  Jan Maximilian Michal authored 7 years ago
  
  - ran isort to properly sort imports - reformatter some classes
  eb8b8603
- Makefile fix and minor formatting issues (PEP8, and line length) · a7403bc5
  Jan Maximilian Michal authored 7 years ago
  
  a7403bc5
- Reorderd imports in compliance with isort rules · 673686af
  Jan Maximilian Michal authored 7 years ago
  
  673686af
- Added a prospector CI job · a8e51d33
  Jan Maximilian Michal authored 7 years ago
  
  a8e51d33
- Added and configured prospector · 6587cd94
  Jan Maximilian Michal authored 7 years ago
  
  6587cd94
- Fixed Docker command in Makefile · 3d6dc30e
  Jan Maximilian Michal authored 7 years ago
  
  3d6dc30e
- Removed *.json from gitignore · 3c7b65d5
  robinwilliam.hundt authored 7 years ago
  
  3c7b65d5
- Sanitized backend · 9ca68496
  robinwilliam.hundt authored 7 years ago
  
  Deleted templates, fixtures, static files, urls, views
  9ca68496
Nov 08, 2017

First step towards REST + Vue Student Page · a5f6d70d

robinwilliam.hundt authored 7 years ago

Backend
- Added isStudent permission
- Added serializers apropriate for StudentPage
- Added api-endpoint urls
- Added views regarding StudentPage
- Migrated the Django Session Authentication to djangorestframework-jwt authentication

Frontend
- Migrated from vue-resource to axios because of better documentation & features
- Added Login Component
- Added First Part of StudentPage containing overview of exam and subissions

Closes #41
References #39

a5f6d70d

Fixes #40 . Added appropriate fields for the Django admin interface · d5fb5065
Jan Maximilian Michal authored 7 years ago

d5fb5065

Nov 05, 2017

Changed UserAccount to provide access to Admin panel. · 13d8e4fb

robinwilliam.hundt authored 7 years ago

Added has_perm() and has_module_perm() to UserAccount model. Both return is_superuser . This allows superusers to access AdminPanel.

AdminPanel now displays usernames in User ListView.

13d8e4fb

Nov 04, 2017
- Updated requirements.txt with django-cors-headers · e20a64a0
  Jan Maximilian Michal authored 7 years ago
  
  e20a64a0
- Started work on StudentPage serializer and views · a03dae1a
  robinwilliam.hundt authored 7 years ago
  
  a03dae1a
- Simple Serializer for Student, Submssion and Feedback · 1bb9074c
  robinwilliam.hundt authored 7 years ago
  
  1bb9074c
- Reworked the user account system and removed groups · fc57a9a6
  Jan Maximilian Michal authored 7 years ago
  
  fc57a9a6
- Reverted changes to .gitignore · ffd2cde3
  Jan Maximilian Michal authored 7 years ago
  
  ffd2cde3
- Merge branch 'refactor' of gitlab.gwdg.de:j.michal/grady into refactor · d75340f5
  robinwilliam.hundt authored 7 years ago
  
  d75340f5
- Added .idea to .gitignore · 8991d3cc
  robinwilliam.hundt authored 7 years ago
  
  Update yarn.lock
  8991d3cc
- Removed password validators from default.py added them to live.py · b069fa9d
  robinwilliam.hundt authored 7 years ago
  
  b069fa9d
- Updated README.md to accommodate folder structure during install · 464b7c41
  robinwilliam.hundt authored 7 years ago
  
  464b7c41
- Update .gitlab-ci.yml · eead0ee6
  robinwilliam.hundt authored 7 years ago
  
  Configured tes_coverage and test_pylint to change to backend dir
  eead0ee6
Nov 03, 2017

Initiliazed front-end folder · 685817b5

robinwilliam.hundt authored 7 years ago

The front-end folder has been initiliazed with the vue webpack template including configuration for unit-testing with Karma + Mocha.

685817b5

Relocated node_modules folder · f0a1e354

robinwilliam.hundt authored 7 years ago

See [django npm and node packages architecture](https://stackoverflow.com/questions/41966065/django-npm-and-node-packages-architecture) for details on why this is better.

f0a1e354

New try to fix CI. · e016012d
robinwilliam.hundt authored 7 years ago

e016012d
Refactor broke CI. Changed relevant paths. · 0235af4a
robinwilliam.hundt authored 7 years ago

0235af4a

Refactor of project structure - Django part · e8c3d925

robinwilliam.hundt authored 7 years ago

The project has been refactored so far as the current state of master has been placed under backend/ .
Some changes to the .gitignore and Makefile have been made to accomodate this refactor.

e8c3d925

Refactor

Merge request reports

Activity