diff --git a/api/serializers.py b/api/serializers.py index ab65b0b..a26cba4 100755 --- a/api/serializers.py +++ b/api/serializers.py @@ -6,6 +6,7 @@ from dss import settings from spa import models from spa.models import Activity, Message from spa.models.activity import ActivityDownload, ActivityPlay +from spa.models.blog import Blog from spa.models.genre import Genre from spa.models.notification import Notification from spa.models.show import Show @@ -509,3 +510,7 @@ class ShowSerializer(serializers.ModelSerializer): ) """ + +class BlogSerializer(serializers.ModelSerializer): + class Meta: + model = Blog diff --git a/api/urls.py b/api/urls.py index 2bee4ff..8d6c68b 100755 --- a/api/urls.py +++ b/api/urls.py @@ -23,6 +23,7 @@ router.register(r'activity', views.ActivityViewSet, base_name='activity') router.register(r'genre', views.GenreViewSet, base_name='genre') router.register(r'messages', views.MessageViewSet, base_name='messages') router.register(r'shows', views.ShowViewSet, base_name='shows') +router.register(r'blog', views.BlogViewSet, base_name='shows') class DebugView(APIView): diff --git a/api/views.py b/api/views.py index fae35c7..f8c3d4d 100755 --- a/api/views.py +++ b/api/views.py @@ -20,6 +20,7 @@ from api import serializers from dss import settings from spa import tasks from spa.models import Message +from spa.models.blog import Blog from spa.models.genre import Genre from spa.models.activity import ActivityPlay from spa.models.mix import Mix @@ -348,3 +349,8 @@ class ShowViewSet(viewsets.ModelViewSet): return Response(status=HTTP_400_BAD_REQUEST, data='Performer not found') except Exception as ex: return Response(status=HTTP_500_INTERNAL_SERVER_ERROR, data=ex) + + +class BlogViewSet(viewsets.ModelViewSet): + queryset = Blog.objects.all() + serializer_class = serializers.BlogSerializer() \ No newline at end of file diff --git a/dss/localsettings.py b/dss/localsettings.py index 798cb03..5940763 100644 --- a/dss/localsettings.py +++ b/dss/localsettings.py @@ -1,8 +1,5 @@ import os -<<<<<<< HEAD from dss import devsettings -======= ->>>>>>> master DEBUG = True DSS_TEMP_PATH = os.environ.get('DSS_TEMP_PATH', '/tmp/') @@ -17,9 +14,9 @@ DATABASE_USER = os.environ.get('DATABASE_USER', 'deepsouthsounds') DATABASE_HOST = os.environ.get('DATABASE_HOST', 'localhost') STATIC_URL = '/assets/' -MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/files/media') -STATIC_ROOT = os.environ.get('STATIC_ROOT', '/files/static') -CACHE_ROOT = os.environ.get('CACHE_ROOT', '/files/cache') +MEDIA_ROOT = os.environ.get('MEDIA_ROOT', '/home/fergalm/Dropbox/development/deepsouthsounds.com/cache/media') +STATIC_ROOT = os.environ.get('STATIC_ROOT', '/home/fergalm/Dropbox/development/deepsouthsounds.com/cache/static') +CACHE_ROOT = os.environ.get('CACHE_ROOT', '/home/fergalm/Dropbox/development/deepsouthsounds.com/cache/cache') MEDIA_URL = os.environ.get('MEDIA_URL', 'http://deepsouthsounds.com/media/') # '{0}media/'.format(CDN_URL) @@ -27,11 +24,7 @@ REDIS_HOST = os.environ.get('REDIS_HOST', 'localhost') BROKER_URL = os.environ.get('BROKER_URL', 'amqp://guest:guest@localhost:5672//') CELERY_ACCEPT_CONTENT = ['pickle', 'msgpack', 'json'] -<<<<<<< HEAD SECRET_KEY = os.environ.get('SECRET_KEY', devsettings.SECRET_KEY) -======= -SECRET_KEY = os.environ.get('SECRET_KEY', 'AAA') ->>>>>>> master LIVE_ENABLED = os.environ.get('LIVE_ENABLED', False) ICE_HOST = os.environ.get('ICE_HOST', 'localhost') @@ -43,20 +36,20 @@ RADIO_PORT = os.environ.get('RADIO_PORT', 8888) MANDRILL_API_KEY = os.environ.get('MANDRILL_API_KEY', '') -SOCIAL_AUTH_FACEBOOK_KEY = os.environ.get('SOCIAL_AUTH_FACEBOOK_KEY', '') -SOCIAL_AUTH_FACEBOOK_SECRET = os.environ.get('SOCIAL_AUTH_FACEBOOK_SECRET', '') +SOCIAL_AUTH_FACEBOOK_KEY = os.environ.get('SOCIAL_AUTH_FACEBOOK_KEY', devsettings.SOCIAL_AUTH_FACEBOOK_KEY) +SOCIAL_AUTH_FACEBOOK_SECRET = os.environ.get('SOCIAL_AUTH_FACEBOOK_SECRET', devsettings.SOCIAL_AUTH_FACEBOOK_SECRET) -SOCIAL_AUTH_TWITTER_KEY = os.environ.get('SOCIAL_AUTH_TWITTER_KEY', '') -SOCIAL_AUTH_TWITTER_SECRET = os.environ.get('SOCIAL_AUTH_TWITTER_SECRET', '') +SOCIAL_AUTH_TWITTER_KEY = os.environ.get('SOCIAL_AUTH_TWITTER_KEY', devsettings.SOCIAL_AUTH_TWITTER_KEY) +SOCIAL_AUTH_TWITTER_SECRET = os.environ.get('SOCIAL_AUTH_TWITTER_SECRET', devsettings.SOCIAL_AUTH_TWITTER_SECRET) -SOCIAL_AUTH_GOOGLE_OAUTH_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_KEY', '') -SOCIAL_AUTH_GOOGLE_OAUTH_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_SECRET', '') +SOCIAL_AUTH_GOOGLE_OAUTH_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_KEY', devsettings.SOCIAL_AUTH_GOOGLE_OAUTH_KEY) +SOCIAL_AUTH_GOOGLE_OAUTH_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_OAUTH_SECRET', devsettings.SOCIAL_AUTH_GOOGLE_OAUTH_SECRET) -SOCIAL_AUTH_GOOGLE_PLUS_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_KEY', '') -SOCIAL_AUTH_GOOGLE_PLUS_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_SECRET', '') +SOCIAL_AUTH_GOOGLE_PLUS_KEY = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_KEY', devsettings.SOCIAL_AUTH_GOOGLE_PLUS_KEY) +SOCIAL_AUTH_GOOGLE_PLUS_SECRET = os.environ.get('SOCIAL_AUTH_GOOGLE_PLUS_SECRET', devsettings.SOCIAL_AUTH_GOOGLE_PLUS_SECRET) -DSS_DB_BACKUP_KEY = os.environ.get('DSS_DB_BACKUP_KEY', '') -DSS_DB_BACKUP_SECRET = os.environ.get('DSS_DB_BACKUP_SECRET', '') -DSS_DB_BACKUP_TOKEN = os.environ.get('DSS_DB_BACKUP_TOKEN', '') +DSS_DB_BACKUP_KEY = os.environ.get('DSS_DB_BACKUP_KEY', devsettings.DSS_DB_BACKUP_KEY) +DSS_DB_BACKUP_SECRET = os.environ.get('DSS_DB_BACKUP_SECRET', devsettings.DSS_DB_BACKUP_SECRET) +DSS_DB_BACKUP_TOKEN = os.environ.get('DSS_DB_BACKUP_TOKEN', devsettings.DSS_DB_BACKUP_TOKEN) -AZURE_ACCOUNT_KEY = os.environ.get('AZURE_ACCOUNT_KEY', '') +AZURE_ACCOUNT_KEY = os.environ.get('AZURE_ACCOUNT_KEY', devsettings.AZURE_ACCOUNT_KEY) diff --git a/spa/migrations/0017_blog.py b/spa/migrations/0017_blog.py new file mode 100644 index 0000000..180474c --- /dev/null +++ b/spa/migrations/0017_blog.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('spa', '0016_remove_show_recurrence_rrule'), + ] + + operations = [ + migrations.CreateModel( + name='Blog', + fields=[ + ('id', models.AutoField(auto_created=True, verbose_name='ID', primary_key=True, serialize=False)), + ('object_created', models.DateTimeField(auto_now_add=True)), + ('object_updated', models.DateTimeField(auto_now=True, db_index=True)), + ('date_created', models.DateField(auto_now=True)), + ('title', models.CharField(max_length=1024)), + ('body', models.TextField()), + ('user', models.ForeignKey(blank=True, to='spa.UserProfile', null=True)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/spa/models/__init__.py b/spa/models/__init__.py index 338e671..221098c 100755 --- a/spa/models/__init__.py +++ b/spa/models/__init__.py @@ -16,3 +16,4 @@ from .release import Release from .playlist import Playlist from .message import Message from .show import Show +from .blog import Blog