Merge pull request #933 from p2pu/2021-website-refresh

2021 website refresh

Author: dirkcuys

Diff for: .github/workflows/ci.yml

@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
     - name: Build docker image
       run: docker build -t p2pu/learning-circles .
     - name: start postgres container

Diff for: .gitmodules

@@ -0,0 +1,3 @@
+[submodule "p2pu-theme"]
+	path = p2pu-theme
+	url = https://github.com/p2pu/p2pu-theme.git

Diff for: Dockerfile

@@ -1,6 +1,7 @@
 FROM node:lts-slim AS frontend
 WORKDIR /opt/app/
 COPY package.json /opt/app/
+COPY p2pu-theme/ /opt/app/p2pu-theme/
 RUN npm install --quiet --production
 COPY . /opt/app/
 RUN npm run build

Diff for: contact/__init__.py

@@ -0,0 +1,35 @@
+from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
+
+from celery import shared_task
+
+from studygroups.email_helper import render_html_with_css
+from studygroups.utils import html_body_to_text
+from studygroups.utils import render_to_string_ctx
+
+
+@shared_task
+def send_contact_form_inquiry(email, name, content, source, organization=None):
+    context = {
+        "email": email,
+        "name": name,
+        "content": content,
+        "source": source,
+        "organization": organization,
+    }
+
+    subject_template = 'contact/contact_email-subject.txt'
+    html_email_template = 'contact/contact_email.html'
+    subject = render_to_string_ctx(subject_template, context).strip(' \n')
+    html_body = render_html_with_css(html_email_template, context)
+    text_body = html_body_to_text(html_body)
+
+    to = [ settings.TEAM_EMAIL ]
+    email = EmailMultiAlternatives(
+        subject,
+        text_body,
+        settings.DEFAULT_FROM_EMAIL,
+        to,
+    )
+    email.attach_alternative(html_body, 'text/html')
+    email.send()

Diff for: contact/tasks.py

@@ -0,0 +1,7 @@
+from django.conf.urls import url
+
+from contact import views
+
+urlpatterns = [
+    url(r'^contact/$', views.ContactAPIView.as_view(), name='api_contact_form')
+]

Diff for: contact/urls.py

@@ -0,0 +1,36 @@
+from rest_framework import serializers
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from django import http
+
+from .tasks import send_contact_form_inquiry
+
+
+# Serializers define the API representation.
+class ContactSerializer(serializers.Serializer):
+    email = serializers.EmailField()
+    name =  serializers.CharField(max_length=255)
+    content = serializers.CharField()
+    source = serializers.CharField(max_length=255)
+    organization = serializers.CharField(max_length=255, required=False)
+
+    def create(self, validated_data):
+        return validated_data
+
+
+class ContactAPIView(APIView):
+    authentication_classes = []
+    permission_classes = []
+
+    def post(self, request, *args, **kwargs):
+        serializer = ContactSerializer(data=request.data, context={'request': request})
+        serializer.is_valid(raise_exception=True)
+        # call async task to send email
+        send_contact_form_inquiry.delay(**serializer.data)
+
+        if request.GET.get('next') and not request.is_ajax():
+            # TODO should this be validated?
+            return http.HttpResponseRedirect(request.GET.get('next'))
+
+        data = {"status": "sent"}
+        return Response(data)

Diff for: contact/views.py

@@ -6,12 +6,15 @@
 from django.forms import ValidationError
 from django.contrib.auth import password_validation
 from django.contrib.auth.forms import UserCreationForm
+from django.utils.safestring import mark_safe
+
 from studygroups.models import Profile
 
 
 class SignupForm(UserCreationForm):
-    communication_opt_in = forms.BooleanField(required=False, initial=False, label=_('P2PU can contact me.'), help_text=_('Joining the community comes with an expectation that you would like to learn about upcoming events, new features, and updates from around the world. If you do not want to receive any of these messages, uncheck this box.'))
-    interested_in_learning = forms.CharField(required=False, label=_('What are you interested in learning?'))
+    communication_opt_in = forms.BooleanField(required=False, initial=False, label=_('P2PU can contact me'), help_text=_('Join our mailing list to learn about upcoming events, new courses, and news from the community. (Approximately six emails/year)'))
+
+    consent_opt_in = forms.BooleanField(required=True, initial=False, label=mark_safe(_('I consent to P2PU storing my data and accept the <a href="https://www.p2pu.org/en/terms/">terms of service</a>')), help_text=_('P2PU values your privacy and will never sell your data.'))
 
     def __init__(self, *args, **kwargs):
         super(SignupForm, self).__init__(*args, **kwargs)
