From 2fca965769a398a8957b2c3033f1661dbccf4735 Mon Sep 17 00:00:00 2001 From: Kevin-Schnaubelt-Jr Date: Thu, 24 Nov 2022 20:05:45 -0500 Subject: [PATCH 1/6] progress capture --- code/Kevin/Django/practice_to_do/Pipfile | 13 ++ code/Kevin/Django/practice_to_do/Pipfile.lock | 68 +++++++++ .../Django/practice_to_do/api/__init__.py | 0 code/Kevin/Django/practice_to_do/api/admin.py | 3 + code/Kevin/Django/practice_to_do/api/apps.py | 6 + .../practice_to_do/api/migrations/__init__.py | 0 .../Kevin/Django/practice_to_do/api/models.py | 3 + .../Django/practice_to_do/api/permissions.py | 12 ++ .../Django/practice_to_do/api/serializers.py | 26 ++++ code/Kevin/Django/practice_to_do/api/tests.py | 3 + code/Kevin/Django/practice_to_do/api/urls.py | 11 ++ code/Kevin/Django/practice_to_do/api/views.py | 12 ++ code/Kevin/Django/practice_to_do/manage.py | 22 +++ .../Django/practice_to_do/templates/home.html | 12 ++ .../templates/registration/login.html | 6 + .../templates/registration/signup.html | 6 + .../templates/user_profile.html | 12 ++ .../practice_to_do/to_do_project/__init__.py | 0 .../practice_to_do/to_do_project/asgi.py | 16 +++ .../practice_to_do/to_do_project/settings.py | 134 ++++++++++++++++++ .../practice_to_do/to_do_project/urls.py | 11 ++ .../practice_to_do/to_do_project/wsgi.py | 16 +++ .../Django/practice_to_do/todo/__init__.py | 0 .../Kevin/Django/practice_to_do/todo/admin.py | 5 + code/Kevin/Django/practice_to_do/todo/apps.py | 6 + .../todo/migrations/0001_initial.py | 22 +++ .../todo/migrations/0002_initial.py | 23 +++ .../todo/migrations/__init__.py | 0 .../Django/practice_to_do/todo/models.py | 11 ++ .../Kevin/Django/practice_to_do/todo/tests.py | 3 + .../Kevin/Django/practice_to_do/todo/views.py | 7 + .../Django/practice_to_do/users/__init__.py | 0 .../Django/practice_to_do/users/admin.py | 13 ++ .../Kevin/Django/practice_to_do/users/apps.py | 6 + .../Django/practice_to_do/users/forms.py | 13 ++ .../users/migrations/0001_initial.py | 43 ++++++ .../users/migrations/__init__.py | 0 .../Django/practice_to_do/users/models.py | 9 ++ .../Django/practice_to_do/users/tests.py | 3 + .../Kevin/Django/practice_to_do/users/urls.py | 13 ++ .../Django/practice_to_do/users/views.py | 34 +++++ 41 files changed, 603 insertions(+) create mode 100644 code/Kevin/Django/practice_to_do/Pipfile create mode 100644 code/Kevin/Django/practice_to_do/Pipfile.lock create mode 100644 code/Kevin/Django/practice_to_do/api/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/api/admin.py create mode 100644 code/Kevin/Django/practice_to_do/api/apps.py create mode 100644 code/Kevin/Django/practice_to_do/api/migrations/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/api/models.py create mode 100644 code/Kevin/Django/practice_to_do/api/permissions.py create mode 100644 code/Kevin/Django/practice_to_do/api/serializers.py create mode 100644 code/Kevin/Django/practice_to_do/api/tests.py create mode 100644 code/Kevin/Django/practice_to_do/api/urls.py create mode 100644 code/Kevin/Django/practice_to_do/api/views.py create mode 100644 code/Kevin/Django/practice_to_do/manage.py create mode 100644 code/Kevin/Django/practice_to_do/templates/home.html create mode 100644 code/Kevin/Django/practice_to_do/templates/registration/login.html create mode 100644 code/Kevin/Django/practice_to_do/templates/registration/signup.html create mode 100644 code/Kevin/Django/practice_to_do/templates/user_profile.html create mode 100644 code/Kevin/Django/practice_to_do/to_do_project/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/to_do_project/asgi.py create mode 100644 code/Kevin/Django/practice_to_do/to_do_project/settings.py create mode 100644 code/Kevin/Django/practice_to_do/to_do_project/urls.py create mode 100644 code/Kevin/Django/practice_to_do/to_do_project/wsgi.py create mode 100644 code/Kevin/Django/practice_to_do/todo/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/todo/admin.py create mode 100644 code/Kevin/Django/practice_to_do/todo/apps.py create mode 100644 code/Kevin/Django/practice_to_do/todo/migrations/0001_initial.py create mode 100644 code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py create mode 100644 code/Kevin/Django/practice_to_do/todo/migrations/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/todo/models.py create mode 100644 code/Kevin/Django/practice_to_do/todo/tests.py create mode 100644 code/Kevin/Django/practice_to_do/todo/views.py create mode 100644 code/Kevin/Django/practice_to_do/users/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/users/admin.py create mode 100644 code/Kevin/Django/practice_to_do/users/apps.py create mode 100644 code/Kevin/Django/practice_to_do/users/forms.py create mode 100644 code/Kevin/Django/practice_to_do/users/migrations/0001_initial.py create mode 100644 code/Kevin/Django/practice_to_do/users/migrations/__init__.py create mode 100644 code/Kevin/Django/practice_to_do/users/models.py create mode 100644 code/Kevin/Django/practice_to_do/users/tests.py create mode 100644 code/Kevin/Django/practice_to_do/users/urls.py create mode 100644 code/Kevin/Django/practice_to_do/users/views.py diff --git a/code/Kevin/Django/practice_to_do/Pipfile b/code/Kevin/Django/practice_to_do/Pipfile new file mode 100644 index 0000000..29b41d8 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/Pipfile @@ -0,0 +1,13 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +django = "*" +djangorestframework = "*" + +[dev-packages] + +[requires] +python_version = "3.11" diff --git a/code/Kevin/Django/practice_to_do/Pipfile.lock b/code/Kevin/Django/practice_to_do/Pipfile.lock new file mode 100644 index 0000000..db29623 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/Pipfile.lock @@ -0,0 +1,68 @@ +{ + "_meta": { + "hash": { + "sha256": "47e66386eec5596a9aa26673b930cd97eff96cef591e9d06e2cbfbdad81e9f2e" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.11" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "asgiref": { + "hashes": [ + "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4", + "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424" + ], + "markers": "python_version >= '3.7'", + "version": "==3.5.2" + }, + "django": { + "hashes": [ + "sha256:678bbfc8604eb246ed54e2063f0765f13b321a50526bdc8cb1f943eda7fa31f1", + "sha256:6b1de6886cae14c7c44d188f580f8ba8da05750f544c80ae5ad43375ab293cd5" + ], + "index": "pypi", + "version": "==4.1.3" + }, + "djangorestframework": { + "hashes": [ + "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8", + "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08" + ], + "index": "pypi", + "version": "==3.14.0" + }, + "pytz": { + "hashes": [ + "sha256:222439474e9c98fced559f1709d89e6c9cbf8d79c794ff3eb9f8800064291427", + "sha256:e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2" + ], + "version": "==2022.6" + }, + "sqlparse": { + "hashes": [ + "sha256:0323c0ec29cd52bceabc1b4d9d579e311f3e4961b98d174201d5622a23b85e34", + "sha256:69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268" + ], + "markers": "python_version >= '3.5'", + "version": "==0.4.3" + }, + "tzdata": { + "hashes": [ + "sha256:04a680bdc5b15750c39c12a448885a51134a27ec9af83667663f0b3a1bf3f342", + "sha256:91f11db4503385928c15598c98573e3af07e7229181bee5375bd30f1695ddcae" + ], + "markers": "sys_platform == 'win32'", + "version": "==2022.6" + } + }, + "develop": {} +} diff --git a/code/Kevin/Django/practice_to_do/api/__init__.py b/code/Kevin/Django/practice_to_do/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/api/admin.py b/code/Kevin/Django/practice_to_do/api/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/code/Kevin/Django/practice_to_do/api/apps.py b/code/Kevin/Django/practice_to_do/api/apps.py new file mode 100644 index 0000000..66656fd --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ApiConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'api' diff --git a/code/Kevin/Django/practice_to_do/api/migrations/__init__.py b/code/Kevin/Django/practice_to_do/api/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/api/models.py b/code/Kevin/Django/practice_to_do/api/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/code/Kevin/Django/practice_to_do/api/permissions.py b/code/Kevin/Django/practice_to_do/api/permissions.py new file mode 100644 index 0000000..bcb0598 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/permissions.py @@ -0,0 +1,12 @@ +from rest_framework import permissions + +class ReadOnly(permissions.BasePermission): + def has_permission(self, request, view): + return request.method in permissions.SAFE_METHODS + + +class IsAuthorOrReadOnly(permissions.BasePermission): + def has_object_permission(self, request, view, obj): + if request.method in permissions.SAFE_METHODS: + return True + return obj.author == request.user \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/serializers.py b/code/Kevin/Django/practice_to_do/api/serializers.py new file mode 100644 index 0000000..bda675c --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/serializers.py @@ -0,0 +1,26 @@ +from rest_framework import serializers +from users.models import CustomUser + +from todo.models import ToDo + +class NestedBookSerializer(serializers.ModelSerializer): + class Meta: + model = ToDo + fields = ('id', 'item', 'author', 'needs_doing') + +class NestedUserSerializer(serializers.ModelSerializer): + class Meta: + model = CustomUser + fields = ('id', 'username') + +class ToDoSerializer(serializers.ModelSerializer): + author_detail = NestedUserSerializer(read_only=True, source='author') + class Meta: + model = ToDo + fields = ('id', 'item', 'author', 'needs_doing', 'author_detail') + +class UserSerializer(serializers.ModelSerializer): + book_detail = NestedBookSerializer(many=True, source='todo', read_only=True) + class Meta: + model = CustomUser + fields = ('id', 'username', 'todo', 'book_detail') \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/tests.py b/code/Kevin/Django/practice_to_do/api/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/Kevin/Django/practice_to_do/api/urls.py b/code/Kevin/Django/practice_to_do/api/urls.py new file mode 100644 index 0000000..3bef708 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/urls.py @@ -0,0 +1,11 @@ +from django.urls import path +from rest_framework.routers import DefaultRouter + +from . import views + +router = DefaultRouter() +router.register('todo', views.PostToDoSet, basename='book') + +urlpatterns = router.urls + [ + path('', views.ToDoAPIView.as_view()), +] \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/views.py b/code/Kevin/Django/practice_to_do/api/views.py new file mode 100644 index 0000000..13a5215 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/api/views.py @@ -0,0 +1,12 @@ +from rest_framework import generics, viewsets + +from todo.models import ToDo +from .serializers import ToDoSerializer + +class ToDoAPIView(generics.ListAPIView): + queryset = ToDo.objects.all() + serializer_class = ToDoSerializer + +class PostToDoSet(viewsets.ModelViewSet): + queryset = ToDo.objects.all() + serializer_class = ToDoSerializer \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/manage.py b/code/Kevin/Django/practice_to_do/manage.py new file mode 100644 index 0000000..7aa1c16 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'to_do_project.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) + + +if __name__ == '__main__': + main() diff --git a/code/Kevin/Django/practice_to_do/templates/home.html b/code/Kevin/Django/practice_to_do/templates/home.html new file mode 100644 index 0000000..9f0e2b7 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/templates/home.html @@ -0,0 +1,12 @@ + + + + + + + Home + + + + + \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/templates/registration/login.html b/code/Kevin/Django/practice_to_do/templates/registration/login.html new file mode 100644 index 0000000..797d9e4 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/templates/registration/login.html @@ -0,0 +1,6 @@ +

Login

+
+ {% csrf_token %} + {{ form.as_p }} + +
\ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/templates/registration/signup.html b/code/Kevin/Django/practice_to_do/templates/registration/signup.html new file mode 100644 index 0000000..e25eb6a --- /dev/null +++ b/code/Kevin/Django/practice_to_do/templates/registration/signup.html @@ -0,0 +1,6 @@ +

Sign up

+
+ {% csrf_token %} + {{ form.as_p }} + +
\ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/templates/user_profile.html b/code/Kevin/Django/practice_to_do/templates/user_profile.html new file mode 100644 index 0000000..f281577 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/templates/user_profile.html @@ -0,0 +1,12 @@ + + + + + + + Profile + + + + + \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/to_do_project/__init__.py b/code/Kevin/Django/practice_to_do/to_do_project/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/to_do_project/asgi.py b/code/Kevin/Django/practice_to_do/to_do_project/asgi.py new file mode 100644 index 0000000..fca9d5a --- /dev/null +++ b/code/Kevin/Django/practice_to_do/to_do_project/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for to_do_project project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'to_do_project.settings') + +application = get_asgi_application() diff --git a/code/Kevin/Django/practice_to_do/to_do_project/settings.py b/code/Kevin/Django/practice_to_do/to_do_project/settings.py new file mode 100644 index 0000000..08a7b17 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/to_do_project/settings.py @@ -0,0 +1,134 @@ +""" +Django settings for to_do_project project. + +Generated by 'django-admin startproject' using Django 4.1.3. + +For more information on this file, see +https://docs.djangoproject.com/en/4.1/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.1/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-bgmmimgw@40w#gw(*o6dmk&ix@lc@o@el&7dtk%h*0_)#3)=q*' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'rest_framework', + 'users.apps.UsersConfig', + 'todo.apps.TodoConfig', + 'api.apps.ApiConfig' +] + +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 = 'to_do_project.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [BASE_DIR / 'templates'], + '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 = 'to_do_project.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.1/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/4.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/4.1/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'America/New_York' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.1/howto/static-files/ + +STATIC_URL = 'static/' +STATICFILES_DIRS = [BASE_DIR / 'static'] + +# Default primary key field type +# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +AUTH_USER_MODEL = 'users.CustomUser' + +LOGIN_REDIRECT_URL = 'home' +LOGOUT_REDIRECT_URL = 'home' +LOGIN_URL = 'login' diff --git a/code/Kevin/Django/practice_to_do/to_do_project/urls.py b/code/Kevin/Django/practice_to_do/to_do_project/urls.py new file mode 100644 index 0000000..78bff41 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/to_do_project/urls.py @@ -0,0 +1,11 @@ +from django.contrib import admin +from django.urls import path, include +from django.views.generic import TemplateView + +urlpatterns = [ + path('admin/', admin.site.urls), + path('api/v1/', include('api.urls')), + path('users/', include('django.contrib.auth.urls')), + path('users/', include('users.urls')), + path('', TemplateView.as_view(template_name='home.html'), name='home') +] \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/to_do_project/wsgi.py b/code/Kevin/Django/practice_to_do/to_do_project/wsgi.py new file mode 100644 index 0000000..3edbf77 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/to_do_project/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for to_do_project 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/4.1/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'to_do_project.settings') + +application = get_wsgi_application() diff --git a/code/Kevin/Django/practice_to_do/todo/__init__.py b/code/Kevin/Django/practice_to_do/todo/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/todo/admin.py b/code/Kevin/Django/practice_to_do/todo/admin.py new file mode 100644 index 0000000..be1e9fe --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin + +from .models import ToDo + +admin.site.register(ToDo) \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/todo/apps.py b/code/Kevin/Django/practice_to_do/todo/apps.py new file mode 100644 index 0000000..3602af1 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class TodoConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'todo' diff --git a/code/Kevin/Django/practice_to_do/todo/migrations/0001_initial.py b/code/Kevin/Django/practice_to_do/todo/migrations/0001_initial.py new file mode 100644 index 0000000..928ef0b --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/migrations/0001_initial.py @@ -0,0 +1,22 @@ +# Generated by Django 4.1.3 on 2022-11-25 00:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='ToDo', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('item', models.CharField(max_length=200)), + ('needs_doing', models.BooleanField(default=True)), + ], + ), + ] diff --git a/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py b/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py new file mode 100644 index 0000000..bcbae56 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py @@ -0,0 +1,23 @@ +# Generated by Django 4.1.3 on 2022-11-25 00:56 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('todo', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='todo', + name='author', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='books', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/code/Kevin/Django/practice_to_do/todo/migrations/__init__.py b/code/Kevin/Django/practice_to_do/todo/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/todo/models.py b/code/Kevin/Django/practice_to_do/todo/models.py new file mode 100644 index 0000000..4067710 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/models.py @@ -0,0 +1,11 @@ +from django.db import models + +from users.models import CustomUser + +class ToDo(models.Model): + item = models.CharField(max_length=200) + author = models.ForeignKey(CustomUser, related_name="books", on_delete=models.CASCADE) + needs_doing = models.BooleanField(default=True) + + def __str__(self): + return self.item \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/todo/tests.py b/code/Kevin/Django/practice_to_do/todo/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/Kevin/Django/practice_to_do/todo/views.py b/code/Kevin/Django/practice_to_do/todo/views.py new file mode 100644 index 0000000..d3b4ae4 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/views.py @@ -0,0 +1,7 @@ +from django.views.generic import ListView + +from .models import ToDo + +class ToDoListView(ListView): + model = ToDo + template_name = 'home.html' \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/users/__init__.py b/code/Kevin/Django/practice_to_do/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/users/admin.py b/code/Kevin/Django/practice_to_do/users/admin.py new file mode 100644 index 0000000..5c93f8b --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/admin.py @@ -0,0 +1,13 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin + +from .forms import CustomUserCreationForm, CustomUserChangeForm +from .models import CustomUser + +class CustomUserAdmin(UserAdmin): + add_form = CustomUserCreationForm + form = CustomUserChangeForm + model = CustomUser + list_display = ['username', 'email'] + +admin.site.register(CustomUser, CustomUserAdmin) \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/users/apps.py b/code/Kevin/Django/practice_to_do/users/apps.py new file mode 100644 index 0000000..72b1401 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'users' diff --git a/code/Kevin/Django/practice_to_do/users/forms.py b/code/Kevin/Django/practice_to_do/users/forms.py new file mode 100644 index 0000000..b0f8bfc --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/forms.py @@ -0,0 +1,13 @@ +from django import forms +from django.contrib.auth.forms import UserCreationForm, UserChangeForm +from .models import CustomUser + +class CustomUserCreationForm(UserCreationForm): + class Meta: + model = CustomUser + fields = ('username', 'email') + +class CustomUserChangeForm(UserChangeForm): + class Meta: + model = CustomUser + fields = ('username', 'email') \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/users/migrations/0001_initial.py b/code/Kevin/Django/practice_to_do/users/migrations/0001_initial.py new file mode 100644 index 0000000..3defbd2 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/migrations/0001_initial.py @@ -0,0 +1,43 @@ +# Generated by Django 4.1.3 on 2022-11-25 00:56 + +import django.contrib.auth.models +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='CustomUser', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('username', models.CharField(max_length=50, unique=True)), + ('email', models.EmailField(max_length=254)), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/code/Kevin/Django/practice_to_do/users/migrations/__init__.py b/code/Kevin/Django/practice_to_do/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/Kevin/Django/practice_to_do/users/models.py b/code/Kevin/Django/practice_to_do/users/models.py new file mode 100644 index 0000000..f110481 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/models.py @@ -0,0 +1,9 @@ +from django.db import models +from django.contrib.auth.models import AbstractUser + +class CustomUser(AbstractUser): + username = models.CharField(max_length=50, unique=True) + email = models.EmailField(max_length=254) + + def __str__(self): + return self.username \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/users/tests.py b/code/Kevin/Django/practice_to_do/users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/Kevin/Django/practice_to_do/users/urls.py b/code/Kevin/Django/practice_to_do/users/urls.py new file mode 100644 index 0000000..e065bec --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/urls.py @@ -0,0 +1,13 @@ +from django.urls import path +from rest_framework.routers import DefaultRouter + +from . import views +from .views import SignUpView + +router = DefaultRouter() +router.register('users', views.UserViewSet, basename='users') + +urlpatterns = [ + path('signup/', SignUpView.as_view(), name='signup'), + path('currentuser/', views.CurrentUserView.as_view()) +] \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/users/views.py b/code/Kevin/Django/practice_to_do/users/views.py new file mode 100644 index 0000000..11d154e --- /dev/null +++ b/code/Kevin/Django/practice_to_do/users/views.py @@ -0,0 +1,34 @@ +from django.shortcuts import render +from rest_framework import generics, viewsets +from django.views.generic.edit import CreateView +from django.views.generic import DetailView +from django.urls import reverse_lazy +from django.shortcuts import get_object_or_404 +from users.models import CustomUser + +from api.serializers import UserSerializer +from api.permissions import IsAuthorOrReadOnly +from .forms import CustomUserCreationForm, CustomUserChangeForm + +class SignUpView(CreateView): + form_class = CustomUserCreationForm + template_name = 'registration/signup.html' + success_url = reverse_lazy('login') + +class UserProfileView(DetailView): + model = CustomUser + template_name = 'user_profile.html' + context_object_name = 'user_profile' + + def get_object(self): + return get_object_or_404(CustomUser, username=self.kwargs['username']) + +class CurrentUserView(generics.RetrieveUpdateAPIView): + serializer_class = UserSerializer + def get_object(self): + return self.request.user + +class UserViewSet(viewsets.ReadOnlyModelViewSet): + queryset = CustomUser + serializer_class = UserSerializer + permission_classes = [IsAuthorOrReadOnly] \ No newline at end of file From 188e2bdbf08bea0f46a5f701f7d02cc7410c715b Mon Sep 17 00:00:00 2001 From: Kevin-Schnaubelt-Jr Date: Thu, 24 Nov 2022 21:20:34 -0500 Subject: [PATCH 2/6] progress capture --- .../Django/practice_to_do/api/serializers.py | 6 +- code/Kevin/Django/practice_to_do/api/urls.py | 2 +- .../Kevin/Django/practice_to_do/static/app.js | 68 +++++++++++++++++++ .../Django/practice_to_do/templates/home.html | 56 +++++++++++++++ .../practice_to_do/to_do_project/settings.py | 2 +- .../todo/migrations/0002_initial.py | 2 +- .../Django/practice_to_do/todo/models.py | 2 +- .../Kevin/Django/practice_to_do/users/urls.py | 3 +- 8 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 code/Kevin/Django/practice_to_do/static/app.js diff --git a/code/Kevin/Django/practice_to_do/api/serializers.py b/code/Kevin/Django/practice_to_do/api/serializers.py index bda675c..a4c7c2b 100644 --- a/code/Kevin/Django/practice_to_do/api/serializers.py +++ b/code/Kevin/Django/practice_to_do/api/serializers.py @@ -3,7 +3,7 @@ from todo.models import ToDo -class NestedBookSerializer(serializers.ModelSerializer): +class NestedToDoSerializer(serializers.ModelSerializer): class Meta: model = ToDo fields = ('id', 'item', 'author', 'needs_doing') @@ -20,7 +20,7 @@ class Meta: fields = ('id', 'item', 'author', 'needs_doing', 'author_detail') class UserSerializer(serializers.ModelSerializer): - book_detail = NestedBookSerializer(many=True, source='todo', read_only=True) + todo_detail = NestedToDoSerializer(many=True, source='todo', read_only=True) class Meta: model = CustomUser - fields = ('id', 'username', 'todo', 'book_detail') \ No newline at end of file + fields = ('id', 'username', 'todo', 'todo_detail') \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/urls.py b/code/Kevin/Django/practice_to_do/api/urls.py index 3bef708..ce11e16 100644 --- a/code/Kevin/Django/practice_to_do/api/urls.py +++ b/code/Kevin/Django/practice_to_do/api/urls.py @@ -4,7 +4,7 @@ from . import views router = DefaultRouter() -router.register('todo', views.PostToDoSet, basename='book') +router.register('todo', views.PostToDoSet, basename='todo') urlpatterns = router.urls + [ path('', views.ToDoAPIView.as_view()), diff --git a/code/Kevin/Django/practice_to_do/static/app.js b/code/Kevin/Django/practice_to_do/static/app.js new file mode 100644 index 0000000..6345565 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/static/app.js @@ -0,0 +1,68 @@ +const app = Vue.createApp({ + delimiters: ['[[', ']]'], + data(){ + return{ + currentUser: {}, + csrfToken: '', + toDo: [], + newToDo: { + "item" : "", + "author": "", + "needs_doing": "", + } + } + }, + methods: { + loadToDo(){ + axios({ + method: 'get', + url: 'api/v1/todo' + }).then(response => { + this.toDo = response.data + console.log(response.data) + } + ) + }, + createToDo() { + + axios({ + method: 'post', + url: '/api/v1/todo/', + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "item" : this.newToDo.item, + "author": this.currentUser.id, + "needs_doing": this.newToDo.needs_doing, + } + }).then( response => { + this.loadToDo() + console.log(response.data) + }).catch(error => { + console.log(error.response) + + }) + + }, + loadCurrentUser(){ + axios({ + method: 'get', + url: '/users/currentuser/' + }).then(response => { + console.log('CU', response.data) + this.currentUser = response.data + }) + } + + }, + created: function() { + this.loadToDo() + this.loadCurrentUser() + }, + mounted(){ + this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value + + + } +}) \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/templates/home.html b/code/Kevin/Django/practice_to_do/templates/home.html index 9f0e2b7..950e9d4 100644 --- a/code/Kevin/Django/practice_to_do/templates/home.html +++ b/code/Kevin/Django/practice_to_do/templates/home.html @@ -1,12 +1,68 @@ + {% load static %} + Home + {% csrf_token %} +
+
+

Hello [[currentUser.username]].

+ +
+ {% if user.is_authenticated == False %} + Login + Sign up + {% endif %} + {% if user.is_authenticated %} + Profile + Logout + {% endif %} +
+
+ +

TO DO

+
+
+ +

[[item.item]] [[item.author_detail.username]]

+ +
+ +
+

NEEDS DOING

+
+
+ +

[[item.item]] [[item.author_detail.username]]

+ +
+ +
+ + + + + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/to_do_project/settings.py b/code/Kevin/Django/practice_to_do/to_do_project/settings.py index 08a7b17..f4178c2 100644 --- a/code/Kevin/Django/practice_to_do/to_do_project/settings.py +++ b/code/Kevin/Django/practice_to_do/to_do_project/settings.py @@ -119,7 +119,7 @@ # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.1/howto/static-files/ -STATIC_URL = 'static/' +STATIC_URL = '/static/' STATICFILES_DIRS = [BASE_DIR / 'static'] # Default primary key field type diff --git a/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py b/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py index bcbae56..36357c5 100644 --- a/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py +++ b/code/Kevin/Django/practice_to_do/todo/migrations/0002_initial.py @@ -18,6 +18,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='todo', name='author', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='books', to=settings.AUTH_USER_MODEL), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='todo', to=settings.AUTH_USER_MODEL), ), ] diff --git a/code/Kevin/Django/practice_to_do/todo/models.py b/code/Kevin/Django/practice_to_do/todo/models.py index 4067710..c64c1fd 100644 --- a/code/Kevin/Django/practice_to_do/todo/models.py +++ b/code/Kevin/Django/practice_to_do/todo/models.py @@ -4,7 +4,7 @@ class ToDo(models.Model): item = models.CharField(max_length=200) - author = models.ForeignKey(CustomUser, related_name="books", on_delete=models.CASCADE) + author = models.ForeignKey(CustomUser, related_name="todo", on_delete=models.CASCADE) needs_doing = models.BooleanField(default=True) def __str__(self): diff --git a/code/Kevin/Django/practice_to_do/users/urls.py b/code/Kevin/Django/practice_to_do/users/urls.py index e065bec..0bcc923 100644 --- a/code/Kevin/Django/practice_to_do/users/urls.py +++ b/code/Kevin/Django/practice_to_do/users/urls.py @@ -9,5 +9,6 @@ urlpatterns = [ path('signup/', SignUpView.as_view(), name='signup'), - path('currentuser/', views.CurrentUserView.as_view()) + path('currentuser/', views.CurrentUserView.as_view()), + path('/', views.UserProfileView.as_view(), name='profile') ] \ No newline at end of file From 04886828fc985a51a5ed477f2f6d3f24b2ec9994 Mon Sep 17 00:00:00 2001 From: Kevin-Schnaubelt-Jr Date: Thu, 24 Nov 2022 23:22:18 -0500 Subject: [PATCH 3/6] added patch requeset --- .../Kevin/Django/practice_to_do/static/app.js | 19 ++++++++++++++++++- .../Django/practice_to_do/templates/home.html | 19 +++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/code/Kevin/Django/practice_to_do/static/app.js b/code/Kevin/Django/practice_to_do/static/app.js index 6345565..77598bb 100644 --- a/code/Kevin/Django/practice_to_do/static/app.js +++ b/code/Kevin/Django/practice_to_do/static/app.js @@ -7,7 +7,6 @@ const app = Vue.createApp({ toDo: [], newToDo: { "item" : "", - "author": "", "needs_doing": "", } } @@ -52,6 +51,23 @@ const app = Vue.createApp({ }).then(response => { console.log('CU', response.data) this.currentUser = response.data + }).catch(error =>{ + console.log(error.response) + }) + }, + swapparo(id, currentBool){ + axios({ + method: 'patch', + url: '/api/v1/todo/' + id + '/', + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "needs_doing": !currentBool + } + }).then(response => { + // console.log(response.data) + this.loadToDo() }) } @@ -62,6 +78,7 @@ const app = Vue.createApp({ }, mounted(){ this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value + console.log('mounted') } diff --git a/code/Kevin/Django/practice_to_do/templates/home.html b/code/Kevin/Django/practice_to_do/templates/home.html index 950e9d4..4d3ef7b 100644 --- a/code/Kevin/Django/practice_to_do/templates/home.html +++ b/code/Kevin/Django/practice_to_do/templates/home.html @@ -28,18 +28,25 @@

Hello [[currentUser.username]].

TO DO

-
- -

[[item.item]] [[item.author_detail.username]]

- +
+
+

[[item.item]]

+ + +

NEEDS DOING

-
+
-

[[item.item]] [[item.author_detail.username]]

+
+

[[item.item]]

+ + +
+
From 326bb8f4d2df7cfc131665141817232acf4ab2f4 Mon Sep 17 00:00:00 2001 From: Kevin-Schnaubelt-Jr Date: Fri, 25 Nov 2022 00:05:45 -0500 Subject: [PATCH 4/6] added create --- code/Kevin/Django/practice_to_do/static/app.js | 9 ++++++--- code/Kevin/Django/practice_to_do/templates/home.html | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/Kevin/Django/practice_to_do/static/app.js b/code/Kevin/Django/practice_to_do/static/app.js index 77598bb..1606bcb 100644 --- a/code/Kevin/Django/practice_to_do/static/app.js +++ b/code/Kevin/Django/practice_to_do/static/app.js @@ -8,7 +8,8 @@ const app = Vue.createApp({ newToDo: { "item" : "", "needs_doing": "", - } + }, + enteredThing: '' } }, methods: { @@ -31,9 +32,8 @@ const app = Vue.createApp({ 'X-CSRFToken': this.csrfToken }, data: { - "item" : this.newToDo.item, + "item" : this.enteredThing, "author": this.currentUser.id, - "needs_doing": this.newToDo.needs_doing, } }).then( response => { this.loadToDo() @@ -69,6 +69,9 @@ const app = Vue.createApp({ // console.log(response.data) this.loadToDo() }) + }, + testFunc(){ + console.log(this.enteredThing) } }, diff --git a/code/Kevin/Django/practice_to_do/templates/home.html b/code/Kevin/Django/practice_to_do/templates/home.html index 4d3ef7b..2fd3f16 100644 --- a/code/Kevin/Django/practice_to_do/templates/home.html +++ b/code/Kevin/Django/practice_to_do/templates/home.html @@ -27,6 +27,7 @@

Hello [[currentUser.username]].

TO DO

+
From cc7d5ab2bc2a4e0113f23b093b1d096bb75237e3 Mon Sep 17 00:00:00 2001 From: Kevin Schnaubelt Jr Date: Tue, 29 Nov 2022 18:07:40 -0500 Subject: [PATCH 5/6] fully functional with a favorites section --- .../Django/practice_to_do/api/serializers.py | 16 +++- code/Kevin/Django/practice_to_do/api/urls.py | 2 + code/Kevin/Django/practice_to_do/api/views.py | 14 +++- .../Kevin/Django/practice_to_do/static/app.js | 83 ++++++++++++++++++- .../Django/practice_to_do/templates/home.html | 70 ++++++++++++---- .../Kevin/Django/practice_to_do/todo/admin.py | 5 +- .../todo/migrations/0003_favorites.py | 24 ++++++ .../Django/practice_to_do/todo/models.py | 9 +- 8 files changed, 195 insertions(+), 28 deletions(-) create mode 100644 code/Kevin/Django/practice_to_do/todo/migrations/0003_favorites.py diff --git a/code/Kevin/Django/practice_to_do/api/serializers.py b/code/Kevin/Django/practice_to_do/api/serializers.py index a4c7c2b..5f324c6 100644 --- a/code/Kevin/Django/practice_to_do/api/serializers.py +++ b/code/Kevin/Django/practice_to_do/api/serializers.py @@ -1,7 +1,7 @@ from rest_framework import serializers from users.models import CustomUser -from todo.models import ToDo +from todo.models import ToDo, Favorites class NestedToDoSerializer(serializers.ModelSerializer): class Meta: @@ -13,6 +13,17 @@ class Meta: model = CustomUser fields = ('id', 'username') +class NestedFavoritesSerializer(serializers.ModelSerializer): + class Meta: + model = Favorites + fields = ('id', 'favorite', 'author') + +class FavoritesSerializer(serializers.ModelSerializer): + author_detail = NestedUserSerializer(read_only=True, source='author') + class Meta: + model = Favorites + fields = ('id', 'favorite', 'author', 'author_detail') + class ToDoSerializer(serializers.ModelSerializer): author_detail = NestedUserSerializer(read_only=True, source='author') class Meta: @@ -21,6 +32,7 @@ class Meta: class UserSerializer(serializers.ModelSerializer): todo_detail = NestedToDoSerializer(many=True, source='todo', read_only=True) + favorites_detail = NestedFavoritesSerializer(many=True, source='favorites', read_only=True) class Meta: model = CustomUser - fields = ('id', 'username', 'todo', 'todo_detail') \ No newline at end of file + fields = ('id', 'username', 'todo', 'todo_detail','favorites', 'favorites_detail') \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/urls.py b/code/Kevin/Django/practice_to_do/api/urls.py index ce11e16..93e14e0 100644 --- a/code/Kevin/Django/practice_to_do/api/urls.py +++ b/code/Kevin/Django/practice_to_do/api/urls.py @@ -5,7 +5,9 @@ router = DefaultRouter() router.register('todo', views.PostToDoSet, basename='todo') +router.register('favorites', views.PostFavoritesSet, basename='favorites') urlpatterns = router.urls + [ path('', views.ToDoAPIView.as_view()), + path('', views.FavoritesAPIView.as_view()) ] \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/api/views.py b/code/Kevin/Django/practice_to_do/api/views.py index 13a5215..66db26c 100644 --- a/code/Kevin/Django/practice_to_do/api/views.py +++ b/code/Kevin/Django/practice_to_do/api/views.py @@ -1,7 +1,7 @@ from rest_framework import generics, viewsets -from todo.models import ToDo -from .serializers import ToDoSerializer +from todo.models import ToDo, Favorites +from .serializers import ToDoSerializer, FavoritesSerializer class ToDoAPIView(generics.ListAPIView): queryset = ToDo.objects.all() @@ -9,4 +9,12 @@ class ToDoAPIView(generics.ListAPIView): class PostToDoSet(viewsets.ModelViewSet): queryset = ToDo.objects.all() - serializer_class = ToDoSerializer \ No newline at end of file + serializer_class = ToDoSerializer + +class FavoritesAPIView(generics.ListAPIView): + queryset = Favorites.objects.all() + serializer_class = FavoritesSerializer + +class PostFavoritesSet(viewsets.ModelViewSet): + queryset = Favorites.objects.all() + serializer_class = FavoritesSerializer \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/static/app.js b/code/Kevin/Django/practice_to_do/static/app.js index 1606bcb..5e69719 100644 --- a/code/Kevin/Django/practice_to_do/static/app.js +++ b/code/Kevin/Django/practice_to_do/static/app.js @@ -5,6 +5,8 @@ const app = Vue.createApp({ currentUser: {}, csrfToken: '', toDo: [], + displayedToDo: [], + displayedFavorites: [], newToDo: { "item" : "", "needs_doing": "", @@ -19,7 +21,14 @@ const app = Vue.createApp({ url: 'api/v1/todo' }).then(response => { this.toDo = response.data - console.log(response.data) + console.log( 'from loadToDo', typeof this.toDo, this.toDo) + this.displayedToDo = [] + for (i=0; i < this.toDo.length; i++){ + this.displayedToDo.push(this.toDo[i].item) + console.log(this.toDo[i].item) + } + console.log('displayed todo',this.displayedToDo) + this.loadCurrentUser() } ) }, @@ -44,12 +53,82 @@ const app = Vue.createApp({ }) }, + deleteToDo(id){ + axios({ + method: 'delete', + url: '/api/v1/todo/' + id, + headers: { + 'X-CSRFToken': this.csrfToken + } + }).then(response => { + console.log('workin') + this.loadToDo() + }) + }, + createFavorite(item){ + axios({ + method: 'post', + url: '/api/v1/favorites/', + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "favorite" : item, + "author": this.currentUser.id, + } + }).then(response => { + this.loadToDo() + console.log(response.data) + }).catch(error => { + console.log(error.response) + }) + }, + spawnFromFavorites(item){ + axios({ + method: 'post', + url: '/api/v1/todo/', + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "item" : item, + "author": this.currentUser.id, + } + }).then( response => { + this.loadToDo() + console.log(response.data) + }).catch(error => { + console.log(error.response) + + }) + }, + + deleteFavorite(id){ + axios({ + method: 'delete', + url: '/api/v1/favorites/' + id, + headers: { + 'X-CSRFToken': this.csrfToken + } + }).then(response => { + console.log('workin') + this.loadToDo() + }) + }, + + + loadCurrentUser(){ axios({ method: 'get', url: '/users/currentuser/' }).then(response => { console.log('CU', response.data) + this.displayedFavorites = [] + for (i=0;i < response.data.favorites_detail.length; i++){ + this.displayedFavorites.push(response.data.favorites_detail[i].favorite) + } + console.log('displayed favs',typeof this.displayedFavorites, this.displayedFavorites) this.currentUser = response.data }).catch(error =>{ console.log(error.response) @@ -77,7 +156,7 @@ const app = Vue.createApp({ }, created: function() { this.loadToDo() - this.loadCurrentUser() + }, mounted(){ this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value diff --git a/code/Kevin/Django/practice_to_do/templates/home.html b/code/Kevin/Django/practice_to_do/templates/home.html index 2fd3f16..9d1c285 100644 --- a/code/Kevin/Django/practice_to_do/templates/home.html +++ b/code/Kevin/Django/practice_to_do/templates/home.html @@ -26,31 +26,65 @@

Hello [[currentUser.username]].

-

TO DO

- -
-
-
-

[[item.item]]

- +
+
+
+

TO DO

+ +
+
+
+

[[single_item.item]]

+ +
+ + +
+ + + + +
+
+ +
+

DID

+
+
+ +
+

[[single_item.item]]

+ +
+ + +
+ + +
+ + +
+
+
+

Favorites

+
+
+

[[single_favorite.favorite]]

+
+ -
-

NEEDS DOING

-
-
- -
-

[[item.item]]

- +
+ + +
- - -
+
diff --git a/code/Kevin/Django/practice_to_do/todo/admin.py b/code/Kevin/Django/practice_to_do/todo/admin.py index be1e9fe..634f77f 100644 --- a/code/Kevin/Django/practice_to_do/todo/admin.py +++ b/code/Kevin/Django/practice_to_do/todo/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin -from .models import ToDo +from .models import ToDo, Favorites -admin.site.register(ToDo) \ No newline at end of file +admin.site.register(ToDo) +admin.site.register(Favorites) \ No newline at end of file diff --git a/code/Kevin/Django/practice_to_do/todo/migrations/0003_favorites.py b/code/Kevin/Django/practice_to_do/todo/migrations/0003_favorites.py new file mode 100644 index 0000000..87df154 --- /dev/null +++ b/code/Kevin/Django/practice_to_do/todo/migrations/0003_favorites.py @@ -0,0 +1,24 @@ +# Generated by Django 4.1.3 on 2022-11-28 22:57 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('todo', '0002_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Favorites', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('favorite', models.CharField(max_length=200)), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='favorites', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/code/Kevin/Django/practice_to_do/todo/models.py b/code/Kevin/Django/practice_to_do/todo/models.py index c64c1fd..1ade010 100644 --- a/code/Kevin/Django/practice_to_do/todo/models.py +++ b/code/Kevin/Django/practice_to_do/todo/models.py @@ -8,4 +8,11 @@ class ToDo(models.Model): needs_doing = models.BooleanField(default=True) def __str__(self): - return self.item \ No newline at end of file + return self.item + +class Favorites(models.Model): + favorite = models.CharField(max_length=200) + author = models.ForeignKey(CustomUser, related_name="favorites", on_delete=models.CASCADE) + + def __str__(self): + return self.favorite \ No newline at end of file From 613d6b4bf031fdbfe48b5a16a47fd9a7793d70e2 Mon Sep 17 00:00:00 2001 From: Kevin Schnaubelt Jr Date: Tue, 29 Nov 2022 18:09:46 -0500 Subject: [PATCH 6/6] cleared input field after sumbitting --- code/Kevin/Django/practice_to_do/static/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/code/Kevin/Django/practice_to_do/static/app.js b/code/Kevin/Django/practice_to_do/static/app.js index 5e69719..815bef6 100644 --- a/code/Kevin/Django/practice_to_do/static/app.js +++ b/code/Kevin/Django/practice_to_do/static/app.js @@ -45,6 +45,7 @@ const app = Vue.createApp({ "author": this.currentUser.id, } }).then( response => { + this.enteredThing = '' this.loadToDo() console.log(response.data) }).catch(error => {