ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

fixed requirements

Browse source
This commit is contained in:
Tomislav R 2016-03-16 00:26:49 +01:00
parent 6223f4a1ef
commit baef7e4aa8
10 changed files with 265 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
digitalglarus/migrations/0001_initial.py
View file

@ -1,14 +1,18 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-03-13 21:39
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion
import filer.fields.image import filer.fields.image
class Migration(migrations.Migration): class Migration(migrations.Migration):
initial = True
dependencies = [ dependencies = [
('filer', '0003_auto_20160306_2306'), ('filer', '0002_auto_20150606_2003'),
('cms', '0013_urlconfrevision'), ('cms', '0013_urlconfrevision'),
] ]
@ -16,9 +20,9 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='DGGallery', name='DGGallery',
fields=[ fields=[
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)), ('name', models.CharField(max_length=30)),
('parent', models.ForeignKey(null=True, to='digitalglarus.DGGallery', blank=True)), ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
], ],
options={ options={
'verbose_name_plural': 'dgGallery', 'verbose_name_plural': 'dgGallery',
@ -27,8 +31,8 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='DGGalleryPlugin', name='DGGalleryPlugin',
fields=[ fields=[
('cmsplugin_ptr', models.OneToOneField(primary_key=True, serialize=False, to='cms.CMSPlugin', auto_created=True, parent_link=True)), ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
('dgGallery', models.ForeignKey(to='digitalglarus.DGGallery')), ('dgGallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
], ],
options={ options={
'abstract': False, 'abstract': False,
@ -38,16 +42,16 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='DGPicture', name='DGPicture',
fields=[ fields=[
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('description', models.CharField(max_length=60)), ('description', models.CharField(max_length=60)),
('gallery', models.ForeignKey(to='digitalglarus.DGGallery')), ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='digitalglarus.DGGallery')),
('image', filer.fields.image.FilerImageField(related_name='dg_gallery', to='filer.Image')), ('image', filer.fields.image.FilerImageField(on_delete=django.db.models.deletion.CASCADE, related_name='dg_gallery', to='filer.Image')),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name='DGSupportersPlugin', name='DGSupportersPlugin',
fields=[ fields=[
('cmsplugin_ptr', models.OneToOneField(primary_key=True, serialize=False, to='cms.CMSPlugin', auto_created=True, parent_link=True)), ('cmsplugin_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
], ],
options={ options={
'abstract': False, 'abstract': False,
@ -57,7 +61,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Message', name='Message',
fields=[ fields=[
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)), ('name', models.CharField(max_length=200)),
('email', models.EmailField(max_length=254)), ('email', models.EmailField(max_length=254)),
('phone_number', models.CharField(max_length=200)), ('phone_number', models.CharField(max_length=200)),
@ -68,9 +72,9 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Supporter', name='Supporter',
fields=[ fields=[
('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=200)), ('name', models.CharField(max_length=200)),
('description', models.TextField(null=True, blank=True)), ('description', models.TextField(blank=True, null=True)),
], ],
), ),
] ]

83
dynamicweb/settings/base.py
View file

@ -46,12 +46,21 @@ SECRET_KEY = env('DJANGO_SECRET_KEY')
# Application definition # Application definition
INSTALLED_APPS = ( INSTALLED_APPS = (
#1st migrate
'membership', 'membership',
'easy_thumbnails',
'mptt',
'parler',
'taggit',
'taggit_autosuggest',
'django_select2',
'meta',
'meta_mixin',
'bootstrap3',
'compressor',
'filer', 'filer',
'cms', # django CMS itself
'cmsplugin_filer_image',
'djangocms_blog', 'djangocms_blog',
'djangocms_admin_style', 'cms', # django CMS itself
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
@ -60,17 +69,22 @@ INSTALLED_APPS = (
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.sites', 'django.contrib.sites',
'treebeard', # utilities for implementing a tree 'treebeard', # utilities for implementing a tree
'menus', # helper for model independent hierarchical website navigation
'sekizai', # for javascript and css management 'sekizai', # for javascript and css management
'menus', # helper for model independent hierarchical website navigation
'cmsplugin_filer_image',
#2nd migrate
# django-cms plugins # django-cms plugins
'djangocms_file',
'djangocms_picture',
'djangocms_video',
'djangocms_flash', 'djangocms_flash',
'djangocms_googlemap', 'djangocms_googlemap',
'djangocms_inherit', 'djangocms_inherit',
'djangocms_link', 'djangocms_link',
'djangocms_snippet',
'djangocms_teaser', 'djangocms_teaser',
'djangocms_page_meta', 'djangocms_page_meta',
# django-filer 'djangocms_text_ckeditor',
'djangocms_admin_style',
'cmsplugin_filer_file', 'cmsplugin_filer_file',
'cmsplugin_filer_folder', 'cmsplugin_filer_folder',
'cmsplugin_filer_link', 'cmsplugin_filer_link',
@ -78,19 +92,6 @@ INSTALLED_APPS = (
'cmsplugin_filer_video', 'cmsplugin_filer_video',
# versioning # versioning
'reversion', 'reversion',
# ck-editor
'djangocms_text_ckeditor',
# djangocms-blog
'easy_thumbnails',
'parler',
'taggit',
'taggit_autosuggest',
'django_select2',
'meta',
'meta_mixin',
'admin_enhancer',
'bootstrap3',
'compressor',
# ungleich # ungleich
'ungleich', 'ungleich',
'hosting', 'hosting',
@ -270,30 +271,28 @@ FILE_UPLOAD_PERMISSIONS = 0o644
META_SITE_PROTOCOL = 'http' META_SITE_PROTOCOL = 'http'
META_USE_SITES = True META_USE_SITES = True
MIGRATION_MODULES = { MIGRATION_MODULES = {
# 'cms': 'cms.migrations', 'cms': 'cms.migrations',
# 'filer': 'filer.migrations_django', # 'filer': 'filer.migrations_django',
# 'menus': 'menus.migrations_django', # 'menus': 'menus.migrations_django',
# 'djangocms_flash': 'djangocms_flash.migrations_django', 'djangocms_flash': 'djangocms_flash.migrations_django',
# 'djangocms_googlemap': 'djangocms_googlemap.migrations_django', 'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
# 'djangocms_inherit': 'djangocms_inherit.migrations_django', 'djangocms_inherit': 'djangocms_inherit.migrations_django',
# 'djangocms_link': 'djangocms_link.migrations_django', 'djangocms_link': 'djangocms_link.migrations_django',
# 'djangocms_snippet': 'djangocms_snippet.migrations_django', 'djangocms_teaser': 'djangocms_teaser.migrations_django',
# 'djangocms_teaser': 'djangocms_teaser.migrations_django', 'djangocms_column': 'djangocms_column.migrations_django',
# 'djangocms_column': 'djangocms_column.migrations_django', 'djangocms_flash': 'djangocms_flash.migrations_django',
# 'djangocms_flash': 'djangocms_flash.migrations_django', 'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
# 'djangocms_googlemap': 'djangocms_googlemap.migrations_django', 'djangocms_inherit': 'djangocms_inherit.migrations_django',
# 'djangocms_inherit': 'djangocms_inherit.migrations_django', 'djangocms_style': 'djangocms_style.migrations_django',
# 'djangocms_style': 'djangocms_style.migrations_django', 'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django',
# 'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django', 'cmsplugin_filer_file': 'cmsplugin_filer_file.migrations_django',
# 'cmsplugin_filer_file': 'cmsplugin_filer_file.migrations_django', 'cmsplugin_filer_folder': 'cmsplugin_filer_folder.migrations_django',
# 'cmsplugin_filer_folder': 'cmsplugin_filer_folder.migrations_django', 'cmsplugin_filer_link': 'cmsplugin_filer_link.migrations_django',
# 'cmsplugin_filer_link': 'cmsplugin_filer_link.migrations_django', 'cmsplugin_filer_teaser': 'cmsplugin_filer_teaser.migrations_django',
# 'cmsplugin_filer_teaser': 'cmsplugin_filer_teaser.migrations_django', 'cmsplugin_filer_utils': 'cmsplugin_filer_utils.migrations_django',
# 'cmsplugin_filer_utils': 'cmsplugin_filer_utils.migrations_django', 'cmsplugin_filer_video': 'cmsplugin_filer_video.migrations_django',
# 'cmsplugin_filer_video': 'cmsplugin_filer_video.migrations_django', 'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
# 'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
} }
STATICFILES_FINDERS = ( STATICFILES_FINDERS = (
@ -424,3 +423,7 @@ STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"
REGISTRATION_MESSAGE = {'subject': "Validation mail", REGISTRATION_MESSAGE = {'subject': "Validation mail",
'message': 'Please validate Your account under this link http://localhost:8000/en-us/validate/{}', 'message': 'Please validate Your account under this link http://localhost:8000/en-us/validate/{}',
'from': 'test@test.com'} 'from': 'test@test.com'}
#dont migrate test
# SOUTH_TESTS_MIGRATE = False

14
hosting/migrations/0001_initial.py Normal file
View file

@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-03-13 20:58
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
]
operations = [
]

25
hosting/migrations/0002_railsbetauser.py Normal file
View file

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.4 on 2016-03-13 21:39
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('hosting', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='RailsBetaUser',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('email', models.EmailField(max_length=254, unique=True)),
('received_date', models.DateTimeField(verbose_name='date received')),
],
),
]

0
hosting/migrations/__init__.py Normal file
View file

7
membership/models.py
View file

@ -4,6 +4,7 @@ from django.contrib.auth.models import User, AbstractBaseUser, BaseUserManager
from django.contrib.auth.hashers import make_password from django.contrib.auth.hashers import make_password
from django.core.mail import send_mail from django.core.mail import send_mail
from django.core.validators import RegexValidator from django.core.validators import RegexValidator
from django.contrib.auth.models import User
REGISTRATION_MESSAGE = {'subject': "Validation mail", REGISTRATION_MESSAGE = {'subject': "Validation mail",
'message': 'Please validate Your account under this link http://localhost:8000/en-us/validate/{}', 'message': 'Please validate Your account under this link http://localhost:8000/en-us/validate/{}',
@ -13,8 +14,7 @@ REGISTRATION_MESSAGE = {'subject': "Validation mail",
class MyUserManager(BaseUserManager): class MyUserManager(BaseUserManager):
def create_user(self, email, name, password=None): def create_user(self, email, name, password=None):
""" """
Creates and saves a User with the given email, date of Creates and saves a User with the given email,name and password.
birth and password.
""" """
if not email: if not email:
raise ValueError('Users must have an email address') raise ValueError('Users must have an email address')
@ -30,8 +30,7 @@ class MyUserManager(BaseUserManager):
def create_superuser(self, email, name, password): def create_superuser(self, email, name, password):
""" """
Creates and saves a superuser with the given email, date of Creates and saves a superuser with the given email, name and password.
birth and password.
""" """
user = self.create_user(email, user = self.create_user(email,
password=password, password=password,

12
membership/tests.py
View file

@ -1,3 +1,13 @@
from django.test import TestCase import unittest
from django.test import TestCase,Client
# Create your tests here. # Create your tests here.
class LoginTestCase(unittest.TestCase):
def test_login(self):
client = Client()
response = client.get("/login")

10
membership/urls.py
View file

@ -5,9 +5,9 @@ from django.contrib.auth.decorators import login_required
from . import views from . import views
urlpatterns = ( urlpatterns = (
url(r"^/$", views.LoginRegistrationView.as_view(), name='login'), url(r"^$", views.LoginRegistrationView.as_view(), name='login'),
url(r"^/validate/(?P<validate_slug>.*)/$", views.validate_email), url(r"^validate/(?P<validate_slug>.*)/$", views.validate_email),
url(r"^/membership/$", login_required(views.MembershipView.as_view()), name='membership'), url(r"^membership/$", login_required(views.MembershipView.as_view()), name='membership'),
url(r"^/buy/(?P<time>\w+)/$", login_required(views.CreditCardView.as_view()), name='payment'), url(r"^buy/(?P<time>\w+)/$", login_required(views.CreditCardView.as_view()), name='payment'),
url(r'^/buy/(?P<time>\w+)/reset',login_required(views.reset),name='reset') url(r'^buy/(?P<time>\w+)/reset',login_required(views.reset),name='reset')
) )

148
requirements.txt
View file

@ -1,102 +1,46 @@
aldryn-blog==0.4.6 Django==1.9.4
aldryn-boilerplates==0.7 wheel
aldryn-common==0.1.3 django-bootstrap3
aldryn-search==0.2.7 django-cms
anyjson==0.3.3 django-compressor
chaussette==1.3.0 django-filter
cmsplugin-filer==1.0.1 django-taggit
cssselect==0.9.1 django-taggit-autosuggest
Django==1.8.9 django-taggit-templatetags
django-admin-enhancer==1.0.0 django-templatetag-sugar
django-appconf==1.0.1 django-model-utils
django-appdata==0.1.4 djangocms-blog
django-bootstrap3==7.0.0 django-dotenv
django-classy-tags==0.7.1 psycopg2
django-cms==3.2.1 django-mptt
django-compressor==1.5 easy_thumbnails
django-countries==3.3 django-polymorphic
django-debug-toolbar==1.3.2
django-dotenv==1.3.0 #PLUGINS
django-extensions==1.5.5 djangocms_flash
django-filer==1.1.1 djangocms_googlemap
django-filter==0.10.0 djangocms_inherit
django-formtools==1.0 djangocms_link
django-fsm==2.2.1 djangocms_teaser
django-fsm-admin==1.2.1 djangocms_page_meta
django-guardian==1.2.0 djangocms_text_ckeditor
django-haystack==2.3.1 djangocms_file
django-hvad==1.2.1 djangocms_picture
-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant djangocms_video
django-meta==0.3.1
django-meta-mixin==0.1.1 #PAYMENT
django-model-utils==2.2 stripe
django-money==0.7.0
django-mptt==0.8.2 django-treebeard
django-parler==1.6.1 django-sekizai
django-polymorphic==0.8.1 django-classy-tags
django-reversion==1.10.1 djangocms-admin-style
django-sekizai==0.9.0 html5lib
Django-Select2==5.8.1 six
django-sortedm2m==0.10.0
django-spurl==0.6 # Optional, recommended packages
django-standard-form==1.1.1 Pillow>=2
django-taggit==0.18.0 django-filer
django-taggit-autosuggest==0.2.8 cmsplugin-filer
django-taggit-templatetags==0.2.5 django-reversion
django-templatetag-sugar==1.0
django-treebeard==4.0
djangocms-admin-style==1.1.0
djangocms-blog==0.5.0
djangocms-column==1.5
djangocms-flash==0.2.0
djangocms-googlemap==0.3
djangocms-grid==1.2
djangocms-inherit==0.1
djangocms-link==1.6.2
djangocms-oembed==0.5
djangocms-page-meta==0.5.5
djangocms-snippet==1.5
djangocms-style==1.5
djangocms-table==1.2
djangocms-teaser==0.1
djangocms-text-ckeditor==2.6.0
djangorestframework==3.1.3
easy-thumbnails==2.3
factory-boy==2.5.2
gevent==1.1b5
gnureadline==6.3.3
greenlet==0.4.9
html5lib==0.9999999
iowait==0.2
ipdb==0.8.1
ipython==3.2.0
lesscpy==0.10.2
lxml==3.4.4
Mako==1.0.2
Markdown==2.6.2
MarkupSafe==0.23
meinheld==0.5.8
micawber==0.3.3
mock==1.3.0
pbr==1.8.1
Pillow==3.1.1
ply==3.6
psutil==3.2.1
psycopg2==2.6.1
py-moneyed==0.5.0
pylibmc==1.5.0
pyquery==1.2.9
python-memcached==1.57
pytz==2015.6
pyzmq==14.7.0
requests==2.9.1
simplejson==3.8.0
six==1.10.0
sqlparse==0.1.15
stripe==1.30.0
tomako==0.1.0
TornadIO2==0.0.3
tornado==4.2.1
Unidecode==0.4.19
URLObject==2.4.0
YURL==0.13

102
requirements_old.txt Normal file
View file

@ -0,0 +1,102 @@
aldryn-blog==0.4.6
aldryn-boilerplates==0.7
aldryn-common==0.1.3
aldryn-search==0.2.7
anyjson==0.3.3
chaussette==1.3.0
cmsplugin-filer==1.0.1
cssselect==0.9.1
Django
django-admin-enhancer==1.0.0
django-appconf==1.0.1
django-appdata==0.1.4
django-bootstrap3==7.0.0
django-classy-tags==0.7.1
django-cms==3.2.1
django-compressor==1.5
django-countries==3.3
django-debug-toolbar==1.3.2
django-dotenv==1.3.0
django-extensions==1.5.5
django-filer==1.1.1
django-filter==0.10.0
django-formtools==1.0
django-fsm==2.2.1
django-fsm-admin==1.2.1
django-guardian==1.2.0
django-haystack==2.3.1
django-hvad==1.2.1
-e git+git@github.com:agiliq/merchant.git@2584954a1371ee6c7d11be2d75a94402e7c641d8#egg=django_merchant
django-meta==0.3.1
django-meta-mixin==0.1.1
django-model-utils==2.2
django-money==0.7.0
django-mptt==0.8.2
django-parler==1.6.1
django-polymorphic==0.8.1
django-reversion==1.10.1
django-sekizai==0.9.0
Django-Select2==5.8.1
django-sortedm2m==0.10.0
django-spurl==0.6
django-standard-form==1.1.1
django-taggit==0.18.0
django-taggit-autosuggest==0.2.8
django-taggit-templatetags==0.2.5
django-templatetag-sugar==1.0
django-treebeard==4.0
djangocms-admin-style==1.1.0
djangocms-blog==0.5.0
djangocms-column==1.5
djangocms-flash==0.2.0
djangocms-googlemap==0.3
djangocms-grid==1.2
djangocms-inherit==0.1
djangocms-link==1.6.2
djangocms-oembed==0.5
djangocms-page-meta==0.5.5
djangocms-snippet==1.5
djangocms-style==1.5
djangocms-table==1.2
djangocms-teaser==0.1
djangocms-text-ckeditor==2.6.0
djangorestframework==3.1.3
easy-thumbnails==2.3
factory-boy==2.5.2
gevent==1.1b5
gnureadline==6.3.3
greenlet==0.4.9
html5lib==0.9999999
iowait==0.2
ipdb==0.8.1
ipython==3.2.0
lesscpy==0.10.2
lxml==3.4.4
Mako==1.0.2
Markdown==2.6.2
MarkupSafe==0.23
meinheld==0.5.8
micawber==0.3.3
mock==1.3.0
pbr==1.8.1
Pillow==3.1.1
ply==3.6
psutil==3.2.1
psycopg2==2.6.1
py-moneyed==0.5.0
pylibmc==1.5.0
pyquery==1.2.9
python-memcached==1.57
pytz==2015.6
pyzmq==14.7.0
requests==2.9.1
simplejson==3.8.0
six==1.10.0
sqlparse==0.1.15
stripe==1.30.0
tomako==0.1.0
TornadIO2==0.0.3
tornado==4.2.1
Unidecode==0.4.19
URLObject==2.4.0
YURL==0.13