diff --git a/code/lauren/django/MovieLister/Pipfile b/code/lauren/django/MovieLister/Pipfile new file mode 100644 index 0000000..d042ba0 --- /dev/null +++ b/code/lauren/django/MovieLister/Pipfile @@ -0,0 +1,13 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +django = "*" +django-rest-framework = "*" + +[dev-packages] + +[requires] +python_version = "3.10" diff --git a/code/lauren/django/MovieLister/Pipfile.lock b/code/lauren/django/MovieLister/Pipfile.lock new file mode 100644 index 0000000..3cdf300 --- /dev/null +++ b/code/lauren/django/MovieLister/Pipfile.lock @@ -0,0 +1,75 @@ +{ + "_meta": { + "hash": { + "sha256": "6ef8c68446dcdd5a4445babba833b494fcf76181dcbf2ae625eeedfbd15d9f27" + }, + "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" + }, + "django-rest-framework": { + "hashes": [ + "sha256:47a8f496fa69e3b6bd79f68dd7a1527d907d6b77f009e9db7cf9bb21cc565e4a" + ], + "index": "pypi", + "version": "==0.1.0" + }, + "djangorestframework": { + "hashes": [ + "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8", + "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08" + ], + "markers": "python_version >= '3.6'", + "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/lauren/django/MovieLister/api/__init__.py b/code/lauren/django/MovieLister/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/api/admin.py b/code/lauren/django/MovieLister/api/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/code/lauren/django/MovieLister/api/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/code/lauren/django/MovieLister/api/apps.py b/code/lauren/django/MovieLister/api/apps.py new file mode 100644 index 0000000..66656fd --- /dev/null +++ b/code/lauren/django/MovieLister/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/lauren/django/MovieLister/api/migrations/__init__.py b/code/lauren/django/MovieLister/api/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/api/models.py b/code/lauren/django/MovieLister/api/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/code/lauren/django/MovieLister/api/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/code/lauren/django/MovieLister/api/permissions.py b/code/lauren/django/MovieLister/api/permissions.py new file mode 100644 index 0000000..bcb0598 --- /dev/null +++ b/code/lauren/django/MovieLister/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/lauren/django/MovieLister/api/serializers.py b/code/lauren/django/MovieLister/api/serializers.py new file mode 100644 index 0000000..1deec16 --- /dev/null +++ b/code/lauren/django/MovieLister/api/serializers.py @@ -0,0 +1,33 @@ +from rest_framework import serializers +from movieapp.models import Movie +from users.models import CustomUser + +class NestedMovieSerializer(serializers.ModelSerializer): + class Meta: + model = Movie + fields = ('id', 'title', 'genre', 'director', 'release_date', 'author', 'opinion', 'likes', 'poster') + +class NestedUserSerializer(serializers.ModelSerializer): + class Meta: + model = CustomUser + fields = ('id', 'username') + + +class MovieSerializer(serializers.ModelSerializer): + author_detail = NestedUserSerializer(read_only=True, source='author') + class Meta: + model = Movie + fields = ('id', 'title', 'genre', 'director', 'release_date', 'opinion', 'author_detail', 'author', 'likes', 'poster') + +class UserSerializer(serializers.ModelSerializer): + movie_detail = NestedMovieSerializer(many=True, source='movies', read_only=True) + class Meta: + model = CustomUser + fields = ('id', 'username', 'movies', 'movie_detail') + + + + + + + diff --git a/code/lauren/django/MovieLister/api/tests.py b/code/lauren/django/MovieLister/api/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/lauren/django/MovieLister/api/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/lauren/django/MovieLister/api/urls.py b/code/lauren/django/MovieLister/api/urls.py new file mode 100644 index 0000000..6dc3e15 --- /dev/null +++ b/code/lauren/django/MovieLister/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('movies', views.PostMovieSet, basename='movie') + +urlpatterns = router.urls + [ + +] \ No newline at end of file diff --git a/code/lauren/django/MovieLister/api/views.py b/code/lauren/django/MovieLister/api/views.py new file mode 100644 index 0000000..87546aa --- /dev/null +++ b/code/lauren/django/MovieLister/api/views.py @@ -0,0 +1,12 @@ +from rest_framework import generics, viewsets + +from movieapp.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/lauren/django/MovieLister/manage.py b/code/lauren/django/MovieLister/manage.py new file mode 100644 index 0000000..f816a7f --- /dev/null +++ b/code/lauren/django/MovieLister/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', 'movieproject.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/lauren/django/MovieLister/movieapp/__init__.py b/code/lauren/django/MovieLister/movieapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/movieapp/admin.py b/code/lauren/django/MovieLister/movieapp/admin.py new file mode 100644 index 0000000..33040e6 --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin + +from.models import Movie + +admin.site.register(Movie) diff --git a/code/lauren/django/MovieLister/movieapp/apps.py b/code/lauren/django/MovieLister/movieapp/apps.py new file mode 100644 index 0000000..3ff6cdb --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class MovieappConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'movieapp' diff --git a/code/lauren/django/MovieLister/movieapp/migrations/0001_initial.py b/code/lauren/django/MovieLister/movieapp/migrations/0001_initial.py new file mode 100644 index 0000000..293642f --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# Generated by Django 4.1.3 on 2022-11-30 22:14 + +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), + ] + + 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)), + ('director', models.CharField(max_length=200)), + ('release_date', models.DateField(max_length=50, null=True)), + ('opinion', models.TextField(null=True)), + ('likes', models.IntegerField(default=0)), + ('poster', models.ImageField(null=True, upload_to='images/')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='movies', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/code/lauren/django/MovieLister/movieapp/migrations/0002_alter_movie_poster.py b/code/lauren/django/MovieLister/movieapp/migrations/0002_alter_movie_poster.py new file mode 100644 index 0000000..fba83cb --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/migrations/0002_alter_movie_poster.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.3 on 2022-11-30 22:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('movieapp', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='movie', + name='poster', + field=models.ImageField(height_field=500, null=True, upload_to='images/', width_field=500), + ), + ] diff --git a/code/lauren/django/MovieLister/movieapp/migrations/__init__.py b/code/lauren/django/MovieLister/movieapp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/movieapp/models.py b/code/lauren/django/MovieLister/movieapp/models.py new file mode 100644 index 0000000..1988ec9 --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/models.py @@ -0,0 +1,18 @@ +from django.db import models +from users.models import CustomUser + +class Movie(models.Model): + title = models.CharField(max_length=200) + genre = models.CharField(max_length=200) + director = models.CharField(max_length=200) + author = models.ForeignKey(CustomUser, related_name="movies", on_delete=models.CASCADE) + release_date = models.DateField(max_length=50, null=True) + opinion = models.TextField(null=True) + likes = models.IntegerField(default=0) + # public = models.BooleanField(default=True) + # created = models.DateTimeField(auto_now_add=True) + # updated = models.DateTimeField(auto_now=True) + poster = models.ImageField(upload_to='images/', null=True) + +def __str__(self): + return self.title \ No newline at end of file diff --git a/code/lauren/django/MovieLister/movieapp/tests.py b/code/lauren/django/MovieLister/movieapp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/lauren/django/MovieLister/movieapp/urls.py b/code/lauren/django/MovieLister/movieapp/urls.py new file mode 100644 index 0000000..8cc567e --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/urls.py @@ -0,0 +1,7 @@ +# from django.urls import path +# from . import views + +# app_name = 'movieapp' +# urlpatterns = [ +# path('', views.MovieListView.as_view(), name='home') +# ] \ No newline at end of file diff --git a/code/lauren/django/MovieLister/movieapp/views.py b/code/lauren/django/MovieLister/movieapp/views.py new file mode 100644 index 0000000..630cb00 --- /dev/null +++ b/code/lauren/django/MovieLister/movieapp/views.py @@ -0,0 +1,8 @@ +from django.views.generic import ListView + +from.models import Movie + + +class MovieListView(ListView): + model = Movie + template_name = 'home.html' \ No newline at end of file diff --git a/code/lauren/django/MovieLister/movieproject/__init__.py b/code/lauren/django/MovieLister/movieproject/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/movieproject/asgi.py b/code/lauren/django/MovieLister/movieproject/asgi.py new file mode 100644 index 0000000..6c32f74 --- /dev/null +++ b/code/lauren/django/MovieLister/movieproject/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for movieproject 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', 'movieproject.settings') + +application = get_asgi_application() diff --git a/code/lauren/django/MovieLister/movieproject/settings.py b/code/lauren/django/MovieLister/movieproject/settings.py new file mode 100644 index 0000000..510b837 --- /dev/null +++ b/code/lauren/django/MovieLister/movieproject/settings.py @@ -0,0 +1,140 @@ +""" +Django settings for movieproject 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 +import os + +# 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-!kwjb9i_+lrx+u-v+0fmcjwr1$8@8(9&-mo&bmj@yz=5g(#k+^' + +# 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', + 'movieapp.apps.MovieappConfig', + '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 = 'movieproject.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 = 'movieproject.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/Los_Angeles' + +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'] + +MEDIA_URL = '/uploaded_files/' +MEDIA_ROOT = os.path.join(BASE_DIR, 'uploaded_files') + +# 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/lauren/django/MovieLister/movieproject/urls.py b/code/lauren/django/MovieLister/movieproject/urls.py new file mode 100644 index 0000000..32ed0bf --- /dev/null +++ b/code/lauren/django/MovieLister/movieproject/urls.py @@ -0,0 +1,13 @@ +from django.contrib import admin +from django.urls import path, include +from django.views.generic import TemplateView +from django.conf.urls.static import static +from django.conf import settings + +urlpatterns = [ + path('admin/', admin.site.urls), + path('', TemplateView.as_view(template_name='home.html'), name='home'), + path('users/', include('django.contrib.auth.urls')), + path('users/', include('users.urls')), + path('api/v1/', include('api.urls')) +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/code/lauren/django/MovieLister/movieproject/wsgi.py b/code/lauren/django/MovieLister/movieproject/wsgi.py new file mode 100644 index 0000000..9621711 --- /dev/null +++ b/code/lauren/django/MovieLister/movieproject/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for movieproject 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', 'movieproject.settings') + +application = get_wsgi_application() diff --git a/code/lauren/django/MovieLister/static/app.js b/code/lauren/django/MovieLister/static/app.js new file mode 100644 index 0000000..6d90803 --- /dev/null +++ b/code/lauren/django/MovieLister/static/app.js @@ -0,0 +1,126 @@ + +const app = Vue.createApp({ + delimiters: ['[[', ']]'], + data(){ + return{ + currentUser: {}, + csrfToken: '', + movies: [], + newMovie: { + "title" : "", + "director": "", + "genre": "", + "release_date": "", + "opinion": "", + "likes": "", + // "poster": "" + } + } + }, + methods: { + + loadMovies(){ + axios({ + method: 'get', + url: 'api/v1/movies' + }).then(response => { + this.movies = response.data + console.log(response.data) + } + ) + }, + createMovie() { + // let posterImg = document.querySelector('#movie-input').files[0].name + // console.log(posterImg) + axios({ + method: 'post', + url: '/api/v1/movies/', + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "title" : this.newMovie.title, + "author": this.currentUser.id, + "director": this.newMovie.director, + "genre": this.newMovie.genre, + "release_date": this.newMovie.release_date, + "opinion": this.newMovie.opinion, + // "poster": posterImg + + } + }).then( response => { + this.loadMovies() + console.log(response.data) + }).catch(error => { + console.log(error.response) + + }) + + + }, + loadCurrentUser(){ + axios({ + method: 'get', + url: '/users/currentuser/' + }).then(response => { + this.currentUser = response.data + }).catch(error =>{ + console.log(error) + }) + + }, + + + createLikes(movie) { + axios({ + method: 'put', + url: `/api/v1/movies/${movie.id}/`, + headers: { + 'X-CSRFToken': this.csrfToken + }, + data: { + "id": movie.id, + "title": movie.title, + "genre": movie.genre, + "director": movie.director, + "release_date": movie.release_date, + "opinion": movie.opinion, + "author_detail": { + "id": movie.author_detail.id, + "username": movie.author_detail.username, + }, + "author": movie.author, + "likes": movie.likes +1 + } + }).then(response => { + this.loadMovies() + + console.log(response.data) + }) + + + }, + + displayinfo(index){ + document.querySelector("#id" + index).style.display = "block" + }, + + + hideinfo(index){ + document.querySelector("#id" + index).style.display = 'none' + } +}, + + + + + created: function() { + this.loadCurrentUser() + this.loadMovies() + }, + mounted(){ + this.csrfToken = document.querySelector("input[name=csrfmiddlewaretoken]").value + + + } +}) \ No newline at end of file diff --git a/code/lauren/django/MovieLister/static/css/styles.css b/code/lauren/django/MovieLister/static/css/styles.css new file mode 100644 index 0000000..550f750 --- /dev/null +++ b/code/lauren/django/MovieLister/static/css/styles.css @@ -0,0 +1,73 @@ +@import url('https://fonts.googleapis.com/css2?family=Special+Elite&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Asap+Condensed:wght@200&display=swap'); + +body{ + background-color: black; + +} + +#headercontainer{ + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: center; + background-image: url(https://th.bing.com/th/id/OIP.bISEsZ5_yn_IY3sZUZYZtwHaEK?pid=ImgDet&rs=1); + color: goldenrod; + font-size: xx-large; + font-family: 'Special Elite', cursive; + height: 12.5rem; + text-align: center; +} + + + +#login{ + display: flex; + color: white; + font-family: 'Economica', sans-serif; + font-size: x-large; + justify-content:flex-start; +} + +#logout{ + color: white; + font-family: 'Economica', sans-serif; +} + +#movieadder{ + display: flex; + flex-wrap: wrap; + flex-direction: column; + color: white; + text-align: center; + font-family: 'Asap Condensed', sans-serif; + padding-right: 10rem; + padding-left: 10rem; +} + +#movieposts{ + display: flex; + justify-content: space-evenly; +} + + +#poster{ + height: 30rem; + /* width: 15rem; */ +} + +.movie-box{ + display: flex; + flex-direction: column; + width: 21rem; + color: aliceblue; + + +} + +.hide{ + display: none; +} + + + diff --git a/code/lauren/django/MovieLister/templates/home.html b/code/lauren/django/MovieLister/templates/home.html new file mode 100644 index 0000000..170c2a8 --- /dev/null +++ b/code/lauren/django/MovieLister/templates/home.html @@ -0,0 +1,73 @@ + + + {% load static %} + + + + + + + + Document + + + {% csrf_token %} + +
+ +
+

M o v i e L i s t e r

+ +
+
+ {% if user.is_authenticated %} +

Welcome [[currentUser.username]]

+ + Logout + {% else %} + Signup + Login + + {% endif %} +
+ +
+ +
+ +
+

[[movie.title]]

+

Genre: [[movie.genre]]

+

Director: [[movie.director]]

+

Release Date: [[movie.release_date]]

+

Opinion: [[movie.opinion]]

+

Likes: [[movie.likes]]

+
+ + {% if user.is_authenticated %} + + {% endif %} +
+
+ +
+

Add New Movie!

+ + + + + + + + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/code/lauren/django/MovieLister/templates/registration/login.html b/code/lauren/django/MovieLister/templates/registration/login.html new file mode 100644 index 0000000..797d9e4 --- /dev/null +++ b/code/lauren/django/MovieLister/templates/registration/login.html @@ -0,0 +1,6 @@ +

Login

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

Sign up

+
+ {% csrf_token %} + {{ form.as_p }} + +
\ No newline at end of file diff --git a/code/lauren/django/MovieLister/uploaded_files/images/OIP.jpg b/code/lauren/django/MovieLister/uploaded_files/images/OIP.jpg new file mode 100644 index 0000000..a2742de Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/OIP.jpg differ diff --git a/code/lauren/django/MovieLister/uploaded_files/images/facebook.jpg b/code/lauren/django/MovieLister/uploaded_files/images/facebook.jpg new file mode 100644 index 0000000..f88060c Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/facebook.jpg differ diff --git a/code/lauren/django/MovieLister/uploaded_files/images/facebook_14FzyuS.jpg b/code/lauren/django/MovieLister/uploaded_files/images/facebook_14FzyuS.jpg new file mode 100644 index 0000000..f88060c Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/facebook_14FzyuS.jpg differ diff --git a/code/lauren/django/MovieLister/uploaded_files/images/insta.jpg b/code/lauren/django/MovieLister/uploaded_files/images/insta.jpg new file mode 100644 index 0000000..6367ce0 Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/insta.jpg differ diff --git a/code/lauren/django/MovieLister/uploaded_files/images/interstellar.jpg b/code/lauren/django/MovieLister/uploaded_files/images/interstellar.jpg new file mode 100644 index 0000000..5f3d555 Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/interstellar.jpg differ diff --git a/code/lauren/django/MovieLister/uploaded_files/images/tenacious.jpg b/code/lauren/django/MovieLister/uploaded_files/images/tenacious.jpg new file mode 100644 index 0000000..fe796bf Binary files /dev/null and b/code/lauren/django/MovieLister/uploaded_files/images/tenacious.jpg differ diff --git a/code/lauren/django/MovieLister/users/__init__.py b/code/lauren/django/MovieLister/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/users/admin.py b/code/lauren/django/MovieLister/users/admin.py new file mode 100644 index 0000000..bc2eae9 --- /dev/null +++ b/code/lauren/django/MovieLister/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', 'first_name', 'last_name', 'email'] + +admin.site.register(CustomUser, CustomUserAdmin) diff --git a/code/lauren/django/MovieLister/users/apps.py b/code/lauren/django/MovieLister/users/apps.py new file mode 100644 index 0000000..72b1401 --- /dev/null +++ b/code/lauren/django/MovieLister/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/lauren/django/MovieLister/users/forms.py b/code/lauren/django/MovieLister/users/forms.py new file mode 100644 index 0000000..630019d --- /dev/null +++ b/code/lauren/django/MovieLister/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', 'first_name', 'age', 'email') + +class CustomUserChangeForm(UserChangeForm): + class Meta: + model = CustomUser + fields = ('username', 'first_name', 'age', 'email') \ No newline at end of file diff --git a/code/lauren/django/MovieLister/users/migrations/0001_initial.py b/code/lauren/django/MovieLister/users/migrations/0001_initial.py new file mode 100644 index 0000000..1d27d1b --- /dev/null +++ b/code/lauren/django/MovieLister/users/migrations/0001_initial.py @@ -0,0 +1,44 @@ +# Generated by Django 4.1.3 on 2022-11-30 22:12 + +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')), + ('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)), + ('first_name', models.CharField(max_length=50)), + ('age', models.CharField(max_length=3)), + ('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/lauren/django/MovieLister/users/migrations/__init__.py b/code/lauren/django/MovieLister/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/code/lauren/django/MovieLister/users/models.py b/code/lauren/django/MovieLister/users/models.py new file mode 100644 index 0000000..e5d9d0b --- /dev/null +++ b/code/lauren/django/MovieLister/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=50, unique=True) + first_name = models.CharField(max_length=50) + age = models.CharField(max_length=3) + email = models.EmailField(max_length=254) + + def __str__(self): + return self.username diff --git a/code/lauren/django/MovieLister/users/tests.py b/code/lauren/django/MovieLister/users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/code/lauren/django/MovieLister/users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/code/lauren/django/MovieLister/users/urls.py b/code/lauren/django/MovieLister/users/urls.py new file mode 100644 index 0000000..e065bec --- /dev/null +++ b/code/lauren/django/MovieLister/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/lauren/django/MovieLister/users/views.py b/code/lauren/django/MovieLister/users/views.py new file mode 100644 index 0000000..1acb787 --- /dev/null +++ b/code/lauren/django/MovieLister/users/views.py @@ -0,0 +1,32 @@ +from django.shortcuts import render +from rest_framework import generics, viewsets, permissions +from django.views.generic.edit import CreateView +from django.urls import reverse_lazy +from users.models import CustomUser +# from django.views.generic.edit import DetailView + +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 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 UserProfile(DetailView): +# model = CustomUser +# template_name = 'user_profile.html' +# context_object_name = 'user_profile' +