TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix all pep8 and eslint errors :0

Browse Source
This commit is contained in:
Jan Tuomi
2017-05-21 16:28:47 +03:00
parent 4ab9c98b57
commit a2fb923220
32 changed files with 306 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/management/commands/createdefaultadmin.py
+1 -1
View File
@@ -1,7 +1,7 @@
from django.core.management.base import BaseCommand, CommandError
from django.contrib.auth.models import User
class Command(BaseCommand):
user_name = "admin"
password = "password123"
webapp/management/commands/createdummydata.py
+67
View File
@@ -0,0 +1,67 @@
import time
import random
from members.models import Member, Request
from infoscreen.models import ExternalImageInfoItem, Rotation, InfoInstance
from misc.namegenerator import generate_names
from django.core.management.base import BaseCommand, CommandError
class Command(BaseCommand):
def handle(self, *args, **options):
print('THIS SCRIPT WILL GENERATE DUMMY VALUES TO DATABASE '
'AND SHOULD __NEVER__ BE RUN ON PRODUCTION. '
'IF YOU ARE ON PRODUCTION ABORT (ctrl-c) IMMEDIATELY!!!! '
'CONTINUING IN 10 SECONDS')
time.sleep(10)
DOMAINS = ["example.coms", 'ggmail.om', "notmail.dom"] # intentionally wrong
PLACES = ["Helsinki", "Espoo", "Korso", "Kerava", "Kouvostoliitto"]
MEMBER_COUNT = 30
MEMBER_REQUEST_COUNT = 3
names = generate_names(MEMBER_COUNT)
for i in range(MEMBER_COUNT):
first, last = names[i]
mail = "{}.{}@{}".format(first.lower(), last.lower(), random.choice(DOMAINS))
por = random.choice(PLACES)
ayy = random.randint(0, 1)
jas = random.randint(0, 1)
Member.objects.create(first_name=first,
last_name=last,
email=mail,
POR=por,
AYY=ayy,
jas=jas)
i_item = ExternalImageInfoItem.objects.create(
name="Heavy",
url="https://i.imgur.com/XXSSqDG.gif"
)
rot = Rotation.objects.create(name="Demo")
inst = InfoInstance.objects.create(
rotation=rot,
item=i_item,
duration=20.0
)
names = generate_names(MEMBER_COUNT)
for i in range(MEMBER_COUNT):
first, last = names[i]
mail = "{}.{}@{}".format(first.lower(), last.lower(), random.choice(DOMAINS))
por = random.choice(PLACES)
ayy = random.randint(0, 1)
jas = random.randint(0, 1)
Member.objects.create(first_name=first,
last_name=last,
email=mail,
POR=por,
AYY=ayy,
jas=jas)
webapp/management/commands/initialize.py
+14 -9
View File
@@ -1,8 +1,8 @@
from django.core.management.base import BaseCommand, CommandError
from django.contrib.auth.models import Group, Permission
from django.contrib.contenttypes.models import ContentType
class Command(BaseCommand):
'''
Creates initial skeleton for the webapp.
@@ -10,19 +10,25 @@ class Command(BaseCommand):
'''
def handle(self, *args, **options):
self.stdout.write("Creating sikadmin group")
sikadmin_group, created = Group.objects.get_or_create(name="sikadmin")
if not created:
self.stdout.write("The group 'sikadmin' already existed and was not therefore created")
self.stdout.write('The group "sikadmin" already existed'
'and was not therefore created')
self.stdout.write("Creating sikadmin permission")
group_ctype = ContentType.objects.get_for_model(Group) # TODO Use some sikadmin native model when such exists
sikadmin_permission, created = Permission.objects.get_or_create(codename='sikadmin',
content_type=group_ctype,
name='SIK Admin')
# TODO Use some sikadmin native model when such exists
group_ctype = ContentType.objects.get_for_model(Group)
sikadmin_permission, created = Permission.objects.get_or_create(
codename='sikadmin',
content_type=group_ctype,
name='SIK Admin')
if not created:
self.stdout.write("The permission 'sikadmin' already existed and was not therefore created")
self.stdout.write('The permission "sikadmin" already existed'
'and was not therefore created')
self.stdout.write("Giving sikadmin group permission to sikadmin")
if sikadmin_group.permissions.filter(id=sikadmin_permission.id).exists():
@@ -31,4 +37,3 @@ class Command(BaseCommand):
sikadmin_group.permissions.add(sikadmin_permission)
self.stdout.write("Initialization successful")
webapp/models.py
+10 -5
View File
@@ -1,8 +1,11 @@
from django.db import models
from django.utils import timezone
class Tag(models.Model):
dummyname = models.CharField(max_length=127) # ALWAYS USE TRANSLATED NAME!!!
# ALWAYS USE TRANSLATED NAME!!!
dummyname = models.CharField(max_length=127)
class TagTr(models.Model):
'''
@@ -12,21 +15,23 @@ class TagTr(models.Model):
name = models.CharField(max_length=127)
translation_for = models.ForeignKey('Tag', related_name='translations')
class Info(models.Model):
'''
model containing something showing on some info feed
'''
publish_time = models.DateTimeField(default=timezone.now)
#published_by = models.Foreignkey(User) #<-- TODO create usermodel
tags = models.ManyToManyField(Tag,related_name="news")
# published_by = models.Foreignkey(User) #<-- TODO create usermodel
tags = models.ManyToManyField(Tag, related_name="news")
class InfoTr(models.Model):
'''
Model containing translations for news
'''
lang = models.CharField(max_length=2, default='fi')
topic = models.CharField(max_length=255)
content = models.TextField()
translation_for = models.ForeignKey('Info', related_name='translations')
webapp/static/js/controllers.js
-1
View File
@@ -1 +0,0 @@
var app = angular.module('webApp', []);
webapp/templates/base.html
+9 -21
View File
@@ -1,9 +1,10 @@
{% load i18n %}
<!DOCTYPE html>
{% load i18n %}
{% load static %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en" ng-app="webApp">
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -11,26 +12,13 @@
<meta name="author" content="veedeeämkoo">
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<title>Aalto-yliopiston Sähköinsinöörikilta ry</title>
<title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<!-- DatePicker -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-messages.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js"></script>
<script src="{% static "js/controllers.js" %}"></script>
<script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
<script src="{% static "js/lib/bootstrap.min.js" %}"></script>
<link rel="stylesheet" href="{% static "css/lib/bootstrap.min.css" %}">
<script src="{% static "js/lib/underscore-min.js" %}"></script>
</head>
<body>
webapp/urls.py
+6 -8
View File
@@ -1,18 +1,16 @@
from django.conf.urls import url
# main
from webapp.views import main_index
from webapp.views import admin_index
# login
from webapp.views import login_view
from webapp.views import logout_view
urlpatterns = [
# main
url(r'^$', main_index),
url(r'^sikadmin$', admin_index),
# main
url(r'^$', main_index),
url(r'^sikadmin$', admin_index),
# login stuff
url(r'^login$', login_view),
url(r'^logout$', logout_view),
# login stuff
url(r'^login$', login_view),
url(r'^logout$', logout_view),
]
webapp/views.py
+11 -5
View File
@@ -6,20 +6,23 @@ from django.contrib.auth.decorators import permission_required
from django.conf import settings
import logging
webilogger = logging.getLogger(__name__)
logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s', level=settings.LOGGERLEVEL, filename=settings.LOGPATH)
webapplogger = logging.getLogger(__name__)
logging.basicConfig(format='[%(levelname)s]%(asctime)s %(message)s',
level=settings.LOGGERLEVEL, filename=settings.LOGPATH)
@require_http_methods(["GET"])
def main_index(request, *args, **kwargs):
return render(request, "main_index.html", {})
@require_http_methods(["GET", "POST"])
@ensure_csrf_cookie
@permission_required('members.change_member', login_url='/login')
def admin_index(request, *args, **kwargs):
return render(request, "admin_index.html", {})
@require_http_methods(["GET", "POST"])
def login_view(request, *args, **kwargs):
if request.method == "POST":
@@ -28,15 +31,18 @@ def login_view(request, *args, **kwargs):
user = authenticate(username=uname, password=pw)
if user is not None:
login(request, user)
original_site = request.GET.get("next",None) or "/"
original_site = request.GET.get("next", None) or "/"
return redirect(original_site)
return render(request, "login.html", {"error" : "☹ Kirjautuminen kosahti. Yritä uudelleen!"})
return render(request, "login.html", {"error": "☹ Kirjautuminen kosahti. Yritä uudelleen!"})
# user got here by a get request
user = request.user
if user.is_authenticated():
return redirect("/") # user shoud not be here authenticated with get but get rid if is
# user shoud not be here authenticated with get but get rid if is
return redirect("/")
return render(request, "login.html", {})
@require_http_methods(["POST"])
def logout_view(request, *args, **kwargs):
logout(request)