Update proposal.md

.vagrant/machines/default/virtualbox/action_provision

@@ -0,0 +1 @@
+1.5:adc499ae-26c1-404b-8001-6f9bf26939c0

.vagrant/machines/default/virtualbox/action_set_name

@@ -0,0 +1 @@
+1538013461

.vagrant/machines/default/virtualbox/box_meta

@@ -0,0 +1 @@
+{"name":"bento/ubuntu-18.04","version":"201803.24.0","provider":"virtualbox","directory":"boxes/bento-VAGRANTSLASH-ubuntu-18.04/201803.24.0/virtualbox"}

.vagrant/machines/default/virtualbox/creator_uid

@@ -0,0 +1 @@
+501

.vagrant/machines/default/virtualbox/id

@@ -0,0 +1 @@
+adc499ae-26c1-404b-8001-6f9bf26939c0

.vagrant/machines/default/virtualbox/index_uuid

@@ -0,0 +1 @@
+9a7a32abc5c34c88a2e21673d4ff069c

.vagrant/machines/default/virtualbox/private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEArdGBIz2jXBLMuG0Cvn7EJ3Pols2QRXJWX+sOsl8fggAYyytk
+aD06wUgSI86aht0SsjdQwlgKdCK2nBfON/11KEYIGN4gVg569Ucmu6E3HgY2Q7YM
+n/uKADxKTy727tBa7V3ZzCuVRVztvBxA66jbWBG82oJUcq3xKVz/4KnXwVRLdLxq
+gFn/weHY+ukExd7uhIsvObNCyLgEGELMPQwS+gquyBYLUSfKiKFlk6orHnffdbRY
+O8UglkcOV5bU1U2Y5cFOK9O6qV2yGL5Dpnql8Avc0Jv+zvhkpG+IDdSjzq5T7Nqk
+sfsAAALvD4VL0Kvm/gKE5/uQyUgEczz3uX0+yQIDAQABAoIBAFc3LEj2gKWOeVKA
+wEO9b8csDaS9eIqgGF8Ants5h6G/UrF/EF6NepHJC/ETlc3d16e8wbUCYBxt3prs
+BvlpIAQZP67apfcIRQIVtYWoGvPhwhCvpB4SJOiBV/frZNPnj/hSgxpDNB8dxdwB
+gUG99HF4VP5/LshsJvnOREYCctP6F9KwAhj386hSVw/qM8nvL4zw6rSbHOmtFjb1
+t7vj7HLnKSsrWPRCaWrXCgWAeIhTmd/XHWdlcwyDel76Ecc7zP5WHZkkLa8vVIHP
+lQokggCpWOQDvx5m5PKUxfnwVb4rGvSbUh31b+fUwpoKGXo4biBN7pGoPV8dn/oK
+tYbVzgECgYEA4OAy+LFwv4claXYrLnG1np93PxtyDx01AnfczRdbY/yGIB8p8DyW
+H5Sx2XXsE+n5G5XhH5S+zv/C9k5pMOJ2rK4cHxd/2DSsWfg2JyFC1DwY40AI6AMZ
+s7XBetfrRcZUyMeIOuh0zNnSaZa/lZZx04OqmM3OplMkK/K2seK6zdECgYEAxeA9
+LVr+M/1IIiZY2nAp/FCRlvQD2DzLWEnEo/0WKlgTRS7Zs4M2qhI7LdoWaxbhViRj
+G8QuMJCEeeuPmamOLbAJ2/kg+u/HxGwbcUzvur5qyeEQ3oqN230pfDvfV8EIel0b
+TkfkkeXJjeuEUnQB5bJdCbgoIL48g/XOnSSNR3kCgYEAvN/yT+mRPnz/kk27RR4i
+oqFjofCmY0Vv0avlG6mDjD58VRx3uBzbJplYq8Kcz7kUDvRbCpB/lxNAqGoBdhqv
+/KecXQz6xxiurj6JFWKdY+86JB0TnfOEsel2IXybUpabfawBoyC9gZVuYltIfRbI
+chRDxGYQLKjmV7dbdZtutRECgYEAkoL3KTb/k2UNXOPB1HNKUx0gv4GLuzdAZO2x
+4K5LFC1Ej2wiG02jUwfOs6OQB9jYHd0xWOTIQoMu48sr913Y/TEkC7EJ32NdKa3W
+H+0Ub9P/49x2jiBO6t5gsjDurN4rtdZsmmiW8AQRWbixsA9fPED1rHWjmKLi0d5W
+Dnp69RkCgYEAnA3NB8tkd88mmZsy5z4NmN0XkfBnWj3lhEdk1m1o7nTyjRO4Hbv0
+trNIEl1M/9wrZvF3BGo9QHNHG8ciRF8wTp9I1vA4nlaUrteRbkE53o+YtywHpub7
+1omouExaF3YPcVAq3G2xWBt/H9ih/7EVUQ9qYtE20CGxlyKjzbdTP4k=
+-----END RSA PRIVATE KEY-----

.vagrant/machines/default/virtualbox/synced_folders

@@ -0,0 +1 @@
+{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"/Users/Bailey/Documents/College/Fall 2018/COMPSCI 326/repo/326_project","disabled":false,"__vagrantfile":true}}}

.vagrant/machines/default/virtualbox/vagrant_cwd

@@ -0,0 +1 @@
+/Users/Bailey/Documents/College/Fall 2018/COMPSCI 326/repo/326_project

.vagrant/rgloader/loader.rb

