Merge pull request #153 from open-austin/enable_admin

NOREF: added admin page functionality.

src/.dockerignore

@@ -6,3 +6,4 @@ nginx.conf-integration
 __pycache__
 *.pyc
 influencetx/static/react-app
+frontend/

src/config/settings/base.py

@@ -43,12 +43,12 @@
     # 'django.contrib.humanize',
 
     # Admin
-    #'django.contrib.admin',
+    'django.contrib.admin',
 ]
 THIRD_PARTY_APPS = [
     'crispy_forms',  # Form layouts
-    #'allauth',  # registration
-    #'allauth.account',  # registration
+    'allauth',  # registration
+    'allauth.account',  # registration
     #'allauth.socialaccount',  # registration
 ]
 

src/config/urls.py

@@ -17,7 +17,7 @@
     url(r'^findreps/$', TemplateView.as_view(template_name='pages/findreps.html'), name='findreps'),
 
     # Django Admin, use {% url 'admin:index' %}
-    #url(settings.ADMIN_URL, admin.site.urls),
+    url(settings.ADMIN_URL, admin.site.urls),
 
     # User management
 #    url(r'^users/', include('influencetx.users.urls', namespace='users')),

src/docker-compose.vagrant

@@ -36,6 +36,7 @@ services:
     container_name: frontend
     build:
       context: ./frontend
+      dockerfile: Dockerfile.local
     image: inftxosfrontend:dev
     command: "npm start"
     environment:

src/influencetx/bills/admin.py

@@ -4,6 +4,6 @@
 
 admin.site.register(models.Bill)
 admin.site.register(models.SubjectTag)
-admin.site.register(models.ActionDates)
+admin.site.register(models.ActionDate)
 admin.site.register(models.VoteTally)
 admin.site.register(models.SingleVote)

src/influencetx/legislators/migrations/0002_auto_20200826_0033.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2020-08-26 00:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('legislators', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='legislator',
+            name='tpj_filer_id',
+            field=models.IntegerField(blank=True, db_index=True, default=0),
+        ),
+        migrations.AddField(
+            model_name='legislator',
+            name='tx_lege_id',
+            field=models.CharField(blank=True, db_index=True, max_length=48),
+        ),
+    ]

src/influencetx/legislators/models.py

@@ -7,6 +7,8 @@
 class Legislator(models.Model):
     # Legislator ID from Open States API.
     openstates_leg_id = models.CharField(max_length=48, db_index=True)
+    tpj_filer_id = models.IntegerField(default=0, blank=True, db_index=True)
+    tx_lege_id = models.CharField(max_length=48, blank=True, db_index=True)
     name = models.CharField(max_length=45)
     first_name = models.CharField(max_length=20, blank=True)
     last_name = models.CharField(max_length=20, blank=True)
@@ -34,7 +36,7 @@ def chamber_label(self):
         return utils.chamber_label(self.chamber)
 
     def __str__(self):
-        return self.name
+        return f'{self.name} {self.tx_lege_id}'
 
 
 class LegislatorIdMap(models.Model):

src/influencetx/tpj/admin.py

@@ -0,0 +1,9 @@
+from django.contrib import admin
+
+from . import models
+
+admin.site.register(models.Donor)
+admin.site.register(models.Filer)
+admin.site.register(models.Contribution)
+admin.site.register(models.Contributionsummary)
+admin.site.register(models.Contributiontotalbydonor)

src/influencetx/users/migrations/0003_auto_20200826_0033.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2020-08-26 00:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_auto_20200709_0256'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='last_name',
+            field=models.CharField(blank=True, max_length=30, verbose_name='last name'),
+        ),
+    ]

src/requirements/base.txt

@@ -5,10 +5,11 @@
 wheel==0.33.1
 
 django==2.2.14
-graphene
-graphene-django
-django-cors-headers
+graphene==2.1.8
+graphene-django==2.13.0
+django-cors-headers==3.5.0
 django-filter>=2
+django-allauth==0.42.0
 
 # Configuration
 django-environ==0.4.5
@@ -25,6 +26,7 @@ django-model-utils==3.1.2
 Pillow==6.2.0
 
 # Password storage
+argon2-cffi==20.1.0
 
 # For user registration, either via email or social
 # Well-built with regular release cycles!