Compare commits
17
Commits
iss07
...
3322649f05
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3322649f05 | ||
|
|
6b99dd5250 | ||
|
|
d4dbd3d9da | ||
|
|
5b7f847bc6 | ||
|
|
99eaafff00 | ||
|
|
446a55f3e5 | ||
|
|
2f970d6eb4 | ||
|
|
c1deabc692 | ||
|
|
fb3e425471 | ||
|
|
46bc47f046 | ||
|
|
8db2774f7c | ||
|
|
272498b4ce | ||
|
|
12323615c7 | ||
|
|
9d6857cfe2 | ||
|
|
565bb3963e | ||
|
|
3b2deb865e | ||
|
|
de3e844089 |
+45
-9
@@ -1,10 +1,46 @@
|
|||||||
*.pyc
|
# Virtuelle Umgebung
|
||||||
*.swp
|
venv/
|
||||||
bin/
|
env/
|
||||||
manage.py
|
ENV/
|
||||||
|
.venv
|
||||||
|
|
||||||
|
# Python
|
||||||
|
__pycache__/
|
||||||
|
*.py[cod]
|
||||||
|
*$py.class
|
||||||
|
*.so
|
||||||
|
.Python
|
||||||
|
build/
|
||||||
|
develop-eggs/
|
||||||
|
dist/
|
||||||
|
downloads/
|
||||||
|
eggs/
|
||||||
|
.eggs/
|
||||||
|
lib/
|
||||||
|
lib64/
|
||||||
|
parts/
|
||||||
|
sdist/
|
||||||
|
var/
|
||||||
|
wheels/
|
||||||
|
*.egg-info/
|
||||||
|
.installed.cfg
|
||||||
|
*.egg
|
||||||
|
|
||||||
|
# Django
|
||||||
|
*.log
|
||||||
|
db.sqlite3
|
||||||
media/
|
media/
|
||||||
old_stuff/
|
staticfiles/
|
||||||
static/
|
|
||||||
templates/blogindex.html-media
|
# IDE
|
||||||
tippy/static/
|
.vscode/
|
||||||
warnings.txt
|
.idea/
|
||||||
|
*.swp
|
||||||
|
*.swo
|
||||||
|
*~
|
||||||
|
|
||||||
|
# Umgebungsvariablen
|
||||||
|
.env
|
||||||
|
.env.local
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
- getSeason() only for staff members
|
||||||
|
- new view staff()
|
||||||
|
- updated bootstrap to version 3.4.1
|
||||||
|
- updated jquery to 3.6.3
|
||||||
|
- changed container layout in main view 'matchday'
|
||||||
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
"""
|
||||||
|
ASGI config for TipPy project.
|
||||||
|
|
||||||
|
It exposes the ASGI callable as a module-level variable named ``application``.
|
||||||
|
|
||||||
|
For more information on this file, see
|
||||||
|
https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
from django.core.asgi import get_asgi_application
|
||||||
|
|
||||||
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
|
||||||
|
|
||||||
|
application = get_asgi_application()
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
"""
|
||||||
|
Django settings for TipPy project.
|
||||||
|
|
||||||
|
Generated by 'django-admin startproject' using Django 4.0.6.
|
||||||
|
|
||||||
|
For more information on this file, see
|
||||||
|
https://docs.djangoproject.com/en/4.0/topics/settings/
|
||||||
|
|
||||||
|
For the full list of settings and their values, see
|
||||||
|
https://docs.djangoproject.com/en/4.0/ref/settings/
|
||||||
|
"""
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Build paths inside the project like this: BASE_DIR / 'subdir'.
|
||||||
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
|
# Quick-start development settings - unsuitable for production
|
||||||
|
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
|
||||||
|
|
||||||
|
# SECURITY WARNING: keep the secret key used in production secret!
|
||||||
|
SECRET_KEY = 'django-insecure-jiw8js(^@d)no7tv(oq+ugl3kj=f8@j-kz3bj530&!%!$cjqj9'
|
||||||
|
|
||||||
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
|
DEBUG = True
|
||||||
|
|
||||||
|
ALLOWED_HOSTS = []
|
||||||
|
|
||||||
|
# Application definition
|
||||||
|
INSTALLED_APPS = [
|
||||||
|
'django.contrib.admin',
|
||||||
|
'django.contrib.auth',
|
||||||
|
'django.contrib.contenttypes',
|
||||||
|
'django.contrib.sessions',
|
||||||
|
'django.contrib.messages',
|
||||||
|
'django.contrib.staticfiles',
|
||||||
|
'django.contrib.humanize',
|
||||||
|
'tipp'
|
||||||
|
]
|
||||||
|
|
||||||
|
MIDDLEWARE = [
|
||||||
|
'django.middleware.security.SecurityMiddleware',
|
||||||
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
|
'django.middleware.common.CommonMiddleware',
|
||||||
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
|
]
|
||||||
|
|
||||||
|
ROOT_URLCONF = 'TipPy.urls'
|
||||||
|
|
||||||
|
TEMPLATES = [
|
||||||
|
{
|
||||||
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
|
'DIRS': [BASE_DIR / 'templates']
|
||||||
|
,
|
||||||
|
'APP_DIRS': True,
|
||||||
|
'OPTIONS': {
|
||||||
|
'context_processors': [
|
||||||
|
'django.template.context_processors.debug',
|
||||||
|
'django.template.context_processors.request',
|
||||||
|
'django.contrib.auth.context_processors.auth',
|
||||||
|
'django.contrib.messages.context_processors.messages',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
WSGI_APPLICATION = 'TipPy.wsgi.application'
|
||||||
|
WSGI_APPLICATION = 'TipPy.wsgi.application'
|
||||||
|
|
||||||
|
|
||||||
|
# Database
|
||||||
|
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
|
||||||
|
DATABASES = {
|
||||||
|
'default': {
|
||||||
|
'ENGINE': 'django.db.backends.postgresql',
|
||||||
|
'NAME': 'tippy',
|
||||||
|
'USER': 'tippy',
|
||||||
|
'PASSWORD': 'tippy',
|
||||||
|
'HOST': 'localhost',
|
||||||
|
'PORT': '5432',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Password validation
|
||||||
|
# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
|
||||||
|
AUTH_PASSWORD_VALIDATORS = [
|
||||||
|
{
|
||||||
|
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
# Internationalization
|
||||||
|
# https://docs.djangoproject.com/en/4.0/topics/i18n/
|
||||||
|
LANGUAGE_CODE = 'de-de'
|
||||||
|
TIME_ZONE = 'Europe/Berlin'
|
||||||
|
USE_I18N = True
|
||||||
|
USE_TZ = True
|
||||||
|
|
||||||
|
# Absolute filesystem path to the directory that will hold user-uploaded files.
|
||||||
|
# Example: "/home/media/media.lawrence.com/media/"
|
||||||
|
MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
|
||||||
|
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
|
||||||
|
# trailing slash.
|
||||||
|
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
|
||||||
|
MEDIA_URL = '/media/'
|
||||||
|
# Absolute path to the directory static files should be collected to.
|
||||||
|
# Don't put anything in this directory yourself; store your static files
|
||||||
|
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
||||||
|
# Example: "/home/media/media.lawrence.com/static/"
|
||||||
|
MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
|
||||||
|
|
||||||
|
# Static files (CSS, JavaScript, Images)
|
||||||
|
# https://docs.djangoproject.com/en/4.0/howto/static-files/
|
||||||
|
STATIC_URL = 'static/'
|
||||||
|
STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
|
||||||
|
|
||||||
|
if not DEBUG:
|
||||||
|
STATIC_ROOT = ''
|
||||||
|
|
||||||
|
STATICFILES_DIRS = [
|
||||||
|
#os.path.join(BASE_DIR, 'static/'),
|
||||||
|
]
|
||||||
|
|
||||||
|
# STATIC_ROOT=os.path.join(BASE_DIR,"static/")
|
||||||
|
# STATIC_URL = 'static/'
|
||||||
|
# STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), ]
|
||||||
|
|
||||||
|
# Default primary key field type
|
||||||
|
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
|
||||||
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
|
# Redirect on logout
|
||||||
|
LOGOUT_REDIRECT_URL = "home"
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
from django.contrib import admin, auth
|
||||||
|
from django.urls import include, path, re_path
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('', include('tipp.urls')),
|
||||||
|
path('admin/', admin.site.urls),
|
||||||
|
]
|
||||||
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
"""
|
||||||
|
WSGI config for TipPy project.
|
||||||
|
|
||||||
|
It exposes the WSGI callable as a module-level variable named ``application``.
|
||||||
|
|
||||||
|
For more information on this file, see
|
||||||
|
https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
|
||||||
|
from django.core.wsgi import get_wsgi_application
|
||||||
|
|
||||||
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TipPy.settings')
|
||||||
|
|
||||||
|
application = get_wsgi_application()
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
"""Django's command-line utility for administrative tasks."""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Run administrative tasks."""
|
||||||
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TipPy.settings")
|
||||||
|
try:
|
||||||
|
from django.core.management import execute_from_command_line
|
||||||
|
except ImportError as exc:
|
||||||
|
raise ImportError(
|
||||||
|
"Couldn't import Django. Are you sure it's installed and "
|
||||||
|
"available on your PYTHONPATH environment variable? Did you "
|
||||||
|
"forget to activate a virtual environment?"
|
||||||
|
) from exc
|
||||||
|
execute_from_command_line(sys.argv)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
asgiref==3.12.1
|
||||||
|
Django==6.1.1
|
||||||
|
pillow==12.3.0
|
||||||
|
psycopg2==2.9.13
|
||||||
|
pytz==2026.3.post1
|
||||||
|
sqlparse==0.6.0
|
||||||
|
suds-community==1.2.0
|
||||||
|
urllib3==2.8.0
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
{% load i18n static %}
|
{% load i18n static %}
|
||||||
{% load humanize %}
|
{% load humanize %}
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block nav %}
|
{% block nav %}
|
||||||
|
|||||||
+6
-6
@@ -16,13 +16,13 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<!-- Bootstrap -->
|
<!-- Bootstrap -->
|
||||||
<link href="{{ STATIC_URL }}css/bootstrap.min.css" rel="stylesheet">
|
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
|
||||||
|
|
||||||
<!-- Bootstrap-Theme -->
|
<!-- Bootstrap-Theme -->
|
||||||
<link href="{{ STATIC_URL }}css/bootstrap-theme.min.css" rel="stylesheet">
|
<link href="{% static 'css/bootstrap-theme.min.css' %}" rel="stylesheet">
|
||||||
|
|
||||||
<!-- Bootstrap-Theme -->
|
<!-- Bootstrap-Theme -->
|
||||||
<link href="{{ STATIC_URL }}css/tippy-bootstrap.css" rel="stylesheet">
|
<link href="{% static 'css/tippy-bootstrap.css' %}" rel="stylesheet">
|
||||||
|
|
||||||
<!-- Unterstützung für Media Queries und HTML5-Elemente im Internet Explorer über HTML5 shim und Respond.js -->
|
<!-- Unterstützung für Media Queries und HTML5-Elemente im Internet Explorer über HTML5 shim und Respond.js -->
|
||||||
<!-- ACHTUNG: Respond.js funktioniert nicht, wenn du die Seite über file:// aufrufst -->
|
<!-- ACHTUNG: Respond.js funktioniert nicht, wenn du die Seite über file:// aufrufst -->
|
||||||
@@ -36,9 +36,9 @@
|
|||||||
<body>
|
<body>
|
||||||
|
|
||||||
<!-- jQuery (wird für Bootstrap JavaScript-Plugins benötigt) -->
|
<!-- jQuery (wird für Bootstrap JavaScript-Plugins benötigt) -->
|
||||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
|
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.3/jquery.min.js"></script>
|
||||||
<!-- Binde alle kompilierten Plugins zusammen ein (wie hier unten) oder such dir einzelne Dateien nach Bedarf aus -->
|
<!-- Binde alle kompilierten Plugins zusammen ein (wie hier unten) oder such dir einzelne Dateien nach Bedarf aus -->
|
||||||
<script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
|
<script src="{% static 'js/bootstrap.min.js'%}"></script>
|
||||||
|
|
||||||
{% block nav %}{% endblock %}
|
{% block nav %}{% endblock %}
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
<div class="col-md-7">
|
<div class="col-md-7">
|
||||||
<p>
|
<p>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
© Martin Bley, 2014-2016 | Dank an
|
© Martin Bley, 2014-2023 | Dank an
|
||||||
<a href="http://openligadb.de">OpenLigaDB</a> für die Bereitstellung der
|
<a href="http://openligadb.de">OpenLigaDB</a> für die Bereitstellung der
|
||||||
Spielergebnisse.
|
Spielergebnisse.
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+17
-13
@@ -19,25 +19,29 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<ul class="media-list">
|
||||||
{% for post, avatar in posts %}
|
{% for post, avatar in posts %}
|
||||||
<div class="row">
|
<li class="media">
|
||||||
<div class="col-md-7">
|
<a href="#" class="pull-left">
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
{{post.author.first_name}} schrieb {{post.created|naturaltime}}
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{% if avatar %}
|
{% if avatar %}
|
||||||
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" />
|
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
|
||||||
|
src="/media/{{ avatar }}"/>
|
||||||
{% else %}
|
{% else %}
|
||||||
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" />
|
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
|
||||||
|
src="/media/profiles/dummy.png"/>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{post.content|safe}}
|
</a>
|
||||||
</div>
|
<div class="media-body">
|
||||||
</div>
|
<span class="text-muted pull-right">
|
||||||
</div>
|
<small class="text-muted">{{ post.created|naturaltime }}</small>
|
||||||
|
</span>
|
||||||
|
<strong class="text-success">{{ post.author.first_name }}</strong>
|
||||||
|
<p>{{ post.content|safe }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-7">
|
<div class="col-md-7">
|
||||||
<nav>
|
<nav>
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
{% load humanize %}
|
||||||
|
<hr>
|
||||||
|
<p class="text-left">
|
||||||
|
<a class="btn btn-default" href="/blog/newpost" role="button">neuer Post</a>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ul class="media-list">
|
||||||
|
{% for post, avatar in posts %}
|
||||||
|
<li class="media">
|
||||||
|
<a href="#" class="pull-left">
|
||||||
|
{% if avatar %}
|
||||||
|
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
|
||||||
|
src="/media/{{ avatar }}"/>
|
||||||
|
{% else %}
|
||||||
|
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic"
|
||||||
|
src="/media/profiles/dummy.png"/>
|
||||||
|
{% endif %}
|
||||||
|
</a>
|
||||||
|
<div class="media-body">
|
||||||
|
<span class="text-muted pull-right">
|
||||||
|
<small class="text-muted">{{ post.created|naturaltime }}</small>
|
||||||
|
</span>
|
||||||
|
<strong class="text-success">{{ post.author.first_name }}</strong>
|
||||||
|
<p>{{ post.content|safe }}</p>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{% extends "base.html" %}
|
|
||||||
{% load url from future %}
|
|
||||||
{% comment %}
|
|
||||||
Main page to authenticate users.
|
|
||||||
{% endcomment %}
|
|
||||||
|
|
||||||
{% block head %}
|
|
||||||
<title>TipPy | Login</title>
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block nav %}
|
|
||||||
{% include "nav_login.html" with ls=ls season=season %}
|
|
||||||
{% endblock %}
|
|
||||||
|
|
||||||
{% block body %}
|
|
||||||
{% if form.errors %}
|
|
||||||
<div class="row">
|
|
||||||
<p>Benutzename und Passwort passen nicht zusammen. Bitte versuche es noch einmal.</p>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-3">
|
|
||||||
<form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
|
|
||||||
<h2 class="form-signin-heading">Bitte melde dich an</h2>
|
|
||||||
{% csrf_token %}
|
|
||||||
<input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
|
|
||||||
<input class="form-control" type="password" required="" placeholder="Passwort" name="{{form.password.html_name}}" />
|
|
||||||
<button class="btn btn-lg btn-primary btn-block" type="submit">Anmelden</button>
|
|
||||||
<input type="hidden" name="next" value="{{ next }}" />
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
+22
-36
@@ -2,7 +2,7 @@
|
|||||||
{% load i18n static %}
|
{% load i18n static %}
|
||||||
{% load humanize %}
|
{% load humanize %}
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<script type="text/javascript" src="{{ STATIC_URL }}javascript/tippy.js"></script>
|
<script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block nav %}
|
{% block nav %}
|
||||||
@@ -12,36 +12,17 @@
|
|||||||
{% block body %}
|
{% block body %}
|
||||||
<div id="content-main">
|
<div id="content-main">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-7">
|
<div class="col-md-6">
|
||||||
<h2>Neueste Nachrichten</h2>
|
<h3>Deine Tipps</h3>
|
||||||
<p class="text-right">
|
|
||||||
<a class="btn btn-default" href="/blog/1" role="button">zum Blog</a>
|
|
||||||
</p>
|
|
||||||
{% for post, avatar in posts %}
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
{{post.author.first_name}} schrieb {{post.created|naturaltime}}
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
{% if avatar %}
|
|
||||||
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/{{avatar}}" />
|
|
||||||
{% else %}
|
|
||||||
<img class="img-circle img-responsive pull-left blog" alt="Profile Pic" src="/media/profiles/dummy.png" />
|
|
||||||
{% endif %}
|
|
||||||
{{post.content|safe}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-7">
|
|
||||||
<h2>Deine Tipps</h2>
|
|
||||||
<nav>
|
<nav>
|
||||||
<ul class="pager">
|
<ul class="pager">
|
||||||
<li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span aria-hidden="true">←</span></a></li>
|
<li data-toggle="tooltip" title="{% trans 'previous' %}" class="previous"><a
|
||||||
|
href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"-1"|stringformat:"02i" }}"><span
|
||||||
|
aria-hidden="true">←</span></a></li>
|
||||||
{{ md_name }}
|
{{ md_name }}
|
||||||
<li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span aria-hidden="true">→</span></a></li>
|
<li data-toggle="tooltip" title="{% trans 'next' %}" class="next"><a
|
||||||
|
href="/matchday/{{ ls }}/{{ season }}/{{ cur_md|add:"1"|stringformat:"02i" }}"><span
|
||||||
|
aria-hidden="true">→</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
<form role="form" action="" method="post">{% csrf_token %}
|
<form role="form" action="" method="post">{% csrf_token %}
|
||||||
@@ -56,7 +37,8 @@
|
|||||||
</tr>
|
</tr>
|
||||||
{% for match in matches %}
|
{% for match in matches %}
|
||||||
{% if match.started and not match.finished %}
|
{% if match.started and not match.finished %}
|
||||||
<tr class="danger">{% else %}<tr>{% endif %}
|
<tr class="danger">{% else %}
|
||||||
|
<tr>{% endif %}
|
||||||
<td>{{ match.matchDateTime }}</td>
|
<td>{{ match.matchDateTime }}</td>
|
||||||
{% if match.iconURLTeam1 != "" %}
|
{% if match.iconURLTeam1 != "" %}
|
||||||
<td><img src="{{ match.iconURLTeam1 }}" width="20"/>
|
<td><img src="{{ match.iconURLTeam1 }}" width="20"/>
|
||||||
@@ -75,7 +57,8 @@
|
|||||||
<span class="visible-xs"> {{ match.abbrTeam2 }}</span>
|
<span class="visible-xs"> {{ match.abbrTeam2 }}</span>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ match.matchResult }}</td>
|
<td>{{ match.matchResult }}</td>
|
||||||
<td>{{ match.tippFormTeam1 }}</td><td>{{ match.tippFormTeam2 }}</td>
|
<td>{{ match.tippFormTeam1 }}</td>
|
||||||
|
<td>{{ match.tippFormTeam2 }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</table>
|
</table>
|
||||||
@@ -84,12 +67,9 @@
|
|||||||
<span class="glyphicon glyphicon-saved" aria-hidden="true"></span> Tipps abgeben
|
<span class="glyphicon glyphicon-saved" aria-hidden="true"></span> Tipps abgeben
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
{% for mandant, list in mandant_dict.items %}
|
{% for mandant, list in mandant_dict.items %}
|
||||||
<div class="col-md-7">
|
<h3>Mitspieler {{ mandant }}</h3>
|
||||||
<h4>Mitspieler {{ mandant }}</h4>
|
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-hover table-condensed">
|
<table class="table table-hover table-condensed">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -122,8 +102,14 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<h3>Chat</h3>
|
||||||
|
{% block chat %}
|
||||||
|
{% include "chat.xhtml" with posts=posts %}
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
+4
-1
@@ -16,6 +16,9 @@
|
|||||||
<li><a href="/">Tipps</a></li>
|
<li><a href="/">Tipps</a></li>
|
||||||
<li><a href="/charts/{{ ls }}/{{ season }}{% if pos %}/{{ pos }}{% endif %}">Bestenliste</a></li>
|
<li><a href="/charts/{{ ls }}/{{ season }}{% if pos %}/{{ pos }}{% endif %}">Bestenliste</a></li>
|
||||||
<li><a href="/blog/1">Blog</a></li>
|
<li><a href="/blog/1">Blog</a></li>
|
||||||
|
{% if request.user.is_active and request.user.is_staff %}
|
||||||
|
<li><a href="/staff">Staff</a></li>
|
||||||
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
{% if has_refresh %}
|
{% if has_refresh %}
|
||||||
@@ -32,7 +35,7 @@
|
|||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li><a href="/accounts/profile/{{user.id}}">Profil ändern</a></li>
|
<li><a href="/accounts/profile/{{user.id}}">Profil ändern</a></li>
|
||||||
<li><a href="/accounts/password_change/">Passwort ändern</a></li>
|
<li><a href="/accounts/password_change/">Passwort ändern</a></li>
|
||||||
<li><a href="/logout">Abmelden</a></li>
|
<li><a href="/accounts/logout">Abmelden</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -25,10 +25,10 @@
|
|||||||
<form class="form-horizontal" action="" method="post">{% csrf_token %}
|
<form class="form-horizontal" action="" method="post">{% csrf_token %}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
{{ form_bp.content.errors }}
|
{{ form_bp.content.errors }}
|
||||||
<label for="id_content" class="col-sm-4 control-label required">{% trans 'Content' %}</label>
|
|
||||||
<div class="col-sm-5">
|
<div class="col-sm-5">
|
||||||
<textarea class="form-control" maxlength="256" rows="2"
|
<div class="panel-body">
|
||||||
id="id_content" name="content"></textarea>
|
<textarea class="form-control" placeholder="Schreibe einen Kommentar..." id="id_content"
|
||||||
|
name="content" maxlength="100" rows="2"></textarea>
|
||||||
{% if cnt_mandants > 1 %}
|
{% if cnt_mandants > 1 %}
|
||||||
{{ form_mandants.mandants.label_tag }}
|
{{ form_mandants.mandants.label_tag }}
|
||||||
{% for choice in form_mandants.mandants %}
|
{% for choice in form_mandants.mandants %}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load url from future %}
|
{% load admin_urls %}
|
||||||
|
|
||||||
{% comment %}
|
{% comment %}
|
||||||
Main page to authenticate users.
|
Main page to authenticate users.
|
||||||
{% endcomment %}
|
{% endcomment %}
|
||||||
@@ -20,7 +21,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
|
<form class="form-signin" role="form" method="post" action="{% url 'login' %}">
|
||||||
<h2 class="form-signin-heading">Bitte melde dich an</h2>
|
<h2 class="form-signin-heading">Bitte melde dich an</h2>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
|
<input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
{% extends "base.html" %}
|
||||||
|
{% load i18n static %}
|
||||||
|
{% load humanize %}
|
||||||
|
{% block head %}
|
||||||
|
<script type="text/javascript" src="{% static 'javascript/tippy.js' %}"></script>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block nav %}
|
||||||
|
{% include "nav.html" with ls=ls season=season %}
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block body %}
|
||||||
|
<div id="content-main">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<h3>Wettbewerbe</h3>
|
||||||
|
{% for comp in competitions %}
|
||||||
|
{{ comp }}<br/>
|
||||||
|
{% endfor %}
|
||||||
|
<h3></h3>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% if debug %}
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<h2 class="form-signin-heading">{% trans 'Debug' %}</h2>
|
||||||
|
{% for line in debug %}
|
||||||
|
<p>{{ line }}</p>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
# Generated by Django 4.0.6 on 2022-07-14 15:15
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Competition',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('leagueShortcut', models.CharField(max_length=32)),
|
||||||
|
('leagueName', models.CharField(max_length=128)),
|
||||||
|
('season', models.CharField(max_length=4)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Mandant',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('name', models.CharField(max_length=32, unique=True)),
|
||||||
|
('description', models.CharField(max_length=255)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Post',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('content', models.TextField()),
|
||||||
|
('published', models.BooleanField(default=True)),
|
||||||
|
('created', models.DateTimeField(auto_now_add=True)),
|
||||||
|
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'ordering': ['-created'],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Team',
|
||||||
|
fields=[
|
||||||
|
('teamID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
|
||||||
|
('name', models.CharField(max_length=200)),
|
||||||
|
('icon', models.FileField(upload_to='images/team_logos/')),
|
||||||
|
('abbr', models.CharField(max_length=3)),
|
||||||
|
('iconURL', models.CharField(max_length=2000)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'managed': True,
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='UserProfile',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('avatar', models.ImageField(blank=True, upload_to='profiles/')),
|
||||||
|
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Score',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('exact_high', models.PositiveSmallIntegerField()),
|
||||||
|
('exact', models.PositiveSmallIntegerField()),
|
||||||
|
('diff', models.PositiveSmallIntegerField()),
|
||||||
|
('tendency', models.PositiveSmallIntegerField()),
|
||||||
|
('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Match',
|
||||||
|
fields=[
|
||||||
|
('matchID', models.IntegerField(primary_key=True, serialize=False, unique=True)),
|
||||||
|
('matchDateTime', models.DateTimeField()),
|
||||||
|
('group', models.IntegerField()),
|
||||||
|
('matchday', models.IntegerField()),
|
||||||
|
('matchday_name', models.CharField(max_length=128)),
|
||||||
|
('pointsTeam1', models.SmallIntegerField()),
|
||||||
|
('pointsTeam2', models.SmallIntegerField()),
|
||||||
|
('finished', models.BooleanField()),
|
||||||
|
('season', models.CharField(max_length=4)),
|
||||||
|
('leagueShortcut', models.CharField(max_length=12)),
|
||||||
|
('idTeam1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
|
||||||
|
('idTeam2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='tipp.team')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Tipp',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('pointsTeam1', models.PositiveSmallIntegerField()),
|
||||||
|
('pointsTeam2', models.PositiveSmallIntegerField()),
|
||||||
|
('score', models.PositiveIntegerField(blank=True, null=True)),
|
||||||
|
('matchID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.match')),
|
||||||
|
('tipperID', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'unique_together': {('matchID', 'tipperID')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='RelUserMandant',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'unique_together': {('user', 'mandant')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='RelPostMandant',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('mandant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.mandant')),
|
||||||
|
('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.post')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'unique_together': {('post', 'mandant')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='chart',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('points', models.PositiveSmallIntegerField()),
|
||||||
|
('diff', models.SmallIntegerField()),
|
||||||
|
('games', models.PositiveSmallIntegerField()),
|
||||||
|
('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.competition')),
|
||||||
|
('team', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='tipp.team')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'unique_together': {('team', 'competition')},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
+77
-19
@@ -18,25 +18,32 @@ You should have received a copy of the GNU General Public License
|
|||||||
along with TipPy. If not, see <http://www.gnu.org/licenses/>.
|
along with TipPy. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
from django.db import models
|
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
class UserProfile(models.Model):
|
class UserProfile(models.Model):
|
||||||
user = models.OneToOneField(User)
|
user = models.OneToOneField(
|
||||||
|
User,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
avatar = models.ImageField(upload_to="profiles/", blank=True)
|
avatar = models.ImageField(upload_to="profiles/", blank=True)
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return self.user.username
|
return self.user.username
|
||||||
|
|
||||||
|
|
||||||
class Competition(models.Model):
|
class Competition(models.Model):
|
||||||
leagueShortcut = models.CharField(max_length=32)
|
leagueShortcut = models.CharField(max_length=32)
|
||||||
leagueName = models.CharField(max_length=128)
|
leagueName = models.CharField(max_length=128)
|
||||||
season = models.CharField(max_length=4)
|
season = models.CharField(max_length=4)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
unique_together = ("leagueShortcut", "season")
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return (self.leagueShortcut)
|
return (self.leagueShortcut)
|
||||||
|
|
||||||
|
|
||||||
class Team(models.Model):
|
class Team(models.Model):
|
||||||
teamID = models.IntegerField(unique=True, primary_key=True)
|
teamID = models.IntegerField(unique=True, primary_key=True)
|
||||||
name = models.CharField(max_length=200)
|
name = models.CharField(max_length=200)
|
||||||
@@ -58,20 +65,38 @@ class Match(models.Model):
|
|||||||
group = models.IntegerField()
|
group = models.IntegerField()
|
||||||
matchday = models.IntegerField()
|
matchday = models.IntegerField()
|
||||||
matchday_name = models.CharField(max_length=128)
|
matchday_name = models.CharField(max_length=128)
|
||||||
idTeam1 = models.ForeignKey(Team, related_name='+')
|
|
||||||
idTeam2 = models.ForeignKey(Team, related_name='+')
|
competition = models.ForeignKey(
|
||||||
|
Competition,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
|
||||||
|
idTeam1 = models.ForeignKey(
|
||||||
|
Team, related_name='+',
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
idTeam2 = models.ForeignKey(
|
||||||
|
Team, related_name='+',
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
|
||||||
pointsTeam1 = models.SmallIntegerField()
|
pointsTeam1 = models.SmallIntegerField()
|
||||||
pointsTeam2 = models.SmallIntegerField()
|
pointsTeam2 = models.SmallIntegerField()
|
||||||
finished = models.BooleanField()
|
finished = models.BooleanField()
|
||||||
season = models.CharField(max_length=4)
|
|
||||||
leagueShortcut = models.CharField(max_length=12)
|
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return (str(self.matchID))
|
return (str(self.matchID))
|
||||||
|
|
||||||
|
|
||||||
class Tipp(models.Model):
|
class Tipp(models.Model):
|
||||||
matchID = models.ForeignKey(Match)
|
matchID = models.ForeignKey(
|
||||||
tipperID = models.ForeignKey(User)
|
Match,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
tipperID = models.ForeignKey(
|
||||||
|
User,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
pointsTeam1 = models.PositiveSmallIntegerField()
|
pointsTeam1 = models.PositiveSmallIntegerField()
|
||||||
pointsTeam2 = models.PositiveSmallIntegerField()
|
pointsTeam2 = models.PositiveSmallIntegerField()
|
||||||
score = models.PositiveIntegerField(
|
score = models.PositiveIntegerField(
|
||||||
@@ -81,24 +106,38 @@ class Tipp(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ("matchID", "tipperID")
|
unique_together = ("matchID", "tipperID")
|
||||||
|
|
||||||
|
|
||||||
class Mandant(models.Model):
|
class Mandant(models.Model):
|
||||||
name = models.CharField(max_length=32, unique=True)
|
name = models.CharField(max_length=32, unique=True)
|
||||||
description = models.CharField(max_length=255)
|
description = models.CharField(max_length=255)
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
class Score(models.Model):
|
class Score(models.Model):
|
||||||
client = models.ForeignKey(Mandant)
|
client = models.ForeignKey(
|
||||||
|
Mandant,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
exact_high = models.PositiveSmallIntegerField()
|
exact_high = models.PositiveSmallIntegerField()
|
||||||
exact = models.PositiveSmallIntegerField()
|
exact = models.PositiveSmallIntegerField()
|
||||||
diff = models.PositiveSmallIntegerField()
|
diff = models.PositiveSmallIntegerField()
|
||||||
tendency = models.PositiveSmallIntegerField()
|
tendency = models.PositiveSmallIntegerField()
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return str(self.client)
|
return str(self.client)
|
||||||
|
|
||||||
class chart(models.Model):
|
|
||||||
team = models.ForeignKey(Team)
|
class Chart(models.Model):
|
||||||
competition = models.ForeignKey(Competition)
|
team = models.ForeignKey(
|
||||||
|
Team,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
competition = models.ForeignKey(
|
||||||
|
Competition,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
points = models.PositiveSmallIntegerField()
|
points = models.PositiveSmallIntegerField()
|
||||||
diff = models.SmallIntegerField()
|
diff = models.SmallIntegerField()
|
||||||
games = models.PositiveSmallIntegerField()
|
games = models.PositiveSmallIntegerField()
|
||||||
@@ -106,20 +145,32 @@ class chart(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ("team", "competition")
|
unique_together = ("team", "competition")
|
||||||
|
|
||||||
|
|
||||||
class RelUserMandant(models.Model):
|
class RelUserMandant(models.Model):
|
||||||
user = models.ForeignKey(User)
|
user = models.ForeignKey(
|
||||||
mandant = models.ForeignKey(Mandant)
|
User,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
mandant = models.ForeignKey(
|
||||||
|
Mandant,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ("user", "mandant")
|
unique_together = ("user", "mandant")
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return (str(self.user) + " -> " + str(self.mandant))
|
return (str(self.user) + " -> " + str(self.mandant))
|
||||||
|
|
||||||
|
|
||||||
class Post(models.Model):
|
class Post(models.Model):
|
||||||
content = models.TextField()
|
content = models.TextField()
|
||||||
published = models.BooleanField(default=True)
|
published = models.BooleanField(default=True)
|
||||||
created = models.DateTimeField(auto_now_add=True)
|
created = models.DateTimeField(auto_now_add=True)
|
||||||
author = models.ForeignKey(User)
|
author = models.ForeignKey(
|
||||||
|
User,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ['-created']
|
ordering = ['-created']
|
||||||
@@ -127,12 +178,19 @@ class Post(models.Model):
|
|||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return u'%s' % self.created
|
return u'%s' % self.created
|
||||||
|
|
||||||
|
|
||||||
class RelPostMandant(models.Model):
|
class RelPostMandant(models.Model):
|
||||||
post = models.ForeignKey(Post)
|
post = models.ForeignKey(
|
||||||
mandant = models.ForeignKey(Mandant)
|
Post,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
mandant = models.ForeignKey(
|
||||||
|
Mandant,
|
||||||
|
on_delete=models.CASCADE
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
unique_together = ("post", "mandant")
|
unique_together = ("post", "mandant")
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return (str(self.post) + " -> " + str(self.mandant))
|
return (str(self.post) + " -> " + str(self.mandant))
|
||||||
|
|
||||||
|
|||||||
+24
-29
@@ -18,7 +18,15 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with TipPy. If not, see <http://www.gnu.org/licenses/>.
|
# along with TipPy. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
import sys, locale, suds, urllib2, psycopg2
|
import locale
|
||||||
|
import urllib.error
|
||||||
|
import urllib.parse
|
||||||
|
import urllib.request
|
||||||
|
|
||||||
|
from zeep import Client
|
||||||
|
from zeep.transports import Transport
|
||||||
|
from requests import Session
|
||||||
|
|
||||||
|
|
||||||
class OpenLiga(object):
|
class OpenLiga(object):
|
||||||
version = "0.1"
|
version = "0.1"
|
||||||
@@ -34,57 +42,44 @@ class OpenLiga(object):
|
|||||||
|
|
||||||
self.debug = debug
|
self.debug = debug
|
||||||
|
|
||||||
# get a SUDS client object
|
# get a SOAP client object
|
||||||
if self.proxyurl is None:
|
wsdl_url = 'http://www.openligadb.de/Webservices/Sportsdata.asmx?WSDL'
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.client = suds.client.Client(
|
if proxyurl is None:
|
||||||
'http://www.openligadb.de/'
|
self.client = Client(wsdl=wsdl_url)
|
||||||
+ 'Webservices/Sportsdata.asmx?WSDL')
|
|
||||||
except (urllib2.URLError):
|
|
||||||
self.error += "Connect to webservice failed."
|
|
||||||
else:
|
else:
|
||||||
try:
|
session = Session()
|
||||||
t = suds.transport.http.HttpTransport()
|
session.proxies = {'http': proxyurl, 'https': proxyurl}
|
||||||
proxy = urllib2.ProxyHandler({'http':proxyurl})
|
transport = Transport(session=session)
|
||||||
opener = urllib2.build_opener(proxy)
|
self.client = Client(wsdl=wsdl_url, transport=transport)
|
||||||
t.urlopener = opener
|
except (urllib.error.URLError, Exception) as e:
|
||||||
self.client = suds.client.Client(
|
self.error += f"Connect to webservice failed: {str(e)}\n"
|
||||||
'http://www.openligadb.de/Webservices/'
|
|
||||||
+ 'Sportsdata.asmx?WSDL', transport=t)
|
|
||||||
except urllib2.URLError as e:
|
|
||||||
self.error += "Connect to webservice failed " \
|
|
||||||
+ "(via proxy " + proxyurl + "): " + str(e) + "\n"
|
|
||||||
|
|
||||||
def getSeason(self, season, league='bl1'):
|
def getSeason(self, season, league='bl1'):
|
||||||
""" Get the whole season.
|
""" Get the whole season.
|
||||||
|
|
||||||
Args: season and league shortcut (optional)
|
Args: season and league shortcut (optional)
|
||||||
"""
|
"""
|
||||||
return(self.client.service.GetMatchdataByLeagueSaison(
|
return self.client.service.GetMatchdataByLeagueSaison(
|
||||||
leagueShortcut=league, leagueSaison=season)
|
leagueShortcut=league, leagueSaison=season)
|
||||||
)
|
|
||||||
|
|
||||||
def getMatchday(self, season, matchdaynumber, league='bl1'):
|
def getMatchday(self, season, matchdaynumber, league='bl1'):
|
||||||
""" Get matchday.
|
""" Get matchday.
|
||||||
|
|
||||||
Args: season, matchdaynumber and league shortcut (optional)
|
Args: season, matchdaynumber and league shortcut (optional)
|
||||||
"""
|
"""
|
||||||
return(self.client.service.GetMatchdataByGroupLeagueSaison(
|
return self.client.service.GetMatchdataByGroupLeagueSaison(
|
||||||
groupOrderID=matchdaynumber,
|
groupOrderID=matchdaynumber,
|
||||||
leagueShortcut=league,
|
leagueShortcut=league,
|
||||||
leagueSaison=season)
|
leagueSaison=season)
|
||||||
)
|
|
||||||
|
|
||||||
def getTeams(self, season, league='bl1'):
|
def getTeams(self, season, league='bl1'):
|
||||||
return(self.client.service.GetTeamsByLeagueSaison(
|
return self.client.service.GetTeamsByLeagueSaison(
|
||||||
leagueShortcut=league,
|
leagueShortcut=league,
|
||||||
leagueSaison=season)
|
leagueSaison=season)
|
||||||
)
|
|
||||||
|
|
||||||
def getCurrentGroup(self, league):
|
def getCurrentGroup(self, league):
|
||||||
return(self.client.service.GetCurrentGroup(
|
return self.client.service.GetCurrentGroup(
|
||||||
leagueShortcut=league)
|
leagueShortcut=league)
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
from django.contrib.auth import views as auth_views
|
||||||
|
from django.urls import re_path
|
||||||
|
from django.conf.urls import include
|
||||||
|
from django.conf import settings
|
||||||
|
from django.conf.urls.static import static
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
re_path(r'^$', views.home, name='home'),
|
||||||
|
re_path(r'^getSeason/(?P<ls>.*)/(?P<season>\d{4})$',
|
||||||
|
views.getSeason),
|
||||||
|
re_path(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$',
|
||||||
|
views.update, name='update'),
|
||||||
|
re_path(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$',
|
||||||
|
views.matchday, name='matchday'),
|
||||||
|
re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', views.charts,
|
||||||
|
name='charts'),
|
||||||
|
re_path(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$',
|
||||||
|
views.charts, name='charts'),
|
||||||
|
re_path(r'^accounts/profile/(\d+)', views.profile),
|
||||||
|
re_path(r'^accounts/', include('django.contrib.auth.urls')),
|
||||||
|
re_path(r'^blog/newpost$', views.newBlogpost),
|
||||||
|
re_path(r'^blog/(?P<page>\d)$', views.blogindex),
|
||||||
|
re_path(r'^about$', views.about),
|
||||||
|
re_path(r'^staff', views.staff),
|
||||||
|
re_path(r'^accounts/login/', auth_views.LoginView.as_view()),
|
||||||
|
re_path(r'^accounts/logout/', auth_views.LogoutView.as_view())
|
||||||
|
]
|
||||||
|
# Redirect on logout
|
||||||
|
LOGOUT_REDIRECT_URL = "home"
|
||||||
|
if settings.DEBUG is True:
|
||||||
|
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||||
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
+519
-376
File diff suppressed because it is too large
Load Diff
@@ -1 +0,0 @@
|
|||||||
__version__ = '1.0.1'
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
"""
|
|
||||||
Django settings for tippy project.
|
|
||||||
|
|
||||||
For more information on this file, see
|
|
||||||
https://docs.djangoproject.com/en/1.7/topics/settings/
|
|
||||||
|
|
||||||
For the full list of settings and their values, see
|
|
||||||
https://docs.djangoproject.com/en/1.7/ref/settings/
|
|
||||||
"""
|
|
||||||
|
|
||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
|
||||||
import os
|
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
|
||||||
|
|
||||||
# Django settings for tippy project.
|
|
||||||
DEBUG = True
|
|
||||||
TEMPLATE_DEBUG = DEBUG
|
|
||||||
|
|
||||||
ADMINS = (
|
|
||||||
('Martin Bley', 'martin@mb-oss.de'),
|
|
||||||
)
|
|
||||||
|
|
||||||
MANAGERS = ADMINS
|
|
||||||
|
|
||||||
DATABASES = {
|
|
||||||
'default': {
|
|
||||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
|
||||||
'NAME': 'tippy',
|
|
||||||
'USER': 'tippy',
|
|
||||||
'PASSWORD': 'tippy',
|
|
||||||
'HOST': 'localhost',
|
|
||||||
'PORT': '5432',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Hosts/domain names that are valid for this site; required if DEBUG is False
|
|
||||||
# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
|
|
||||||
ALLOWED_HOSTS = ['*']
|
|
||||||
|
|
||||||
# Local time zone for this installation. Choices can be found here:
|
|
||||||
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
|
|
||||||
# although not all choices may be available on all operating systems.
|
|
||||||
# In a Windows environment this must be set to your system time zone.
|
|
||||||
TIME_ZONE = 'Europe/Berlin'
|
|
||||||
|
|
||||||
# Language code for this installation. All choices can be found here:
|
|
||||||
# http://www.i18nguy.com/unicode/language-identifiers.html
|
|
||||||
LANGUAGE_CODE = 'de-de'
|
|
||||||
|
|
||||||
SITE_ID = 1
|
|
||||||
|
|
||||||
# If you set this to False, Django will make some optimizations so as not
|
|
||||||
# to load the internationalization machinery.
|
|
||||||
USE_I18N = True
|
|
||||||
|
|
||||||
# If you set this to False, Django will not format dates, numbers and
|
|
||||||
# calendars according to the current locale.
|
|
||||||
USE_L10N = True
|
|
||||||
|
|
||||||
# If you set this to False, Django will not use timezone-aware datetimes.
|
|
||||||
USE_TZ = True
|
|
||||||
|
|
||||||
# Absolute filesystem path to the directory that will hold user-uploaded files.
|
|
||||||
# Example: "/home/media/media.lawrence.com/media/"
|
|
||||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
|
|
||||||
|
|
||||||
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
|
|
||||||
# trailing slash.
|
|
||||||
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
|
|
||||||
MEDIA_URL = '/media/'
|
|
||||||
|
|
||||||
# Absolute path to the directory static files should be collected to.
|
|
||||||
# Don't put anything in this directory yourself; store your static files
|
|
||||||
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
|
|
||||||
# Example: "/home/media/media.lawrence.com/static/"
|
|
||||||
STATIC_ROOT = '/home/martin/dev/TipPy/src/static/'
|
|
||||||
MEDIA_ROOT = os.path.join(BASE_DIR, 'media/')
|
|
||||||
|
|
||||||
# URL prefix for static files.
|
|
||||||
# Example: "http://media.lawrence.com/static/"
|
|
||||||
STATIC_URL = '/static/'
|
|
||||||
|
|
||||||
# Additional locations of static files
|
|
||||||
STATICFILES_DIRS = (
|
|
||||||
# Put strings here, like "/home/html/static" or "C:/www/django/static".
|
|
||||||
# Always use forward slashes, even on Windows.
|
|
||||||
# Don't forget to use absolute paths, not relative paths.
|
|
||||||
'/home/martin/dev/TipPy/src/tippy/static/',
|
|
||||||
)
|
|
||||||
|
|
||||||
# List of finder classes that know how to find static files in
|
|
||||||
# various locations.
|
|
||||||
STATICFILES_FINDERS = (
|
|
||||||
'django.contrib.staticfiles.finders.FileSystemFinder',
|
|
||||||
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
|
|
||||||
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
|
|
||||||
)
|
|
||||||
|
|
||||||
# Make this unique, and don't share it with anybody.
|
|
||||||
SECRET_KEY = '-7%ge^nl1b0t0694%ws&0$ft_lo)j4l1f-qv#ku^=$)s(sw6us'
|
|
||||||
|
|
||||||
# List of callables that know how to import templates from various sources.
|
|
||||||
TEMPLATE_LOADERS = (
|
|
||||||
'django.template.loaders.filesystem.Loader',
|
|
||||||
'django.template.loaders.app_directories.Loader',
|
|
||||||
# 'django.template.loaders.eggs.Loader',
|
|
||||||
)
|
|
||||||
|
|
||||||
MIDDLEWARE_CLASSES = (
|
|
||||||
'django.middleware.common.CommonMiddleware',
|
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
|
||||||
# Uncomment the next line for simple clickjacking protection:
|
|
||||||
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
|
||||||
)
|
|
||||||
|
|
||||||
ROOT_URLCONF = 'tippy.urls'
|
|
||||||
|
|
||||||
# Python dotted path to the WSGI application used by Django's runserver.
|
|
||||||
WSGI_APPLICATION = 'tippy.wsgi.application'
|
|
||||||
|
|
||||||
TEMPLATE_DIRS = (
|
|
||||||
[os.path.join(BASE_DIR, 'templates')]
|
|
||||||
)
|
|
||||||
|
|
||||||
INSTALLED_APPS = (
|
|
||||||
'django.contrib.auth',
|
|
||||||
'django.contrib.contenttypes',
|
|
||||||
'django.contrib.sessions',
|
|
||||||
'django.contrib.sites',
|
|
||||||
'django.contrib.messages',
|
|
||||||
'django.contrib.staticfiles',
|
|
||||||
'django.contrib.humanize',
|
|
||||||
# Uncomment the next line to enable the admin:
|
|
||||||
'django.contrib.admin',
|
|
||||||
# Uncomment the next line to enable admin documentation:
|
|
||||||
'django.contrib.admindocs',
|
|
||||||
'tipp',
|
|
||||||
)
|
|
||||||
|
|
||||||
# URL of the login page.
|
|
||||||
LOGIN_URL = '/login'
|
|
||||||
|
|
||||||
# A sample logging configuration. The only tangible logging
|
|
||||||
# performed by this configuration is to send an email to
|
|
||||||
# the site admins on every HTTP 500 error when DEBUG=False.
|
|
||||||
# See http://docs.djangoproject.com/en/dev/topics/logging for
|
|
||||||
# more details on how to customize your logging configuration.
|
|
||||||
LOGGING = {
|
|
||||||
'version': 1,
|
|
||||||
'disable_existing_loggers': False,
|
|
||||||
'filters': {
|
|
||||||
'require_debug_false': {
|
|
||||||
'()': 'django.utils.log.RequireDebugFalse'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'handlers': {
|
|
||||||
'mail_admins': {
|
|
||||||
'level': 'ERROR',
|
|
||||||
'filters': ['require_debug_false'],
|
|
||||||
'class': 'django.utils.log.AdminEmailHandler'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'loggers': {
|
|
||||||
'django.request': {
|
|
||||||
'handlers': ['mail_admins'],
|
|
||||||
'level': 'ERROR',
|
|
||||||
'propagate': True,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
EMAIL_USE_TLS = True
|
|
||||||
EMAIL_HOST = 'hermes.mb-oss.de'
|
|
||||||
EMAIL_PORT = 25
|
|
||||||
EMAIL_HOST_USER = 'tippy@mb-oss.de'
|
|
||||||
#EMAIL_HOST_PASSWORD = 'p@ssword'
|
|
||||||
|
|
||||||
DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
|
|
||||||
SERVER_EMAIL = EMAIL_HOST_USER
|
|
||||||
|
|
||||||
SESSION_COOKIE_AGE = 7200
|
|
||||||
|
|
||||||
AUTH_PROFILE_MODULE = 'tippy.UserProfile'
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
from django.conf.urls import patterns, include, url
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
|
||||||
from django.contrib import admin
|
|
||||||
admin.autodiscover()
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
|
||||||
# Examples:
|
|
||||||
url(r'^$', 'tipp.views.home', name='home'),
|
|
||||||
url(r'^login$', 'django.contrib.auth.views.login', {
|
|
||||||
'template_name': 'login.html'}),
|
|
||||||
url(r'^logout$', 'django.contrib.auth.views.logout', {
|
|
||||||
'next_page': '/'}),
|
|
||||||
url(r'^getSeason/(?P<ls>.*)/(?P<season>\d{4})$',
|
|
||||||
'tipp.views.getSeason'),
|
|
||||||
url(r'^update/(?P<ls>.*)/(?P<season>\d{4})/(?P<cur_md>\d{2})$',
|
|
||||||
'tipp.views.update', name='update'),
|
|
||||||
url(r'^matchday/(?P<ls>.{3,})/(?P<season>\d{4})/(?P<matchday>\d{2})$',
|
|
||||||
'tipp.views.matchday', name='matchday'),
|
|
||||||
url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})$', 'tipp.views.charts',
|
|
||||||
name='charts'),
|
|
||||||
url(r'^charts/(?P<ls>\w{3,})/(?P<season>\d{4})/(?P<pos>\w{1,})$',
|
|
||||||
'tipp.views.charts', name='charts'),
|
|
||||||
url(r'^accounts/profile/(\d+)', 'tipp.views.profile'),
|
|
||||||
url(r'^accounts/', include('django.contrib.auth.urls')),
|
|
||||||
url(r'^blog/newpost$', 'tipp.views.newBlogpost'),
|
|
||||||
url(r'^blog/(?P<page>\d)$', 'tipp.views.blogindex'),
|
|
||||||
url(r'^about$', 'tipp.views.about'),
|
|
||||||
|
|
||||||
# Uncomment the admin/doc line below to enable admin documentation:
|
|
||||||
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
|
|
||||||
|
|
||||||
# Uncomment the next line to enable the admin:
|
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
|
||||||
)
|
|
||||||
|
|
||||||
if settings.DEBUG:
|
|
||||||
urlpatterns += patterns('',
|
|
||||||
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
|
|
||||||
'document_root': settings.MEDIA_ROOT,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
"""
|
|
||||||
WSGI config for tippy project.
|
|
||||||
|
|
||||||
This module contains the WSGI application used by Django's development server
|
|
||||||
and any production WSGI deployments. It should expose a module-level variable
|
|
||||||
named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
|
|
||||||
this application via the ``WSGI_APPLICATION`` setting.
|
|
||||||
|
|
||||||
Usually you will have the standard Django WSGI application here, but it also
|
|
||||||
might make sense to replace the whole Django WSGI application with a custom one
|
|
||||||
that later delegates to the Django one. For example, you could introduce WSGI
|
|
||||||
middleware here, or combine a Django application with an application of another
|
|
||||||
framework.
|
|
||||||
|
|
||||||
"""
|
|
||||||
import os
|
|
||||||
|
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tippy.settings")
|
|
||||||
|
|
||||||
# This application object is used by any WSGI server configured to use this
|
|
||||||
# file. This includes Django's development server, if the WSGI_APPLICATION
|
|
||||||
# setting points here.
|
|
||||||
from django.core.wsgi import get_wsgi_application
|
|
||||||
application = get_wsgi_application()
|
|
||||||
|
|
||||||
# Apply WSGI middleware here.
|
|
||||||
# from helloworld.wsgi import HelloWorldApplication
|
|
||||||
# application = HelloWorldApplication(application)
|
|
||||||
Reference in New Issue
Block a user