From 6cfa799919e1406486ae204f4a6214b71815ed54 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Wed, 15 Nov 2017 13:43:12 -0600 Subject: [PATCH 01/11] Users - ORM --- .../users/main/apps/__init__.py | 0 .../users/main/apps/user_app/__init__.py | 0 .../users/main/apps/user_app/admin.py | 3 + .../users/main/apps/user_app/apps.py | 7 + .../apps/user_app/migrations/0001_initial.py | 28 ++++ .../main/apps/user_app/migrations/__init__.py | 0 .../users/main/apps/user_app/models.py | 15 +++ .../user_app/static/user_app/css/style.css | 0 .../user_app/templates/user_app/index.html | 0 .../users/main/apps/user_app/tests.py | 3 + .../users/main/apps/user_app/urls.py | 6 + .../users/main/apps/user_app/views.py | 6 + .../django_projects/users/main/db.sqlite3 | Bin 0 -> 135168 bytes .../users/main/main/__init__.py | 0 .../users/main/main/settings.py | 121 ++++++++++++++++++ .../django_projects/users/main/main/urls.py | 21 +++ .../django_projects/users/main/main/wsgi.py | 16 +++ .../django_projects/users/main/manage.py | 22 ++++ 18 files changed, 248 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/static/user_app/css/style.css create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/templates/user_app/index.html create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/apps/user_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/users/main/main/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/main/settings.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/main/urls.py create mode 100644 justin_quiros/python_stack/django_projects/users/main/main/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/users/main/manage.py diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/__init__.py b/justin_quiros/python_stack/django_projects/users/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/__init__.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/admin.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/apps.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/apps.py new file mode 100644 index 0000000..660e43e --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class UserAppConfig(AppConfig): + name = 'user_app' diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/0001_initial.py new file mode 100644 index 0000000..222f3a6 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-15 19:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email_address', models.CharField(max_length=255)), + ('age', models.IntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now_add=True)), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/models.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/models.py new file mode 100644 index 0000000..20fbefd --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/models.py @@ -0,0 +1,15 @@ +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. +class User(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + email_address = models.CharField(max_length=255) + age = models.IntegerField() + created_at = models.DateTimeField(auto_now_add = True) + updated_at = models.DateTimeField(auto_now_add = True) + + def __unicode__(self): + return "id: " + str(self.id) + ", first_name: " + self.first_name + ", last_name: " + self.last_name \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/static/user_app/css/style.css b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/static/user_app/css/style.css new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/templates/user_app/index.html b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/templates/user_app/index.html new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/tests.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/urls.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/urls.py new file mode 100644 index 0000000..42b9825 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/users/main/apps/user_app/views.py b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/views.py new file mode 100644 index 0000000..b46365b --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/apps/user_app/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render, redirect + +# Create your views here. +def index(request): + + return render(request, 'user_app/index.html') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/users/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/users/main/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..ce4b4c267776c5cdb847002cb27f62f95c39deeb GIT binary patch literal 135168 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 MtyYSh$riK!3v-xh6#xJL literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/users/main/main/__init__.py b/justin_quiros/python_stack/django_projects/users/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/users/main/main/settings.py b/justin_quiros/python_stack/django_projects/users/main/main/settings.py new file mode 100644 index 0000000..67af856 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/main/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'gdk30mdbjc%-*5sj!@nn1o7e8#u8te4*lspv5534)gn7%!%sao' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.user_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/users/main/main/urls.py b/justin_quiros/python_stack/django_projects/users/main/main/urls.py new file mode 100644 index 0000000..27fc861 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/main/urls.py @@ -0,0 +1,21 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.user_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/users/main/main/wsgi.py b/justin_quiros/python_stack/django_projects/users/main/main/wsgi.py new file mode 100644 index 0000000..4d1e3f4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/users/main/manage.py b/justin_quiros/python_stack/django_projects/users/main/manage.py new file mode 100755 index 0000000..ad5d3e7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/users/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From 9a3063073635c2fcd8aab8743c623164cd718d6e Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Wed, 15 Nov 2017 15:10:04 -0600 Subject: [PATCH 02/11] Dojo Ninjas --- .../dojo_ninjas/main/apps/__init__.py | 0 .../main/apps/dojo_app/__init__.py | 0 .../dojo_ninjas/main/apps/dojo_app/admin.py | 3 + .../dojo_ninjas/main/apps/dojo_app/apps.py | 7 + .../apps/dojo_app/migrations/0001_initial.py | 35 +++++ .../dojo_app/migrations/0002_dojo_desc.py | 20 +++ .../main/apps/dojo_app/migrations/__init__.py | 0 .../dojo_ninjas/main/apps/dojo_app/models.py | 22 ++++ .../dojo_app/static/dojo_app/css/style.css | 0 .../dojo_app/templates/dojo_app/index.html | 0 .../dojo_ninjas/main/apps/dojo_app/tests.py | 3 + .../dojo_ninjas/main/apps/dojo_app/urls.py | 6 + .../dojo_ninjas/main/apps/dojo_app/views.py | 9 ++ .../dojo_ninjas/main/db.sqlite3 | Bin 0 -> 147456 bytes .../dojo_ninjas/main/main/__init__.py | 0 .../dojo_ninjas/main/main/settings.py | 121 ++++++++++++++++++ .../dojo_ninjas/main/main/urls.py | 21 +++ .../dojo_ninjas/main/main/wsgi.py | 16 +++ .../dojo_ninjas/main/manage.py | 22 ++++ 19 files changed, 285 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0002_dojo_desc.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/static/dojo_app/css/style.css create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/templates/dojo_app/index.html create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/settings.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/urls.py create mode 100644 justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/dojo_ninjas/main/manage.py diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/__init__.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/__init__.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/admin.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/apps.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/apps.py new file mode 100644 index 0000000..bdc48d8 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class DojoAppConfig(AppConfig): + name = 'dojo_app' diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0001_initial.py new file mode 100644 index 0000000..f03fa99 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0001_initial.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-15 20:13 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Dojo', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('city', models.CharField(max_length=255)), + ('state', models.CharField(max_length=2)), + ], + ), + migrations.CreateModel( + name='Ninja', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('dojo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ninjas', to='dojo_app.Dojo')), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0002_dojo_desc.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0002_dojo_desc.py new file mode 100644 index 0000000..25bb40d --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/0002_dojo_desc.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-15 21:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dojo_app', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='dojo', + name='desc', + field=models.TextField(null=True), + ), + ] diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/models.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/models.py new file mode 100644 index 0000000..eb2e4e8 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/models.py @@ -0,0 +1,22 @@ +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. +class Dojo(models.Model): + name = models.CharField(max_length=255) + city = models.CharField(max_length=255) + state = models.CharField(max_length=2) + desc = models.TextField(null = True) + def __unicode__(self): + return "id: " + str(self.id) + ", name: " + self.name + ", city: " + self.city + ", state:" + self.state + ", desc: " + str(self.desc) + + +class Ninja(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + + dojo = models.ForeignKey(Dojo, related_name = "ninjas") + + def __unicode__(self): + return "id: " + str(self.id) + ", first_name: " + self.first_name + ", last_name: " + self.last_name + ", dojo: " + str(self.dojo) \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/static/dojo_app/css/style.css b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/static/dojo_app/css/style.css new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/templates/dojo_app/index.html b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/templates/dojo_app/index.html new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/tests.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/urls.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/urls.py new file mode 100644 index 0000000..42b9825 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/views.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/views.py new file mode 100644 index 0000000..4a876c4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/apps/dojo_app/views.py @@ -0,0 +1,9 @@ +from django.shortcuts import render + +# Create your views here. +from django.shortcuts import render, redirect + +# Create your views here. +def index(request): + + return render(request, 'dojo_app/index.html') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..e6c93ccfb8dc940fe2ab928dd494761a72978587 GIT binary patch literal 147456 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 B@bv%y literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/__init__.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/settings.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/settings.py new file mode 100644 index 0000000..2a60c98 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'g+w46!s7h*@w^#qit672)&rabk@_g+2wx_5w6j@(ki@99&9vr!' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.dojo_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/urls.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/urls.py new file mode 100644 index 0000000..9b03604 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/urls.py @@ -0,0 +1,21 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.dojo_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/wsgi.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/wsgi.py new file mode 100644 index 0000000..4d1e3f4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/dojo_ninjas/main/manage.py b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/manage.py new file mode 100755 index 0000000..ad5d3e7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/dojo_ninjas/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From 9a468fb3bf80854756d4d2935d616832815d43b2 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Wed, 15 Nov 2017 17:08:24 -0600 Subject: [PATCH 03/11] Books/Authors --- .../books_authors/main/apps/__init__.py | 0 .../main/apps/book_app/__init__.py | 0 .../books_authors/main/apps/book_app/admin.py | 3 + .../books_authors/main/apps/book_app/apps.py | 7 + .../apps/book_app/migrations/0001_initial.py | 42 ++++++ .../book_app/migrations/0002_author_notes.py | 20 +++ .../main/apps/book_app/migrations/__init__.py | 0 .../main/apps/book_app/models.py | 24 ++++ .../books_authors/main/apps/book_app/tests.py | 3 + .../books_authors/main/apps/book_app/urls.py | 6 + .../books_authors/main/apps/book_app/views.py | 9 ++ .../books_authors/main/db.sqlite3 | Bin 0 -> 159744 bytes .../books_authors/main/main/__init__.py | 0 .../books_authors/main/main/settings.py | 121 ++++++++++++++++++ .../books_authors/main/main/urls.py | 21 +++ .../books_authors/main/main/wsgi.py | 16 +++ .../books_authors/main/manage.py | 22 ++++ 17 files changed, 294 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0002_author_notes.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/main/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/main/settings.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/main/urls.py create mode 100644 justin_quiros/python_stack/django_projects/books_authors/main/main/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/books_authors/main/manage.py diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/__init__.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/__init__.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/admin.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/apps.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/apps.py new file mode 100644 index 0000000..06273c9 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class BookAppConfig(AppConfig): + name = 'book_app' diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0001_initial.py new file mode 100644 index 0000000..c9cac84 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0001_initial.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-15 21:39 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Author', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('desc', models.TextField(null=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + migrations.AddField( + model_name='author', + name='books', + field=models.ManyToManyField(related_name='authors', to='book_app.Book'), + ), + ] diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0002_author_notes.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0002_author_notes.py new file mode 100644 index 0000000..de56495 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/0002_author_notes.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-15 21:47 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('book_app', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='author', + name='notes', + field=models.TextField(null=True), + ), + ] diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/models.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/models.py new file mode 100644 index 0000000..8c5bde6 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/models.py @@ -0,0 +1,24 @@ +from __future__ import unicode_literals + +from django.db import models + +# Create your models here. +class Book(models.Model): + name = models.CharField(max_length=255) + desc = models.TextField(null = True) + created_at = models.DateTimeField(auto_now_add = True) + updated_at = models.DateTimeField(max_length=255) + def __unicode__(self): + return "id: " + str(self.id) + ", name: " + self.name + ", authors: " + str(self.authors) + ", desc: " + str(self.desc) + ", created_at:" + str(self.created_at) + ", updated_at: " + str(self.updated_at) + +class Author(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + email = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add = True) + updated_at = models.DateTimeField(auto_now = True) + notes = models.TextField(null = True) + books = models.ManyToManyField(Book, related_name = "authors") + + def __unicode__(self): + return "id: " + str(self.id) + ", first_name: " + self.first_name + ", last_name: " + self.last_name + ", email: " + self.email + ", books: " + str(self.books) + ", notes: " + str(self.notes) + ", created_at:" + str(self.created_at) + ", updated_at: " + str(self.updated_at) \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/tests.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/urls.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/urls.py new file mode 100644 index 0000000..42b9825 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/views.py b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/views.py new file mode 100644 index 0000000..de08e44 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/apps/book_app/views.py @@ -0,0 +1,9 @@ +from django.shortcuts import render + +# Create your views here. +from django.shortcuts import render, redirect + +# Create your views here. +def index(request): + + return render(request, 'book_app/index.html') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/books_authors/main/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..0a78abe187b75220c5a619f3f233da725df5cf75 GIT binary patch literal 159744 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 Y%DH?gQ*v9)E@kB@~ literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/main/__init__.py b/justin_quiros/python_stack/django_projects/books_authors/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/main/settings.py b/justin_quiros/python_stack/django_projects/books_authors/main/main/settings.py new file mode 100644 index 0000000..04b22ff --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/main/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '#8qd4e@b*_66av=0nq%yl5@p#*%&8v^)*kh)m9!-)98bj8$!bu' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.book_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/main/urls.py b/justin_quiros/python_stack/django_projects/books_authors/main/main/urls.py new file mode 100644 index 0000000..0f070b7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/main/urls.py @@ -0,0 +1,21 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.book_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/main/wsgi.py b/justin_quiros/python_stack/django_projects/books_authors/main/main/wsgi.py new file mode 100644 index 0000000..4d1e3f4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/books_authors/main/manage.py b/justin_quiros/python_stack/django_projects/books_authors/main/manage.py new file mode 100755 index 0000000..ad5d3e7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/books_authors/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From 4a9abd01ae6366cfdbff00d576604b551074ffac Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Thu, 16 Nov 2017 07:52:17 -0600 Subject: [PATCH 04/11] Likes/Books --- .../likes_books/main/apps/__init__.py | 0 .../main/apps/book_app/__init__.py | 0 .../likes_books/main/apps/book_app/admin.py | 3 + .../likes_books/main/apps/book_app/apps.py | 7 + .../apps/book_app/migrations/0001_initial.py | 48 +++++++ .../main/apps/book_app/migrations/__init__.py | 0 .../likes_books/main/apps/book_app/models.py | 18 +++ .../likes_books/main/apps/book_app/tests.py | 3 + .../likes_books/main/apps/book_app/urls.py | 6 + .../likes_books/main/apps/book_app/views.py | 9 ++ .../likes_books/main/db.sqlite3 | Bin 0 -> 151552 bytes .../likes_books/main/main/__init__.py | 0 .../likes_books/main/main/settings.py | 121 ++++++++++++++++++ .../likes_books/main/main/urls.py | 21 +++ .../likes_books/main/main/wsgi.py | 16 +++ .../likes_books/main/manage.py | 22 ++++ 16 files changed, 274 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/main/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/main/settings.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/main/urls.py create mode 100644 justin_quiros/python_stack/django_projects/likes_books/main/main/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/likes_books/main/manage.py diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/__init__.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/__init__.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/admin.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/apps.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/apps.py new file mode 100644 index 0000000..06273c9 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class BookAppConfig(AppConfig): + name = 'book_app' diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/0001_initial.py new file mode 100644 index 0000000..bea1bf9 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/0001_initial.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-16 13:31 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('desc', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email', models.EmailField(max_length=254, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + migrations.AddField( + model_name='book', + name='liked_by', + field=models.ManyToManyField(related_name='liked_books', to='book_app.User'), + ), + migrations.AddField( + model_name='book', + name='uploader', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploaded_books', to='book_app.User'), + ), + ] diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/models.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/models.py new file mode 100644 index 0000000..f1e7ee6 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/models.py @@ -0,0 +1,18 @@ +from __future__ import unicode_literals + +from django.db import models + +class User(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + email = models.EmailField(unique=True) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + +class Book(models.Model): + name = models.CharField(max_length=255) + desc = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + uploader = models.ForeignKey(User, related_name="uploaded_books") + liked_by = models.ManyToManyField(User, related_name="liked_books") \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/tests.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/urls.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/urls.py new file mode 100644 index 0000000..42b9825 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/urls.py @@ -0,0 +1,6 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/views.py b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/views.py new file mode 100644 index 0000000..de08e44 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/apps/book_app/views.py @@ -0,0 +1,9 @@ +from django.shortcuts import render + +# Create your views here. +from django.shortcuts import render, redirect + +# Create your views here. +def index(request): + + return render(request, 'book_app/index.html') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/likes_books/main/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..59fa800050c76838e2ca5557380755d67372bf42 GIT binary patch literal 151552 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 U00ck)1V8`;KmY_l;4l&RA38wu8UO$Q literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/main/__init__.py b/justin_quiros/python_stack/django_projects/likes_books/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/main/settings.py b/justin_quiros/python_stack/django_projects/likes_books/main/main/settings.py new file mode 100644 index 0000000..d636d6c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/main/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'a8f(v@p36*ohs&6w)2$in+4j%1i-hr+^7w@a-&3r!2$i8s3m_u' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.book_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/main/urls.py b/justin_quiros/python_stack/django_projects/likes_books/main/main/urls.py new file mode 100644 index 0000000..0f070b7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/main/urls.py @@ -0,0 +1,21 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.book_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/main/wsgi.py b/justin_quiros/python_stack/django_projects/likes_books/main/main/wsgi.py new file mode 100644 index 0000000..4d1e3f4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/likes_books/main/manage.py b/justin_quiros/python_stack/django_projects/likes_books/main/manage.py new file mode 100755 index 0000000..ad5d3e7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/likes_books/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From bec14e8f82ddcd148ca1b73029db3d27ff372f1f Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Thu, 16 Nov 2017 20:13:48 -0600 Subject: [PATCH 05/11] Semi-Restful --- .../django_app/main/db.sqlite3 | Bin 131072 -> 131072 bytes .../semi_rest/main/apps/__init__.py | 0 .../semi_rest/main/apps/rest_app/__init__.py | 0 .../semi_rest/main/apps/rest_app/admin.py | 3 + .../semi_rest/main/apps/rest_app/apps.py | 7 + .../apps/rest_app/migrations/0001_initial.py | 27 ++++ .../main/apps/rest_app/migrations/__init__.py | 0 .../semi_rest/main/apps/rest_app/models.py | 12 ++ .../rest_app/static/rest_app/css/style.css | 9 ++ .../rest_app/templates/rest_app/edit.html | 28 ++++ .../rest_app/templates/rest_app/index.html | 43 +++++++ .../apps/rest_app/templates/rest_app/new.html | 29 +++++ .../rest_app/templates/rest_app/user.html | 18 +++ .../semi_rest/main/apps/rest_app/tests.py | 3 + .../semi_rest/main/apps/rest_app/urls.py | 13 ++ .../semi_rest/main/apps/rest_app/views.py | 54 ++++++++ .../django_projects/semi_rest/main/db.sqlite3 | Bin 0 -> 139264 bytes .../semi_rest/main/main/__init__.py | 0 .../semi_rest/main/main/settings.py | 121 ++++++++++++++++++ .../semi_rest/main/main/urls.py | 21 +++ .../semi_rest/main/main/wsgi.py | 16 +++ .../django_projects/semi_rest/main/manage.py | 22 ++++ 22 files changed, 426 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/static/rest_app/css/style.css create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/edit.html create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/index.html create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/new.html create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/user.html create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/main/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/main/settings.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/main/urls.py create mode 100644 justin_quiros/python_stack/django_projects/semi_rest/main/main/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/semi_rest/main/manage.py diff --git a/justin_quiros/python_stack/django_projects/django_app/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/django_app/main/db.sqlite3 index 62401a1e0515c1e37784c472b86381c2a60220c4..aa8b67ff3b8513fda582f5e706d06088a9ab11b8 100644 GIT binary patch delta 250 zcmZo@;Am*zm>|ulK2gS*QGH{=l70>*z9$U)MSM>-D=OUJ(`e*oV)boQbm4T_1iGiNEp}C=@VIwyq zSo`D$>lJ`XvN)Ldw=?i>=fAUAFkv;nstU6&BO#NSn(wUNerG+Sh67OZVFvz3{D*;> vxAWV|F*`CE85o-D8XD?i+RP-&?8pg|HZoT*w6HQYvobc+v#>BUFfsrDVo^%z delta 114 zcmZo@;Am*zm>|ulHc`fzQEg+wl72Qu{vrncqRom18T=fL+>ETgjjE25AFNlHJZpXy z2P6L-1|Z_vESPYCzxmGk?RVBQYB&J(JYwK~1Qfi%FDJ|F$Z2F?Xs&B$sB2`dU}#}w QYG!3@sApkeXkcUj0OVRBMF0Q* diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/__init__.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/__init__.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/admin.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/apps.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/apps.py new file mode 100644 index 0000000..a56dd04 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class RestAppConfig(AppConfig): + name = 'rest_app' diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/0001_initial.py new file mode 100644 index 0000000..58e2301 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/0001_initial.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-16 18:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email', models.EmailField(max_length=254, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/models.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/models.py new file mode 100644 index 0000000..e0e9eee --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/models.py @@ -0,0 +1,12 @@ +from __future__ import unicode_literals + +from django.db import models + +class User(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + email = models.EmailField(unique=True) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + def __unicode__(self): + return "id: " + str(self.id) + ", first_name: " + self.first_name + ", last_name " + self.last_name + ", email " + self.email \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/static/rest_app/css/style.css b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/static/rest_app/css/style.css new file mode 100644 index 0000000..2dd646d --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/static/rest_app/css/style.css @@ -0,0 +1,9 @@ +*{ + margin: 0px; + padding: 0px; +} + +.box{ + height: 500px; + width: 500px; +} \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/edit.html b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/edit.html new file mode 100644 index 0000000..ec839ce --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/edit.html @@ -0,0 +1,28 @@ + + + + {% load static %} + + Users Index + + + + +