@@ -0,0 +1,9 @@
+# This file loads the proper rgloader/loader.rb file that comes packaged
+# with Vagrant so that encoded files can properly run with Vagrant.
+
+if ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
+  require File.expand_path(
+    "rgloader/loader", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
+else
+  raise "Encoded files can't be read outside of the Vagrant installer."
+end

CS326_project/CS326_project/settings.py

@@ -0,0 +1,131 @@
+"""
+Django settings for CS326_project project.
+
+Generated by 'django-admin startproject' using Django 2.0.6.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/2.0/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/2.0/ref/settings/
+"""
+
+import os
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '9#@jjh%93#kb15#=fs0$lxthv$x(@*el3ito5bhz%#!5)+eb+8'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'Catch.apps.CatchConfig',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'CS326_project.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'CS326_project.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/2.0/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/2.0/howto/static-files/
+
+STATIC_URL = '/static/'
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+
+
+# Log in Redirect
+LOGIN_REDIRECT_URL = '/Catch/homePage'
+LOGOUT_REDIRECT_URL = '/Catch/homePage'
+
+
+AUTH_USER_MODEL = 'Catch.PetUser'

CS326_project/CS326_project/urls.py

@@ -0,0 +1,31 @@
+"""CS326_project URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/2.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import path
+from django.conf.urls import include
+from django.views.generic import RedirectView
+from django.conf import settings
+from django.conf.urls.static import static
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('Catch/', include('Catch.urls')),
+    path('', RedirectView.as_view(url='/Catch/')),
+    #path('accounts/', include('django.contrib.auth.urls')),
+]
+
+urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

CS326_project/CS326_project/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for CS326_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/2.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CS326_project.settings")
+
+application = get_wsgi_application()

CS326_project/Catch/admin.py

@@ -0,0 +1,22 @@
+from django.contrib import admin
+from .models import PetUser, Pet, Event
+
+from django.contrib.auth import get_user_model
+from django.contrib.auth.admin import UserAdmin
+from .forms import PetUserCreationForm, PetUserChangeForm
+from .models import PetUser
+
+
+# Register your models here.
+# admin.site.register(PetUser)
+admin.site.register(Pet)
+admin.site.register(Event)
+
+
+class PetUserAdmin(UserAdmin):
+    add_form = PetUserCreationForm
+    form = PetUserChangeForm
+    model = PetUser
+    list_display = ['email', 'username', 'image']
+
+admin.site.register(PetUser, PetUserAdmin)

CS326_project/Catch/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CatchConfig(AppConfig):
+    name = 'Catch'

CS326_project/Catch/forms.py

@@ -0,0 +1,42 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from .models import PetUser, Pet
+
+
+class PetUserCreationForm(UserCreationForm):
+    username = forms.CharField(max_length = 30)
+    first_name = forms.CharField(max_length = 30)
+    last_name = forms.CharField(max_length = 30)
+    password = forms.CharField(max_length = 30)
+    email = forms.EmailField(max_length = 30)
+    location = forms.CharField(max_length = 100)
+    description = forms.CharField(widget=forms.Textarea)
+
+    class Meta(UserCreationForm):
+        model = PetUser
+        fields = ('username', 'first_name', 'last_name','password','email','location','description')
+
+class PetUserChangeForm(UserChangeForm):
+    username = forms.CharField(max_length = 30)
+    first_name = forms.CharField(max_length = 30)
+    last_name = forms.CharField(max_length = 30)
+    email = forms.EmailField(max_length = 30)
+    location = forms.CharField(max_length = 100)
+    description = forms.CharField(widget=forms.Textarea)
+    # image = forms.ImageField(upload_to = "user_images", null = True)
+
+    class Meta(UserCreationForm):
+        model = PetUser
+        fields = ('username', 'first_name', 'last_name','email','location','description', 'image')
+
+
+class PetCreationForm(forms.ModelForm):
+    name = forms.CharField()
+    pet_type = forms.CharField()
+    breed = forms.CharField()
+    description = forms.CharField()
+    #image = forms.ImageField()
+
+    class Meta:
+        model = Pet
+        fields = ('name', 'pet_type', 'breed','description',) # 'image')

CS326_project/Catch/migrations/0001_initial.py

@@ -0,0 +1,72 @@
+# Generated by Django 2.1.2 on 2018-11-13 18:31
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Event',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('location', models.CharField(blank=True, help_text='Please be as specific as possible. Include the building and room number if applicable. A kind reminder, it is best to meet in public places.', max_length=30, null=True)),
+                ('latitude', models.FloatField(null=True)),
+                ('longitude', models.FloatField(null=True)),
+                ('datetime', models.DateTimeField()),
+                ('capacity', models.IntegerField()),
+                ('description', models.TextField(null=True)),
+                ('image', models.ImageField(null=True, upload_to='event_images')),
+                ('duration', models.DurationField(default=datetime.timedelta(0, 3600))),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Pet',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30)),
+                ('pet_type', models.CharField(max_length=30)),
+                ('breed', models.CharField(blank=True, max_length=30, null=True)),
+                ('description', models.TextField(blank=True, max_length=3000, null=True)),
+                ('image', models.ImageField(null=True, upload_to='pet_images')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PetUser',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('username', models.CharField(max_length=30)),
+                ('first_name', models.CharField(max_length=30)),
+                ('last_name', models.CharField(max_length=30)),
+                ('password', models.CharField(max_length=30)),
+                ('email', models.EmailField(max_length=30)),
+                ('location', models.CharField(blank=True, help_text='Your area of residence', max_length=100, null=True)),
+                ('description', models.CharField(blank=True, max_length=3000, null=True)),
+                ('image', models.ImageField(null=True, upload_to='user_images')),
+                ('hosting', models.ManyToManyField(to='Catch.Event')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='pet',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='Catch.PetUser'),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='host',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='Catch.PetUser'),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='pet',
+            field=models.ManyToManyField(to='Catch.Pet'),
+        ),
+    ]