Town Square MVP

app/app/settings.py

@@ -122,7 +122,8 @@
     'inbox',
     'feeswapper',
     'oauth2_provider',
-    'compliance'
+    'townsquare',
+    'compliance',
 ]
 
 MIDDLEWARE = [
@@ -155,7 +156,7 @@
 
 TEMPLATES = [{
     'BACKEND': 'django.template.backends.django.DjangoTemplates',
-    'DIRS': ['chat/templates/', 'retail/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates', 'quests/templates'],
+    'DIRS': ['chat/templates/', 'retail/templates/', 'dataviz/templates', 'kudos/templates', 'inbox/templates', 'quests/templates', 'townsquare/templates'],
     'APP_DIRS': True,
     'OPTIONS': {
         'context_processors': [

app/app/urls.py

@@ -51,6 +51,7 @@
 import retail.views
 import revenue.views
 import tdi.views
+import townsquare.views
 from avatar.router import router as avatar_router
 from dashboard.router import router as dbrouter
 from grants.router import router as grant_router
@@ -113,6 +114,8 @@
     url(r'^api/v0.1/profile/(.*)?/viewers.csv', dashboard.views.profile_viewers, name='profile_viewers'),
     url(r'^api/v0.1/profile/(.*)?/spent.csv', dashboard.views.profile_spent, name='profile_spent'),
     url(r'^api/v0.1/profile/banner', dashboard.views.change_user_profile_banner, name='change_user_profile_banner'),
+    path('api/v0.1/activity/<int:activity_id>', townsquare.views.api, name='townsquare_api'),
+    path('api/v0.1/emailsettings/', townsquare.views.emailsettings, name='townsquare_emailsettings'),
     url(r'^api/v0.1/activity', retail.views.create_status_update, name='create_status_update'),
     url(
         r'^api/v0.1/profile/(.*)?/jobopportunity',
@@ -349,7 +352,7 @@
     re_path(r'^modal/extend_issue_deadline/?', dashboard.views.extend_issue_deadline, name='extend_issue_deadline'),
 
     # brochureware views
-    re_path(r'^$', retail.views.index, name='index'),
+    re_path(r'^home/?$', retail.views.index, name='home'),
     re_path(r'^pricing/$', retail.views.pricing, name='pricing'),
     re_path(r'^subscribe/$', retail.views.subscribe, name='subscribe'),
     re_path(r'^about/?', retail.views.about, name='about'),
@@ -361,6 +364,16 @@
     re_path(r'^results/?(?P<keyword>.*)/?', retail.views.results, name='results_by_keyword'),
     re_path(r'^results/?', retail.views.results, name='results'),
     re_path(r'^activity/?', retail.views.activity, name='activity'),
+    re_path(r'^townsquare/?', townsquare.views.index, name='townsquare'),
+    re_path(r'^$', townsquare.views.index, name='index'),
+    path('action/<int:offer_id>/<slug:offer_slug>/go', townsquare.views.offer_go, name='townsquare_offer_go'),
+    path('action/new', townsquare.views.offer_new, name='townsquare_offer_new'),
+    path(
+        'action/<int:offer_id>/<slug:offer_slug>/decline',
+        townsquare.views.offer_decline,
+        name='townsquare_offer_decline'
+    ),
+    path('action/<int:offer_id>/<slug:offer_slug>', townsquare.views.offer_view, name='townsquare_offer_view'),
     url(r'^help/dev/?', retail.views.help_dev, name='help_dev'),
     url(r'^help/repo/?', retail.views.help_repo, name='help_repo'),
     url(r'^help/faq/?', retail.views.help_faq, name='help_faq'),
@@ -468,6 +481,7 @@
         name='unread_notifications_email_weekly_roundup'
     ),
     path('_administration/email/new_bounty_rejection', retail.emails.new_bounty_rejection, name='new_bounty_rejection'),
+    path('_administration/email/comment', retail.emails.comment, name='comment_email'),
     path(
         '_administration/email/new_bounty_acceptance',
         retail.emails.new_bounty_acceptance,

app/assets/v2/css/actions.css

@@ -0,0 +1,171 @@
+
+.announce-bot {
+  margin-top: 10px;
+  text-align: center;
+}
+
+.announce-bot img {
+  width: 200px;
+  max-width: 200px;
+}
+
+.announce-bot2 img {
+  width: 250px;
+  max-width: 250px;
+}
+
+.announce-bot3 img {
+  width: 250px;
+  max-width: 250px;
+}
+
+.announce-bot4 img {
+  width: 250px;
+  max-width: 250px;
+}
+
+.announce {
+  text-align: center;
+  border-radius: 5px;
+  background-color: #fdedee;
+  padding: 3px;
+  position: relative;
+  margin-top: 25px;
+  margin-bottom: 25px;
+  margin-left: auto;
+  margin-right: auto;
+  width: 90%;
+}
+
+.announce:after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 50%;
+  width: 0;
+  height: 0;
+  border: 20px solid transparent;
+  border-bottom-color: #fdedee;
+  border-top: 0;
+  border-left: 0;
+  margin-left: -10px;
+  margin-top: -20px;
+}
+
+.announce a {
+  color: black;
+}
+.announce a.btn {
+  background-color: #f2c3c4;
+}
+.announce a.decline {
+  font-style: italic;
+}
+
+.announce h4 {
+  border-bottom: 3px solid #fdedee;
+}
+
+.announce5 h4 {
+  border-bottom: 3px solid #def390 !important;
+}
+
+.announce5:after {
+  border-bottom-color: #def390 !important;
+}
+
+.announce5 {
+  background-color: #def390 !important;
+}
+
+.announce5 a.btn {
+  background-color: #cee370 !important;
+}
+
+.announce4 h4 {
+  border-bottom: 3px solid #fce5ac !important;
+}
+
+.announce4:after {
+  border-bottom-color: #fce5ac !important;
+}
+
+.announce4 {
+  background-color: #fce5ac !important;
+}
+
+.announce4 a.btn {
+  background-color: #dcc58c !important;
+}
+
+.announce3 h4 {
+  border-bottom: 3px solid #d0f9f4 !important;
+}
+
+.announce3:after {
+  border-bottom-color: #d0f9f4 !important;
+}
+
+.announce3 {
+  background-color: #d0f9f4 !important;
+}
+
+.announce3 a.btn {
+  background-color: #b0d9d4 !important;
+}
+
+.announce2 h4 {
+  border-bottom: 3px solid #a4affc !important;
+}
+
+.announce2:after {
+  border-bottom-color: #a4affc !important;
+}
+
+.announce2 {
+  background-color: #a4affc !important;
+}
+
+.announce2 a.btn {
+  background-color: #849ffc !important;
+}
+
+.announce6 h4 {
+  border-bottom: 3px solid #fde9ed !important;
+}
+
+.announce6:after {
+  border-bottom-color: #fde9ed !important;
+}
+
+.announce6 {
+  background-color: #fde9ed !important;
+}
+
+.announce6 a.btn {
+  background-color: #ddb9bd !important;
+}
+
+#announce {
+  width: 9%;
+  display: block;
+  background-color: #d9d8e7;
+  border-radius: 5px;
+  text-align: center;
+  margin-top: 5px;
+  padding-top: 0px;
+}
+
+#announce img {
+  margin: 0px auto;
+  margin-top: -150px;
+  margin-bottom: -50px;
+  width: 200px;
+  height: 200px;
+}
+
+.announce a.btn:hover {
+  color: black;
+  font-weight: bold;
+  background-color: #f5d3d4;
+}

app/assets/v2/css/activity_stream.css

@@ -1,4 +1,71 @@
-
+#new_activity_notifier{
+  text-align: center;
+  background-color: #f0f0f0;
+  border: 1px solid #eee;
+  cursor: pointer;
+  padding: 5px 10px;
+  border-radius: 3px;
+  color: black;
+}
+#activities{
+  text-align: left;
+}
+.action{
+  padding: 3px;
+  border-radius: 5px;
+}
+.sup{
+  vertical-align: super;
+  font-size: smaller;  
+}
+.action i,
+a .sup{
+  color: black;
+}
+.action:hover{
+  background-color: #fafafa;
+}
+.action.open{
+  background-color: #eeeeee;
+}
+.comment_container.filled{
+  text-align: left;
+  width: 300px;
+  background-color: #f2f2f2;
+  padding: 5px;
+  border-radius: 5px;
+}
+.comment_container img{
+  border-radius: 20px;
+  max-width: 20px;
+}
+.comment_container li{
+  list-style: none;
+}
+.comment_container a{
+  color: black;
+  font-weight: bold;
+}
+.comment_container .post_comment{
+  float: right;
+  background-color: #eeeeee;
+  padding: 5px 10px;
+  border-radius: 5px;
+  color: black;
+  font-weight: bold;
+}
+.comment_container .post_comment:hover{
+  float: right;
+  background-color: #e9e9e9;
+  padding: 5px 10px;
+  border-radius: 5px;
+  color: black;
+  font-weight: bold;
+}
+.like_activity:hover, .flag_activity:hover, .comment_activity:hover, .copy_activity:hover{
+  text-decoration: none;
+  font-weight: bolder;
+}
 .activity_stream .avatar {
   width: 2.5rem;
   height: 2.5rem;
@@ -54,7 +121,10 @@
 }
 
 @media (max-width: 767.98px) {
-
+  .comment_container.filled{
+    text-align: center;
+    margin: 0px auto;
+  }
   .activity-info {
     text-align: center;
   }

app/assets/v2/css/grants/detail.css

@@ -1,4 +1,4 @@
-.grant_details .box {
+.grant_details span.box {
   width: 20px;
   height: 20px;
   margin-right: 10px;