Edit User {{id}}

+ +
+ {% csrf_token %} + + + + + + + + +
+ +
+

Show | Go Back

+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/index.html b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/index.html new file mode 100644 index 0000000..4aadc8e --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/index.html @@ -0,0 +1,43 @@ + + + + {% load static %} + + Users Index + + + +

Users

+
+ + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
idFull NameEmailCreated AtActions
{{user.id}}{{user.first_name}} {{user.last_name}}{{user.email}}{{user.created_at}} + Show + Edit + Delete +
+
+
+ Add a new user + + + diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/new.html b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/new.html new file mode 100644 index 0000000..fd19ca4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/new.html @@ -0,0 +1,29 @@ + + + + {% load static %} + + Users Index + + + + +

Add a new user

+ +
+ {% csrf_token %} + + + + + + + + +
+ +
+
+

Go Back

+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/user.html b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/user.html new file mode 100644 index 0000000..4df6280 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/templates/rest_app/user.html @@ -0,0 +1,18 @@ + + + + {% load static %} + + Users Index + + + + +

User {{user.id}}

+

Full Name: {{user.first_name}} {{user.last_name}}

+

Email: {{user.email}}

+

Created at: {{user.created_at}}

+
+

Edit | Delete

+ + diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/tests.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/urls.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/urls.py new file mode 100644 index 0000000..53f3735 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/urls.py @@ -0,0 +1,13 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), + url(r'users$', views.index), + url(r'users/(?P\d+)$', views.show), + url(r'users/new', views.new), + url(r'create', views.create), + url(r'update/(?P\d+)', views.update), + url(r'users/(?P\d+)/edit', views.edit), + url(r'users/(?P\d+)/destroy', views.destroy) +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/views.py b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/views.py new file mode 100644 index 0000000..7c2a447 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/apps/rest_app/views.py @@ -0,0 +1,54 @@ +from django.shortcuts import render, redirect + +# Create your views here. +from django.shortcuts import render, redirect +from .models import User +from time import localtime, strftime + +# Create your views here. +def index(request): + context = { + "users": User.objects.all() + } + return render(request, 'rest_app/index.html', context) + +def show(request, user_id): + context = { + "user": (User.objects.get(id=user_id)) + } + + return render(request, 'rest_app/user.html', context) + +def new(request): + return render(request, 'rest_app/new.html') + +def edit(request, user_id): + context = { + "id": (User.objects.get(id=user_id).id), + "first_name": (User.objects.get(id=user_id).first_name), + "last_name": (User.objects.get(id=user_id).last_name), + "email": (User.objects.get(id=user_id).email) + } + return render(request, 'rest_app/edit.html', context) + +def create(request): + User.objects.create(first_name=request.POST['first_name'], last_name=request.POST['last_name'], email=request.POST['email']) + return redirect('/') + +def destroy(request, user_id): + User.objects.get(id=user_id).delete() + return redirect('/') + +def update(request, user_id): + + x = User.objects.get(id=user_id) + x.first_name = request.POST['first_name'] + x.last_name = request.POST['last_name'] + x.email = request.POST['email'] + x.save() + + return redirect('/') + + + + diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/semi_rest/main/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..01567438f8811bf6edcf06a710b2dcb0a8cc45b8 GIT binary patch literal 139264 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 literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/main/__init__.py b/justin_quiros/python_stack/django_projects/semi_rest/main/main/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/main/settings.py b/justin_quiros/python_stack/django_projects/semi_rest/main/main/settings.py new file mode 100644 index 0000000..8f240dd --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/main/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for main project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '+su$+$)6d_whsvxlr!xjwi7z3c#niqetupwsjffyks+ftli$*5' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.rest_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'main.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'main.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/main/urls.py b/justin_quiros/python_stack/django_projects/semi_rest/main/main/urls.py new file mode 100644 index 0000000..2b90edf --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/main/urls.py @@ -0,0 +1,21 @@ +"""main URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.rest_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/main/wsgi.py b/justin_quiros/python_stack/django_projects/semi_rest/main/main/wsgi.py new file mode 100644 index 0000000..4d1e3f4 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/main/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for main project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/semi_rest/main/manage.py b/justin_quiros/python_stack/django_projects/semi_rest/main/manage.py new file mode 100755 index 0000000..ad5d3e7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/semi_rest/main/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "main.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From 31c364d22aabb1c9979c066627f940d3d1133ad2 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Thu, 16 Nov 2017 21:27:50 -0600 Subject: [PATCH 06/11] Course/Review --- .../courses/courses/apps/__init__.py | 0 .../courses/apps/course_review/__init__.py | 0 .../courses/apps/course_review/admin.py | 3 + .../courses/apps/course_review/apps.py | 7 + .../course_review/migrations/0001_initial.py | 26 ++++ .../apps/course_review/migrations/__init__.py | 0 .../courses/apps/course_review/models.py | 11 ++ .../templates/course_review/destroy.html | 17 +++ .../templates/course_review/index.html | 45 +++++++ .../courses/apps/course_review/tests.py | 3 + .../courses/apps/course_review/urls.py | 9 ++ .../courses/apps/course_review/views.py | 28 ++++ .../courses/courses/courses/__init__.py | 0 .../courses/courses/courses/settings.py | 121 ++++++++++++++++++ .../courses/courses/courses/urls.py | 21 +++ .../courses/courses/courses/wsgi.py | 16 +++ .../courses/courses/db.sqlite3 | Bin 0 -> 135168 bytes .../django_projects/courses/courses/manage.py | 22 ++++ 18 files changed, 329 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/admin.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/apps.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/destroy.html create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/tests.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/urls.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/courses/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/courses/settings.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/courses/urls.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/courses/wsgi.py create mode 100644 justin_quiros/python_stack/django_projects/courses/courses/db.sqlite3 create mode 100755 justin_quiros/python_stack/django_projects/courses/courses/manage.py diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/__init__.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/__init__.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/admin.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/apps.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/apps.py new file mode 100644 index 0000000..a51a109 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class CourseReviewConfig(AppConfig): + name = 'course_review' diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/0001_initial.py new file mode 100644 index 0000000..14c5240 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-17 02:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Course', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('desc', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/__init__.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py new file mode 100644 index 0000000..c4e6f23 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py @@ -0,0 +1,11 @@ +from __future__ import unicode_literals + +from django.db import models + +class Course(models.Model): + name = models.CharField(max_length=255) + desc = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + def __unicode__(self): + return "id: " + str(self.id) + ", name: " + self.name + ", desc: " + self.desc \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/destroy.html b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/destroy.html new file mode 100644 index 0000000..b5c49b9 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/destroy.html @@ -0,0 +1,17 @@ + + + + {% load static %} + + Courses + + + + +

