Removes references to the disabled sunlight api

.env_sample

@@ -1,4 +1,3 @@
-SUNLIGHT_API_KEY=""
 GOOGLE_MAP_API_KEY=<google_map_key>
 DJANGO_SECRET_KEY=<django_secret_key>
 PROPUBLICA_API_KEY=<pro_publica_api_key>

project/api/models/bill.py

@@ -5,13 +5,12 @@
 
 
 class BillSources:
- SUNLIGHT = "sunlight" # we don't use sunlight in current implementation is just relic of the past
  PROPUBLICA = "propublica"
- SOURCES = [(SUNLIGHT, SUNLIGHT), (PROPUBLICA, PROPUBLICA)]
+ SOURCES = [(PROPUBLICA, PROPUBLICA)]
 
 
 class Bill(models.Model):
- id = models.CharField(max_length=255, primary_key=True) # from sunlight
+ id = models.CharField(max_length=255, primary_key=True)
 
  title = models.CharField(max_length=1023)
  short_title = models.CharField(max_length=1023)

project/api/write.py

@@ -236,31 +236,6 @@ def deleteCivi(request):
  return HttpResponseServerError(reason=str(e))
 
 
-# TODO 1: profile image file upload
-# TODO 2: redo user editing
-# TODO 3: django forms
-# @login_required
-# def get_dist(request):
-# '''
-# Upon First registering or changing location information gets representative codes and addes them to the user array
-# '''
-# request = urllib2.Request("https://congress.api.sunlightfoundation.com/")
-#
-# #S3tting the key as the value of an X-APIKEY HTTP request header.
-# data = {
-# "apikey": APIKEY,
-# "fields": [],
-#
-# }
-# request.add_data(json.dumps(data))
-#
-# response = urllib2.urlopen(request)
-# resp_parsed = json.loads(response.read())
-# reps = [for rep in resp_parsed.data]
-# Account.user(request.user).representatives = reps
-#
-
-
 @login_required
 def editThread(request):
  thread_id = request.POST.get("thread_id")

project/civiwiki/settings.py

@@ -98,7 +98,6 @@
 
 # API keys
 # returns None if not found in os.environ
-SUNLIGHT_API_KEY = os.getenv("SUNLIGHT_API_KEY")
 GOOGLE_API_KEY = os.getenv("GOOGLE_MAP_API_KEY")
 
 # Channels Setup

project/frontend_views/views.py

@@ -75,7 +75,6 @@ def user_profile(request, username=None):
  "username": user,
  "profile_image_form": UpdateProfileImage,
  "google_map_api_key": settings.GOOGLE_API_KEY,
- "sunlight_api_key": settings.SUNLIGHT_API_KEY,
  }
  return TemplateResponse(request, "account.html", data)
 
@@ -92,7 +91,6 @@ def user_setup(request):
  "username": request.user.username,
  "email": request.user.email,
  "google_map_api_key": settings.GOOGLE_API_KEY,
- "sunlight_api_key": settings.SUNLIGHT_API_KEY,
  }
  return TemplateResponse(request, "user-setup.html", data)
 
@@ -196,7 +194,6 @@ def settings_view(request):
  "username": request.user.username,
  "email": request.user.email,
  "google_map_api_key": settings.GOOGLE_API_KEY,
- "sunlight_api_key": settings.SUNLIGHT_API_KEY,
  "lng": request_account.longitude,
  "lat": request_account.latitude,
  }

project/webapp/static/js/account.js

@@ -375,23 +375,4 @@ cw.AccountView = BB.View.extend({
 
  return false;
  },
- // // SunlightAPI related functions
- // getLegislators: function(coordinates){
- // var _this = this;
- // $.ajax({
- // url: "https://congress.api.sunlightfoundation.com/legislators/locate?latitude=" + coordinates.lat + "&longitude="+ coordinates.lng + "&callback=?",
- // headers:{"X-APIKEY": this.sunlightApiKey},
- // dataType: "jsonp",
- // success: function(data, status){
- // _this.$('#rep-list').empty();
- // _.each(data.results, function(rep){
- // _this.$('#rep-text').addClass('hide');
- // _this.$('#rep-list').append(_this.repChipTemplate({ rep : rep }));
- // });
- // },
- // error: function(){
- // Materialize.toast("Sunlight Error: Could not get representatives", 5000);
- // }
- // });
- // }
 });

