From ef0ee37930f5d72358820b13b74b67cf197c9185 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Mon, 23 Feb 2015 16:27:18 -0800
Subject: [PATCH 01/43] Front end time

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3ec394..e6005ee 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # decluttter
-App to declutter your life.
+App to declutter your life and then stuff.

From 295c46cdc85bb3533adf373ead28fe4582a21f5f Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Wed, 25 Feb 2015 01:05:41 -0800
Subject: [PATCH 02/43] Authentication is working, need to add in rest of the
 views

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 appuser/migrations/0001_initial.py            |  10 +-
 .../migrations/0002_stream_deleted_status.py  |  20 --
 appuser/models.py                             |   9 +-
 appuser/views.py                              |   5 +-
 authentication/__init__.py                    |   0
 authentication/admin.py                       |   3 +
 authentication/app_settings.py                |  42 ++++
 authentication/migrations/__init__.py         |   0
 authentication/models.py                      |   3 +
 authentication/register/__init__.py           |   1 +
 authentication/register/views.py              |  85 +++++++
 authentication/tests.py                       |   3 +
 authentication/urls.py                        |  20 ++
 authentication/utils.py                       |  13 ++
 authentication/views.py                       | 169 ++++++++++++++
 declutter/settings.py                         |  24 +-
 declutter/urls.py                             |   4 +
 declutter_db.sqlite3                          | Bin 167936 -> 262144 bytes
 items/migrations/0001_initial.py              |  32 +++
 requirements.txt                              |   7 +
 static/app/index.html                         |   6 +
 static/app/scripts/app.js                     |  20 +-
 static/app/scripts/controllers/about.js       |   2 +
 static/app/scripts/controllers/login.js       |  21 ++
 static/app/scripts/services/djangoAuth.js     | 208 ++++++++++++++++++
 static/app/scripts/services/validate.js       |  50 +++++
 static/app/views/login.html                   |  17 ++
 static/test/karma.conf.js                     |   2 +
 29 files changed, 736 insertions(+), 40 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 appuser/migrations/0002_stream_deleted_status.py
 create mode 100644 authentication/__init__.py
 create mode 100644 authentication/admin.py
 create mode 100644 authentication/app_settings.py
 create mode 100644 authentication/migrations/__init__.py
 create mode 100644 authentication/models.py
 create mode 100644 authentication/register/__init__.py
 create mode 100644 authentication/register/views.py
 create mode 100644 authentication/tests.py
 create mode 100644 authentication/urls.py
 create mode 100644 authentication/utils.py
 create mode 100644 authentication/views.py
 create mode 100644 items/migrations/0001_initial.py
 create mode 100644 static/app/scripts/controllers/login.js
 create mode 100755 static/app/scripts/services/djangoAuth.js
 create mode 100755 static/app/scripts/services/validate.js
 create mode 100644 static/app/views/login.html

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/appuser/migrations/0001_initial.py b/appuser/migrations/0001_initial.py
index 74f082e..39cf509 100644
--- a/appuser/migrations/0001_initial.py
+++ b/appuser/migrations/0001_initial.py
@@ -9,6 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('items', '0001_initial'),
     ]
 
     operations = [
@@ -16,8 +17,8 @@ class Migration(migrations.Migration):
             name='Follower',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('followee', models.IntegerField()),
-                ('follower', models.IntegerField()),
+                ('followee', models.ForeignKey(related_name='followee', to=settings.AUTH_USER_MODEL)),
+                ('follower', models.ForeignKey(related_name='follower', to=settings.AUTH_USER_MODEL)),
             ],
             options={
             },
@@ -27,9 +28,10 @@ class Migration(migrations.Migration):
             name='Stream',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('item', models.TextField(max_length=120)),
-                ('created', models.DateField(auto_now_add=True)),
+                ('created', models.DateField(null=True, blank=True)),
                 ('status', models.BooleanField(default=True)),
+                ('deleted_status', models.BooleanField(default=False)),
+                ('item', models.ForeignKey(related_name='item_id', to='items.Item')),
                 ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
             ],
             options={
diff --git a/appuser/migrations/0002_stream_deleted_status.py b/appuser/migrations/0002_stream_deleted_status.py
deleted file mode 100644
index 594b915..0000000
--- a/appuser/migrations/0002_stream_deleted_status.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('appuser', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='stream',
-            name='deleted_status',
-            field=models.BooleanField(default=False),
-            preserve_default=True,
-        ),
-    ]
diff --git a/appuser/models.py b/appuser/models.py
index b9b58a1..604fe35 100644
--- a/appuser/models.py
+++ b/appuser/models.py
@@ -1,11 +1,12 @@
 from django.db import models
 from django.contrib.auth.models import User
+from items.models import Item
 
 # Create your models here.
 
 class Stream(models.Model):
-    item = models.TextField(max_length=120)
-    created = models.DateField(auto_now_add=True)
+    item = models.ForeignKey(Item, related_name='item_id')
+    created = models.DateField(null=True, blank=True)
     status = models.BooleanField(default=True)
     deleted_status = models.BooleanField(default=False)
     user = models.ForeignKey(User)
@@ -15,8 +16,8 @@ def __unicode__(self):
 
 
 class Follower(models.Model):
-    followee = models.IntegerField()
-    follower = models.IntegerField()
+    followee = models.ForeignKey(User, related_name="followee")
+    follower = models.ForeignKey(User, related_name="follower")
 
     def __unicode__(self):
         return u"Followee: {}, Follower: {}".format(self.followee, self.follower)
diff --git a/appuser/views.py b/appuser/views.py
index 69debd4..d9f6c11 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -7,9 +7,12 @@
 
 
 class StreamListCreateAPIView(ListCreateAPIView):
-    queryset = Stream.objects.all()
     serializer_class = StreamSerializer
 
+    def get_queryset(self):
+        user = self.request.user
+        return Stream.objects.filter(user=user)
+
     def post(self, request, *args, **kwargs):
         serializer = StreamSerializer(data=request.data)
         if serializer.is_valid():