Delete a course

+

Are you sure you want to delete the following course?

+

Name: {{name}}

+

Description: {{desc}}

+ remove + + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html new file mode 100644 index 0000000..25e28fb --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html @@ -0,0 +1,45 @@ + + + + {% load static %} + + Courses + + + + +

Add a new course

+ +
+ {% csrf_token %} + + +
+ +
+ +
+
+

Courses

+ + + + + + + + + + + {% for course in courses %} + + + + + + + {% endfor %} + +
Course NameDescriptionDate AddedActions
{{course.name}}{{course.desc}}{{course.created_at}}remove
+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/tests.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/urls.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/urls.py new file mode 100644 index 0000000..e7461ef --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/urls.py @@ -0,0 +1,9 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), + url(r'courses/create', views.create), + url(r'courses/destroy/(?P\d+)', views.destroy), + url(r'courses/delete/(?P\d+)', views.delete) +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py new file mode 100644 index 0000000..76954e5 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py @@ -0,0 +1,28 @@ +from django.shortcuts import render, redirect + +# Create your views here. +from django.shortcuts import render, redirect +from .models import Course + +# Create your views here. +def index(request): + context = { + "courses": Course.objects.all() + } + return render(request, 'course_review/index.html', context) + +def destroy(request, course_id): + context = { + "id": (Course.objects.get(id=course_id).id), + "name": (Course.objects.get(id=course_id).name), + "desc": (Course.objects.get(id=course_id).desc) + } + return render(request, 'course_review/destroy.html', context) + +def delete(request, id): + Course.objects.get(id=id).delete() + return redirect('/') + +def create(request): + Course.objects.create(name=request.POST['name'], desc=request.POST['desc']) + return redirect('/') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/courses/__init__.py b/justin_quiros/python_stack/django_projects/courses/courses/courses/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/courses/courses/courses/settings.py b/justin_quiros/python_stack/django_projects/courses/courses/courses/settings.py new file mode 100644 index 0000000..3b1e7b7 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/courses/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for courses project. + +Generated by 'django-admin startproject' using Django 1.10. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.10/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '60!$l^7vf+qkqzo(_8v*2z)fl=pewhyf$u7g(5*1d#kz_e_4*2' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.course_review', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'courses.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'courses.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.10/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.10/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.10/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/courses/courses/courses/urls.py b/justin_quiros/python_stack/django_projects/courses/courses/courses/urls.py new file mode 100644 index 0000000..1fb3d86 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/courses/urls.py @@ -0,0 +1,21 @@ +"""courses URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.10/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.course_review.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/courses/courses/courses/wsgi.py b/justin_quiros/python_stack/django_projects/courses/courses/courses/wsgi.py new file mode 100644 index 0000000..9da3dff --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/courses/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for courses project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.10/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "courses.settings") + +application = get_wsgi_application() diff --git a/justin_quiros/python_stack/django_projects/courses/courses/db.sqlite3 b/justin_quiros/python_stack/django_projects/courses/courses/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..d585944a82a0a1b54738e4c3d5d59e40aada55ae GIT binary patch literal 135168 zcmeI5TWlLwddFvY8{No}B`f2s?RZ43VzaU=4lkl;Z#H2Z#u04Gjx3{bw#9Trj^wd< zkvWtdqq|s8F5EtBUJ4|;55)p)7g(SV-LwUY0?k7kplyHx1@_Vw=)aT>TgD*0k2Jo+PYKe?^L%HSn9C zy=AIty_hX(xsBe0sk5u)(pp(wUU{wjmYnQO?&eF%msa|dlk$lqD?l}>$yA3sXxT6w zY=gd3NGn=3*IUTJJ#29D4Yq;Rl$kI;DM;4{1})eGTTm_LviWo+T~W6i#;sm^CT)AJ zt}MTKbugMhU3=SjQuZQyVM3737x_-vwbuf=rMK#aX&TLjsV-#;*>$C$Fhl#2Cj#*G z33YXN4D1u4?sUtweER$W%fK_c8R%9fV9)o-T0M(E@+*E|^GQ4CWgQU(>7_ZoGw;^NBa%}J8_K#;VXeT8 z7X#?Jsj8F9W0#vs9bRcR+Ipj{w(oA~mdi^Cf|Z!@wLmj^owi&;jGiTWt)Rj;GVrli7e7<~5E?r%_w7f!8UM#Py5mW8KBOupm z`StQ@dF5>RilkJR{P#BjR?}QWBmOYf3>@fU}Qi=_f^9!%{1>cTcl;&)>@V8TI+<8SxR-A z2XSRhGuvvdxoI?#a#d^VZKJMx(+yKKw~6~`V@b;E&1TJ;N@H1T@9NK{UG=hc_adci z7%fuFU`fZ2T_yCoX4Kr86!LCKBtJE@t!-@d8%a{MO53=t_b1UBt2dfPLnny(s-IFu zV^aAT&#^(syj3HQcq(xektfeL^qc*FW8D=gjM1HmVL>Vu`Fk(B{IOvrl%; z*yq@u#1phHo+LR_ool=xEiCXmnipl=*lcNSI>)e$b0b1Ny~)1xeKi+SSN9&0$@_02 z{&Ax>m1M0MeRm4tZ0Wf;xhBSbofH2?d|#}J(}{mfyqkC<5sQBm|9U(#_HSb!kVJey z00ck)1V8`;KmY_l00cnbvk}N9qTJEhlBrueHR*I(QH_StHndtMtrX@JWnL-B>CEX| z?sO)7Dy?Lfin*nDlsi6Ksx-G-rmnX1+lGE;*PKf6RI#|Yw3vT=EXqw?Dbd9al3_{J zYHhN`$JUaa)j+kby`$Fj#%B9^p9MruVJTfu(&tBso?mtJ6l^`WwVFZJ;hHV7W>>AM zdaKoJsdZ8{ZBsV`m1PTsT)H$ulr1~T7DB-g3S|E=oz4WQSj^^?LhjXJ zqT;-xBJZu2yGE)uwrl-VNu3rm#l^+^D?>!bIY&p%tE0=Nxz!G=NWQp8w%E=JM8ic# zL)NQ-Er0HTHcyOD7T<^wCBN(_$=FKVwI{X^yO*ZS;!<|;jcAmcJx7`e+n-?=DMiA! z-n`w#Ywg?6xpNTSTrsaGxl$y`Nd!%`ZZwz*vgSWN#M{}IM4f5sK|N_U9XBr(QuXz zILjc6jfRg6v2!?dy+!;PH{pipIgQC!c#dc3?rO-?WH>xOWNTyV6ZAaXR4BaQ6ycso zND!kB4F{AwLJ|bA#fg6}enT8Fz+0CvHus2L}q8ml7YK>@A)1}M5ZJ*`DZ`uiN+&SQ!GfA3L=w{sc9B+7Y4!; z5$Pz;Rs@{G3LzIlt-o9*;)2DT!|Wv-$s6gaoH(kk0=n z!Xz|JL+I*H@tn9M zz9=3PBZ;3Uew_F?@x8?RiQh;xi6}lG00JNY0w4eaAOHd&00JNY0wCZaa4^EBc!9j3 zP$w@RwdcE2RwQ|$Yh$w;dGJ7lpWy}i+5}r{@=%0V_?Vs7GZmh&672k*gacC%evXe( z9iG_ni3mT-M{PZ9_AFXawgwiJ5F`9CK1%blaGco_v2)Q$_Lvo8XQDBqi3op`kI+0c zI3h*(1wL$NacAPgR=l0jjUQqh!Zf=ZDX=<(Y$eXleaworRXDLxR*eu<;6z0xBE!dd zJGV8{CkFvYl%3Uz3MC@L)5A2MyZ=vK`i~C?fB*=900@8p2!H?xfB*=900@AD%&vso=I}iW?5C8!X009sH0T2KI5CDP4K;Z2uqV($V z*;1+0XtuBGE%{1YtK7WQ(B*owrOWNs-Ar03%qz;gQjpWx)0x6)MLCsOOlPyj0V%n3 zwsRsRaK}3rOQqHA^}BMjA+Ksi&GZFi!<03d{4D>r-kLX!sxIHr*JW*Mt7cTRwn6f2 zw6wZ@r`ftG-)R}`w%(8pqKGQoZd8e>#9sO0@|t|XsOSw-KPCGOQkG6Dxl`$-#auQ$ zAZ0O|?Id}Do9&z}l`h|HUniw90Bc0G9X2TtxzZ$N8oDXB^~&`|ll+{Y2F&fsby+iQ z(UbD)HO;(vQhx0Qd2>SZq%<0_X>2%?gl1URgy(!t# z>Eh|Uaw?Z!QkJrw{eSjTfXC1hpb`W?00ck)1V8`;KmY_l00ck)1VG?(Cg7R>f6kVm zcn|;q5C8!X009sH0T2KI5C8!X0D;Fv0Q3LHMHYHN00ck)1V8`;KmY_l00ck)1VG@) zAwUoPPl@+A@&CmC5&uK{ckw6UKa2k){z&{g@ni8L@k8-X#Sg?k5WgdSTl|*z+u}Ef zC_W$n0w4eaAOHd&00JNY0w4eaAOHgUA`lJpyfDSC2ibL!USkvNdVpQW=`|{{Yl24p00ck)1V8`; zKmY_l00ck)1fD7a?4^I>PnF3q76d>51V8`;KmY_l00ck)1V8`;K;R(>VE+G*z#t9+ zAOHd&00JNY0w4eaAOHd&00K`T0nGoOLZ`uG5C8!X009sH0T2KI5C8!X009tqNCKGu zKO``Sg8&GC00@8p2!H?xfB*=900@AWW8L)EcT^pof(;rB!T z6)N)|@n7b&hb(~Ogi)zp;&&#EMpb`D+iqW1w@tleUAFXA-7rm~*)XjLqpB)7ZE<}u zn^CtL#;w8f&z)T@m)6Si)s^Kpua@QImDkE|$;rX;!TOW(rIp=sCFK)IX0B09o|KcW zy()=Fb@(YkdU>Aj%=A=lv(?<*GS#$R%oerWhHI6TFlF1`XLL`#UhAx6Y7_fr*}xsN zY?uzVL0>AQ6|I`=4p=^DYH1)E?Cs>NJ3pRS}UJ)X5{HMxgB zZ8U+p_O_Au&V%fQ2|+qvbVJO=g&QFprK zT0VXLfMwvB-3;`#u0FK~9>_pP$6f|n>RFq=I4($=MSe%v%{E6~O;@VfOnyD>`n=E5 z@xh+&lU0KiKd|`$eK;Zt(o1uEXWp%k#~nGPu%WCg71j#ecrk#ko2ojwJa)OM)Zvw8 zqpdgEYWwb%Zn?aaAXteRUkfy&M_wgedOcgnYc5t-f5PS2dHXrx*&ThKwqd6|CP?%1 z{Jq0%ZM~-V4#>UXG24x6rB^SMz4s{A1x(tCNPmWMu|Ac~fJZ z&;Jg!b0jWEr4oPdY!7+{#O*q!>xABv_#k)m3jTr};~G!Lkq7XOo56LF%)N9e#dB=v zF>lq3wyqKqO%|r#>}NK$StHM9{_yC|#IPV0i~PNpUABGWHp|l&I~>5YPiS8}EiDfQ zgvmNA`fd>WBbptGN#~|_C2E=IdAu0vj0=J^Jq+^x)~a0B zS|^s$DR&gH9;;L2X@6RpoAY%Xw*e8mo`^?aJkL3kC_K+y4#jALy~etbJ(ijJt!=$g z(R+enUuWt`JV86hNs=?wxyB39!UDgeF`d;LT4S@R){V`U)}}MpzKD=dZ?Z3aUwu{E z+H$*UCZBivDjBl;9l1A^WUU!Gxj9s|w%#`CdbgXWu>b$i>lw%Z0w4eaAOHd&00JNY z0w4eaAOHeS9fA1BE8KYK0yq5L(7y_&W8aINjQ(2Wcf;Qd{V;SPadq_DBk#q3XXJAH zg-1}akyrRXl#U(a@6Wocn{@5GyPWLosr7Dn>}$DXOEb+o%@$eoaF#cf%#v@-q^6l| zwbtA;8UYIn@v+R2u7Fb;oMR6D6Ldm%62jETp@UH4`mcn6p`q|&VFtR19w zgc*S?yO-U*;+DvIj2k@aUvBJ4-B<7FsnQ#L2A+$U#NZBmEQ}nJKdr1W-i~1cJAh9o}y7mq9gk^Pba;n3<;5}(%o26Cj zMuU!{s&itfH{pm~9lMA3CU^7s;C9v0sDkdOeT&?; zoV#D9r_a&5Mzf)A)U?f{Y}U0}jT|J9w;QIhNp2Y4I~~~@Y;5XkT{lf_liX*lqU_TK ztbhBDvbYYO?xNLNaH z=c;?Oh84yx?l{_WRu=yy~r6cjh&?_xnB`|4)9+@46Yt?FjQ)6IG|<|-|nJcd$j1-~kPXw={I{fShu)8%gJciqOC^E`%mkBt$Gjy$nM z>mTyHW(I63-#c+iU^BgA{^rwd98bhd?=iF&`yh>XCP-NBHqWwK?4zID(eCOWxRkut z-S+t&?Ellj5+4u%0T2KI5C8!X009sH0T2KI5O}r;VE+GX`xmtX0T2KI5C8!X009sH z0T2KI5C8#60P}ye0}ucK5C8!X009sH0T2KI5C8!Xc=idzNfoEYe#nXcB7P`-Q*4Rn z#3PCSO#F4?TZykG-cBqfz7YTK_z&XWjo*%!<1=HQ5>b3W00ck)1V8`;KmY_l00cnb zNg?p!RFvaWia_4Kqmwsa*}r5zt2JaRMz&*KJZQ<;?>F(tSuu{BJW1qc<^-);^(rGl zM`B@uNGNAwc8T`;P3WKY@sw)E$~1c6fR({6x+jBOyf;H?oMf2G$EXcG($o&GXi_Ai zv-45g81`2tJZ4yb>>^>w*yVR+?2=jdNSw$VJ07J)b_Hl*EFh1O)S0=6T?+lRxu*~s zlt(QIy9`IdE`kQXFhV4b&PHenPBJZkem^-((iRF~Tfh5)6i+E`PjAzHduj+X5Tg`?c?@ddkN>rEz}a;=D&5EHV?bcO5^t%##M5t>fX(p(8zmKCD& ze{TFq>AJ831V8`;KmY_l00ck)1V8`;KmY_l;BgS}oc|Xehkob;0T2KI5C8!X009sH z0T2KI5C8!X`1}cY=Kr6+F|YsxKmY_l00ck)1V8`;KmY_l00cnbu@J!g|FK|&QV;+E Y5C8!X009sH0T2KI5C8!Xc%lgWKh?vA=Kufz literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/courses/courses/manage.py b/justin_quiros/python_stack/django_projects/courses/courses/manage.py new file mode 100755 index 0000000..7594c9c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/courses/courses/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "courses.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) From c9bb572c2585f7cfceecf99b73fc599e9a3c0692 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Fri, 17 Nov 2017 13:24:16 -0600 Subject: [PATCH 07/11] Course validation --- .../courses/apps/course_review/models.py | 32 +++++++++++++++++++ .../templates/course_review/index.html | 4 ++- .../courses/apps/course_review/views.py | 9 +++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py index c4e6f23..e0a4ddd 100644 --- a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/models.py @@ -2,10 +2,42 @@ from django.db import models +class CourseManager(models.Manager): + + def course_validation(self, form_data): + errors = {} + + + if len(form_data['name']) == 0: + errors['name'] = "Course name is required." + + if len(form_data['name']) < 5: + errors['name'] = "Course name must be atleast 5 characters." + + if len(form_data['desc']) < 15: + errors['desc'] = "Course description must be atleast 15 characters." + + + # if len(form_data['name']) == 0: + # errors.append('Course name is required.') + + # if len(form_data['name']) < 5: + # errors.append('Course name must be atleast 5 characters.') + + # if len(form_data['desc']) < 15: + # errors.append('Course description must be atleast 15 characters.') + + return errors + + + class Course(models.Model): name = models.CharField(max_length=255) desc = models.CharField(max_length=255) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) + + objects = CourseManager() + def __unicode__(self): return "id: " + str(self.id) + ", name: " + self.name + ", desc: " + self.desc \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html index 25e28fb..70e048f 100644 --- a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/templates/course_review/index.html @@ -9,7 +9,9 @@