@@ -28,7 +31,7 @@ def clean(self):
 
     class Meta:
         model = User
-        fields = ['email', 'first_name', 'last_name', 'password1', 'password2', 'interested_in_learning', 'communication_opt_in']
+        fields = ['first_name', 'last_name', 'email', 'password1', 'password2', 'communication_opt_in', 'consent_opt_in']
 
 
 class CustomPasswordResetForm(PasswordResetForm):

Diff for: custom_registration/forms.py

@@ -1,19 +1,19 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
-from django.utils import six
 from django.utils import timezone
 from django.utils.http import urlsafe_base64_encode
 from django.utils.encoding import force_bytes
 from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
+
+from studygroups.models import Profile
+from studygroups.utils import html_body_to_text
 from studygroups.utils import render_to_string_ctx
 from studygroups.email_helper import render_html_with_css
-from django.core.mail import EmailMultiAlternatives
 
 import random
 import string
 
-from studygroups.models import Profile
-from studygroups.utils import html_body_to_text
 
 def create_user(email, first_name, last_name, password, communication_opt_in=False, interested_in_learning=''):
     """ Create a new user using the email as the username  """

Diff for: custom_registration/models.py

@@ -40,7 +40,7 @@ def test_account_create(self):
             "first_name": "firstname",
             "last_name": "lastname",
             "communication_opt_in": "on",
-            "interested_in_learning": "python",
+            "consent_opt_in": "on",
             "password1": "password",
             "password2": "password",
         }
@@ -49,7 +49,6 @@ def test_account_create(self):
         users = User.objects.filter(email__iexact=data['email'])
         self.assertEqual(users.count(), 1)
         profile = Profile.objects.get(user=users.first())
-        self.assertEqual(profile.interested_in_learning, "python")
         self.assertEqual(profile.communication_opt_in, True)
         self.assertEqual(len(mail.outbox), 1) ##
         self.assertIn('Please confirm your email address', mail.outbox[0].subject)
@@ -64,6 +63,7 @@ def test_facilitator_signup_with_mixed_case(self):
             "password1": "password",
             "password2": "password",
             "communication_opt_in": "on",
+            "consent_opt_in": "on",
         }
         resp = c.post('/en/accounts/register/', data)
         self.assertRedirects(resp, '/en/')
@@ -140,6 +140,7 @@ def test_api_account_create(self):
             "last_name": "Test",
             "password": "12345",
             "communication_opt_in": False,
+            "consent_opt_in": True,
             "g-recaptcha-response": "blah",
         }
         resp = c.post(url, data=json.dumps(data), content_type='application/json')
@@ -197,7 +198,8 @@ def test_email_address_confirm(self):
             "last_name": "Test",
             "password": "12345",
             "g-recaptcha-response": "blah",
-            "communication_opt_in": False
+            "communication_opt_in": False,
+            "consent_opt_in": True,
         }
         resp = c.post(url, data=json.dumps(data), content_type='application/json')
         self.assertEqual(resp.status_code, 200)
@@ -225,6 +227,7 @@ def test_send_new_user_email(self):
             "first_name": "firstname",
             "last_name": "lastname",
             "communication_opt_in": "on",
+            "consent_opt_in": "on",
             "password1": "password",
             "password2": "password",
         }

Diff for: custom_registration/tests.py

@@ -5,6 +5,7 @@
 from django.utils.http import urlsafe_base64_decode
 from django.utils.translation import ugettext as _
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.cache import never_cache
 from django.views.generic.edit import FormView
@@ -71,7 +72,7 @@ def form_valid(self, form):
             return json_response(self.request, {"status": "error", "errors": '1011010010010010111'})
 
         user = form.save(commit=False)
-        user = create_user(user.email, user.first_name, user.last_name, form.cleaned_data['password1'], form.cleaned_data['communication_opt_in'], form.cleaned_data['interested_in_learning'], )
+        user = create_user(user.email, user.first_name, user.last_name, form.cleaned_data['password1'], form.cleaned_data['communication_opt_in'])
         login(self.request, user)
         return http.HttpResponseRedirect(self.get_success_url())
 
@@ -120,6 +121,7 @@ def _validate(value):
         return json_response(request, { "status": "created", "user": user.username });
 
 
