From ef86dbc0f77021a379a2482a6c6f790af7866d13 Mon Sep 17 00:00:00 2001 From: tkupek Date: Wed, 20 Jan 2016 23:55:56 +0100 Subject: [PATCH] refactor project, first steps --- .idea/.name | 1 + .../.idea => .idea}/compiler.xml | 0 .../copyright/profiles_settings.xml | 0 .../.idea => .idea}/encodings.xml | 0 .idea/misc.xml | 32 + .../.idea => .idea}/modules.xml | 2 +- .idea/vcs.xml | 6 + .../__init__.py | 0 .../eLearning}/__init__.py | 0 .../eLearning/admin.py | 0 .../eLearning/apps.py | 0 .../eLearning/migrations/0001_initial.py | 26 + .../eLearning/migrations}/__init__.py | 0 .../eLearning/models.py | 0 .../eLearning/templates/index.html | 21 + .../eLearning/tests.py | 0 VCPBayern_eLearning/eLearning/views.py | 13 + .../settings.py | 9 +- .../urls.py | 4 +- .../wsgi.py | 4 +- db.sqlite3 | Bin 0 -> 38912 bytes vcpBayern_eLearning/manage.py => manage.py | 2 +- vcpBayern_eLearning/.idea/.name | 1 - vcpBayern_eLearning/.idea/misc.xml | 54 -- vcpBayern_eLearning/.idea/workspace.xml | 810 ------------------ vcpBayern_eLearning/eLearning/views.py | 3 - vcpBayern_eLearning/vcpBayern_eLearning.iml | 15 - vcpby-elearning.iml | 9 + 28 files changed, 120 insertions(+), 892 deletions(-) create mode 100644 .idea/.name rename {vcpBayern_eLearning/.idea => .idea}/compiler.xml (100%) rename {vcpBayern_eLearning/.idea => .idea}/copyright/profiles_settings.xml (100%) rename {vcpBayern_eLearning/.idea => .idea}/encodings.xml (100%) create mode 100644 .idea/misc.xml rename {vcpBayern_eLearning/.idea => .idea}/modules.xml (56%) create mode 100644 .idea/vcs.xml rename {vcpBayern_eLearning/eLearning => VCPBayern_eLearning}/__init__.py (100%) rename {vcpBayern_eLearning/eLearning/migrations => VCPBayern_eLearning/eLearning}/__init__.py (100%) rename {vcpBayern_eLearning => VCPBayern_eLearning}/eLearning/admin.py (100%) rename {vcpBayern_eLearning => VCPBayern_eLearning}/eLearning/apps.py (100%) create mode 100644 VCPBayern_eLearning/eLearning/migrations/0001_initial.py rename {vcpBayern_eLearning/vcpBayern_eLearning => VCPBayern_eLearning/eLearning/migrations}/__init__.py (100%) rename {vcpBayern_eLearning => VCPBayern_eLearning}/eLearning/models.py (100%) create mode 100644 VCPBayern_eLearning/eLearning/templates/index.html rename {vcpBayern_eLearning => VCPBayern_eLearning}/eLearning/tests.py (100%) create mode 100644 VCPBayern_eLearning/eLearning/views.py rename {vcpBayern_eLearning/vcpBayern_eLearning => VCPBayern_eLearning}/settings.py (93%) rename {vcpBayern_eLearning/vcpBayern_eLearning => VCPBayern_eLearning}/urls.py (86%) rename {vcpBayern_eLearning/vcpBayern_eLearning => VCPBayern_eLearning}/wsgi.py (73%) create mode 100644 db.sqlite3 rename vcpBayern_eLearning/manage.py => manage.py (75%) delete mode 100644 vcpBayern_eLearning/.idea/.name delete mode 100644 vcpBayern_eLearning/.idea/misc.xml delete mode 100644 vcpBayern_eLearning/.idea/workspace.xml delete mode 100644 vcpBayern_eLearning/eLearning/views.py delete mode 100644 vcpBayern_eLearning/vcpBayern_eLearning.iml create mode 100644 vcpby-elearning.iml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..f2ec957 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +vcpby-elearning \ No newline at end of file diff --git a/vcpBayern_eLearning/.idea/compiler.xml b/.idea/compiler.xml similarity index 100% rename from vcpBayern_eLearning/.idea/compiler.xml rename to .idea/compiler.xml diff --git a/vcpBayern_eLearning/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml similarity index 100% rename from vcpBayern_eLearning/.idea/copyright/profiles_settings.xml rename to .idea/copyright/profiles_settings.xml diff --git a/vcpBayern_eLearning/.idea/encodings.xml b/.idea/encodings.xml similarity index 100% rename from vcpBayern_eLearning/.idea/encodings.xml rename to .idea/encodings.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..da6f99e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + Python 2.7.6 (/usr/bin/python2.7) + + + + + + + + \ No newline at end of file diff --git a/vcpBayern_eLearning/.idea/modules.xml b/.idea/modules.xml similarity index 56% rename from vcpBayern_eLearning/.idea/modules.xml rename to .idea/modules.xml index 0d78ed8..8303c7f 100644 --- a/vcpBayern_eLearning/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/vcpBayern_eLearning/eLearning/__init__.py b/VCPBayern_eLearning/__init__.py similarity index 100% rename from vcpBayern_eLearning/eLearning/__init__.py rename to VCPBayern_eLearning/__init__.py diff --git a/vcpBayern_eLearning/eLearning/migrations/__init__.py b/VCPBayern_eLearning/eLearning/__init__.py similarity index 100% rename from vcpBayern_eLearning/eLearning/migrations/__init__.py rename to VCPBayern_eLearning/eLearning/__init__.py diff --git a/vcpBayern_eLearning/eLearning/admin.py b/VCPBayern_eLearning/eLearning/admin.py similarity index 100% rename from vcpBayern_eLearning/eLearning/admin.py rename to VCPBayern_eLearning/eLearning/admin.py diff --git a/vcpBayern_eLearning/eLearning/apps.py b/VCPBayern_eLearning/eLearning/apps.py similarity index 100% rename from vcpBayern_eLearning/eLearning/apps.py rename to VCPBayern_eLearning/eLearning/apps.py diff --git a/VCPBayern_eLearning/eLearning/migrations/0001_initial.py b/VCPBayern_eLearning/eLearning/migrations/0001_initial.py new file mode 100644 index 0000000..19f9c89 --- /dev/null +++ b/VCPBayern_eLearning/eLearning/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-01-20 22:54 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='questions', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('questionId', models.IntegerField()), + ('questionTitle', models.CharField(max_length=100)), + ('questionText', models.TextField()), + ('questionAnswer', models.TextField()), + ], + ), + ] diff --git a/vcpBayern_eLearning/vcpBayern_eLearning/__init__.py b/VCPBayern_eLearning/eLearning/migrations/__init__.py similarity index 100% rename from vcpBayern_eLearning/vcpBayern_eLearning/__init__.py rename to VCPBayern_eLearning/eLearning/migrations/__init__.py diff --git a/vcpBayern_eLearning/eLearning/models.py b/VCPBayern_eLearning/eLearning/models.py similarity index 100% rename from vcpBayern_eLearning/eLearning/models.py rename to VCPBayern_eLearning/eLearning/models.py diff --git a/VCPBayern_eLearning/eLearning/templates/index.html b/VCPBayern_eLearning/eLearning/templates/index.html new file mode 100644 index 0000000..13d8e20 --- /dev/null +++ b/VCPBayern_eLearning/eLearning/templates/index.html @@ -0,0 +1,21 @@ + + + + + + + + + VCP Bayern - eLearning + + + + +
+