Add a new course

- + {% for message in messages %} + {{message}} + {% endfor %}
{% csrf_token %} diff --git a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py index 76954e5..64c9441 100644 --- a/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py +++ b/justin_quiros/python_stack/django_projects/courses/courses/apps/course_review/views.py @@ -2,6 +2,7 @@ # Create your views here. from django.shortcuts import render, redirect +from django.contrib import messages from .models import Course # Create your views here. @@ -24,5 +25,11 @@ def delete(request, id): return redirect('/') def create(request): - Course.objects.create(name=request.POST['name'], desc=request.POST['desc']) + errors = Course.objects.course_validation(request.POST) + if len(errors): + for tag, error in errors.iteritems(): + messages.error(request, error, extra_tags = tag) + return redirect('/') + else: + Course.objects.create(name=request.POST['name'], desc=request.POST['desc']) return redirect('/') \ No newline at end of file From a34fc2618d378d7376a162f02ef167a9bdc6f373 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Fri, 17 Nov 2017 16:09:05 -0600 Subject: [PATCH 08/11] Login_Reg --- .../login_reg/apps/__init__.py | 0 .../login_reg/apps/login_app/__init__.py | 0 .../login_reg/apps/login_app/admin.py | 3 + .../login_reg/apps/login_app/apps.py | 7 + .../apps/login_app/migrations/0001_initial.py | 28 ++++ .../apps/login_app/migrations/__init__.py | 0 .../login_reg/apps/login_app/models.py | 71 ++++++++++ .../login_app/static/login_app/css/style.css | 21 +++ .../login_app/templates/login_app/index.html | 54 ++++++++ .../templates/login_app/success.html | 15 +++ .../login_reg/apps/login_app/tests.py | 3 + .../login_reg/apps/login_app/urls.py | 10 ++ .../login_reg/apps/login_app/views.py | 44 +++++++ .../django_projects/login_reg/db.sqlite3 | Bin 0 -> 135168 bytes .../login_reg/login_reg/__init__.py | 0 .../login_reg/login_reg/settings.py | 121 ++++++++++++++++++ .../login_reg/login_reg/urls.py | 21 +++ .../login_reg/login_reg/wsgi.py | 16 +++ .../django_projects/login_reg/manage.py | 22 ++++ 19 files changed, 436 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/static/login_app/css/style.css create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/index.html create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/success.html create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/apps/login_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/db.sqlite3 create mode 100644 justin_quiros/python_stack/django_projects/login_reg/login_reg/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/login_reg/settings.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/login_reg/urls.py create mode 100644 justin_quiros/python_stack/django_projects/login_reg/login_reg/wsgi.py create mode 100755 justin_quiros/python_stack/django_projects/login_reg/manage.py diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/__init__.py b/justin_quiros/python_stack/django_projects/login_reg/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/__init__.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/admin.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/apps.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/apps.py new file mode 100644 index 0000000..39e95c6 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class LoginAppConfig(AppConfig): + name = 'login_app' diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/0001_initial.py new file mode 100644 index 0000000..fc8f6ff --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-17 19:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('first_name', models.CharField(max_length=255)), + ('last_name', models.CharField(max_length=255)), + ('email', models.CharField(max_length=255)), + ('password', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/models.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/models.py new file mode 100644 index 0000000..4a82f5c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/models.py @@ -0,0 +1,71 @@ +from __future__ import unicode_literals + +from django.db import models +import bcrypt +import re +EMAIL_REGEX = re.compile(r'^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]+$') + +class UserManager(models.Manager): + + def register_validation(self, form_data): + errors = [] + + if len(form_data['first_name']) == 0: + errors.append( "First name is required.") + if len(form_data['last_name']) == 0: + errors.append("Last name is required") + if len(form_data['email']) == 0 or not EMAIL_REGEX.match(form_data['email']): + errors.append("Email is invalid.") + if len(form_data['password']) < 8: + errors.append("Email must be atleast 8 characters.") + if form_data['password'] != form_data['conf_password']: + errors.append("Passwords did not match.") + + duplicate = User.objects.filter(email = form_data['email']) + if len(duplicate) == 1: + errors.append("This email is already registered.") + + return errors + + + def register(self, form_data): + pw = str(form_data['password']) + hashed_pw = bcrypt.hashpw(pw, bcrypt.gensalt()) + + user = User.objects.create( + first_name = form_data['first_name'], + last_name = form_data['last_name'], + email = form_data['email'], + password = hashed_pw + ) + return user + + def login_validation(self, form_data): + errors = [] + user = User.objects.filter(email=form_data['email']).first() + print user + if user: + pw = str(form_data['password']) + user_password = str(user.password) + if not bcrypt.checkpw(pw.encode(), user_password.encode()): + errors.append("Invalid password.") + else: + errors.append("Invalid email.") + return errors + + def login(self, form_data): + user = User.objects.filter(email=form_data['email']).first() + return user + + +class User(models.Model): + first_name = models.CharField(max_length=255) + last_name = models.CharField(max_length=255) + email = models.CharField(max_length=255) + password = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + objects = UserManager() + + def __unicode__(self): + return "id: " + str(self.id) + ", first_name: " + self.first_name + ", last_name: " + self.last_name + ", email:" + self.email + ", password:" + self.password diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/static/login_app/css/style.css b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/static/login_app/css/style.css new file mode 100644 index 0000000..6babea9 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/static/login_app/css/style.css @@ -0,0 +1,21 @@ +*{ + margin: 0px; + padding: 0px; +} + +input{ + float: right; +} + +h1{ + margin-left: 10px; + margin-bottom: 20px; +} + +form{ + width: 215px; + margin-bottom: 50px; + margin-left: 10PX; + border: solid 2px black; + padding: 10px 5px 25px 5px; +} \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/index.html b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/index.html new file mode 100644 index 0000000..372c89f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/index.html @@ -0,0 +1,54 @@ + + + + {% load static %} + + Login and Registration + + + + +