diff --git a/authentication/__init__.py b/authentication/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/authentication/admin.py b/authentication/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/authentication/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/authentication/app_settings.py b/authentication/app_settings.py
new file mode 100644
index 0000000..5aa6aa0
--- /dev/null
+++ b/authentication/app_settings.py
@@ -0,0 +1,42 @@
+from django.conf import settings
+
+from rest_auth.serializers import (
+    TokenSerializer as DefaultTokenSerializer,
+    UserDetailsSerializer as DefaultUserDetailsSerializer,
+    LoginSerializer as DefaultLoginSerializer,
+    PasswordResetSerializer as DefaultPasswordResetSerializer,
+    PasswordResetConfirmSerializer as DefaultPasswordResetConfirmSerializer,
+    PasswordChangeSerializer as DefaultPasswordChangeSerializer)
+from .utils import import_callable
+
+
+serializers = getattr(settings, 'REST_AUTH_SERIALIZERS', {})
+
+TokenSerializer = import_callable(
+    serializers.get('TOKEN_SERIALIZER', DefaultTokenSerializer))
+
+UserDetailsSerializer = import_callable(
+    serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer)
+)
+
+LoginSerializer = import_callable(
+    serializers.get('LOGIN_SERIALIZER', DefaultLoginSerializer)
+)
+
+PasswordResetSerializer = import_callable(
+    serializers.get('PASSWORD_RESET_SERIALIZER',
+        DefaultPasswordResetSerializer)
+)
+
+PasswordResetConfirmSerializer = import_callable(
+    serializers.get('PASSWORD_RESET_CONFIRM_SERIALIZER',
+        DefaultPasswordResetConfirmSerializer)
+)
+
+PasswordChangeSerializer = import_callable(
+    serializers.get('PASSWORD_CHANGE_SERIALIZER',
+        DefaultPasswordChangeSerializer)
+)
+
+
+__author__ = 'andy'
diff --git a/authentication/migrations/__init__.py b/authentication/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/authentication/models.py b/authentication/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/authentication/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/authentication/register/__init__.py b/authentication/register/__init__.py
new file mode 100644
index 0000000..45a598f
--- /dev/null
+++ b/authentication/register/__init__.py
@@ -0,0 +1 @@
+__author__ = 'andy'
diff --git a/authentication/register/views.py b/authentication/register/views.py
new file mode 100644
index 0000000..fd999d7
--- /dev/null
+++ b/authentication/register/views.py
@@ -0,0 +1,85 @@
+from django.http import HttpRequest
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.permissions import AllowAny
+from rest_framework import status
+
+from allauth.account.views import SignupView, ConfirmEmailView
+from allauth.account.utils import complete_signup
+from allauth.account import app_settings
+
+from rest_auth.app_settings import UserDetailsSerializer
+from rest_auth.registration.serializers import SocialLoginSerializer
+from rest_auth.views import Login
+
+
+class Register(APIView, SignupView):
+
+    permission_classes = (AllowAny,)
+    user_serializer_class = UserDetailsSerializer
+    allowed_methods = ('POST', 'OPTIONS', 'HEAD')
+
+    def get(self, *args, **kwargs):
+        return Response({}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def put(self, *args, **kwargs):
+        return Response({}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def form_valid(self, form):
+        self.user = form.save(self.request)
+        if isinstance(self.request, HttpRequest):
+            request = self.request
+        else:
+            request = self.request._request
+        return complete_signup(request, self.user,
+                               app_settings.EMAIL_VERIFICATION,
+                               self.get_success_url())
+
+    def post(self, request, *args, **kwargs):
+        self.initial = {}
+        self.request.POST = self.request.DATA.copy()
+        form_class = self.get_form_class()
+        self.form = self.get_form(form_class)
+        if self.form.is_valid():
+            self.form_valid(self.form)
+            return self.get_response()
+        else:
+            return self.get_response_with_errors()
+
+    def get_response(self):
+        serializer = self.user_serializer_class(instance=self.user)
+        return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+    def get_response_with_errors(self):
+        return Response(self.form.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class VerifyEmail(APIView, ConfirmEmailView):
+
+    permission_classes = (AllowAny,)
+    allowed_methods = ('POST', 'OPTIONS', 'HEAD')
+
+    def get(self, *args, **kwargs):
+        return Response({}, status=status.HTTP_405_METHOD_NOT_ALLOWED)
+
+    def post(self, request, *args, **kwargs):
+        self.kwargs['key'] = self.request.DATA.get('key', '')
+        confirmation = self.get_object()
+        confirmation.confirm(self.request)
+        return Response({'message': 'ok'}, status=status.HTTP_200_OK)
+
+
+class SocialLogin(Login):
+    """
+    class used for social authentications
+    example usage for facebook
+
+    from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
+    class FacebookLogin(SocialLogin):
+        adapter_class = FacebookOAuth2Adapter
+    """
+
+    serializer_class = SocialLoginSerializer
+
+
+__author__ = 'andy'
diff --git a/authentication/tests.py b/authentication/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/authentication/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/authentication/urls.py b/authentication/urls.py
new file mode 100644
index 0000000..947ae75
--- /dev/null
+++ b/authentication/urls.py
@@ -0,0 +1,20 @@
+from django.conf.urls import patterns, url
+from django.contrib import admin
+import appuser.urls as user_urls
+from authentication.views import Facebooklogin, Login, Logout, PasswordChange, UserDetails
+from register.views import Register
+admin.autodiscover()
+
+urlpatterns = patterns('',
+    # Examples:
+    # url(r'^$', 'declutter.views.home', name='home'),
+    # url(r'^blog/', include('blog.urls')),
+    url(r'^facebook/$', Facebooklogin.as_view(), name='fb_login'),
+    url(r'^login/$', Login.as_view(), name='login'),
+    url(r'^logout/$', Logout.as_view(), name='logout'),
+    url(r'^register/$', Register.as_view(), name='register')
+)
+
+
+
+__author__ = 'andy'
diff --git a/authentication/utils.py b/authentication/utils.py
new file mode 100644
index 0000000..8daa11d
--- /dev/null
+++ b/authentication/utils.py
@@ -0,0 +1,13 @@
+from six import string_types
+from django.utils.importlib import import_module
+
+
+def import_callable(path_or_callable):
+    if hasattr(path_or_callable, '__call__'):
+        return path_or_callable
+    else:
+        assert isinstance(path_or_callable, string_types)
+        package, attr = path_or_callable.rsplit('.', 1)
+        return getattr(import_module(package), attr)
+
+__author__ = 'andy'
diff --git a/authentication/views.py b/authentication/views.py
new file mode 100644
index 0000000..7ec7087
--- /dev/null
+++ b/authentication/views.py
@@ -0,0 +1,169 @@
+from allauth.socialaccount.providers.facebook.views import FacebookOAuth2Adapter
+from rest_auth.registration.views import SocialLogin
+
+from django.contrib.auth import login, logout
+from django.conf import settings
+
+from rest_framework import status
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework.generics import GenericAPIView
+from rest_framework.permissions import IsAuthenticated, AllowAny
+from rest_framework.authtoken.models import Token
+from rest_framework.generics import RetrieveUpdateAPIView
+
+from .app_settings import (TokenSerializer, UserDetailsSerializer,
+    LoginSerializer, PasswordResetSerializer, PasswordResetConfirmSerializer,
+    PasswordChangeSerializer)
+
+
+class Login(GenericAPIView):
+
+    """
+    Check the credentials and return the REST Token
+    if the credentials are valid and authenticated.
+    Calls Django Auth login method to register User ID
+    in Django session framework
+
+    Accept the following POST parameters: username, password
+    Return the REST Framework Token Object's key.
+    """
+    permission_classes = (AllowAny,)
+    serializer_class = LoginSerializer
+    token_model = Token
+    response_serializer = TokenSerializer
+
+    def login(self):
+        # import ipdb; ipdb.set_trace()
+        self.user = self.serializer.validated_data['user']
+        self.token, created = self.token_model.objects.get_or_create(
+            user=self.user)
+        if getattr(settings, 'REST_SESSION_LOGIN', True):
+            login(self.request, self.user)
+
+    def get_response(self):
+        return Response(self.response_serializer(self.token).data,
+            status=status.HTTP_200_OK)
+
+    def get_error_response(self):
+        return Response(self.serializer.errors,
+            status=status.HTTP_400_BAD_REQUEST)
+
+    def post(self, request, *args, **kwargs):
+        self.serializer = self.get_serializer(data=self.request.DATA)
+        if not self.serializer.is_valid():
+            return self.get_error_response()
+        self.login()
+        return self.get_response()
+
+
+class Logout(APIView):
+
+    """
+    Calls Django logout method and delete the Token object
+    assigned to the current User object.
+
+    Accepts/Returns nothing.
+    """
+    permission_classes = (AllowAny,)
+
+    def post(self, request):
+        try:
+            request.user.auth_token.delete()
+        except:
+            pass
+
+        logout(request)
+
+        return Response({"success": "Successfully logged out."},
+                        status=status.HTTP_200_OK)
+
+
+class UserDetails(RetrieveUpdateAPIView):
+
+    """
+    Returns User's details in JSON format.
+
+    Accepts the following GET parameters: token
+    Accepts the following POST parameters:
+        Required: token
+        Optional: email, first_name, last_name and UserProfile fields
+    Returns the updated UserProfile and/or User object.
+    """
+    serializer_class = UserDetailsSerializer
+    permission_classes = (IsAuthenticated,)
+
+    def get_object(self):
+        return self.request.user
+
+
+class PasswordReset(GenericAPIView):
+
+    """
+    Calls Django Auth PasswordResetForm save method.
+
+    Accepts the following POST parameters: email
+    Returns the success/fail message.
+    """
+
+    serializer_class = PasswordResetSerializer
+    permission_classes = (AllowAny,)
+
+    def post(self, request, *args, **kwargs):
+        # Create a serializer with request.DATA
+        serializer = self.get_serializer(data=request.DATA)
+
+        if not serializer.is_valid():
+            return Response(serializer.errors,
+                            status=status.HTTP_400_BAD_REQUEST)
+        serializer.save()
+        # Return the success message with OK HTTP status
+        return Response({"success": "Password reset e-mail has been sent."},
+                         status=status.HTTP_200_OK)
+
+
+class PasswordResetConfirm(GenericAPIView):
+
+    """
+    Password reset e-mail link is confirmed, therefore this resets the user's password.
+
+    Accepts the following POST parameters: new_password1, new_password2
+    Accepts the following Django URL arguments: token, uid
+    Returns the success/fail message.
+    """
+
+    serializer_class = PasswordResetConfirmSerializer
+    permission_classes = (AllowAny,)
+
+    def post(self, request):
+        serializer = self.get_serializer(data=request.DATA)
+        if not serializer.is_valid():
+            return Response(serializer.errors,
+                status=status.HTTP_400_BAD_REQUEST)
+        serializer.save()
+        return Response({"success": "Password has been reset with the new password."})
+
+
+class PasswordChange(GenericAPIView):
+
+    """
+    Calls Django Auth SetPasswordForm save method.
+
+    Accepts the following POST parameters: new_password1, new_password2
+    Returns the success/fail message.
+    """
+
+    serializer_class = PasswordChangeSerializer
+    permission_classes = (IsAuthenticated,)
+
+    def post(self, request):
+        serializer = self.get_serializer(data=request.DATA)
+        if not serializer.is_valid():
+            return Response(serializer.errors,
+                status=status.HTTP_400_BAD_REQUEST)
+        serializer.save()
+        return Response({"success": "New password has been saved."})
+
+#Facebook
+class Facebooklogin(SocialLogin):
+    adapter_class = FacebookOAuth2Adapter
diff --git a/declutter/settings.py b/declutter/settings.py
index c88e294..22a0d4c 100644
--- a/declutter/settings.py
+++ b/declutter/settings.py
@@ -36,15 +36,23 @@
 
 INSTALLED_APPS = (
     'django.contrib.staticfiles',
+    'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'rest_framework',
+    'rest_framework.authtoken',
+    'allauth',
+    'allauth.account',
+    'rest_auth.registration',
     'appuser',
     'items',
-    'debug_toolbar'
+    'debug_toolbar',
+    'rest_auth',
+    'allauth.socialaccount',
+    'allauth.socialaccount.providers.facebook'
 )
 
 MIDDLEWARE_CLASSES = (
@@ -61,6 +69,19 @@
 
 WSGI_APPLICATION = 'declutter.wsgi.application'
 
+#For Django-allauth Template Context Processor Settings
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.request",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.contrib.messages.context_processors.messages",
+    "allauth.socialaccount.context_processors.socialaccount"
+)
+
 
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
@@ -103,6 +124,7 @@
     )
 }
 
+SITE_ID = 1
 
 #EMAIL settings
 EMAIL_USE_TLS = True
diff --git a/declutter/urls.py b/declutter/urls.py
index cd6ad8f..8b8c5bd 100644
--- a/declutter/urls.py
+++ b/declutter/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 import appuser.urls as user_urls
+from authentication.views import Facebooklogin
 admin.autodiscover()
 
 urlpatterns = patterns('',
@@ -10,4 +11,7 @@
     url(r'^api/appuser/', include(user_urls)),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^api/items/', include('items.api.urls')),
+    url(r'^api/rest-auth/', include('authentication.urls')),
+    url(r'^api/rest-auth/registration/', include('rest_auth.registration.urls')),
+    url(r'^api/rest_auth/facebook/$', Facebooklogin.as_view(), name='fb_login')
 )
diff --git a/declutter_db.sqlite3 b/declutter_db.sqlite3
index fb565289e65a5a0b3994ac696c05b1eeeb107fc9..e3ee6b855cf4d8dc3cb90c0eca8404ee16b89cf2 100644
GIT binary patch
literal 262144
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
AI{*Lx

literal 167936
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

diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
new file mode 100644
index 0000000..0fd22f3
--- /dev/null
+++ b/items/migrations/0001_initial.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('poster_id', models.IntegerField()),
+                ('claimer_id', models.IntegerField()),
+                ('item_name', models.CharField(max_length=100)),
+                ('description', models.TextField(max_length=500)),
+                ('created', models.DateField(auto_now_add=True)),
+                ('image', models.CharField(max_length=100, null=True, blank=True)),
+                ('availability', models.BooleanField(default=True)),
+                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
+            ],
+            options={
+                'verbose_name': 'Item',
+                'verbose_name_plural': 'Items',
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/requirements.txt b/requirements.txt
index b75b658..87106c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,13 @@
 Django==1.7.4
+django-allauth==0.19.1
 django-debug-toolbar==1.2.2
 django-filter==0.9.2
+django-rest-auth==0.3.4
 djangorestframework==3.0.5
 Markdown==2.6
+oauthlib==0.7.2
+python-openid==2.2.5
+requests==2.5.3
+requests-oauthlib==0.4.2
+six==1.9.0
 sqlparse==0.1.14
diff --git a/static/app/index.html b/static/app/index.html
index 4f80e08..ff679c6 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -8,6 +8,7 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(.) styles/vendor.css -->
     <!-- bower:css -->
+    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -71,7 +72,9 @@
 
     <!-- build:js(.) scripts/vendor.js -->
     <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/angular-animate/angular-animate.js"></script>
     <script src="bower_components/angular-cookies/angular-cookies.js"></script>
     <script src="bower_components/angular-resource/angular-resource.js"></script>
@@ -83,8 +86,11 @@
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
         <script src="scripts/app.js"></script>
+        <script src="scripts/services/djangoAuth.js"></script>
+        <script src="scripts/services/validate.js"></script>
         <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
+        <script src="scripts/controllers/login.js"></script>
         <!-- endbuild -->
 </body>
 </html>
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 074c099..d281806 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -28,43 +28,43 @@ angular
         controller: 'AboutCtrl'
       })
       .when('/login', {
-            templateURL: 'views/login.html',
+            templateUrl: 'views/login.html',
             controller: 'LoginCtrl'
         })
         .when('/logout', {
-            templateURL: 'views/logout.html',
+            templateUrl: 'views/logout.html',
             controller: 'LogoutCtrl'
         })
         .when('/register', {
-            templateURL: 'views/register.html',
+            templateUrl: 'views/register.html',
             controller: 'RegisterCtrl'
         })
         .when('/friendscrap', {
-            templateURL: 'views/friendscrap.html',
+            templateUrl: 'views/friendscrap.html',
             controller: 'FriendscrapCtrl'
         })
         .when('/mycrap', {
-            templateURL: 'views/mycrap.html',
+            templateUrl: 'views/mycrap.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/myclaimed', {
-            templateURL: 'views/myclaimed.html',
+            templateUrl: 'views/myclaimed.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/postitem', {
-            templateURL: 'views/postitem.html',
+            templateUrl: 'views/postitem.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/:item', {
-            templateURL: 'views/edititem.html',
+            templateUrl: 'views/edititem.html',
             controller: 'MycrapCtrl'
         })
         .when('/myfriends', {
-            templateURL: 'views/myfriends.html',
+            templateUrl: 'views/myfriends.html',
             controller: 'MyfriendsCtrl'
         })
         .when('/myfriends/addfriend', {
-            templateURL: 'views/addfriend.html',
+            templateUrl: 'views/addfriend.html',
             controller: 'MyfriendsCtrl'
         })
       .otherwise({
diff --git a/static/app/scripts/controllers/about.js b/static/app/scripts/controllers/about.js
index 1159518..2a72572 100644
--- a/static/app/scripts/controllers/about.js
+++ b/static/app/scripts/controllers/about.js
@@ -14,4 +14,6 @@ angular.module('declutterApp')
       'AngularJS',
       'Karma'
     ];
+
+    console.log('AboutCtrl loaded');
   });
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
new file mode 100644
index 0000000..17fd207
--- /dev/null
+++ b/static/app/scripts/controllers/login.js
@@ -0,0 +1,21 @@
+'use strict';
+
+angular.module('declutterApp')
+  .controller('LoginCtrl', function ($scope, $location, djangoAuth, Validate) {
+    $scope.model = {'username':'','password':''};
+  	$scope.complete = false;
+    $scope.login = function(formData){
+      $scope.errors = [];
+      Validate.form_validation(formData,$scope.errors);
+      if(!formData.$invalid){
+        djangoAuth.login($scope.model.username, $scope.model.password)
+        .then(function(data){
+        	// success case
+        	$location.path("/");
+        },function(data){
+        	// error case
+        	$scope.errors = data;
+        });
+      }
+    }
+  });
diff --git a/static/app/scripts/services/djangoAuth.js b/static/app/scripts/services/djangoAuth.js
new file mode 100755
index 0000000..a4fa8a6
--- /dev/null
+++ b/static/app/scripts/services/djangoAuth.js
@@ -0,0 +1,208 @@
+'use strict';
+
+angular.module('declutterApp')
+  .service('djangoAuth', function djangoAuth($q, $http, $cookies, $rootScope) {
+    // AngularJS will instantiate a singleton by calling "new" on this function
+    var service = {
+        /* START CUSTOMIZATION HERE */
+        // Change this to point to your Django REST Auth API
+        // e.g. /api/rest-auth  (DO NOT INCLUDE ENDING SLASH)
+        'API_URL': '/api/rest-auth',
+        // Set use_session to true to use Django sessions to store security token.
+        // Set use_session to false to store the security token locally and transmit it as a custom header.
+        'use_session': true,
+        /* END OF CUSTOMIZATION */
+        'authenticated': null,
+        'authPromise': null,
+        'request': function(args) {
+            // Let's retrieve the token from the cookie, if available
+            if($cookies.token){
+                $http.defaults.headers.common.Authorization = 'Token ' + $cookies.token;
+            }
+            // Continue
+            params = args.params || {}
+            args = args || {};
+            var deferred = $q.defer(),
+                url = this.API_URL + args.url,
+                method = args.method || "GET",
+                params = params,
+                data = args.data || {};
+            // Fire the request, as configured.
+            $http({
+                url: url,
+                withCredentials: this.use_session,
+                method: method.toUpperCase(),
+                headers: {'X-CSRFToken': $cookies['csrftoken']},
+                params: params,
+                data: data
+            })
+            .success(angular.bind(this,function(data, status, headers, config) {
+                deferred.resolve(data, status);
+            }))
+            .error(angular.bind(this,function(data, status, headers, config) {
+                console.log("error syncing with: " + url);
+                // Set request status
+                if(data){
+                    data.status = status;
+                }
+                if(status == 0){
+                    if(data == ""){
+                        data = {};
+                        data['status'] = 0;
+                        data['non_field_errors'] = ["Could not connect. Please try again."];
+                    }
+                    // or if the data is null, then there was a timeout.
+                    if(data == null){
+                        // Inject a non field error alerting the user
+                        // that there's been a timeout error.
+                        data = {};
+                        data['status'] = 0;
+                        data['non_field_errors'] = ["Server timed out. Please try again."];
+                    }
+                }
+                deferred.reject(data, status, headers, config);
+            }));
+            return deferred.promise;
+        },
+        'register': function(username,password1,password2,email,more){
+            var data = {
+                'username':username,
+                'password1':password1,
+                'password2':password2,
+                'email':email
+            }
+            data = angular.extend(data,more);
+            return this.request({
+                'method': "POST",
+                'url': "/registration/",
+                'data' :data
+            });
+        },
+        'login': function(username,password){
+            var djangoAuth = this;
+            return this.request({
+                'method': "POST",
+                'url': "/login/",
+                'data':{
+                    'username':username,
+                    'password':password
+                }
+            }).then(function(data){
+                if(!djangoAuth.use_session){
+                    $http.defaults.headers.common.Authorization = 'Token ' + data.key;
+                    $cookies.token = data.key;
+                }
+                djangoAuth.authenticated = true;
+                $rootScope.$broadcast("djangoAuth.logged_in", data);
+            });
+        },
+        'logout': function(){
+            var djangoAuth = this;
+            return this.request({
+                'method': "POST",
+                'url': "/logout/"
+            }).then(function(data){
+                delete $http.defaults.headers.common.Authorization;
+                delete $cookies.token;
+                djangoAuth.authenticated = false;
+                $rootScope.$broadcast("djangoAuth.logged_out");
+            });
+        },
+        'changePassword': function(password1,password2){
+            return this.request({
+                'method': "POST",
+                'url': "/password/change/",
+                'data':{
+                    'new_password1':password1,
+                    'new_password2':password2
+                }
+            });
+        },
+        'resetPassword': function(email){
+            return this.request({
+                'method': "POST",
+                'url': "/password/reset/",
+                'data':{
+                    'email':email
+                }
+            });
+        },
+        'profile': function(){
+            return this.request({
+                'method': "GET",
+                'url': "/user/"
+            }); 
+        },
+        'updateProfile': function(data){
+            return this.request({
+                'method': "PATCH",
+                'url': "/user/",
+                'data':data
+            }); 
+        },
+        'verify': function(key){
+            return this.request({
+                'method': "POST",
+                'url': "/registration/verify-email/",
+                'data': {'key': key} 
+            });            
+        },
+        'confirmReset': function(uid,token,password1,password2){
+            return this.request({
+                'method': "POST",
+                'url': "/password/reset/confirm/",
+                'data':{
+                    'uid': uid,
+                    'token': token,
+                    'new_password1':password1,
+                    'new_password2':password2
+                }
+            });
+        },
+        'authenticationStatus': function(restrict, force){
+            // Set restrict to true to reject the promise if not logged in
+            // Set to false or omit to resolve when status is known
+            // Set force to true to ignore stored value and query API
+            restrict = restrict || false;
+            force = force || false;
+            if(this.authPromise == null || force){
+                this.authPromise = this.request({
+                    'method': "GET",
+                    'url': "/user/"
+                })
+            }
+            var da = this;
+            var getAuthStatus = $q.defer();
+            if(this.authenticated != null && !force){
+                // We have a stored value which means we can pass it back right away.
+                if(this.authenticated == false && restrict){
+                    getAuthStatus.reject("User is not logged in.");
+                }else{
+                    getAuthStatus.resolve();
+                }
+            }else{
+                // There isn't a stored value, or we're forcing a request back to
+                // the API to get the authentication status.
+                this.authPromise.then(function(){
+                    da.authenticated = true;
+                    getAuthStatus.resolve();
+                },function(){
+                    da.authenticated = false;
+                    if(restrict){
+                        getAuthStatus.reject("User is not logged in.");
+                    }else{
+                        getAuthStatus.resolve();
+                    }
+                });
+            }
+            return getAuthStatus.promise;
+        },
+        'initialize': function(url, sessions){
+            this.API_URL = url;
+            this.use_session = sessions;
+            return this.authenticationStatus();
+        }
+
+    }
+    return service;
+  });
diff --git a/static/app/scripts/services/validate.js b/static/app/scripts/services/validate.js
new file mode 100755
index 0000000..1d18842
--- /dev/null
+++ b/static/app/scripts/services/validate.js
@@ -0,0 +1,50 @@
+'use strict';
+
+angular.module('declutterApp')
+  .service('Validate', function Validate() {
+    return {
+        'message': {
+            'minlength': 'This value is not long enough.',
+            'maxlength': 'This value is too long.',
+            'email': 'A properly formatted email address is required.',
+            'required': 'This field is required.'
+        },
+        'more_messages': {
+            'demo': {
+                'required': 'Here is a sample alternative required message.'
+            }
+        },
+        'check_more_messages': function(name,error){
+            return (this.more_messages[name] || [])[error] || null;
+        },
+        validation_messages: function(field,form,error_bin){
+            var messages = [];
+            for(var e in form[field].$error){
+                if(form[field].$error[e]){
+                    var special_message = this.check_more_messages(field,e);
+                    if(special_message){
+                        messages.push(special_message);
+                    }else if(this.message[e]){
+                        messages.push(this.message[e]);
+                    }else{
+                        messages.push("Error: " + e)
+                    }
+                }
+            }
+            var deduped_messages = [];
+            angular.forEach(messages, function(el, i){
+                if(deduped_messages.indexOf(el) === -1) deduped_messages.push(el);
+            });
+            if(error_bin){
+                error_bin[field] = deduped_messages;
+            }
+        },
+        'form_validation': function(form,error_bin){
+            for(var field in form){
+                if(field.substr(0,1) != "$"){
+                    this.validation_messages(field,form,error_bin);
+                }
+            }
+        }
+    }
+});
\ No newline at end of file
diff --git a/static/app/views/login.html b/static/app/views/login.html
new file mode 100644
index 0000000..13febf8
--- /dev/null
+++ b/static/app/views/login.html
@@ -0,0 +1,17 @@
+<div id="login_view" ng-controller="LoginCtrl">
+  <form role="form" ng-submit="login(loginForm)" name="loginForm" novalidate>
+    <div class="form-group">
+      <label for="id_username">Username</label>
+      <input name="username" id="id_username" type="text" ng-model="model.username" placeholder="Username" class="form-control" required />
+    </div>
+    <div class="alert alert-danger" ng-repeat="error in errors.username">{{error}}</div>
+    <div class="form-group">
+      <label for="id_password">Password</label>
+      <input name="password" id="id_password" type="password" ng-model="model.password" placeholder="Password" class="form-control" required />
+    </div>
+    <div class="alert alert-danger" ng-repeat="error in errors.password">{{error}}</div>
+    <div class="alert alert-danger" ng-repeat="error in errors.non_field_errors">{{error}}</div>
+    <div class="alert alert-danger" ng-if="error">{{error}}</div>
+    <button type="submit" class="btn btn-primary">Login</button>
+  </form>
+</div>
diff --git a/static/test/karma.conf.js b/static/test/karma.conf.js
index 7483b46..9d99a1d 100644
--- a/static/test/karma.conf.js
+++ b/static/test/karma.conf.js
@@ -19,7 +19,9 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // bower:js
+      'bower_components/jquery/dist/jquery.js',
       'bower_components/angular/angular.js',
+      'bower_components/bootstrap/dist/js/bootstrap.js',
       'bower_components/angular-animate/angular-animate.js',
       'bower_components/angular-cookies/angular-cookies.js',
       'bower_components/angular-resource/angular-resource.js',

From 296e2172fefa80c5a17efee8c01a665847c53b45 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Wed, 25 Feb 2015 09:52:49 -0800
Subject: [PATCH 03/43] Registration, login, logout implemented on both front
 and backend

---
 declutter_db.sqlite3                       | Bin 262144 -> 262144 bytes
 static/app/index.html                      |   1 +
 static/app/scripts/controllers/logout.js   |   6 ++++
 static/app/scripts/controllers/register.js |  22 +++++++++++++++
 static/app/views/logout.html               |   3 ++
 static/app/views/register.html             |  31 +++++++++++++++++++++
 6 files changed, 63 insertions(+)
 create mode 100755 static/app/scripts/controllers/logout.js
 create mode 100644 static/app/scripts/controllers/register.js
 create mode 100755 static/app/views/logout.html
 create mode 100644 static/app/views/register.html

diff --git a/declutter_db.sqlite3 b/declutter_db.sqlite3
index e3ee6b855cf4d8dc3cb90c0eca8404ee16b89cf2..1807312a98d17937181bb9a6bd5f3dc2041f7450 100644
GIT binary patch
delta 6396
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

delta 396
zcmXYsze^io9LC=tr+8xWoVMc7LQZf{1Wj_+YBDJuYQQMEWe|-d=#?sGOh_seUWgz#
zMFSpmD%U_aMGw4)h=Q9qC^+k1AcBiaAijv>^L(D~!}AqF6GE$eq7yrxztM@qg<9xi
z8)5`8+`>Z@MJ!<!&t9k9i<TbB4eHPn`k^{A{HMEJ&HPBOE_J9pq^1k`<@v&THg^<O
zL@Py#ASI8cQB9p&!O?g$5;x7E$cSl-nAMweQ$}70US#AEY8&rS)0q`()wRctHLBSE
z6kGqV{H405*o}}YG*^UOp}Q5$t>|x3I}(Z}OX>u5S+WnOe!wQBaYt|`jVtg$KIfbr
zuz|e`rby5rX!xBs{25)Gt7?D{!h#7BOrRXN_IfoM=tr5xljYyz*>o|Mv5b6aBUdmY
zKR1@6*;4dZ?u%72z8Y3!(O<h~t+eC)r&!c5!+zqPozixOU4mWs@a2Y0D1AIho$Uvv
dJI7CKO5z&9C2FWiya(rdlVQtiGRJH3<SY5)d7J<M

diff --git a/static/app/index.html b/static/app/index.html
index ff679c6..6a1a415 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -91,6 +91,7 @@
         <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
         <script src="scripts/controllers/login.js"></script>
+        <script src="scripts/controllers/register.js"></script>
         <!-- endbuild -->
 </body>
 </html>
diff --git a/static/app/scripts/controllers/logout.js b/static/app/scripts/controllers/logout.js
new file mode 100755
index 0000000..1d0e326
--- /dev/null
+++ b/static/app/scripts/controllers/logout.js
@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('declutterApp')
+  .controller('LogoutCtrl', function ($scope, $location, djangoAuth) {
+    djangoAuth.logout();
+  });
diff --git a/static/app/scripts/controllers/register.js b/static/app/scripts/controllers/register.js
new file mode 100644
index 0000000..e9530a8
--- /dev/null
+++ b/static/app/scripts/controllers/register.js
@@ -0,0 +1,22 @@
+'use strict';
+
+angular.module('declutterApp')
+  .controller('RegisterCtrl', function ($scope, $location, djangoAuth, Validate) {
+  	$scope.model = {'username':'','password':'','email':''};
+  	$scope.complete = false;
+    $scope.register = function(formData){
+      $scope.errors = [];
+      Validate.form_validation(formData,$scope.errors);
+      if(!formData.$invalid){
+        djangoAuth.register($scope.model.username,$scope.model.password1,$scope.model.password2,$scope.model.email)
+        .then(function(data){
+        	// success case
+        	$scope.complete = true;
+          $location.path("/");
+        },function(data){
+        	// error case
+        	$scope.errors = data;
+        });
+      }
+    }
+  });
diff --git a/static/app/views/logout.html b/static/app/views/logout.html
new file mode 100755
index 0000000..d1d8689
--- /dev/null
+++ b/static/app/views/logout.html
@@ -0,0 +1,3 @@
+<div id="logout_view" ng-controller="LogoutCtrl">
+	<div class="alert alert-info">You have logged out.</div>
+</div>
\ No newline at end of file
diff --git a/static/app/views/register.html b/static/app/views/register.html
new file mode 100644
index 0000000..c77d0b2
--- /dev/null
+++ b/static/app/views/register.html
@@ -0,0 +1,31 @@
+<div id="register_view" ng-controller="RegisterCtrl">
+    <div ng-if="complete == false">
+        <form role="form" ng-if="authenticated != true" name="registerForm" ng-submit="register(registerForm)" novalidate>
+            <div class="form-group">
+                <label for="id_username">Username</label>
+                <input name="username" id="id_username" class="form-control" type="text" ng-model="model.username" placeholder="Username" required />
+            </div>
+            <div class="alert alert-danger" ng-repeat="error in errors.username">{{error}}</div>
+            <div class="form-group">
+                <label for="id_password">Password</label>
+                <input name="password1" id="id_password1" class="form-control" type="password" ng-model="model.password1" placeholder="Password" required />
+            </div>
+            <div class="alert alert-danger" ng-repeat="error in errors.password1">{{error}}</div>
+            <div class="form-group">
+                <label for="id_password">Repeat Password</label>
+                <input name="password" id="id_password2" class="form-control" type="password" ng-model="model.password2" placeholder="Repeat Password" required />
+            </div>
+            <div class="alert alert-danger" ng-repeat="error in errors.password2">{{error}}</div>
+            <div class="form-group">
+                <label for="id_email">Email</label>
+                <input name="email" id="id_email" class="form-control" type="email" ng-model="model.email" placeholder="Email" required />
+            </div>
+            <div class="alert alert-danger" ng-repeat="error in errors.email">{{error}}</div>
+            <button ng-hide="authenticated" type="submit" class="btn btn-primary">Register</button>
+        </form>
+        <p ng-if="authenticated">You are already logged in!  You don't need to register.</p>
+    </div>
+    <div ng-if="complete == true">
+        <div class="alert alert-success">Great!  You've just registered.  You should receive an email shortly with instructions on how to activate your account.</div>
+    </div>
+</div>
\ No newline at end of file

From b54ca17e535092fba348b4a429294cf7e4019eec Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Wed, 25 Feb 2015 09:54:36 -0800
Subject: [PATCH 04/43] model updates, front end set up

---
 .DS_Store                                   | Bin 0 -> 6148 bytes
 declutter_db.sqlite3                        | Bin 167936 -> 48128 bytes
 items/api/serializers.py                    |  11 ++-
 items/api/urls.py                           |   5 +-
 items/api/views.py                          |  24 +++++--
 items/migrations/0001_initial.py            |  34 ++++++++++
 items/migrations/0002_auto_20150225_0129.py |  24 +++++++
 items/models.py                             |   5 +-
 static/.tmp/styles/main.css                 |   6 +-
 static/app/images/noun_28242_cc.png         | Bin 0 -> 33861 bytes
 static/app/index.html                       |  16 ++++-
 static/app/scripts/app.js                   |  32 ++++-----
 static/app/scripts/controllers/mycrap.js    |  71 ++++++++++++++++++++
 static/app/scripts/controllers/myfriends.js |  10 +++
 static/app/styles/main.css                  |   4 ++
 static/app/views/addfriend.html             |  14 ++++
 static/app/views/main.html                  |  18 ++---
 static/app/views/myclaimed.html             |  10 +++
 static/app/views/mycrap.html                |  43 ++++++++++++
 static/app/views/myfriends.html             |  32 +++++++++
 static/app/views/postitem.html              |  28 ++++++++
 static/test/karma.conf.js                   |   2 +
 22 files changed, 345 insertions(+), 44 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 items/migrations/0001_initial.py
 create mode 100644 items/migrations/0002_auto_20150225_0129.py
 create mode 100644 static/app/images/noun_28242_cc.png
 create mode 100644 static/app/scripts/controllers/mycrap.js
 create mode 100644 static/app/scripts/controllers/myfriends.js
 create mode 100644 static/app/views/addfriend.html
 create mode 100644 static/app/views/myclaimed.html
 create mode 100644 static/app/views/mycrap.html
 create mode 100644 static/app/views/myfriends.html
 create mode 100644 static/app/views/postitem.html

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/declutter_db.sqlite3 b/declutter_db.sqlite3
index fb565289e65a5a0b3994ac696c05b1eeeb107fc9..c51ecdd78ee44d7cf8a3938bf2b7f41cff02dd4e 100644
GIT binary patch
delta 5436
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

literal 167936
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

diff --git a/items/api/serializers.py b/items/api/serializers.py
index 2d06f1f..a7d1323 100644
--- a/items/api/serializers.py
+++ b/items/api/serializers.py
@@ -1,10 +1,19 @@
 from rest_framework import serializers
+from django.contrib.auth.models import User
 from items.models import Item
 
 
+class UserSerialize(serializers.ModelSerializer):
+
+    class Meta:
+        model = User
+
+
 class ItemSerializer(serializers.ModelSerializer):
+    poster = UserSerialize(read_only=True)
+    claimer = UserSerialize(read_only=True)
 
     class Meta:
         model = Item
-        fields = ("id", "poster_id", "claimer_id", "item_name", "description", "created", "image", "availability", "category")
+        fields = ("id", "poster", "claimer", "item_name", "description", "created", "image", "availability", "category")
 
diff --git a/items/api/urls.py b/items/api/urls.py
index aaefe35..4da2d76 100644
--- a/items/api/urls.py
+++ b/items/api/urls.py
@@ -1,5 +1,6 @@
 from django.conf.urls import patterns, url
-from views import ItemListAPIView, ItemDetailAPIView, ItemCreateAPIView, ItemGenericListAPIView, ItemGenericRetrieveUpdateAPIView
+from views import ItemListAPIView, ItemDetailAPIView, ItemCreateAPIView, ItemGenericListAPIView, ItemGenericRetrieveUpdateAPIView, ItemListCreateAPIView, \
+    ClaimItemListCreateAPIView
 
 urlpatterns = patterns('',
     url(r'^$', ItemListAPIView.as_view(), name='ItemListAPIView'),
@@ -7,4 +8,6 @@
     url(r'^create/$', ItemCreateAPIView.as_view()),
     url(r'^list/$', ItemGenericListAPIView.as_view()),
     url(r'^generics/id/(?P<id>\d+)/$', ItemGenericRetrieveUpdateAPIView.as_view(), name="item-generic-single"),
+    url(r'^poster/(?P<poster>\d+)/$', ItemListCreateAPIView.as_view()),
+    url(r'^claimer/(?P<claimer>\d+)/$', ClaimItemListCreateAPIView.as_view()),
 )
\ No newline at end of file
diff --git a/items/api/views.py b/items/api/views.py
index 5a9cd6e..d405946 100644
--- a/items/api/views.py
+++ b/items/api/views.py
@@ -1,6 +1,6 @@
 from rest_framework.views import APIView, Response
 from rest_framework import status
-from rest_framework.generics import CreateAPIView, ListAPIView, RetrieveUpdateAPIView
+from rest_framework.generics import CreateAPIView, ListAPIView, RetrieveUpdateAPIView, ListCreateAPIView
 from items.api.serializers import ItemSerializer
 from items.models import Item
 
@@ -32,7 +32,7 @@ def put(self, request, item_id, *args):
         serializer = ItemSerializer(data=request.data)
         if serializer.is_valid():
 
-            serializer.save()
+            serializer.save(poster=request.user)
             return Response(serializer.data, status.HTTP_202_ACCEPTED)
 
         else:
@@ -46,7 +46,7 @@ def create(self, request, *args):
         serializer = ItemSerializer(data=request.data)
         if serializer.is_valid():
 
-            serializer.save()
+            serializer.save(poster=request.user)
             return Response(serializer.data, status.HTTP_201_CREATED)
 
         else:
@@ -67,4 +67,20 @@ class ItemGenericRetrieveUpdateAPIView(RetrieveUpdateAPIView):
     lookup_field = 'id'
 
     def get_queryset(self):
-        return Item.objects.all()
\ No newline at end of file
+        return Item.objects.all()
+
+
+class ItemListCreateAPIView(ListCreateAPIView):
+   serializer_class = ItemSerializer
+
+   def get_queryset(self):
+       user = self.request.user
+       return Item.objects.filter(poster=user)
+
+
+class ClaimItemListCreateAPIView(ListCreateAPIView):
+    serializer_class = ItemSerializer
+
+    def get_queryset(self):
+        user = self.request.user
+        return Item.Objects.filter(claimer=user)
\ No newline at end of file
diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
new file mode 100644
index 0000000..3deb5bb
--- /dev/null
+++ b/items/migrations/0001_initial.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('item_name', models.CharField(max_length=100)),
+                ('description', models.TextField(max_length=500)),
+                ('created', models.DateField(auto_now_add=True)),
+                ('image', models.CharField(max_length=100, null=True, blank=True)),
+                ('availability', models.BooleanField(default=True)),
+                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
+                ('claimer_id', models.ForeignKey(related_name='claimed_items', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('poster_id', models.ForeignKey(related_name='posted_items', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Item',
+                'verbose_name_plural': 'Items',
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/items/migrations/0002_auto_20150225_0129.py b/items/migrations/0002_auto_20150225_0129.py
new file mode 100644
index 0000000..81d7a33
--- /dev/null
+++ b/items/migrations/0002_auto_20150225_0129.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('items', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='item',
+            old_name='claimer_id',
+            new_name='claimer',
+        ),
+        migrations.RenameField(
+            model_name='item',
+            old_name='poster_id',
+            new_name='poster',
+        ),
+    ]
diff --git a/items/models.py b/items/models.py
index a384dd2..1c6106d 100644
--- a/items/models.py
+++ b/items/models.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.models import User
 from django.db import models
 
 # Create your models here.
@@ -20,8 +21,8 @@ class Meta:
         ('AUTOMOTIVE', 'Automotive'),
     )
 
-    poster_id = models.IntegerField()
-    claimer_id = models.IntegerField()
+    poster = models.ForeignKey(User, related_name="posted_items")
+    claimer = models.ForeignKey(User, null=True, blank=True, related_name="claimed_items")
     item_name = models.CharField(max_length=100)
     description = models.TextField(max_length=500)
     created = models.DateField(auto_now_add=True)
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index af74efc..bfaf811 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -80,6 +80,8 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
-}
 
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG59XG4iXX0= */
\ No newline at end of file
+  .other-color{
+      background: #f0ac1d;
+  }
+}
\ No newline at end of file
diff --git a/static/app/images/noun_28242_cc.png b/static/app/images/noun_28242_cc.png
new file mode 100644
index 0000000000000000000000000000000000000000..396a4ebc485ef568b567f2fe48f323f1832c183d
GIT binary patch
literal 33861
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

literal 0
HcmV?d00001

diff --git a/static/app/index.html b/static/app/index.html
index 4f80e08..935a68a 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -8,6 +8,7 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(.) styles/vendor.css -->
     <!-- bower:css -->
+    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -30,18 +31,22 @@
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
               <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
             </button>
 
             <a class="navbar-brand" href="#/">declutter</a>
+
           </div>
 
           <div class="collapse navbar-collapse" id="js-navbar-collapse">
 
             <ul class="nav navbar-nav">
               <li class="active"><a href="#/">Home</a></li>
-              <li><a ng-href="#/about">About</a></li>
-              <li><a ng-href="#/">Contact</a></li>
+              <li><a ng-href="#/friendscrap">Friends Crap</a></li>
+              <li><a ng-href="#/mycrap">My Crap</a></li>
+              <li><a ng-href="#/myfriends">My Friends</a></li>
             </ul>
+          <img src="/images/noun_28242_cc.png" class="img pull-right" style="width: 7%; height: 7%"/>
           </div>
         </div>
       </div>
@@ -53,7 +58,8 @@
 
     <div class="footer">
       <div class="container">
-        <p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
+        <p><span class="glyphicon glyphicon-ice-lolly-tasted"></span> from Team SAS | Don't be a pack mule... decrapify!</p>
+        <p>Image created by Luis Prado from the Noun Project</p>
       </div>
     </div>
 
@@ -71,7 +77,9 @@
 
     <!-- build:js(.) scripts/vendor.js -->
     <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/angular-animate/angular-animate.js"></script>
     <script src="bower_components/angular-cookies/angular-cookies.js"></script>
     <script src="bower_components/angular-resource/angular-resource.js"></script>
@@ -85,6 +93,8 @@
         <script src="scripts/app.js"></script>
         <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
+        <script src="scripts/controllers/mycrap.js"></script>
+        <script src="scripts/controllers/myfriends.js"></script>
         <!-- endbuild -->
 </body>
 </html>
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 074c099..e6dc3df 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -1,13 +1,5 @@
 'use strict';
 
-/**
- * @ngdoc overview
- * @name declutterApp
- * @description
- * # declutterApp
- *
- * Main module of the application.
- */
 angular
   .module('declutterApp', [
     'ngAnimate',
@@ -20,51 +12,51 @@ angular
   .config(function ($routeProvider) {
     $routeProvider
       .when('/', {
-        templateUrl: 'views/main.html',
+        templateUrl: '/views/main.html',
         controller: 'MainCtrl'
       })
       .when('/about', {
-        templateUrl: 'views/about.html',
+        templateUrl: '/views/about.html',
         controller: 'AboutCtrl'
       })
       .when('/login', {
-            templateURL: 'views/login.html',
+            templateUrl: 'views/login.html',
             controller: 'LoginCtrl'
         })
         .when('/logout', {
-            templateURL: 'views/logout.html',
+            templateUrl: 'views/logout.html',
             controller: 'LogoutCtrl'
         })
         .when('/register', {
-            templateURL: 'views/register.html',
+            templateUrl: 'views/register.html',
             controller: 'RegisterCtrl'
         })
         .when('/friendscrap', {
-            templateURL: 'views/friendscrap.html',
+            templateUrl: 'views/friendscrap.html',
             controller: 'FriendscrapCtrl'
         })
         .when('/mycrap', {
-            templateURL: 'views/mycrap.html',
+            templateUrl: '/views/mycrap.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/myclaimed', {
-            templateURL: 'views/myclaimed.html',
+            templateUrl: 'views/myclaimed.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/postitem', {
-            templateURL: 'views/postitem.html',
+            templateUrl: 'views/postitem.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/:item', {
-            templateURL: 'views/edititem.html',
+            templateUrl: 'views/edititem.html',
             controller: 'MycrapCtrl'
         })
         .when('/myfriends', {
-            templateURL: 'views/myfriends.html',
+            templateUrl: 'views/myfriends.html',
             controller: 'MyfriendsCtrl'
         })
         .when('/myfriends/addfriend', {
-            templateURL: 'views/addfriend.html',
+            templateUrl: 'views/addfriend.html',
             controller: 'MyfriendsCtrl'
         })
       .otherwise({
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
new file mode 100644
index 0000000..dbaf157
--- /dev/null
+++ b/static/app/scripts/controllers/mycrap.js
@@ -0,0 +1,71 @@
+'use strict';
+
+angular.module('declutterApp')
+
+  .controller('MycrapCtrl', function ($scope, $http, $cookies, $location) {
+    $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+
+    $scope.itemCategories = [
+        {category:'BOOKS', name:'Books'},
+        {category:'ENTERTAINMENT', name:'Movies, Music, and Games'},
+        {category:'ELECTRONICS', name:'Electronics and Computers'},
+        {category:'HOME', name:'Home'},
+        {category:'GARDEN', name:'Garden and Tools'},
+        {category:'BEAUTY', name:'Beauty and Health'},
+        {category:'TOYS', name:'Toys, Kids and Baby'},
+        {category:'CLOTHING', name:'Clothing, Shoes and Jewelry'},
+        {category:'SPORTS', name:'Sports and Outdoors'},
+        {category:'AUTOMOTIVE', name:'Automotive'}
+    ];
+
+    var items_request = $http.get('/api/items/');
+    items_request.success(function(data){
+        console.log("success" + data);
+        $scope.items=data;
+    });
+    items_request.error(function(data){
+        $scope.error = ["Error with items"];
+        console.log("error" + data);
+    });
+
+    $scope.getTotalItems = function(){
+        return $scope.items ? $scope.items.length : 0;
+    };
+
+    $scope.addItem = function(){
+        var data = {
+            "item_name":$scope.formItemName,
+            "description":$scope.formItemDescription,
+            "category":$scope.formItemCategory
+        };
+
+        $http.post('/api/items/create/', data).
+        success(function(data){
+                $scope.items.push({item_name:data.item_name, description:data.description, category:data.category});
+                $scope.formItemName = '';
+                $scope.formItemDescription = '';
+                $scope.formItemCategory = '';
+                $location.path('/mycrap');
+                alert("Your new item has been posted!");
+                }).
+
+            error(function(data){
+                $scope.error = ["Error adding new item"];
+                console.log("error" + data.error);
+            });
+        };
+
+    $scope.removeItem = function(item){
+        $http.delete('api/items/item/' + item.id).
+        success(function(data){
+                $scope.items.splice(
+                    $scope.items.indexOf(item),
+                    1
+                );
+            }).
+            error(function(data){
+                $scope.error = ["Error deleting item"];
+            });
+    };
+
+  });
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
new file mode 100644
index 0000000..a220aa6
--- /dev/null
+++ b/static/app/scripts/controllers/myfriends.js
@@ -0,0 +1,10 @@
+'use strict';
+
+angular.module('declutterApp')
+  .controller('MyfriendsCtrl', function ($scope) {
+    $scope.awesomeThings = [
+      'HTML5 Boilerplate',
+      'AngularJS',
+      'Karma'
+    ];
+  });
diff --git a/static/app/styles/main.css b/static/app/styles/main.css
index b2e953f..9197e2a 100644
--- a/static/app/styles/main.css
+++ b/static/app/styles/main.css
@@ -80,4 +80,8 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
+
+  .other-color{
+      background: #f0ac1d;
+  }
 }
diff --git a/static/app/views/addfriend.html b/static/app/views/addfriend.html
new file mode 100644
index 0000000..d609498
--- /dev/null
+++ b/static/app/views/addfriend.html
@@ -0,0 +1,14 @@
+<div class="btn-group">
+    <label class="btn btn" ng-model="radioModel" btn-radio="'myfriends'"><a ng-href="#/myfriends">My Friends</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'addfriend'"><a ng-href="#/myfriends/addfriend">Add a Friend</a></label>
+</div>
+<br>
+<br>
+<div class="well">
+<p class="lead" id="additem">Find and Connect with More Friends
+    <form class="form-group" name="newfriendForm">
+    <p>Email:  <input type="email" ng-model="formFriendEmail" required></p>
+    <button class="btn btn-primary" ng-click="addFriend()"><strong>Add Friend</strong></button>
+</form>
+</p>
+</div>
\ No newline at end of file
diff --git a/static/app/views/main.html b/static/app/views/main.html
index 787f33e..d8d1a27 100644
--- a/static/app/views/main.html
+++ b/static/app/views/main.html
@@ -1,23 +1,19 @@
-<div class="jumbotron">
-  <h1>'Allo, 'Allo!</h1>
+<div class="jumbotron other-color">
+  <h1>It's time to decrapify your life!</h1>
   <p class="lead">
-    <img src="images/yeoman.png" alt="I'm Yeoman"><br>
-    Always a pleasure scaffolding your apps.
+    Get rid of your unused stuff. <br>And feel good it's not headed to landfill.
   </p>
-  <p><a class="btn btn-lg btn-success" ng-href="#/">Splendid!<span class="glyphicon glyphicon-ok"></span></a></p>
+  <p><a class="btn btn-lg btn-primary" ng-href="#/login">Get Started!<span class="glyphicon glyphicon-ok"></span></a></p>
 </div>
 
 <div class="row marketing">
-  <h4>HTML5 Boilerplate</h4>
   <p>
-    HTML5 Boilerplate is a professional front-end template for building fast, robust, and adaptable web apps or sites.
+    Getting rid of your stuff can be difficult.
   </p>
 
-  <h4>Angular</h4>
   <p>
-    AngularJS is a toolset for building the framework most suited to your application development.
+    Things have value to you, whether you have formed a personal attachment to your stuff or you believe you have a practical use for it... someday. Most of the time, "personal value" means guilt or "someday" never comes.
   </p>
 
-  <h4>Karma</h4>
-  <p>Spectacular Test Runner for JavaScript.</p>
+  <p>How about giving it to your friends and family who need them?</p>
 </div>
diff --git a/static/app/views/myclaimed.html b/static/app/views/myclaimed.html
new file mode 100644
index 0000000..66b8e24
--- /dev/null
+++ b/static/app/views/myclaimed.html
@@ -0,0 +1,10 @@
+<div class="btn-group">
+    <label class="btn btn" ng-model="radioModel" btn-radio="'mycrap'"><a ng-href="#/mycrap">My Posted Items</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'postitem'"><a ng-href="#/mycrap/postitem">Post New Item</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
+</div>
+<br>
+<br>
+<div class="well">
+<p class="lead" id="myitems">Stuff I'm Taking From My Friends</p>
+<p><strong>{{  }}</strong> items claimed.</p></div>
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
new file mode 100644
index 0000000..ba3aba1
--- /dev/null
+++ b/static/app/views/mycrap.html
@@ -0,0 +1,43 @@
+<div class="btn-group">
+    <label class="btn btn" ng-model="radioModel" btn-radio="'mycrap'"><a ng-href="#/mycrap">My Posted Items</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'postitem'"><a ng-href="#/mycrap/postitem">Post New Item</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
+</div>
+<br>
+<br>
+<div class="well">
+<p class="lead" id="myitems">Stuff I'm Currently Trying to Give Away</p>
+<p><strong>{{ getTotalItems() }}</strong> items posted.</p>
+<div>
+    <table class="table">
+    <thead>
+    <tr>
+        <th ng-click="sortBy='id';reverse=!reverse">Item Id</th>
+        <th ng-click="sortBy='item_name';reverse=!reverse">Item</th>
+        <th>Description</th>
+        <th ng-click="sortBy='category';reverse=!reverse">Category</th>
+        <th ng-click="sortBy='created';reverse=!reverse">Date Posted</th>
+        <th>Owner</th>
+        <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
+        <th>Availability</th>
+        <th>Delete</th>
+
+    </tr>
+    </thead>
+
+    <tbody ng-repeat="item in items | orderBy: sortBy:reverse" class="item">
+        <tr>
+            <td>{{ item.id }}</td>
+            <td>{{ item.item_name }}</td>
+            <td>{{ item.description }}</td>
+            <td>{{ item.category }}</td>
+            <td>{{ item.created }}</td>
+            <td>{{ item.poster.username }}</td>
+            <td>{{ item.claimer }}</td>
+            <td>{{ item.availability }}</td>
+            <td bn-index-watch><a ng-click="removeItem(item)">Delete</a></td>
+        </tr>
+    </tbody>
+</table>
+</div>
+</div>
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
new file mode 100644
index 0000000..6c3ae68
--- /dev/null
+++ b/static/app/views/myfriends.html
@@ -0,0 +1,32 @@
+<div class="btn-group">
+    <label class="btn btn" ng-model="radioModel" btn-radio="'myfriends'"><a ng-href="#/myfriends">My Friends</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'addfriend'"><a ng-href="#/myfriends/addfriend">Add a Friend</a></label>
+</div>
+<br>
+<br>
+<div class="well">
+<p class="lead" id="myfriends">My Friends</p>
+<div>
+    <table class="table">
+    <thead>
+    <tr>
+        <th ng-click="sortBy='username';reverse=!reverse">Username</th>
+        <th ng-click="sortBy='email';reverse=!reverse">Email</th>
+        <th ng-click="sortBy='first_name';reverse=!reverse">First Name</th>
+        <th ng-click="sortBy='last_name';reverse=!reverse">Last Name</th>
+        <th>Delete</th>
+    </tr>
+    </thead>
+
+    <tbody ng-repeat="friend in friends | orderBy: sortBy:reverse" class="friend">
+        <tr>
+            <td>{{ user.username }}</td>
+            <td>{{ user.email }}</td>
+            <td>{{ user.first_name }}</td>
+            <td>{{ user.last_name }}</td>
+            <td bn-index-watch><a ng-click="removeFriend(friend)">Delete</a></td>
+        </tr>
+    </tbody>
+</table>
+</div>
+</div>
diff --git a/static/app/views/postitem.html b/static/app/views/postitem.html
new file mode 100644
index 0000000..044368d
--- /dev/null
+++ b/static/app/views/postitem.html
@@ -0,0 +1,28 @@
+<div class="btn-group">
+    <label class="btn btn" ng-model="radioModel" btn-radio="'mycrap'"><a ng-href="#/mycrap">My Posted Items</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'postitem'"><a ng-href="#/mycrap/postitem">Post New Item</a></label>
+    <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
+</div>
+<br>
+<br>
+<div class="well">
+<p class="lead" id="additem">Post a New Item
+    <form class="form-group" name="newitemForm">
+    <p>Item Name:  <input type="text" ng-model="formItemName" required></p>
+    <p>Description:  <input type="text" ng-model="formItemDescription" required></p>
+    <p>Category:  <select ng-model="formItemCategory" required>
+        <option style="display:none" value class>select a category</option>
+        <option value="BOOKS">Books</option>
+        <option value="ENTERTAINMENT">Movies, Music, and Games</option>
+        <option value="ELECTRONICS">Electronics and Computers</option>
+        <option value="HOME">Home</option>
+        <option value="GARDEN">Garden and Tools</option>
+        <option value="BEAUTY">Beauty and Health</option>
+        <option value="TOYS">Toys, Kids and Baby</option>
+        <option value="CLOTHING">Clothing, Shoes and Jewelry</option>
+        <option value="SPORTS">Sports and Outdoors</option>
+        <option value="AUTOMOTIVE">Automotive</option></select></p>
+    <button class="btn btn-primary" ng-click="addItem()"><strong>Add Item</strong></button>
+</form>
+</p>
+</div>
diff --git a/static/test/karma.conf.js b/static/test/karma.conf.js
index 7483b46..9d99a1d 100644
--- a/static/test/karma.conf.js
+++ b/static/test/karma.conf.js
@@ -19,7 +19,9 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // bower:js
+      'bower_components/jquery/dist/jquery.js',
       'bower_components/angular/angular.js',
+      'bower_components/bootstrap/dist/js/bootstrap.js',
       'bower_components/angular-animate/angular-animate.js',
       'bower_components/angular-cookies/angular-cookies.js',
       'bower_components/angular-resource/angular-resource.js',

From 3ac01c0b55fbc7ee4eecbca74a95db5ae31c703d Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Wed, 25 Feb 2015 09:56:26 -0800
Subject: [PATCH 05/43] suman commit 1 frontend

---
 static/.tmp/styles/main.css                   |   4 +-
 static/app/.DS_Store                          | Bin 0 -> 6148 bytes
 static/app/index.html                         |   7 ++-
 static/app/scripts/app.js                     |  20 +++---
 static/app/scripts/controllers/friendscrap.js |  14 +++++
 static/app/views/about.html                   |   1 -
 static/app/views/friendscrap.html             |  59 ++++++++++++++++++
 static/app/views/main.html                    |   3 +-
 static/test/karma.conf.js                     |   2 +
 9 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 static/app/.DS_Store
 create mode 100644 static/app/scripts/controllers/friendscrap.js
 delete mode 100644 static/app/views/about.html
 create mode 100644 static/app/views/friendscrap.html

diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index af74efc..358f6e1 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -80,6 +80,4 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
-}
-
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG59XG4iXX0= */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/static/app/.DS_Store b/static/app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b4b06a82c344f7a0554ad81def038ce658b66c52
GIT binary patch
literal 6148
zcmeHKOHRW;47E!UrQNiwkl4(Qb#E}L!U=i-qyzyHQ6k#Hc5cAgxDn4|w@OG6JA}ZN
zJTLKQoV-MFOhmleRZF5d5lx_iqjM}rMEs%y8JR_#ocCyHOPi<r<+^MJ(Qf#S49K%P
zqYahxOpnxges!ytJG&Z2)J;)TyKPDIzIeONai8|6o9dg0_Cel~eU&JioYD)f;f`MS
z@6g^mUG%-3`WI;`somU8?IYfP-H?-gaR!_LXW*YPfSxTfnJN0}3^)VMz<~kzJ_M*>
zG)#*5(}5+A0KhTKS#T_~gyaOnXqXh?fv~0mHI;3|U`>ZTSX?wrikePr!v|Yswh4uE
zb?hH<IB`_;)fsRG`V5@t>0J8%&DZmPKgrLW0cYS(F~H+uU950R)>{WRC%ra6Z=oU*
mmlO{vILNISvC@h!p;=%LasZ5mNf8!^{|ICnd~pVTlz|V#B|=C5

literal 0
HcmV?d00001

diff --git a/static/app/index.html b/static/app/index.html
index 4f80e08..c5eb8a9 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -8,6 +8,7 @@
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(.) styles/vendor.css -->
     <!-- bower:css -->
+    <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
     <!-- endbower -->
     <!-- endbuild -->
     <!-- build:css(.tmp) styles/main.css -->
@@ -39,8 +40,7 @@
 
             <ul class="nav navbar-nav">
               <li class="active"><a href="#/">Home</a></li>
-              <li><a ng-href="#/about">About</a></li>
-              <li><a ng-href="#/">Contact</a></li>
+              <li><a ng-href="#/friendscrap">Friends Crap</a></li>
             </ul>
           </div>
         </div>
@@ -71,7 +71,9 @@
 
     <!-- build:js(.) scripts/vendor.js -->
     <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/angular-animate/angular-animate.js"></script>
     <script src="bower_components/angular-cookies/angular-cookies.js"></script>
     <script src="bower_components/angular-resource/angular-resource.js"></script>
@@ -85,6 +87,7 @@
         <script src="scripts/app.js"></script>
         <script src="scripts/controllers/main.js"></script>
         <script src="scripts/controllers/about.js"></script>
+        <script src="scripts/controllers/friendscrap.js"></script>
         <!-- endbuild -->
 </body>
 </html>
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 074c099..d281806 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -28,43 +28,43 @@ angular
         controller: 'AboutCtrl'
       })
       .when('/login', {
-            templateURL: 'views/login.html',
+            templateUrl: 'views/login.html',
             controller: 'LoginCtrl'
         })
         .when('/logout', {
-            templateURL: 'views/logout.html',
+            templateUrl: 'views/logout.html',
             controller: 'LogoutCtrl'
         })
         .when('/register', {
-            templateURL: 'views/register.html',
+            templateUrl: 'views/register.html',
             controller: 'RegisterCtrl'
         })
         .when('/friendscrap', {
-            templateURL: 'views/friendscrap.html',
+            templateUrl: 'views/friendscrap.html',
             controller: 'FriendscrapCtrl'
         })
         .when('/mycrap', {
-            templateURL: 'views/mycrap.html',
+            templateUrl: 'views/mycrap.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/myclaimed', {
-            templateURL: 'views/myclaimed.html',
+            templateUrl: 'views/myclaimed.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/postitem', {
-            templateURL: 'views/postitem.html',
+            templateUrl: 'views/postitem.html',
             controller: 'MycrapCtrl'
         })
         .when('/mycrap/:item', {
-            templateURL: 'views/edititem.html',
+            templateUrl: 'views/edititem.html',
             controller: 'MycrapCtrl'
         })
         .when('/myfriends', {
-            templateURL: 'views/myfriends.html',
+            templateUrl: 'views/myfriends.html',
             controller: 'MyfriendsCtrl'
         })
         .when('/myfriends/addfriend', {
-            templateURL: 'views/addfriend.html',
+            templateUrl: 'views/addfriend.html',
             controller: 'MyfriendsCtrl'
         })
       .otherwise({
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
new file mode 100644
index 0000000..6fa4fcf
--- /dev/null
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -0,0 +1,14 @@
+/**
+ * Created by skumo on 23/02/15.
+ */
+
+'use strict';
+
+angular.module('declutterApp')
+  .controller('FriendscrapCtrl', function ($scope, $http) {
+    $http.get('/api/items/').success(function(data) {
+        $scope.items = data;
+    }).
+  error(function(data, status, headers, config) {
+    });
+  });
diff --git a/static/app/views/about.html b/static/app/views/about.html
deleted file mode 100644
index d21bf89..0000000
--- a/static/app/views/about.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>This is the about view.</p>
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
new file mode 100644
index 0000000..09aade1
--- /dev/null
+++ b/static/app/views/friendscrap.html
@@ -0,0 +1,59 @@
+<!--
+<div class="well">
+    <div ng-repeat="item in items">
+        <div class="lead">
+            <p class="item"> {{ item.item_name }}</p>
+            <p class="item_desc"> {{ item.description }} </p>
+            <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
+    </div>
+</div>
+-->
+
+<!--
+<div class="well">
+    <p class="lead">My Friends Items</p>
+    <table class="table">
+        <tbody ng-repeat="item in items">
+            <tr>
+                <td>{{ item.item_name }} </td>
+                <td>{{ item.description }} </td>
+                <td><label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">Claim this Item</a></label></td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="btn-group">
+   <label class="btn btn" ng-model="radioModel" btn-radio="'mycrap'"><a ng-href="#/mycrap">My Posted Items</a></label>
+   <label class="btn btn" ng-model="radioModel" btn-radio="'postitem'"><a ng-href="#/mycrap/postitem">Post an Item</a></label>
+   <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
+</div>
+-->
+
+<br>
+<br>
+<div class="well">
+<p class="lead" id="myitems">My Friends Items
+<div>
+   <table class="table">
+   <thead>
+   <tr>
+       <th ng-click="sortBy='distance';reverse=!reverse">Category</th>
+       <th ng-click="sortBy='item_name';reverse=!reverse">Item Name</th>
+       <th>Description</th>
+       <th>Claim This</th>
+   </tr>
+   </thead>
+
+   <tbody ng-repeat="item in items | filter: itemFilter | orderBy: sortBy:reverse" class="item">
+       <tr>
+
+           <td>{{ item.category }}</td>
+           <td>{{ item.item_name }}</td>
+           <td>{{ item.description }}</td>
+           <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>
+       </tr>
+   </tbody>
+</table>
+</div>
+</div>
diff --git a/static/app/views/main.html b/static/app/views/main.html
index 787f33e..aa53635 100644
--- a/static/app/views/main.html
+++ b/static/app/views/main.html
@@ -1,7 +1,6 @@
-<div class="jumbotron">
+<div class="jumbotron" >
   <h1>'Allo, 'Allo!</h1>
   <p class="lead">
-    <img src="images/yeoman.png" alt="I'm Yeoman"><br>
     Always a pleasure scaffolding your apps.
   </p>
   <p><a class="btn btn-lg btn-success" ng-href="#/">Splendid!<span class="glyphicon glyphicon-ok"></span></a></p>
diff --git a/static/test/karma.conf.js b/static/test/karma.conf.js
index 7483b46..9d99a1d 100644
--- a/static/test/karma.conf.js
+++ b/static/test/karma.conf.js
@@ -19,7 +19,9 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // bower:js
+      'bower_components/jquery/dist/jquery.js',
       'bower_components/angular/angular.js',
+      'bower_components/bootstrap/dist/js/bootstrap.js',
       'bower_components/angular-animate/angular-animate.js',
       'bower_components/angular-cookies/angular-cookies.js',
       'bower_components/angular-resource/angular-resource.js',

From 6b792285fa03df1b881e7251b126413dc1736c2c Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Wed, 25 Feb 2015 10:13:17 -0800
Subject: [PATCH 06/43] Removed sqlite3 db from git cache

---
 declutter_db.sqlite3 | Bin 262144 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 declutter_db.sqlite3

diff --git a/declutter_db.sqlite3 b/declutter_db.sqlite3
deleted file mode 100644
index 1807312a98d17937181bb9a6bd5f3dc2041f7450..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 262144
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
K00=xef&T}c?-v*V


From b064e6fde9b41fb5cddd1609956abd9b9a50b9c9 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Wed, 25 Feb 2015 10:16:42 -0800
Subject: [PATCH 07/43] items migration files removed

---
 items/migrations/0001_initial.py | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 items/migrations/0001_initial.py

diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
deleted file mode 100644
index 0fd22f3..0000000
--- a/items/migrations/0001_initial.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Item',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('poster_id', models.IntegerField()),
-                ('claimer_id', models.IntegerField()),
-                ('item_name', models.CharField(max_length=100)),
-                ('description', models.TextField(max_length=500)),
-                ('created', models.DateField(auto_now_add=True)),
-                ('image', models.CharField(max_length=100, null=True, blank=True)),
-                ('availability', models.BooleanField(default=True)),
-                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
-            ],
-            options={
-                'verbose_name': 'Item',
-                'verbose_name_plural': 'Items',
-            },
-            bases=(models.Model,),
-        ),
-    ]

From 144595f2ee5aac2ae32b5d122d7ff6ebaae2637d Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Wed, 25 Feb 2015 10:55:01 -0800
Subject: [PATCH 08/43] removing sqlite3 file

---
 declutter_db.sqlite3.orig | Bin 48128 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 declutter_db.sqlite3.orig

diff --git a/declutter_db.sqlite3.orig b/declutter_db.sqlite3.orig
deleted file mode 100644
index c51ecdd78ee44d7cf8a3938bf2b7f41cff02dd4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48128
zcmeHQd2C$Ad7pW+2OlL;BB|AiqG&!|BG(kfJ-8%Sf?_k&N}|le5-C|LH&{P%AIT;6
zpmvwK(4Zw{I{_LrK?@W`Q5X%-BRv4eE!rTclNM>48ZFQuNQ<IHQZ#Ac8fcQD{-bRY
z|Iu&e%{zBVN~&T;(yXoFo0)Is`{wuNdfzw4+@+~(MN^iFrMy~EV#tFqM$an>Lg)<q
z8{+>k{2hRQ9{6YcXxMJQGidN#zZa<d<Xe>X1o<)fZ}MN{d*t8AcgVN=!82#@y)zYc
zA*XHmJpN!ThVR9gH?yi1mW%1dVxgiHD(T9db*)B_cj9t#d_JknkAHM3sdUw#=u-N-
zvY9R=3;8T-C1qxIUYWTvHKn|Gd2)LEa!Pq2nNr5D%+F5FKwi_ynfVh+S3%8dUCK?h
zw78;{`Xk|R$V>;Z>iT**r!Hu@?Md>*%ns34W+pFPNrGTjPLQphCKQrBf&O^$3`W^P
zM!Q|Uk%RY>RyQg|=1<osVme*WZlxpJ#rOdCA8alYhVItJ1EA}<e{|3IeZflu+X)Tg
zucX(tQa)QQXN!e&#1-HN5j{z-FPMsLmqo48)he>@MadT&7{Do3P7YsLyRo4a7B!cb
zILhaW?5CCB1f&dYrm#OaG=#TQJ9hc(a!IW~Y06wQD?oDOYt%|B{-Nq5)D^3~MdNWt
zm2_5EBNk9S-UkkA&TXym6bOKG@BldSK5*)M4b+t`BJ$VdS4f70r5{LdOP_!M@e>F<
z5CW&`yeN2j9D1vKIUEj0S)Y}Th9mKCG#XEbBhdu)42GkF(YO+hoQft+h2tlqk&#3q
z9)m%my?4B<vHpRkkEFAOY$dDaT!~_*;$tVrh7+;jk+2Uq_L>}bNf8T&$Da3kQQP=9
zG^LHQR$@|?D<w_Mr=h#nDq1F8uBerba!sC*cx-Gm>VX`3Z8_}7bu<=@0$;-9R5ST(
zVYiZvjEzL2BSVrG1%L~5o4Y26$40^<qu7gjd&l``Ne9baF&v2ukHm)?ND0Q~k0J6I
z^3UYU<af!>!|4362YT^>SRfz}sD(gF9T}AQ?0~iYbgsBezK$9(>m}3RHu^}X<;%AO
zF^S<Ca~-+GLk6&G+SJxWNT`nYX3%xfo($xWSq1@#3>i6DQ;)g^Kk3l(p<N*KGYDbw
zV=Dbgn47;sqQoP;D}6<JL)wyFkv<}|;P2qK@Tc)Iehzn_AEIxdH_>b8W%L|Pf{wOA
zzk}N+)PkaBGRh=${xUq!lI8o4cu@=w&^Wz!g|CcUu6Ro;)#?7U;qMQclrZ5gEYt51
zPO1A%%C5s+G>Cf*ekK{^X?S`9UNnUJY<zWO{G6-q>p5gnah{xtbJTs$w0KbncN+XS
z3FW3g9&h%d2oBkK=|h;$V5WPIH<@$>H%@1;)4j?;FB-tzCO=NZ80ybM2fXMsj@UTz
zPG6zDzL&GL4Fp4tW&+OIk%05JB?vWmQCxp-z*lilQ$cK`%6?N^ov}hIm4^#KpOt+k
z1?SEvI9K|7wBAvLSTtorAG&1ob@Tj}OT~?K!Wl467tA|&mEat78qR`wj=}Vz4|f=_
z>I9StdpZI0h*3ObgVg#|kvJ<W<OIwiI5p>I#Yvp06>=Qr3%r6*Fs%rQvbVhbFh_{X
z_QnETg#ur`r8`^#@H1~ev{_Ec`J0rSyFu9nlY$}HY%C@j<qRHZzJslF{x1_5k$)q9
zN!}#CPD<noIZfIjNc;o>PY(jk(A5Nj0Xl-w!K+N2W6-s<x3wDs3m<3=?-A%!TH9Ln
zfq=*9o;K)E+S=QUuNl4LE^}``^dG&w-S%$P)}xkf&rQ&G1Ofrt5z>L5{%xV35`iG=
zwrCi8Xonu5Gtg;uCN#$KwLv$~5p1_LfA|hD`iOdX!!nsi<OgJt+$MhuUjbhtzd`27
zFFZZ3UX)ZI@F)>z^aKO?oSt?f@*z)KJ9hOQb<Li(RwIzlDi3+u+py7R@V~xep5AV3
z>l5t#gSWvG2(Y<4n>00g0zu}}r#CI0KqvEBJ%QBZ3AV%h+|~Zu@Oy~-C$#*(BA+L}
z3L1cQ@-cD|W&t4*Bv^V+`kM45>2uOA!xuq8x-OlUB2t^QAO8rFiQi*_K$8b|W0_AS
zX|-(AL->@Dh8%75;C5_&zO@ECcmTUU)sE<)Jee^R2Ae&&7uV5=r4e+v#e@5>^P4N6
zhw;REwLf&wgFCUGCe;I44ta10yS|^A^*|$~KB6|UBKTNRJ>=jK502m(A3+E72%g^7
zo*G$syfhD6XamdH{vESl58)Zm_O_3~<)JC5x1K@Z_%f08AfAS`%DMv{+<^&A#QgrC
z2M^)uj|`t4&XZa#*voKmeLHv#dE^1?`b;1!kY`|w_R>L*+{@mu5klwxUUUheOL!3f
zob*X(>lYwsD*(p0hqBE*w#E`>71XVJxvT~j!;D(dD%redn*KtM-n1l)p3G1h3Oyp@
z-_}W=pIZN3ZDFQ5m%hy9b(uF^u@7aWbK2qJPP;MhV3;jCUDGCgIe9L5IXN?toZHEk
z9fDfA2)H?!xvbQtjoHoBo;Va@?H}Jj_y+#GG$Gw4e}qrrQ;*4@wg+Oqu+JAvC#aD+
z(%=gwJGL`dv&uxr1#au6kJRky`F|S9HxJhNgPomtbIq#YY$Ra}*;BpK`fNo!f*L($
ztI>*H#X>RJ7d+p&BM?k3js$z&w>4Jp4<-`$)qSpV*mPoLOLTka{_V<VCwi!|>SFHN
zGA*$<7uq1LF?#o=%`&hOSh<*u)|8|w=TOM1g0<F%Si;%iuw!ozZ=mhpv8rbe+LT}^
z5D*CL4FXjEC))qsU@y1|1oj#MG5+uM8xZ^j0(*ym82|SUd%;;Cu-6FC@n4d@h{y~$
z;wKPzToBl7mKxAz-*{c1p`oEp9$#Nr%Pd9H<rOs=AL)Tj2jOr}W_>AIPOfZBj!oX_
zIU89kRIa72q;jd;m6yg|xK+44_0epuJeC=akF7<cix(!Y-JZL4eqn0)jC1{eEPg6B
zc5*Zv3lE2L#kK5qv5DyB5N1Nj0}TxkxwcTz!p6p}in=(L%fx%4%S+LTJ4@FSv1sa6
za&hMBRBU5%V)XJr>cWlK>Rj}~`b(q9v$Ls*7n5$GBB#P5C&Tf0bTkZwE~q6{TP_we
zx3UGp`}}fV&E`%n7V|EN!*mZtI652)$LaVlk?$h%UGn|M<<$#01p)$r`$wRT1TgKl
zq-HW88=V91E9m&|LGK{+j<g|tj{F(^MbriV*?x0PzToosj^-U^=VFd!)F|5wUu=Pd
z-Ry8^>rkUVI5>#!y=<9(SO(1Sp&Nc|{-zoxA6qmSQ0_gu-yiJgz^`{ZGi2rvO4_(h
z77t}8T35^ETg4JA5-|4&N5>o+GIMIVLKj(Q3pExJfKew~PM0?TEh<`<vQRAM%w+};
zOGBO3-B`8Z4d|A#C1A5XC6F*dcBIhgC}EXk)VZ^i3R+Q@ma2t>7<I9dy$L&|-SX3=
z6X{jhv0Qr{#Y31*A9;m&@J->Y!rh;7P=Bjz<2khrn%2DPUFdd;zh%0sVG%UA+p`OW
zo;%<R&JFI~IQ3>_Z<2aQv(W$9x;pVF5O~TE5c<ET?1hWs3IuEji1FVBhIkYRJY@)o
z@&74%;i9+#0UH8z{P!UR&IrR9{6*<`>6_%^wrI39e$XErAIGmYIQ42(Dm_!tRu$8-
zjpnV2@S#+3hF;`8R4Xp6jHRo56f3q3IY2+-%s3SKiD*zaJ<YH~YXEN!vU33${5HnJ
zk<q2dLS)euewe?D$(ggsYjBbwY!tWYWz$BgE@gJ6Dwe(;_hypNW^0Q-_(B42p0>o$
z)m@e_<#bp}#1iW86604D9jqZ#6_J^TO|~i`Dxw|;db-f&Glz89k~_&Z78{K%L`L-^
z39E8Ea$m9;dF&>eg$b>4p-mL<2cH|no1K<`tR68j%4uzEG#pVg!wfcCL~9M9Y|&;q
zn>e;;3KH{D5$O2eMivnHfcy`6AI{}`m;5X21pa&ScjO)N74kOu6W9~{d*nCC8?ZC@
zm&m8c>##rgE~$_LS%GBYClC+_?1+GuU@W&W_b78)sato1xk2V0rmjE0+(XQ5p{}o)
zxlPPHNL}v%<~B07fx4dk%-zS_dg>CHxpmC-Q&;ja*UMawhsc;vM<PU)#r%KAmnR|x
z0#7soqWwS7uU8aKAh06>qW$j(kBAfqJkbb<_Wwk`UQsxKz>Wy$>wj+|bQApu|CV$W
zeSrRV#{`cgauXlc6`$R;6`u}$u}yV(bQi^^k#2j%r%gNDAM^+3#_{H)O9sZz($v;c
z!@5b1Z6}wTa9h=^o6w=8-8^|j7xl_+q8f^5OJnTLxc$CGHS%(U>CTagYQe=6+xPlf
z+4An!F|!)EkHB~PpW!k&Z*ekD%%==$uDjjo3MaZW8EzV)2e{Q<fn8i!)fOwv^i$Dp
zSB&G|cyLKuhjrP;>h7rf1}HuArJTClrIhn(E(h03DI0}yb{UpD+gEb)1NicAKB2k{
zlIX1X9aLZ|avM}EGZww0%Dy_d#-#up7`numy_A|D+4C@~g^`l!|Hb(qkEBx*nFs_P
zI|Ri1|FL^zLSTWwBSV1B|1tRo1pkYlKtLeyBp?vNG8#V+kQ=b<+WF5;G8l`DL?W>$
z-4g7f<3GLsOTPl_NhrK1gFrwaa32VG2$nr`{P&{IBJ^2&0>3G(!ur0??3i}5?x?Q1
zi!fc3Ta{xjA$3P|IQ35MXfvIzZL*?2Y<}4S-L_BlBW~3UEZ1zaFW0nW)YF){J$FRs
zE=4z%dAf^kiDGDXLYrg9m||^<A9J8zWNTi!VO#}iT*A@iRIF7+Ka66H=MB0n_m%3P
zhB6sfMTWLoJN&^=2;a-=E6KU&`lTO+WV)}nw%B^)Lumu`%Q1}WeX9>Fp!c8DP|m@H
zns6zwu0OPE_4HeUtFtlQQ&s65n!IW)+-=1lJRQQDt-5~K0gYL$oEUXGE0r_SOv81z
zjtnV)hM-LUhsg)9{&&Y#FCqm30)ZzC0lNN|j{idc|Af6*Q5=E5eIg+A|Mv-$AQK2Y
zfe6s{-$eev*#Gx^@*dm-{x9U8U<csez<r>9PQFI|6!rkV1tj7p5D*CLAp#zPa0_*s
zsnbNAgVbrHP6KuJQ|AD6>Zv1Br;a*)>iDSRr4DQY1g$?INX-BD@O=u_0)f3opg~$f
z1ig>Y`}p_qd*FEu9Y!c0@&{vZ$z%)DM^fczIZfSkBA$qjBw|ZeP@hu|X+@Z{x(?Ec
zp!&!4Vz~l$V`ejKx#(KI&hCJl-EcfIs*Oc6R^py**%`F8*e&K%SO-e^!J!KyJxmY1
z)n{Lu%I{m}s(bDWIrY%aNLma|mtNEESc^r6?ML<6mZ*Yy+@Oc^an)*dvvzwuThh|>
z@Z1_pRzs(IeZkq#c4xghg-b`A{%3#oxUON=PnvK>rZZX`&gK}2I)ewCP&*^dG!CN$
zFCT@*UYHQrn17AlTKd`@hPm}Rt*0R;)>Z_~tmeX28??&!mHFAp8OUNfIWtd})mksy
z(#5-1)K=-?AtB}KI#Ahlv2IsJD=(I^>vVZ>^*dbL&Sa3yv-Q8mief!ekO+9HH{k$g
zbs?L}R-hWW&r)85>abia*(#XpT46_9vP#R>81G_v5cB`N?tuk=fx!JCKo9MJ`M*r(
z|1zEb%XI!P)A_$l=l?RD|I2j#FVp$IOy~bHo&U>p{x8${zf9-<GM)d!As|fuFO8rk
z^kqc8PJSEC^_eBdrT>t=D1A!$8A-<fh<^v)#*_Fc`W}${6#h=M)T7S!&IY*^$>-G)
zT#2q+C~8yLHBBjKx2&~K=f^LfP0pNXeh})xrh3%v&bz#A=7R?xjQqd@k)Ld=N4@Qx
zh!*rhaS`Sl%3LM8xOQ=)Tv3Vz%_{2Li?f&K=fVy3sJ#Q|yOBIm%&%|2YzzM8i<x4{
zMx2~VPRw7Potd1N8`xiuTDx@)FXq%jrJPk()SH@;D^|+x?4c?gZ*S6xXA7D#4Y{t^
z?#0oCI9Xqh`lt{ABwq%hvxQ{^_QPaLla;=*vay`IW955cb~-r#r_lsMI{jP)u0)tt
zGn$gEDET{OEw|((4%gMAjsczcd`W{hzqqkpDJo#uRx+h*fpT-ENcii~U?-#iOvVev
z%8FJ}mP>#njIeX`E(XY<QX8B;AHdmWGGj?Ts%B_Pi^u$IYA)mjspxy6MTVU~thm+n
zk(TyZSbNvq26Y!m^#V*3Hx^eIHpMk7TS^-uK-*eHJ5{`?xj`Jn4^*+(`d{g*Nct-A
z{S-EEA(BAgJ`mU%mAupUK0ZD=yl`_NGO}{xM)BtAt(6;<N@ArHzf~EDXj)>itWD=H
z=C04DhNo9k(dn12u1-fM;rZ&y^x2Eq+4HIR?D=ymvoBqWPOoNGXXlf5XXaCPXV0#W
zPUaFTnQNDe*J4-iUcYv6Nj-n=t~xO}GPydFhyT`6^J}+f&R<=<e)h_pnX^}7(|6CU
zOy5mLQmd(3Gtuc=)ALtz*Uw*xrdD&=R6d!Vnz*=>x^^|Jo=Zd)qgU@-i(XtwMJu_5
z{H5${_TrkFKeur`I<}FDCN?q`F0QAtamIftZ_r)7JGB<MdHwv=@}>N_RW*8b<NCy8
zxk}ELAivdf3B5Oo4MrkLIC3hcUmZ3QA03X=lW&41@C%510UpFpARrKU91!Rs(|EVe
zPJ)8;WK`{LZlSbPyb%ePhBKpTDX|_cYD?LT@aRo#siLp{|287uCV%lb6kNzC5D*AB
z5O{`+<C+6}WGp-!-!_&F|8R#YLIi&XNm={>{OJR4k0bY=fal)vK7Vjv0KZOL+Te5=
zzS=F#FY|7z7iO`Kv2yrc_p=Oz*FJ7XVfBP=3TbegLJ|vOBU*e(v*6jm^1^9rnL<o$
zaaU+<;6pUK+&cutr6vGaJHL>#6~ih}|06X4JcgS5hqhW+FZDt7|Fr$LqUR9#Ciz41
zN%9Jb5|8w*^cCq1X-j%V`iRtmzk}bxpT^7hIoyGMh`xc|1RLSYkc9q@wt7)7Zl6#K
zikitNlVClO;ei<o`;T~03=hyaefx!C><+2Z{pPln{-8;zpO<1$>VA{5>#!FM;$DNF
znIYwAczOa}G=%$XeD#eZe$G|*^&B#(I8RQ+IqJS=TD&NPI}LuEgmTj#k2iZ!1c&Ur
z;G`F@4EYRZy7zdKNoR25bOt-!s~q&A0o-l!<3x<1{ycQRi%#Q+jU(Tuq*U&#YhKQl
zhtZ&+Ml%6t?MT4++Y*EtyeO`}H{h!{sHq?}Qf0p>uFjaM-%1`X1btTanG~Emqu^ZW
z^U-=o6=Knp4Snd6&DYKIXXiH&&VYHk>P#BWL8sv?nCF<^i~4Yf0jo|xnXso5J}(-@
zLpDgQ<BTNE$_hE*HK{p2D^B7}t&rm$^Tksztq6&-x4iuXK$q=}1$Ln+TA@<9!zBPe
z^Y%+7CFgHaa_$CY7ltY>n~lXJqnr&I+WsZ-Hi9*OZ?hIH9D#s9;ITkJX*2s)-aE4K
mm-iQR{-Yc<DR^JOD0n|XDQpG(Q0D$Ne&SIeAQ0GN1pW_EUX=R)


From 5cb0a6bcfa8fc0ba8a5f81ecb1a4350304741adb Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Wed, 25 Feb 2015 11:15:11 -0800
Subject: [PATCH 09/43] commiting before mergering

---
 appuser/migrations/0001_initial.py            |  39 ------------------
 .../migrations/0002_stream_deleted_status.py  |  20 ---------
 declutter_db.sqlite3                          | Bin 167936 -> 0 bytes
 items/api/urls.py                             |   2 +-
 4 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 appuser/migrations/0001_initial.py
 delete mode 100644 appuser/migrations/0002_stream_deleted_status.py
 delete mode 100644 declutter_db.sqlite3

diff --git a/appuser/migrations/0001_initial.py b/appuser/migrations/0001_initial.py
deleted file mode 100644
index 74f082e..0000000
--- a/appuser/migrations/0001_initial.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Follower',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('followee', models.IntegerField()),
-                ('follower', models.IntegerField()),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Stream',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('item', models.TextField(max_length=120)),
-                ('created', models.DateField(auto_now_add=True)),
-                ('status', models.BooleanField(default=True)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-    ]
diff --git a/appuser/migrations/0002_stream_deleted_status.py b/appuser/migrations/0002_stream_deleted_status.py
deleted file mode 100644
index 594b915..0000000
--- a/appuser/migrations/0002_stream_deleted_status.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('appuser', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='stream',
-            name='deleted_status',
-            field=models.BooleanField(default=False),
-            preserve_default=True,
-        ),
-    ]
diff --git a/declutter_db.sqlite3 b/declutter_db.sqlite3
deleted file mode 100644
index fb565289e65a5a0b3994ac696c05b1eeeb107fc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167936
zcmeI5du$^~e&4&rm#7ihGo#URX0)1VN%Ig-E2$r(NNTgU%bnF|G!JP;qj_i!2Cqdn
zB}#l~*rZ<Tb4<;8;lu_uu;Ji>1V(@ufqg;ZOAsV5;sb*7BZe=q4cLDqhYOtC<sL~c
z31T2P$7dW;)em;_C26%|@2&Prje5GPepSC;ed^cURllyL9zM96tEhaoR4ynLUS>`+
zEX%yb^9;jmkl!%*y+(dr<ae0-y2-EgVXd75{@-B6zvJ-`0haqA6&v7w7})Q9(0lgO
z-#m4@hx326yWjUs@7KJ4+jG<Xf86V?KX8qAeW~jj`!4hQ%<mphZ)=vjHgVn;dYEKu
zk8;I~x}#JpYpJTHmW|D(S}x=?EmtaPskj`ISHzguS>*hU#hK*N3_myj&dgJOxU*or
zu3>&*{vg3&estKjA(hJvhijuD!{E8Y3|8YYK~yr4&US>3Y_L_=Q4H4c>87%;_(E@v
zv$c^XQ&-ES>ZX<w)P$T+B3au&Bjc4$W;K;-Hpa-N%=A427t?RpFx1`#t6|MH^dDk_
zRj#uQHik>*e4#rDwl-s%U>In3ZIgSoWS?tePK!`Gw`vh;=TaB?3<F<3$iRl)YN@vG
zNCsMUIH<MM)YO0Ov%b(9V{C2Qw#~+tiiokSxFV+Y?z7X+wz0;}t(S6`Vdql)=~A(x
z7AvXB?xw1{(Ze&|&}x!pbR)Fqd2;nj5uGLdnC^ADY8-I6IJ2KT?F%K7?0bQVvXWOj
z*U~xXwAs+5<lA>=4!e?&bCS=IhOMe)etuzzpMP}sE`NV<?p|_nnZGl$%qJf$EzHf6
zD(}tAFTKVOTQ1yMYH{Y~%;L=ajhTlIrIZ{!?@37;C&hP!@^%5cmPhk*4<5~sN-aBD
zDh`L=<h-GW<A-;Q?q*ub(H%w#w|_3^3yqJnFFx1Q2}Zt+-Z&0+0&ZlR#<w>3uLiTO
z^oWFY*@NNMs|$z4fHyRA`Eaf_(7=n&^!h@VFSGBDG?J_%?CrqrSkN{VP1`P&iF0i!
z<@B0T9u=i{xbD})Rq~2fN##qcx#BRNQ7URBS5Te#IW47CiQiH08s=9@rMxqjrWTcg
zYS%9dcJ;jBn?y@CS0-vYOIn5;D4`aVT;A3ci`tq<d1`1y$!1%PBsogDlG`FyHrr2I
zoLVOrD3u^;X@2<5DQ_s1IIw>WZ?I2H>+ESsKeZq4@r4oz_PtYf&$meFZqSn2)5a%S
zgpTDPMlDCX`slLux$%-OUv*1JU)nhJ`$|~$dqcBBN9YIRMANJC*G_l)LPJArZKH{|
z&A7W0*JH74bl!ODi4cCn=M6m=JFp#&rW=j16MXv<USDWzjD4@qZjqg>H_JYBw`rT5
z`w|)$bu^IlS@US1_3G}t9cI>*;%X`7EadR4bSa}Y(iDXTZS|X;vjXZXx*=xaaCpY!
z4K2%^c(<`3CALZQ?t9(7kSwz=WSx5(kv2)5M*eLiUP2!<VHs97H&c0KMRi;zn?(wQ
zZRhMdSi2^I)F=}U-|zBL|6A5Em;*dbeO^_IX|?Il)zJK=%u(98uaT1B+A`}4O-{1=
ziW6-iw^~*zbV6xjvlF@+>K$&$KNeKdSo^*rMH_D{jgHuyON!=mEq4zxhrZY!AlvTX
zG{gNn?(cFLZZi18;BN$fiX`9z0w4eaAOHd&00JNY0w4eaAOHe7fw#LoOgNUL5gqb?
zC70Ic!h#@3B#@adRmn3KE7~auVsu=P#wD4T#A#8U7K8~Y78l}T!bj@3+FFO0$`x~!
zoRW7I6{dyAv@kUhjYOmI$Xi|yGmuP@sV$A~>Uy<GSyc)t5;{;TYKBHyD^<-=gBYKV
zB&H*giMSw3(YQn&Ob-y{^%`2WO1vaYM~yO5k%S=2ZVxkfHL0n_qhzACwUEF|l3pk=
z5fz1)5EWb=CPWlv3c2E;C4@*MF*VucVfqa&hZTs#Vqz>FV?E5(t4TA`L?3o(hZc;;
z#QFgDCrme&aB=^J`)}Mo=6;%6=a#q+xCD0rZVmz<00JNY0w4eaAOHd&00JNY0-pi`
z+&^Mo_csPN>Vb_^QQf}K<4SbMKj(9evu0Q!l`ZA-rERtBKj$T>=28GX6hK$Bc>-?N
zWmaDmL&F%Zv)!(6y{Hk-@R1pMpUX97NZG4nE`?Z^Y*px7V$wr;r@vWxpufvCX-V5F
z6}kh#&oTq2{+Qvu!Tk&FXSvUF66X$nC-~LiF9-Vq-wgcozz2cVz?*@~z5lQGk9&W;
z_h))P7yQZKQm@<_I`w}^F?>J(1V8`;KmY_l00ck)1U_B@{3Q=F#*W-jioEeCl&4dR
z9%EmB8<roeOOW?%imR$2VeIP?7hfgM6WKvphmy${*<?r0yEfoqL^kZG-+bWfH&vL2
zqvt)0%#JzathrFPDQF#!hU${0JyuS)X_Iw4{ECMeXRlgzS;^hhHtXO@zlWJ*uRHXb
z6Dd=xadhQeUCPvHN|_psqf33{0W~{h=`%&BHe>hN*=82zqhYV5%y?3K?Mz+H(q?3M
zEp^5rf4bf?l)F`#uF#N}<UGvltmtT+Irrn~Q(up%*6|>CGFUHQs%|J?>UR_f2RuyF
z=r?LZgETe7Axa$ml~z}~cCop!mV=ne%tQV{Lt`x=s>9qL_Sd`HXc(`*Hsdl|X}s)1
z)*+ZKVYbhZF?Hz&uab2J*V)TfHyQ#|kG}UBSxOLNCml%bS$3DH%1(KWEE_PTO?`G=
zm#NfFxkeTYm?sN`X=ij%_4eT?StAhjJ5Lr89pK5rit?^$0XfzWN6Fd%Q_|F5mo&9o
zlEY+Cz@)!^ved<>W=n>y|Mv&~g5kc!{WkaOT$y{sz0M5=|APAmAMZsB+CcyWKmY_l
z00ck)1V8`;KmY_l;N=h)BC&;m@PHX<XnfLdCca8S3xflLR$$3|q;DObCqab^0~d@y
zkeO#34A6HI1_!LS1dPCqW*&}`_`%hyBhIjjBch@?_RsW?w*dP4Y4nboNB{4muM+f!
z^sog@({~0*L|~|Y$POmZ9Q$a1gaIyx1|8FX@*aXU|EG%u{M;>u`(Ip|+u^>(eVzLX
zcZ>Un+|Run%BTedKmY_l00ck)1V8`;KmY_l00d4Ffs5|&fWGG5{w@S-J;OQoz@W9J
z--;b{pLGvhuoBHxCFk6O1FRJ@uvUJ&>b^R{I${FO_yBo%px;>NuP^Wky8A=A3C8k<
zK6n3+erQJmy3V*mgMR(xgZliR3o!!$vi|>nlbQeTa9`%WNWKGLlluwoHpd3P7yQHE
zSAxG9{KepYuo!$6oDGV>0WQvs1igVD1inp*;R6C700JNY0w4eaAOHd&00JQJ@ew%V
zW=B}(>mHYk6mxYrohuFo-RvOSLl=V6!&lF_*)ZGm`o=)Nn;m1DU)4Boq?&bE)7j8j
zH+z+Bcnjl|J~w-v^_h#;jVW%wk!BV)($1ZBvqP+pnqnmM>Bcm@KXKMbv`QLJ)X(Vc
z^6Ev6l+)+ktjM-`34${+%<_);bWm@Pht}aprK{q5S+`-l0mm$APU<h}s>xKk{;I+S
z9YMpJ34SBVEUC}RyE!*|nRU@}`mrzMW+&O!mkhi{x>?ko!FzOLn%*67pL6@i*rwM6
zTzaBefi>IjI_>sf)vdNtXiLc-{lf<YKmY_l00ck)1V8`;KmY_l00cnb1QVd^|1tkR
z!5xgIfdB}A00@8p2!H?xfB*=900@8pA%N%qa03tk0T2KI5C8!X009sH0T2KI5IFe+
z@cjSe_c2-s0w4eaAOHd&00JNY0w4eaAOHgN`M)c8kqKVpJ|FzI-~j?400JNY0w4ea
zAOHd&00JQJF%n=eGqvloKh)nh?)S@^D;t@tl+xA|DLQpUj0%EqC6RbuS$^mF)1Bu}
zBUf(c6QVpdQ=N?7c(Poo++V6JKbTvR;`cMz?XlIJTMJLO)|FdtKYM=T!5fkwM#lwd
zT#|V)F)c)=rMUj>@X2Ckw>H8Ch~ng5wPHz}mgH$6F_DN&iDIIze_7d7D(kz-=3A=;
zC6}K_mkM=rC0>k8M-!xAZO}!nl)FQrP`JB2o}Hchi#PASUAm{-m9Hd}`@6FX@^1F#
zeD!wx$<|(EcYga(QPsADSuM9)T}<Z|qcfS3v=MjW5rk<uGA$>RO*OA1>E>Z6pVKtD
zc}w3;RJQ8&$-E_B8|*Ud>kEa(JJ`2-cXvIvpxl3ZPsv_+z7fmBmIYyEt1$O?;b}=z
zqR)%B3Qr<8A4eZ&#_~D&c6#h)?B>pFq}4u2R`Qi(zEUdd)|vcvm9<i-fuCicB-7{r
zF7De5_XF}50KWY(dO1{s00@8p2!H?xfB*=900@8p2!H?xd^7@n7x}}0G-l!Qx%yZV
zBIxRNg^a%gi1+_L8d{VF0T2KI5C8!X009sH0T2KI5CDNs0s*}L|4Ha2*a!k300JNY
z0w4eaAOHd&00JNY0w0Y4p8tO|ekctBAOHd&00JNY0w4eaAOHd&00N%`0(k!aN$4fm
z2m&Ag0w4eaAOHd&00JNY0w4eaAB_N={||604ELAh8vy@|`#$#_?mu&1=l+EI1MXjO
zU*^8V{R;QX+!wiD;C`NapZjTUkE?LM$9<LiO|HnTkz)9O00@8p2!H?xfB*=900@8p
z2!H?x=mb12mhHKuZwK}5t909aUf+iF?JIQa>({sE^lcyAde7?HGy3*4-Fi5E8`QS}
zy7dp}+l%`40^Pd&`nFr&`slXHt8YE}*6nurSr^@Oxm<ofp8vy5K>!3m00ck)1V8`;
zKmY_l00cnb<P*UB|K#^ES_lFl00JNY0w4eaAOHd&00JNY0+|292S5M>KmY_l00ck)
z1V8`;KmY_l;N%m){Qu<lF<J-$AOHd&00JNY0w4eaAOHd&00Nl*!v{bB1V8`;KmY_l
z00ck)1V8`;K;YyP!2JK@_c2-s0w4eaAOHd&00JNY0w4eaAOHdZir_TE1ple^112B<
z0w4eaAOHd&00JNY0w4eaAn>shU>_#A5c?CXUlPRVxFC&7GA|~kWocTFCWM$A72~q9
zspgfg8*55&Rn73(Tv@B6ib_F!jn6CQF0T|byjoCl`3W~^(~pu|Uz<wB>4-ETN2lUb
zQAx>HK2(+eq`jTuv>2U;CL(b$CMuaiuK1xUeM~C#2O1hL2-9+8T24$v5-~X@8;z%J
z`V47PTUjYGA;hO5@dRy?o6i5wb$yBH`jYE?*MD&T7tg47+51J`nD6u5f4}>CJ-^iR
zd#C=imk(qDzY%;Z_zmt0UDw!mncruA_d|JtyEbv&7kZdvYmaipjJl&#D{HB$rk0J(
zrdlrKG%Z&uYN<GB#0rH|{ZJZ+@Nsl>GUNP>#hK*N3_myj&dgJO_z3n6^9%C_2@dn4
z!*)AUxy*35HX1UZ%pC?rjmHGyE|Jc5gpO>mRo77r*1JeIm3_q*dUKqujWn6MS}s*L
zwUnSH<b)E*+6EdKuXHl2sa&%$MmA-p?-{t3Szl;!lHFG-%1U0%tdsM*lq%#_%Swg1
zPD?_UseCE<_T3qNxFw%fPa4PPiWPNLE%WmWOZ@z!yLb8fi*xsqi_83-nPootXlY??
zp44=2W`5~4(!-mZ!~B*~POmBDQ7IY?*Nc%%dX?#%ON!=mDp8nGDrzNHQ0qm*_q)8I
zu`za8Z<+QypR1@TO?_Tfi)pp#(AChYrp!_OI!8)|_q}dkNS4_bvXfT2MA}-cq$<0c
z7C>i`r=f0(m{a0d%o?$Xg3thsU`geb6*X^@YZfV#G6!TonxA{{XohsAT@&dGqf9tF
z<MD=;WtPz$*ThBKw4@)WOs8-*F(tN1^zKi1eYA_->(hDaj&7gNO^5DAj!n5Qfnl@}
zVT1W?U3zim=FH;E{EeB1^%KEa$TTTTxTOi}13Rpa+gSlUL!E`g;WvEV(1Wo~+?$Z3
z$n~CFi*2C3+UagzXlRJ7ZP>i^Yk@AP?{&AKtY^Fgz;Op)-e_@H_IpFKLkG6VxLO&F
z(f9rP@g83&kzn6D)zl70V>P=?&eWbx?Q;qptF4BahdPRFmcu{nKB9fzdhv96T2rUm
zwbXs6ZV7Ro#+t+7JEy#%RN@G{?Sh)=NJh1e^iwZB)9VXezRbQqV)p~Rz3C>>o!&OI
zY5K7MZz`I$T`Chk)~!O6;tf|leJGkQt>%ht?gs=$PD^Q3(g4GRl~O5Rzgv)8n%a1h
z%B>Dd<m|z(ZHZHoh}6f#9VPT}vYi`iyysCvD@ryy%r_fJa+Gu>w?%G=%~|vgm|7>-
z;P$seG2ji&Tt2YpDFL&y>26^ET+kO9A7@{DuCaepx+@rGm|n&>4tD5mQ~X$+u2+Aw
zbApQ6XM;V+Il}3r+i#bxpGlT>(xry?6HCJ3H#u+U;rQVs4Jr<xCJ1gndD<6BCfWA_
zO<Z+-jx(%&BDIX^Pj_P7T*Y5Ab=&xtaV2x`Z>%^Ret5<kT1_6_3C%p5-O-$Prsh8D
z3%xPM*2e82xkGV8jAg|YG2L_tK5O=cb7Iq`lw&+@=hE(JzUPN)7y5jmI|;V-x^0Hx
ze|Ev9`9Vu|UmK%Zgz9q)hixrF)I=kZdVlTGIm5P@gKV>BoMZ&jQscQJ*=E&om~A!_
zV@kvH8`G*G+d#debu+Y-HCMCGEhD49jZy8&Im~fnQ%L$DWfV9SV7RU?GhJVHMO=UC
z{yW}j@9+3-b+g@{?fy;wcF!*cwgaE({ZHJl(I3}Ou_G?A>%TJpo~e?b<9{B7y`kKV
zgH8xCNy(-4c^$cjq)SyYXGs;+?UY1ObjS=p8a-~c`iQMVwWBXSdqp3@y&tMy0$WAf
z+cjc#lsN@$FLbQS-bWu{9B^AVN4#wZ8j&LpG@O#{2O3QhbihDkVy)wabXg@MhD=JS
z)P5Wy5uc#I%`pORA8SzT#q|sNIPQH`KiSNwxb7AyGF)yxzR-ArHD@2|)S`pdQZYp%
zH0{UcrImFxUC{>(6?Lbg2aSk>o5^K$lZ@@Galh0Y?Jz3O=9Sf9UMnd1JPAMX)uNVL
zC4*t-7@tI#NB}!kP&G|iC6*Yf%or6>*L*9s$Bs0H<(!7KiD#H#=!D<871-siIGD4J
z`Yp&R8Lo9-G;Us^e)DQZpRz_E%^9yY-n^Q#>*b7_S93O1-`w(WjTvy>N1Myk@1xBb
zgNK-6-G4iqV!;d7re5`h!eMs*y3=np(s{&}OugpOrM5n6X43YVyQvLz*LEc5wbB`(
zBt2-!lUbG0>L=>XX0EKJ=#;CCJBME%^oAC~o$kerme)gLrpC)ZdC3=gJ<QgO@k^6%
zMvan)@RZb;%(rD;Z-QB-fw-AT(Ks6uuEj6w*NS~}PQSUScSp9A&zH8z)V}F>sF8bf
zw&~cdr@=wtU{e<%+Z;tE{bCu?ni<}|Fs!@Fi-IwxFiq7e<VIJpEHjR-v^U$xJeJWU
zn5xpdDVeuds#@#amPDTmt$t+QgAE^YUZ^@%W1Sl<Xc{g~trwP^5yPo27=z*lH1$)t
zk<oCYQ#EGR%b3IAh6*V_%g`{l$o>%x)?uVapKdf<af~<vb?W-_)b`gVBGM+L<gANG
z9A%`}=3+%kRyXN|jE)4`<cG<W<enpBc!$h09EbX272<DZ?7#hJywemTe22^~K6GUr
zCKjVFo?bWR6n8%KoZ@=Z^`Py9=vdc<&Y`?d>ujTqj~&Ga|Jm^-w;h~CpZSgw*M4%m
zY7d+<TkrpK-?Dy=Kdnbe5C8!X009sH0T2KI5C8!X009sHfsd2GpxZ;#hurkVfHQ6v
z*`9KDk*&vFpZ|Z4Gk-`jJ|F-BAOHd&00JNY0w4eaAOHd&00N&>0_SNAppS+Cf;0l)
zrvU(Wp!b&;fA@D8?gi%!{;gnd;Df-~Q=jYpZqHDULh|te0T2KI5C8!X0D(^`f&EyI
z=iZAiBrEdPZh0$F*ez$(mGs*7&UP-7jps^gbvHhxt?w>NGt#|xR(I#6#r*v2e12Ja
zT$q<0?aZ&wZO<=lNY9oYNY9?kN%OP!b{F26i!3kY*PbnH#^&;gwanAS(o^~I-m|B-
zv&!tvJ>|yS)ZF@Vbm7SZX})kfe{XNGu>53MxVN+{%<paNEG*3l&)!My%}XTj$>Q4b
z-p%!erOd{{JIUPL8@IE|Pag})&4iei9`8PtZm%s%mHbNKL2e;;dqXMQtUi<C)nzGB
z&D^@ZxtxpY`tKGjxy8M^8{*cp*~i+0!p(I>dR%>WV@_+a^9iYM{bs`WIxTrzNYJm-
z5~9;md?GO=%JIm4tXC(u78NyVrJ9wVOIzva-nNjaZi}0RlBkt;3JG}&<akM(mgH$6
zF_DN)MH5r|v2LB*>QrHBw^S6xmHbpSw_PeeFXgva5|NFSs;aE1d!Kr8abAo~M-%kh
z)}&ZMo{EyI%ol2&Lr>OwPnNeAo;=GvTVLH>-dl|>uV>chXUU0Lc$QmUO3TaZ<p1@V
zoqN*l+`Kfmw=g>wp(kth!5eS1b$CgPMB?vyJ@<(6mFJQcD@N06+3nq`D(&sAXd9KX
zoLem^YkTSF&P!2lw4646LQDu#G2va0u3VH0>nqW{^7iIVTFdN}5|y2dyrN0zm9i$q
zwBk!qKE+dS6{aJJiK*C>AV%JG>&i20qM((t`M6rhr%QseKDDX|+0547TC^Z!vZa@;
zJQ|hA*WtbE(v=r78-=pAr)r{5Tw5>2O3{^sB(H975)!*>TdOZ!xgd#A>D?|}d0F1t
zku`Bjh^OW4qL{A6g^iW%TzM)VPps#63NKZ;7@vqn#n@ErT~=2f-w-0vO+i()Z2Y+r
zdA=*Ilq8XGNXOTsxpd;?DvwRX#Yj97?+N}(#vlBE;cju?;6}JY@IMAW;C_Mo*TEkJ
zfAmSc*~4xS009sH0T2KI5C8!X009sHfggJUS6uhl!y=8nq!m{SrF40FUDYaDyt-MI
z3*ve{Ur-~}%BrkvXG+;qw5G!%Z{1Yru#j*M6*?>$<fTG~MQuD(=&<ODn+hEk1#wZK
z!=e>kBd&Y?!=egw{l7o>-x=<k+;4He!u<@F<z_jOz>NmK_G9lYFc1Vl00ck)1V8`;
zKmY_l00cnb(@20DWiC6Gb=a$M#6(<*_Fi%&Sx0u$GN+z~?3NWN-3{4^=A}N3mA9<w
z@HUigS$E;-lx?hxaCgks*Dko)X4h92bPc+a=3h%B%eySyqV@cr{{27ZG{bOzMt=Us
zr_pWDW)J`Y5C8!X009sH0T2KI5C8!XIB5iYte?L6A2j~+`B@iz{_o|!$#8$k{eVOO
z{wG-n@ZFQvYP1IgKmY_l00ck)1V8`;KmY_l00deHT=ROF*pQ!{SGV~&@`q6QY`Ik6
zlf~6)UMU;v2c&UH?iyjej6CG`&no4NTI3g%4V5?kWOJr2C2`+kMkbqt%4(*%V~Y&A
zz06@Eu0usGc6pg0qUgrLqQ)2KU%#zuaJ&4h&*Ng*E-&46(~XO6x?C>5zyAFHZDv@X
z|6}&w;u1&z0T2KI5C8!X009sH0T2KI5C8#&slCqjGPUc;@%})-pG<D9Y-F-hN?TK;
z=+qT4DhR@rSXSEETYA3qd||6{<;nWYv*g~L8)MR>GCLMcKaFpR>SHx}W3@Opr^TK<
z*&BQO_*Qy0I=gCqOC^mr@RC5kmQ{>S#D%yh%SvT^SJ`}PwV>qk6X{YxDQ0%-Q+}s(
zA|8(m?Q#-=7#FAL{NKwBFx=O<uW)~lt8#bA0X`rA0w4eaAOHd&00JNY0w4eaAn@rS
zFzNF#-E-ujdWC$=AfKaa0akW-B~!>1c_mv>%Y44Hnk(9K>+4=p;3#VchTTN)kca-m
zuES*px`<4N$Nth4mSi5fLV>RT*WdsD{->v7(NYiq0T2KI5C8!X009sH0T2KI5ID&M
z`ds7w=5+&Rd%MX0SIO_lNp3&d1_B@e0w4eaAOHd&00JNY0w4eapEd$MSHGXWGeFn>
zvs{uP|L_3;5C8!X009sH0T2KI5C8!X009u_M4<LJ*Z|}IYk2=(BrpF@%Tp6mv1mLd
zHb2Kd`uqQSJ(4gX2vc%IqU--z?)wb+hYtvV00@8p2!H?xfB*=900@8p2!Ox|Akc38
szcK&+bB6o#6VO030R%t*1V8`;KmY_l00ck)1V8`;K%jwuwf_JA1IRsfd;kCd

diff --git a/items/api/urls.py b/items/api/urls.py
index aaefe35..d2ad4d7 100644
--- a/items/api/urls.py
+++ b/items/api/urls.py
@@ -7,4 +7,4 @@
     url(r'^create/$', ItemCreateAPIView.as_view()),
     url(r'^list/$', ItemGenericListAPIView.as_view()),
     url(r'^generics/id/(?P<id>\d+)/$', ItemGenericRetrieveUpdateAPIView.as_view(), name="item-generic-single"),
-)
\ No newline at end of file
+)

From afb74bf1f344a7e6541140c09fb8db7cae1fb3ca Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Wed, 25 Feb 2015 11:25:59 -0800
Subject: [PATCH 10/43] main.css changed

---
 static/.tmp/styles/main.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index bfaf811..22bc4b9 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -84,4 +84,6 @@ body {
   .other-color{
       background: #f0ac1d;
   }
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2QjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2YwYWMxZDtcbiAgfVxufVxuIl19 */
\ No newline at end of file

From e7e5814f507abcf0efa18203b30d6b5041ae1586 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Wed, 25 Feb 2015 13:22:35 -0800
Subject: [PATCH 11/43] added login links to nav bar

---
 appuser/migrations/0001_initial.py      | 41 +++++++++++++++++++++++++
 items/migrations/0001_initial.py        | 34 ++++++++++++++++++++
 static/app/index.html                   |  7 ++++-
 static/app/scripts/controllers/login.js |  2 ++
 static/app/scripts/controllers/main.js  |  2 +-
 static/app/views/main.html              |  2 +-
 6 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 appuser/migrations/0001_initial.py
 create mode 100644 items/migrations/0001_initial.py

diff --git a/appuser/migrations/0001_initial.py b/appuser/migrations/0001_initial.py
new file mode 100644
index 0000000..39cf509
--- /dev/null
+++ b/appuser/migrations/0001_initial.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('items', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Follower',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('followee', models.ForeignKey(related_name='followee', to=settings.AUTH_USER_MODEL)),
+                ('follower', models.ForeignKey(related_name='follower', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Stream',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('created', models.DateField(null=True, blank=True)),
+                ('status', models.BooleanField(default=True)),
+                ('deleted_status', models.BooleanField(default=False)),
+                ('item', models.ForeignKey(related_name='item_id', to='items.Item')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
new file mode 100644
index 0000000..c6130f8
--- /dev/null
+++ b/items/migrations/0001_initial.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('item_name', models.CharField(max_length=100)),
+                ('description', models.TextField(max_length=500)),
+                ('created', models.DateField(auto_now_add=True)),
+                ('image', models.CharField(max_length=100, null=True, blank=True)),
+                ('availability', models.BooleanField(default=True)),
+                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
+                ('claimer', models.ForeignKey(related_name='claimed_items', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('poster', models.ForeignKey(related_name='posted_items', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Item',
+                'verbose_name_plural': 'Items',
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/static/app/index.html b/static/app/index.html
index 2d97b0e..0a53e06 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -38,13 +38,18 @@
 
           </div>
 
-          <div class="collapse navbar-collapse" id="js-navbar-collapse">
+          <div class="collapse navbar-collapse" id="js-navbar-collapse" ng-controller="LoginCtrl">
 
             <ul class="nav navbar-nav">
               <li class="active"><a href="#/">Home</a></li>
               <li><a ng-href="#/friendscrap">Friends Crap</a></li>
               <li><a ng-href="#/mycrap">My Crap</a></li>
               <li><a ng-href="#/myfriends">My Friends</a></li>
+              <li><a ng-href="#/login">Login</a></li>
+              <li><a ng-href="#/logout">Logout</a></li>
+              <li> Hello {{ name }}</li>
+
+
             </ul>
           <img src="/images/noun_28242_cc.png" class="img pull-right" style="width: 7%; height: 7%"/>
           </div>
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
index 17fd207..738f5df 100644
--- a/static/app/scripts/controllers/login.js
+++ b/static/app/scripts/controllers/login.js
@@ -4,6 +4,7 @@ angular.module('declutterApp')
   .controller('LoginCtrl', function ($scope, $location, djangoAuth, Validate) {
     $scope.model = {'username':'','password':''};
   	$scope.complete = false;
+    $scope.name = "";
     $scope.login = function(formData){
       $scope.errors = [];
       Validate.form_validation(formData,$scope.errors);
@@ -12,6 +13,7 @@ angular.module('declutterApp')
         .then(function(data){
         	// success case
         	$location.path("/");
+            $scope.name = $scope.model.username;
         },function(data){
         	// error case
         	$scope.errors = data;
diff --git a/static/app/scripts/controllers/main.js b/static/app/scripts/controllers/main.js
index 8d6a4bd..f84e638 100644
--- a/static/app/scripts/controllers/main.js
+++ b/static/app/scripts/controllers/main.js
@@ -14,4 +14,4 @@ angular.module('declutterApp')
       'AngularJS',
       'Karma'
     ];
-  });
+   });
diff --git a/static/app/views/main.html b/static/app/views/main.html
index 0c31cdd..32f9931 100644
--- a/static/app/views/main.html
+++ b/static/app/views/main.html
@@ -4,7 +4,7 @@ <h1>It's time to decrapify your life!</h1>
     <p class="lead">
     Get rid of your unused stuff. <br>And feel good it's not headed to landfill.
     </p>
-  <p><a class="btn btn-lg btn-primary" ng-href="#/login">Get Started!<span class="glyphicon glyphicon-ok"></span></a></p>
+  <p><a class="btn btn-lg btn-primary" ng-href="#/register">Sign Up <span class="glyphicon glyphicon-ok"></span></a></p>
 </div>
 
 <div class="row marketing">

From defb246c84df08910db0a3aa8ed6772d154e00f4 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 09:27:57 -0800
Subject: [PATCH 12/43] Authentication on Angular with validation complete

---
 appuser/views.py                           |  6 +-
 static/.tmp/styles/main.css                | 46 +++++++--------
 static/app/index.html                      |  3 +-
 static/app/scripts/app.js                  | 49 ++++++++++++---
 static/app/scripts/app.js.orig             | 69 ----------------------
 static/app/scripts/controllers/login.js    |  7 +--
 static/app/scripts/controllers/logout.js   |  6 +-
 static/app/scripts/controllers/register.js |  3 +-
 8 files changed, 80 insertions(+), 109 deletions(-)
 delete mode 100644 static/app/scripts/app.js.orig

diff --git a/appuser/views.py b/appuser/views.py
index d9f6c11..76709e3 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -64,7 +64,11 @@ class FollowerCreateAPIView(CreateAPIView):
     serializer_class = FollowerSerializer
 
     def post(self, request, *args, **kwargs):
-        follower_id = User.objects.get(email=request.data['follower'])
+        try:
+            follower_id = User.objects.get(email=request.data['follower'])
+
+        except:
+            return Response({"error": "This user does not exist"}, status=status.HTTP_404_NOT_FOUND)
 
         data = {
             'followee': request.user.id,
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index c08d946..22bc4b9 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -61,31 +61,29 @@ body {
 
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
-    .container {
-        max-width: 730px;
-    }
+  .container {
+    max-width: 730px;
+  }
 
-    /* Remove the padding we set earlier */
-    .header,
-    .marketing,
-    .footer {
-        padding-left: 0;
-        padding-right: 0;
-    }
+  /* Remove the padding we set earlier */
+  .header,
+  .marketing,
+  .footer {
+    padding-left: 0;
+    padding-right: 0;
+  }
+  /* Space out the masthead */
+  .header {
+    margin-bottom: 30px;
+  }
+  /* Remove the bottom border on the jumbotron for visual effect */
+  .jumbotron {
+    border-bottom: 0;
+  }
 
-    /* Space out the masthead */
-    .header {
-        margin-bottom: 30px;
-    }
-
-    /* Remove the bottom border on the jumbotron for visual effect */
-    .jumbotron {
-        border-bottom: 0;
-    }
-
-    .other-color {
-        background: #f0ac1d;
-    }
+  .other-color{
+      background: #f0ac1d;
+  }
 }
 
-
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2QjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2YwYWMxZDtcbiAgfVxufVxuIl19 */
\ No newline at end of file
diff --git a/static/app/index.html b/static/app/index.html
index 0a53e06..d11e1d2 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -47,7 +47,7 @@
               <li><a ng-href="#/myfriends">My Friends</a></li>
               <li><a ng-href="#/login">Login</a></li>
               <li><a ng-href="#/logout">Logout</a></li>
-              <li> Hello {{ name }}</li>
+              <li> Hello {{ logname }}</li>
 
 
             </ul>
@@ -104,6 +104,7 @@
         <script src="scripts/controllers/mycrap.js"></script>
         <script src="scripts/controllers/myfriends.js"></script>
         <script src="scripts/controllers/login.js"></script>
+        <script src="scripts/controllers/logout.js"></script>
         <script src="scripts/controllers/register.js"></script>
         <!-- endbuild -->
 </body>
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 648ad9f..a0ef7f2 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -33,31 +33,66 @@ angular
         })
         .when('/friendscrap', {
             templateUrl: 'views/friendscrap.html',
-            controller: 'FriendscrapCtrl'
+            controller: 'FriendscrapCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+          }],
+        }
         })
         .when('/mycrap', {
             templateUrl: 'views/mycrap.html',
-            controller: 'MycrapCtrl'
+            controller: 'MycrapCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
         .when('/mycrap/myclaimed', {
             templateUrl: 'views/myclaimed.html',
-            controller: 'MycrapCtrl'
+            controller: 'MycrapCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
         .when('/mycrap/postitem', {
             templateUrl: 'views/postitem.html',
-            controller: 'MycrapCtrl'
+            controller: 'MycrapCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
         .when('/mycrap/:item', {
             templateUrl: 'views/edititem.html',
-            controller: 'MycrapCtrl'
+            controller: 'MycrapCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
         .when('/myfriends', {
             templateUrl: 'views/myfriends.html',
-            controller: 'MyfriendsCtrl'
+            controller: 'MyfriendsCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
         .when('/myfriends/addfriend', {
             templateUrl: 'views/addfriend.html',
-            controller: 'MyfriendsCtrl'
+            controller: 'MyfriendsCtrl',
+            resolve: {
+            authenticated: ['djangoAuth', function(djangoAuth){
+            return djangoAuth.authenticationStatus();
+            }],
+            }
         })
       .otherwise({
         redirectTo: '/'
diff --git a/static/app/scripts/app.js.orig b/static/app/scripts/app.js.orig
deleted file mode 100644
index 5202665..0000000
--- a/static/app/scripts/app.js.orig
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-angular
-  .module('declutterApp', [
-    'ngAnimate',
-    'ngCookies',
-    'ngResource',
-    'ngRoute',
-    'ngSanitize',
-    'ngTouch'
-  ])
-  .config(function ($routeProvider) {
-    $routeProvider
-      .when('/', {
-        templateUrl: '/views/main.html',
-        controller: 'MainCtrl'
-      })
-      .when('/about', {
-        templateUrl: '/views/about.html',
-        controller: 'AboutCtrl'
-      })
-      .when('/login', {
-            templateUrl: 'views/login.html',
-            controller: 'LoginCtrl'
-        })
-        .when('/logout', {
-            templateUrl: 'views/logout.html',
-            controller: 'LogoutCtrl'
-        })
-        .when('/register', {
-            templateUrl: 'views/register.html',
-            controller: 'RegisterCtrl'
-        })
-        .when('/friendscrap', {
-            templateUrl: 'views/friendscrap.html',
-            controller: 'FriendscrapCtrl'
-        })
-        .when('/mycrap', {
-<<<<<<< HEAD
-            templateUrl: '/views/mycrap.html',
-=======
-            templateUrl: 'views/mycrap.html',
->>>>>>> b064e6fde9b41fb5cddd1609956abd9b9a50b9c9
-            controller: 'MycrapCtrl'
-        })
-        .when('/mycrap/myclaimed', {
-            templateUrl: 'views/myclaimed.html',
-            controller: 'MycrapCtrl'
-        })
-        .when('/mycrap/postitem', {
-            templateUrl: 'views/postitem.html',
-            controller: 'MycrapCtrl'
-        })
-        .when('/mycrap/:item', {
-            templateUrl: 'views/edititem.html',
-            controller: 'MycrapCtrl'
-        })
-        .when('/myfriends', {
-            templateUrl: 'views/myfriends.html',
-            controller: 'MyfriendsCtrl'
-        })
-        .when('/myfriends/addfriend', {
-            templateUrl: 'views/addfriend.html',
-            controller: 'MyfriendsCtrl'
-        })
-      .otherwise({
-        redirectTo: '/'
-      });
-  });
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
index 738f5df..404e13b 100644
--- a/static/app/scripts/controllers/login.js
+++ b/static/app/scripts/controllers/login.js
@@ -1,10 +1,9 @@
 'use strict';
 
 angular.module('declutterApp')
-  .controller('LoginCtrl', function ($scope, $location, djangoAuth, Validate) {
+  .controller('LoginCtrl', function ($scope, $location, $rootScope, djangoAuth, Validate) {
     $scope.model = {'username':'','password':''};
   	$scope.complete = false;
-    $scope.name = "";
     $scope.login = function(formData){
       $scope.errors = [];
       Validate.form_validation(formData,$scope.errors);
@@ -12,8 +11,8 @@ angular.module('declutterApp')
         djangoAuth.login($scope.model.username, $scope.model.password)
         .then(function(data){
         	// success case
-        	$location.path("/");
-            $scope.name = $scope.model.username;
+        	$location.path("/mycrap");
+            $rootScope.logname = $scope.model.username;
         },function(data){
         	// error case
         	$scope.errors = data;
diff --git a/static/app/scripts/controllers/logout.js b/static/app/scripts/controllers/logout.js
index 1d0e326..d6d75a5 100755
--- a/static/app/scripts/controllers/logout.js
+++ b/static/app/scripts/controllers/logout.js
@@ -1,6 +1,8 @@
 'use strict';
 
 angular.module('declutterApp')
-  .controller('LogoutCtrl', function ($scope, $location, djangoAuth) {
+  .controller('LogoutCtrl', function ($scope, $location, $timeout, $rootScope, $window, djangoAuth) {
+    $rootScope.logname='';
     djangoAuth.logout();
-  });
+    $window.location.href = "/";
+   });
diff --git a/static/app/scripts/controllers/register.js b/static/app/scripts/controllers/register.js
index e9530a8..01b202f 100644
--- a/static/app/scripts/controllers/register.js
+++ b/static/app/scripts/controllers/register.js
@@ -12,7 +12,8 @@ angular.module('declutterApp')
         .then(function(data){
         	// success case
         	$scope.complete = true;
-          $location.path("/");
+            alert("Thank you for registering");
+          $location.path("/login");
         },function(data){
         	// error case
         	$scope.errors = data;

From b08a92af094dc89bf72bb7b2dbf4b150b9d83329 Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 09:34:17 -0800
Subject: [PATCH 13/43] shanarae 2/25 updates

---
 .gitignore                                    |  3 +-
 items/api/urls.py                             |  8 ++-
 items/api/views.py                            | 32 ++++++++-
 static/.tmp/styles/main.css                   |  7 +-
 static/app/index.html                         |  3 +
 static/app/scripts/app.js                     |  2 +-
 static/app/scripts/controllers/config.js      | 17 +++++
 static/app/scripts/controllers/friendscrap.js | 72 +++++++++++++++++--
 static/app/scripts/controllers/myclaimed.js   | 24 +++++++
 static/app/scripts/controllers/mycrap.js      |  6 +-
 static/app/views/myclaimed.html               | 29 +++++++-
 static/app/views/mycrap.html                  | 12 ++--
 12 files changed, 188 insertions(+), 27 deletions(-)
 create mode 100644 static/app/scripts/controllers/config.js
 create mode 100644 static/app/scripts/controllers/myclaimed.js

diff --git a/.gitignore b/.gitignore
index 0377a63..f6ffe5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 local_settings.py
 *.pyc
 .idea/
-declutter_db.sqlite3
\ No newline at end of file
+declutter_db.sqlite3
+declutter_db.sqlite3.orig
\ No newline at end of file
diff --git a/items/api/urls.py b/items/api/urls.py
index a6b044f..c54afe6 100644
--- a/items/api/urls.py
+++ b/items/api/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 from views import ItemListAPIView, ItemDetailAPIView, ItemCreateAPIView, ItemGenericListAPIView, ItemGenericRetrieveUpdateAPIView, ItemListCreateAPIView, \
-    ClaimItemListCreateAPIView
+    ClaimItemListCreateAPIView, ClaimItemDetailAPIView, ClaimGenericRetrieveUpdateAPIView
 
 urlpatterns = patterns('',
     url(r'^$', ItemListAPIView.as_view(), name='ItemListAPIView'),
@@ -8,6 +8,8 @@
     url(r'^create/$', ItemCreateAPIView.as_view()),
     url(r'^list/$', ItemGenericListAPIView.as_view()),
     url(r'^generics/id/(?P<id>\d+)/$', ItemGenericRetrieveUpdateAPIView.as_view(), name="item-generic-single"),
-    url(r'^poster/(?P<poster>\d+)/$', ItemListCreateAPIView.as_view()),
-    url(r'^claimer/(?P<claimer>\d+)/$', ClaimItemListCreateAPIView.as_view()),
+    url(r'^poster/$', ItemListCreateAPIView.as_view()),
+    url(r'^claimer/$', ClaimItemListCreateAPIView.as_view()),
+    url(r'^claim/(?P<item_id>\d+)/$', ClaimItemDetailAPIView.as_view()),
+    url(r'^mine/(?P<id>\d+)/$', ClaimGenericRetrieveUpdateAPIView.as_view()),
 )
diff --git a/items/api/views.py b/items/api/views.py
index d405946..6be16fc 100644
--- a/items/api/views.py
+++ b/items/api/views.py
@@ -2,7 +2,7 @@
 from rest_framework import status
 from rest_framework.generics import CreateAPIView, ListAPIView, RetrieveUpdateAPIView, ListCreateAPIView
 from items.api.serializers import ItemSerializer
-from items.models import Item
+from items.models import Item, User
 
 
 class ItemListAPIView(APIView):
@@ -83,4 +83,32 @@ class ClaimItemListCreateAPIView(ListCreateAPIView):
 
     def get_queryset(self):
         user = self.request.user
-        return Item.Objects.filter(claimer=user)
\ No newline at end of file
+        return Item.objects.filter(claimer=user)
+
+
+class ClaimItemDetailAPIView(CreateAPIView):
+    serializer_class = ItemSerializer
+
+    def put(self, request, *args, **kwargs):
+        serializer = ItemSerializer(data=request.data)
+        item = Item.objects.filter(pk=kwargs['item_id'])
+        user = self.request.user
+        # user = User.objects.get(username=request.DATA['user'])
+        item.update(claimer=user)
+
+        if serializer.is_valid():
+            serializer.save(claimer=request.user)
+            #can we add availability=false here?
+            return Response(serializer.data, status=status.HTTP_202_ACCEPTED)
+
+        else:
+            return Response(serializer.errors, status.HTTP_400_BAD_REQUEST)
+
+
+class ClaimGenericRetrieveUpdateAPIView(RetrieveUpdateAPIView):
+    model = Item
+    serializer_class = ItemSerializer
+    lookup_field = 'id'
+
+    def get_queryset(self):
+        return Item.objects.all()
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index a4c7bb8..22bc4b9 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -80,11 +80,10 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
-<<<<<<< HEAD
-=======
 
   .other-color{
       background: #f0ac1d;
   }
->>>>>>> ebdf937432e747e27a0f68c15e3d0b09128b03c1
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2QjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2YwYWMxZDtcbiAgfVxufVxuIl19 */
\ No newline at end of file
diff --git a/static/app/index.html b/static/app/index.html
index 0a53e06..57a4ebc 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -95,6 +95,7 @@
     <!-- endbuild -->
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
+        <script src="scripts/controller/config.js"></script>
         <script src="scripts/app.js"></script>
         <script src="scripts/services/djangoAuth.js"></script>
         <script src="scripts/services/validate.js"></script>
@@ -102,8 +103,10 @@
         <script src="scripts/controllers/about.js"></script>
         <script src="scripts/controllers/friendscrap.js"></script>
         <script src="scripts/controllers/mycrap.js"></script>
+        <script src="scripts/controllers/myclaimed.js"></script>
         <script src="scripts/controllers/myfriends.js"></script>
         <script src="scripts/controllers/login.js"></script>
+        <script src="scripts/controllers/logout.js"></script>
         <script src="scripts/controllers/register.js"></script>
         <!-- endbuild -->
 </body>
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 648ad9f..6aea059 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -41,7 +41,7 @@ angular
         })
         .when('/mycrap/myclaimed', {
             templateUrl: 'views/myclaimed.html',
-            controller: 'MycrapCtrl'
+            controller: 'MyclaimedCtrl'
         })
         .when('/mycrap/postitem', {
             templateUrl: 'views/postitem.html',
diff --git a/static/app/scripts/controllers/config.js b/static/app/scripts/controllers/config.js
new file mode 100644
index 0000000..3804d39
--- /dev/null
+++ b/static/app/scripts/controllers/config.js
@@ -0,0 +1,17 @@
+angular.module('declutterApp')
+ // Here we see the name of the controller defined.
+ // Following the name, we see an anonymous function with one argument.
+ // These arguments are functionality being injected into the controller.
+ // Think of this as being like including scripts in HTML.
+ // Unless they are referenced here, you cannot utilize them.
+ .config(
+   function($httpProvider){
+       $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+       $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+     // $httpProvider.defaults.headers.common['Access-Control-Allow-Origin'] = "*";
+     // $httpProvider.defaults.headers.common['Access-Control-Allow-Methods'] = ['OPTIONS', 'POST'];
+     // $httpProvider.defaults.headers.common['Access-Control-Allow-Headers'] = 'Content-Type';
+     // $httpProvider.defaults.headers.post["Content-Type"] = "multipart/form-data";
+     // $httpProvider.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded";
+     // delete $httpProvider.defaults.headers.common['X-Requested-With'];
+   });
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 6fa4fcf..4e6b82b 100644
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -5,10 +5,70 @@
 'use strict';
 
 angular.module('declutterApp')
-  .controller('FriendscrapCtrl', function ($scope, $http) {
-    $http.get('/api/items/').success(function(data) {
-        $scope.items = data;
-    }).
-  error(function(data, status, headers, config) {
-    });
+  .controller('FriendscrapCtrl', function ($scope, $http, $cookies) {
+        $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+
+        $http.get('/api/items/').success(function(data) {
+            $scope.items = data;
+        }).
+            error(function(data, status, headers, config) {
+            });
+
+
+
+
+        //shanarae's code
+        //
+        //$scope.claimItem = function(){
+        //    $http.put('/api/items/mine/' + item_id).
+        //    success(function(data){
+        //            $scope.items.put({item.claimer=user});
+        //    need to update claimer with user and availability to false
+        //            alert("You've claimed this item!");
+        //        }).
+        //    error(function(data){
+        //            $scope.error = ["Error claiming item"];
+        //            console.log("error" + data.error);
+        //        });
+        //};
+
+    //
+    //
+    //$scope.addItem = function(){
+    //    var data = {
+    //        "item_name":$scope.formItemName,
+    //        "description":$scope.formItemDescription,
+    //        "category":$scope.formItemCategory
+    //    };
+    //
+    //    $http.post('/api/items/create/', data).
+    //    success(function(data){
+    //            $scope.items.push({item_name:data.item_name, description:data.description, category:data.category});
+    //            $scope.formItemName = '';
+    //            $scope.formItemDescription = '';
+    //            $scope.formItemCategory = '';
+    //            $location.path('/mycrap');
+    //            alert("Your new item has been posted!");
+    //            }).
+    //
+    //        error(function(data){
+    //            $scope.error = ["Error adding new item"];
+    //            console.log("error" + data.error);
+    //        });
+    //    };
+    //
+    //$scope.removeItem = function(item){
+    //    $http.delete('api/items/item/' + item.id).
+    //    success(function(data){
+    //            $scope.items.splice(
+    //                $scope.items.indexOf(item),
+    //                1
+    //            );
+    //        }).
+    //        error(function(data){
+    //            $scope.error = ["Error deleting item"];
+    //        });
+    //};
+
+
   });
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
new file mode 100644
index 0000000..b8e2784
--- /dev/null
+++ b/static/app/scripts/controllers/myclaimed.js
@@ -0,0 +1,24 @@
+'use strict';
+
+angular.module('declutterApp')
+
+  .controller('MyclaimedCtrl', function ($scope, $http, $cookies) {
+    $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+
+
+    var items_request = $http.get('/api/items/claimer');
+    items_request.success(function(data){
+        console.log("success" + data);
+        $scope.items=data;
+    });
+    items_request.error(function(data){
+        $scope.error = ["Error with items"];
+        console.log("error" + data);
+    });
+
+    $scope.getTotalItems = function(){
+        return $scope.items ? $scope.items.length : 0;
+    };
+
+
+  });
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index dbaf157..a69b584 100644
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -18,7 +18,7 @@ angular.module('declutterApp')
         {category:'AUTOMOTIVE', name:'Automotive'}
     ];
 
-    var items_request = $http.get('/api/items/');
+    var items_request = $http.get('/api/items/poster/');
     items_request.success(function(data){
         console.log("success" + data);
         $scope.items=data;
@@ -68,4 +68,8 @@ angular.module('declutterApp')
             });
     };
 
+    $scope.delete = function(item) {
+        alert("Deleting the item");
+        return item.show = true;
+    };
   });
diff --git a/static/app/views/myclaimed.html b/static/app/views/myclaimed.html
index 66b8e24..f01777c 100644
--- a/static/app/views/myclaimed.html
+++ b/static/app/views/myclaimed.html
@@ -6,5 +6,30 @@
 <br>
 <br>
 <div class="well">
-<p class="lead" id="myitems">Stuff I'm Taking From My Friends</p>
-<p><strong>{{  }}</strong> items claimed.</p></div>
+<p class="lead" id="myclaimeditems">Stuff I'm Taking From My Friends</p>
+<p><strong>{{ getTotalItems() }}</strong> items claimed.</p>
+<div>
+    <table class="table">
+    <thead>
+    <tr>
+        <th ng-click="sortBy='item_name';reverse=!reverse">Item</th>
+        <th>Description</th>
+        <th>Owner</th>
+        <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
+        <th>Availability</th>
+    </tr>
+    </thead>
+
+    <tbody ng-repeat="item in items | orderBy: sortBy:reverse" class="item">
+        <tr>
+            <td>{{ item.item_name }}</td>
+            <td>{{ item.description }}</td>
+            <td>{{ item.poster.username }}</td>
+            <td>{{ item.claimer.username }}</td>
+            <td>{{ item.availability }}</td>
+        </tr>
+    </tbody>
+    </table>
+</div>
+</div>
+
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
index ba3aba1..bb4e48b 100644
--- a/static/app/views/mycrap.html
+++ b/static/app/views/mycrap.html
@@ -8,11 +8,11 @@
 <div class="well">
 <p class="lead" id="myitems">Stuff I'm Currently Trying to Give Away</p>
 <p><strong>{{ getTotalItems() }}</strong> items posted.</p>
+
 <div>
     <table class="table">
     <thead>
     <tr>
-        <th ng-click="sortBy='id';reverse=!reverse">Item Id</th>
         <th ng-click="sortBy='item_name';reverse=!reverse">Item</th>
         <th>Description</th>
         <th ng-click="sortBy='category';reverse=!reverse">Category</th>
@@ -20,22 +20,20 @@
         <th>Owner</th>
         <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
         <th>Availability</th>
-        <th>Delete</th>
-
+        <th></th>
     </tr>
     </thead>
 
-    <tbody ng-repeat="item in items | orderBy: sortBy:reverse" class="item">
+    <tbody ng-repeat="item in items | orderBy: sortBy:reverse" ng-hide="checked">
         <tr>
-            <td>{{ item.id }}</td>
             <td>{{ item.item_name }}</td>
             <td>{{ item.description }}</td>
             <td>{{ item.category }}</td>
             <td>{{ item.created }}</td>
             <td>{{ item.poster.username }}</td>
-            <td>{{ item.claimer }}</td>
+            <td>{{ item.claimer.username }}</td>
             <td>{{ item.availability }}</td>
-            <td bn-index-watch><a ng-click="removeItem(item)">Delete</a></td>
+            <td bn-index-watch><a ng-click="removeItem(item)"><span class="glyphicon glyphicon-trash"></span>Delete</a></td>
         </tr>
     </tbody>
 </table>

From c7b52cbf6714254c47026f2a4a00832eb4e667f1 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 09:52:25 -0800
Subject: [PATCH 14/43] commit for add friend and friendscrap

---
 .DS_Store                                     | Bin 6148 -> 8196 bytes
 appuser/views.py                              |   7 ++-
 static/.tmp/styles/main.css                   |   7 ++-
 static/app/index.html                         |   1 +
 static/app/scripts/controllers/friendscrap.js |  23 +++++++--
 static/app/scripts/controllers/myfriends.js   |  35 +++++++++++---
 static/app/views/friendscrap.html             |  45 +++---------------
 static/app/views/myfriends.html               |   2 +-
 8 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..17413f9cbbfc72aefe20f7d61da485887b80fb9d 100644
GIT binary patch
literal 8196
zcmeHMzi-n(6n@vHO+p!*mP!>B!W%*=kN_nEiwR*wR0?WUQPkLRXe>E#6gxzyN|l*^
zfQ5<Q0|U$~9Y94wLSkfOWMgOHy}N7VOPmo}i95^pUGBU0!`~%$Jr@92sp}R1mH;4w
zH=!|yRYD=2?y)i@dzKLy+JnDSsMLaHdu*ic&<bb;v;tZIt$<eGxF~>oHkHhTeP6J;
z)(U6^{!0aDeK7GRv?LA$@}&bSegr^FVK*<>HmHGUO0*;n1R{fl2~$L2%H$D)33Kc>
z<v2^?K%g)OCJ!G>MrQJa!gzG_Z}Q>5EP=Y#3TOq!6`-?w3NFG9cn~S)_r-%BajqGZ
z%WgNS0eoBd`h+_g+BE}rBG+!j-U%#K$#4eadEi1FY$YQ6JfpHo%#UOmw~a-e|FSvC
zDsfqr=rq{S#;Xe<#_qUb&3A&prxj&{QqwA(8y^u%Ew}fcypQ^br8i-Ok|O*fA6YI-
z4SY;8!VA-MdSTn~0|(jPPTTjwD4+k%rlwOfv*}Fs#2j5lZti}i5%emN9d*N!-MPm<
zd2Zd2?KL}U9JcS`Ll4`wv+mV<+s3JzK`XMoR=pE5-P-V4ZqO?Q-Ig0}RfN9{&y5<}
z#^PG1{t!*q>{fl<3q8m4z35RUOV_q>dUy9ip?G=4Eab1P_E*f^VllsBUcFN6_l^B*
zX8HW;joX{;{^MuQU%Y(v`pu^UdU{;8<?;>-;`6ZnjI9K54(E`@CD7_To}J(%VJ;JV
zCCq2SD0NQxo3I)BY2i#ZAyo6Z^Z~Puu}U8A=#f-*_#?~hjj>8xu?f!N*F3_ne1!39
z@yO}@w|CID!pCCIKe*0gkMP6jiF`c%$*23ce}hS05G{!VfntXB{!eP?q7^tg1*S#l
zB|87#n*9F%=n~YCwE|j!zpemFl`G{Eh7nuyc)Tg>GV!kBO@+n{1acFsXbAQ5<2d5*
bABNaAC1*(-2t)>p{zHJvpewDwKULrlD3KW4

delta 105
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ5X6q~502;ws^0>w5aE@Piqz_pm2gF}!R
pBnTAa1`@77thzDrJM(0I8AV3M$)+;eJWLRCKt?lcj^~-f3;-dB4=?}#

diff --git a/appuser/views.py b/appuser/views.py
index d9f6c11..1cab43e 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -64,7 +64,12 @@ class FollowerCreateAPIView(CreateAPIView):
     serializer_class = FollowerSerializer
 
     def post(self, request, *args, **kwargs):
-        follower_id = User.objects.get(email=request.data['follower'])
+        try:
+            follower_id = User.objects.get(email=request.data['follower'])
+
+        except:
+           return Response({"error": "This user does not exist"}, status=status.HTTP_404_NOT_FOUND)
+
 
         data = {
             'followee': request.user.id,
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index a4c7bb8..22bc4b9 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -80,11 +80,10 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
-<<<<<<< HEAD
-=======
 
   .other-color{
       background: #f0ac1d;
   }
->>>>>>> ebdf937432e747e27a0f68c15e3d0b09128b03c1
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2QjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2YwYWMxZDtcbiAgfVxufVxuIl19 */
\ No newline at end of file
diff --git a/static/app/index.html b/static/app/index.html
index 0a53e06..65d11c4 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -104,6 +104,7 @@
         <script src="scripts/controllers/mycrap.js"></script>
         <script src="scripts/controllers/myfriends.js"></script>
         <script src="scripts/controllers/login.js"></script>
+        <script src="scripts/controllers/logout.js"></script>
         <script src="scripts/controllers/register.js"></script>
         <!-- endbuild -->
 </body>
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 6fa4fcf..38f0fd8 100644
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -6,9 +6,22 @@
 
 angular.module('declutterApp')
   .controller('FriendscrapCtrl', function ($scope, $http) {
-    $http.get('/api/items/').success(function(data) {
-        $scope.items = data;
-    }).
-  error(function(data, status, headers, config) {
+//    $http.get('/api/appuser/list/follower/').success(function(data) {
+//        console.log(data);
+//        $scope.friends = data;
+//    }).
+//    error(function(data, status, headers, config) {
+//    });
+//  });
+
+
+    var friends = $http.get('/api/appuser/list/follower/');
+        friends.success(function(data){
+            console.log(data);
+            $scope.friends=data;
+    });
+    friends.error(function(data){
+        $scope.error = ["Error with items"];
+        console.log("error" + data);
     });
-  });
+  });
\ No newline at end of file
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index a220aa6..7015716 100644
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -1,10 +1,31 @@
 'use strict';
 
+
 angular.module('declutterApp')
-  .controller('MyfriendsCtrl', function ($scope) {
-    $scope.awesomeThings = [
-      'HTML5 Boilerplate',
-      'AngularJS',
-      'Karma'
-    ];
-  });
+  .controller('MyfriendsCtrl', function ($scope, $http, $cookies) {
+          $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+          $scope.addFriend = function () {
+                var data = {
+                    "follower": $scope.formFriendEmail
+            };
+
+            console.log(data);
+
+
+            $http.post('/api/appuser/create/follower/', data).
+                success(function (data) {
+                    console.log(data);
+                }).
+                error(function (data) {
+                    $scope.error = ["Error adding New User"];
+                    console.log("error: " + data.error);
+                });
+        }
+
+    });
+
+
+
+
+
+
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 09aade1..e14e079 100644
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -1,34 +1,3 @@
-<!--
-<div class="well">
-    <div ng-repeat="item in items">
-        <div class="lead">
-            <p class="item"> {{ item.item_name }}</p>
-            <p class="item_desc"> {{ item.description }} </p>
-            <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
-    </div>
-</div>
--->
-
-<!--
-<div class="well">
-    <p class="lead">My Friends Items</p>
-    <table class="table">
-        <tbody ng-repeat="item in items">
-            <tr>
-                <td>{{ item.item_name }} </td>
-                <td>{{ item.description }} </td>
-                <td><label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">Claim this Item</a></label></td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-
-<div class="btn-group">
-   <label class="btn btn" ng-model="radioModel" btn-radio="'mycrap'"><a ng-href="#/mycrap">My Posted Items</a></label>
-   <label class="btn btn" ng-model="radioModel" btn-radio="'postitem'"><a ng-href="#/mycrap/postitem">Post an Item</a></label>
-   <label class="btn btn" ng-model="radioModel" btn-radio="'myclaimed'"><a ng-href="#/mycrap/myclaimed">My Claimed Items</a></label>
-</div>
--->
 
 <br>
 <br>
@@ -38,19 +7,19 @@
    <table class="table">
    <thead>
    <tr>
-       <th ng-click="sortBy='distance';reverse=!reverse">Category</th>
-       <th ng-click="sortBy='item_name';reverse=!reverse">Item Name</th>
-       <th>Description</th>
+       <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
+       <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
+       <th>Item Description </th>
        <th>Claim This</th>
    </tr>
    </thead>
 
-   <tbody ng-repeat="item in items | filter: itemFilter | orderBy: sortBy:reverse" class="item">
+   <tbody ng-repeat="friend in friends" class="item">
        <tr>
+           <td> {{ friend.id}} </td>
+           <td> {{ friend.user_name}} </td>
+
 
-           <td>{{ item.category }}</td>
-           <td>{{ item.item_name }}</td>
-           <td>{{ item.description }}</td>
            <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>
        </tr>
    </tbody>
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 6c3ae68..6c0b590 100644
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -18,7 +18,7 @@
     </tr>
     </thead>
 
-    <tbody ng-repeat="friend in friends | orderBy: sortBy:reverse" class="friend">
+    <tbody ng-repeat="friend in friends_list | orderBy: sortBy:reverse" class="friend">
         <tr>
             <td>{{ user.username }}</td>
             <td>{{ user.email }}</td>

From 93612c0ea9899c5ca0061eef569541711f26a062 Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 10:05:24 -0800
Subject: [PATCH 15/43] resolve line missing now added on app.js

---
 static/app/scripts/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 07c0c3e..46403b2 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -52,6 +52,7 @@ angular
         .when('/mycrap/myclaimed', {
             templateUrl: 'views/myclaimed.html',
             controller: 'MyclaimedCtrl',
+            resolve: {
             authenticated: ['djangoAuth', function(djangoAuth){
             return djangoAuth.authenticationStatus();
             }],

From 8d24a54cfe741ad1a9f3092c3eba0184f049953d Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 10:46:58 -0800
Subject: [PATCH 16/43] css color change

---
 static/.tmp/styles/main.css    | 8 +++++---
 static/app/index.html          | 4 +++-
 static/app/styles/main.css     | 6 +++++-
 static/app/views/login.html    | 1 +
 static/app/views/register.html | 1 +
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index 22bc4b9..39924d7 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -82,8 +82,10 @@ body {
   }
 
   .other-color{
-      background: #f0ac1d;
+      background: #bbeaf0;
   }
-}
 
-/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2QjtFQUNGIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2YwYWMxZDtcbiAgfVxufVxuIl19 */
\ No newline at end of file
+  .well{
+      background-color: #bbeaf0;
+}
+}
\ No newline at end of file
diff --git a/static/app/index.html b/static/app/index.html
index 4a93105..b5f960c 100644
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -51,7 +51,7 @@
 
 
             </ul>
-          <img src="/images/noun_28242_cc.png" class="img pull-right" style="width: 7%; height: 7%"/>
+          <!--<img src="/images/noun_28242_cc.png" class="img pull-right" style="width: 7%; height: 7%"/-->
           </div>
         </div>
       </div>
@@ -63,6 +63,8 @@
 
     <div class="footer">
       <div class="container">
+        <img src="/images/noun_28242_cc.png" class="img pull-right" style="width: 7%; height: 7%"/>
+
         <p><span class="glyphicon glyphicon-ice-lolly-tasted"></span> from Team SAS | Don't be a pack mule... decrapify!</p>
         <p>Image created by Luis Prado from the Noun Project</p>
       </div>
diff --git a/static/app/styles/main.css b/static/app/styles/main.css
index 9197e2a..02068b3 100644
--- a/static/app/styles/main.css
+++ b/static/app/styles/main.css
@@ -82,6 +82,10 @@ body {
   }
 
   .other-color{
-      background: #f0ac1d;
+      background: #bbeaf0;
   }
+
+  .well{
+      background-color: #bbeaf0;
+}
 }
diff --git a/static/app/views/login.html b/static/app/views/login.html
index 13febf8..f54d704 100644
--- a/static/app/views/login.html
+++ b/static/app/views/login.html
@@ -14,4 +14,5 @@
     <div class="alert alert-danger" ng-if="error">{{error}}</div>
     <button type="submit" class="btn btn-primary">Login</button>
   </form>
+    <br>
 </div>
diff --git a/static/app/views/register.html b/static/app/views/register.html
index c77d0b2..1ee80d5 100644
--- a/static/app/views/register.html
+++ b/static/app/views/register.html
@@ -23,6 +23,7 @@
             <div class="alert alert-danger" ng-repeat="error in errors.email">{{error}}</div>
             <button ng-hide="authenticated" type="submit" class="btn btn-primary">Register</button>
         </form>
+        <br>
         <p ng-if="authenticated">You are already logged in!  You don't need to register.</p>
     </div>
     <div ng-if="complete == true">

From 59d1b145d1408bcff4463189b013a663dec4a8aa Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 14:22:26 -0800
Subject: [PATCH 17/43] 2/26 afternoon push

---
 items/models.py                             |  4 ++--
 static/.tmp/styles/main.css                 |  8 +++++---
 static/app/scripts/controllers/myclaimed.js |  9 +++++++++
 static/app/scripts/controllers/mycrap.js    | 10 ++++++++++
 static/app/styles/main.css                  |  4 ++--
 static/app/views/myclaimed.html             |  4 ++--
 static/app/views/mycrap.html                |  8 ++++----
 static/app/views/postitem.html              |  2 +-
 8 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/items/models.py b/items/models.py
index 1c6106d..2e9b2e9 100644
--- a/items/models.py
+++ b/items/models.py
@@ -30,5 +30,5 @@ class Meta:
     availability = models.BooleanField(default=True)
     category = models.CharField(max_length=50, choices=CATEGORIES)
 
-    def __str__(self):
-        return "%s on %" % (self.item_name, self.created)
+    def __unicode__(self):
+        return "{}s on {}.format"(self.item_name, self.created)
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index 39924d7..9ed87e4 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -82,10 +82,12 @@ body {
   }
 
   .other-color{
-      background: #bbeaf0;
+      background: #dbeaf0;
   }
 
   .well{
-      background-color: #bbeaf0;
+      background-color: #dbeaf0;
 }
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2Qjs7RUFFRDtNQUNJLDJCQUEwQjtFQUMvQjtFQUNBIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2RiZWFmMDtcbiAgfVxuXG4gIC53ZWxse1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RiZWFmMDtcbn1cbn1cbiJdfQ== */
\ No newline at end of file
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
index b8e2784..9f4ae36 100644
--- a/static/app/scripts/controllers/myclaimed.js
+++ b/static/app/scripts/controllers/myclaimed.js
@@ -1,6 +1,15 @@
 'use strict';
 
 angular.module('declutterApp')
+  
+  .filter('availbool', function(){
+        return function(boolValue) {
+            if (boolValue === true)
+                return "Claimed";
+            else
+                return "Available";
+        };
+    })
 
   .controller('MyclaimedCtrl', function ($scope, $http, $cookies) {
     $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index a69b584..1027a02 100644
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -2,6 +2,15 @@
 
 angular.module('declutterApp')
 
+  .filter('availbool', function(){
+        return function(boolValue) {
+            if (boolValue === true)
+                return "Claimed";
+            else
+                return "Available";
+        };
+    })
+
   .controller('MycrapCtrl', function ($scope, $http, $cookies, $location) {
     $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
 
@@ -72,4 +81,5 @@ angular.module('declutterApp')
         alert("Deleting the item");
         return item.show = true;
     };
+
   });
diff --git a/static/app/styles/main.css b/static/app/styles/main.css
index 02068b3..77b4cf7 100644
--- a/static/app/styles/main.css
+++ b/static/app/styles/main.css
@@ -82,10 +82,10 @@ body {
   }
 
   .other-color{
-      background: #bbeaf0;
+      background: #dbeaf0;
   }
 
   .well{
-      background-color: #bbeaf0;
+      background-color: #dbeaf0;
 }
 }
diff --git a/static/app/views/myclaimed.html b/static/app/views/myclaimed.html
index f01777c..9aa01cb 100644
--- a/static/app/views/myclaimed.html
+++ b/static/app/views/myclaimed.html
@@ -16,7 +16,7 @@
         <th>Description</th>
         <th>Owner</th>
         <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
-        <th>Availability</th>
+        <th>Status</th>
     </tr>
     </thead>
 
@@ -26,7 +26,7 @@
             <td>{{ item.description }}</td>
             <td>{{ item.poster.username }}</td>
             <td>{{ item.claimer.username }}</td>
-            <td>{{ item.availability }}</td>
+            <td>{{ item.availability | availbool }}</td>
         </tr>
     </tbody>
     </table>
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
index bb4e48b..a23a856 100644
--- a/static/app/views/mycrap.html
+++ b/static/app/views/mycrap.html
@@ -19,7 +19,7 @@
         <th ng-click="sortBy='created';reverse=!reverse">Date Posted</th>
         <th>Owner</th>
         <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
-        <th>Availability</th>
+        <th>Status</th>
         <th></th>
     </tr>
     </thead>
@@ -29,11 +29,11 @@
             <td>{{ item.item_name }}</td>
             <td>{{ item.description }}</td>
             <td>{{ item.category }}</td>
-            <td>{{ item.created }}</td>
+            <td>{{ item.created | date:'shortDate' }}</td>
             <td>{{ item.poster.username }}</td>
             <td>{{ item.claimer.username }}</td>
-            <td>{{ item.availability }}</td>
-            <td bn-index-watch><a ng-click="removeItem(item)"><span class="glyphicon glyphicon-trash"></span>Delete</a></td>
+            <td>{{ item.availability | availbool }}</td>
+            <td bn-index-watch><a ng-click="removeItem(item)"><span class="glyphicon glyphicon-trash"></span></a></td>
         </tr>
     </tbody>
 </table>
diff --git a/static/app/views/postitem.html b/static/app/views/postitem.html
index 044368d..46adb7f 100644
--- a/static/app/views/postitem.html
+++ b/static/app/views/postitem.html
@@ -8,7 +8,7 @@
 <div class="well">
 <p class="lead" id="additem">Post a New Item
     <form class="form-group" name="newitemForm">
-    <p>Item Name:  <input type="text" ng-model="formItemName" required></p>
+    <p>Item Name:   <input type="text" ng-model="formItemName" required></p>
     <p>Description:  <input type="text" ng-model="formItemDescription" required></p>
     <p>Category:  <select ng-model="formItemCategory" required>
         <option style="display:none" value class>select a category</option>

From dcb81510b14cf28ad43e9f2eedf04d361a6eca70 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 14:26:15 -0800
Subject: [PATCH 18/43] commit 4

---
 appuser/serializers.py                        |  2 +-
 items/models.py                               |  4 +--
 static/app/scripts/controllers/friendscrap.js | 27 +++++++++++++++----
 static/app/scripts/controllers/myfriends.js   |  8 +-----
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/appuser/serializers.py b/appuser/serializers.py
index f3069aa..dd61350 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -4,7 +4,7 @@
 class StreamSerializer(serializers.ModelSerializer):
     class Meta:
         model = Stream
-        fields = ("id", "item", "created", "status", "deleted_status")
+        fields = ("id", "item", "created", "status", "deleted_status", "user")
 
 
 class FollowerSerializer(serializers.ModelSerializer):
diff --git a/items/models.py b/items/models.py
index 1c6106d..d3323d4 100644
--- a/items/models.py
+++ b/items/models.py
@@ -30,5 +30,5 @@ class Meta:
     availability = models.BooleanField(default=True)
     category = models.CharField(max_length=50, choices=CATEGORIES)
 
-    def __str__(self):
-        return "%s on %" % (self.item_name, self.created)
+    def __unicode__(self):
+        return "{}s on {}".format(self.item_name, self.created)
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 3a27ba4..6063092 100644
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -8,11 +8,28 @@ angular.module('declutterApp')
   .controller('FriendscrapCtrl', function ($scope, $http) {
     var friends = $http.get('/api/appuser/list/follower/');
         friends.success(function(data){
-            console.log(data);
+            for (var i=0;  i<data.length; i++) {
+                console.log("api/list/follower success " + data[i].follower);
+            }
             $scope.friends=data;
+    }).
+        error(function(data){
+//        $scope.error = ["Error with friends"];
+        console.log("error with friends " + data);
     });
-    friends.error(function(data){
-        $scope.error = ["Error with items"];
-        console.log("error" + data);
-    });
+
+
+
+
+    //   Get all the data from Item List API
+    var poster_items = $http.get('/api/items/');
+        poster_items.success(function(data){
+            for (var i=0;  i<data.length; i++) {
+                console.log("Item List API" + data[i]["poster"]["username"]);
+                }
+                $scope.poster_items = data;
+        }).
+        error(function(data){
+                console.log("error with poster_items " + data);
+        });
   });
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index 7015716..e9d5438 100644
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -8,13 +8,13 @@ angular.module('declutterApp')
                 var data = {
                     "follower": $scope.formFriendEmail
             };
-
             console.log(data);
 
 
             $http.post('/api/appuser/create/follower/', data).
                 success(function (data) {
                     console.log(data);
+                    $scope.formFriendEmail = '';
                 }).
                 error(function (data) {
                     $scope.error = ["Error adding New User"];
@@ -23,9 +23,3 @@ angular.module('declutterApp')
         }
 
     });
-
-
-
-
-
-

From 5f3cffdc4450873e9ce6f93dfab30175a25bda81 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 14:26:57 -0800
Subject: [PATCH 19/43] Fixed Followers from duplicating

---
 appuser/serializers.py                        |   2 +-
 appuser/views.py                              |  10 +++++++++-
 items/models.py                               |   4 ++--
 static/app/.DS_Store                          | Bin
 static/app/.buildignore                       |   0
 static/app/.htaccess                          |   0
 static/app/404.html                           |   0
 static/app/favicon.ico                        | Bin
 static/app/images/noun_28242_cc.png           | Bin
 static/app/images/yeoman.png                  | Bin
 static/app/index.html                         |   1 -
 static/app/index.html.orig                    |   0
 static/app/robots.txt                         |   0
 static/app/scripts/app.js                     |   0
 static/app/scripts/controllers/about.js       |   0
 static/app/scripts/controllers/config.js      |   0
 static/app/scripts/controllers/friendscrap.js |   0
 static/app/scripts/controllers/login.js       |   0
 static/app/scripts/controllers/main.js        |   0
 static/app/scripts/controllers/myclaimed.js   |   0
 static/app/scripts/controllers/mycrap.js      |   0
 static/app/scripts/controllers/myfriends.js   |   0
 static/app/scripts/controllers/register.js    |   0
 static/app/styles/main.css                    |   0
 static/app/views/addfriend.html               |   0
 static/app/views/friendscrap.html             |   0
 static/app/views/login.html                   |   0
 static/app/views/main.html                    |   0
 static/app/views/myclaimed.html               |   0
 static/app/views/mycrap.html                  |   0
 static/app/views/myfriends.html               |   0
 static/app/views/postitem.html                |   0
 static/app/views/register.html                |   0
 33 files changed, 12 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 static/app/.DS_Store
 mode change 100644 => 100755 static/app/.buildignore
 mode change 100644 => 100755 static/app/.htaccess
 mode change 100644 => 100755 static/app/404.html
 mode change 100644 => 100755 static/app/favicon.ico
 mode change 100644 => 100755 static/app/images/noun_28242_cc.png
 mode change 100644 => 100755 static/app/images/yeoman.png
 mode change 100644 => 100755 static/app/index.html
 mode change 100644 => 100755 static/app/index.html.orig
 mode change 100644 => 100755 static/app/robots.txt
 mode change 100644 => 100755 static/app/scripts/app.js
 mode change 100644 => 100755 static/app/scripts/controllers/about.js
 mode change 100644 => 100755 static/app/scripts/controllers/config.js
 mode change 100644 => 100755 static/app/scripts/controllers/friendscrap.js
 mode change 100644 => 100755 static/app/scripts/controllers/login.js
 mode change 100644 => 100755 static/app/scripts/controllers/main.js
 mode change 100644 => 100755 static/app/scripts/controllers/myclaimed.js
 mode change 100644 => 100755 static/app/scripts/controllers/mycrap.js
 mode change 100644 => 100755 static/app/scripts/controllers/myfriends.js
 mode change 100644 => 100755 static/app/scripts/controllers/register.js
 mode change 100644 => 100755 static/app/styles/main.css
 mode change 100644 => 100755 static/app/views/addfriend.html
 mode change 100644 => 100755 static/app/views/friendscrap.html
 mode change 100644 => 100755 static/app/views/login.html
 mode change 100644 => 100755 static/app/views/main.html
 mode change 100644 => 100755 static/app/views/myclaimed.html
 mode change 100644 => 100755 static/app/views/mycrap.html
 mode change 100644 => 100755 static/app/views/myfriends.html
 mode change 100644 => 100755 static/app/views/postitem.html
 mode change 100644 => 100755 static/app/views/register.html

diff --git a/appuser/serializers.py b/appuser/serializers.py
index f3069aa..dd61350 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -4,7 +4,7 @@
 class StreamSerializer(serializers.ModelSerializer):
     class Meta:
         model = Stream
-        fields = ("id", "item", "created", "status", "deleted_status")
+        fields = ("id", "item", "created", "status", "deleted_status", "user")
 
 
 class FollowerSerializer(serializers.ModelSerializer):
diff --git a/appuser/views.py b/appuser/views.py
index f00d721..1d88eea 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -70,6 +70,13 @@ def post(self, request, *args, **kwargs):
         except:
            return Response({"error": "This user does not exist"}, status=status.HTTP_404_NOT_FOUND)
 
+        try:
+            if Follower.objects.get(followee=request.user.id, follower=follower_id.id):
+                return Response({"error": "You are already friends"}, status=status.HTTP_404_NOT_FOUND)
+
+        except:
+            pass
+
         data = {
             'followee': request.user.id,
             'follower': follower_id.id
@@ -83,13 +90,14 @@ def post(self, request, *args, **kwargs):
         serializer = FollowerSerializer(data=data)
         serializer_reverse = FollowerSerializer(data=data_reverse)
 
+
         if serializer.is_valid() and serializer_reverse.is_valid():
             serializer.save()
             serializer_reverse.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
 
         else:
-            return Response({"error": "This stream does not exist"}, status=status.HTTP_404_NOT_FOUND)
+            return Response({"error": "Please enter a valid email"}, status=status.HTTP_404_NOT_FOUND)
 
 
 class FollowerListAPIView(ListAPIView):
diff --git a/items/models.py b/items/models.py
index 1c6106d..ebf7bd7 100644
--- a/items/models.py
+++ b/items/models.py
@@ -30,5 +30,5 @@ class Meta:
     availability = models.BooleanField(default=True)
     category = models.CharField(max_length=50, choices=CATEGORIES)
 
-    def __str__(self):
-        return "%s on %" % (self.item_name, self.created)
+    def __unicode__(self):
+        return "{} on {}".format(self.item_name, self.created)
diff --git a/static/app/.DS_Store b/static/app/.DS_Store
old mode 100644
new mode 100755
diff --git a/static/app/.buildignore b/static/app/.buildignore
old mode 100644
new mode 100755
diff --git a/static/app/.htaccess b/static/app/.htaccess
old mode 100644
new mode 100755
diff --git a/static/app/404.html b/static/app/404.html
old mode 100644
new mode 100755
diff --git a/static/app/favicon.ico b/static/app/favicon.ico
old mode 100644
new mode 100755
diff --git a/static/app/images/noun_28242_cc.png b/static/app/images/noun_28242_cc.png
old mode 100644
new mode 100755
diff --git a/static/app/images/yeoman.png b/static/app/images/yeoman.png
old mode 100644
new mode 100755
diff --git a/static/app/index.html b/static/app/index.html
old mode 100644
new mode 100755
index 4a93105..6ffa63e
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -95,7 +95,6 @@
     <!-- endbuild -->
 
         <!-- build:js({.tmp,app}) scripts/scripts.js -->
-        <script src="scripts/controller/config.js"></script>
         <script src="scripts/app.js"></script>
         <script src="scripts/services/djangoAuth.js"></script>
         <script src="scripts/services/validate.js"></script>
diff --git a/static/app/index.html.orig b/static/app/index.html.orig
old mode 100644
new mode 100755
diff --git a/static/app/robots.txt b/static/app/robots.txt
old mode 100644
new mode 100755
diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/about.js b/static/app/scripts/controllers/about.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/config.js b/static/app/scripts/controllers/config.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/main.js b/static/app/scripts/controllers/main.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
old mode 100644
new mode 100755
diff --git a/static/app/scripts/controllers/register.js b/static/app/scripts/controllers/register.js
old mode 100644
new mode 100755
diff --git a/static/app/styles/main.css b/static/app/styles/main.css
old mode 100644
new mode 100755
diff --git a/static/app/views/addfriend.html b/static/app/views/addfriend.html
old mode 100644
new mode 100755
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
old mode 100644
new mode 100755
diff --git a/static/app/views/login.html b/static/app/views/login.html
old mode 100644
new mode 100755
diff --git a/static/app/views/main.html b/static/app/views/main.html
old mode 100644
new mode 100755
diff --git a/static/app/views/myclaimed.html b/static/app/views/myclaimed.html
old mode 100644
new mode 100755
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
old mode 100644
new mode 100755
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
old mode 100644
new mode 100755
diff --git a/static/app/views/postitem.html b/static/app/views/postitem.html
old mode 100644
new mode 100755
diff --git a/static/app/views/register.html b/static/app/views/register.html
old mode 100644
new mode 100755

From 44dce07ad03e38ab423cf61722edff7d222d6f0d Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 14:52:05 -0800
Subject: [PATCH 20/43] Added depth = 1 to FollowerSerializer

---
 appuser/serializers.py      | 1 +
 static/.tmp/styles/main.css | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/appuser/serializers.py b/appuser/serializers.py
index dd61350..0c5ed05 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -10,5 +10,6 @@ class Meta:
 class FollowerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Follower
+        depth = 1
 
 __author__ = 'andy'
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index 3f7f74d..9ed87e4 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -88,4 +88,6 @@ body {
   .well{
       background-color: #dbeaf0;
 }
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2Qjs7RUFFRDtNQUNJLDJCQUEwQjtFQUMvQjtFQUNBIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2RiZWFmMDtcbiAgfVxuXG4gIC53ZWxse1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RiZWFmMDtcbn1cbn1cbiJdfQ== */
\ No newline at end of file

From 4f7b41201ec1af6e4c49c78802571b6b8ef110dc Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 15:05:07 -0800
Subject: [PATCH 21/43] commit 5

---
 static/.tmp/styles/main.css                   |  4 +++-
 static/app/scripts/controllers/friendscrap.js | 24 ++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index 3f7f74d..9ed87e4 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -88,4 +88,6 @@ body {
   .well{
       background-color: #dbeaf0;
 }
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2Qjs7RUFFRDtNQUNJLDJCQUEwQjtFQUMvQjtFQUNBIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2RiZWFmMDtcbiAgfVxuXG4gIC53ZWxse1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RiZWFmMDtcbn1cbn1cbiJdfQ== */
\ No newline at end of file
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 6063092..6d963d7 100644
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -6,15 +6,16 @@
 
 angular.module('declutterApp')
   .controller('FriendscrapCtrl', function ($scope, $http) {
-    var friends = $http.get('/api/appuser/list/follower/');
+        var arrayOfFollowers = [];
+        var friends = $http.get('/api/appuser/list/follower/');
         friends.success(function(data){
             for (var i=0;  i<data.length; i++) {
-                console.log("api/list/follower success " + data[i].follower);
-            }
+                 arrayOfFollowers.push(data[i]["follower"]);
+                 }
+            console.log(arrayOfFollowers);
             $scope.friends=data;
     }).
         error(function(data){
-//        $scope.error = ["Error with friends"];
         console.log("error with friends " + data);
     });
 
@@ -22,14 +23,25 @@ angular.module('declutterApp')
 
 
     //   Get all the data from Item List API
+    var arrayOfObjects = [];
     var poster_items = $http.get('/api/items/');
         poster_items.success(function(data){
             for (var i=0;  i<data.length; i++) {
-                console.log("Item List API" + data[i]["poster"]["username"]);
-                }
+                var userName =  data[i]["poster"]["username"];
+                var userId = data[i]["id"];
+                var item_Name = data[i]["item_name"];
+                // Initialize with empty object and then add user & item details
+                var obj = {};
+                obj["id"] = userId;
+                obj["username"] = userName;
+                obj["item"] = item_Name;
+                arrayOfObjects.push(obj);
+            }
+            console.log(arrayOfObjects);
                 $scope.poster_items = data;
         }).
         error(function(data){
                 console.log("error with poster_items " + data);
         });
   });
+

From ef8aa8c16c4bb1c805db3443f4bfb247d33db3bc Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 15:12:53 -0800
Subject: [PATCH 22/43] after dropping the db

---
 items/migrations/0001_initial.py | 34 --------------------------------
 static/.tmp/styles/main.css      |  4 +++-
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 items/migrations/0001_initial.py

diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
deleted file mode 100644
index c6130f8..0000000
--- a/items/migrations/0001_initial.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Item',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('item_name', models.CharField(max_length=100)),
-                ('description', models.TextField(max_length=500)),
-                ('created', models.DateField(auto_now_add=True)),
-                ('image', models.CharField(max_length=100, null=True, blank=True)),
-                ('availability', models.BooleanField(default=True)),
-                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
-                ('claimer', models.ForeignKey(related_name='claimed_items', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
-                ('poster', models.ForeignKey(related_name='posted_items', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Item',
-                'verbose_name_plural': 'Items',
-            },
-            bases=(models.Model,),
-        ),
-    ]
diff --git a/static/.tmp/styles/main.css b/static/.tmp/styles/main.css
index 3f7f74d..9ed87e4 100644
--- a/static/.tmp/styles/main.css
+++ b/static/.tmp/styles/main.css
@@ -88,4 +88,6 @@ body {
   .well{
       background-color: #dbeaf0;
 }
-}
\ No newline at end of file
+}
+
+/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm1haW4uY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0VBQ0UsaUJBQWdCO0VBQ2hCLGtCQUFpQjtFQUNqQixhQUFZO0VBQ1osa0JBQWlCO0VBQ2xCOztBQUVEO0VBQ0UsWUFBVztFQUNaOztBQUVELDRFQUEyRTtBQUMzRTs7O0VBR0Usb0JBQW1CO0VBQ25CLHFCQUFvQjtFQUNyQjs7QUFFRCx5QkFBd0I7QUFDeEI7RUFDRSxrQ0FBaUM7RUFDakMscUJBQW9CO0VBQ3JCO0FBQ0Qsa0VBQWlFO0FBQ2pFO0VBQ0UsZUFBYztFQUNkLGtCQUFpQjtFQUNqQixtQkFBa0I7RUFDbEIsc0JBQXFCO0VBQ3RCOztBQUVELHlCQUF3QjtBQUN4QjtFQUNFLG1CQUFrQjtFQUNsQixhQUFZO0VBQ1osK0JBQThCO0VBQy9COztBQUVEO0VBQ0UsZ0JBQWU7RUFDaEI7O0FBRUQsZ0RBQStDO0FBQy9DO0VBQ0Usb0JBQW1CO0VBQ25CLGtDQUFpQztFQUNsQztBQUNEO0VBQ0UsaUJBQWdCO0VBQ2hCLG9CQUFtQjtFQUNwQjs7QUFFRCxtQ0FBa0M7QUFDbEM7RUFDRSxnQkFBZTtFQUNoQjtBQUNEO0VBQ0Usa0JBQWlCO0VBQ2xCOztBQUVELDBDQUF5QztBQUN6QztFQUNFO0lBQ0Usa0JBQWlCO0lBQ2xCOztFQUVELHdDQUF1QztFQUN2Qzs7O0lBR0UsaUJBQWdCO0lBQ2hCLGtCQUFpQjtJQUNsQjtFQUNELDZCQUE0QjtFQUM1QjtJQUNFLHFCQUFvQjtJQUNyQjtFQUNELGtFQUFpRTtFQUNqRTtJQUNFLGtCQUFpQjtJQUNsQjs7RUFFRDtNQUNJLHFCQUFvQjtJQUN2Qjs7RUFFRDtNQUNJLDJCQUEwQjtFQUMvQjtFQUNBIiwiZmlsZSI6Im1haW4uY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLmJyb3dzZWhhcHB5IHtcbiAgbWFyZ2luOiAwLjJlbSAwO1xuICBiYWNrZ3JvdW5kOiAjY2NjO1xuICBjb2xvcjogIzAwMDtcbiAgcGFkZGluZzogMC4yZW0gMDtcbn1cblxuYm9keSB7XG4gIHBhZGRpbmc6IDA7XG59XG5cbi8qIEV2ZXJ5dGhpbmcgYnV0IHRoZSBqdW1ib3Ryb24gZ2V0cyBzaWRlIHNwYWNpbmcgZm9yIG1vYmlsZSBmaXJzdCB2aWV3cyAqL1xuLmhlYWRlcixcbi5tYXJrZXRpbmcsXG4uZm9vdGVyIHtcbiAgcGFkZGluZy1sZWZ0OiAxNXB4O1xuICBwYWRkaW5nLXJpZ2h0OiAxNXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBoZWFkZXIgKi9cbi5oZWFkZXIge1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbiAgbWFyZ2luLWJvdHRvbTogMTBweDtcbn1cbi8qIE1ha2UgdGhlIG1hc3RoZWFkIGhlYWRpbmcgdGhlIHNhbWUgaGVpZ2h0IGFzIHRoZSBuYXZpZ2F0aW9uICovXG4uaGVhZGVyIGgzIHtcbiAgbWFyZ2luLXRvcDogMDtcbiAgbWFyZ2luLWJvdHRvbTogMDtcbiAgbGluZS1oZWlnaHQ6IDQwcHg7XG4gIHBhZGRpbmctYm90dG9tOiAxOXB4O1xufVxuXG4vKiBDdXN0b20gcGFnZSBmb290ZXIgKi9cbi5mb290ZXIge1xuICBwYWRkaW5nLXRvcDogMTlweDtcbiAgY29sb3I6ICM3Nzc7XG4gIGJvcmRlci10b3A6IDFweCBzb2xpZCAjZTVlNWU1O1xufVxuXG4uY29udGFpbmVyLW5hcnJvdyA+IGhyIHtcbiAgbWFyZ2luOiAzMHB4IDA7XG59XG5cbi8qIE1haW4gbWFya2V0aW5nIG1lc3NhZ2UgYW5kIHNpZ24gdXAgYnV0dG9uICovXG4uanVtYm90cm9uIHtcbiAgdGV4dC1hbGlnbjogY2VudGVyO1xuICBib3JkZXItYm90dG9tOiAxcHggc29saWQgI2U1ZTVlNTtcbn1cbi5qdW1ib3Ryb24gLmJ0biB7XG4gIGZvbnQtc2l6ZTogMjFweDtcbiAgcGFkZGluZzogMTRweCAyNHB4O1xufVxuXG4vKiBTdXBwb3J0aW5nIG1hcmtldGluZyBjb250ZW50ICovXG4ubWFya2V0aW5nIHtcbiAgbWFyZ2luOiA0MHB4IDA7XG59XG4ubWFya2V0aW5nIHAgKyBoNCB7XG4gIG1hcmdpbi10b3A6IDI4cHg7XG59XG5cbi8qIFJlc3BvbnNpdmU6IFBvcnRyYWl0IHRhYmxldHMgYW5kIHVwICovXG5AbWVkaWEgc2NyZWVuIGFuZCAobWluLXdpZHRoOiA3NjhweCkge1xuICAuY29udGFpbmVyIHtcbiAgICBtYXgtd2lkdGg6IDczMHB4O1xuICB9XG5cbiAgLyogUmVtb3ZlIHRoZSBwYWRkaW5nIHdlIHNldCBlYXJsaWVyICovXG4gIC5oZWFkZXIsXG4gIC5tYXJrZXRpbmcsXG4gIC5mb290ZXIge1xuICAgIHBhZGRpbmctbGVmdDogMDtcbiAgICBwYWRkaW5nLXJpZ2h0OiAwO1xuICB9XG4gIC8qIFNwYWNlIG91dCB0aGUgbWFzdGhlYWQgKi9cbiAgLmhlYWRlciB7XG4gICAgbWFyZ2luLWJvdHRvbTogMzBweDtcbiAgfVxuICAvKiBSZW1vdmUgdGhlIGJvdHRvbSBib3JkZXIgb24gdGhlIGp1bWJvdHJvbiBmb3IgdmlzdWFsIGVmZmVjdCAqL1xuICAuanVtYm90cm9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwO1xuICB9XG5cbiAgLm90aGVyLWNvbG9ye1xuICAgICAgYmFja2dyb3VuZDogI2RiZWFmMDtcbiAgfVxuXG4gIC53ZWxse1xuICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2RiZWFmMDtcbn1cbn1cbiJdfQ== */
\ No newline at end of file

From c4e8ebf7b961d9254adde6c01a3f688082ab6195 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 15:13:26 -0800
Subject: [PATCH 23/43] after dropping the db

---
 appuser/migrations/0001_initial.py | 41 ------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 appuser/migrations/0001_initial.py

diff --git a/appuser/migrations/0001_initial.py b/appuser/migrations/0001_initial.py
deleted file mode 100644
index 39cf509..0000000
--- a/appuser/migrations/0001_initial.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('items', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Follower',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('followee', models.ForeignKey(related_name='followee', to=settings.AUTH_USER_MODEL)),
-                ('follower', models.ForeignKey(related_name='follower', to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Stream',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('created', models.DateField(null=True, blank=True)),
-                ('status', models.BooleanField(default=True)),
-                ('deleted_status', models.BooleanField(default=False)),
-                ('item', models.ForeignKey(related_name='item_id', to='items.Item')),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-    ]

From 94b74b0424772c8063df75e31a92586747b3ec46 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 15:36:55 -0800
Subject: [PATCH 24/43] Fixed FollowerListAPIView, only returns items for
 current logged in user

---
 appuser/serializers.py                      | 1 -
 appuser/views.py                            | 6 +++++-
 static/app/scripts/controllers/myfriends.js | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/appuser/serializers.py b/appuser/serializers.py
index 0c5ed05..dd61350 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -10,6 +10,5 @@ class Meta:
 class FollowerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Follower
-        depth = 1
 
 __author__ = 'andy'
diff --git a/appuser/views.py b/appuser/views.py
index 1d88eea..548a629 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -101,9 +101,13 @@ def post(self, request, *args, **kwargs):
 
 
 class FollowerListAPIView(ListAPIView):
-    queryset = Follower.objects.all()
+    # queryset = Follower.objects.all()
     serializer_class = FollowerSerializer
 
+    def get_queryset(self):
+        user = self.request.user.id
+        return Follower.objects.filter(followee=user)
+
 
 class FollowerRetrieveUpdateDestroyAPIView(RetrieveUpdateDestroyAPIView):
     serializer_class = FollowerSerializer
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index e9d5438..87cac9c 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -22,4 +22,6 @@ angular.module('declutterApp')
                 });
         }
 
+        
+
     });

From d6c9a1aced6dfe5a8ed331e53ef4df98ce31f78a Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 15:38:13 -0800
Subject: [PATCH 25/43] aftb

---
 appuser/migrations/0001_initial.py            | 41 +++++++++++++++++++
 appuser/serializers.py                        |  2 +-
 items/migrations/0001_initial.py              | 34 +++++++++++++++
 static/app/scripts/controllers/friendscrap.js | 12 +++++-
 4 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 appuser/migrations/0001_initial.py
 create mode 100644 items/migrations/0001_initial.py

diff --git a/appuser/migrations/0001_initial.py b/appuser/migrations/0001_initial.py
new file mode 100644
index 0000000..39cf509
--- /dev/null
+++ b/appuser/migrations/0001_initial.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('items', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Follower',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('followee', models.ForeignKey(related_name='followee', to=settings.AUTH_USER_MODEL)),
+                ('follower', models.ForeignKey(related_name='follower', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Stream',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('created', models.DateField(null=True, blank=True)),
+                ('status', models.BooleanField(default=True)),
+                ('deleted_status', models.BooleanField(default=False)),
+                ('item', models.ForeignKey(related_name='item_id', to='items.Item')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/appuser/serializers.py b/appuser/serializers.py
index 0c5ed05..116a8b1 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -10,6 +10,6 @@ class Meta:
 class FollowerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Follower
-        depth = 1
+        # depth = 1
 
 __author__ = 'andy'
diff --git a/items/migrations/0001_initial.py b/items/migrations/0001_initial.py
new file mode 100644
index 0000000..c6130f8
--- /dev/null
+++ b/items/migrations/0001_initial.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Item',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('item_name', models.CharField(max_length=100)),
+                ('description', models.TextField(max_length=500)),
+                ('created', models.DateField(auto_now_add=True)),
+                ('image', models.CharField(max_length=100, null=True, blank=True)),
+                ('availability', models.BooleanField(default=True)),
+                ('category', models.CharField(max_length=50, choices=[(b'BOOKS', b'Books'), (b'ENTERTAINMENT', b'Movies, Music, and Games'), (b'ELECTRONICS', b'Electronics and Computers'), (b'HOME', b'Home'), (b'GARDEN', b'Garden and Tools'), (b'BEAUTY', b'Beauty and Health'), (b'TOYS', b'Toys, Kids and Baby'), (b'CLOTHING', b'Clothing, Shoes and Jewelry'), (b'SPORTS', b'Sports and Outdoors'), (b'AUTOMOTIVE', b'Automotive')])),
+                ('claimer', models.ForeignKey(related_name='claimed_items', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('poster', models.ForeignKey(related_name='posted_items', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Item',
+                'verbose_name_plural': 'Items',
+            },
+            bases=(models.Model,),
+        ),
+    ]
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 6d963d7..ae03ca6 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -43,5 +43,15 @@ angular.module('declutterApp')
         error(function(data){
                 console.log("error with poster_items " + data);
         });
-  });
+
+
+    //Compare the array of followers to items in arrayofObjects
+        function friend_scrap(Followers, Objects){
+            console.log("hey you reached friends crap custom function");
+        }
+
+
+        friend_scrap(arrayOfFollowers, arrayOfObjects);
+
+    });
 

From b442f9683cd5f2f39357e8f41dec5f39a87c518e Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 15:40:08 -0800
Subject: [PATCH 26/43] no new updates

---
 appuser/serializers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/appuser/serializers.py b/appuser/serializers.py
index 0c5ed05..dd61350 100644
--- a/appuser/serializers.py
+++ b/appuser/serializers.py
@@ -10,6 +10,5 @@ class Meta:
 class FollowerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Follower
-        depth = 1
 
 __author__ = 'andy'

From c0a9593a39cc3c7abae133824429a523eba8593c Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 17:48:01 -0800
Subject: [PATCH 27/43] Created Secure Friends Detail API

---
 appuser/urls.py                             |  5 ++--
 appuser/views.py                            | 29 ++++++++++++++++++++-
 static/app/scripts/controllers/login.js     |  1 +
 static/app/scripts/controllers/mycrap.js    |  2 +-
 static/app/scripts/controllers/myfriends.js |  2 --
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/appuser/urls.py b/appuser/urls.py
index b88232f..cd43cfc 100644
--- a/appuser/urls.py
+++ b/appuser/urls.py
@@ -1,13 +1,14 @@
 from django.conf.urls import patterns, url
 from appuser.views import StreamListCreateAPIView, StreamRetrieveUpdateDestroyAPIView, FollowerCreateAPIView, \
-    FollowerRetrieveUpdateDestroyAPIView, FollowerListAPIView
+    FollowerRetrieveUpdateDestroyAPIView, FollowerListAPIView, FollowerFriendsDetailListAPIView
 
 urlpatterns = patterns('',
     url(r'^list/$', StreamListCreateAPIView.as_view()),
     url(r'^update/(?P<stream_id>\w+)$', StreamRetrieveUpdateDestroyAPIView.as_view()),
     url(r'^create/follower/$', FollowerCreateAPIView.as_view()),
     url(r'list/follower/$', FollowerListAPIView.as_view()),
-    url(r'^update/follower/(?P<followee_id>.+)/(?P<follower_id>.+)/$', FollowerRetrieveUpdateDestroyAPIView.as_view())
+    url(r'^update/follower/(?P<followee_id>.+)/(?P<follower_id>.+)/$', FollowerRetrieveUpdateDestroyAPIView.as_view()),
+    url(r'^detail/follower/(?P<user_id>.+)/(?P<follower_id>.+)/$', FollowerFriendsDetailListAPIView.as_view())
 )
 
 __author__ = 'andy'
diff --git a/appuser/views.py b/appuser/views.py
index 548a629..9f17501 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -3,7 +3,9 @@
 from appuser.models import Stream, Follower
 from rest_framework.generics import ListAPIView, CreateAPIView, ListCreateAPIView, RetrieveUpdateDestroyAPIView
 from appuser.serializers import StreamSerializer, FollowerSerializer
+from items.api.serializers import UserSerialize
 from django.contrib.auth.models import User
+import pdb
 
 
 class StreamListCreateAPIView(ListCreateAPIView):
@@ -149,4 +151,29 @@ def delete(self, request, followee_id, follower_id, *args, **kwargs):
         snippet.delete()
         snippet_reverse = Follower.objects.get(followee=follower_id, follower=followee_id)
         snippet_reverse.delete()
-        return Response(status=status.HTTP_204_NO_CONTENT)
\ No newline at end of file
+        return Response(status=status.HTTP_204_NO_CONTENT)
+
+# Setting up authorization model for access by user to friends detail.
+class FollowerFriendsDetailListAPIView(ListAPIView):
+    serializer_class = UserSerialize
+
+    def get(self, request, user_id, follower_id, *args, **kwargs):
+        # pdb.set_trace()
+        try:
+            if request.user.id != int(user_id):
+                return Response({"error": "You are not authorized."}, status=status.HTTP_403_FORBIDDEN)
+
+        except:
+            pass
+
+        try:
+            if not Follower.objects.get(followee=user_id, follower=follower_id.id):
+                return Response({"error": "You are not friends"}, status=status.HTTP_403_FORBIDDEN)
+
+        except:
+            pass
+
+        queryset = User.objects.get(pk=follower_id)
+        serializer = UserSerialize(queryset)
+
+        return Response(serializer.data, status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
index 404e13b..aac69f9 100755
--- a/static/app/scripts/controllers/login.js
+++ b/static/app/scripts/controllers/login.js
@@ -11,6 +11,7 @@ angular.module('declutterApp')
         djangoAuth.login($scope.model.username, $scope.model.password)
         .then(function(data){
         	// success case
+          console.log('login: ' + data);
         	$location.path("/mycrap");
             $rootScope.logname = $scope.model.username;
         },function(data){
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index 1027a02..ba943b2 100755
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -60,7 +60,7 @@ angular.module('declutterApp')
 
             error(function(data){
                 $scope.error = ["Error adding new item"];
-                console.log("error" + data.error);
+                console.log("error " + data);
             });
         };
 
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index 87cac9c..e9d5438 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -22,6 +22,4 @@ angular.module('declutterApp')
                 });
         }
 
-        
-
     });

From c6cc5376838dabf4e562984d7b420da36b35f2ca Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 17:51:28 -0800
Subject: [PATCH 28/43] aftb

---
 static/app/scripts/controllers/friendscrap.js | 87 ++++++++++++-------
 static/app/views/friendscrap.html             | 14 +--
 2 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index ae03ca6..914afb7 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -6,52 +6,73 @@
 
 angular.module('declutterApp')
   .controller('FriendscrapCtrl', function ($scope, $http) {
-        var arrayOfFollowers = [];
-        var friends = $http.get('/api/appuser/list/follower/');
-        friends.success(function(data){
-            for (var i=0;  i<data.length; i++) {
-                 arrayOfFollowers.push(data[i]["follower"]);
-                 }
-            console.log(arrayOfFollowers);
-            $scope.friends=data;
-    }).
-        error(function(data){
-        console.log("error with friends " + data);
-    });
-
-
-
-
-    //   Get all the data from Item List API
-    var arrayOfObjects = [];
-    var poster_items = $http.get('/api/items/');
+        //  Step 1:  Get all the data from Item List API
+        var poster_items = $http.get('/api/items/');
         poster_items.success(function(data){
+            $scope.getObjects = true;
+            $scope.arrayOfObjects = [];
             for (var i=0;  i<data.length; i++) {
+                var userId = data[i]["poster"]["id"];
                 var userName =  data[i]["poster"]["username"];
-                var userId = data[i]["id"];
                 var item_Name = data[i]["item_name"];
+                var desc = data[i]["description"];
                 // Initialize with empty object and then add user & item details
                 var obj = {};
-                obj["id"] = userId;
+                obj["poster_id"] = userId;
                 obj["username"] = userName;
                 obj["item"] = item_Name;
-                arrayOfObjects.push(obj);
+                obj["desc"] = desc;
+                $scope.arrayOfObjects.push(obj);
+
+
+                // Step 2: Get all followers from follower list
+                $scope.arrayOfFollowers = [];
+                var friends = $http.get('/api/appuser/list/follower/');
+                friends.success(function(data){
+                    for (var i=0;  i<data.length; i++) {
+                        $scope.arrayOfFollowers.push(data[i]["follower"]);
+                         }
+                    console.log($scope.arrayOfFollowers);
+                    friends_crap($scope.arrayOfFollowers, $scope.arrayOfObjects);
+                    $scope.friends=data;
+
+                    }).
+                error(function(data){
+                console.log("error with friends " + data);
+                    });
+                    }
+                    console.log("array of objects:" + $scope.arrayOfObjects);
+                        $scope.poster_items = data;
+                }).
+                error(function(data){
+                        console.log("error with poster_items " + data);
+                });
+
+        // Step 3: This function will produce resulting array of objects
+
+        var friends_crap = function(Followers, Objects){
+            $scope.resultArray = [];
+//            console.log("hey you reached friends crap custom function");
+//            console.log("follower:    " + Followers.length.toString());
+
+            for (var i=0; i<Followers.length; i++) {
+                for (var j = 0; j < Objects.length; j++) {
+                    if (Followers[i] === Objects[j]["poster_id"]) {
+                        $scope.resultArray.push(Objects[j]);
+                    }
+                    else {
+                        console.log("no match found");
+                    }
+                }
             }
-            console.log(arrayOfObjects);
-                $scope.poster_items = data;
-        }).
-        error(function(data){
-                console.log("error with poster_items " + data);
-        });
+        console.log("resulting array is : " + $scope.resultArray[0]);
+        };
+
+
 
 
-    //Compare the array of followers to items in arrayofObjects
-        function friend_scrap(Followers, Objects){
-            console.log("hey you reached friends crap custom function");
-        }
 
 
-        friend_scrap(arrayOfFollowers, arrayOfObjects);
 
     });
 
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index e14e079..e5d029b 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -9,15 +9,19 @@
    <tr>
        <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
        <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
-       <th>Item Description </th>
-       <th>Claim This</th>
+       <th>Item </th>
+       <th>Item </th>
+       <th>Item Description</th>
    </tr>
    </thead>
 
-   <tbody ng-repeat="friend in friends" class="item">
+   <tbody ng-repeat="friend in resultArray" class="item">
        <tr>
-           <td> {{ friend.id}} </td>
-           <td> {{ friend.user_name}} </td>
+           <td> {{ friend.poster_id}} </td>
+           <td> {{ friend.username}} </td>
+           <td> {{ friend.item}} </td>
+           <td> {{ friend.desc}} </td>
+
 
 
            <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>

From eb887e675fb59b300614ea70cf828aedb42b2788 Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 18:09:51 -0800
Subject: [PATCH 29/43] 2/26 evening push shanarae

---
 items/api/urls.py                           |  5 +++--
 items/api/views.py                          | 25 +++++++++++++++++++++
 static/app/scripts/controllers/myclaimed.js |  4 ++--
 static/app/scripts/controllers/mycrap.js    | 14 ++++++++----
 static/app/views/mycrap.html                |  2 ++
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/items/api/urls.py b/items/api/urls.py
index c54afe6..5465882 100644
--- a/items/api/urls.py
+++ b/items/api/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 from views import ItemListAPIView, ItemDetailAPIView, ItemCreateAPIView, ItemGenericListAPIView, ItemGenericRetrieveUpdateAPIView, ItemListCreateAPIView, \
-    ClaimItemListCreateAPIView, ClaimItemDetailAPIView, ClaimGenericRetrieveUpdateAPIView
+    ClaimItemListCreateAPIView, ClaimItemDetailAPIView, ClaimGenericRetrieveUpdateAPIView, ItemDetail2APIView
 
 urlpatterns = patterns('',
     url(r'^$', ItemListAPIView.as_view(), name='ItemListAPIView'),
@@ -10,6 +10,7 @@
     url(r'^generics/id/(?P<id>\d+)/$', ItemGenericRetrieveUpdateAPIView.as_view(), name="item-generic-single"),
     url(r'^poster/$', ItemListCreateAPIView.as_view()),
     url(r'^claimer/$', ClaimItemListCreateAPIView.as_view()),
-    url(r'^claim/(?P<item_id>\d+)/$', ClaimItemDetailAPIView.as_view()),
+    url(r'^claim/(?P<id>\d+)/$', ClaimItemDetailAPIView.as_view()),
     url(r'^mine/(?P<id>\d+)/$', ClaimGenericRetrieveUpdateAPIView.as_view()),
+    url(r'^delete/(?P<id>\d+)/$', ItemDetail2APIView.as_view()),
 )
diff --git a/items/api/views.py b/items/api/views.py
index 6be16fc..654448a 100644
--- a/items/api/views.py
+++ b/items/api/views.py
@@ -112,3 +112,28 @@ class ClaimGenericRetrieveUpdateAPIView(RetrieveUpdateAPIView):
 
     def get_queryset(self):
         return Item.objects.all()
+
+
+class ItemDetail2APIView(APIView):
+    def get(self, request, item_id):
+        item = Item.objects.get(pk=item_id)
+        serializer = ItemSerializer(item)
+        return Response(serializer.data, status=status.HTTP_200_OK)
+
+    # def delete(self, request, item_id):
+    #     item = Item.objects.get(pk=item_id)
+    #     if item:
+    #         item.delete()
+    #         return Response(status=status.HTTP_204_NO_CONTENT)
+    #     else:
+    #         return Response(status=status.HTTP_400_BAD_REQUEST)
+
+    def put(self, request):
+        serializer = ItemSerializer(data=request.data)
+        if serializer.is_valid():
+
+            serializer.delete()
+            return Response(serializer.data, status.HTTP_202_ACCEPTED)
+
+        else:
+            return Response(serializer.errors, status.HTTP_400_BAD_REQUEST)
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
index 9f4ae36..e7737f6 100755
--- a/static/app/scripts/controllers/myclaimed.js
+++ b/static/app/scripts/controllers/myclaimed.js
@@ -5,9 +5,9 @@ angular.module('declutterApp')
   .filter('availbool', function(){
         return function(boolValue) {
             if (boolValue === true)
-                return "Claimed";
-            else
                 return "Available";
+            else
+                return "Claimed";
         };
     })
 
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index 1027a02..f3b766d 100755
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -5,14 +5,16 @@ angular.module('declutterApp')
   .filter('availbool', function(){
         return function(boolValue) {
             if (boolValue === true)
-                return "Claimed";
-            else
                 return "Available";
+            else
+                return "Else";
         };
     })
 
   .controller('MycrapCtrl', function ($scope, $http, $cookies, $location) {
-    $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+    $http.defaults.headers.post['X-CSRFToken'] = $cookies['csrftoken'];
+    $http.defaults.headers.put['X-CSRFToken'] = $cookies['csrftoken'];
+    //$http.defaults.headers['delete']['X-CSRFToken'] = $cookies['csrftoken'];
 
     $scope.itemCategories = [
         {category:'BOOKS', name:'Books'},
@@ -45,11 +47,14 @@ angular.module('declutterApp')
         var data = {
             "item_name":$scope.formItemName,
             "description":$scope.formItemDescription,
-            "category":$scope.formItemCategory
+            "category":$scope.formItemCategory,
+            "availability": true
+
         };
 
         $http.post('/api/items/create/', data).
         success(function(data){
+                console.table(data);
                 $scope.items.push({item_name:data.item_name, description:data.description, category:data.category});
                 $scope.formItemName = '';
                 $scope.formItemDescription = '';
@@ -82,4 +87,5 @@ angular.module('declutterApp')
         return item.show = true;
     };
 
+
   });
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
index a23a856..ce3b5f0 100755
--- a/static/app/views/mycrap.html
+++ b/static/app/views/mycrap.html
@@ -21,6 +21,7 @@
         <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
         <th>Status</th>
         <th></th>
+        <th></th>
     </tr>
     </thead>
 
@@ -34,6 +35,7 @@
             <td>{{ item.claimer.username }}</td>
             <td>{{ item.availability | availbool }}</td>
             <td bn-index-watch><a ng-click="removeItem(item)"><span class="glyphicon glyphicon-trash"></span></a></td>
+            <td><a ng-click="deleteItem(item.id)" class="btn btn-small btn-danger">delete</a></td>
         </tr>
     </tbody>
 </table>

From 7f217d5f05273a641f89c96684f1686d2911ad64 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 18:10:42 -0800
Subject: [PATCH 30/43] aftb

---
 static/app/scripts/controllers/friendscrap.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 914afb7..c741501 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -16,6 +16,7 @@ angular.module('declutterApp')
                 var userName =  data[i]["poster"]["username"];
                 var item_Name = data[i]["item_name"];
                 var desc = data[i]["description"];
+
                 // Initialize with empty object and then add user & item details
                 var obj = {};
                 obj["poster_id"] = userId;

From 315436d61d50607792eb93211451ef79c2f3dbf0 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Thu, 26 Feb 2015 20:24:26 -0800
Subject: [PATCH 31/43] aftb

---
 static/app/index.html                         | 12 ++---
 static/app/scripts/controllers/login.js       |  6 ++-
 static/app/scripts/controllers/myfriends.js   | 49 ++++++++++++++++++-
 static/app/views/friendscrap.html             |  8 +--
 static/app/views/main.html                    |  2 +-
 static/app/views/myfriends.html               |  8 +--
 .../bootstrap/dist/css/bootstrap.css          |  9 ++--
 7 files changed, 72 insertions(+), 22 deletions(-)

diff --git a/static/app/index.html b/static/app/index.html
index ba52e3f..6fb15e0 100755
--- a/static/app/index.html
+++ b/static/app/index.html
@@ -41,12 +41,12 @@
           <div class="collapse navbar-collapse" id="js-navbar-collapse" ng-controller="LoginCtrl">
 
             <ul class="nav navbar-nav">
-              <li class="active"><a href="#/">Home</a></li>
-              <li><a ng-href="#/friendscrap">Friends Crap</a></li>
-              <li><a ng-href="#/mycrap">My Crap</a></li>
-              <li><a ng-href="#/myfriends">My Friends</a></li>
-              <li><a ng-href="#/login">Login</a></li>
-              <li><a ng-href="#/logout">Logout</a></li>
+              <li ng-class="{ active: isActive('#/')}"><a href="#/">Home</a></li>
+              <li ng-class="{ active: isActive('#/friendscrap')}"><a ng-href="#/friendscrap">Friends Crap</a></li>
+              <li ng-class="{ active: isActive('#/mycrap')}"><a ng-href="#/mycrap">My Crap</a></li>
+              <li ng-class="{ active: isActive('#/myfriends')}"><a href="#/myfriends">My Friends</a></li>
+              <li ng-class="{ active: isActive('#/login')}"><a ng-href="#/login" >Login</a></li>
+              <li ng-class="{ active: isActive('#/logout')}"><a ng-href="#/logout">Logout</a></li>
               <li> Hello {{ logname }}</li>
 
 
diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
index aac69f9..4d7e209 100755
--- a/static/app/scripts/controllers/login.js
+++ b/static/app/scripts/controllers/login.js
@@ -19,5 +19,9 @@ angular.module('declutterApp')
         	$scope.errors = data;
         });
       }
-    }
+    };
+  $scope.isActive = function (viewLocation) {
+        return viewLocation === $location.path();
+    };
+
   });
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index e9d5438..c74678a 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -20,6 +20,51 @@ angular.module('declutterApp')
                     $scope.error = ["Error adding New User"];
                     console.log("error: " + data.error);
                 });
-        }
+        };
+
+//            Step 1: get the follower and followee from the below below api
+
+                $scope.arrayOfFollowers = [];
+                var friends_followee = $http.get('/api/appuser/list/follower/');
+                friends_followee.success(function(data){
+                    for (var i=0;  i<data.length; i++) {
+                        $scope.arrayOfFollowers.push(data[i]["follower"]);
+                        $scope.Followee = data[i]["followee"];
+                         }
+                    console.log($scope.arrayOfFollowers);
+                    console.log($scope.Followee);
+
+                    $scope.friends_followee=data;
+
+//            Step 2: Get the followers from the api    "/api/appuser/detail/follower/1/2/ "
+
+                $scope.result_friends = [];
+                for (var j=0; j<$scope.arrayOfFollowers.length; j++){
+                    var friends_list = $http.get('/api/appuser/detail/follower/' + $scope.Followee + '/' + $scope.arrayOfFollowers[j] + '/');
+                    friends_list.success(function(data){
+
+                        var username =  data["username"];
+                        var email =  data["email"];
+                        var first_name =  data["first_name"];
+                        var last_name = data["last_name"];
+
+                        var obj = {};
+                        obj["user_name"] = username;
+                        obj["email"] = email;
+                        obj["first_name"] = first_name;
+                        obj["last_name"] = last_name;
+                        $scope.result_friends.push(obj);
+                        console.log(obj);
+
+                });
+
+                }
+
+                    }).
+                error(function(data){
+                console.log("error with followees " + data);
+                    });
+
+  });
+
 
-    });
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index e5d029b..d06f679 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -10,7 +10,6 @@
        <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
        <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
        <th>Item </th>
-       <th>Item </th>
        <th>Item Description</th>
    </tr>
    </thead>
@@ -21,10 +20,11 @@
            <td> {{ friend.username}} </td>
            <td> {{ friend.item}} </td>
            <td> {{ friend.desc}} </td>
-
-
-
+           <td><a ng-href="#/mycrap/myclaimed" class="btn btn-small btn-primary">Claim This</a></td>
+<!--
            <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>
+           <td><a ng-href="#/mycrap/myclaimed">class="btn btn-small btn-primary">Claim This</a></td>
+-->
        </tr>
    </tbody>
 </table>
diff --git a/static/app/views/main.html b/static/app/views/main.html
index 32f9931..8b0c5d0 100755
--- a/static/app/views/main.html
+++ b/static/app/views/main.html
@@ -4,7 +4,7 @@ <h1>It's time to decrapify your life!</h1>
     <p class="lead">
     Get rid of your unused stuff. <br>And feel good it's not headed to landfill.
     </p>
-  <p><a class="btn btn-lg btn-primary" ng-href="#/register">Sign Up <span class="glyphicon glyphicon-ok"></span></a></p>
+  <p><a class="btn btn-lg btn-primary" ng-href="#/register">Sign Up </a></p>
 </div>
 
 <div class="row marketing">
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 6c0b590..7d8fe98 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -14,17 +14,17 @@
         <th ng-click="sortBy='email';reverse=!reverse">Email</th>
         <th ng-click="sortBy='first_name';reverse=!reverse">First Name</th>
         <th ng-click="sortBy='last_name';reverse=!reverse">Last Name</th>
-        <th>Delete</th>
     </tr>
     </thead>
 
-    <tbody ng-repeat="friend in friends_list | orderBy: sortBy:reverse" class="friend">
+    <tbody ng-repeat="user in result_friends | orderBy: sortBy:reverse" class="friend">
         <tr>
-            <td>{{ user.username }}</td>
+            <td>{{ user.user_name }}</td>
             <td>{{ user.email }}</td>
             <td>{{ user.first_name }}</td>
             <td>{{ user.last_name }}</td>
-            <td bn-index-watch><a ng-click="removeFriend(friend)">Delete</a></td>
+            <td><a ng-click="removeFriend(friend)" class="btn btn-small btn-danger">Delete</a></td>
+
         </tr>
     </tbody>
 </table>
diff --git a/static/bower_components/bootstrap/dist/css/bootstrap.css b/static/bower_components/bootstrap/dist/css/bootstrap.css
index c46af7d..d7f7d48 100644
--- a/static/bower_components/bootstrap/dist/css/bootstrap.css
+++ b/static/bower_components/bootstrap/dist/css/bootstrap.css
@@ -4398,14 +4398,15 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 }
 .navbar-default .navbar-nav > li > a:hover,
 .navbar-default .navbar-nav > li > a:focus {
-  color: #333;
-  background-color: transparent;
+  color: darkred;
+  background-color: #dbeaf0;
 }
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
+  color: darkred;
+  background-color: #dbeaf0;
+
 }
 .navbar-default .navbar-nav > .disabled > a,
 .navbar-default .navbar-nav > .disabled > a:hover,

From bf8d831cd56d2e6ea9e8e9aa0b49a06e556572fd Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Thu, 26 Feb 2015 21:29:31 -0800
Subject: [PATCH 32/43] shanarae cosmetic updates

---
 static/app/views/login.html     | 2 ++
 static/app/views/myclaimed.html | 4 ----
 static/app/views/mycrap.html    | 8 ++------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/static/app/views/login.html b/static/app/views/login.html
index f54d704..fb85444 100755
--- a/static/app/views/login.html
+++ b/static/app/views/login.html
@@ -15,4 +15,6 @@
     <button type="submit" class="btn btn-primary">Login</button>
   </form>
     <br>
+    <p><a ng-href="#/register">Not a member yet? Join now!</a></p>
+    
 </div>
diff --git a/static/app/views/myclaimed.html b/static/app/views/myclaimed.html
index 9aa01cb..634f569 100755
--- a/static/app/views/myclaimed.html
+++ b/static/app/views/myclaimed.html
@@ -15,8 +15,6 @@
         <th ng-click="sortBy='item_name';reverse=!reverse">Item</th>
         <th>Description</th>
         <th>Owner</th>
-        <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
-        <th>Status</th>
     </tr>
     </thead>
 
@@ -25,8 +23,6 @@
             <td>{{ item.item_name }}</td>
             <td>{{ item.description }}</td>
             <td>{{ item.poster.username }}</td>
-            <td>{{ item.claimer.username }}</td>
-            <td>{{ item.availability | availbool }}</td>
         </tr>
     </tbody>
     </table>
diff --git a/static/app/views/mycrap.html b/static/app/views/mycrap.html
index ce3b5f0..b20f97a 100755
--- a/static/app/views/mycrap.html
+++ b/static/app/views/mycrap.html
@@ -17,10 +17,8 @@
         <th>Description</th>
         <th ng-click="sortBy='category';reverse=!reverse">Category</th>
         <th ng-click="sortBy='created';reverse=!reverse">Date Posted</th>
-        <th>Owner</th>
-        <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
         <th>Status</th>
-        <th></th>
+        <th ng-click="sortBy='claimer';reverse=!reverse">Claimed By</th>
         <th></th>
     </tr>
     </thead>
@@ -31,11 +29,9 @@
             <td>{{ item.description }}</td>
             <td>{{ item.category }}</td>
             <td>{{ item.created | date:'shortDate' }}</td>
-            <td>{{ item.poster.username }}</td>
-            <td>{{ item.claimer.username }}</td>
             <td>{{ item.availability | availbool }}</td>
+            <td>{{ item.claimer.username }}</td>
             <td bn-index-watch><a ng-click="removeItem(item)"><span class="glyphicon glyphicon-trash"></span></a></td>
-            <td><a ng-click="deleteItem(item.id)" class="btn btn-small btn-danger">delete</a></td>
         </tr>
     </tbody>
 </table>

From 4262ab741efddeb6fe1920bcd817db08fe76a205 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Thu, 26 Feb 2015 22:47:09 -0800
Subject: [PATCH 33/43] Updated redirect to friends in login.js

---
 static/app/scripts/controllers/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/app/scripts/controllers/login.js b/static/app/scripts/controllers/login.js
index aac69f9..5af9d34 100755
--- a/static/app/scripts/controllers/login.js
+++ b/static/app/scripts/controllers/login.js
@@ -12,7 +12,7 @@ angular.module('declutterApp')
         .then(function(data){
         	// success case
           console.log('login: ' + data);
-        	$location.path("/mycrap");
+        	$location.path("/friendscrap");
             $rootScope.logname = $scope.model.username;
         },function(data){
         	// error case

From aef05457a6f0897c3d25f3d2a88da704a137109d Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Fri, 27 Feb 2015 01:50:32 -0800
Subject: [PATCH 34/43] Fixed all CSRF issues with PATCH and DELETE methods

---
 appuser/views.py                              |  2 +-
 declutter/settings.py                         | 28 ++++++++++++++
 items/api/serializers.py                      |  4 ++
 items/api/urls.py                             |  3 +-
 items/api/views.py                            | 37 ++++++++++++++++++-
 requirements.txt                              |  1 +
 static/app/scripts/controllers/friendscrap.js | 28 +++++++++++++-
 static/app/scripts/controllers/myclaimed.js   |  6 +++
 static/app/scripts/controllers/mycrap.js      |  6 +++
 static/app/scripts/controllers/myfriends.js   |  6 +++
 static/app/views/friendscrap.html             |  4 +-
 static/app/views/myfriends.html               |  2 +-
 12 files changed, 120 insertions(+), 7 deletions(-)

diff --git a/appuser/views.py b/appuser/views.py
index 9f17501..b70bae6 100644
--- a/appuser/views.py
+++ b/appuser/views.py
@@ -48,7 +48,7 @@ def put(self, request, stream_id, format=None, *args, **kwargs):
 
     def patch(self, request, stream_id, format=None, *args, **kwargs):
         snippet = Stream.objects.get(pk=stream_id)
-        serializer = StreamSerializer(snippet, data=request.data)
+        serializer = StreamSerializer(snippet, data=request.data, partial=True)
         if serializer.is_valid():
             serializer.save()
             return Response(serializer.data, status=status.HTTP_200_OK)
diff --git a/declutter/settings.py b/declutter/settings.py
index 22a0d4c..addf098 100644
--- a/declutter/settings.py
+++ b/declutter/settings.py
@@ -42,6 +42,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'corsheaders',
     'rest_framework',
     'rest_framework.authtoken',
     'allauth',
@@ -63,6 +64,8 @@
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
+    'django.middleware.common.CommonMiddleware'
 )
 
 ROOT_URLCONF = 'declutter.urls'
@@ -106,6 +109,31 @@
 
 USE_TZ = True
 
+#CORs settings
+CORS_ORIGIN_ALLOW_ALL = True
+CORS_ALLOW_CREDENTIALS = True
+
+
+ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
+CORS_ALLOW_HEADERS = (
+    'x-requested-with',
+    'content-type',
+    'accept',
+    'origin',
+    'authorization',
+    'X-CSRFToken',
+    'Api-Authorization',
+)
+
+CORS_ALLOW_METHODS = (
+    'GET',
+    'POST',
+    'PUT',
+    'PATCH',
+    'DELETE',
+    'OPTIONS'
+)
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
diff --git a/items/api/serializers.py b/items/api/serializers.py
index a7d1323..f13cc9a 100644
--- a/items/api/serializers.py
+++ b/items/api/serializers.py
@@ -17,3 +17,7 @@ class Meta:
         model = Item
         fields = ("id", "poster", "claimer", "item_name", "description", "created", "image", "availability", "category")
 
+class SecondItemSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Item
+
diff --git a/items/api/urls.py b/items/api/urls.py
index 5465882..a44499b 100644
--- a/items/api/urls.py
+++ b/items/api/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 from views import ItemListAPIView, ItemDetailAPIView, ItemCreateAPIView, ItemGenericListAPIView, ItemGenericRetrieveUpdateAPIView, ItemListCreateAPIView, \
-    ClaimItemListCreateAPIView, ClaimItemDetailAPIView, ClaimGenericRetrieveUpdateAPIView, ItemDetail2APIView
+    ClaimItemListCreateAPIView, ClaimItemDetailAPIView, ClaimGenericRetrieveUpdateAPIView, ItemDetail2APIView, ItemUpdate
 
 urlpatterns = patterns('',
     url(r'^$', ItemListAPIView.as_view(), name='ItemListAPIView'),
@@ -13,4 +13,5 @@
     url(r'^claim/(?P<id>\d+)/$', ClaimItemDetailAPIView.as_view()),
     url(r'^mine/(?P<id>\d+)/$', ClaimGenericRetrieveUpdateAPIView.as_view()),
     url(r'^delete/(?P<id>\d+)/$', ItemDetail2APIView.as_view()),
+    url(r'^update/(?P<item_id>\d+)/$', ItemUpdate.as_view())
 )
diff --git a/items/api/views.py b/items/api/views.py
index 654448a..aaeb04b 100644
--- a/items/api/views.py
+++ b/items/api/views.py
@@ -1,7 +1,7 @@
 from rest_framework.views import APIView, Response
 from rest_framework import status
 from rest_framework.generics import CreateAPIView, ListAPIView, RetrieveUpdateAPIView, ListCreateAPIView
-from items.api.serializers import ItemSerializer
+from items.api.serializers import ItemSerializer, SecondItemSerializer
 from items.models import Item, User
 
 
@@ -137,3 +137,38 @@ def put(self, request):
 
         else:
             return Response(serializer.errors, status.HTTP_400_BAD_REQUEST)
+
+class ItemUpdate(RetrieveUpdateAPIView):
+    serializer_class = SecondItemSerializer
+
+    def get(self, request, item_id, format=None, *args, **kwargs):
+        try:
+            queryset = Item.objects.get(pk=item_id)
+            serializer = SecondItemSerializer(queryset)
+
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        except:
+            return Response(status=status.HTTP_404_NOT_FOUND)
+
+
+    def put(self, request, item_id, format=None, *args, **kwargs):
+        snippet = Item.objects.get(pk=item_id)
+        serializer = SecondItemSerializer(snippet, data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        else:
+            return Response({"error": "This item does not exist"}, status=status.HTTP_404_NOT_FOUND)
+
+    def patch(self, request, item_id, format=None, *args, **kwargs):
+        snippet = Item.objects.get(pk=item_id)
+        serializer = SecondItemSerializer(snippet, data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+
+        else:
+            return Response({"error": "This stream does not exist"}, status=status.HTTP_404_NOT_FOUND)
+
diff --git a/requirements.txt b/requirements.txt
index 87106c6..df893fd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 Django==1.7.4
 django-allauth==0.19.1
+django-cors-headers==1.0.0
 django-debug-toolbar==1.2.2
 django-filter==0.9.2
 django-rest-auth==0.3.4
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index c741501..61f940e 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -5,8 +5,15 @@
 'use strict';
 
 angular.module('declutterApp')
-  .controller('FriendscrapCtrl', function ($scope, $http) {
+    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
+    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    //** django urls loves trailling slashes which angularjs removes by default.
+    $resourceProvider.defaults.stripTrailingSlashes = false;
+    })
+  .controller('FriendscrapCtrl', function ($scope, $http, $cookies) {
         //  Step 1:  Get all the data from Item List API
+
         var poster_items = $http.get('/api/items/');
         poster_items.success(function(data){
             $scope.getObjects = true;
@@ -16,6 +23,7 @@ angular.module('declutterApp')
                 var userName =  data[i]["poster"]["username"];
                 var item_Name = data[i]["item_name"];
                 var desc = data[i]["description"];
+                var item_id = data[i]["id"];
 
                 // Initialize with empty object and then add user & item details
                 var obj = {};
@@ -23,6 +31,7 @@ angular.module('declutterApp')
                 obj["username"] = userName;
                 obj["item"] = item_Name;
                 obj["desc"] = desc;
+                obj["item_id"] = item_id;
                 $scope.arrayOfObjects.push(obj);
 
 
@@ -69,7 +78,24 @@ angular.module('declutterApp')
         console.log("resulting array is : " + $scope.resultArray[0]);
         };
 
+        Object.toparams = function ObjecttoParams(obj) {
+          var p = [];
+          for (var key in obj) {
+            p.push(key + '=' + encodeURIComponent(obj[key]));
+          }
+          return p.join('&');
+        };
 
+        $scope.claim = function(itemId){
+            var url = "/api/items/update/" + itemId + "/";
+            var availability = {"availability": false};
+            $http.patch(url, availability).success(function(data){
+                console.log("Success");
+            }).
+            error(function(data){
+                console.log("Failure");
+            });
+        };
 
 
 
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
index e7737f6..4089180 100755
--- a/static/app/scripts/controllers/myclaimed.js
+++ b/static/app/scripts/controllers/myclaimed.js
@@ -1,6 +1,12 @@
 'use strict';
 
 angular.module('declutterApp')
+    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
+    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    //** django urls loves trailling slashes which angularjs removes by default.
+    $resourceProvider.defaults.stripTrailingSlashes = false;
+    })
   
   .filter('availbool', function(){
         return function(boolValue) {
diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index 43a8f11..6951680 100755
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -1,6 +1,12 @@
 'use strict';
 
 angular.module('declutterApp')
+    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
+    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    //** django urls loves trailling slashes which angularjs removes by default.
+    $resourceProvider.defaults.stripTrailingSlashes = false;
+    })
 
   .filter('availbool', function(){
         return function(boolValue) {
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index c74678a..ff0187c 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -2,6 +2,12 @@
 
 
 angular.module('declutterApp')
+    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
+    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    //** django urls loves trailling slashes which angularjs removes by default.
+    $resourceProvider.defaults.stripTrailingSlashes = false;
+    })
   .controller('MyfriendsCtrl', function ($scope, $http, $cookies) {
           $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
           $scope.addFriend = function () {
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index d06f679..37d4622 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -14,13 +14,13 @@
    </tr>
    </thead>
 
-   <tbody ng-repeat="friend in resultArray" class="item">
+   <tbody ng-repeat="friend in resultArray track by $index" class="item">
        <tr>
            <td> {{ friend.poster_id}} </td>
            <td> {{ friend.username}} </td>
            <td> {{ friend.item}} </td>
            <td> {{ friend.desc}} </td>
-           <td><a ng-href="#/mycrap/myclaimed" class="btn btn-small btn-primary">Claim This</a></td>
+           <td><a ng-click="claim(friend.item_id)" class="btn btn-small btn-primary">Claim This</a></td>
 <!--
            <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>
            <td><a ng-href="#/mycrap/myclaimed">class="btn btn-small btn-primary">Claim This</a></td>
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 7d8fe98..9da6e83 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -17,7 +17,7 @@
     </tr>
     </thead>
 
-    <tbody ng-repeat="user in result_friends | orderBy: sortBy:reverse" class="friend">
+    <tbody ng-repeat="user in result_friends | orderBy: sortBy:reverse track by $index" class="friend">
         <tr>
             <td>{{ user.user_name }}</td>
             <td>{{ user.email }}</td>

From b24286ecda2b0e54bf6e9c05e6dd50fdf80de449 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Fri, 27 Feb 2015 09:31:07 -0800
Subject: [PATCH 35/43] commit this morning

---
 static/app/scripts/controllers/myfriends.js    |  2 ++
 static/app/views/friendscrap.html              | 15 ++++++++-------
 static/app/views/main.html                     |  2 +-
 static/app/views/myfriends.html                | 18 ++++++++++--------
 .../bootstrap/dist/css/bootstrap.css           |  4 ++--
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index c74678a..2089121 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -65,6 +65,8 @@ angular.module('declutterApp')
                 console.log("error with followees " + data);
                     });
 
+
+
   });
 
 
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index d06f679..4f27bb8 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -14,17 +14,18 @@
    </tr>
    </thead>
 
-   <tbody ng-repeat="friend in resultArray" class="item">
-       <tr>
+   <tbody class="item">
+       <tr
+               ng-repeat="friend in resultArray"
+               ng-if="!friend.hide"
+       >
            <td> {{ friend.poster_id}} </td>
            <td> {{ friend.username}} </td>
            <td> {{ friend.item}} </td>
            <td> {{ friend.desc}} </td>
-           <td><a ng-href="#/mycrap/myclaimed" class="btn btn-small btn-primary">Claim This</a></td>
-<!--
-           <td><a ng-href="#/mycrap/myclaimed">Claim this Item</a></td>
-           <td><a ng-href="#/mycrap/myclaimed">class="btn btn-small btn-primary">Claim This</a></td>
--->
+           <td><a ng-href="#/mycrap/myclaimed" class="btn btn-small btn-primary">Claim</a></td>
+           <td><a ng-click="friend.hide = true;" class="btn btn-small btn-warning">Hide</a></td>
+
        </tr>
    </tbody>
 </table>
diff --git a/static/app/views/main.html b/static/app/views/main.html
index 8b0c5d0..d6789c9 100755
--- a/static/app/views/main.html
+++ b/static/app/views/main.html
@@ -1,6 +1,6 @@
 
 <div class="jumbotron other-color">
-    <h1>It's time to decrapify your life!</h1>
+    <h3>It's time to decrapify your life!</h3>
     <p class="lead">
     Get rid of your unused stuff. <br>And feel good it's not headed to landfill.
     </p>
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 7d8fe98..8c6c01a 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -17,14 +17,16 @@
     </tr>
     </thead>
 
-    <tbody ng-repeat="user in result_friends | orderBy: sortBy:reverse" class="friend">
-        <tr>
-            <td>{{ user.user_name }}</td>
-            <td>{{ user.email }}</td>
-            <td>{{ user.first_name }}</td>
-            <td>{{ user.last_name }}</td>
-            <td><a ng-click="removeFriend(friend)" class="btn btn-small btn-danger">Delete</a></td>
-
+    <tbody class="friend">
+        <tr
+            ng-repeat="user in result_friends | orderBy:  sortBy:reverse"
+            ng-if="!user.hide"
+        >
+                <td>{{ user.user_name }}</td>
+                <td>{{ user.email }}</td>
+                <td>{{ user.first_name }}</td>
+                <td>{{ user.last_name }}</td>
+                <td><a ng-click="user.hide = true;" class="btn btn-small btn-danger">Delete</a></td>
         </tr>
     </tbody>
 </table>
diff --git a/static/bower_components/bootstrap/dist/css/bootstrap.css b/static/bower_components/bootstrap/dist/css/bootstrap.css
index d7f7d48..af7e894 100644
--- a/static/bower_components/bootstrap/dist/css/bootstrap.css
+++ b/static/bower_components/bootstrap/dist/css/bootstrap.css
@@ -1281,7 +1281,7 @@ p {
 }
 .lead {
   margin-bottom: 20px;
-  font-size: 16px;
+  font-size: 12px;
   font-weight: 300;
   line-height: 1.4;
 }
@@ -3324,7 +3324,7 @@ fieldset[disabled] .btn-link:focus {
 .btn-lg,
 .btn-group-lg > .btn {
   padding: 10px 16px;
-  font-size: 18px;
+  font-size: 15px;
   line-height: 1.3333333;
   border-radius: 6px;
 }

From 6ce3d6c6ee61cc35d4cc7daeee95e3e5067250f8 Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Fri, 27 Feb 2015 09:40:49 -0800
Subject: [PATCH 36/43] 2/27am shanarae updates

---
 static/app/scripts/controllers/mycrap.js    | 6 ------
 static/app/scripts/controllers/myfriends.js | 2 ++
 static/app/views/login.html                 | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/static/app/scripts/controllers/mycrap.js b/static/app/scripts/controllers/mycrap.js
index 6951680..70bf0e9 100755
--- a/static/app/scripts/controllers/mycrap.js
+++ b/static/app/scripts/controllers/mycrap.js
@@ -88,10 +88,4 @@ angular.module('declutterApp')
             });
     };
 
-    $scope.delete = function(item) {
-        alert("Deleting the item");
-        return item.show = true;
-    };
-
-
   });
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index ff0187c..bd6fe1e 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -71,6 +71,8 @@ angular.module('declutterApp')
                 console.log("error with followees " + data);
                     });
 
+
+
   });
 
 
diff --git a/static/app/views/login.html b/static/app/views/login.html
index fb85444..24def58 100755
--- a/static/app/views/login.html
+++ b/static/app/views/login.html
@@ -16,5 +16,5 @@
   </form>
     <br>
     <p><a ng-href="#/register">Not a member yet? Join now!</a></p>
-    
+
 </div>

From f99f112cbbf10dce9a7d5cc5b8703cc5980317e7 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Fri, 27 Feb 2015 09:50:55 -0800
Subject: [PATCH 37/43] committed for pull

---
 static/app/scripts/controllers/friendscrap.js | 8 --------
 static/app/views/friendscrap.html             | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 61f940e..b8b16af 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -78,14 +78,6 @@ angular.module('declutterApp')
         console.log("resulting array is : " + $scope.resultArray[0]);
         };
 
-        Object.toparams = function ObjecttoParams(obj) {
-          var p = [];
-          for (var key in obj) {
-            p.push(key + '=' + encodeURIComponent(obj[key]));
-          }
-          return p.join('&');
-        };
-
         $scope.claim = function(itemId){
             var url = "/api/items/update/" + itemId + "/";
             var availability = {"availability": false};
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 37d4622..3d76ff6 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -14,7 +14,7 @@
    </tr>
    </thead>
 
-   <tbody ng-repeat="friend in resultArray track by $index" class="item">
+   <tbody ng-repeat="friend in resultArray" ng-if="!friend.hide" class="item">
        <tr>
            <td> {{ friend.poster_id}} </td>
            <td> {{ friend.username}} </td>

From 68c3574e23b7039b284a0ff3357c4f11294bbf6e Mon Sep 17 00:00:00 2001
From: Shanarae Goodwin <shanarae@gmail.com>
Date: Fri, 27 Feb 2015 12:03:51 -0800
Subject: [PATCH 38/43] shanarae friends delete update

---
 static/app/scripts/controllers/myfriends.js | 31 +++++++++++++++++++--
 static/app/views/friendscrap.html           |  2 +-
 static/app/views/myfriends.html             |  9 ++----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index bd6fe1e..ccf1b27 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -1,8 +1,7 @@
 'use strict';
 
-
 angular.module('declutterApp')
-    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
+  .config(function($httpProvider , $interpolateProvider, $resourceProvider){
     $httpProvider.defaults.xsrfCookieName = 'csrftoken';
     $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
     //** django urls loves trailling slashes which angularjs removes by default.
@@ -71,6 +70,34 @@ angular.module('declutterApp')
                 console.log("error with followees " + data);
                     });
 
+    //$scope.removeFriend = function(followeeId, followerId){
+    //    console.log("url :" + 'api/appuser/update/follower/' + followeeId + "/" + followerId + "/" );
+    //    $http.delete('api/appuser/update/follower/' + followeeId + "/" + followerId + "/").
+    //    success(function(data){
+    //            $scope.snippet.splice(
+    //                $scope.snippet.indexOf(snippet),
+    //                1
+    //            );
+    //        }).
+    //        error(function(data){
+    //            $scope.error = ["Error deleting friend"];
+    //        });
+    //};
+
+    $scope.removeFriend = function(followeeId, followerId) {
+        console.log("url :" + 'api/appuser/update/follower/' + followeeId + "/" + followerId + "/" );
+        var url = "/api/appuser/update/follower/" + followeeId + "/" + followerId + "/";
+        $http.delete(url).success(function(data){
+            console.log("Success");
+            $scope.snippet.splice(
+                $scope.snippet.indexOf(snippet),
+                1
+            )
+        }).
+        error(function(data) {
+            console.log("Failure");
+            });
+    };
 
 
   });
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 75281e1..3488a02 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -16,7 +16,7 @@
 
    <tbody class="item">
        <tr
-               ng-repeat="friend in resultArray"
+               ng-repeat="friend in resultArray track by $index"
                ng-if="!friend.hide"
        >
            <td> {{ friend.poster_id}} </td>
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 8f06334..c0f4aef 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -12,22 +12,17 @@
     <tr>
         <th ng-click="sortBy='username';reverse=!reverse">Username</th>
         <th ng-click="sortBy='email';reverse=!reverse">Email</th>
-        <th ng-click="sortBy='first_name';reverse=!reverse">First Name</th>
-        <th ng-click="sortBy='last_name';reverse=!reverse">Last Name</th>
+        <th></th>
     </tr>
     </thead>
 
-<<<<<<< HEAD
     <tbody class="friend">
         <tr
             ng-repeat="user in result_friends | orderBy:  sortBy:reverse"
         >
                 <td>{{ user.user_name }}</td>
                 <td>{{ user.email }}</td>
-                <td>{{ user.first_name }}</td>
-                <td>{{ user.last_name }}</td>
-                <td><a ng-click="removeFriend(friend)" class="btn btn-small btn-danger">Delete</a></td>
-
+                <td bn-index-watch><a ng-click="removeFriend(friend.followee_id, friend.follower_id)"><span class="glyphicon glyphicon-trash"></span></a></td>
         </tr>
     </tbody>
 </table>

From 3999a3718f38b93b46fa386f0f2bef00de86e852 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Fri, 27 Feb 2015 13:01:33 -0800
Subject: [PATCH 39/43] incomplete friendscrap

---
 static/app/scripts/controllers/friendscrap.js | 105 ++++++------------
 static/app/scripts/controllers/myclaimed.js   |   2 +-
 static/app/views/friendscrap.html             |   4 +-
 3 files changed, 40 insertions(+), 71 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index b8b16af..ae33721 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -13,85 +13,54 @@ angular.module('declutterApp')
     })
   .controller('FriendscrapCtrl', function ($scope, $http, $cookies) {
         //  Step 1:  Get all the data from Item List API
-
-        var poster_items = $http.get('/api/items/');
-        poster_items.success(function(data){
-            $scope.getObjects = true;
-            $scope.arrayOfObjects = [];
-            for (var i=0;  i<data.length; i++) {
-                var userId = data[i]["poster"]["id"];
-                var userName =  data[i]["poster"]["username"];
-                var item_Name = data[i]["item_name"];
-                var desc = data[i]["description"];
-                var item_id = data[i]["id"];
-
-                // Initialize with empty object and then add user & item details
-                var obj = {};
-                obj["poster_id"] = userId;
-                obj["username"] = userName;
-                obj["item"] = item_Name;
-                obj["desc"] = desc;
-                obj["item_id"] = item_id;
-                $scope.arrayOfObjects.push(obj);
-
-
-                // Step 2: Get all followers from follower list
-                $scope.arrayOfFollowers = [];
-                var friends = $http.get('/api/appuser/list/follower/');
-                friends.success(function(data){
-                    for (var i=0;  i<data.length; i++) {
-                        $scope.arrayOfFollowers.push(data[i]["follower"]);
-                         }
-                    console.log($scope.arrayOfFollowers);
-                    friends_crap($scope.arrayOfFollowers, $scope.arrayOfObjects);
-                    $scope.friends=data;
-
-                    }).
-                error(function(data){
-                console.log("error with friends " + data);
-                    });
-                    }
-                    console.log("array of objects:" + $scope.arrayOfObjects);
-                        $scope.poster_items = data;
-                }).
-                error(function(data){
-                        console.log("error with poster_items " + data);
-                });
-
-        // Step 3: This function will produce resulting array of objects
-
-        var friends_crap = function(Followers, Objects){
-            $scope.resultArray = [];
-//            console.log("hey you reached friends crap custom function");
-//            console.log("follower:    " + Followers.length.toString());
-
-            for (var i=0; i<Followers.length; i++) {
-                for (var j = 0; j < Objects.length; j++) {
-                    if (Followers[i] === Objects[j]["poster_id"]) {
-                        $scope.resultArray.push(Objects[j]);
-                    }
-                    else {
-                        console.log("no match found");
-                    }
-                }
+        $scope.poster_items = {};
+        $http.get('/api/items/').
+        success(function(data){
+            $scope.poster_items['data'] = data;
+            console.log("data type: " + data[0]["id"]);
+            console.log("data length: " + data.length);
+            console.log("scope: " + $scope.poster_items['data'][0]["id"]);
+            console.log("scope.length :" + $scope.poster_items['data'].length);
+        }).
+        error(function(data){
+            console.log("error " + data);
+        });
+
+        $scope.itemDetailCollection = [];
+        
+        $scope.itemPop = function (){
+            for (var i=0; i<$scope.poster_items['data'].length; i ++){
+                var itemID = $scope.poster_items['data'][i]["id"];
+                var posterID = $scope.poster_items['data'][i]["poster"]["id"];
+                var itemName = $scope.poster_items['data'][i]["item_name"];
+                var avail = $scope.poster_items['data'][i]["availability"];
+                var category = $scope.poster_items['data'][i]["category"];
+
+                var itemObject = {};
+                itemObject['item_id'] = itemID;
+                itemObject['poster_id'] = posterID;
+                itemObject['item_name'] = itemName;
+                itemObject['availability'] = avail;
+                itemObject['category'] = category;
+                $scope.itemDetailCollection.push(itemObject);
             }
-        console.log("resulting array is : " + $scope.resultArray[0]);
         };
 
+        // $scope.itemPop();
+
+        // console.log("itemCollection : " + $scope.itemDetailCollection);
+
         $scope.claim = function(itemId){
             var url = "/api/items/update/" + itemId + "/";
-            var availability = {"availability": false};
-            $http.patch(url, availability).success(function(data){
+            var claimUpdate = {"availability": false, "claimer": $scope.poster_items['data'][0]["poster"["id"]};
+            $http.patch(url, claimUpdate).success(function(data){
                 console.log("Success");
+                console.log("poster_id :" + $scope.poster_items['data'][0]["poster"["id"]);
             }).
             error(function(data){
                 console.log("Failure");
             });
         };
 
-
-
-
-
     });
 
diff --git a/static/app/scripts/controllers/myclaimed.js b/static/app/scripts/controllers/myclaimed.js
index 4089180..a417e05 100755
--- a/static/app/scripts/controllers/myclaimed.js
+++ b/static/app/scripts/controllers/myclaimed.js
@@ -18,7 +18,7 @@ angular.module('declutterApp')
     })
 
   .controller('MyclaimedCtrl', function ($scope, $http, $cookies) {
-    $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
+    // $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
 
 
     var items_request = $http.get('/api/items/claimer');
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 75281e1..7f918a6 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -16,8 +16,8 @@
 
    <tbody class="item">
        <tr
-               ng-repeat="friend in resultArray"
-               ng-if="!friend.hide"
+               ng-repeat="friend in resultArray track by $index"
+               ng-show="friend.avail === true"
        >
            <td> {{ friend.poster_id}} </td>
            <td> {{ friend.username}} </td>

From dc670f603dfe555789cf0fbcc411fc15a2e076e4 Mon Sep 17 00:00:00 2001
From: skumo <skathimanda@gmail.com>
Date: Fri, 27 Feb 2015 13:36:43 -0800
Subject: [PATCH 40/43] commit this morning

---
 static/app/scripts/controllers/friendscrap.js | 146 +++++++++---------
 static/app/views/friendscrap.html             |   7 +-
 static/app/views/myfriends.html               |   1 -
 3 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 61f940e..952da6f 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -1,105 +1,107 @@
-/**
- * Created by skumo on 23/02/15.
- */
-
 'use strict';
 
 angular.module('declutterApp')
     .config(function($httpProvider , $interpolateProvider, $resourceProvider){
     $httpProvider.defaults.xsrfCookieName = 'csrftoken';
     $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
-    //** django urls loves trailling slashes which angularjs removes by default.
     $resourceProvider.defaults.stripTrailingSlashes = false;
     })
-  .controller('FriendscrapCtrl', function ($scope, $http, $cookies) {
+  .controller('FriendscrapCtrl', function ($scope, $q, $http) {
+
         //  Step 1:  Get all the data from Item List API
 
         var poster_items = $http.get('/api/items/');
-        poster_items.success(function(data){
-            $scope.getObjects = true;
-            $scope.arrayOfObjects = [];
-            for (var i=0;  i<data.length; i++) {
-                var userId = data[i]["poster"]["id"];
-                var userName =  data[i]["poster"]["username"];
-                var item_Name = data[i]["item_name"];
-                var desc = data[i]["description"];
-                var item_id = data[i]["id"];
-
-                // Initialize with empty object and then add user & item details
-                var obj = {};
-                obj["poster_id"] = userId;
-                obj["username"] = userName;
-                obj["item"] = item_Name;
-                obj["desc"] = desc;
-                obj["item_id"] = item_id;
-                $scope.arrayOfObjects.push(obj);
-
-
-                // Step 2: Get all followers from follower list
-                $scope.arrayOfFollowers = [];
-                var friends = $http.get('/api/appuser/list/follower/');
-                friends.success(function(data){
-                    for (var i=0;  i<data.length; i++) {
-                        $scope.arrayOfFollowers.push(data[i]["follower"]);
-                         }
-                    console.log($scope.arrayOfFollowers);
-                    friends_crap($scope.arrayOfFollowers, $scope.arrayOfObjects);
-                    $scope.friends=data;
-
-                    }).
-                error(function(data){
-                console.log("error with friends " + data);
-                    });
-                    }
-                    console.log("array of objects:" + $scope.arrayOfObjects);
-                        $scope.poster_items = data;
-                }).
-                error(function(data){
-                        console.log("error with poster_items " + data);
+
+        var posterItems = function() {
+            var deferred = $q.defer();
+            poster_items.success(function (data) {
+                $scope.arrayOfObjects = [];
+                for (var i = 0; i < data.length; i++) {
+                    var userId = data[i]["poster"]["id"];
+                    var userName = data[i]["poster"]["username"];
+                    var item_Name = data[i]["item_name"];
+                    var availability = data[i]["availability"];
+                    var desc = data[i]["description"];
+                    var item_id = data[i]["id"];
+
+                    // Initialize with empty object and then add user & item details
+                    var obj = {};
+                    obj["poster_id"] = userId;
+                    obj["username"] = userName;
+                    obj["item"] = item_Name;
+                    obj["desc"] = desc;
+                    obj["item_id"] = item_id;
+                    obj["availability"] = availability;
+
+                    $scope.arrayOfObjects.push(obj);
+
+                }
+                $scope.poster_items = data;
+                deferred.resolve($scope.arrayOfObjects);
+            }).
+                error(function (data) {
+                    console.log("error with poster_items " + data);
+                });
+            return deferred.promise;
+    };
+            posterItems().then(function(data){
+                console.log(data);
+        });
+
+
+
+        // Step 2: Get all followers from follower list
+        var friends = $http.get('/api/appuser/list/follower/');
+        var friendsItems = function() {
+            var task2 = $q.defer();
+            $scope.arrayOfFollowers = [];
+
+            friends.success(function (data1) {
+                for (var i = 0; i < data1.length; i++) {
+                    $scope.arrayOfFollowers.push(data1[i]["follower"]);
+                }
+                $scope.friends = data1;
+                task2.resolve($scope.arrayOfFollowers);
+                $scope.currentUser = data1[0]["followee"];
+                console.log($scope.currentUser);
+            }).
+                error(function (data1) {
+                    console.log("error with friends " + data1);
                 });
 
+            return task2.promise;
+        };
+        friendsItems().then(function(followers){
+            posterItems().then(function(objects){
+               friends_crap(followers, objects);
+            });
+        });
+
+
+
+
         // Step 3: This function will produce resulting array of objects
 
-        var friends_crap = function(Followers, Objects){
+            var friends_crap = function(Followers, Objects){
             $scope.resultArray = [];
-//            console.log("hey you reached friends crap custom function");
-//            console.log("follower:    " + Followers.length.toString());
 
             for (var i=0; i<Followers.length; i++) {
                 for (var j = 0; j < Objects.length; j++) {
                     if (Followers[i] === Objects[j]["poster_id"]) {
+                        console.log("The Followers index values is "+ Followers[i]);
+                        console.log("You are looking at objects poster ID " + Objects[j]["poster_id"]);
                         $scope.resultArray.push(Objects[j]);
+                        console.log("result array's length after each inner loop " + $scope.resultArray.length);
                     }
                     else {
                         console.log("no match found");
                     }
                 }
             }
-        console.log("resulting array is : " + $scope.resultArray[0]);
-        };
 
-        Object.toparams = function ObjecttoParams(obj) {
-          var p = [];
-          for (var key in obj) {
-            p.push(key + '=' + encodeURIComponent(obj[key]));
-          }
-          return p.join('&');
         };
 
-        $scope.claim = function(itemId){
-            var url = "/api/items/update/" + itemId + "/";
-            var availability = {"availability": false};
-            $http.patch(url, availability).success(function(data){
-                console.log("Success");
-            }).
-            error(function(data){
-                console.log("Failure");
-            });
-        };
-
-
-
-
+//        friends_crap($scope.arrayOfFollowers, $scope.arrayOfObjects);
 
     });
 
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 75281e1..13c70d1 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -10,7 +10,9 @@
        <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
        <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
        <th>Item </th>
-       <th>Item Description</th>
+       <th>Description</th>
+       <th>Availability</th>
+
    </tr>
    </thead>
 
@@ -23,6 +25,9 @@
            <td> {{ friend.username}} </td>
            <td> {{ friend.item}} </td>
            <td> {{ friend.desc}} </td>
+           <td> {{ friend.availability}} </td>
+
+
            <td><a ng-click="claim(friend.item_id)" class="btn btn-small btn-primary">Claim</a></td>
            <td><a ng-click="friend.hide = true;" class="btn btn-small btn-warning">Hide</a></td>
 
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index 8f06334..ca93f56 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -17,7 +17,6 @@
     </tr>
     </thead>
 
-<<<<<<< HEAD
     <tbody class="friend">
         <tr
             ng-repeat="user in result_friends | orderBy:  sortBy:reverse"

From 59a820b148e56fc91bd23dc2ce41441e2ba08d1c Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Fri, 27 Feb 2015 14:18:20 -0800
Subject: [PATCH 41/43] delete function for friends operational

---
 static/app/scripts/controllers/friendscrap.js | 41 +-------------
 static/app/scripts/controllers/myfriends.js   | 55 +++++++++----------
 static/app/views/myfriends.html               |  4 +-
 3 files changed, 29 insertions(+), 71 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index ae33721..70aad96 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -12,50 +12,13 @@ angular.module('declutterApp')
     $resourceProvider.defaults.stripTrailingSlashes = false;
     })
   .controller('FriendscrapCtrl', function ($scope, $http, $cookies) {
-        //  Step 1:  Get all the data from Item List API
-        $scope.poster_items = {};
-        $http.get('/api/items/').
-        success(function(data){
-            $scope.poster_items['data'] = data;
-            console.log("data type: " + data[0]["id"]);
-            console.log("data length: " + data.length);
-            console.log("scope: " + $scope.poster_items['data'][0]["id"]);
-            console.log("scope.length :" + $scope.poster_items['data'].length);
-        }).
-        error(function(data){
-            console.log("error " + data);
-        });
-
-        $scope.itemDetailCollection = [];
-        
-        $scope.itemPop = function (){
-            for (var i=0; i<$scope.poster_items['data'].length; i ++){
-                var itemID = $scope.poster_items['data'][i]["id"];
-                var posterID = $scope.poster_items['data'][i]["poster"]["id"];
-                var itemName = $scope.poster_items['data'][i]["item_name"];
-                var avail = $scope.poster_items['data'][i]["availability"];
-                var category = $scope.poster_items['data'][i]["category"];
-
-                var itemObject = {};
-                itemObject['item_id'] = itemID;
-                itemObject['poster_id'] = posterID;
-                itemObject['item_name'] = itemName;
-                itemObject['availability'] = avail;
-                itemObject['category'] = category;
-                $scope.itemDetailCollection.push(itemObject);
-            }
-        };
-
-        // $scope.itemPop();
-
-        // console.log("itemCollection : " + $scope.itemDetailCollection);
 
         $scope.claim = function(itemId){
             var url = "/api/items/update/" + itemId + "/";
-            var claimUpdate = {"availability": false, "claimer": $scope.poster_items['data'][0]["poster"["id"]};
+            var claimUpdate = {"availability": false, "claimer": $scope.poster_items['data'][0]["poster"]["id"]};
             $http.patch(url, claimUpdate).success(function(data){
                 console.log("Success");
-                console.log("poster_id :" + $scope.poster_items['data'][0]["poster"["id"]);
+                console.log("poster_id :" + $scope.poster_items['data'][0]["poster"]["id"]);
             }).
             error(function(data){
                 console.log("Failure");
diff --git a/static/app/scripts/controllers/myfriends.js b/static/app/scripts/controllers/myfriends.js
index ccf1b27..a555c80 100755
--- a/static/app/scripts/controllers/myfriends.js
+++ b/static/app/scripts/controllers/myfriends.js
@@ -7,7 +7,7 @@ angular.module('declutterApp')
     //** django urls loves trailling slashes which angularjs removes by default.
     $resourceProvider.defaults.stripTrailingSlashes = false;
     })
-  .controller('MyfriendsCtrl', function ($scope, $http, $cookies) {
+  .controller('MyfriendsCtrl', function ($scope, $http, $cookies, $location) {
           $http.defaults.headers.post['X-CSRFToken'] = $cookies.csrftoken;
           $scope.addFriend = function () {
                 var data = {
@@ -44,20 +44,25 @@ angular.module('declutterApp')
 //            Step 2: Get the followers from the api    "/api/appuser/detail/follower/1/2/ "
 
                 $scope.result_friends = [];
+                var counter = -1;
                 for (var j=0; j<$scope.arrayOfFollowers.length; j++){
                     var friends_list = $http.get('/api/appuser/detail/follower/' + $scope.Followee + '/' + $scope.arrayOfFollowers[j] + '/');
                     friends_list.success(function(data){
-
+                        
+                        var follower_id = data["id"];
                         var username =  data["username"];
                         var email =  data["email"];
                         var first_name =  data["first_name"];
                         var last_name = data["last_name"];
+                        var arrayIndex = counter += 1;
 
                         var obj = {};
+                        obj["follower_id"] = follower_id;
                         obj["user_name"] = username;
                         obj["email"] = email;
                         obj["first_name"] = first_name;
                         obj["last_name"] = last_name;
+                        obj["arrayIndex"] = arrayIndex;
                         $scope.result_friends.push(obj);
                         console.log(obj);
 
@@ -70,34 +75,24 @@ angular.module('declutterApp')
                 console.log("error with followees " + data);
                     });
 
-    //$scope.removeFriend = function(followeeId, followerId){
-    //    console.log("url :" + 'api/appuser/update/follower/' + followeeId + "/" + followerId + "/" );
-    //    $http.delete('api/appuser/update/follower/' + followeeId + "/" + followerId + "/").
-    //    success(function(data){
-    //            $scope.snippet.splice(
-    //                $scope.snippet.indexOf(snippet),
-    //                1
-    //            );
-    //        }).
-    //        error(function(data){
-    //            $scope.error = ["Error deleting friend"];
-    //        });
-    //};
-
-    $scope.removeFriend = function(followeeId, followerId) {
-        console.log("url :" + 'api/appuser/update/follower/' + followeeId + "/" + followerId + "/" );
-        var url = "/api/appuser/update/follower/" + followeeId + "/" + followerId + "/";
-        $http.delete(url).success(function(data){
-            console.log("Success");
-            $scope.snippet.splice(
-                $scope.snippet.indexOf(snippet),
-                1
-            )
-        }).
-        error(function(data) {
-            console.log("Failure");
-            });
-    };
+            $scope.removeFriend = function(followerId, itemIndex) {
+                console.log("url :" + 'api/appuser/update/follower/' + $scope.Followee + "/" + followerId + "/" );
+                var url = "/api/appuser/update/follower/" + $scope.Followee + "/" + followerId + "/";
+                $http.delete(url).
+                success(function(data){
+                    console.log("Success");
+
+                }).
+                error(function(data) {
+                    console.log("Failure");
+                    }).
+                then(function(){
+                    console.log("Then exexcuted");
+                    console.log("itemIndex :" + itemIndex);
+                    $scope.result_friends.splice(itemIndex, 1);
+                    $location.path("myfriends");  
+                });
+            };
 
 
   });
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index c0f4aef..b143c18 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -18,11 +18,11 @@
 
     <tbody class="friend">
         <tr
-            ng-repeat="user in result_friends | orderBy:  sortBy:reverse"
+            ng-repeat="user in result_friends | orderBy:  sortBy:reverse" ng-show="user.user_name !== undefined"
         >
                 <td>{{ user.user_name }}</td>
                 <td>{{ user.email }}</td>
-                <td bn-index-watch><a ng-click="removeFriend(friend.followee_id, friend.follower_id)"><span class="glyphicon glyphicon-trash"></span></a></td>
+                <td bn-index-watch><a ng-click="removeFriend(user.follower_id, user.arrayIndex)"><span class="glyphicon glyphicon-trash"></span></a></td>
         </tr>
     </tbody>
 </table>

From e3401ca5247e10bb98fbaf8e9aa7f2d4490bc93c Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Fri, 27 Feb 2015 16:53:29 -0800
Subject: [PATCH 42/43] claims still not working

---
 static/app/scripts/controllers/friendscrap.js | 16 ++++++
 static/app/views/friendscrap.html             | 51 +++++++++----------
 static/app/views/myfriends.html               |  2 +-
 3 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 4a1303c..135aa82 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -24,6 +24,7 @@ angular.module('declutterApp')
                     var availability = data[i]["availability"];
                     var desc = data[i]["description"];
                     var item_id = data[i]["id"];
+                    // var item_index = counter +=1;
 
                     // Initialize with empty object and then add user & item details
                     var obj = {};
@@ -33,6 +34,7 @@ angular.module('declutterApp')
                     obj["desc"] = desc;
                     obj["item_id"] = item_id;
                     obj["availability"] = availability;
+                    // obj["item_index"] = item_index;
 
                     $scope.arrayOfObjects.push(obj);
 
@@ -102,6 +104,20 @@ angular.module('declutterApp')
 
         };
 
+        $scope.claim = function(itemId, itemIndex){
+            var url = "/api/items/update/" + itemId + "/";
+            var claimUpdate = {"availability": false, "claimer": $scope.currentUser };
+            $http.patch(url, claimUpdate).success(function(data){
+                console.log("Success");
+                console.log("poster_id :" + $scope.currentUser);
+                $scope.resultArray.splice(itemIndex, 1);
+                console.log("ItemIndex :" + itemIndex);
+            }).
+            error(function(data){
+                console.log("Failure");
+            });
+        };
+
 
     });
 
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index 4ea8781..feb5265 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -1,38 +1,37 @@
-
 <br>
 <br>
 <div class="well">
 <p class="lead" id="myitems">My Friends Items
 <div>
-   <table class="table">
-   <thead>
-   <tr>
-       <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
-       <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
-       <th>Item </th>
-       <th>Description</th>
-       <th>Availability</th>
+  <table class="table">
+  <thead>
+  <tr>
+      <th ng-click="sortBy='distance';reverse=!reverse">ID</th>
+      <th ng-click="sortBy='item_name';reverse=!reverse">User Name</th>
+      <th>Item </th>
+      <th>Description</th>
+      <th>Availability</th>
 
-   </tr>
-   </thead>
+  </tr>
+  </thead>
 
-   <tbody class="item">
-       <tr
-               ng-repeat="friend in resultArray track by $index"
-               ng-show="friend.avail === true"
-       >
-           <td> {{ friend.poster_id}} </td>
-           <td> {{ friend.username}} </td>
-           <td> {{ friend.item}} </td>
-           <td> {{ friend.desc}} </td>
-           <td> {{ friend.availability}} </td>
+  <tbody class="item">
+      <tr
+              ng-repeat="friend in resultArray track by $index"
+              ng-show="friend.availability === true"
+      >
+          <td> {{ friend.poster_id}} </td>
+          <td> {{ friend.username}} </td>
+          <td> {{ friend.item}} </td>
+          <td> {{ friend.desc}} </td>
+          <td> {{ friend.availability}} </td>
 
 
-           <td><a ng-click="claim(friend.item_id)" class="btn btn-small btn-primary">Claim</a></td>
-           <td><a ng-click="friend.hide = true;" class="btn btn-small btn-warning">Hide</a></td>
+          <td><a ng-click="claim(friend.item_id)" class="btn btn-small btn-primary">Claim</a></td>
+          <td><a ng-click="friend.hide = true;" class="btn btn-small btn-warning">Hide</a></td>
 
-       </tr>
-   </tbody>
+      </tr>
+  </tbody>
 </table>
 </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/static/app/views/myfriends.html b/static/app/views/myfriends.html
index b143c18..96c3a7c 100755
--- a/static/app/views/myfriends.html
+++ b/static/app/views/myfriends.html
@@ -22,7 +22,7 @@
         >
                 <td>{{ user.user_name }}</td>
                 <td>{{ user.email }}</td>
-                <td bn-index-watch><a ng-click="removeFriend(user.follower_id, user.arrayIndex)"><span class="glyphicon glyphicon-trash"></span></a></td>
+                <td bn-index-watch><a ng-click="removeFriend(user.follower_id, $index)"><span class="glyphicon glyphicon-trash"></span></a></td>
         </tr>
     </tbody>
 </table>

From bf216b0aacdc7913624c0aa3598c4d01f3f31be8 Mon Sep 17 00:00:00 2001
From: Andy Y <andy.yap.cal@gmail.com>
Date: Tue, 3 Mar 2015 17:15:52 -0800
Subject: [PATCH 43/43] Everything works now

---
 static/app/scripts/app.js                     | 7 ++++++-
 static/app/scripts/controllers/friendscrap.js | 6 +-----
 static/app/views/friendscrap.html             | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 46403b2..bc00d10 100755
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -97,4 +97,9 @@ angular
       .otherwise({
         redirectTo: '/'
       });
-  });
+  }).config(function($httpProvider){
+    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+    }).config(function($resourceProvider) {
+        $resourceProvider.defaults.stripTrailingSlashes = false;
+    });
diff --git a/static/app/scripts/controllers/friendscrap.js b/static/app/scripts/controllers/friendscrap.js
index 135aa82..3ac3e9f 100755
--- a/static/app/scripts/controllers/friendscrap.js
+++ b/static/app/scripts/controllers/friendscrap.js
@@ -1,11 +1,7 @@
 'use strict';
 
 angular.module('declutterApp')
-    .config(function($httpProvider , $interpolateProvider, $resourceProvider){
-    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
-    $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
-    $resourceProvider.defaults.stripTrailingSlashes = false;
-    })
+
 
   .controller('FriendscrapCtrl', function ($scope, $q, $http) {
 
diff --git a/static/app/views/friendscrap.html b/static/app/views/friendscrap.html
index feb5265..b785330 100755
--- a/static/app/views/friendscrap.html
+++ b/static/app/views/friendscrap.html
@@ -27,7 +27,7 @@
           <td> {{ friend.availability}} </td>
 
 
-          <td><a ng-click="claim(friend.item_id)" class="btn btn-small btn-primary">Claim</a></td>
+          <td><a ng-click="claim(friend.item_id, $index)" class="btn btn-small btn-primary">Claim</a></td>
           <td><a ng-click="friend.hide = true;" class="btn btn-small btn-warning">Hide</a></td>
 
       </tr>