From 40b449e866f0b66e2c1c3e2182c185c3eb3a5dd9 Mon Sep 17 00:00:00 2001 From: Ben Waters Date: Thu, 4 Sep 2014 16:30:23 -0400 Subject: [PATCH] Update on models --- .idea/dataSources.xml | 4 +- .idea/deployment.xml | 5 + .idea/dictionaries/bwaters.xml | 3 + .idea/friendfinder.iml | 9 +- .idea/inspectionProfiles/Project_Default.xml | 15 + .../inspectionProfiles/profiles_settings.xml | 7 + .idea/vagrant.xml | 8 + .idea/workspace.xml | 404 ++++++++++++++++-- core/models.py | 17 +- core/views.py | 26 ++ ffREST/__init__.pyc | Bin 144 -> 144 bytes ffREST/settings.py | 13 +- ffREST/settings.pyc | Bin 2776 -> 2538 bytes ffREST/urls.py | 7 +- geo/admin.py | 9 +- geo/migrations/0001_initial.py | 40 -- geo/migrations/__init__.py | 0 geo/models.py | 34 +- geo/router.py | 5 +- geo/tests.py | 2 - geo/views.py | 30 +- requirements.txt | 3 +- 22 files changed, 513 insertions(+), 128 deletions(-) create mode 100644 .idea/deployment.xml create mode 100644 .idea/dictionaries/bwaters.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/vagrant.xml delete mode 100644 geo/migrations/0001_initial.py delete mode 100644 geo/migrations/__init__.py diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index f9e0fbd..62cbf89 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -5,8 +5,8 @@ postgresql org.postgresql.Driver jdbc:postgresql://127.0.0.1/ff - ffuser - df9bdf9edfccdfccdf8b + ffUser + df9bdf9edfccdfccdfffdfd9dfcfdfd8df8b diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..98dad78 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/dictionaries/bwaters.xml b/.idea/dictionaries/bwaters.xml new file mode 100644 index 0000000..6c54fea --- /dev/null +++ b/.idea/dictionaries/bwaters.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/friendfinder.iml b/.idea/friendfinder.iml index 07106f6..ca34303 100644 --- a/.idea/friendfinder.iml +++ b/.idea/friendfinder.iml @@ -11,11 +11,18 @@ - + + + + + diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..2d55bf0 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,15 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml new file mode 100644 index 0000000..d1051a8 --- /dev/null +++ b/.idea/vagrant.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 02975fd..4454fc6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,23 @@ - + + + + + + + + + + + + + + + + + + + @@ -30,9 +49,11 @@ - - - + + + + + @@ -40,8 +61,8 @@ - - + + @@ -52,8 +73,8 @@ - - + + @@ -61,24 +82,22 @@ - + - - + + - - + + - - - - - + + + @@ -96,18 +115,35 @@ - + + + + + + + + + + + Buildout + + + + @@ -116,8 +152,8 @@ - - + + - + - + + + + + + + + + + + + + + + + + + + + @@ -285,21 +480,21 @@ - + - - + + - + - + - - - - + + + + @@ -324,32 +519,72 @@ + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + - + @@ -359,7 +594,7 @@ - + @@ -369,12 +604,89 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/models.py b/core/models.py index c093db8..056436d 100644 --- a/core/models.py +++ b/core/models.py @@ -6,8 +6,23 @@ from django.db.models.signals import post_save from django.dispatch import receiver from rest_framework.authtoken.models import Token from rest_framework import serializers +from model_utils.models import TimeStampedModel from django.contrib.auth.models import User +class University(TimeStampedModel): + name = models.CharField(max_length=255) + city = models.CharField(max_length=255) + state = models.CharField(max_length=2) + + def __unicode__(self): + return self.name + + +class UniversitySerializer(serializers.ModelSerializer): + class Meta: + model = University + fields = ('id', 'name', 'city', 'state') + @receiver(post_save, sender=get_user_model()) def create_auth_token(sender, instance=None, created=False, **kwargs): if created: @@ -16,4 +31,4 @@ def create_auth_token(sender, instance=None, created=False, **kwargs): class UserSerializer(serializers.ModelSerializer): class Meta: model = User - fields = ('id', 'username', 'email') + fields = ('id', 'username', 'first_name', 'last_name', 'email') diff --git a/core/views.py b/core/views.py index 91ea44a..c04f483 100644 --- a/core/views.py +++ b/core/views.py @@ -1,3 +1,29 @@ from django.shortcuts import render +from rest_framework import viewsets +from rest_framework.response import Response +from rest_framework import status +from rest_framework.decorators import detail_route +from django.contrib.auth.models import User +from .models import University, UniversitySerializer, UserSerializer # Create your views here. +class UniversityViewSet(viewsets.ModelViewSet): + queryset = University.objects.all() + serializer_class = UniversitySerializer + + +class UserViewSet(viewsets.ModelViewSet): + queryset = User.objects.all() + serializer_class = UserSerializer + + @detail_route(methods=['post']) + def set_password(self, request, pk=None): + user = self.get_object() + serializer = UserSerializer(data=request.DATA) + if serializer.is_valid(): + user.set_password(serializer.data['password']) + user.save() + return Response({'status': 'password set'}) + else: + return Response(serializer.errors, + status=status.HTTP_400_BAD_REQUEST) \ No newline at end of file diff --git a/ffREST/__init__.pyc b/ffREST/__init__.pyc index e06b06d0497bf0c0a9644b35884a39a668693714..9511b8f0bd28ffffbc0e9b18a74119612f196744 100644 GIT binary patch delta 16 XcmbQhIDwIa`7F58!6FE8nEk_0u diff --git a/ffREST/settings.py b/ffREST/settings.py index 85f3f07..fe87947 100644 --- a/ffREST/settings.py +++ b/ffREST/settings.py @@ -35,7 +35,6 @@ SITE_ID= 1 POSTGIS_VERSION =(2,1,2) -DATABASE_ROUTERS = ['geo.router.GeoRouter'] # Application definition @@ -47,7 +46,6 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django.contrib.gis', 'push_notifications', 'rest_framework', 'rest_framework.authtoken', @@ -78,17 +76,10 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'ff', - 'USER': 'ffuser', - 'PASSWORD': '14ff!', + 'USER': 'ffUser', + 'PASSWORD': '14ffUser!', 'HOST': 'localhost', }, - 'location': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': 'geo', - 'USER': 'geoUser', - 'PASSWORD': '14geoUser!', - 'HOST': 'localhost', - } } # Internationalization diff --git a/ffREST/settings.pyc b/ffREST/settings.pyc index 4baea68bcc6bc44fa8de56851938be7b578f060e..65f5c5b55a21e62d9780ee30b10b1f11fd6451d7 100644 GIT binary patch delta 244 zcmca1`bt=a`7cTzrRNqD-ci7DE(2Ly9&-lmJ7D4nve6Ly8nb zln_ITG((gyLnb3bCM!dV3`2@6gW1H5@_J@bA`B_&3{j#CDH;q>VhpM53{m1>QUXj$ zGNfoSL`gBEFfjyc=x)|$3}a-Jn0%03c=9Hu4Vx>OKQT&$7N-`KumBwp8tfWW%n4)| znxv(HL?<`08ck+nGiC!hu^6FEl0BS}QF?MA$BoT#oC1uDVUzQ@BpBHzPv8=nynsuA LhmW0&2@2T&fj2WF delta 462 zcmZ`z%TB^j5Iwh83K~%n5EWz8i0}F$ti?#&Noc{CyCJ}orfR6+*0tY2`V+>DF@A%I zpWrvRb!S{SX;|t^X3m_y0i(mSQ~NP*Y-9@OBR%r$7m~0&*I3 z2sr~ff=q)7kh7pA$P7FUo{r)3a*H-lrcIQY(iUi$Sq`+qunk&c*a59G6cH(RQI=WI z9we(w$T>I$WIoFCQC7Vc5~2`38XuWy9z3fw sDyJ2@+OlfRM%A)k9}+V{^ul2>ug8))MEH~}