Registration

+ {% for error in errors %} + {{error}} + {% endfor %} + + {% csrf_token %} + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

Login

+
+ {% csrf_token %} + + +
+
+ + +
+
+ +
+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/success.html b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/success.html new file mode 100644 index 0000000..9002f73 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/templates/login_app/success.html @@ -0,0 +1,15 @@ + + + + {% load static %} + + Login and Registration + + + + +

Success! Welcome, {{request.session.name}}.

+

Succesfully {{request.session.status}}

+ Logout + + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/tests.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/urls.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/urls.py new file mode 100644 index 0000000..c998298 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/urls.py @@ -0,0 +1,10 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), + url(r'^courses/register', views.register), + url(r'^courses/login', views.login), + url(r'^logout', views.logout), + url(r'^success', views.success), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/views.py b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/views.py new file mode 100644 index 0000000..360b066 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/login_reg/apps/login_app/views.py @@ -0,0 +1,44 @@ +from django.shortcuts import render, redirect +from django.contrib import messages +from .models import User +# Create your views here. +def index(request): + request.session['status'] = "" + if 'errors' not in request.session: + request.session['errors'] = [] + context = { + "errors": request.session['errors'] + } + return render(request, 'login_app/index.html', context) + +def register(request): + if request.method == "POST": + errors = User.objects.register_validation(request.POST) + if len(errors) != 0: + request.session['errors'] = errors + print errors + return redirect('/') + else: + user = User.objects.register(request.POST) + request.session['user_id'] = user.id + request.session['status'] = "registered." + request.session['name'] = user.first_name + return redirect('/success') + +def login(request): + errors = User.objects.login_validation(request.POST) + if len(errors) != 0: + request.session['errors'] = errors + return redirect('/') + else: + user = User.objects.login(request.POST) + request.session['name'] = user.first_name + request.session['status'] = "logged in." + return render(request, 'login_app/success.html') + +def success(request): + return render(request, 'login_app/success.html') + +def logout(request): + request.session.clear() + return redirect('/') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/login_reg/db.sqlite3 b/justin_quiros/python_stack/django_projects/login_reg/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..c7c5932a57bc2ca0f9a1e0c1845b54c7bd8e6546 GIT binary patch literal 135168 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 Date: Sat, 18 Nov 2017 19:41:42 -0600 Subject: [PATCH 09/11] Reviewer --- .../django_projects/reviewer/apps/__init__.py | 0 .../reviewer/apps/review_app/__init__.py | 0 .../reviewer/apps/review_app/admin.py | 3 + .../reviewer/apps/review_app/apps.py | 7 + .../review_app/migrations/0001_initial.py | 28 ++++ .../migrations/0002_author_book_review.py | 42 ++++++ .../apps/review_app/migrations/__init__.py | 0 .../reviewer/apps/review_app/models.py | 141 ++++++++++++++++++ .../static/review_app/css/style.css | 3 + .../review_app/templates/review_app/add.html | 47 ++++++ .../templates/review_app/books.html | 38 +++++ .../templates/review_app/index.html | 59 ++++++++ .../templates/review_app/review.html | 49 ++++++ .../review_app/templates/review_app/user.html | 22 +++ .../reviewer/apps/review_app/tests.py | 3 + .../reviewer/apps/review_app/urls.py | 16 ++ .../reviewer/apps/review_app/views.py | 107 +++++++++++++ .../django_projects/reviewer/db.sqlite3 | Bin 0 -> 159744 bytes .../django_projects/reviewer/manage.py | 22 +++ .../reviewer/reviewer/__init__.py | 0 .../reviewer/reviewer/settings.py | 121 +++++++++++++++ .../django_projects/reviewer/reviewer/urls.py | 21 +++ .../django_projects/reviewer/reviewer/wsgi.py | 16 ++ 23 files changed, 745 insertions(+) create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/admin.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/apps.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0001_initial.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0002_author_book_review.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/static/review_app/css/style.css create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/add.html create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/index.html create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/review.html create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/user.html create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/tests.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/db.sqlite3 create mode 100755 justin_quiros/python_stack/django_projects/reviewer/manage.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/reviewer/__init__.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/reviewer/settings.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/reviewer/urls.py create mode 100644 justin_quiros/python_stack/django_projects/reviewer/reviewer/wsgi.py diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/__init__.py b/justin_quiros/python_stack/django_projects/reviewer/apps/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/__init__.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/admin.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/apps.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/apps.py new file mode 100644 index 0000000..3332ce0 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/apps.py @@ -0,0 +1,7 @@ +from __future__ import unicode_literals + +from django.apps import AppConfig + + +class ReviewAppConfig(AppConfig): + name = 'review_app' diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0001_initial.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0001_initial.py new file mode 100644 index 0000000..000924a --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0001_initial.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-18 16:36 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('alias', models.CharField(max_length=255)), + ('email', models.CharField(max_length=255)), + ('password', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0002_author_book_review.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0002_author_book_review.py new file mode 100644 index 0000000..ff13d3f --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/0002_author_book_review.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2017-11-18 20:35 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('review_app', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Author', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ], + ), + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255)), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='books', to='review_app.Author')), + ], + ), + migrations.CreateModel( + name='Review', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('review', models.TextField()), + ('rating', models.IntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('book', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='review_app.Book')), + ('reviewer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews_left', to='review_app.User')), + ], + ), + ] diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/__init__.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py new file mode 100644 index 0000000..5aa0b51 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py @@ -0,0 +1,141 @@ +from __future__ import unicode_literals + +from django.db import models +import bcrypt +import re +EMAIL_REGEX = re.compile(r'^[a-zA-Z0-9.+_-]+@[a-zA-Z0-9._-]+\.[a-zA-Z]+$') + +class UserManager(models.Manager): + + def register_validation(self, form_data): + errors = [] + + if len(form_data['name']) == 0: + errors.append( "Name is required.") + if len(form_data['alias']) == 0: + errors.append("Alias is required") + if len(form_data['email']) == 0 or not EMAIL_REGEX.match(form_data['email']): + errors.append("Email is invalid.") + if len(form_data['password']) < 8: + errors.append("Email must be atleast 8 characters.") + if form_data['password'] != form_data['conf_password']: + errors.append("Passwords did not match.") + + duplicate = User.objects.filter(email = form_data['email']) + if len(duplicate) == 1: + errors.append("This email is already registered.") + + return errors + + + + def register(self, form_data): + pw = str(form_data['password']) + hashed_pw = bcrypt.hashpw(pw, bcrypt.gensalt()) + + user = User.objects.create( + name = form_data['name'], + alias = form_data['alias'], + email = form_data['email'], + password = hashed_pw + ) + return user + + def login_validation(self, form_data): + errors = [] + user = User.objects.filter(email=form_data['email']).first() + print user + if user: + pw = str(form_data['password']) + user_password = str(user.password) + if not bcrypt.checkpw(pw.encode(), user_password.encode()): + errors.append("Invalid password.") + else: + errors.append("Invalid email.") + return errors + + + def login(self, form_data): + user = User.objects.filter(email=form_data['email']).first() + return user + + + + + + +class User(models.Model): + name = models.CharField(max_length=255) + alias = models.CharField(max_length=255) + email = models.CharField(max_length=255) + password = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + objects = UserManager() + +class Author(models.Model): + name = models.CharField(max_length=255) + +class Book(models.Model): + title = models.CharField(max_length=255) + author = models.ForeignKey(Author, related_name="books") + + + +class ReviewManager(models.Manager): + def review_validation(self, form_data): + errors = [] + + if len(form_data['title']) < 1 or len(form_data['review']) < 1: + errors.append('Title/Review fields are required') + if not "author" in form_data and len(form_data['new_author']) < 3: + rrors.append('Author names must be atleast 3 letters.') + + if "author" in form_data and len(form_data['new_author']) > 0 and len(form_data['new_author']) < 3: + errors.append('Author names must be atleast 3 letters.') + if not int(form_data['rating']) > 0 or not int(form_data['rating']) <= 5: + errors.append('invalid rating') + return errors + + def create_review(self, form_data, user_id): + + # retrive or create author + the_author = None + if len(form_data['new_author']) < 1: + the_author = Author.objects.get(id=int(form_data['author'])) + else: + the_author = Author.objects.create(name=form_data['new_author']) + + # retirive or create book + the_book = None + if not Book.objects.filter(title=form_data['title']): + the_book = Book.objects.create( + title=form_data['title'], author=the_author + ) + else: + the_book = Book.objects.get(title=form_data['title']) + + # returns a Review object + return self.create( + review = form_data['review'], + rating = form_data['rating'], + book = the_book, + reviewer = User.objects.get(id=user_id) + ) + + def recent_and_not(self): + + # returns a tuple with the zeroeth index containing query for 3 most recent reviews, and the first index + # containing the rest + + return (self.all().order_by('-created_at')[:3], self.all().order_by('-created_at')[3:]) + +class Review(models.Model): + review = models.TextField() + rating = models.IntegerField() + book = models.ForeignKey(Book, related_name="reviews") + reviewer = models.ForeignKey(User, related_name="reviews_left") + created_at = models.DateTimeField(auto_now_add=True) + objects = ReviewManager() + def __str__(self): + return "Book: {}".format(self.book.title) \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/static/review_app/css/style.css b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/static/review_app/css/style.css new file mode 100644 index 0000000..1fe37db --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/static/review_app/css/style.css @@ -0,0 +1,3 @@ +.side{ + overflow: scroll; +} \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/add.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/add.html new file mode 100644 index 0000000..d77c92d --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/add.html @@ -0,0 +1,47 @@ + + + + {% load static %} + + Add Book and Review + + + + +