VCP Bayern - eLearning

+

{{ questionTitle }}

+

{{ questionText }}

+
+ + + \ No newline at end of file diff --git a/vcpBayern_eLearning/eLearning/tests.py b/VCPBayern_eLearning/eLearning/tests.py similarity index 100% rename from vcpBayern_eLearning/eLearning/tests.py rename to VCPBayern_eLearning/eLearning/tests.py diff --git a/VCPBayern_eLearning/eLearning/views.py b/VCPBayern_eLearning/eLearning/views.py new file mode 100644 index 0000000..2c095e2 --- /dev/null +++ b/VCPBayern_eLearning/eLearning/views.py @@ -0,0 +1,13 @@ +from django.shortcuts import render_to_response + + +# Create your views here. + +def home(request): + + content = { + 'questionId': 1, + 'questionTitle': 'titleOne', + 'questionText': 'Lorem ipsum dolor sit amet' + } + return render_to_response('index.html', content) diff --git a/vcpBayern_eLearning/vcpBayern_eLearning/settings.py b/VCPBayern_eLearning/settings.py similarity index 93% rename from vcpBayern_eLearning/vcpBayern_eLearning/settings.py rename to VCPBayern_eLearning/settings.py index 36d323a..f95d293 100644 --- a/vcpBayern_eLearning/vcpBayern_eLearning/settings.py +++ b/VCPBayern_eLearning/settings.py @@ -1,5 +1,5 @@ """ -Django settings for vcpBayern_eLearning project. +Django settings for VCPBayern_eLearning project. Generated by 'django-admin startproject' using Django 1.9.1. @@ -37,6 +37,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'VCPBayern_eLearning.eLearning' ] MIDDLEWARE_CLASSES = [ @@ -50,12 +51,12 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'vcpBayern_eLearning.urls' +ROOT_URLCONF = 'VCPBayern_eLearning.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': ["eLearning/templates"], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -68,7 +69,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'vcpBayern_eLearning.wsgi.application' +WSGI_APPLICATION = 'VCPBayern_eLearning.wsgi.application' # Database diff --git a/vcpBayern_eLearning/vcpBayern_eLearning/urls.py b/VCPBayern_eLearning/urls.py similarity index 86% rename from vcpBayern_eLearning/vcpBayern_eLearning/urls.py rename to VCPBayern_eLearning/urls.py index ab393b4..b457092 100644 --- a/vcpBayern_eLearning/vcpBayern_eLearning/urls.py +++ b/VCPBayern_eLearning/urls.py @@ -1,4 +1,4 @@ -"""vcpBayern_eLearning URL Configuration +"""VCPBayern_eLearning URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/1.9/topics/http/urls/ @@ -16,6 +16,8 @@ Including another URLconf from django.conf.urls import url from django.contrib import admin + urlpatterns = [ url(r'^admin/', admin.site.urls), + url(r'', 'VCPBayern_eLearning.eLearning.views.home', name='home') ] diff --git a/vcpBayern_eLearning/vcpBayern_eLearning/wsgi.py b/VCPBayern_eLearning/wsgi.py similarity index 73% rename from vcpBayern_eLearning/vcpBayern_eLearning/wsgi.py rename to VCPBayern_eLearning/wsgi.py index aa5992a..a1706e3 100644 --- a/vcpBayern_eLearning/vcpBayern_eLearning/wsgi.py +++ b/VCPBayern_eLearning/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for vcpBayern_eLearning project. +WSGI config for VCPBayern_eLearning project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "vcpBayern_eLearning.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "VCPBayern_eLearning.settings") application = get_wsgi_application() diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..746f855e5698a5099aa9aec6e710e073645843af GIT binary patch literal 38912 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcpBayern_eLearning/.idea/workspace.xml b/vcpBayern_eLearning/.idea/workspace.xml deleted file mode 100644 index 09a65ea..0000000 --- a/vcpBayern_eLearning/.idea/workspace.xml +++ /dev/null @@ -1,810 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1453241040276 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - - - - - - - - vcpBayern_eLearning - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcpBayern_eLearning/eLearning/views.py b/vcpBayern_eLearning/eLearning/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/vcpBayern_eLearning/eLearning/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/vcpBayern_eLearning/vcpBayern_eLearning.iml b/vcpBayern_eLearning/vcpBayern_eLearning.iml deleted file mode 100644 index 1d15315..0000000 --- a/vcpBayern_eLearning/vcpBayern_eLearning.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vcpby-elearning.iml b/vcpby-elearning.iml new file mode 100644 index 0000000..ad3c0a3 --- /dev/null +++ b/vcpby-elearning.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file