Reestructure of curriculum app

axeliodiaz · Jul 19, 2017 · 70e5f30 · 70e5f30
1 parent 83933e9
commit 70e5f30
Show file tree

Hide file tree

Showing 15 changed files with 215 additions and 4 deletions.
diff --git a/README.rst b/README.rst
@@ -31,14 +31,14 @@ Add it to your `INSTALLED_APPS`:
 
     INSTALLED_APPS = (
         ...
-        'django_curriculum',
+        'curriculum',
         ...
     )
 
 And create migrations and migrate the models: ::
 
-   python manage.py makemigrations django_curriculum
-   python manage.py migrate django_curriculum
+   python manage.py makemigrations curriculum
+   python manage.py migrate curriculum
 
 Features
 --------

diff --git a/django_curriculum/__init__.py → curriculum/__init__.py b/django_curriculum/__init__.py → curriculum/__init__.py
diff --git a/django_curriculum/admin.py → curriculum/admin.py b/django_curriculum/admin.py → curriculum/admin.py
diff --git a/django_curriculum/apps.py → curriculum/apps.py b/django_curriculum/apps.py → curriculum/apps.py
diff --git a/curriculum/migrations/0001_initial.py b/curriculum/migrations/0001_initial.py
@@ -0,0 +1,193 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-07-19 15:42
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import model_utils.fields
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Accomplishment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('description', models.TextField()),
+                ('order', models.IntegerField(default=0)),
+            ],
+            options={
+                'db_table': 'accomplishments',
+                'ordering': ['order'],
+            },
+        ),
+        migrations.CreateModel(
+            name='EducationInfo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('start', models.DateTimeField(blank=True, null=True, verbose_name='start')),
+                ('end', models.DateTimeField(blank=True, null=True, verbose_name='end')),
+                ('name', models.CharField(max_length=250)),
+                ('location', models.CharField(max_length=250)),
+                ('school_url', models.URLField(verbose_name='School URL')),
+                ('summary', models.TextField()),
+                ('is_current', models.BooleanField(default=False)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name_plural': 'Education',
+            },
+        ),
+        migrations.CreateModel(
+            name='JobInfo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('start', models.DateTimeField(blank=True, null=True, verbose_name='start')),
+                ('end', models.DateTimeField(blank=True, null=True, verbose_name='end')),
+                ('company', models.CharField(max_length=250)),
+                ('location', models.CharField(max_length=250)),
+                ('title', models.CharField(max_length=250)),
+                ('company_url', models.URLField(verbose_name='Company URL')),
+                ('description', models.TextField(blank=True)),
+                ('is_current', models.BooleanField(default=False)),
+                ('is_public', models.BooleanField(default=True)),
+                ('company_image', models.CharField(blank=True, help_text='Path to company image, local or otherwise', max_length=250)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'jobs',
+                'ordering': ['-end', '-start'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Language',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('name', models.CharField(max_length=250)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='LanguageInfo',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('level', models.CharField(max_length=250)),
+                ('language', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='curriculum.Language')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Overview',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('text', models.TextField()),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name_plural': 'Overview',
+            },
+        ),
+        migrations.CreateModel(
+            name='PersonalPhone',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('name', models.CharField(max_length=255)),
+                ('phone', models.IntegerField(blank=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='PersonalSocialMedia',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('linkedin', models.CharField(blank=True, max_length=255, null=True)),
+                ('twitter', models.CharField(blank=True, max_length=255, null=True)),
+                ('github', models.CharField(blank=True, max_length=255, null=True)),
+                ('bitbucket', models.CharField(blank=True, max_length=255, null=True)),
+                ('gitlab', models.CharField(blank=True, max_length=255, null=True)),
+                ('gplus', models.CharField(blank=True, max_length=255, null=True)),
+                ('instagram', models.CharField(blank=True, max_length=255, null=True)),
+                ('snapchat', models.CharField(blank=True, max_length=255, null=True)),
+                ('skype', models.CharField(blank=True, max_length=255, null=True)),
+                ('wordpress', models.URLField(blank=True, verbose_name='wordpress')),
+                ('youtube', models.URLField(blank=True, verbose_name='youtube')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Skill',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('name', models.CharField(max_length=250)),
+                ('skill_url', models.URLField(blank=True, verbose_name='Skill URL')),
+            ],
+            options={
+                'ordering': ['id'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Skillset',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
+                ('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
+                ('name', models.CharField(max_length=250)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='skill',
+            name='skillset',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='curriculum.Skillset'),
+        ),
+        migrations.AddField(
+            model_name='skill',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='accomplishment',
+            name='job',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='curriculum.JobInfo'),
+        ),
+    ]
diff --git a/...rriculum/static/css/django_curriculum.css → curriculum/migrations/__init__.py b/...rriculum/static/css/django_curriculum.css → curriculum/migrations/__init__.py
diff --git a/django_curriculum/models.py → curriculum/models.py b/django_curriculum/models.py → curriculum/models.py
diff --git a/django_curriculum/static/img/.gitignore → curriculum/static/css/django_curriculum.css b/django_curriculum/static/img/.gitignore → curriculum/static/css/django_curriculum.css
diff --git a/...curriculum/static/js/django_curriculum.js → curriculum/static/img/.gitignore b/...curriculum/static/js/django_curriculum.js → curriculum/static/img/.gitignore
diff --git a/django_curriculum/views.py → curriculum/static/js/django_curriculum.js b/django_curriculum/views.py → curriculum/static/js/django_curriculum.js
diff --git a/...lum/templates/django_curriculum/base.html → ...lum/templates/django_curriculum/base.html b/...lum/templates/django_curriculum/base.html → ...lum/templates/django_curriculum/base.html
diff --git a/django_curriculum/urls.py → curriculum/urls.py b/django_curriculum/urls.py → curriculum/urls.py
@@ -1,9 +1,13 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls import url
 from django.views.generic import TemplateView
+from rest_framework import routers
 
 from . import views
 
+router.register(r'projects', views.ProjectViewSet)
+
 urlpatterns = [
     url(r'', TemplateView.as_view(template_name="base.html")),
-    ]
+    url(r'^api/', include(router.urls)),
+]
diff --git a/curriculum/views.py b/curriculum/views.py
@@ -0,0 +1,12 @@
+from rest_framework import viewsets
+from django.utils.translation import ugettext_lazy as _
+
+from .models import Overview
+
+
+class OverviewViewSet(viewsets.ModelViewSet):
+    """
+    API endpoint that allows users to be viewed or edited.
+    """
+    queryset = Overview.objects.all().order_by('-created')
+    serializer_class = ProjectSerializer
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 Django==1.11.3
+djangorestframework==3.6.3
 # Additional requirements go here
diff --git a/setup.cfg b/setup.cfg
@@ -14,6 +14,7 @@ universal = 1
 ignore = D203
 exclude =
     django_curriculum/migrations,
+    curriculum/migrations,
     .git,
     .tox,
     docs/conf.py,