Add a New Book and a Review

+
+ {% for error in errors %} + {{error}} + {% endfor %} +

Register

+
+ {% csrf_token %} + + +
+
+ + Choose from the list: + +
+ Or add a new author: + + + + + + +
+
+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html new file mode 100644 index 0000000..905f70d --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html @@ -0,0 +1,38 @@ + + + + {% load static %} + + Books Home + + + + +

Welcome, {{request.session.name}}

+
+ Add Book and Review +
+ Logout + +
+

Recent Book Reviews:

+ {% for review in recent %} +
+

{{ review.book.title }}

+

Rating: {{ review.rating }}

+

{{ review.reviewer.name}} says: {{ review.review }}

+

Posted on: {{ review.created_at }}

+
+ {% endfor %} +
+

Other Books with Reviews:

+ {% for review in more %} +
+

{{ review.book.title }}

+
+ {% endfor %} +
+
+ + + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/index.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/index.html new file mode 100644 index 0000000..e475463 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/index.html @@ -0,0 +1,59 @@ + + + + {% load static %} + + Welcome + + + + +

Welcome!

+
+ {% for error in errors %} + {{error}} + {% endfor %} +

Register

+
+ {% csrf_token %} + + +
+
+ + +
+
+ + +
+
+ + +

*Password should be at least 8 characters

+
+ + +
+
+ +
+
+
+ + + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/review.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/review.html new file mode 100644 index 0000000..832d355 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/review.html @@ -0,0 +1,49 @@ + + + + {% load static %} + + Add Book and Review + + + + +
+

Home | Logout

+

{{book.title}}

+

{{book.author.name}}

+
+

Reviews:

+
+ {% for review in book.reviews.all %} +

Rating: {{review.rating}}

+

{{review.reviewer.name}} says: {{review.review}}

+

Posted on: {{review.created_at}}

+ {% if request.session.user_id == review.reviewer_id %} + Delete this Review + {% endif %} +
+ {% endfor %} + +
+
+ {% csrf_token %} +
+ + +
+
+ + +
+ +
+
+ + \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/user.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/user.html new file mode 100644 index 0000000..b4f4fcf --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/user.html @@ -0,0 +1,22 @@ + + + + {% load static %} + + User Reviews + + + + +

Home | Add book and review | Logout

+

User Alias: {{user.alias}}

+

Name: {{user.name}}

+

Email: {{user.email}}

+

Total Reviews: {{user.reviews_left.all.count}}

+
+

Posted Reviews on the Folowing Books

+ {% for book in unique_book_reviews %} +

{{book.title}}