project/webapp/static/js/utils/locate.js

@@ -115,7 +115,6 @@ cw.MapView = BB.View.extend({
  options = options || {};
 
  this.googleMapsApiKey = options.googleMapsApiKey;
- this.sunlightApiKey = options.sunlightApiKey;
  return this;
  },
 
@@ -324,32 +323,4 @@ cw.MapView = BB.View.extend({
  };
  return fullAddress;
  },
-
- // SunlightAPI related functions
- getLegislators: function(coordinates) {
- var _this = this;
- $.ajax({
- url:
- "https://congress.api.sunlightfoundation.com/legislators/locate?latitude=" +
- coordinates.lat +
- "&longitude=" +
- coordinates.lng +
- "&callback=?",
- headers: { "X-APIKEY": this.sunlightApiKey },
- dataType: "jsonp",
- success: function(data, status) {
- _this.$("#rep-list").empty();
- _.each(data.results, function(rep) {
- _this.$("#rep-text").addClass("hide");
- _this.$("#rep-list").append(_this.repChipTemplate({ rep: rep }));
- });
- },
- error: function() {
- Materialize.toast(
- "Sunlight Error: Could not get representatives",
- 2000
- );
- }
- });
- }
 });

project/webapp/templates/account.html

@@ -74,7 +74,6 @@
 <script type="text/javascript" src="{% static "js/account.js" %}"></script>
 
 <script type="text/javascript">
- // var sunlightApiKey = "{{ sunlight_api_key }}";
 
  var username = '{{username}}';
  var current_user = '{{request.user.username}}'
@@ -85,7 +84,6 @@
  var accountView = new cw.AccountView({
  model: accountModel,
  current_user: current_user,
- // sunlightApiKey: sunlightApiKey
  });
  accountModel.fetch();
  accountView.render();

project/webapp/templates/user-setup.html

@@ -33,7 +33,6 @@
 
 <script type="text/javascript" src="{% static "js/user-setup.js" %}"></script>
 <script type="text/javascript">
- var sunlightApiKey = "{{ sunlight_api_key }}";
  var accountUsername= "{{ username }}";
  var accountModel = new cw.AccountModel({username: accountUsername});
 

project/webapp/templates/user/settings.html

@@ -120,15 +120,14 @@
 <script type="text/javascript" src="{% static "js/utils/locate.js" %}"></script>
 <script type="text/javascript">
  var googleMapsApiKey = "{{ google_map_api_key }}";
- var sunlightApiKey = "{{ sunlight_api_key }}";
 
  location_data = {
  lng: {{lng}},
  lat: {{lat}}
  }
 
  var mapModel = new cw.Map({coordinates: location_data});
- var mapView = new cw.MapView({model: mapModel, googleMapsApiKey: googleMapsApiKey, sunlightApiKey: sunlightApiKey});
+ var mapView = new cw.MapView({model: mapModel, googleMapsApiKey: googleMapsApiKey});
 
  var data = {};
  data.username = '{{user.username}}';

readmes/local-setup.md

@@ -22,7 +22,6 @@ The above command should be run in the same directory as the requirements.txt fi
 ### Environment variables
 There are several environment variables that are needed for things to work properly:
 
-- SUNLIGHT_API_KEY
 - GOOGLE_MAP_API_KEY
 - REDIS_URL (optional)
 - AWS_STORAGE_BUCKET_NAME (optional)
@@ -42,7 +41,6 @@ You can save some time and declare those environmental variables all at once wit
 export DJANGO_SECRET_KEY=**********
 
 # Third party
-export SUNLIGHT_API_KEY=**********
 export GOOGLE_MAP_API_KEY=**********
 
 # PostgreSQL

requirements.txt

@@ -12,7 +12,6 @@ coreapi==2.3.3
 psycopg2==2.8.6
 Pillow==7.2.0
 requests==2.24.0
-sunlight==1.2.9
 
 # Packages for development/testing
 coverage==4.5.3