Models 2

.gitignore

@@ -27,6 +27,8 @@ bin/
 lib64
 pyvenv.cfg
 share/
+pip-selfcheck.json
+MEDIA/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -91,3 +93,7 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# Ignore the files in the Media directory, but not the directory itself
+imagersite/MEDIA/*
+!imagersite/MEDIA/.gitkeep

.travis.yml

@@ -0,0 +1,18 @@
+language: python
+python:
+  - "2.7"
+  - "3.5"
+
+# command to install dependencies
+install:
+  # - pip install .
+  - pip install -r requirements.pip
+
+services:
+  - postgresql
+
+before_script:
+  - psql -c 'create database travis_ci_test;' -U postgres
+
+# command to run tests
+script: python imagersite/manage.py test

README.md

@@ -1,2 +1,42 @@
-# django-imager
-django introduction assignment
+[![Build Status](https://travis-ci.org/pasaunders/django-imager.svg?branch=front-end-1)](https://travis-ci.org/pasaunders/django-imager)
+# Django Imager
+### Getting Started
+
+Clone this repository into whatever directory you want to work from.
+
+```bash
+$ git clone https://github.com/pasaunders/django-imager.git
+```
+
+Assuming that you have access to Python 3 at the system level, start up a new virtual environment.
+
+```bash
+$ cd django-imager
+$ python3 -m venv .
+$ source bin/activate
+```
+
+Once your environment has been activated, make sure to install Django and all of this project's required packages.
+
+```bash
+(django-imager) $ pip install -r requirements.pip
+```
+
+Navigate to the project root, `imagersite`, and apply the migrations for the app.
+
+```bash
+(django-imager) $ cd imagersite
+(django-imager) $ ./manage.py migrate
+```
+
+Finally, run the server in order to server the app on `localhost`
+
+```bash
+(django-imager) $ ./manage.py runserver
+```
+
+Django will typically serve on port 8000, unless you specify otherwise.
+You can access the locally-served site at the address `http://localhost:8000`.
+
+Resources we used:
+http://stackoverflow.com/questions/10180764/django-auth-login-problems

imagersite/imager_images/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+from imager_images.models import Album, Photo
+
+admin.site.register(Album)
+admin.site.register(Photo)

imagersite/imager_images/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ImagerImagesConfig(AppConfig):
+    name = 'imager_images'

imagersite/imager_images/migrations/0001_initial.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-01-19 05:16
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import imager_images.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Album',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=60)),
+                ('description', models.TextField(max_length=200)),
+                ('date_created', models.DateTimeField(auto_now_add=True)),
+                ('date_modified', models.DateTimeField(auto_now=True)),
+                ('date_published', models.DateTimeField(null=True)),
+                ('published', models.CharField(choices=[('private', 'private'), ('shared', 'shared'), ('public', 'public')], max_length=10)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Photo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('image', models.ImageField(upload_to=imager_images.models.image_path)),
+                ('title', models.CharField(max_length=60)),
+                ('description', models.TextField(max_length=120)),
+                ('date_uploaded', models.DateTimeField(auto_now_add=True)),
+                ('date_modified', models.DateTimeField(auto_now=True)),
+                ('date_published', models.DateTimeField(null=True)),
+                ('published', models.CharField(choices=[('private', 'private'), ('shared', 'shared'), ('public', 'public')], max_length=10)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='photos', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='album',
+            name='cover',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='albums_covered', to='imager_images.Photo'),
+        ),
+        migrations.AddField(
+            model_name='album',
+            name='photos',
+            field=models.ManyToManyField(related_name='albums', to='imager_images.Photo'),
+        ),
+        migrations.AddField(
+            model_name='album',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='albums', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

imagersite/imager_images/migrations/0002_auto_20170129_1248.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-01-29 20:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import imager_images.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('imager_images', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='album',
+            name='date_published',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='album',
+            name='published',
+            field=models.CharField(choices=[('private', 'private'), ('shared', 'shared'), ('public', 'public')], default='public', max_length=10),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='date_modified',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='date_published',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='date_uploaded',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='description',
+            field=models.TextField(blank=True, max_length=120, null=True),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to=imager_images.models.image_path),
+        ),
+        migrations.AlterField(
+            model_name='photo',
+            name='published',
+            field=models.CharField(choices=[('private', 'private'), ('shared', 'shared'), ('public', 'public')], default='public', max_length=10),
+        ),
+    ]

imagersite/imager_images/models.py

@@ -0,0 +1,68 @@
+from __future__ import unicode_literals
+from django.utils.encoding import python_2_unicode_compatible
+from django.db import models
+from django.contrib.auth.models import User
+
+PUBLISHED_OPTIONS = (
+    ("private", "private"),
+    ("shared", "shared"),
+    ("public", "public"),
+)
+
+
+def image_path(instance, file_name):
+    """Upload file to media root in user folder."""
+    return 'user_{0}/{1}'.format(instance.user.id, file_name)
+
+
+@python_2_unicode_compatible
+class Photo(models.Model):
+    """Create Photo Model."""
+
+    user = models.ForeignKey(
+        User,
+        related_name='photos',
+        on_delete=models.CASCADE,
+    )
+    image = models.ImageField(upload_to=image_path, blank=True, null=True)
+    title = models.CharField(max_length=60)
+    description = models.TextField(max_length=120, blank=True, null=True)
+    date_uploaded = models.DateTimeField(auto_now_add=True, blank=True, null=True)
+    date_modified = models.DateTimeField(auto_now=True, blank=True, null=True)
+    date_published = models.DateTimeField(null=True, blank=True)
+    published = models.CharField(max_length=10, choices=PUBLISHED_OPTIONS, default='public')
+
+    def __str__(self):
+        """Return string description of album."""
+        return "{}: Photo belonging to {}".format(self.title, self.user)
+
+
+@python_2_unicode_compatible
+class Album(models.Model):
+    """Create Album Model."""
+
+    user = models.ForeignKey(
+        User,
+        related_name="albums",
+        on_delete=models.CASCADE,
+    )
+    cover = models.ForeignKey(
+        "Photo",
+        null=True,
+        related_name="albums_covered"
+    )
+    title = models.CharField(max_length=60)
+    description = models.TextField(max_length=200)
+    photos = models.ManyToManyField(
+        "Photo",
+        related_name="albums",
+        symmetrical=False
+    )
+    date_created = models.DateTimeField(auto_now_add=True)
+    date_modified = models.DateTimeField(auto_now=True)
+    date_published = models.DateTimeField(null=True, blank=True)
+    published = models.CharField(max_length=10, choices=PUBLISHED_OPTIONS, default="public")
+
+    def __str__(self):
+        """Return String Representation of Album."""
+        return "{}: Album belonging to {}".format(self.title, self.user)