+ {% endfor %} + + diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/tests.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py new file mode 100644 index 0000000..281f21d --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py @@ -0,0 +1,16 @@ +from django.conf.urls import url +from . import views # This line is new! + +urlpatterns = [ + url(r'^$', views.index), + url(r'^login$', views.login), + url(r'^register$', views.register), + url(r'^books$', views.books), + url(r'^create', views.create), + url(r'books/(?P\d+)$', views.review), + url(r'^books/add$', views.add), + url(r'^books/(?P\d+)/add', views.add_review), + url(r'^user/(?P\d+)', views.user), + url(r'^delete/(?P\d+)', views.delete), + url(r'^logout$', views.logout), +] \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py new file mode 100644 index 0000000..e1bbb18 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py @@ -0,0 +1,107 @@ +from django.shortcuts import render, redirect +from django.contrib import messages +from .models import * +# Create your views here. +def index(request): + request.session['status'] = "" + if 'errors' not in request.session: + request.session['errors'] = [] + context = { + "errors": request.session['errors'] + } + return render(request, 'review_app/index.html', context) + +def register(request): + if request.method == "POST": + errors = User.objects.register_validation(request.POST) + if len(errors) != 0: + request.session['errors'] = errors + print errors + return redirect('/') + else: + user = User.objects.register(request.POST) + request.session['user_id'] = user.id + request.session['status'] = "registered." + request.session['name'] = user.name + return redirect('/books') + +def login(request): + errors = User.objects.login_validation(request.POST) + if len(errors) != 0: + request.session['errors'] = errors + return redirect('/') + else: + user = User.objects.login(request.POST) + request.session['name'] = user.name + request.session['user_id'] = user.id + request.session['status'] = "logged in." + return redirect('/books') + +def books(request): + context = { + 'recent': Review.objects.recent_and_not()[0], + 'more': Review.objects.recent_and_not()[1] + } + return render(request, 'review_app/books.html', context) + +def add(request): + context = { + "authors": Author.objects.all() + } + return render(request, 'review_app/add.html', context) + +def add_review(request, book_id): + book = Book.objects.get(id=book_id) + new_review = { + "title": book.title, + "author": book.author.id, + "rating": request.POST['rating'], + "review": request.POST['review'], + "new_author": '' + } + + errors = Review.objects.review_validation(new_review) + if errors: + for e in errors: + messages.error(request, e) + else: + Review.objects.create_review(new_review, request.session['user_id']) + return redirect('/books/{}'.format(book_id)) + +def create(request): + error = Review.objects.review_validation(request.POST) + if error: + for e in error: + messages.error(request, e) + else: + book_id = Review.objects.create_review(request.POST, request.session['user_id']).book.id + return redirect('/books/{}'.format(book_id)) + +def review(request, book_id): + context = { + "book": Book.objects.get(id=book_id) + } + return render(request, 'review_app/review.html', context) + +def user(request, user_id): + + user = User.objects.get(id=user_id) + print user + unique_ids = user.reviews_left.all().values("book").distinct() + unique_books = [] + for book in unique_ids: + unique_books.append(Book.objects.get(id=book['book'])) + context = { + 'user': user, + 'unique_book_reviews': unique_books + } + return render(request, 'review_app/user.html', context) + +def delete(request, review_id): + book_id = Review.objects.get(id=review_id).book_id + Review.objects.get(id=review_id).delete() + return redirect('/books/{}'.format(book_id)) + +def logout(request): + request.session.clear() + return redirect('/') \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/db.sqlite3 b/justin_quiros/python_stack/django_projects/reviewer/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..621df35b74105c3cd485a4b685271d30c2be6d0a GIT binary patch literal 159744 zcmeI5e{37qeZcR?BTxMKY{?4k*s@NN6`NH=-4Fhho5r-wII=CtKjg$Ry0J&`B%Mu> zG)c)nuymtbWZl~SQ((gi3`2nw=r-(+6;H5=Ns=-Tx+)^=F7cI$u? z*xq}0=>z&MqeU%zW3hu*ZaJ8Ki<1X>f-scdP5VIE44MXAt=l)hGm&!g1|7$ zbNK(m`2W`DBtGC;8T>D6JKpN>IVQIEB@YosuMwGj=(X@b;Jbl?flv5-eNo>RdD%PQ znde?||F8Squ1~uH?E6`}kFD&!q2*0>kdHh*$u`IIa#6dft~XZm>vgS`U#V5rtM$C7 zWt5B>Uv^dup16?9F64xnxs$oe!l<*ltv4#n&vjRi3P(n%gS=iGjW(G*MhqjpW6;tm zQBsR>r;|N*iJ_&pbqutnG=#|kKC*~0sJ%ll1@oD>k`R}~rTltXzwV4@z>Me8+|2n) zTchb|>+Uf=D%g=7?B^qAGHf$v#cKeqYPB`JUe_z-dOoeBl!BC!XrNuy{XOt?3AJt5 z0_+kZ-D&wX`gGrJBfz8E1=umVy3FprrvO_v?iQe7o_6-^Esb#4kEzwb6m7^YX zt=fD`%NCbaOFDe1Qf_GFM!s>Ysu^9L4P&f0jAwd=;gHYcQ@Ws}5~_vOvLD`>rzMo% z*5Wbs_ge z?m}+vMDC)^sp%uyHE6oMcIjKKZCQyn8$muYImzDH@4!Pxxebbu4{n9RsD8izj5Dz( z@vgR0*>O7>b(N=JL!z9L%Y1>^38y)5fB z>}G4pRv_C-XltrovRaZ#Se~#x3ACXuFLwutYt*HNzM*wjkrwB#R`jxl5p^{`Dh0fe z+%U_~i%|V~2|wcHaYtc!{Cq=>%m*Cfu1H`6Hv4^iB$Hw9JZ|-`F=KDO?ckz5=WQ1*Ab3ma8X>|NnjlZu3caEcU_n3?-ecs5a zk!`!ypk{mG>D%;r`N+gX$0gn3LmOjdy**lF)xH7EO4yo(JIZkjyGvIUud3yhO2>WA z42fLe+jp_{c`b=HZ_(xo$43-}-CU;~+QV3nB2Oof9ujW=l#V!YOVnyLUs4O2?ZV*{ zS;M#Nt*WDVhBO^{>@jxpm$zzZK3^#nZH@7UymVUCe5Z$xEGcZ$xLnvI+K)Qz;PRmDK} zI&UJK*9~VaRxRmWcM9Cuk)aSyQShA%`W*UAR74};FNHr8elqM0y%_rCkR1Ge@cH0- zaW#B^01yBIKmZ5;0U!VbfB+EK;RKE$4>NK!Thlgl?FN~@iJ~ae)ul=;k5}BT<&7#? zlv0zDG%2M8S)5i9(}`qEPNh>xNeO$Hq48{8GhWtUeJQV(^@gsNY)VpcS|R_%WF?tO z$%znlJKpJbdo?Moi1HIb4>Nc%OBOq@pLAX=HSjAwx|ZBp4a~2pH}fT}ywX_h>0V4o zO8iU!+xdl-os?;3LoMle9j;QtYj(wAUaQqGgEibPbw#W9GA1QcX)&GkV`DQdV@V9` z`nq1zTFV>cy#jv!h_UuGp`=AgIqt(I&a_M^CW6rv*Yq+qf!Cbz zI!NtS%N8C`71HNDO~|QaJSDoZiSf3HZN_RMmd?njL~6=~L0}DItZuK65Yuud#p3pk zJKMXxqNt=YN(lW1<3kf}^ab<+Dx;61UqwGaPov{#VuxScp!q-m2mk>f00e*l5C8%| z00;m9Ah1&j3?lawYb|z}i(9(~!tM!sF>S zU68_r`>h<=r!nBgPH4Tg8gg*J?Vjv2t1b_e#00KY&2mk>f00e*l z5cpXV7~t5$tRMdbpoV|l)0lN0G|KP~rj}P)Wkb6-c7*klUnMYv4(#UGG1g})l1b`* zqr_ArB@c%=c8K*6C6e7o?e>`}#vFF9QD!O`WfAJDkEj_15AEUDD9f9Q=7e|9C^R+A z!aXzwo~W871A94EV!fuWZ7$qzRG9jS0AsP>7YLTgO&?qsLNJ)TF;)o8NOGh|%iglYR)>PbQl$(lHIo<_;;kb#q zRmjsexJ)ChSNC3{)HKm5_0VRxh=EoSw~Of00iE~1jze;nE$_xI~bY<1b_e#00KY&2mk>f00e*l z5C8%|026@s|1b=I01yBIKmZ5;0U!VbfB+Bx0zd!=y!{D~`9Bx>0|u>xUkN{k58wj? zfB+Bx0zd!=00AHX1b_e#00M71fo7QV;a`0_-1KC#$4l!P`M-ewKSq++Qf2LsTsS1j zhor^QVoh6lA~QexGgU;FB|DqdVI|I#}-(5emz%Sok`zHr;_JauPgOaxp^hF^3=*q?#Wrb zn!R;-X})qhxmvtZ&~9W?*B90+a~-sj({X895@SkSN@Nn9A-8LiNrlY+S@Qe;NrrwE z;7uRo5C9MW0zd!=00AHX1b_e#00KY&2mpZxP2jt;o0qcHdUds`#*5b)m4bY;tm7bF zZk}R2vztR*b@E2-#(yh zo)i^9l%^G#tfOR7N?J_A{{II(sK6f(00KY&2mk>f00e*l5C8%|00;nq2TuUz{|}xy zcmx7K00;m9AOHk_01yBIKmZ5;0U+?836M?y2hlkO{S^HK{TKQn`Y!rc^cD0^=wSQ+{WRT8 z(_JL>Aex408X_qdq-lVrev-O3=`lEllc4X6`(LewQ00AHX1b_e#00KY&2mk>f00edn z0hs^qn68F~0s$ZZ1b_e#00KY&2mk>f00e-*4kiHe{~g@<&~zXG1b_e#00KY&2mk>f z00e*l5ZEyUVE(^jx*8e^1b_e#00KY&2mk>f00e*l5C8%@m;lWGcW~!J(}4gG00KY& z2mk>f00e*l5C8%|V8;-E`TvgTYG^1B00KY&2mk>f00e*l5C8%|00``00xf00e*l5C8%|00;nq9YY}G_cHyiITjrXzY_RR;IjV&U+Vi_*cDn1e%AX! zUon{VeBBf0?zp~;gxWfefD;nc3`xMd3_t zQOI6en4g)$hGuhf3wW?p3RktI28l*!Xg3>F!78q4)!L}Aq1KjG)!GqR6r*jcSV&!J z;FBW1TvAs?h5DLWDq+{cdbzHzl(nK=604V2wEUV@ud6Fs%as`)w&WyZwSmNcA@@Y? zLT>Iv?qa*qb_KKDQEaEx+m?Qdf!#)Xl-V@RwlwrL99~gvXymBfglIFimycY`vdv45 z0ZctwXIwp>R#HkqN=a=eT^EsuI|tI%f^A#Q;q7!v+F`|DoN-4YM!++73%GR-Z5_wn zdk(l|>s|tG^;NWa{K=Xc$r?5qiG)g4a32i!4M@bpg8b%*Ne zSWCg`B7u2qKFTumJgQ$W=?yK9NmOW_9GTB-`AP{tpLON~oBcjMlF6`l9=F&Uqs8)M zaP2Df^Pot+4N(sM6<+oEq7ds1c$;lOFdqckz5=WQ1*A zbC9IOsSLjrvHPM_R>>{7^$e1>J%X5z)lvMkKN6Xk=s0mKJ~*zo#3S&*em-(0!!~o) zjliI5h3a^E=&J5F!P+0myM%f@HFOD)p0NBHSN?swjR22s7huP1q08*w*(Q|zWnZJKj~HGQR~l85wq zSAna;Zfi1ODcsk&s#dGksVXND9n*!*6WLjdRZF^try<=B-|+tbb+2cD0uTTKKmZ5; z0U!VbfB+Bx0zd!=0D+%70wMl!rl0vJ<9)&Nsz>4uyO&&F4POcd{r?ckhxZ1*5qz9| zjrpkmobPXZ?|L&Dw|O~9*IwS2r)w`YZ9~^?Wh z8|NdBO|Z>LYh}~6Fx%RUKo{4o^03)b`$Di)>)49m&?Ri`ug{Ie-|Qj0z>33ore_!q z`8?jNQBYC|)mmV+ynD^qdaSHkLiuei+E!LAm0od^F`>=eanzdQ@AZupN0YkGxYx0fq1~$Xix0`M`C^;Z)M)daqkLpZVVlOwF>~#=BR+C< zDyapnlusoKMWv_|XkYda<$CsK4?%jx>tWOA%^nJbayt&Pb7>9tWeM+Cni=6Eio$MY z>}%Qf@Ov2ZbarSDiTmnQE50pz!ic(eb+pMGwC{W}!?Jc8wRTK6D-M{=G0$*kb-tz7 z0k>_IG?l*cB`;4HhW$Uf0Sq=g;W4)3Has=^GI(3TRO=37yJwn*VoEBerMT2pbGUO1 zcGc%wn#LgPswbn+C^Q}cqD?MsgfdR=GF=LJQH>{3@)CY7aXdmja@SBy&22&<4*~RM z_uiCo%QZG5+I&%o__Cr%n!M~NAKx;94y`W#tw#@XhcO-%qMI3!-l*Oebw1RPbJpgU zWc{XJbBB$i_P(xZ+uSEn5G&57IS6B|;aV0265W<4I)J)dZ|+tsuU z^yn`seB@}9Z5jj8yw=z8W=XQWvZy8S=G>&*Sv=A?96Kx9IvsZh(;yi#+Rdt7)A9r~ zzTGAzJ`#_67a_PH3|{)#E-^?ZFDKM9kOJu2WUN~ygw71u87HLTh>z7!jBEJBTME75gY$2+1U z5j520f00e-*n?V5P z|8E9$@CgKf01yBIKmZ5;0U!VbfB+Bx0zlxw5(r^;2Lm5x(09;Zq36(h(M5CwG2vIj z9}B-fyc|9megyw5fUkv~4{e6dho(Y&@aw_P1V0k22cHfmf&+mc1wN0J;R6JK01yBI zKmZ5;0U!VbfWR9`;Lt%2!ycaU+(&%0s)+}3 zd}uGOJ3Q5A+Bd%UZ}VUj9EuoHrVmTX^kNhod1qn-{C_(LO`k^kr2LY15-s_y~`sqmrBWwMvO7@otqwy;yD{;WA^uKPG_x z+F0$DEdpF5(6Xq<5H$m^i<<7+qGKEu9iMU$?{+!jyDc>A_AtJ&iLL1lyQqNauSL)F zMY8)?EHE@qytHbG2Xaj2|IDs8@=^u1fB+Bx0zd!=00AHX1b_e#00KY&2mpb%8Ufq> zfAm(14dMX;KmZ5;0U!VbfB+Bx0zd!=00AHX1l|||Wd6^huQK>Q_y7SQ00e*l5C8%| z00;m9AOHk_01yBIKZgXy+_S!Fy}DXef00e*l5C8%|00@`_hTK`7EJ~?KNuCrHL6oKyd0I@x zGASi3rpfpJz34dx{U`bc`U3h3^a-4S4-fzXKmZ5;0U!VbfB+Bx0zd!=00AKIpa}%M zZf5wRUMk%ZX4P`Y<7P%Ksx@_0I9^)U5a(vb&)h0$!iDu>rBq!FyWPy#X|-M{<9fAR z47+e1>lLwfrBc&EEY?3=(S)aK`pRm9%>M&OXV8z)_t00+%jhrBAEA$9wY*fJAj!%&;UA{El!Kdv?9eY zHBm_fxNINKoMJKY`7(}rxl+S_5|TDxiA+r1c*}i8j3+W)_q2;=j&`@ZP*PXP zC)Vj+!h91kF^%JwJg!-mXH?t(V`$^^LT&Yt*;V!)E8yjWn7}#g;pT|3WFnbKB{=f^ z{{VWCK|e)5Krf;HLEk~IqOYSbqklx7$Hnjg0zd!=00AHX1b_e#00KY&2mk>f00iC= z1Uzn*^#(Y%kM)y7kB_E(B;|OLy1gWId58!{3*5B8<#zjge)KO)5IxVJFQM1af1^J| z|AGDueG5I0e+%HV=x@@)&o^6m?h z)Dt9WAV5+-o&5*s?B7pk|9GDQ{%t?sZc^LlAt_I%|6V%%_qaGW>*M_BYk2)~pV2Gm?{GDIfB+Bx0zd!=00AHX1b_e#00KY&2mpaMi2!+- hA0|nVB-ZPHjxGRj=IehPoR^~u0B*Vf;O=_=|NnM269)hQ literal 0 HcmV?d00001 diff --git a/justin_quiros/python_stack/django_projects/reviewer/manage.py b/justin_quiros/python_stack/django_projects/reviewer/manage.py new file mode 100755 index 0000000..db4b49b --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "reviewer.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/justin_quiros/python_stack/django_projects/reviewer/reviewer/__init__.py b/justin_quiros/python_stack/django_projects/reviewer/reviewer/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/justin_quiros/python_stack/django_projects/reviewer/reviewer/settings.py b/justin_quiros/python_stack/django_projects/reviewer/reviewer/settings.py new file mode 100644 index 0000000..190bffa --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/reviewer/settings.py @@ -0,0 +1,121 @@ +""" +Django settings for reviewer project. + +Generated by 'django-admin startproject' using Django 1.11.6. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'b=0yiw6s_2f@f9cr7p7@6xi2+5(0!-6fqc=01+a6eser7ks)+d' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'apps.review_app', + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'reviewer.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'reviewer.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/justin_quiros/python_stack/django_projects/reviewer/reviewer/urls.py b/justin_quiros/python_stack/django_projects/reviewer/reviewer/urls.py new file mode 100644 index 0000000..7f72ffa --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/reviewer/urls.py @@ -0,0 +1,21 @@ +"""reviewer URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^', include('apps.review_app.urls')), +] diff --git a/justin_quiros/python_stack/django_projects/reviewer/reviewer/wsgi.py b/justin_quiros/python_stack/django_projects/reviewer/reviewer/wsgi.py new file mode 100644 index 0000000..0c3b548 --- /dev/null +++ b/justin_quiros/python_stack/django_projects/reviewer/reviewer/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for reviewer project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "reviewer.settings") + +application = get_wsgi_application() From c49bb383e1253bb699a2376da69fe26f6709b7a9 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Mon, 20 Nov 2017 08:26:38 -0600 Subject: [PATCH 10/11] Word Generator fix --- .../main/apps/word_gen/views.py | 2 +- .../word_generator/main/db.sqlite3 | Bin 131072 -> 131072 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/justin_quiros/python_stack/django_projects/word_generator/main/apps/word_gen/views.py b/justin_quiros/python_stack/django_projects/word_generator/main/apps/word_gen/views.py index 04f9771..1953a2e 100644 --- a/justin_quiros/python_stack/django_projects/word_generator/main/apps/word_gen/views.py +++ b/justin_quiros/python_stack/django_projects/word_generator/main/apps/word_gen/views.py @@ -4,7 +4,7 @@ def index(request): - if request.session['attempt'] == None: + if request.session.get('attempt') == None: request.session['attempt'] = 1 else: request.session['attempt'] += 1 diff --git a/justin_quiros/python_stack/django_projects/word_generator/main/db.sqlite3 b/justin_quiros/python_stack/django_projects/word_generator/main/db.sqlite3 index 2bcd036bca2168b4809aa11e0699e587c1c91b0c..50728534711735b80b30d8295617ab241be3073a 100644 GIT binary patch delta 358 zcmZo@;Am*zm>|vQF;T{u(PLx6l70>*zBLT|VSH;gD=IADt8Y|iV)bo|bu`VYDl;`P zOUp6OFfq?bG*3+}$j&k>GBGzdHps8c%#U&jEcbW!t@ICx%J!@BH1uZ)f1&&VOgKV8UvCRTXAmMnb+|YQD36`|vQFj2;t(P3l4l72Qu{xAmqu+54J-u#^F8r2zDeH&vPCqG!PFu87i z8wVr*9R?uc+ANrGfxr3A`t5htGio>hH9cbBe*_e~!7nGv?8s?kU}&yuXsBysu3%(n PWnuwDdd8-vrWS?(F#sYW From 8290ff1df333610c9b1e6b0be0873770239c1795 Mon Sep 17 00:00:00 2001 From: Justin Quiros Date: Tue, 21 Nov 2017 07:32:08 -0600 Subject: [PATCH 11/11] Updates --- .../reviewer/apps/review_app/models.py | 7 ++++++- .../templates/review_app/books.html | 1 - .../reviewer/apps/review_app/urls.py | 3 ++- .../reviewer/apps/review_app/views.py | 17 ++++++++++------- .../django_projects/reviewer/db.sqlite3 | Bin 159744 -> 159744 bytes .../word_app/static/word_app/css/style.css | 3 ++- .../word_app/templates/word_app/index.html | 2 +- .../session_words/main/apps/word_app/views.py | 1 - 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py index 5aa0b51..f2cbe23 100644 --- a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/models.py @@ -73,6 +73,7 @@ class User(models.Model): updated_at = models.DateTimeField(auto_now=True) objects = UserManager() + class Author(models.Model): name = models.CharField(max_length=255) @@ -82,6 +83,10 @@ class Book(models.Model): + + + + class ReviewManager(models.Manager): def review_validation(self, form_data): errors = [] @@ -89,7 +94,7 @@ def review_validation(self, form_data): if len(form_data['title']) < 1 or len(form_data['review']) < 1: errors.append('Title/Review fields are required') if not "author" in form_data and len(form_data['new_author']) < 3: - rrors.append('Author names must be atleast 3 letters.') + errors.append('Author names must be atleast 3 letters.') if "author" in form_data and len(form_data['new_author']) > 0 and len(form_data['new_author']) < 3: errors.append('Author names must be atleast 3 letters.') diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html index 905f70d..9578582 100644 --- a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/templates/review_app/books.html @@ -33,6 +33,5 @@