+@method_decorator(csrf_exempt, name='dispatch')
 class AjaxLoginView(View):
     def post(self, request):
         post_schema = {
@@ -168,6 +170,9 @@ def get(self, request):
                     {"text": "My team", "url": reverse('studygroups_organize')},
                 ]
 
+            if request.user.is_staff or TeamMembership.objects.active().filter(user=request.user):
+                user_data['team'] = True
+
             if request.user.is_staff:
                 user_data["links"][:0] = [
                     {"text": "Staff dash", "url": reverse('studygroups_staff_dash')},

Diff for: custom_registration/views.py

@@ -10,7 +10,7 @@ services:
     - 1080:80
   learning-circles:
     build: .
-    image: learning-circles
+    image: p2pu/learning-circles:local
     links:
     - selenium
     ports:

Diff for: docker-compose.test.yml

@@ -34,7 +34,8 @@ class LearningCircleCreationPageLocators(object):
     FACILITATOR_CONCERNS_FIELD = (By.ID, "facilitator_concerns")
     SUCCESS_ALERT = (By.CSS_SELECTOR, ".alert.alert-success")
     DANGER_ALERT = (By.CSS_SELECTOR, ".alert.alert-danger")
-    ALERT_CLOSE_BUTTON = (By.CSS_SELECTOR, ".alert.alert-dismissible button.close")
+    ALERT_CLOSE_BUTTON = (By.CSS_SELECTOR, ".alert.alert-dismissible .btn-close")
+
     COURSE_CARDS = (By.CSS_SELECTOR, "#react-tabs-1 .search-results .result-item")
     PUBLISH_BUTTON = (By.CSS_SELECTOR, ".action-bar button.publish")
     SAVE_BUTTON = (By.CSS_SELECTOR, ".action-bar button.save")

Diff for: e2e/tests/selenium/locators.py

@@ -82,7 +82,7 @@ export default class LearningCirclesTable extends Component {
                     date = moment(lc.start_date).format('MMM D, YYYY')
                   }
 
-                  const classes = lc.draft ? 'bg-secondary' : '';
+                  const classes = lc.draft ? 'bg-cream-dark' : '';
 
                   return(
                     <tr key={ lc.id } className={`${classes}`}>
@@ -91,7 +91,7 @@ export default class LearningCirclesTable extends Component {
                       { this.props.teamId && <td>{ lc.facilitator }</td>}
                       <td>{ lc.signup_count }</td>
                       <td>{ date }</td>
-                      { (this.props.user || this.props.userIsOrganizer) && <td><a href={ lc.studygroup_path } className="p2pu-btn btn-sm dark">manage</a></td> }
+                      { (this.props.user || this.props.userIsOrganizer) && <td><a href={ lc.studygroup_path } className="p2pu-btn btn btn-sm dark">manage</a></td> }
                     </tr>
                   )
                 })
