Merge pull request #10 from andela-ijubril/feature-effects

Feature effects

djangogram/circle.yml → circle.yml

@@ -8,10 +8,8 @@ dependencies:
     - pip install --upgrade pip
     - pip install -r requirements.txt
     - pip install coveralls
-    - npm install bower
 test:
   override:
-    - bower install
     - python djangogram/manage.py collectstatic --noinput --settings=djangogram.settings.test
     - python djangogram/manage.py test djangogram --settings=djangogram.settings.test
     - coverage run djangogram/manage.py test djangogram --settings=djangogram.settings.test

djangogram/djangogram/settings/__init__.py

@@ -1,5 +1,5 @@
 import os
-if not os.getenv('TRAVIS') and not os.getenv('HEROKU'):
+if not os.getenv('CI') and not os.getenv('HEROKU'):
     from django_envie.workroom import convertfiletovars
     convertfiletovars()
     from development import *

djangogram/djangogram/settings/base.py

@@ -11,7 +11,6 @@
 """
 
 import os
-from ..config import *
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -143,6 +142,8 @@
 
 STATIC_URL = '/static/'
 
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
 SOCIAL_AUTH_FACEBOOK_PROFILE_EXTRA_PARAMS = {
     'fields': 'id,name,email',
 }

djangogram/photoeditor/migrations/0001_initial.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-23 08:42
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import photoeditor.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Filter',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image', models.ImageField(upload_to=photoeditor.models.get_upload_file_name)),
+                ('name', models.CharField(max_length=100)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('social_id', models.CharField(max_length=100, unique=True)),
+                ('profile_pics', models.TextField()),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

djangogram/photoeditor/migrations/0002_auto_20160109_0108.py

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-01-09 01:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import photoeditor.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('photoeditor', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Photo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image', models.ImageField(upload_to=photoeditor.models.get_upload_file_name)),
+                ('name', models.CharField(blank=True, max_length=100)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='filter',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='Filter',
+        ),
+    ]