{{ review.book.title }}

{% endfor %} - \ No newline at end of file diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py index 281f21d..5cd0bac 100644 --- a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/urls.py @@ -13,4 +13,5 @@ url(r'^user/(?P\d+)', views.user), url(r'^delete/(?P\d+)', views.delete), url(r'^logout$', views.logout), -] \ No newline at end of file +] + diff --git a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py index e1bbb18..4a135f3 100644 --- a/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py +++ b/justin_quiros/python_stack/django_projects/reviewer/apps/review_app/views.py @@ -27,7 +27,7 @@ def register(request): def login(request): errors = User.objects.login_validation(request.POST) - if len(errors) != 0: + if len(errors) != 0: request.session['errors'] = errors return redirect('/') else: @@ -46,7 +46,8 @@ def books(request): def add(request): context = { - "authors": Author.objects.all() + "authors": Author.objects.all(), + "errors": request.session['errors'] } return render(request, 'review_app/add.html', context) @@ -69,10 +70,11 @@ def add_review(request, book_id): return redirect('/books/{}'.format(book_id)) def create(request): - error = Review.objects.review_validation(request.POST) - if error: - for e in error: - messages.error(request, e) + errors = Review.objects.review_validation(request.POST) + + if len(errors) != 0: + request.session['errors'] = errors + return redirect('/books/add') else: book_id = Review.objects.create_review(request.POST, request.session['user_id']).book.id return redirect('/books/{}'.format(book_id)) @@ -86,11 +88,12 @@ def review(request, book_id): def user(request, user_id): user = User.objects.get(id=user_id) - print user unique_ids = user.reviews_left.all().values("book").distinct() unique_books = [] + for book in unique_ids: unique_books.append(Book.objects.get(id=book['book'])) + context = { 'user': user, 'unique_book_reviews': unique_books diff --git a/justin_quiros/python_stack/django_projects/reviewer/db.sqlite3 b/justin_quiros/python_stack/django_projects/reviewer/db.sqlite3 index 621df35b74105c3cd485a4b685271d30c2be6d0a..167a4c08313f9c3b39c5a50dd500c52c65fbd5b3 100644 GIT binary patch delta 2184 zcmbtVTZ|KB6z)vhEp@v+3oN_Y09wt8S7ztlPIZN$%PuY3?iSkZPDy~?ww>N)y4`l# zCZ?>H2k}M0WMjYwiBTRf1Xi+`V2l`}iDDuocnJzB#Hfk#puA{;GlMKkSLMNn|77x? z|NP%~zH|OFdoEe`T(Z8f8oB)98V_>$*zRw!?%tJl<0Hsasw$?GT`^hS6_=!(ZGWWy zFw%A$H|_3hv+XrN+J4qP&~c<=wQcX*y^gA_Ib(0L8dj}(V8+bz+r&ghTT|-Vs2MCF z75d0{A3^p7bLFhU=Eq7S!X^(h#3v%2aUUj*GF6!!wK2}eA zVkAyD*Av8gl5h}|n56C6!AR(N!#wQ?+QwUkfybGMEtJl|UpQ3XLG+ZwL*cpmHDN z8)}AGe>SZ6vr#p_oD#_TNuja-rK1DQ+K9(j5h6t1o0Y`v#c?&Ce8pSD7t_KiH$%Hg z3Zpoh<6JX6MzeorfN#{&v0^40W0hKw6VpVlTr0^`E$zzDrHrJ=fx#T<9}H80Y$g|o z_?75znDP$_L?El~hr+aw4N}d~P`Dmw2+U|`GozBD{H-#J-mLTlG)+p|cmRBM+){)i?MZybrIz zvoNXB4MFp6BabW;Xh}<(Tih+JWxCD1q`bx!cZMmoA}=WWl}eC_9Ko$dSPh|WxVb3?Di;6Zo<31!5xL!0gnC02G!rDFMf-I120 zB<3(L46z#%R~@h0iPABaoEUqq#fmupi%EjuK16^QzVtQj>K5v%Dg9q^FG@IyEa z@4!hotO8zBdHw{K;R`qmpTIY891f{~H63t8Td&DzMY=Vk!Gl`vaW{yGV!WWY+iXcsAlIH0HgA^B9s-WnqNlHUI6q?Ye6`@e; zO59iq22ocPbrC3aEQt##27G|FV1!sDwlTg?7iOVu6zZM0Q@ET9Kj(b+KXJw3!-@Co`G&Ksr6rI&-}1HWlyaVnP;`Ji(A!R`)1* z%cEUWto-#8tc4;-_;Fbt-3`yj-l=1;Og1x|Np=s8oJN?%Q2X%rvAFQBI2W#KBxfLeCcYMNYEaL(0;ufyp z0?xwZu7k*#UF_<1S*{Sw;}m>qLtRjhsH(E0TvQGzZE{7O;Ol1Pm^wjXJ(7JzLsE>= zqr+xavs-H8$*eXsmP(C!HJ@&TIt`=Kh-kVI^#`JQ#B2Bi{$M~73zgk0PyPRA$5Mle z>z`ye+8y-z^>8>8;mL))tdH_4C4%4hiYNGq4`^TwukZp(DDf&cFmrfK%suL3yF7S9 zWLN|*@e4n258v<^?_l9M9^xq$vB>??fBl6x>*(P>?3CONfzlR-ts6vJor0|nCJIy% zU0CJJqW%73lyDzKzC#0F@E$8D;~7>t^D=V9H0x-$d18|%GClear Session - {% for i in request.session.word %} + {% for i in request.session.word %}

{{i.word}} {{i.display}}

{% endfor %} diff --git a/justin_quiros/python_stack/django_projects/session_words/main/apps/word_app/views.py b/justin_quiros/python_stack/django_projects/session_words/main/apps/word_app/views.py index befca28..f3ce375 100644 --- a/justin_quiros/python_stack/django_projects/session_words/main/apps/word_app/views.py +++ b/justin_quiros/python_stack/django_projects/session_words/main/apps/word_app/views.py @@ -28,7 +28,6 @@ def process(request): return redirect('/display') - def display(request): return redirect('/')