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 0000000..746f855 Binary files /dev/null and b/db.sqlite3 differ diff --git a/vcpBayern_eLearning/manage.py b/manage.py similarity index 75% rename from vcpBayern_eLearning/manage.py rename to manage.py index 433a21c..c9f5656 100755 --- a/vcpBayern_eLearning/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "vcpBayern_eLearning.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "VCPBayern_eLearning.settings") from django.core.management import execute_from_command_line diff --git a/vcpBayern_eLearning/.idea/.name b/vcpBayern_eLearning/.idea/.name deleted file mode 100644 index ab52932..0000000 --- a/vcpBayern_eLearning/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -vcpBayern_eLearning \ No newline at end of file diff --git a/vcpBayern_eLearning/.idea/misc.xml b/vcpBayern_eLearning/.idea/misc.xml deleted file mode 100644 index e854d54..0000000 --- a/vcpBayern_eLearning/.idea/misc.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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