From 509ac9aa5e49e4917acbfaf1ec67e1217523b8a3 Mon Sep 17 00:00:00 2001
From: Kevin Schnaubelt Jr <kevinschnaubelt@gmail.com>
Date: Wed, 23 Nov 2022 20:32:50 -0500
Subject: [PATCH 1/3] progress capture

---
 .../Django/rest_lab/rest_project/Pipfile      |  13 ++
 .../Django/rest_lab/rest_project/Pipfile.lock |  68 +++++++++
 .../rest_lab/rest_project/api/__init__.py     |   0
 .../Django/rest_lab/rest_project/api/admin.py |   3 +
 .../Django/rest_lab/rest_project/api/apps.py  |   6 +
 .../rest_project/api/migrations/__init__.py   |   0
 .../rest_lab/rest_project/api/models.py       |   3 +
 .../rest_lab/rest_project/api/permissions.py  |  14 ++
 .../rest_lab/rest_project/api/serializers.py  |  27 ++++
 .../Django/rest_lab/rest_project/api/tests.py |   3 +
 .../Django/rest_lab/rest_project/api/urls.py  |  10 ++
 .../Django/rest_lab/rest_project/api/views.py |  14 ++
 .../Django/rest_lab/rest_project/manage.py    |  22 +++
 .../rest_project/rest_app/__init__.py         |   0
 .../rest_lab/rest_project/rest_app/admin.py   |   5 +
 .../rest_lab/rest_project/rest_app/apps.py    |   6 +
 .../rest_app/migrations/0001_initial.py       |  22 +++
 .../rest_app/migrations/0002_initial.py       |  23 +++
 .../rest_app/migrations/__init__.py           |   0
 .../rest_lab/rest_project/rest_app/models.py  |  13 ++
 .../rest_lab/rest_project/rest_app/tests.py   |   3 +
 .../rest_lab/rest_project/rest_app/views.py   |  12 ++
 .../rest_project/rest_project/__init__.py     |   0
 .../rest_project/rest_project/asgi.py         |  16 +++
 .../rest_project/rest_project/settings.py     | 135 ++++++++++++++++++
 .../rest_project/rest_project/urls.py         |  11 ++
 .../rest_project/rest_project/wsgi.py         |  16 +++
 .../rest_lab/rest_project/static/app.js       |  78 ++++++++++
 .../rest_lab/rest_project/templates/home.html |  58 ++++++++
 .../templates/registration/login.html         |   6 +
 .../templates/registration/signup.html        |   6 +
 .../rest_project/templates/user_profile.html  |  12 ++
 .../rest_lab/rest_project/users/__init__.py   |   0
 .../rest_lab/rest_project/users/admin.py      |  13 ++
 .../rest_lab/rest_project/users/apps.py       |   6 +
 .../rest_lab/rest_project/users/forms.py      |  14 ++
 .../users/migrations/0001_initial.py          |  45 ++++++
 .../rest_project/users/migrations/__init__.py |   0
 .../rest_lab/rest_project/users/models.py     |  11 ++
 .../rest_lab/rest_project/users/tests.py      |   3 +
 .../rest_lab/rest_project/users/urls.py       |  14 ++
 .../rest_lab/rest_project/users/views.py      |  36 +++++
 42 files changed, 747 insertions(+)
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/Pipfile
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/admin.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/apps.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/migrations/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/models.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/permissions.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/serializers.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/tests.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/urls.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/api/views.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/manage.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/admin.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/apps.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0001_initial.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0002_initial.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/models.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/tests.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_project/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_project/asgi.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_project/settings.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/rest_project/wsgi.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/static/app.js
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/templates/home.html
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/templates/registration/login.html
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/templates/registration/signup.html
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/templates/user_profile.html
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/admin.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/apps.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/forms.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/migrations/0001_initial.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/migrations/__init__.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/models.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/tests.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/urls.py
 create mode 100644 code/Kevin/Django/rest_lab/rest_project/users/views.py

