From 5fe039a5aba49a320a066b107066764f7ce70337 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Tue, 4 Dec 2018 06:11:40 -0700 Subject: [PATCH 01/18] day 1 complete --- .vscode/settings.json | 3 + Pipfile | 13 ++++ Pipfile.lock | 43 +++++++++++ djorg/__init__.py | 0 djorg/settings.py | 123 +++++++++++++++++++++++++++++++ djorg/urls.py | 21 ++++++ djorg/wsgi.py | 16 ++++ manage.py | 15 ++++ notes/__init__.py | 0 notes/admin.py | 3 + notes/apps.py | 5 ++ notes/migrations/0001_initial.py | 23 ++++++ notes/migrations/__init__.py | 0 notes/models.py | 11 +++ notes/tests.py | 3 + notes/views.py | 3 + 16 files changed, 282 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 Pipfile create mode 100644 Pipfile.lock create mode 100644 djorg/__init__.py create mode 100644 djorg/settings.py create mode 100644 djorg/urls.py create mode 100644 djorg/wsgi.py create mode 100755 manage.py create mode 100644 notes/__init__.py create mode 100644 notes/admin.py create mode 100644 notes/apps.py create mode 100644 notes/migrations/0001_initial.py create mode 100644 notes/migrations/__init__.py create mode 100644 notes/models.py create mode 100644 notes/tests.py create mode 100644 notes/views.py diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..e5273f67a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "/usr/local/opt/python/bin/python3.7" +} \ No newline at end of file diff --git a/Pipfile b/Pipfile new file mode 100644 index 000000000..172da92c2 --- /dev/null +++ b/Pipfile @@ -0,0 +1,13 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +django = "*" +python-decouple = "*" + +[dev-packages] + +[requires] +python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 000000000..666b71ab8 --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,43 @@ +{ + "_meta": { + "hash": { + "sha256": "0bb3b331760d823d01166b55e53cd9c02ded57f108f27a6e4dd739e3ed291a1f" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.7" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "django": { + "hashes": [ + "sha256:068d51054083d06ceb32ce02b7203f1854256047a0d58682677dd4f81bceabd7", + "sha256:55409a056b27e6d1246f19ede41c6c610e4cab549c005b62cbeefabc6433356b" + ], + "index": "pypi", + "version": "==2.1.4" + }, + "python-decouple": { + "hashes": [ + "sha256:1317df14b43efee4337a4aa02914bf004f010cd56d6c4bd894e6474ec8c4fe2d" + ], + "index": "pypi", + "version": "==3.1" + }, + "pytz": { + "hashes": [ + "sha256:31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca", + "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6" + ], + "version": "==2018.7" + } + }, + "develop": {} +} diff --git a/djorg/__init__.py b/djorg/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/djorg/settings.py b/djorg/settings.py new file mode 100644 index 000000000..367aef5f5 --- /dev/null +++ b/djorg/settings.py @@ -0,0 +1,123 @@ +""" +Django settings for djorg project. + +Generated by 'django-admin startproject' using Django 2.1.4. + +For more information on this file, see +https://docs.djangoproject.com/en/2.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/2.1/ref/settings/ +""" + +import os +from decouple import config + +# 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/2.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! + +SECRET_KEY = config('SECRET_KEY') + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = config('DEBUG', cast=bool) + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'notes.apps.NotesConfig', + '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 = 'djorg.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 = 'djorg.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/2.1/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/2.1/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/2.1/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/2.1/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/djorg/urls.py b/djorg/urls.py new file mode 100644 index 000000000..f4f667215 --- /dev/null +++ b/djorg/urls.py @@ -0,0 +1,21 @@ +"""djorg URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/2.1/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/djorg/wsgi.py b/djorg/wsgi.py new file mode 100644 index 000000000..7bb827bb0 --- /dev/null +++ b/djorg/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for djorg 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/2.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djorg.settings') + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 000000000..ae1e94bc6 --- /dev/null +++ b/manage.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == '__main__': + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'djorg.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + 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?" + ) from exc + execute_from_command_line(sys.argv) diff --git a/notes/__init__.py b/notes/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/notes/admin.py b/notes/admin.py new file mode 100644 index 000000000..8c38f3f3d --- /dev/null +++ b/notes/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/notes/apps.py b/notes/apps.py new file mode 100644 index 000000000..b6155aca3 --- /dev/null +++ b/notes/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class NotesConfig(AppConfig): + name = 'notes' diff --git a/notes/migrations/0001_initial.py b/notes/migrations/0001_initial.py new file mode 100644 index 000000000..b7fba6265 --- /dev/null +++ b/notes/migrations/0001_initial.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.4 on 2018-12-04 12:43 + +from django.db import migrations, models +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Note', + fields=[ + ('title', models.CharField(max_length=200)), + ('content', models.TextField(blank=True)), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ], + ), + ] diff --git a/notes/migrations/__init__.py b/notes/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/notes/models.py b/notes/models.py new file mode 100644 index 000000000..a36de91cf --- /dev/null +++ b/notes/models.py @@ -0,0 +1,11 @@ +from django.db import models +from uuid import uuid4 + +class Note(models.Model): + title = models.CharField(max_length=200) + content = models.TextField(blank=True) + id = models.UUIDField(primary_key=True, default=uuid4, editable=False) + + def __str__(self): + return (f"Title: {self.title} Content: {self.content}") + diff --git a/notes/tests.py b/notes/tests.py new file mode 100644 index 000000000..7ce503c2d --- /dev/null +++ b/notes/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/notes/views.py b/notes/views.py new file mode 100644 index 000000000..91ea44a21 --- /dev/null +++ b/notes/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From ee95f4270969f2a1399a13217d5d98195fa60cc7 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Tue, 4 Dec 2018 14:38:40 -0700 Subject: [PATCH 02/18] admin working, about half way through day 2 stuff --- notes/admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/notes/admin.py b/notes/admin.py index 8c38f3f3d..761e0e39d 100644 --- a/notes/admin.py +++ b/notes/admin.py @@ -1,3 +1,5 @@ from django.contrib import admin +from .models import Note # Register your models here. +admin.site.register(Note) \ No newline at end of file From 834d73bda750d5345c92609be24935163d84d47f Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Tue, 4 Dec 2018 17:05:26 -0700 Subject: [PATCH 03/18] almost done with day 2 --- notes/migrations/0002_auto_20181204_2357.py | 36 +++++++++++++++++++++ notes/models.py | 15 +++++++++ 2 files changed, 51 insertions(+) create mode 100644 notes/migrations/0002_auto_20181204_2357.py diff --git a/notes/migrations/0002_auto_20181204_2357.py b/notes/migrations/0002_auto_20181204_2357.py new file mode 100644 index 000000000..9086cd1d9 --- /dev/null +++ b/notes/migrations/0002_auto_20181204_2357.py @@ -0,0 +1,36 @@ +# Generated by Django 2.1.4 on 2018-12-04 23:57 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('notes', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='PersonalNote', + fields=[ + ('note_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='notes.Note')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + bases=('notes.note',), + ), + migrations.AddField( + model_name='note', + name='created_at', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + migrations.AddField( + model_name='note', + name='last_modified', + field=models.DateTimeField(auto_now=True), + ), + ] diff --git a/notes/models.py b/notes/models.py index a36de91cf..546748dec 100644 --- a/notes/models.py +++ b/notes/models.py @@ -1,11 +1,26 @@ from django.db import models from uuid import uuid4 +from django.contrib.auth.models import User class Note(models.Model): title = models.CharField(max_length=200) content = models.TextField(blank=True) id = models.UUIDField(primary_key=True, default=uuid4, editable=False) + created_at = models.DateTimeField(auto_now_add=True) + last_modified = models.DateTimeField(auto_now=True) + def __str__(self): return (f"Title: {self.title} Content: {self.content}") + + # Inherits from Note! +class PersonalNote(Note): + user = models.ForeignKey(User, on_delete=models.CASCADE) +# #What this is doing is importing Django’s built in user class model with +# something called a _foreign key_ to create a reference to data on another table. +# It works sort of like a pointer in C. +# `on_delete=models.CASCADE` helps with the integrity of the data. In relational +# databases, one of the principles is to protect consistency. There shouldn’t be +# an item in one table that references the foreign key of something that has been +# removed from another. Check the readme in the repo for more info. \ No newline at end of file From 6931e4652ffe241f60590930abbe271fa2ddf7f1 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Wed, 5 Dec 2018 14:40:15 -0700 Subject: [PATCH 04/18] finishing up day 3 --- notes/admin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/notes/admin.py b/notes/admin.py index 761e0e39d..acc4421e1 100644 --- a/notes/admin.py +++ b/notes/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from .models import Note +from .models import Note, PersonalNote # Register your models here. -admin.site.register(Note) \ No newline at end of file +admin.site.register(Note) +admin.site.register(PersonalNote) \ No newline at end of file From 717b77e290a3bd15a1aed7c879d0bff2d4078bf3 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Wed, 5 Dec 2018 17:13:57 -0700 Subject: [PATCH 05/18] almost done with day 3 --- Pipfile | 1 + Pipfile.lock | 10 +++++++++- djorg/settings.py | 9 +++++++++ djorg/urls.py | 12 +++++++++++- notes/api.py | 19 +++++++++++++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 notes/api.py diff --git a/Pipfile b/Pipfile index 172da92c2..2d6b93ec0 100644 --- a/Pipfile +++ b/Pipfile @@ -6,6 +6,7 @@ name = "pypi" [packages] django = "*" python-decouple = "*" +djangorestframework = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 666b71ab8..74432aa3b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "0bb3b331760d823d01166b55e53cd9c02ded57f108f27a6e4dd739e3ed291a1f" + "sha256": "f60c55d31de62ba3f850d6c16dc83ccc1a0d6fe44e337b58447a45133fdc5bb9" }, "pipfile-spec": 6, "requires": { @@ -24,6 +24,14 @@ "index": "pypi", "version": "==2.1.4" }, + "djangorestframework": { + "hashes": [ + "sha256:607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136", + "sha256:63f76cbe1e7d12b94c357d7e54401103b2e52aef0f7c1650d6c820ad708776e5" + ], + "index": "pypi", + "version": "==3.9.0" + }, "python-decouple": { "hashes": [ "sha256:1317df14b43efee4337a4aa02914bf004f010cd56d6c4bd894e6474ec8c4fe2d" diff --git a/djorg/settings.py b/djorg/settings.py index 367aef5f5..e64990b2d 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -40,6 +40,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'rest_framework', ] MIDDLEWARE = [ @@ -70,6 +71,14 @@ }, ] +REST_FRAMEWORK = { + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly', + ] +} +# ^ This will allow read/write permissions for logged in users and read only for +# anonymous users. + WSGI_APPLICATION = 'djorg.wsgi.application' diff --git a/djorg/urls.py b/djorg/urls.py index f4f667215..ee3120d5f 100644 --- a/djorg/urls.py +++ b/djorg/urls.py @@ -14,8 +14,18 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path +from django.urls import path, include +from rest_framework import routers +from notes.api import PersonalNoteViewSet + +router = routers.DefaultRouter() +router.register(r'notes', PersonalNoteViewSet) +# This is similar to setting up a route in express, but we’re saying for this +# route, this (`PersonalNoteViewSet`) is the data we want to associate with it. +# (The `r` means that this is a regular expression, and to interpret the string as +# literally as possible--somewhat overkill in this case.) urlpatterns = [ path('admin/', admin.site.urls), + path('api/', include(router.urls)), ] diff --git a/notes/api.py b/notes/api.py new file mode 100644 index 000000000..fabbd3a32 --- /dev/null +++ b/notes/api.py @@ -0,0 +1,19 @@ +from rest_framework import serializers, viewsets +from .models import PersonalNote + +class PersonalNoteSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = PersonalNote + fields = ('title', 'content') + def create(self, validated_data): + note = PersonalNote.objects.create(user=user, **validated_data) + return note + +class PersonalNoteViewSet(viewsets.ModelViewSet): + serializer_class = PersonalNoteSerializer + # Link this back to the serializer class we made previously: + queryset = PersonalNote.objects.all() + # Next, add which records to search for. We could use filters here, but for now, grab all of them: + + + From 1744cf87366667e6d6e4c02f0f2dca5e169144d7 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Thu, 6 Dec 2018 08:29:00 -0700 Subject: [PATCH 06/18] day 3 done, starting day 4 --- djorg/settings.py | 5 +++++ notes/api.py | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index e64990b2d..3222ef47f 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -41,9 +41,12 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'rest_framework', + 'corsheaders', ] MIDDLEWARE = [ + 'corsheaders.middleware.CorsMiddleware', + 'django.middleware.common.CommonMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -79,6 +82,8 @@ # ^ This will allow read/write permissions for logged in users and read only for # anonymous users. +CORS_ORIGIN_ALLOW_ALL = True + WSGI_APPLICATION = 'djorg.wsgi.application' diff --git a/notes/api.py b/notes/api.py index fabbd3a32..0b2b0e09a 100644 --- a/notes/api.py +++ b/notes/api.py @@ -6,6 +6,7 @@ class Meta: model = PersonalNote fields = ('title', 'content') def create(self, validated_data): + user = self.context['request'].user note = PersonalNote.objects.create(user=user, **validated_data) return note @@ -14,6 +15,11 @@ class PersonalNoteViewSet(viewsets.ModelViewSet): # Link this back to the serializer class we made previously: queryset = PersonalNote.objects.all() # Next, add which records to search for. We could use filters here, but for now, grab all of them: - + def get_queryset(self): + user = self.request.user + if user.is_anonymous: + return PersonalNote.objects.none() + else: + return PersonalNote.objects.filter(user=user) From d7a5a3b7c616a3b66ffdf328ceeea36c35bcff03 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Thu, 6 Dec 2018 10:05:28 -0700 Subject: [PATCH 07/18] notes added from peer review --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 3222ef47f..697ec5832 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -46,7 +46,6 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', - 'django.middleware.common.CommonMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -83,6 +82,7 @@ # anonymous users. CORS_ORIGIN_ALLOW_ALL = True +#can be put anywhere, on its own WSGI_APPLICATION = 'djorg.wsgi.application' From 9a7997e1218c485e18eed2409459c64aed67b396 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Thu, 6 Dec 2018 16:52:06 -0700 Subject: [PATCH 08/18] day 4 done --- djorg/settings.py | 8 +++++++- djorg/urls.py | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 697ec5832..e083534bb 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -42,6 +42,7 @@ 'django.contrib.staticfiles', 'rest_framework', 'corsheaders', + 'rest_framework.authtoken', ] MIDDLEWARE = [ @@ -76,7 +77,12 @@ REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly', - ] + ], + 'DEFAULT_AUTHENTICATION_CLASSES': ( + 'rest_framework.authentication.BasicAuthentication', + 'rest_framework.authentication.SessionAuthentication', + 'rest_framework.authentication.TokenAuthentication', + ), } # ^ This will allow read/write permissions for logged in users and read only for # anonymous users. diff --git a/djorg/urls.py b/djorg/urls.py index ee3120d5f..df456fbe3 100644 --- a/djorg/urls.py +++ b/djorg/urls.py @@ -17,6 +17,8 @@ from django.urls import path, include from rest_framework import routers from notes.api import PersonalNoteViewSet +from django.urls import path, include, re_path +from rest_framework.authtoken import views router = routers.DefaultRouter() router.register(r'notes', PersonalNoteViewSet) @@ -28,4 +30,5 @@ urlpatterns = [ path('admin/', admin.site.urls), path('api/', include(router.urls)), + re_path(r'^api-token-auth/', views.obtain_auth_token), ] From 8dbbb620a4dfbb50dd0ce354ec7d5c3af4922f20 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Fri, 7 Dec 2018 11:58:04 -0700 Subject: [PATCH 09/18] secret key not working --- Pipfile | 4 +++ Pipfile.lock | 62 ++++++++++++++++++++++++++++++++++++++++++++++- Procfile | 1 + djorg/settings.py | 19 ++++++++++++--- 4 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 Procfile diff --git a/Pipfile b/Pipfile index 2d6b93ec0..190afb452 100644 --- a/Pipfile +++ b/Pipfile @@ -7,6 +7,10 @@ name = "pypi" django = "*" python-decouple = "*" djangorestframework = "*" +gunicorn = "*" +"psycopg2-binary" = "*" +dj-database-url = "*" +whitenoise = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 74432aa3b..9389d5bec 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f60c55d31de62ba3f850d6c16dc83ccc1a0d6fe44e337b58447a45133fdc5bb9" + "sha256": "8afcbb900798e3365aaa12966ff1c4a545134cbc204818e57f81d4504337595e" }, "pipfile-spec": 6, "requires": { @@ -16,6 +16,14 @@ ] }, "default": { + "dj-database-url": { + "hashes": [ + "sha256:4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163", + "sha256:851785365761ebe4994a921b433062309eb882fedd318e1b0fcecc607ed02da9" + ], + "index": "pypi", + "version": "==0.5.0" + }, "django": { "hashes": [ "sha256:068d51054083d06ceb32ce02b7203f1854256047a0d58682677dd4f81bceabd7", @@ -32,6 +40,50 @@ "index": "pypi", "version": "==3.9.0" }, + "gunicorn": { + "hashes": [ + "sha256:aa8e0b40b4157b36a5df5e599f45c9c76d6af43845ba3b3b0efe2c70473c2471", + "sha256:fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3" + ], + "index": "pypi", + "version": "==19.9.0" + }, + "psycopg2-binary": { + "hashes": [ + "sha256:036bcb198a7cc4ce0fe43344f8c2c9a8155aefa411633f426c8c6ed58a6c0426", + "sha256:1d770fcc02cdf628aebac7404d56b28a7e9ebec8cfc0e63260bd54d6edfa16d4", + "sha256:1fdc6f369dcf229de6c873522d54336af598b9470ccd5300e2f58ee506f5ca13", + "sha256:21f9ddc0ff6e07f7d7b6b484eb9da2c03bc9931dd13e36796b111d631f7135a3", + "sha256:247873cda726f7956f745a3e03158b00de79c4abea8776dc2f611d5ba368d72d", + "sha256:3aa31c42f29f1da6f4fd41433ad15052d5ff045f2214002e027a321f79d64e2c", + "sha256:475f694f87dbc619010b26de7d0fc575a4accf503f2200885cc21f526bffe2ad", + "sha256:4b5e332a24bf6e2fda1f51ca2a57ae1083352293a08eeea1fa1112dc7dd542d1", + "sha256:570d521660574aca40be7b4d532dfb6f156aad7b16b5ed62d1534f64f1ef72d8", + "sha256:59072de7def0690dd13112d2bdb453e20570a97297070f876fbbb7cbc1c26b05", + "sha256:5f0b658989e918ef187f8a08db0420528126f2c7da182a7b9f8bf7f85144d4e4", + "sha256:649199c84a966917d86cdc2046e03d536763576c0b2a756059ae0b3a9656bc20", + "sha256:6645fc9b4705ae8fbf1ef7674f416f89ae1559deec810f6dd15197dfa52893da", + "sha256:6872dd54d4e398d781efe8fe2e2d7eafe4450d61b5c4898aced7610109a6df75", + "sha256:6ce34fbc251fc0d691c8d131250ba6f42fd2b28ef28558d528ba8c558cb28804", + "sha256:73920d167a0a4d1006f5f3b9a3efce6f0e5e883a99599d38206d43f27697df00", + "sha256:8a671732b87ae423e34b51139628123bc0306c2cb85c226e71b28d3d57d7e42a", + "sha256:8d517e8fda2efebca27c2018e14c90ed7dc3f04d7098b3da2912e62a1a5585fe", + "sha256:9475a008eb7279e20d400c76471843c321b46acacc7ee3de0b47233a1e3fa2cf", + "sha256:96947b8cd7b3148fb0e6549fcb31258a736595d6f2a599f8cd450e9a80a14781", + "sha256:abf229f24daa93f67ac53e2e17c8798a71a01711eb9fcdd029abba8637164338", + "sha256:b1ab012f276df584beb74f81acb63905762c25803ece647016613c3d6ad4e432", + "sha256:b22b33f6f0071fe57cb4e9158f353c88d41e739a3ec0d76f7b704539e7076427", + "sha256:b3b2d53274858e50ad2ffdd6d97ce1d014e1e530f82ec8b307edd5d4c921badf", + "sha256:bab26a729befc7b9fab9ded1bba9c51b785188b79f8a2796ba03e7e734269e2e", + "sha256:daa1a593629aa49f506eddc9d23dc7f89b35693b90e1fbcd4480182d1203ea90", + "sha256:dd111280ce40e89fd17b19c1269fd1b74a30fce9d44a550840e86edb33924eb8", + "sha256:e0b86084f1e2e78c451994410de756deba206884d6bed68d5a3d7f39ff5fea1d", + "sha256:eb86520753560a7e89639500e2a254bb6f683342af598088cb72c73edcad21e6", + "sha256:ff18c5c40a38d41811c23e2480615425c97ea81fd7e9118b8b899c512d97c737" + ], + "index": "pypi", + "version": "==2.7.6.1" + }, "python-decouple": { "hashes": [ "sha256:1317df14b43efee4337a4aa02914bf004f010cd56d6c4bd894e6474ec8c4fe2d" @@ -45,6 +97,14 @@ "sha256:8e0f8568c118d3077b46be7d654cc8167fa916092e28320cde048e54bfc9f1e6" ], "version": "==2018.7" + }, + "whitenoise": { + "hashes": [ + "sha256:118ab3e5f815d380171b100b05b76de2a07612f422368a201a9ffdeefb2251c1", + "sha256:42133ddd5229eeb6a0c9899496bdbe56c292394bf8666da77deeb27454c0456a" + ], + "index": "pypi", + "version": "==4.1.2" } }, "develop": {} diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..be138390c --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn djorg.wsgi --log-file - \ No newline at end of file diff --git a/djorg/settings.py b/djorg/settings.py index e083534bb..a69442436 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -12,6 +12,15 @@ import os from decouple import config +import dj_database_url + +# DATABASES['default'] = dj_database_url.config(conn_max_age=600) +# DATABASES['default'] = dj_database_url.config(default='postgres://...') +# DATABASES['default'] = dj_database_url.parse('postgres://...', conn_max_age=600) +# The conn_max_age attribute is the lifetime of a database connection in seconds and +# is available in Django 1.6+. If you do not set a value, it will default to 0 which +# is Django's historical behavior of using a new database connection on each request. +# Use None for unlimited persistent connections. # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -25,10 +34,10 @@ SECRET_KEY = config('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = config('DEBUG', cast=bool) - -ALLOWED_HOSTS = [] +# DEBUG = config('DEBUG', cast=bool) +DEBUG = False +ALLOWED_HOSTS = ['michelleok-djorg.herokuapp.com'] # Application definition @@ -48,6 +57,7 @@ MIDDLEWARE = [ 'corsheaders.middleware.CorsMiddleware', 'django.middleware.security.SecurityMiddleware', + 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -103,6 +113,8 @@ } } +DATABASES = {} +DATABASES['default'] = dj_database_url.config(default=config('DATABASE_URL'), conn_max_age=600) # Password validation # https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators @@ -141,3 +153,4 @@ # https://docs.djangoproject.com/en/2.1/howto/static-files/ STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, 'static') From 8f6bbe1562d47637e893bfea9fcd2afad068b01d Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 14:48:41 -0700 Subject: [PATCH 10/18] wip --- djorg/settings.py | 19 +++++++++++-------- requirements.txt | 9 +++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 requirements.txt diff --git a/djorg/settings.py b/djorg/settings.py index a69442436..209eb023b 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -35,9 +35,12 @@ # SECURITY WARNING: don't run with debug turned on in production! # DEBUG = config('DEBUG', cast=bool) -DEBUG = False +DEBUG = False + +ALLOWED_HOSTS='michelleok.heroku.com' +# OR +# ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) -ALLOWED_HOSTS = ['michelleok-djorg.herokuapp.com'] # Application definition @@ -106,12 +109,12 @@ # Database # https://docs.djangoproject.com/en/2.1/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} +# DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.sqlite3', +# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), +# } +# } DATABASES = {} DATABASES['default'] = dj_database_url.config(default=config('DATABASE_URL'), conn_max_age=600) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000000000..5a9e8ca82 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +dj-database-url==0.5.0 +Django==2.1.4 +django-cors-headers==2.4.0 +djangorestframework==3.9.0 +gunicorn==19.9.0 +psycopg2-binary==2.7.6.1 +python-decouple==3.1 +pytz==2018.7 +whitenoise==4.1.2 From ae1f3459417e7c90861db927d2efca8239808e95 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 15:16:59 -0700 Subject: [PATCH 11/18] deployed fixing bugs --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 209eb023b..ce6616154 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -58,7 +58,7 @@ ] MIDDLEWARE = [ - 'corsheaders.middleware.CorsMiddleware', + # 'corsheaders.middleware.CorsMiddleware', 'django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', From 747a98eb188f1aa666e23276b3b4b488ea32c8ab Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 15:26:06 -0700 Subject: [PATCH 12/18] wip --- Pipfile | 1 + Pipfile.lock | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 190afb452..6528acefa 100644 --- a/Pipfile +++ b/Pipfile @@ -11,6 +11,7 @@ gunicorn = "*" "psycopg2-binary" = "*" dj-database-url = "*" whitenoise = "*" +django-cors-headers = "*" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock index 9389d5bec..979af96aa 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8afcbb900798e3365aaa12966ff1c4a545134cbc204818e57f81d4504337595e" + "sha256": "8125b5bd02cb8f85c9f0329f5ff7548591ce4fb6ffbe9b3cb8cb0952d2f3cff2" }, "pipfile-spec": 6, "requires": { @@ -32,6 +32,14 @@ "index": "pypi", "version": "==2.1.4" }, + "django-cors-headers": { + "hashes": [ + "sha256:5545009c9b233ea7e70da7dbab7cb1c12afa01279895086f98ec243d7eab46fa", + "sha256:c4c2ee97139d18541a1be7d96fe337d1694623816d83f53cb7c00da9b94acae1" + ], + "index": "pypi", + "version": "==2.4.0" + }, "djangorestframework": { "hashes": [ "sha256:607865b0bb1598b153793892101d881466bd5a991de12bd6229abb18b1c86136", From 3f5e47c4b088bcba8d2f675b72d40081e47a2753 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 15:42:23 -0700 Subject: [PATCH 13/18] wip --- djorg/settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/djorg/settings.py b/djorg/settings.py index ce6616154..063be9a1e 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -109,12 +109,12 @@ # Database # https://docs.djangoproject.com/en/2.1/ref/settings/#databases -# DATABASES = { -# 'default': { -# 'ENGINE': 'django.db.backends.sqlite3', -# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), -# } -# } +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} DATABASES = {} DATABASES['default'] = dj_database_url.config(default=config('DATABASE_URL'), conn_max_age=600) From 89fc08ca53ca967097d63c22fe6266d6f8b2a1d6 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 15:47:58 -0700 Subject: [PATCH 14/18] wip --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 063be9a1e..6a7f3b910 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -58,7 +58,7 @@ ] MIDDLEWARE = [ - # 'corsheaders.middleware.CorsMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', From aebb9860f0fdc814be4e07b5aff776dd245316e4 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 16:08:45 -0700 Subject: [PATCH 15/18] wip --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 6a7f3b910..19b4dda9e 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -37,7 +37,7 @@ # DEBUG = config('DEBUG', cast=bool) DEBUG = False -ALLOWED_HOSTS='michelleok.heroku.com' +ALLOWED_HOSTS='michelleok-djorg.herokuapp.com' # OR # ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) From 4d252b724c9067dbef86b742a70125e059f86039 Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 16:18:12 -0700 Subject: [PATCH 16/18] wip --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 19b4dda9e..b19310c16 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -35,7 +35,7 @@ # SECURITY WARNING: don't run with debug turned on in production! # DEBUG = config('DEBUG', cast=bool) -DEBUG = False +DEBUG = False ALLOWED_HOSTS='michelleok-djorg.herokuapp.com' # OR From c8f78075d9061ab87924c8d9bd60f2336d76ad6e Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 16:32:58 -0700 Subject: [PATCH 17/18] wip --- djorg/settings.py | 7 ++++--- djorg/urls.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/djorg/settings.py b/djorg/settings.py index b19310c16..7accf2814 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -14,6 +14,7 @@ from decouple import config import dj_database_url + # DATABASES['default'] = dj_database_url.config(conn_max_age=600) # DATABASES['default'] = dj_database_url.config(default='postgres://...') # DATABASES['default'] = dj_database_url.parse('postgres://...', conn_max_age=600) @@ -35,11 +36,11 @@ # SECURITY WARNING: don't run with debug turned on in production! # DEBUG = config('DEBUG', cast=bool) -DEBUG = False +DEBUG = config('DEBUG', cast=bool) -ALLOWED_HOSTS='michelleok-djorg.herokuapp.com' +# ALLOWED_HOSTS='.herokuapp.com' # OR -# ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) + ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) # Application definition diff --git a/djorg/urls.py b/djorg/urls.py index df456fbe3..3bcf6873d 100644 --- a/djorg/urls.py +++ b/djorg/urls.py @@ -21,7 +21,7 @@ from rest_framework.authtoken import views router = routers.DefaultRouter() -router.register(r'notes', PersonalNoteViewSet) +router.register('notes', PersonalNoteViewSet) # This is similar to setting up a route in express, but we’re saying for this # route, this (`PersonalNoteViewSet`) is the data we want to associate with it. # (The `r` means that this is a regular expression, and to interpret the string as @@ -30,5 +30,5 @@ urlpatterns = [ path('admin/', admin.site.urls), path('api/', include(router.urls)), - re_path(r'^api-token-auth/', views.obtain_auth_token), + re_path('^api-token-auth/', views.obtain_auth_token), ] From 054497a8ce55741a5df15391f9d832288608ac5a Mon Sep 17 00:00:00 2001 From: MichelleOk Date: Mon, 10 Dec 2018 16:35:36 -0700 Subject: [PATCH 18/18] wip --- djorg/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djorg/settings.py b/djorg/settings.py index 7accf2814..38967c74d 100644 --- a/djorg/settings.py +++ b/djorg/settings.py @@ -40,7 +40,7 @@ # ALLOWED_HOSTS='.herokuapp.com' # OR - ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) +ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=lambda v: [s.strip() for s in v.split(',')]) # Application definition