@@ -104,7 +104,7 @@ export default class LearningCirclesTable extends Component {
           {
             this.state.learningCircles.map(lc => {
               const date = lc.next_meeting_date ? moment(lc.next_meeting_date).format('MMM D, YYYY') : "n/a";
-              const classes = lc.draft ? 'bg-secondary' : '';
+              const classes = lc.draft ? 'bg-cream-dark' : '';
 
               return(
                 <div className={`meeting-card p-2 ${classes}`} key={lc.id}>
@@ -124,7 +124,7 @@ export default class LearningCirclesTable extends Component {
                     </div>
                   </div>
 
-                  { (this.props.user || this.props.userIsOrganizer) && <a href={ lc.studygroup_path } className="p2pu-btn btn-sm dark m-0 my-2">manage</a> }
+                  { (this.props.user || this.props.userIsOrganizer) && <a href={ lc.studygroup_path } className="p2pu-btn btn btn-sm dark m-0 my-2">manage</a> }
                 </div>
               )
             })

Diff for: frontend/components/dashboard/ActiveLearningCirclesTable.jsx

@@ -51,7 +51,7 @@ export default class Announcements extends Component {
               <Card className={`bg-${announcement.color} feedback-survey d-block w-100`} key={`announcement-${index}`}>
                 <div className="bold text-center text-white">{announcement.text}</div>
                 <div className="text-center mt-3">
-                  <a href={announcement.link} className="p2pu-btn light btn-sm" target="_blank">{announcement.link_text}</a>
+                  <a href={announcement.link} className="p2pu-btn btn btn-sm secondary transparent" target="_blank">{announcement.link_text}</a>
                 </div>
               </Card>
             )

Diff for: frontend/components/dashboard/Announcements.jsx

@@ -72,7 +72,7 @@ export default class LearningCirclesTable extends Component {
               {
                 this.state.learningCircles.map(lc => {
                   const date = lc.last_meeting_date ? moment(lc.last_meeting_date).format('MMM D, YYYY') : "n/a";
-                  const classes = lc.draft ? 'bg-secondary' : '';
+                  const classes = lc.draft ? 'bg-cream-dark' : '';
 
                   return(
                     <tr key={ lc.id } className={`${classes}`}>
@@ -81,7 +81,7 @@ export default class LearningCirclesTable extends Component {
                       { this.props.teamId && <td>{ lc.facilitator }</td>}
                       <td>{ lc.signup_count }</td>
                       <td>{ date }</td>
-                      { (this.props.user || this.props.userIsOrganizer) && <td><a href={ lc.studygroup_path } className="p2pu-btn btn-sm dark">manage</a></td> }
+                      { (this.props.user || this.props.userIsOrganizer) && <td><a href={ lc.studygroup_path } className="p2pu-btn btn btn-sm dark">manage</a></td> }
                     </tr>
                   )
                 })
@@ -94,7 +94,7 @@ export default class LearningCirclesTable extends Component {
           {
             this.state.learningCircles.map(lc => {
               const date = lc.last_meeting_date ? moment(lc.last_meeting_date).format('MMM D, YYYY') : "n/a";
-              const classes = lc.draft ? 'bg-secondary' : '';
+              const classes = lc.draft ? 'bg-cream-dark' : '';
 
               return(
                 <div className={`meeting-card p-2 ${classes}`} key={lc.id}>
@@ -114,7 +114,7 @@ export default class LearningCirclesTable extends Component {
                     </div>
                   </div>
 
-                  { (this.props.user || this.props.userIsOrganizer) && <a href={ lc.studygroup_path } className="p2pu-btn btn-sm dark m-0 my-2">manage</a> }
+                  { (this.props.user || this.props.userIsOrganizer) && <a href={ lc.studygroup_path } className="p2pu-btn btn btn-sm dark m-0 my-2">manage</a> }
                 </div>
               )
             })

Diff for: frontend/components/dashboard/CompletedLearningCirclesTable.jsx

@@ -58,7 +58,7 @@ export default class CoursesTable extends Component {
       return(
         <div className="py-2">
           <div>You haven't added any courses.</div>
-          <a href={"/en/course/create"} className="p2pu-btn dark btn-sm ml-0">Add a course</a>
+          <a href={"/en/course/create"} className="p2pu-btn dark btn btn-sm ml-0">Add a course</a>
         </div>
       )
     };
@@ -79,14 +79,14 @@ export default class CoursesTable extends Component {
               {
                 this.state.courses.map(course => {
                   const date = moment(course.created_at).format('MMM D, YYYY')
-                  const classes = course.unlisted ? 'bg-secondary' : '';
+                  const classes = course.unlisted ? 'bg-cream-dark' : '';
 
                   return(
                     <tr key={course.id} className={`${classes}`}>
                       <td><a href={course.course_page_path}>{`${course.unlisted ? "[UNLISTED] " : ""}${course.title}`}</a></td>
                       <td>{course.provider}</td>
                       <td>{date}</td>
-                      <td><a href={course.course_edit_path} className="p2pu-btn btn-sm dark">edit</a></td>
+                      <td><a href={course.course_edit_path} className="p2pu-btn btn btn-sm dark">edit</a></td>
                     </tr>
                   )
                 })
@@ -99,7 +99,7 @@ export default class CoursesTable extends Component {
           {
             this.state.courses.map((course, index) => {
               const date = moment(course.created_at).format('MMM D, YYYY')
-              const classes = course.unlisted ? 'bg-secondary' : '';
+              const classes = course.unlisted ? 'bg-cream-dark' : '';
               const delay = index * 100;
 
               return(
@@ -118,7 +118,7 @@ export default class CoursesTable extends Component {
                     </div>
                   </div>
 
-                  <a href={ course.course_edit_path } className="p2pu-btn btn-sm dark m-0 my-2">edit</a>
+                  <a href={ course.course_edit_path } className="p2pu-btn btn btn-sm dark m-0 my-2">edit</a>
                 </div>
               )
             })