diff --git a/code/Kevin/Django/rest_lab/rest_project/Pipfile b/code/Kevin/Django/rest_lab/rest_project/Pipfile
new file mode 100644
index 0000000..4725933
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/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.10"
diff --git a/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock b/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
new file mode 100644
index 0000000..20965b4
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
@@ -0,0 +1,68 @@
+{
+    "_meta": {
+        "hash": {
+            "sha256": "73653c63d46a4fc8ebd2b89822e3a608760544d16ee5f109c986963679b05ce4"
+        },
+        "pipfile-spec": 6,
+        "requires": {
+            "python_version": "3.10"
+        },
+        "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/rest_lab/rest_project/api/__init__.py b/code/Kevin/Django/rest_lab/rest_project/api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/admin.py b/code/Kevin/Django/rest_lab/rest_project/api/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/apps.py b/code/Kevin/Django/rest_lab/rest_project/api/apps.py
new file mode 100644
index 0000000..66656fd
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/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/rest_lab/rest_project/api/migrations/__init__.py b/code/Kevin/Django/rest_lab/rest_project/api/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/models.py b/code/Kevin/Django/rest_lab/rest_project/api/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/permissions.py b/code/Kevin/Django/rest_lab/rest_project/api/permissions.py
new file mode 100644
index 0000000..1215194
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/permissions.py
@@ -0,0 +1,14 @@
+from rest_framework import permissions
+
+
+
+class ReadOnly(permissions.BasePermission):
+    def has_permission(self, request, view):
+        return request.method in permissions.SAFE_METHODS
+
+
+class IsAuthorReadOnly(permissions.BasePermission):
+    def has_object_permission(self, request, view, obj):
+        if request.method in permissions.SAFE_METHODS:
+            return True
+        return obj.author == request.user
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/serializers.py b/code/Kevin/Django/rest_lab/rest_project/api/serializers.py
new file mode 100644
index 0000000..4eef276
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/serializers.py
@@ -0,0 +1,27 @@
+from rest_framework import serializers
+
+from rest_app.models import Movie
+from users.models import CustomUser
+
+class NestedMovieSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Movie
+        fields = ('id', 'title', 'director', 'genre',)
+
+class NestedUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CustomUser
+        fields = ('id', 'username')
+
+class MovieSerializer(serializers.ModelSerializer):
+    director_detail = NestedUserSerializer(read_only=True, source='director')
+    class Meta:
+        model = Movie
+        fields = ('id', 'title', 'director', 'genre', 'director_detail')
+
+class UserSerializer(serializers.ModelSerializer):
+    movie_detail = NestedMovieSerializer(many=True, source='movie', read_only=True)
+    class Meta:
+        model = CustomUser
+        fields = ('id', 'username', 'favorite_movie', 'favorite_genre', 'email', 'movie_detail')
+
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/tests.py b/code/Kevin/Django/rest_lab/rest_project/api/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/urls.py b/code/Kevin/Django/rest_lab/rest_project/api/urls.py
new file mode 100644
index 0000000..a451c7c
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/urls.py
@@ -0,0 +1,10 @@
+from django.urls import path
+from rest_framework.routers import DefaultRouter
+
+from . import views
+router = DefaultRouter()
+router.register('movie', views.PostMovieSet, basename='movie')
+
+urlpatterns = router.urls + [
+    path('', views.MovieAPIView.as_view()),
+]
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/api/views.py b/code/Kevin/Django/rest_lab/rest_project/api/views.py
new file mode 100644
index 0000000..1c54699
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/api/views.py
@@ -0,0 +1,14 @@
+from django.shortcuts import render
+from rest_framework import generics, viewsets
+
+from rest_app.models import Movie
+from .serializers import MovieSerializer
+
+class MovieAPIView(generics.ListAPIView):
+    queryset = Movie.objects.all()
+    serializer_class = MovieSerializer
+
+
+class PostMovieSet(viewsets.ModelViewSet):
+    queryset = Movie.objects.all()
+    serializer_class = MovieSerializer
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/manage.py b/code/Kevin/Django/rest_lab/rest_project/manage.py
new file mode 100644
index 0000000..fcd023c
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/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', 'rest_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/rest_lab/rest_project/rest_app/__init__.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/admin.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/admin.py
new file mode 100644
index 0000000..09d3635
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from .models import Movie
+
+admin.site.register(Movie)
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/apps.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/apps.py
new file mode 100644
index 0000000..15c78e8
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class RestAppConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'rest_app'
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0001_initial.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0001_initial.py
new file mode 100644
index 0000000..e2011f6
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0001_initial.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.1.3 on 2022-11-23 23:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Movie',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('genre', models.CharField(max_length=200)),
+            ],
+        ),
+    ]
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0002_initial.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0002_initial.py
new file mode 100644
index 0000000..1e45e4b
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/0002_initial.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.1.3 on 2022-11-23 23:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('rest_app', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='movie',
+            name='director',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movie', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/__init__.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/models.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/models.py
new file mode 100644
index 0000000..7b35cd4
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/models.py
@@ -0,0 +1,13 @@
+from django.db import models
+
+from users.models import CustomUser
+
+
+
+class Movie(models.Model):
+    title = models.CharField(max_length=200)
+    director = models.ForeignKey(CustomUser, related_name="movie", on_delete=models.CASCADE)
+    genre = models.CharField(max_length=200)
+    
+    def __str__(self):
+        return self.title
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/tests.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
new file mode 100644
index 0000000..a387008
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
@@ -0,0 +1,12 @@
+from django.http import HttpResponse
+from django.shortcuts import render
+from django.views.generic import ListView
+
+from .models import Movie
+
+def home_view(request):
+    return HttpResponse('hello world!')
+
+class RestListView(ListView):
+    model = Movie
+    template_name: str = 'home.html'
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_project/__init__.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_project/asgi.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/asgi.py
new file mode 100644
index 0000000..700ac57
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_project/asgi.py
@@ -0,0 +1,16 @@
+"""
+ASGI config for rest_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', 'rest_project.settings')
+
+application = get_asgi_application()
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_project/settings.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/settings.py
new file mode 100644
index 0000000..8dcc23b
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_project/settings.py
@@ -0,0 +1,135 @@
+"""
+Django settings for rest_project project.
+
+Generated by 'django-admin startproject' using Django 4.1.1.
+
+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-^q3%qiv63q7^644p_kswytig7i+ex7hizj^!+az0oiurqe@!a-'
+
+# 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',
+    'rest_app.apps.RestAppConfig',
+    'api.apps.ApiConfig',
+    'users.apps.UsersConfig',
+]
+
+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 = 'rest_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 = 'rest_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/rest_lab/rest_project/rest_project/urls.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py
new file mode 100644
index 0000000..78bff41
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_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/rest_lab/rest_project/rest_project/wsgi.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/wsgi.py
new file mode 100644
index 0000000..5ad8fd8
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_project/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for rest_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', 'rest_project.settings')
+
+application = get_wsgi_application()
diff --git a/code/Kevin/Django/rest_lab/rest_project/static/app.js b/code/Kevin/Django/rest_lab/rest_project/static/app.js
new file mode 100644
index 0000000..a5781ec
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/static/app.js
@@ -0,0 +1,78 @@
+
+const app = Vue.createApp({
+    delimiters: ['[[',']]'],
+    data(){
+        return{
+            
+            csrfToken: '',
+            currentUser: {},
+            message: `Welcome`,
+
+            movie: [],
+            newMovie: {
+                title: '',
+                director: '',
+                genre: ''
+            }
+        }
+    },
+    methods: {
+        loadMovies(){
+            axios({
+                method: 'get',
+                url: 'api/v1/movie'
+            }).then(response => {
+                this.movie = response.data
+                console.log(this.movie)
+                
+                }
+            )
+        },
+        createMovie(){
+            axios({
+                method: 'post',
+                url: 'api/v1/movie/',
+                Headers: {
+                    'X-CSRFToken': this.csrfToken
+                },
+                data: {
+                    title: this.newMovie.title,
+                    director: this.currentUser.id,
+                    genre: this.newMovie.genre
+                }
+            }).then(response => {
+                console.log(response.data)
+                this.loadMovies()
+                
+                }
+            ).catch(error => {
+                console.log(error)
+            })
+        },
+        loadCurrentUser(){
+            axios({
+                method: 'get',
+                url: '/users/currentuser'
+            }).then(response => {
+                console.log(response.data)
+                this.currentUser = response.data
+            })
+        }
+
+
+    },
+    created: function(){
+        this.loadMovies()
+        this.loadCurrentUser()
+        console.log('created')
+        
+
+
+    },
+    mounted(){
+        this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value        
+        
+    }
+
+
+})
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/templates/home.html b/code/Kevin/Django/rest_lab/rest_project/templates/home.html
new file mode 100644
index 0000000..4af7fea
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/templates/home.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="en">
+    {% load static %}
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script src="https://cdn.tailwindcss.com"></script>
+    <title>Rest App</title>
+</head>
+<body>
+    {% csrf_token %}
+<div id="app">
+    
+    <div class="flex flex-col items-center border-b h-[5rem]">
+        <h1>[[message]] [[this.currentUser.username]]!</h1>
+        <div>
+            {% if user.is_authenticated == False %}
+                <a href="{% url 'login' %}" class="p-1">Login</a>
+                <a href="{% url 'signup' %}" class="p-1">Sign up</a>
+            {% endif %}
+            {% if user.is_authenticated %}
+                <a href="{% url 'profile' user.username%}" class="p-1">Profile</a>
+                <a href="{% url 'logout' %}" class="p-1">Logout</a>
+            {% endif %}
+        </div>
+    </div>
+    <div v-for="film in movie" class="flex items-center flex-col">
+        <p>[[film.title]] [[film.director_detail.username]] [[film.genre]]</p>
+    </div>
+    <br>
+    <div class="flex items-center flex-col">
+        <input type="text" placeholder="Title" v-model="newMovie.title" class="border w-[10rem]">
+        {% comment %} <input type="text" placeholder="Director" v-model="newMovie.director" class="border w-[10rem]"> {% endcomment %}
+        <input type="text" placeholder="Genre" v-model="newMovie.genre" class="border w-[10rem]">
+        <button @click="createMovie">Submit</button>
+    </div>
+
+
+
+</div>
+
+
+<!-- Import Ajax -->
+<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+
+<!-- Import Vue.js -->
+<script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
+
+<!-- Import file.js -->
+<script src="{% static '/app.js' %}"></script> 
+
+<!-- Mount App -->
+<script> const mountApp = app.mount('#app') </script>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/templates/registration/login.html b/code/Kevin/Django/rest_lab/rest_project/templates/registration/login.html
new file mode 100644
index 0000000..797d9e4
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/templates/registration/login.html
@@ -0,0 +1,6 @@
+<h1>Login</h1>
+<form action="" method="post">
+  {% csrf_token %}
+  {{ form.as_p }}
+  <input type="submit" value="Login">
+</form>
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/templates/registration/signup.html b/code/Kevin/Django/rest_lab/rest_project/templates/registration/signup.html
new file mode 100644
index 0000000..e25eb6a
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/templates/registration/signup.html
@@ -0,0 +1,6 @@
+<h1>Sign up</h1>
+<form action="" method="post">
+  {% csrf_token %}
+  {{ form.as_p }}
+  <button type="submit">Sign Up</button>
+</form>
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/templates/user_profile.html b/code/Kevin/Django/rest_lab/rest_project/templates/user_profile.html
new file mode 100644
index 0000000..5693829
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/templates/user_profile.html
@@ -0,0 +1,12 @@
+<h1>PROFILE!</h1>
+<div>
+    {% if user.is_authenticated == False %}
+        <a href="{% url 'login' %}">Login</a>
+        <a href="{% url 'signup' %}">Sign up</a>
+    {% endif %}
+    {% if user.is_authenticated %}
+    <a href="{% url 'home' %}">Home</a>
+    <a href="{% url 'logout' %}">Logout</a>
+    {% endif %}
+</div>
+
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/__init__.py b/code/Kevin/Django/rest_lab/rest_project/users/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/admin.py b/code/Kevin/Django/rest_lab/rest_project/users/admin.py
new file mode 100644
index 0000000..cb2ec85
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/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', 'favorite_movie', 'favorite_genre', 'email']
+
+admin.site.register(CustomUser, CustomUserAdmin)
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/apps.py b/code/Kevin/Django/rest_lab/rest_project/users/apps.py
new file mode 100644
index 0000000..72b1401
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/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/rest_lab/rest_project/users/forms.py b/code/Kevin/Django/rest_lab/rest_project/users/forms.py
new file mode 100644
index 0000000..614c496
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/forms.py
@@ -0,0 +1,14 @@
+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', 'favorite_movie', 'favorite_genre', 'email')
+
+class CustomUserChangeForm(UserChangeForm):
+    class Meta:
+        model = CustomUser
+        fields = ('username', 'favorite_movie', 'favorite_genre', 'email')
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/migrations/0001_initial.py b/code/Kevin/Django/rest_lab/rest_project/users/migrations/0001_initial.py
new file mode 100644
index 0000000..782134e
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/migrations/0001_initial.py
@@ -0,0 +1,45 @@
+# Generated by Django 4.1.3 on 2022-11-23 23:49
+
+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=20, unique=True)),
+                ('favorite_movie', models.CharField(max_length=200, null=True)),
+                ('favorite_genre', models.CharField(max_length=50, null=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/rest_lab/rest_project/users/migrations/__init__.py b/code/Kevin/Django/rest_lab/rest_project/users/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/models.py b/code/Kevin/Django/rest_lab/rest_project/users/models.py
new file mode 100644
index 0000000..e6d682e
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/models.py
@@ -0,0 +1,11 @@
+from django.db import models
+from django.contrib.auth.models import AbstractUser
+
+class CustomUser(AbstractUser):
+    username = models.CharField(max_length=20, unique=True)
+    favorite_movie = models.CharField(max_length=200, null=True)
+    favorite_genre = models.CharField(max_length=50, null=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/rest_lab/rest_project/users/tests.py b/code/Kevin/Django/rest_lab/rest_project/users/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/urls.py b/code/Kevin/Django/rest_lab/rest_project/users/urls.py
new file mode 100644
index 0000000..0bcc923
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/urls.py
@@ -0,0 +1,14 @@
+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()),
+    path('<str:username>/', views.UserProfileView.as_view(), name='profile')
+]
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/users/views.py b/code/Kevin/Django/rest_lab/rest_project/users/views.py
new file mode 100644
index 0000000..6eb9805
--- /dev/null
+++ b/code/Kevin/Django/rest_lab/rest_project/users/views.py
@@ -0,0 +1,36 @@
+from django.shortcuts import render
+from rest_framework import generics, viewsets, permissions
+from django.views.generic import DetailView
+from django.views.generic.edit import CreateView
+from django.urls import reverse_lazy
+from django.shortcuts import get_object_or_404
+
+
+from api.serializers import UserSerializer
+from . forms import CustomUserCreationForm, CustomUserChangeForm
+from users.models import CustomUser
+
+class SignUpView(CreateView):
+    form_class = CustomUserCreationForm
+    template_name = 'registration/signup.html'
+    success_url = reverse_lazy('login')
+
+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 = [permissions.IsAuthenticatedOrReadOnly]
+
+
+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'])
+

From e493e59bbc2f2975a458da757d119d49302fd860 Mon Sep 17 00:00:00 2001
From: Kevin Schnaubelt Jr <kevinschnaubelt@gmail.com>
Date: Tue, 29 Nov 2022 19:14:56 -0500
Subject: [PATCH 2/3] progress capture

---
 code/Kevin/Django/rest_lab/rest_project/Pipfile       |  2 +-
 code/Kevin/Django/rest_lab/rest_project/Pipfile.lock  |  4 ++--
 code/Kevin/Django/rest_lab/rest_project/static/app.js | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/Kevin/Django/rest_lab/rest_project/Pipfile b/code/Kevin/Django/rest_lab/rest_project/Pipfile
index 4725933..29b41d8 100644
--- a/code/Kevin/Django/rest_lab/rest_project/Pipfile
+++ b/code/Kevin/Django/rest_lab/rest_project/Pipfile
@@ -10,4 +10,4 @@ djangorestframework = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.10"
+python_version = "3.11"
diff --git a/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock b/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
index 20965b4..db29623 100644
--- a/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
+++ b/code/Kevin/Django/rest_lab/rest_project/Pipfile.lock
@@ -1,11 +1,11 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "73653c63d46a4fc8ebd2b89822e3a608760544d16ee5f109c986963679b05ce4"
+            "sha256": "47e66386eec5596a9aa26673b930cd97eff96cef591e9d06e2cbfbdad81e9f2e"
         },
         "pipfile-spec": 6,
         "requires": {
-            "python_version": "3.10"
+            "python_version": "3.11"
         },
         "sources": [
             {
diff --git a/code/Kevin/Django/rest_lab/rest_project/static/app.js b/code/Kevin/Django/rest_lab/rest_project/static/app.js
index a5781ec..690a233 100644
--- a/code/Kevin/Django/rest_lab/rest_project/static/app.js
+++ b/code/Kevin/Django/rest_lab/rest_project/static/app.js
@@ -11,7 +11,6 @@ const app = Vue.createApp({
             movie: [],
             newMovie: {
                 title: '',
-                director: '',
                 genre: ''
             }
         }
@@ -32,7 +31,7 @@ const app = Vue.createApp({
             axios({
                 method: 'post',
                 url: 'api/v1/movie/',
-                Headers: {
+                headers: {
                     'X-CSRFToken': this.csrfToken
                 },
                 data: {
@@ -42,11 +41,16 @@ const app = Vue.createApp({
                 }
             }).then(response => {
                 console.log(response.data)
+                this.newMovie = {
+                    title: '',
+                    genre: ''
+                }
+                console.log('wiped')
                 this.loadMovies()
                 
                 }
             ).catch(error => {
-                console.log(error)
+                console.log(error.data)
             })
         },
         loadCurrentUser(){

From 1071eaa0b42fea2863ea124a9d6d273c1e35441a Mon Sep 17 00:00:00 2001
From: Kevin Schnaubelt Jr <kevinschnaubelt@gmail.com>
Date: Wed, 7 Dec 2022 18:11:00 -0500
Subject: [PATCH 3/3] progress capture

---
 .../rest_lab/rest_project/rest_app/views.py   |  5 +-
 .../rest_project/rest_project/urls.py         |  4 +-
 .../rest_lab/rest_project/static/app.js       | 59 +++++++++++++++++--
 .../rest_lab/rest_project/templates/home.html | 27 +++++++--
 4 files changed, 85 insertions(+), 10 deletions(-)

diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py b/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
index a387008..94116f2 100644
--- a/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_app/views.py
@@ -9,4 +9,7 @@ def home_view(request):
 
 class RestListView(ListView):
     model = Movie
-    template_name: str = 'home.html'
\ No newline at end of file
+    template_name: str = 'home.html'
+
+def goals_by_timeframe(request, timeframe):
+    return HttpResponse(f'The timeframe is {timeframe}')
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py b/code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py
index 78bff41..98d239f 100644
--- a/code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py
+++ b/code/Kevin/Django/rest_lab/rest_project/rest_project/urls.py
@@ -1,11 +1,13 @@
 from django.contrib import admin
 from django.urls import path, include
 from django.views.generic import TemplateView
+from rest_app import views
 
 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')
+    path('', TemplateView.as_view(template_name='home.html'), name='home'),
+    path('bob/<str:timeframe>', views.goals_by_timeframe, name='bob'),
 ]
\ No newline at end of file
diff --git a/code/Kevin/Django/rest_lab/rest_project/static/app.js b/code/Kevin/Django/rest_lab/rest_project/static/app.js
index 690a233..99b8198 100644
--- a/code/Kevin/Django/rest_lab/rest_project/static/app.js
+++ b/code/Kevin/Django/rest_lab/rest_project/static/app.js
@@ -6,13 +6,15 @@ const app = Vue.createApp({
             
             csrfToken: '',
             currentUser: {},
-            message: `Welcome`,
+            message: ` `,
 
             movie: [],
             newMovie: {
                 title: '',
                 genre: ''
-            }
+            },
+            editTitle: '',
+            editGenre: '',
         }
     },
     methods: {
@@ -23,7 +25,7 @@ const app = Vue.createApp({
             }).then(response => {
                 this.movie = response.data
                 console.log(this.movie)
-                
+                this.loadCurrentUser()
                 }
             )
         },
@@ -53,6 +55,35 @@ const app = Vue.createApp({
                 console.log(error.data)
             })
         },
+        deleteMovie(id){
+            axios({
+                method: 'delete',
+                url: '/api/v1/movie/' + id,
+                headers: {
+                    'X-CSRFToken': this.csrfToken
+                }
+            }).then(response => {
+                console.log('workin')
+                this.loadMovies()
+            })
+        },
+        editMovie(id,){
+            axios({
+                method: 'patch',
+                url: '/api/v1/movie/' + id + '/',
+                headers: {
+                    'X-CSRFToken': this.csrfToken
+                },
+                data: {
+                    "title": this.editTitle,
+                    "genre": this.editGenre,
+                }
+            }).then(response => {
+                // console.log(response.data)
+                this.switchBackFromEdit()
+                this.loadMovies()
+            })
+        },
         loadCurrentUser(){
             axios({
                 method: 'get',
@@ -61,13 +92,33 @@ const app = Vue.createApp({
                 console.log(response.data)
                 this.currentUser = response.data
             })
+        },
+        switchToEdit(index, title, genre){
+            document.querySelectorAll('.edit-button').forEach(element => {
+                element.disabled = true
+            })
+            document.querySelector('#post-div'+ index).style.display = 'none'
+            document.querySelector('#edit-div'+ index).style.display = 'block'
+            this.editTitle = title
+            this.editGenre = genre
+            
+        },
+        switchBackFromEdit(){
+            document.querySelectorAll('.edit-button').forEach(element => {
+                element.disabled = false
+            })
+            document.querySelectorAll('.post-div').forEach(element => {
+                element.style.display = 'block'
+            })
+            document.querySelectorAll('.edit-div').forEach(element => {
+                element.style.display = 'none'
+            })
         }
 
 
     },
     created: function(){
         this.loadMovies()
-        this.loadCurrentUser()
         console.log('created')
         
 
diff --git a/code/Kevin/Django/rest_lab/rest_project/templates/home.html b/code/Kevin/Django/rest_lab/rest_project/templates/home.html
index 4af7fea..12058c4 100644
--- a/code/Kevin/Django/rest_lab/rest_project/templates/home.html
+++ b/code/Kevin/Django/rest_lab/rest_project/templates/home.html
@@ -23,19 +23,38 @@ <h1>[[message]] [[this.currentUser.username]]!</h1>
                 <a href="{% url 'profile' user.username%}" class="p-1">Profile</a>
                 <a href="{% url 'logout' %}" class="p-1">Logout</a>
             {% endif %}
+            
         </div>
+        <a :href=" 'bob/' + [[message]] " class="p-1">bob</a>
     </div>
-    <div v-for="film in movie" class="flex items-center flex-col">
-        <p>[[film.title]] [[film.director_detail.username]] [[film.genre]]</p>
-    </div>
+
+    
     <br>
+    
     <div class="flex items-center flex-col">
         <input type="text" placeholder="Title" v-model="newMovie.title" class="border w-[10rem]">
-        {% comment %} <input type="text" placeholder="Director" v-model="newMovie.director" class="border w-[10rem]"> {% endcomment %}
         <input type="text" placeholder="Genre" v-model="newMovie.genre" class="border w-[10rem]">
         <button @click="createMovie">Submit</button>
     </div>
 
+    <br>
+    
+    <div class="border flex flex-wrap justify-evenly">
+        <div  v-for="(film, index) in movie"  class="flex items-center flex-col h-[15rem] w-[15rem] border">
+            <div :id="'post-div' + index" class="post-div">
+                <p class="border">[[film.title]] [[film.director_detail.username]] [[film.genre]]</p>
+                <button @click="deleteMovie(film.id)">DELETE</button>
+                <br>
+                <button class="edit-button" @click="switchToEdit(index, film.title, film.genre)">edit</button>
+
+            </div>
+            <div :id="'edit-div' + index" class="edit-div hidden">
+                <input :id="'title-input' + index" v-model="editTitle" type="text" placeholder="Title"  class="border w-[10rem]">
+                <input :id="'genre-input' + index" v-model="editGenre" type="text" placeholder="Genre"  class="border w-[10rem]">
+                <button @click="editMovie(film.id)">Submit</button>
+            </div>
+        </div>
+    </div>
 
 
 </div>