\w{31})$', v.beta_register, name='beta_register'),
diff --git a/frontend_views/views.py b/project/frontend_views/views.py
similarity index 90%
rename from frontend_views/views.py
rename to project/frontend_views/views.py
index 31d15fb2b..3821f0346 100644
--- a/frontend_views/views.py
+++ b/project/frontend_views/views.py
@@ -28,9 +28,9 @@ def base_view(request):
all_categories = list(Category.objects.values_list('id', flat=True))
user_categories = list(a.categories.values_list('id', flat=True)) or all_categories
- feed_threads = [Thread.objects.summarize(t) for t in Thread.objects.order_by('-created')]
- top5_threads = list(Thread.objects.all().order_by('-num_views')[:5].values('id', 'title'))
-
+ feed_threads = [Thread.objects.summarize(t) for t in Thread.objects.exclude(is_draft=True).order_by('-created')]
+ top5_threads = list(Thread.objects.filter(is_draft=False).order_by('-num_views')[:5].values('id', 'title'))
+ my_draft_threads = [Thread.objects.summarize(t) for t in Thread.objects.filter(author_id=a.id).exclude(is_draft=False).order_by('-created')]
states = sorted(US_STATES, key=lambda s: s[1])
data = {
@@ -38,7 +38,8 @@ def base_view(request):
'states': states,
'user_categories': user_categories,
'threads': feed_threads,
- 'trending': top5_threads
+ 'trending': top5_threads,
+ 'draft_threads': my_draft_threads
}
return TemplateResponse(request, 'feed.html', {'data': json.dumps(data)})
@@ -92,19 +93,9 @@ def issue_thread(request, thread_id=None):
req_acct = Account.objects.get(user=request.user)
t = Thread.objects.get(id=thread_id)
c_qs = Civi.objects.filter(thread_id=thread_id).exclude(c_type='response')
- # c_scored = Civi.objects.thread_sorted_by_score(c_qs, req_acct.id)
c_scored = [c.dict_with_score(req_acct.id) for c in c_qs]
civis = sorted(c_scored, key=lambda c: c['score'], reverse=True)
-
- # civis = Civi.objects.filter(thread_id=thread_id)
- # c = civis.order_by('-created')
- # c_scores = [ci.score(req_a.id) for ci in c]
- # c_data = [Civi.objects.serialize_s(ci) for ci in c]
- # for idx, item in enumerate(c_data):
- # c_data[idx]['score'] = c_scores[idx]
- # c_data = sorted(c_data, key=lambda x: x['score'], reverse=True)
-
#modify thread view count
t.num_civis = len(civis)
t.num_views = F('num_views') + 1
@@ -142,6 +133,7 @@ def issue_thread(request, thread_id=None):
data = {
'thread_id': thread_id,
+ 'is_draft': t.is_draft,
'thread_wiki_data': json.dumps(thread_wiki_data),
'thread_body_data': json.dumps(thread_body_data)
}
@@ -187,6 +179,23 @@ def invite(request):
return TemplateResponse(request, 'invite.html', response_data)
+@login_required
+@beta_blocker
+def settings_view(request):
+
+ request_account = Account.objects.get(user=request.user)
+
+ response_data = {
+ '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
+ }
+
+ return TemplateResponse(request, 'user/settings.html', response_data)
+
def login_view(request):
if request.user.is_authenticated():
diff --git a/legislation/__init__.py b/project/legislation/__init__.py
similarity index 100%
rename from legislation/__init__.py
rename to project/legislation/__init__.py
diff --git a/legislation/migrations/__init__.py b/project/legislation/migrations/__init__.py
similarity index 100%
rename from legislation/migrations/__init__.py
rename to project/legislation/migrations/__init__.py
diff --git a/legislation/sunlightapi.py b/project/legislation/sunlightapi.py
similarity index 82%
rename from legislation/sunlightapi.py
rename to project/legislation/sunlightapi.py
index da6a43384..b6c095010 100644
--- a/legislation/sunlightapi.py
+++ b/project/legislation/sunlightapi.py
@@ -1,7 +1,7 @@
-import os
-import json
import sunlight
+from sunlight.errors import BadRequestException
from django.conf import settings
+from sunlight.errors import BadRequestException
def get_legislator_and_district(account):
location = account.zip_code
@@ -27,12 +27,12 @@ def get_bill_information(account):
def get_legislator_ids_by_lat_long(latitude, longitude):
""" Gets legislator bioguide_ids by coordinate location"""
- # sunlight.config.API_KEY = settings.SUNLIGHT_API_KEY
bioguide_ids = []
- # preferences = {}
- # preferences['state'] = account.state
- legislators = sunlight.congress.locate_legislators_by_lat_lon(latitude, longitude)
+ try:
+ legislators = sunlight.congress.locate_legislators_by_lat_lon(latitude, longitude)
+ except BadRequestException:
+ return bioguide_ids
if legislators and len(legislators):
for legislator in legislators:
diff --git a/manage.py b/project/manage.py
similarity index 100%
rename from manage.py
rename to project/manage.py
diff --git a/runtime.txt b/project/runtime.txt
similarity index 100%
rename from runtime.txt
rename to project/runtime.txt
diff --git a/setup.cfg b/project/setup.cfg
similarity index 81%
rename from setup.cfg
rename to project/setup.cfg
index 8a00af3c0..42641fd6c 100644
--- a/setup.cfg
+++ b/project/setup.cfg
@@ -1,3 +1,4 @@
[flake8]
ignore = E128,E265,E261,E126,E501,E302,E262,E127,E303,E226,E231,E201,E202,E121,E203,E123,W293,W391,E122,W292,F403,E401,E131,W503,E731,E266
max-line-length = 160
+exclude = api/migrations, __init__.py
diff --git a/utils/__init__.py b/project/utils/__init__.py
similarity index 100%
rename from utils/__init__.py
rename to project/utils/__init__.py
diff --git a/utils/constants.py b/project/utils/constants.py
similarity index 100%
rename from utils/constants.py
rename to project/utils/constants.py
diff --git a/utils/custom_decorators.py b/project/utils/custom_decorators.py
similarity index 94%
rename from utils/custom_decorators.py
rename to project/utils/custom_decorators.py
index 5ee964a68..49c0a037a 100644
--- a/utils/custom_decorators.py
+++ b/project/utils/custom_decorators.py
@@ -1,9 +1,6 @@
from functools import wraps
from django.utils.decorators import available_attrs
from django.http import HttpResponseBadRequest, HttpResponseRedirect
-from django.contrib.auth.views import redirect_to_login
-from django.shortcuts import resolve_url
-
from api.models import Account
'''
diff --git a/utils/string_templates.py b/project/utils/string_templates.py
similarity index 100%
rename from utils/string_templates.py
rename to project/utils/string_templates.py
diff --git a/webapp/static/dependencies/animate.min.css b/project/webapp/static/dependencies/animate.min.css
similarity index 100%
rename from webapp/static/dependencies/animate.min.css
rename to project/webapp/static/dependencies/animate.min.css
diff --git a/webapp/static/dependencies/backbone-min.js b/project/webapp/static/dependencies/backbone-min.js
similarity index 100%
rename from webapp/static/dependencies/backbone-min.js
rename to project/webapp/static/dependencies/backbone-min.js
diff --git a/webapp/static/dependencies/jquery.min.js b/project/webapp/static/dependencies/jquery.min.js
similarity index 100%
rename from webapp/static/dependencies/jquery.min.js
rename to project/webapp/static/dependencies/jquery.min.js
diff --git a/webapp/static/dependencies/less.min.js b/project/webapp/static/dependencies/less.min.js
similarity index 100%
rename from webapp/static/dependencies/less.min.js
rename to project/webapp/static/dependencies/less.min.js
diff --git a/webapp/static/dependencies/magicsuggest-min.css b/project/webapp/static/dependencies/magicsuggest-min.css
similarity index 100%
rename from webapp/static/dependencies/magicsuggest-min.css
rename to project/webapp/static/dependencies/magicsuggest-min.css
diff --git a/webapp/static/dependencies/magicsuggest-min.js b/project/webapp/static/dependencies/magicsuggest-min.js
similarity index 100%
rename from webapp/static/dependencies/magicsuggest-min.js
rename to project/webapp/static/dependencies/magicsuggest-min.js
diff --git a/webapp/static/dependencies/materialize.min.css b/project/webapp/static/dependencies/materialize.min.css
similarity index 100%
rename from webapp/static/dependencies/materialize.min.css
rename to project/webapp/static/dependencies/materialize.min.css
diff --git a/webapp/static/dependencies/materialize.min.js b/project/webapp/static/dependencies/materialize.min.js
similarity index 100%
rename from webapp/static/dependencies/materialize.min.js
rename to project/webapp/static/dependencies/materialize.min.js
diff --git a/webapp/static/dependencies/underscore.js b/project/webapp/static/dependencies/underscore.js
similarity index 100%
rename from webapp/static/dependencies/underscore.js
rename to project/webapp/static/dependencies/underscore.js
diff --git a/webapp/static/fonts/material-design-icons/LICENSE.txt b/project/webapp/static/fonts/material-design-icons/LICENSE.txt
similarity index 100%
rename from webapp/static/fonts/material-design-icons/LICENSE.txt
rename to project/webapp/static/fonts/material-design-icons/LICENSE.txt
diff --git a/webapp/static/fonts/material-design-icons/Material-Design-Icons.eot b/project/webapp/static/fonts/material-design-icons/Material-Design-Icons.eot
similarity index 100%
rename from webapp/static/fonts/material-design-icons/Material-Design-Icons.eot
rename to project/webapp/static/fonts/material-design-icons/Material-Design-Icons.eot
diff --git a/webapp/static/fonts/material-design-icons/Material-Design-Icons.svg b/project/webapp/static/fonts/material-design-icons/Material-Design-Icons.svg
similarity index 100%
rename from webapp/static/fonts/material-design-icons/Material-Design-Icons.svg
rename to project/webapp/static/fonts/material-design-icons/Material-Design-Icons.svg
diff --git a/webapp/static/fonts/material-design-icons/Material-Design-Icons.ttf b/project/webapp/static/fonts/material-design-icons/Material-Design-Icons.ttf
similarity index 100%
rename from webapp/static/fonts/material-design-icons/Material-Design-Icons.ttf
rename to project/webapp/static/fonts/material-design-icons/Material-Design-Icons.ttf
diff --git a/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff b/project/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff
similarity index 100%
rename from webapp/static/fonts/material-design-icons/Material-Design-Icons.woff
rename to project/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff
diff --git a/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff2 b/project/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff2
similarity index 100%
rename from webapp/static/fonts/material-design-icons/Material-Design-Icons.woff2
rename to project/webapp/static/fonts/material-design-icons/Material-Design-Icons.woff2
diff --git a/webapp/static/fonts/roboto/Roboto-Bold.eot b/project/webapp/static/fonts/roboto/Roboto-Bold.eot
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Bold.eot
rename to project/webapp/static/fonts/roboto/Roboto-Bold.eot
diff --git a/webapp/static/fonts/roboto/Roboto-Bold.ttf b/project/webapp/static/fonts/roboto/Roboto-Bold.ttf
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Bold.ttf
rename to project/webapp/static/fonts/roboto/Roboto-Bold.ttf
diff --git a/webapp/static/fonts/roboto/Roboto-Bold.woff b/project/webapp/static/fonts/roboto/Roboto-Bold.woff
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Bold.woff
rename to project/webapp/static/fonts/roboto/Roboto-Bold.woff
diff --git a/webapp/static/fonts/roboto/Roboto-Bold.woff2 b/project/webapp/static/fonts/roboto/Roboto-Bold.woff2
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Bold.woff2
rename to project/webapp/static/fonts/roboto/Roboto-Bold.woff2
diff --git a/webapp/static/fonts/roboto/Roboto-Light.eot b/project/webapp/static/fonts/roboto/Roboto-Light.eot
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Light.eot
rename to project/webapp/static/fonts/roboto/Roboto-Light.eot
diff --git a/webapp/static/fonts/roboto/Roboto-Light.ttf b/project/webapp/static/fonts/roboto/Roboto-Light.ttf
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Light.ttf
rename to project/webapp/static/fonts/roboto/Roboto-Light.ttf
diff --git a/webapp/static/fonts/roboto/Roboto-Light.woff b/project/webapp/static/fonts/roboto/Roboto-Light.woff
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Light.woff
rename to project/webapp/static/fonts/roboto/Roboto-Light.woff
diff --git a/webapp/static/fonts/roboto/Roboto-Light.woff2 b/project/webapp/static/fonts/roboto/Roboto-Light.woff2
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Light.woff2
rename to project/webapp/static/fonts/roboto/Roboto-Light.woff2
diff --git a/webapp/static/fonts/roboto/Roboto-Medium.eot b/project/webapp/static/fonts/roboto/Roboto-Medium.eot
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Medium.eot
rename to project/webapp/static/fonts/roboto/Roboto-Medium.eot
diff --git a/webapp/static/fonts/roboto/Roboto-Medium.ttf b/project/webapp/static/fonts/roboto/Roboto-Medium.ttf
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Medium.ttf
rename to project/webapp/static/fonts/roboto/Roboto-Medium.ttf
diff --git a/webapp/static/fonts/roboto/Roboto-Medium.woff b/project/webapp/static/fonts/roboto/Roboto-Medium.woff
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Medium.woff
rename to project/webapp/static/fonts/roboto/Roboto-Medium.woff
diff --git a/webapp/static/fonts/roboto/Roboto-Medium.woff2 b/project/webapp/static/fonts/roboto/Roboto-Medium.woff2
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Medium.woff2
rename to project/webapp/static/fonts/roboto/Roboto-Medium.woff2
diff --git a/webapp/static/fonts/roboto/Roboto-Regular.eot b/project/webapp/static/fonts/roboto/Roboto-Regular.eot
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Regular.eot
rename to project/webapp/static/fonts/roboto/Roboto-Regular.eot
diff --git a/webapp/static/fonts/roboto/Roboto-Regular.ttf b/project/webapp/static/fonts/roboto/Roboto-Regular.ttf
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Regular.ttf
rename to project/webapp/static/fonts/roboto/Roboto-Regular.ttf
diff --git a/webapp/static/fonts/roboto/Roboto-Regular.woff b/project/webapp/static/fonts/roboto/Roboto-Regular.woff
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Regular.woff
rename to project/webapp/static/fonts/roboto/Roboto-Regular.woff
diff --git a/webapp/static/fonts/roboto/Roboto-Regular.woff2 b/project/webapp/static/fonts/roboto/Roboto-Regular.woff2
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Regular.woff2
rename to project/webapp/static/fonts/roboto/Roboto-Regular.woff2
diff --git a/webapp/static/fonts/roboto/Roboto-Thin.eot b/project/webapp/static/fonts/roboto/Roboto-Thin.eot
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Thin.eot
rename to project/webapp/static/fonts/roboto/Roboto-Thin.eot
diff --git a/webapp/static/fonts/roboto/Roboto-Thin.ttf b/project/webapp/static/fonts/roboto/Roboto-Thin.ttf
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Thin.ttf
rename to project/webapp/static/fonts/roboto/Roboto-Thin.ttf
diff --git a/webapp/static/fonts/roboto/Roboto-Thin.woff b/project/webapp/static/fonts/roboto/Roboto-Thin.woff
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Thin.woff
rename to project/webapp/static/fonts/roboto/Roboto-Thin.woff
diff --git a/webapp/static/fonts/roboto/Roboto-Thin.woff2 b/project/webapp/static/fonts/roboto/Roboto-Thin.woff2
similarity index 100%
rename from webapp/static/fonts/roboto/Roboto-Thin.woff2
rename to project/webapp/static/fonts/roboto/Roboto-Thin.woff2
diff --git a/webapp/static/img/bg-landing-lastcall.jpg b/project/webapp/static/img/bg-landing-lastcall.jpg
similarity index 100%
rename from webapp/static/img/bg-landing-lastcall.jpg
rename to project/webapp/static/img/bg-landing-lastcall.jpg
diff --git a/webapp/static/img/bg-landing-tree.svg b/project/webapp/static/img/bg-landing-tree.svg
similarity index 100%
rename from webapp/static/img/bg-landing-tree.svg
rename to project/webapp/static/img/bg-landing-tree.svg
diff --git a/webapp/static/img/bg-supportus-main.png b/project/webapp/static/img/bg-supportus-main.png
similarity index 100%
rename from webapp/static/img/bg-supportus-main.png
rename to project/webapp/static/img/bg-supportus-main.png
diff --git a/webapp/static/img/bg-tile-cube.svg b/project/webapp/static/img/bg-tile-cube.svg
similarity index 100%
rename from webapp/static/img/bg-tile-cube.svg
rename to project/webapp/static/img/bg-tile-cube.svg
diff --git a/webapp/static/img/bg-tile-steps.png b/project/webapp/static/img/bg-tile-steps.png
similarity index 100%
rename from webapp/static/img/bg-tile-steps.png
rename to project/webapp/static/img/bg-tile-steps.png
diff --git a/webapp/static/img/content-civiwiki-infographic-l.png b/project/webapp/static/img/content-civiwiki-infographic-l.png
similarity index 100%
rename from webapp/static/img/content-civiwiki-infographic-l.png
rename to project/webapp/static/img/content-civiwiki-infographic-l.png
diff --git a/webapp/static/img/content-civiwiki-infographic-md.png b/project/webapp/static/img/content-civiwiki-infographic-md.png
similarity index 100%
rename from webapp/static/img/content-civiwiki-infographic-md.png
rename to project/webapp/static/img/content-civiwiki-infographic-md.png
diff --git a/webapp/static/img/favicon.ico b/project/webapp/static/img/favicon.ico
similarity index 100%
rename from webapp/static/img/favicon.ico
rename to project/webapp/static/img/favicon.ico
diff --git a/webapp/static/img/image-beta-indevelopment.gif b/project/webapp/static/img/image-beta-indevelopment.gif
similarity index 100%
rename from webapp/static/img/image-beta-indevelopment.gif
rename to project/webapp/static/img/image-beta-indevelopment.gif
diff --git a/webapp/static/img/logo-civiwiki-tree-black.svg b/project/webapp/static/img/logo-civiwiki-tree-black.svg
similarity index 100%
rename from webapp/static/img/logo-civiwiki-tree-black.svg
rename to project/webapp/static/img/logo-civiwiki-tree-black.svg
diff --git a/webapp/static/img/logo-civiwiki-tree-white.svg b/project/webapp/static/img/logo-civiwiki-tree-white.svg
similarity index 100%
rename from webapp/static/img/logo-civiwiki-tree-white.svg
rename to project/webapp/static/img/logo-civiwiki-tree-white.svg
diff --git a/webapp/static/img/logo-social-facebook.png b/project/webapp/static/img/logo-social-facebook.png
similarity index 100%
rename from webapp/static/img/logo-social-facebook.png
rename to project/webapp/static/img/logo-social-facebook.png
diff --git a/webapp/static/img/logo-social-twitter.png b/project/webapp/static/img/logo-social-twitter.png
similarity index 100%
rename from webapp/static/img/logo-social-twitter.png
rename to project/webapp/static/img/logo-social-twitter.png
diff --git a/webapp/static/img/logo-sponsor-gephardt.png b/project/webapp/static/img/logo-sponsor-gephardt.png
similarity index 100%
rename from webapp/static/img/logo-sponsor-gephardt.png
rename to project/webapp/static/img/logo-sponsor-gephardt.png
diff --git a/webapp/static/img/logo-sponsor-gusf.png b/project/webapp/static/img/logo-sponsor-gusf.png
similarity index 100%
rename from webapp/static/img/logo-sponsor-gusf.png
rename to project/webapp/static/img/logo-sponsor-gusf.png
diff --git a/webapp/static/img/logo-sponsor-skandalaris.png b/project/webapp/static/img/logo-sponsor-skandalaris.png
similarity index 100%
rename from webapp/static/img/logo-sponsor-skandalaris.png
rename to project/webapp/static/img/logo-sponsor-skandalaris.png
diff --git a/webapp/static/img/logo-wordmark.png b/project/webapp/static/img/logo-wordmark.png
similarity index 100%
rename from webapp/static/img/logo-wordmark.png
rename to project/webapp/static/img/logo-wordmark.png
diff --git a/webapp/static/img/no_image_md.png b/project/webapp/static/img/no_image_md.png
similarity index 100%
rename from webapp/static/img/no_image_md.png
rename to project/webapp/static/img/no_image_md.png
diff --git a/webapp/static/img/team/dan.png b/project/webapp/static/img/team/dan.png
similarity index 100%
rename from webapp/static/img/team/dan.png
rename to project/webapp/static/img/team/dan.png
diff --git a/webapp/static/img/team/darius.png b/project/webapp/static/img/team/darius.png
similarity index 100%
rename from webapp/static/img/team/darius.png
rename to project/webapp/static/img/team/darius.png
diff --git a/webapp/static/img/team/joohee.png b/project/webapp/static/img/team/joohee.png
similarity index 100%
rename from webapp/static/img/team/joohee.png
rename to project/webapp/static/img/team/joohee.png
diff --git a/webapp/static/img/team/mitchell.png b/project/webapp/static/img/team/mitchell.png
similarity index 100%
rename from webapp/static/img/team/mitchell.png
rename to project/webapp/static/img/team/mitchell.png
diff --git a/webapp/static/js/account.js b/project/webapp/static/js/account.js
similarity index 93%
rename from webapp/static/js/account.js
rename to project/webapp/static/js/account.js
index 3fff5e715..a9879d159 100644
--- a/webapp/static/js/account.js
+++ b/project/webapp/static/js/account.js
@@ -52,7 +52,7 @@ cw.AccountView = BB.View.extend({
initialize: function (options) {
options = options || {};
- this.mapView = options.mapView;
+ // this.mapView = options.mapView;
this.current_user = options.current_user;
this.isSave = false;
@@ -79,16 +79,10 @@ cw.AccountView = BB.View.extend({
this.postRender();
} else {
this.$el.empty().append(this.template());
+
+ $('.account-tabs .tab').on('dragstart', function() {return false;});
this.$el.find('.account-settings').pushpin({ top: $('.account-settings').offset().top });
this.$el.find('.scroll-col').height($(window).height());
-
- // Only render the settings form if logged in user
- var settingsEl = this.$('#settings');
- if (settingsEl.length) {
- settingsEl.empty().append(this.settingsTemplate());
- this.mapView.renderAndInitMap();
- this.listenTo(this.mapView.model, 'change:address', _.bind(this.saveLocation, this)); //TODO: validateLocation and then save
- }
}
},
@@ -102,7 +96,7 @@ cw.AccountView = BB.View.extend({
var settingsEl = this.$('#settings');
if (settingsEl.length) {
settingsEl.empty().append(this.settingsTemplate());
- this.mapView.render();
+ Materialize.updateTextFields();
}
},
@@ -119,11 +113,11 @@ cw.AccountView = BB.View.extend({
events: {
'click .follow-btn': 'followRequest',
'submit #profile_image_form': 'handleFiles',
- 'change .profile-image-pick': 'toggleImgButtons',
'blur .save-account': 'saveAccount',
'mouseenter .user-chip-contents': 'showUserCard',
'mouseleave .user-chip-contents': 'hideUserCard',
'click .toggle-solutions': 'toggleSolutions',
+ 'change .profile-image-pick': 'previewImage',
'keypress .save-account': cw.checkForEnter,
},
@@ -135,6 +129,27 @@ cw.AccountView = BB.View.extend({
this.$('#solutions-'+id).toggleClass('hide');
},
+ previewImage: function(e){
+ var _this = this;
+ var img = this.$el.find('#id_profile_image');
+ if (img.val()) {
+ var uploaded_image = img[0].files[0];
+ if (uploaded_image) {
+ var formData = new FormData(this.$el.find('#profile_image_form')[0]);
+
+ var reader = new FileReader();
+
+ reader.onload = function(e) {
+ var preview_image = _this.$el.find('.preview-image');
+ preview_image.attr('src', e.target.result);
+
+ _this.toggleImgButtons();
+ };
+ reader.readAsDataURL(uploaded_image);
+ }
+ }
+ },
+
showUserCard: function(e) {
var _this = this;
var username = e.currentTarget.dataset.username;
@@ -221,6 +236,7 @@ cw.AccountView = BB.View.extend({
toggleImgButtons: function(event) {
this.$('.profile-image-pick').toggleClass('hide');
this.$('.upload-image').toggleClass('hide');
+ this.$('#confirmation-prompt').toggleClass('hide');
},
followRequest: function(e){
@@ -269,7 +285,7 @@ cw.AccountView = BB.View.extend({
saveAccount: function (e) {
var $this = $(e.target),
changeKey = $this.attr('id'),
- changeVal = $this.val(),
+ changeVal = $this.val().trim(),
apiData = {},
_this = this;
diff --git a/webapp/static/js/account_tabs/followers.js b/project/webapp/static/js/account_tabs/followers.js
similarity index 100%
rename from webapp/static/js/account_tabs/followers.js
rename to project/webapp/static/js/account_tabs/followers.js
diff --git a/webapp/static/js/account_tabs/following.js b/project/webapp/static/js/account_tabs/following.js
similarity index 100%
rename from webapp/static/js/account_tabs/following.js
rename to project/webapp/static/js/account_tabs/following.js
diff --git a/webapp/static/js/account_tabs/my_civis.js b/project/webapp/static/js/account_tabs/my_civis.js
similarity index 100%
rename from webapp/static/js/account_tabs/my_civis.js
rename to project/webapp/static/js/account_tabs/my_civis.js
diff --git a/webapp/static/js/account_tabs/my_issues.js b/project/webapp/static/js/account_tabs/my_issues.js
similarity index 100%
rename from webapp/static/js/account_tabs/my_issues.js
rename to project/webapp/static/js/account_tabs/my_issues.js
diff --git a/webapp/static/js/account_tabs/my_reps.js b/project/webapp/static/js/account_tabs/my_reps.js
similarity index 100%
rename from webapp/static/js/account_tabs/my_reps.js
rename to project/webapp/static/js/account_tabs/my_reps.js
diff --git a/project/webapp/static/js/base.js b/project/webapp/static/js/base.js
new file mode 100644
index 000000000..972d5b9cb
--- /dev/null
+++ b/project/webapp/static/js/base.js
@@ -0,0 +1,68 @@
+cw = {};
+BB = Backbone;
+
+_.templateSettings = {
+ evaluate: /\{\{#(.+?)\}\}/g,
+ interpolate: /\{\{=(.+?)\}\}/g,
+ escape: /\{\{(?!#|=)(.+?)\}\}/g
+};
+
+cw.underscorePartial = function (templateSelector, data) {
+ return _.template($('#' + templateSelector).html())(data);
+};
+
+cw.checkForEnter = function (e) {
+ if (e.which == 13 && !e.shiftKey) {
+ e.preventDefault();
+ $(e.target).blur();
+ }
+};
+
+cw.materializeShit = function () {
+ Materialize.updateTextFields();
+ $('ul.tabs').tabs();
+ $('select').material_select();
+};
+
+cw.initGlobalNav = function () {
+ var $notifications = $('#item-notifications');
+
+ $notifications.on('click', function () {
+ $('.notifications-modal').openModal();
+ });
+
+ var $navMenuButton = $('#js-toggle-menu');
+ $navMenuButton.on('click', function () {
+ event.stopPropagation()
+ $('#js-dropdown-menu').toggleClass('hide');
+ $('.js-dropdown-icon').toggleClass('hide');
+
+ $(document).on('click', function(event){
+ $target = $(event.target);
+
+ if ($target.parents('#js-dropdown-menu').length==0){
+ $('#js-dropdown-menu').addClass('hide');
+ $('.js-dropdown-icon').toggleClass('hide');
+ $(this).unbind(event);
+ }
+ })
+
+
+ });
+
+};
+
+//CSRF Setup
+cw.csrftoken = jQuery("[name=csrfmiddlewaretoken]").val();
+
+function csrfSafeMethod(method) {
+ // these HTTP methods do not require CSRF protection
+ return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+}
+$.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+ xhr.setRequestHeader("X-CSRFToken", cw.csrftoken);
+ }
+ }
+});
diff --git a/webapp/static/js/beta_register.js b/project/webapp/static/js/beta_register.js
similarity index 100%
rename from webapp/static/js/beta_register.js
rename to project/webapp/static/js/beta_register.js
diff --git a/webapp/static/js/beta_view.js b/project/webapp/static/js/beta_view.js
similarity index 100%
rename from webapp/static/js/beta_view.js
rename to project/webapp/static/js/beta_view.js
diff --git a/webapp/static/js/feed.js b/project/webapp/static/js/feed.js
similarity index 76%
rename from webapp/static/js/feed.js
rename to project/webapp/static/js/feed.js
index be76c3097..a5cd5beb7 100644
--- a/webapp/static/js/feed.js
+++ b/project/webapp/static/js/feed.js
@@ -48,6 +48,7 @@ cw.FeedView = BB.View.extend({
this.options = options || {};
this.categories = this.options.categories;
this.threads = this.options.threads.toJSON();
+ this.draft_threads = this.options.draft_threads.toJSON();
this.render();
this.options.threads.on('sync', function() {
@@ -62,6 +63,7 @@ cw.FeedView = BB.View.extend({
var template_var = {
'trending': this.options.trending,
+ 'draft_threads': this.draft_threads,
'categories': this.options.categories,
'user_categories': filtered_categories,
};
@@ -190,6 +192,7 @@ cw.NewThreadView = BB.View.extend({
events: {
'click .cancel-new-thread': 'cancelThread',
'click .create-new-thread': 'createThread',
+ 'click .draft-new-thread': 'draftThread',
'click #image-from-computer': 'showImageUploadForm',
'click #image-from-link': 'showImageLinkForm',
'change #thread-location': 'showStates',
@@ -295,6 +298,86 @@ cw.NewThreadView = BB.View.extend({
Materialize.toast('Please input all fields.', 5000);
}
},
+
+ draftThread: function () {
+ var _this = this;
+
+ var title = this.$el.find('#thread-title').val(),
+ summary = this.$el.find('#thread-body').val(),
+ level = this.$el.find('#thread-location').val(),
+ category_id = this.$el.find('#thread-category').val(),
+ state="";
+ if (level === "state" ) {
+ state = this.$el.find('#thread-state').val();
+ }
+ if (title && summary && category_id) {
+ $.ajax({
+ url: '/api/new_thread/',
+ type: 'POST',
+ data: {
+ title: title,
+ summary: summary,
+ category_id: category_id,
+ level: level,
+ state: state,
+ is_draft: "True"
+ },
+ success: function (response) {
+ if (_this.imageMode==="upload") {
+ var file = $('#id_attachment_image').val();
+
+ if (file) {
+ var formData = new FormData(_this.$('#attachment_image_form')[0]);
+ formData.set('thread_id', response.thread_id);
+ $.ajax({
+ url: '/api/upload_image/',
+ type: 'POST',
+ success: function () {
+ Materialize.toast('New thread created.', 5000);
+ window.location = "thread/" + response.thread_id;
+ },
+ error: function(e){
+ Materialize.toast('ERROR: Image could not be uploaded', 5000);
+ Materialize.toast(e.statusText, 5000);
+ },
+ data: formData,
+ cache: false,
+ contentType: false,
+ processData: false
+ });
+ }
+ } else if (_this.imageMode==="link") {
+ var img_url = _this.$('#link-image-form').val().trim();
+ console.log(_this.imageMode, img_url);
+ if (img_url) {
+ $.ajax({
+ url: '/api/upload_image/',
+ type: 'POST',
+ data: {
+ link: img_url,
+ thread_id: response.thread_id
+ },
+ success: function () {
+ Materialize.toast('New thread created.', 5000);
+ window.location = "thread/" + response.thread_id;
+ },
+ error: function(e){
+ Materialize.toast('ERROR: Image could not be uploaded', 5000);
+ Materialize.toast(e.statusText, 5000);
+ }
+ });
+ }
+ } else {
+ Materialize.toast('New thread created.', 5000);
+ window.location = "thread/" + response.thread_id;
+ }
+
+ }
+ });
+ } else {
+ Materialize.toast('Please input all fields.', 5000);
+ }
+ },
});
diff --git a/webapp/static/js/general_view.js b/project/webapp/static/js/general_view.js
similarity index 100%
rename from webapp/static/js/general_view.js
rename to project/webapp/static/js/general_view.js
diff --git a/webapp/static/js/invite.js b/project/webapp/static/js/invite.js
similarity index 100%
rename from webapp/static/js/invite.js
rename to project/webapp/static/js/invite.js
diff --git a/webapp/static/js/login.js b/project/webapp/static/js/login.js
similarity index 100%
rename from webapp/static/js/login.js
rename to project/webapp/static/js/login.js
diff --git a/webapp/static/js/notifications.js b/project/webapp/static/js/notifications.js
similarity index 93%
rename from webapp/static/js/notifications.js
rename to project/webapp/static/js/notifications.js
index 81a4bbdf0..19dc57953 100644
--- a/webapp/static/js/notifications.js
+++ b/project/webapp/static/js/notifications.js
@@ -45,6 +45,7 @@ $('#item-notifications').on('click', function () {
url: '/inbox/notifications/mark-all-as-read/',
success: function (response) {
$('#notify-count-wrapper').addClass('hide');
+ $('#notify-icon').html('notifications_none').removeClass('active');
console.log('success');
},
error: function(r){
@@ -57,8 +58,11 @@ var render_notifications = function(data) {
var unreadCount = parseInt(data.unread_count);
if (unreadCount === 0) {
$('#notify-count-wrapper').addClass('hide');
+ $('#notify-icon').html('notifications_none').removeClass('active');
} else {
$('#notify-count-wrapper').removeClass('hide');
+ $('#notify-icon').html('notifications').addClass('active');
+
this.new_notifications = [];
var notified = false;
if (data.unread_list.length > 5 && !notificationsView.initialNotificationShown) {
diff --git a/project/webapp/static/js/settings.js b/project/webapp/static/js/settings.js
new file mode 100644
index 000000000..b30e17f69
--- /dev/null
+++ b/project/webapp/static/js/settings.js
@@ -0,0 +1,135 @@
+cw = cw || {};
+
+cw.UserModel = BB.Model.extend({
+ defaults: function() {
+ return {
+ username: "",
+ email: "",
+ location: "",
+ };
+ },
+ url: function () {
+ if (! this.get('username') ) {
+ throw new Error("This is a race condition! and why we can't have nice things :(");
+ }
+ return '/api/account_profile/' + this.get('username') + '/';
+ },
+
+ initialize: function (model, options) {
+ options = options || {};
+ }
+});
+
+
+cw.SettingsView = BB.View.extend({
+
+ el: '#settings',
+
+ initialize: function(options) {
+ this.options = options || {};
+ this.mapView = options.mapView;
+
+ this.template = _.template($('#settings-template').text());
+ this.settingsTemplate = _.template($('#settings-base').text());
+ this.personalTemplate = _.template($('#settings-personal').text());
+ this.locationLabelTemplate = _.template($('#location-label').text());
+
+ this.listenTo(this.model, 'change', this.renderAllLabels);
+ },
+
+ render: function() {
+ this.$el.html(this.template());
+
+ this.$('#settings-el').html(this.settingsTemplate());
+
+ this.renderPersonal();
+
+ this.mapView.renderAndInitMap();
+ // var saveLocationThrottled = _.throttle(this.saveLocation, 1000);
+ this.listenTo(this.mapView.model, 'change:is_new', _.bind(this.saveLocation, this));
+ },
+
+ renderAllLabels:function() {
+ this.renderPersonal();
+ this.renderLocationLabel();
+ Materialize.updateTextFields();
+ },
+
+ renderPersonal: function() {
+ this.$('#settings-1').html(this.personalTemplate());
+ },
+
+ renderLocationLabel: function() {
+ this.$('#location-label-container').html(this.locationLabelTemplate());
+ },
+
+ events: {
+ 'blur .save-account': 'saveAccount',
+ },
+
+ saveAccount: function (e) {
+ var $this = $(e.target),
+ changeKey = $this.attr('id'),
+ changeVal = $this.val().trim(),
+ apiData = {},
+ _this = this;
+
+ if (this.model.get([changeKey]) === changeVal) {
+ return;
+ }
+
+ apiData[changeKey] = changeVal;
+
+ $.ajax({
+ url: '/api/edituser/',
+ type: 'POST',
+ data: apiData,
+ success: function () {
+ Materialize.toast('Saved!', 5000);
+
+ _this.isSave = true;
+ _this.model.fetch();
+
+ }
+ });
+ },
+
+ saveLocation: function () {
+ var _this = this;
+ var coordinates = this.mapView.model.get('coordinates'),
+ address = this.mapView.model.get('address');
+
+ if (!this.mapView.model.get('is_new')) return;
+
+ if (coordinates && address) {
+
+ $.ajax({
+ type: 'POST',
+ url: '/api/edituser/',
+ data: {
+ coordinates: coordinates,
+ address: address.address,
+ city: address.city,
+ state: address.state,
+ zip_code: address.zipcode,
+ longitude: coordinates.lng,
+ latitude: coordinates.lat,
+ },
+ success: function (data) {
+ Materialize.toast('Location Changed', 5000);
+ _this.mapView.model.set('is_new', false);
+ _this.model.fetch();
+ },
+ error: function (data) {
+ if (data.status_code === 400) {
+ Materialize.toast(data.message, 5000);
+ } else if (data.status_code === 500) {
+ Materialize.toast('Internal Server Error', 5000);
+ } else {
+ Materialize.toast(data.statusText, 5000);
+ }
+ }
+ });
+ }
+ },
+});
diff --git a/webapp/static/js/static/about_view.js b/project/webapp/static/js/static/about_view.js
similarity index 100%
rename from webapp/static/js/static/about_view.js
rename to project/webapp/static/js/static/about_view.js
diff --git a/webapp/static/js/static/how_it_works_view.js b/project/webapp/static/js/static/how_it_works_view.js
similarity index 100%
rename from webapp/static/js/static/how_it_works_view.js
rename to project/webapp/static/js/static/how_it_works_view.js
diff --git a/webapp/static/js/static/landing_view.js b/project/webapp/static/js/static/landing_view.js
similarity index 100%
rename from webapp/static/js/static/landing_view.js
rename to project/webapp/static/js/static/landing_view.js
diff --git a/webapp/static/js/static/support_us_view.js b/project/webapp/static/js/static/support_us_view.js
similarity index 100%
rename from webapp/static/js/static/support_us_view.js
rename to project/webapp/static/js/static/support_us_view.js
diff --git a/webapp/static/js/thread.js b/project/webapp/static/js/thread.js
similarity index 92%
rename from webapp/static/js/thread.js
rename to project/webapp/static/js/thread.js
index 5d2f43330..8eb5acc1f 100644
--- a/webapp/static/js/thread.js
+++ b/project/webapp/static/js/thread.js
@@ -178,6 +178,7 @@ cw.CiviView = BB.View.extend({
initialize: function (options) {
this.options = options || {};
this.can_edit = options.can_edit;
+ this.is_draft = options.is_draft;
this.can_respond = options.can_respond;
this.parentView = options.parentView;
this.civis = this.parentView.civis;
@@ -391,15 +392,23 @@ cw.CiviView = BB.View.extend({
if (this.model.get('type') === 'response' || this.model.get('type') === 'rebuttal') {
this.$('.edit-links').addClass('hide');
this.$('#civi-type-form').addClass('hide');
+ } else if (this.model.get('type') === 'problem') {
+ this.$('#magicsuggest-'+this.model.id).addClass('hide');
}
},
clickNewType: function(e){
var new_type = $(e.target).closest("input[type='radio']:checked").val();
// var new_type = $("#civi-type-form input[type='radio']:checked").val();
+ if (new_type === "problem") {
+ this.$('.edit-links').addClass('hide');
+ this.$('#magicsuggest-'+this.model.id).addClass('hide');
+ } else {
+ this.$('.edit-links').removeClass('hide');
+ this.$('#magicsuggest-'+this.model.id).removeClass('hide');
+ }
this.magicSuggestView.setLinkableData(new_type);
this.magicSuggestView.ms.clear();
- Materialize.toast('Changing the civi type has cleared your links', 5000);
},
addRebuttal: function(){
@@ -668,10 +677,13 @@ cw.NewCiviView = BB.View.extend({
render: function () {
this.$el.empty().append(this.template());
- $('.responses').height($('#new-civi-box').height() + $('.responses-box').height());
+ // $('.responses').height($('#new-civi-box').height() + $('.responses-box').height());
this.magicSuggestView = new cw.LinkSelectView({$el: this.$('#magicsuggest'), civis: this.options.parentView.civis});
+ this.$('.edit-links').addClass('hide');
+ this.$('#magicsuggest').addClass('hide');
+
this.attachment_links = [];
this.attachmentCount = 0;
// this.renderMagicSuggest();
@@ -686,6 +698,7 @@ cw.NewCiviView = BB.View.extend({
'click #image-from-computer': 'showImageUploadForm',
'click #image-from-link': 'showImageLinkForm',
'click #add-image-link-input': 'addImageLinkInput',
+ 'click .ms-sel-ctn': ''
},
addImageLinkInput: function(){
@@ -735,7 +748,7 @@ cw.NewCiviView = BB.View.extend({
cancelCivi: function () {
this.$el.empty();
- $('.responses').height($('.responses-box').height());
+ // $('.responses').height($('.responses-box').height());
},
createCivi: function (e) {
@@ -875,7 +888,17 @@ cw.NewCiviView = BB.View.extend({
$this.siblings().removeClass('current');
var c_type = this.$el.find('.civi-types > .current').val();
- this.magicSuggestView.setLinkableData(c_type);
+
+ if (c_type === "problem") {
+ this.$('.edit-links').addClass('hide');
+ this.$('#magicsuggest').addClass('hide');
+ } else {
+ this.$('.edit-links').removeClass('hide');
+ this.$('#magicsuggest').removeClass('hide');
+ this.magicSuggestView.setLinkableData(c_type);
+ this.magicSuggestView.ms.clear();
+ }
+
},
});
@@ -1286,6 +1309,7 @@ cw.LinkSelectView = BB.View.extend({
groupBy: 'type',
valueField: 'id',
displayField: 'title',
+ expandOnFocus: true,
data: [],
renderer: function(data){
return ''+limit+'/'+totalCount+ ' '+ type+'s View More +
');
@@ -1700,8 +1701,9 @@ cw.ThreadView = BB.View.extend({
},
civiRenderHelper: function(civi){
+ var is_draft = this.is_draft;
var can_edit = civi.get('author').username == this.username ? true : false;
- this.$('#thread-'+civi.get('type')+'s').append(new cw.CiviView({model: civi, can_edit: can_edit, parentView: this}).el);
+ this.$('#thread-'+civi.get('type')+'s').append(new cw.CiviView({model: civi, can_edit: can_edit, is_draft: is_draft, parentView: this}).el);
},
@@ -1756,6 +1758,11 @@ cw.ThreadView = BB.View.extend({
}
}
}, this);
+
+ // add padding
+ var $lastResponseCivi = this.$('#response-list div:last-child');
+ var scrollPadding = this.$('.responses').height() - $lastResponseCivi.height();
+ this.$('.responses-padding').height(scrollPadding - 8);
},
events: {
@@ -1768,7 +1775,8 @@ cw.ThreadView = BB.View.extend({
'click .add-response': 'openNewResponseModal',
'click #recommended-switch': 'toggleRecommended',
'click .btn-loadmore': 'loadMoreCivis',
- 'click .edit-thread-button': 'openEditThreadModal'
+ 'click .edit-thread-button': 'openEditThreadModal',
+ 'click #js-publish-btn': 'publishThread'
},
scrollToBody: function () {
@@ -1778,38 +1786,29 @@ cw.ThreadView = BB.View.extend({
this.$('.thread-body-holder').removeClass('hide');
this.$('.thread-body-holder').css({display: 'block'});
+ this.resizeBodyToWindow();
+
+ this.renderOutline();
+ this.processCiviScroll();
+ },
+
+ resizeBodyToWindow: function() {
$('body').css({overflow: 'hidden'});
- // this.$('.thread-body-holder').css({display: 'block'});
- // $('body').css({overflow: 'hidden'});
- //
- // $('body').animate({
- // scrollTop: $('.thread-body-holder').offset().top
- // }, 200);
+ var $windowHeight = $('body').height();
+ var bodyHeight = $windowHeight - $("#js-global-nav").height();
var $civiNavScroll = this.$('.civi-outline');
- $civiNavScroll.css({height: $('body').height() - $civiNavScroll.offset().top});
+ $civiNavScroll.css({height: $windowHeight - $civiNavScroll.offset().top});
var $civiThreadScroll = this.$('.main-thread');
- $civiThreadScroll.css({height: $('body').height() - $civiThreadScroll.offset().top});
- var $civiResponseScroll = this.$('.responses-box');
- $civiResponseScroll.css({height: $('body').height() - $civiResponseScroll.offset().top});
-
- this.renderOutline();
-
- // this.currentScroll = 0;
- this.processCiviScroll();
+ $civiThreadScroll.css({height: $windowHeight - $civiThreadScroll.offset().top});
+ var $civiResponseScroll = this.$('.responses');
+ $civiResponseScroll.css({height: $windowHeight - $civiResponseScroll.offset().top});
},
-
scrollToWiki: function () {
var _this = this;
- // $('body').animate({
- // scrollTop: 0
- // }, 200, function () {
- // _this.$('.thread-body-holder').css({display: 'none'});
- // });
- // $('body').css({overflow: 'scroll'});
this.$('.thread-body-holder').addClass('hide');
this.$('.thread-wiki-holder').removeClass('hide');
$('body').css({overflow: 'scroll'});
@@ -1824,23 +1823,12 @@ cw.ThreadView = BB.View.extend({
var _this = this,
$this = _.isUndefined(e) ? this.$('.expand-nav') : $(e.target);
- // if ($this.hasClass('expanded')) {
- // $('.civi-nav-wrapper').slideUp();
- // $this.removeClass('expanded');
- // this.navExpanded = false;
- // } else {
- // $('.civi-nav-wrapper').slideDown();
- // $this.addClass('expanded');
- // this.navExpanded = true;
- // }
if (!this.navExpanded) {
$('.civi-nav-wrapper').hide();
$this.removeClass('expanded');
- // this.navExpanded = false;
} else {
$('.civi-nav-wrapper').show();
$this.addClass('expanded');
- // this.navExpanded = true;
}
this.activateNav();
},
@@ -1990,7 +1978,6 @@ cw.ThreadView = BB.View.extend({
drilldownCivi: function (e) {
var target = $(e.target);
- console.log(target);
var ms_check = target.hasClass('ms-ctn') || target.hasClass('ms-sel-ctn') || target.hasClass('ms-close-btn') || target.hasClass('ms-trigger') || target.hasClass('ms-trigger-ico') || target.hasClass('ms-res-ctn') || target.hasClass('ms-sel-item') || target.hasClass('ms-res-group');
if (target.hasClass('btn') || target.hasClass('rating-button') || target.is('input') || target.is('textarea') || target.is('label') || target.hasClass('input') || ms_check) {
@@ -2069,6 +2056,36 @@ cw.ThreadView = BB.View.extend({
this.selectInitialCiviAfterToggle();
},
+ publishThread: function(e){
+ var _this = this;
+ _this.$(e.currentTarget).addClass('disabled').attr('disabled', true);
+
+ $.ajax({
+ url: '/api/edit_thread/',
+ type: 'POST',
+ data: {
+ thread_id: _this.model.threadId,
+ is_draft: false,
+ },
+ success: function (response) {
+ _this.is_draft = false
+ Materialize.toast('Thread is now public. Refreshing the page...', 5000);
+ _this.$("#js-publish-btn").hide()
+ var reload_page = _.bind(location.reload, location);
+ _.delay(reload_page, 1000);
+ },
+ error: function (response) {
+ if (response.status === 403) {
+ Materialize.toast('You do not have permission to publish the thread', 5000);
+ }
+ else if (response.status === 500) {
+ Materialize.toast('Server Error: Thread could not be published', 5000);
+ _this.$(e.currentTarget).removeClass('disabled').attr('disabled', false);
+ }
+ }
+ });
+ },
+
openNewCiviModal: function () {
this.newCiviView.render();
},
diff --git a/webapp/static/js/user-setup.js b/project/webapp/static/js/user-setup.js
similarity index 99%
rename from webapp/static/js/user-setup.js
rename to project/webapp/static/js/user-setup.js
index 2f27df886..011d438fb 100644
--- a/webapp/static/js/user-setup.js
+++ b/project/webapp/static/js/user-setup.js
@@ -199,7 +199,7 @@ cw.UserSetupView = BB.View.extend({
type: 'POST',
url: '/api/edituser/',
data: {
- full_account: true,
+ full_account: 'True',
about_me: about_me,
first_name: first_name,
last_name: last_name,
diff --git a/webapp/static/js/utils/locate.js b/project/webapp/static/js/utils/locate.js
similarity index 97%
rename from webapp/static/js/utils/locate.js
rename to project/webapp/static/js/utils/locate.js
index 4663f2006..65299ef16 100644
--- a/webapp/static/js/utils/locate.js
+++ b/project/webapp/static/js/utils/locate.js
@@ -6,7 +6,7 @@ cw.Map = BB.Model.extend({
id: '',
uscapitol: { lat: 38.8899389, lng: -77.0090505 },
zoom: 5,
- coordinates: {}, address: {},
+ coordinates: {}, address: {}, is_new: false,
// Visual Setup and Initalization Options
mapOptions: {}, markerOptions: {},
// Google Map Objects
@@ -166,6 +166,12 @@ cw.MapView = BB.View.extend({
fillInAddress: function () {
this.$('.progress').toggleClass('hide');
var place = this.model.get('autocomplete').getPlace();
+ // Check if user didn't select any Options
+ if (_.isUndefined(place.address_components)) {
+ this.$('.progress').toggleClass('hide');
+ return;
+ }
+
this.model.set('address', this.getAddressFromComponents(place.address_components));
// Set the model's coordinates
var coordinates = {
@@ -173,7 +179,7 @@ cw.MapView = BB.View.extend({
lng: place.geometry.location.lng()
};
this.model.set('coordinates', coordinates);
- this.getLegislators(coordinates);
+ this.model.set('is_new', true);
this.adjustMapCenter(coordinates);
this.$('.progress').toggleClass('hide');
@@ -199,13 +205,13 @@ cw.MapView = BB.View.extend({
}
_this.model.set('coordinates', geolocation);
- _this.getLegislators(geolocation);
_this.adjustMapCenter(geolocation);
_this.model.get('geocoder').geocode({ 'location': geolocation }, function(results, status) {
if (status === 'OK') {
_this.$('#autocomplete').val(results[0].formatted_address);
_this.model.set('address', _this.getAddressFromComponents(results[0].address_components));
+ _this.model.set('is_new', true);
} else {
Materialize.toast('Geocode Error: ' + status, 2000);
}
diff --git a/webapp/static/less/about.less b/project/webapp/static/less/about.less
similarity index 100%
rename from webapp/static/less/about.less
rename to project/webapp/static/less/about.less
diff --git a/webapp/static/less/account.less b/project/webapp/static/less/account.less
similarity index 94%
rename from webapp/static/less/account.less
rename to project/webapp/static/less/account.less
index 1dbff3f7d..029a35930 100644
--- a/webapp/static/less/account.less
+++ b/project/webapp/static/less/account.less
@@ -184,25 +184,21 @@ body {
}
}
+ .preview-image {
+ max-height: 171px;
+ }
+ #confirmation-prompt {
+ color: @light-gray;
+ font-size: 16px;
+ }
.top-bar {
- height: 32px;
+ margin-top: 8px;
margin-bottom: 0px;
- z-index: 2;
- .logo-container {
- height: inherit;
- text-align: center;
- line-height: 24px;
- .logo {
- // margin-left: 20px;
- margin-top: 5px;
- text-align: center;
- font-size: 26px;
- font-weight: 700;
- color: @white;
- letter-spacing: 0.01em;
- }
- }
+ // Prevent annoying behavior of highlighting instead of clicking
+ -webkit-user-select: none; /* Chrome all / Safari all */
+ -moz-user-select: none; /* Firefox all */
+ -ms-user-select: none;
.account-tabs {
height: inherit;
.tabs {
@@ -211,7 +207,11 @@ body {
height: inherit;
line-height: 32px;
a {
- color: @white;
+ -webkit-user-select: none; /* Chrome all / Safari all */
+ -moz-user-select: none; /* Firefox all */
+ -ms-user-select: none;
+
+ color: @light-gray;
text-transform: capitalize;
font-weight: 700;
font-size: 12px;
@@ -220,7 +220,7 @@ body {
}
}
.active {
- font-size: 14px;
+ font-size: 12px;
color: @light-purple;
}
i {
@@ -235,6 +235,7 @@ body {
color: @white;
font-size: 10px;
line-height: 24px;
+ height: 24px;
padding: 0 .5rem;
&:hover {
background-color: lighten(@light-purple, 5%);
@@ -246,15 +247,16 @@ body {
font-size: 16px;
}
}
-
}
.indicator {
background-color: @light-purple;
+ margin: 0 16px 0 16px;
height: 2px;
}
}
}
+
}
.content {
diff --git a/webapp/static/less/base.less b/project/webapp/static/less/base.less
similarity index 98%
rename from webapp/static/less/base.less
rename to project/webapp/static/less/base.less
index 86b343b94..17e12232b 100644
--- a/webapp/static/less/base.less
+++ b/project/webapp/static/less/base.less
@@ -23,7 +23,9 @@ html {
font-family: 'Lato', sans-serif;
color: @text;
}
-
+body {
+ -webkit-font-smoothing: antialiased;
+}
// Body Text
.body-lato {
font-family: 'Lato', sans-serif;
diff --git a/webapp/static/less/beta.less b/project/webapp/static/less/beta.less
similarity index 100%
rename from webapp/static/less/beta.less
rename to project/webapp/static/less/beta.less
diff --git a/project/webapp/static/less/components/map.less b/project/webapp/static/less/components/map.less
new file mode 100644
index 000000000..2d542952f
--- /dev/null
+++ b/project/webapp/static/less/components/map.less
@@ -0,0 +1,50 @@
+#location {
+ .input-field, #autocomplete {
+ @media only screen and (max-width: 600px) {
+ width: 200px;
+ }
+ width: 350px;
+ }
+
+ .map-wrapper {
+ .map-overlay {
+ position: relative;
+ .progress {
+ position: absolute;
+ left: 0;
+ right: 0;
+ margin: 0 auto 0 auto;
+ width: 350px;
+ @media only screen and (max-width: 600px) {
+ width: 200px;
+ }
+ z-index: 2;
+
+ }
+ }
+ #map {
+ width: 350px;
+ height: 250px;
+ @media only screen and (max-width: 600px) {
+ width: 200px;
+ height: 200px;
+ }
+ margin-left: auto;
+ margin-right: auto;
+ border: solid 1px @dark-white;
+ z-index: 1;
+ }
+ }
+ .rep-title{
+ margin-top: 20px;
+ }
+ #rep-text {
+ margin: 20px 0 20px 0;
+ }
+ #rep-list {
+ margin-top: 15px;
+ .rep {
+ margin: 5px;
+ }
+ }
+}
diff --git a/project/webapp/static/less/components/navbar.less b/project/webapp/static/less/components/navbar.less
new file mode 100644
index 000000000..619167296
--- /dev/null
+++ b/project/webapp/static/less/components/navbar.less
@@ -0,0 +1,89 @@
+.nav {
+ height: 40px;
+ line-height: 40px;
+ background-color: @dark-purple;
+
+ .nav-wrapper {
+ margin-left: 8px;
+ margin-right: 8px;
+
+ .nav-item {
+ line-height: inherit;
+ height: 40px;
+ display: inline-flex;
+ }
+ .logo {
+ height: inherit;
+ text-align: center;
+ line-height: inherit;
+ .wordmark {
+ text-align: center;
+ font-size: 24px;
+ font-weight: 700;
+ color: @white;
+ letter-spacing: 0.01em;
+ padding-bottom: 8px;
+
+ }
+ }
+ .nav-menu {
+ height: 40px;
+ line-height: 40px;
+ padding-top: 4px;
+
+ .nav-menu-item,.nav-menu-item * {
+ display: inline-block;
+ height: 32px;
+ line-height: 32px;
+ }
+ .button-icon i {
+ color: @white;
+ font-size: 24px;
+ vertical-align: super;
+ }
+ .button-icon i:hover {
+ color: @blue;
+ cursor: pointer;
+ }
+ }
+ .chip-menu-profile {
+ margin-bottom: 0;
+ vertical-align: top;
+ // Prevent annoying behavior of highlighting instead of clicking
+ -webkit-user-select: none; /* Chrome all / Safari all */
+ -moz-user-select: none; /* Firefox all */
+ -ms-user-select: none;
+ display: inline-block;
+ margin-left: 8px;
+ margin-right: 4px;
+
+ .label-username {
+ vertical-align: top;
+ line-height: 32px;
+ font-size: 16px;
+ padding-right: 4px;
+ color: @white
+ }
+ .chip-image-profile {
+ width: 32px;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 50%;
+ }
+ .button-icon-toggle {
+ display: inline-block;
+ i {
+ color: @white
+ }
+ }
+ &:hover {
+ .label-username, i{
+ color: @blue;
+ }
+ cursor: pointer;
+ }
+
+ }
+
+ }
+}
diff --git a/webapp/static/less/feed.less b/project/webapp/static/less/feed.less
similarity index 98%
rename from webapp/static/less/feed.less
rename to project/webapp/static/less/feed.less
index 11e18d535..4e809b315 100644
--- a/webapp/static/less/feed.less
+++ b/project/webapp/static/less/feed.less
@@ -74,8 +74,8 @@ body {
}
}
- nav {
- background-color: @dark-purple;
+ .feed-nav {
+ background-color: @white;
height: 48px;
line-height: 48px;
.nav-wrapper {
@@ -97,7 +97,7 @@ body {
.category-item {
height: 48px;
line-height: 48px;
- color: @white;
+ color: @light-gray;
font-size: 14px;
i {
line-height: inherit;
@@ -108,7 +108,6 @@ body {
}
&.active {
color: @light-purple;
- font-weight: 600;
}
}
.dropdown-wrapper {
diff --git a/webapp/static/less/how_it_works.less b/project/webapp/static/less/how_it_works.less
similarity index 100%
rename from webapp/static/less/how_it_works.less
rename to project/webapp/static/less/how_it_works.less
diff --git a/webapp/static/less/landing.less b/project/webapp/static/less/landing.less
similarity index 100%
rename from webapp/static/less/landing.less
rename to project/webapp/static/less/landing.less
diff --git a/webapp/static/less/login.less b/project/webapp/static/less/login.less
similarity index 100%
rename from webapp/static/less/login.less
rename to project/webapp/static/less/login.less
diff --git a/webapp/static/less/setup.less b/project/webapp/static/less/setup.less
similarity index 100%
rename from webapp/static/less/setup.less
rename to project/webapp/static/less/setup.less
diff --git a/webapp/static/less/static_common.less b/project/webapp/static/less/static_common.less
similarity index 100%
rename from webapp/static/less/static_common.less
rename to project/webapp/static/less/static_common.less
diff --git a/webapp/static/less/supportus.less b/project/webapp/static/less/supportus.less
similarity index 100%
rename from webapp/static/less/supportus.less
rename to project/webapp/static/less/supportus.less
diff --git a/webapp/static/less/thread.less b/project/webapp/static/less/thread.less
similarity index 71%
rename from webapp/static/less/thread.less
rename to project/webapp/static/less/thread.less
index 511b73681..d8b7703dc 100644
--- a/webapp/static/less/thread.less
+++ b/project/webapp/static/less/thread.less
@@ -23,23 +23,139 @@
body {
- -webkit-font-smoothing: antialiased;
- ::-webkit-scrollbar {
- width: 8px;
- }
- ::-webkit-scrollbar-track {
- background-color: @dark-white;
- }
- ::-webkit-scrollbar-thumb {
- background-color: @light-gray;
- margin-top: 4px;
- margin-bottom: 4px;
- }
+ // -webkit-font-smoothing: antialiased;
+ // ::-webkit-scrollbar {
+ // width: 8px;
+ // }
+ // ::-webkit-scrollbar-track {
+ // background-color: @dark-white;
+ // }
+ // ::-webkit-scrollbar-thumb {
+ // background-color: @light-gray;
+ // margin-top: 4px;
+ // margin-bottom: 4px;
+ // }
}
.linked {
border: 1px solid #501cb5;
}
+
+
#thread {
+ .thread-nav {
+ background-color: transparent;
+ border-bottom: 1px solid @dark-white;
+ box-shadow: none;
+ color: @black;
+ height: 56px;
+ // line-height: 40px;
+ display: inline-block;
+
+ .nav-wrapper {
+ .nav-item {
+
+ padding-left: 0;
+ padding-right: 0;
+ &.nav-categories {
+ max-width: 1200px !important;
+ margin-left: auto !important;
+ margin-right: auto !important;
+
+ padding-left: 16px;
+ padding-right: 16px;
+ }
+
+
+ }
+
+ #thread-meta {
+ display: flex;
+ padding-top: 8px;
+ .meta-item {
+ height: 16px;
+ line-height: 16px;
+ color: @dark-gray;
+ font-size: 14px;
+
+ padding-right: 4px;
+ i {
+ vertical-align: text-bottom;
+ line-height: 16px;
+ height: 16px;
+ display: inline-block;
+
+ font-size: 1.5em;
+
+ color: @light-gray;
+ &:hover {
+ cursor: pointer;
+ color: @light-purple;
+ }
+ }
+
+ }
+
+ .title-item {
+ width: 68%;
+ }
+ .dropdown-wrapper {
+ .dropdown-content {
+ li {
+ min-height: 0;
+ &:hover {
+ background-color: white;
+ }
+ }
+
+ .meta-item {
+ color: @gray;
+ height: inherit;
+ line-height: 14px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ margin: 0;
+ &:hover {
+ color: @light-purple;
+ background-color: white;
+ }
+ &.active {
+ color: @light-purple;
+ font-weight: 600;
+ }
+ }
+ }
+ }
+ }
+ .add-button {
+ height: 32px;
+ line-height: 32px;
+
+ float: right;
+
+
+ margin-left: auto;
+ .btn{
+ font-size: 12px;
+ padding: 0 8px;
+ margin-top: 4px;
+ height: 32px;
+
+ .text {
+ padding-bottom: 4px;
+ }
+ i{
+ margin-left: 4px;
+ margin-right: 4px;
+ line-height: 32px;
+
+ font-size: 1.7em;
+
+ }
+ }
+ }
+ }
+ }
+
.edit-thread-modal {
.action-button {
display: inline-block;
@@ -96,6 +212,11 @@ body {
}
.thread-wiki {
+ max-width: 1200px !important;
+ margin-left: auto !important;
+ margin-right: auto !important;
+
+
.wiki-banner {
min-height: 30vh;
padding-bottom: 16px;
@@ -106,7 +227,7 @@ body {
.wiki-title {
padding-top: 80px;
line-height: 24px;
- font-size: 24px;
+ font-size: 16px;
word-wrap: break-word;
}
@@ -278,23 +399,32 @@ body {
}
.thread-body {
+ max-width: 1200px !important;
+ margin-left: auto !important;
+ margin-right: auto !important;
+
.btn {
background-color: @purple;
}
.body-banner {
- background-color: @dark-purple;
- box-shadow: 0 5px 6px -3px rgba(0, 0, 0, 0.4);
- position: relative;
- z-index: 2;
+ display: inline-block;
+
+ // box-shadow: 0 5px 6px -3px rgba(0, 0, 0, 0.4);
+ // position: relative;
+ // z-index: 1;
.category-topic {
- margin-top: 4px;
- font-size: 13px;
+ display: inline-block;
+ font-size: 16px;
+ line-height: 36px;
+ height:36px;
i {
+ display: inline-block;
position: relative;
- top: 6px;
+ line-height: 36px;
+ height:36px;
}
}
@@ -328,8 +458,10 @@ body {
// box-shadow: 0 5px 6px -3px rgba(0, 0, 0, 0.4);
position: relative;
z-index: 2;
- background-color: @barely-not-white;
- // border-right: 1px solid @dark-white;
+ background-color: @white;
+
+
+ // border-bottom: 1px solid @dark-white;
width: 25%;
margin-left: auto;
@@ -343,7 +475,7 @@ body {
padding: 6px 0.75rem 16px 0.75rem;
.enter-wiki {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
cursor: pointer;
color: @blue;
@@ -379,9 +511,21 @@ body {
margin-top: 4px;
}
-
+ .label-other {
+ margin-right: 6px;
+ }
+ .label-recommended {
+ margin-left: 10px;
+ }
.lever {
- margin: 0 8px;
+ margin: 0;
+ width: 32px;
+ &:after {
+ width: 18px;
+ height: 18px;
+ border-radius: 18px;
+ top: -2px;
+ }
}
.badge-other.current{
background-color: @red !important;
@@ -472,7 +616,9 @@ body {
// z-index: 1;
overflow-y: scroll;
overflow-x: hidden;
- padding: 15px 32px 0 32px;
+ padding: 15px 16px 0 16px;
+ border-left: 1px solid @dark-white;
+ border-right: 1px solid @dark-white;
width: 40%;
margin-left: auto;
@@ -487,9 +633,13 @@ body {
right: auto;
// z-index: 1;
overflow-y: scroll;
+ overflow-x: hidden;
padding: 15px 15px 0 15px;
// border-left: 1px solid #ddd;
// box-shadow: 0 2px 5px @box-shadow-gray;
+ .scroll-padding {
+ width: 100%;
+ }
}
}
diff --git a/webapp/static/less/utils.less b/project/webapp/static/less/utils.less
similarity index 70%
rename from webapp/static/less/utils.less
rename to project/webapp/static/less/utils.less
index 0c34ab08e..1d9bc3a38 100644
--- a/webapp/static/less/utils.less
+++ b/project/webapp/static/less/utils.less
@@ -1,4 +1,6 @@
@import 'base';
+@import 'components/navbar';
+@import 'components/map';
.nav-button-outer {
position: fixed;
@@ -37,16 +39,16 @@
}
#live_notify_badge {
z-index: 3;
- line-height: 20px;
+ line-height: 16px;
font-size: 12px;
font-weight: 600;
text-align: center;
position: absolute;
- background-color: @blue;
+ background-color: @dark-blue;
color: @white;
- width: 20px;
- height: 20px;
- border-radius: 10px;
+ width: 16px;
+ height: 16px;
+ border-radius: 8px;
}
.civi-card, .new-civi-card {
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
@@ -113,7 +115,6 @@
i {
cursor: pointer;
- margin-left: 6px;
vertical-align: middle;
}
}
@@ -167,7 +168,7 @@
.civi-body {
padding: 0 20px;
border-bottom: 1px solid @dark-white;
- font-size: 14px;
+ font-size: 12px;
line-height: 22px;
.civi-body-inner {
@@ -328,130 +329,42 @@
}
}
-.global-nav {
- /* Component styles - this is what you need to grab */
- .absolute-center {
+@box-shadow-z1: 0 2px 2px 0 rgba(0,0,0,0.14), 0 1px 5px 0 rgba(0,0,0,0.12), 0 3px 1px -2px rgba(0,0,0,0.2);
+
+.dropdown-menu-wrapper{
+ display: block;
+ margin-top: -12px;
+
+ .dropdown-menu {
position: absolute;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
- margin: auto;
- }
- .floaty {
- position: fixed;
- bottom: 15px;
+ // top: 100%;
+
right: 0;
- z-index: 100;
- // Prevent annoying behavior of highlighting instead of clicking
- -webkit-user-select: none; /* Chrome all / Safari all */
- -moz-user-select: none; /* Firefox all */
- -ms-user-select: none;
- }
- .floaty-list {
- margin: 8px 0 0 0;
- padding: 0;
- list-style: none;
- display: inline-block;
- opacity: 0;
- transition: opacity .2s ease-out;
- }
- .floaty:hover .floaty-list {
- opacity: 1;
- }
- .floaty-list-item {
- position: relative;
- width: 40px;
- height: 40px;
- margin: 0 8px;
- display: inline-block;
- cursor: pointer;
- background-color: #f0f0f0;
- border-radius: 50%;
- box-shadow: 0 4px 8px rgba(0,0,0,.25);
- }
- .floaty-list-item > img {
- border-radius: 50%;
- }
- .floaty-list-item--yellow {
- background-color: @dark-yellow;
- }
- .floaty-list-item--yellow > svg {
- fill: #fff;
- }
- .floaty-list-item--blue {
- background-color: @dark-blue;
- }
- .floaty-list-item--blue > svg {
- fill: #fff;
- }
- .floaty-list-item-label {
- position: absolute;
- left: 50%;
- bottom: 46px;
- transform: translate(-50%, 0);
- padding: 4px 8px;
- font-size: 14px;
- color: #fff;
- background-color: #424242;
- border-radius: 2px;
- opacity: 0;
- white-space: nowrap;
- pointer-events: none;
- transition: opacity .2s ease-out;
- }
- .floaty-list-item:hover > .floaty-list-item-label {
- opacity: 1;
- }
- .floaty-btn {
- position: relative;
- display: inline-block;
- width: 56px;
- height: 56px;
- float: right;
- margin: 0 15px 0 8px;
- cursor: pointer;
- background-color: @purple;
- border-radius: 50%;
- box-shadow: 0 4px 8px rgba(0,0,0,.25);
- }
- .floaty-btn:hover .floaty-btn-label {
- opacity: 1;
- }
- .floaty-btn-label {
- position: absolute;
- top: 14px;
- right: 115%;
- padding: 4px 8px;
- font-size: 14px;
- color: #fff;
- background-color: #424242;
- border-radius: 2px;
- opacity: 0;
- pointer-events: none;
- white-space: nowrap;
- transition: opacity .2s ease-out;
- }
- .floaty-btn-icon {
- transition: all .2s;
- }
- .floaty-btn-icon-plus {
- -webkit-transform: rotate(-45deg);
- transform: rotate(-45deg);
- }
- .floaty.is-active .floaty-btn-icon-plus {
- opacity: 0;
- -webkit-transform: rotate(-130deg);
- transform: rotate(-130deg);
- }
- .floaty-btn-icon-create {
- opacity: 0;
- -webkit-transform: rotate(60deg);
- transform: rotate(60deg);
+ left: auto;
+
+ z-index: 2;
+ width: 120px;
+ padding-bottom: 4px;
+ background-color: @white;
+ border-radius: 4px;
+ box-shadow: @box-shadow-z1;
+ .dropdown-item {
+ display: block;
+ padding: 4px 10px 4px 15px;
+ margin-top: 8px;
+ margin-bottom: 8px;
+ line-height: 32px;
+ height: 32px;
+ overflow: hidden;
+ color: #24292e;
+ white-space: nowrap;
+ }
}
- .floaty.is-active .floaty-btn-icon-create {
- opacity: 1;
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
+}
+
+.location-info {
+ i {
+ color: @light-purple;
+ vertical-align: bottom;
}
}
diff --git a/webapp/templates/account.html b/project/webapp/templates/account.html
similarity index 87%
rename from webapp/templates/account.html
rename to project/webapp/templates/account.html
index 80262770d..257d82a2e 100644
--- a/webapp/templates/account.html
+++ b/project/webapp/templates/account.html
@@ -78,11 +78,11 @@