localcosmos-server 0.24.9__tar.gz → 0.24.11__tar.gz

{localcosmos_server-0.24.9/localcosmos_server.egg-info → localcosmos_server-0.24.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcosmos_server
-Version: 0.24.9
+Version: 0.24.11
 Summary: LocalCosmos Private Server. Run your own server for localcosmos.org apps.
 Home-page: https://github.com/SiSol-Systems/localcosmos-server
 Author: Thomas Uher

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/api/serializers.py

@@ -206,6 +206,16 @@ class ContactUserSerializer(serializers.Serializer):
     subject = serializers.CharField()
     message = serializers.CharField(min_length=10)
     
+    
+class ContactStaffSerializer(serializers.Serializer):
+    
+    name = serializers.CharField()
+    email = serializers.EmailField()
+    subject = serializers.CharField(required=False, allow_blank=True)
+    message = serializers.CharField(min_length=10)
+    page = serializers.CharField(required=False)
+    website = serializers.CharField(required=False, allow_blank=True) # honeypot field
+    
 
 #################################################################################################
 #

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/api/urls.py

@@ -15,6 +15,9 @@ urlpatterns = [
     # contact user
     path('<uuid:app_uuid>/contact-user/<uuid:user_uuid>/', views.ContactUser.as_view(),
          name='api_contact_user'),
+    # contact staff
+    path('<uuid:app_uuid>/contact-staff/', views.ContactStaff.as_view(),
+         name='api_contact_staff'),
     # JSON WebToken
     path('<uuid:app_uuid>/token/', views.TokenObtainPairViewWithClientID.as_view(), name='token_obtain_pair'),
     path('<uuid:app_uuid>/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/api/views.py

@@ -34,11 +34,12 @@ from localcosmos_server.taxonomy.lazy import LazyAppTaxon
 from .serializers import (LocalcosmosUserSerializer, RegistrationSerializer, PasswordResetSerializer,
                             TokenObtainPairSerializerWithClientID, ServerContentImageSerializer,
                             LocalcosmosPublicUserSerializer, ContactUserSerializer, TaxonProfileSerializer,
-                            TaxonProfileMinimalSerializer)
+                            TaxonProfileMinimalSerializer, ContactStaffSerializer)
 
 from .permissions import OwnerOnly, AppMustExist, ServerContentImageOwnerOrReadOnly
 
-from localcosmos_server.mails import (send_registration_confirmation_email, send_user_contact_email)
+from localcosmos_server.mails import (send_registration_confirmation_email, send_user_contact_email,
+                                      send_staff_email)
 
 from localcosmos_server.datasets.models import Dataset
 from localcosmos_server.models import UserClients
@@ -435,6 +436,35 @@ class ContactUser(APIView):
             return Response(serializer.data, status=status.HTTP_200_OK)
         
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+    
+
+class ContactStaff(APIView):
+    '''
+        Contact Localcosmos Staff
+        - [POST] delivers an email to the staff
+    '''
+
+    permission_classes = ()
+    parser_classes = (CamelCaseJSONParser,)
+    renderer_classes = (CamelCaseJSONRenderer,)
+    serializer_class = ContactStaffSerializer
+
+    def post(self, request, *args, **kwargs):
+
+        serializer = self.serializer_class(data=request.data)
+        
+        if serializer.is_valid():
+            
+            if serializer.data.get('website', '') != '':
+                # honeypot field filled
+                return Response('', status=status.HTTP_200_OK)
+            
+            # send mail
+            send_staff_email(kwargs['app_uuid'], serializer.data['name'], serializer.data['email'],
+                                    serializer.data.get('subject', ''), serializer.data['message'],)
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 ##################################################################################################################
 #

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/mails.py

@@ -7,7 +7,7 @@ from django.utils.translation import gettext as _
 
 FROM_EMAIL = settings.DEFAULT_FROM_EMAIL
 
-from localcosmos_server.models import App
+from localcosmos_server.models import App, LocalcosmosUser
 
 import re 
 
@@ -101,4 +101,53 @@ def send_user_contact_email(app_uuid, sender, receiver, subject, message):
     msg = EmailMultiAlternatives(subject, text_message, from_email=from_email, to=[to], headers=headers)
     msg.attach_alternative(html_message, 'text/html')
     
-    msg.send()
+    msg.send()
+    
+    
+def send_staff_email(app_uuid, sender_name, sender_email, subject, message):
+    
+    app = App.objects.get(uuid=app_uuid)
+    frontend = app.get_frontend()
+    
+    staff_users = LocalcosmosUser.objects.filter(is_staff=True, is_active=True)
+    receivers = [u.email for u in staff_users]
+    
+    support_email = None
+    if frontend and 'configuration' in frontend['userContent'] and 'supportEmail' in frontend['userContent']['configuration']:
+        support_email = frontend['userContent']['configuration']['supportEmail']
+    
+    headers = {
+        'Reply-To': sender_email
+    }
+
+    legal_notice_url = reverse('legal_notice', kwargs={'app_uid':app.uid}, urlconf='localcosmos_server.urls')
+    privacy_statement_url = reverse('privacy_statement', kwargs={'app_uid':app.uid},
+                                    urlconf='localcosmos_server.urls')
+    
+    
+    ctx = {
+        'sender_name' : sender_name,
+        'sender_email' : sender_email,
+        'receiver' : receivers,
+        'app' : app,
+        'site' : Site.objects.get_current(),
+        'subject': subject,
+        'message': message,
+        'legal_notice_url' : legal_notice_url,
+        'privacy_statement_url' : privacy_statement_url,
+        'support_email': support_email,
+    }
+    
+    from_email = FROM_EMAIL
+    to = receivers
+
+    text_message = render_to_string('email/contact_staff.txt', ctx)
+    html_message = get_template('email/contact_staff.html').render(ctx)
+    
+    subject = '[{0}] {1}'.format(app.name, subject)
+
+    msg = EmailMultiAlternatives(subject, text_message, from_email=from_email, to=to, headers=headers)
+    msg.attach_alternative(html_message, 'text/html')
+    
+    msg.send()
+    

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/static/localcosmos_server/js/django-ajax.js

@@ -75,8 +75,11 @@ function ajaxify(container_id){
 			var contentType = 'application/x-www-form-urlencoded; charset=UTF-8';
 			var processData = true;
 		}
-
-		submit_button.attr('disabled','disabled');
+		
+		// only disable button if it has not the class nodisable
+		if (!submit_button.hasClass('nodisable')) {
+			submit_button.attr('disabled','disabled');
+		}
 
 		$.ajax({
 			type: form.attr('method'),

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/taxonomy/fields.py

@@ -3,7 +3,7 @@ from django.utils.translation import gettext_lazy as _
 
 from localcosmos_server.taxonomy.lazy import LazyAppTaxon
 
-from localcosmos_server.taxonomy.widgets import (TaxonAutocompleteWidget, SelectTaxonWidget, ListToLazyTaxon)
+from localcosmos_server.taxonomy.widgets import (TaxonAutocompleteWidget, SelectTaxonWidget, HiddenTaxonWidget, ListToLazyTaxon)
 
 '''
     A field that returns a LazyTaxon instance
@@ -100,3 +100,24 @@ class SelectTaxonField(LazyTaxonField, forms.MultiValueField):
 
         super().__init__(fields, *args, require_all_fields=True, **kwargs)
 
+
+
+class HiddenTaxonField(LazyTaxonField, forms.MultiValueField):
+
+    lazy_taxon_class = LazyAppTaxon
+
+    def __init__(self, *args, **kwargs):
+        
+        include_descendants = kwargs.pop('include_descendants', False)
+
+        self.widget = HiddenTaxonWidget(include_descendants=include_descendants)
+
+        fields = [
+            forms.CharField(), # taxon_source
+            forms.CharField(), # taxon_latname
+            forms.CharField(required=False), # taxon_author
+            forms.CharField(), # name_uuid
+            forms.CharField(), # taxon_nuid
+        ]
+
+        super().__init__(fields, *args, require_all_fields=True, **kwargs)

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server/taxonomy/widgets.py

@@ -216,3 +216,26 @@ class SelectTaxonWidget(ListToLazyTaxon, MultiWidget):
             value = self.get_lazy_taxon(value)
         return value
 
+
+
+class HiddenTaxonWidget(MultiWidget):
+    def __init__(self, attrs=None, include_descendants=False):
+        widgets = [
+            HiddenInput(),  # taxon_source
+            HiddenInput(),  # taxon_latname
+            HiddenInput(),  # taxon_author
+            HiddenInput(),  # name_uuid
+            HiddenInput(),  # taxon_nuid
+        ]
+        if include_descendants:
+            widgets.append(HiddenInput())  # include_descendants
+        super().__init__(widgets, attrs)
+
+    def decompress(self, lazy_taxon):
+
+        if lazy_taxon:
+            data_list = [lazy_taxon.taxon_source, lazy_taxon.taxon_latname, lazy_taxon.taxon_author,
+                         str(lazy_taxon.name_uuid), lazy_taxon.taxon_nuid]
+            return data_list
+
+        return []

localcosmos_server-0.24.11/localcosmos_server/templates/email/contact_staff.html

@@ -0,0 +1,358 @@
+{% load i18n static countries %}
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta name="viewport" content="width=device-width" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>{% trans 'Registration confirmation' %}</title>
+	<style>
+	* {
+	  margin: 0;
+	  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	  box-sizing: border-box;
+	  font-size: 14px;
+	}
+
+	img {
+	  max-width: 100%;
+	}
+
+	body {
+	  -webkit-font-smoothing: antialiased;
+	  -webkit-text-size-adjust: none;
+	  width: 100% !important;
+	  height: 100%;
+	  line-height: 1.6em;
+	  /* 1.6em * 14px = 22.4px, use px to get airier line-height also in Thunderbird, and Yahoo!, Outlook.com, AOL webmail clients */
+	  /*line-height: 22px;*/
+	}
+
+	/* Let's make sure all tables have defaults */
+	table td {
+	  vertical-align: top;
+	}
+
+
+	body {
+	  background-color: #f6f6f6;
+	}
+
+	.body-wrap {
+	  background-color: #f6f6f6;
+	  width: 100%;
+	}
+
+	.container {
+	  display: block !important;
+	  max-width: 600px !important;
+	  margin: 0 auto !important;
+	  /* makes it centered */
+	  clear: both !important;
+	}
+
+	.content {
+	  max-width: 600px;
+	  margin: 0 auto;
+	  display: block;
+	  padding: 20px;
+	}
+
+	/* -------------------------------------
+		HEADER, FOOTER, MAIN
+	------------------------------------- */
+	.main {
+	  background-color: #fff;
+	  border: 1px solid #e9e9e9;
+	  border-radius: 3px;
+	}
+
+	.content-wrap {
+	  padding: 20px;
+	}
+
+	.content-block {
+	  padding: 0 0 20px;
+	}
+
+	.header {
+	  width: 100%;
+	  margin-bottom: 20px;
+	}
+
+	.footer {
+	  width: 100%;
+	  clear: both;
+	  color: #999;
+	  padding: 20px;
+	}
+	.footer p, .footer a, .footer td {
+	  color: #999;
+	  font-size: 12px;
+	}
+
+	/* -------------------------------------
+		TYPOGRAPHY
+	------------------------------------- */
+	h1, h2, h3 {
+	  font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+	  color: #000;
+	  margin: 20px 0 0;
+	  line-height: 1.2em;
+	  font-weight: 400;
+	}
+
+	h1 {
+	  font-size: 32px;
+	  font-weight: 500;
+	  /* 1.2em * 32px = 38.4px, use px to get airier line-height also in Thunderbird, and Yahoo!, Outlook.com, AOL webmail clients */
+	  /*line-height: 38px;*/
+	}
+
+	h2 {
+	  font-size: 24px;
+	  /* 1.2em * 24px = 28.8px, use px to get airier line-height also in Thunderbird, and Yahoo!, Outlook.com, AOL webmail clients */
+	  /*line-height: 29px;*/
+	}
+
+	h3 {
+	  font-size: 18px;
+	  /* 1.2em * 18px = 21.6px, use px to get airier line-height also in Thunderbird, and Yahoo!, Outlook.com, AOL webmail clients */
+	  /*line-height: 22px;*/
+	}
+
+	h4 {
+	  font-size: 14px;
+	  font-weight: 600;
+	}
+
+	p, ul, ol {
+	  margin-bottom: 10px;
+	  font-weight: normal;
+	}
+	p li, ul li, ol li {
+	  margin-left: 5px;
+	  list-style-position: inside;
+	}
+
+	/* -------------------------------------
+		LINKS & BUTTONS
+	------------------------------------- */
+	a {
+	  color: #348eda;
+	  text-decoration: underline;
+	}
+
+	.btn-primary {
+	  text-decoration: none;
+	  color: #FFF;
+	  background-color: #348eda;
+	  border: solid #348eda;
+	  border-width: 10px 20px;
+	  line-height: 2em;
+	  /* 2em * 14px = 28px, use px to get airier line-height also in Thunderbird, and Yahoo!, Outlook.com, AOL webmail clients */
+	  /*line-height: 28px;*/
+	  font-weight: bold;
+	  text-align: center;
+	  cursor: pointer;
+	  display: inline-block;
+	  border-radius: 5px;
+	  text-transform: capitalize;
+	}
+
+	/* -------------------------------------
+		OTHER STYLES THAT MIGHT BE USEFUL
+	------------------------------------- */
+	.last {
+	  margin-bottom: 0;
+	}
+
+	.first {
+	  margin-top: 0;
+	}
+
+	.aligncenter {
+	  text-align: center;
+	}
+
+	.alignright {
+	  text-align: right;
+	}
+
+	.alignleft {
+	  text-align: left;
+	}
+
+	.clear {
+	  clear: both;
+	}
+
+	/* -------------------------------------
+		ALERTS
+		Change the class depending on warning email, good email or bad email
+	------------------------------------- */
+	.alert {
+	  font-size: 16px;
+	  color: #fff;
+	  font-weight: 500;
+	  padding: 20px;
+	  text-align: center;
+	  border-radius: 3px 3px 0 0;
+	}
+	.alert a {
+	  color: #fff;
+	  text-decoration: none;
+	  font-weight: 500;
+	  font-size: 16px;
+	}
+	.alert.alert-warning {
+	  background-color: #FF9F00;
+	}
+	.alert.alert-bad {
+	  background-color: #D0021B;
+	}
+	.alert.alert-good {
+	  background-color: #68B90F;
+	}
+
+	/* -------------------------------------
+		INVOICE
+		Styles for the billing table
+	------------------------------------- */
+	.invoice {
+	  margin: 40px auto;
+	  text-align: left;
+	  width: 80%;
+	}
+	.invoice td {
+	  padding: 5px 0;
+	}
+	.invoice .invoice-items {
+	  width: 100%;
+	}
+	.invoice .invoice-items td {
+	  border-top: #eee 1px solid;
+	}
+	.invoice .invoice-items .total td {
+	  border-top: 2px solid #333;
+	  border-bottom: 2px solid #333;
+	  font-weight: 700;
+	}
+
+	/* -------------------------------------
+		RESPONSIVE AND MOBILE FRIENDLY STYLES
+	------------------------------------- */
+	@media only screen and (max-width: 640px) {
+	  body {
+		padding: 0 !important;
+	  }
+
+	  h1, h2, h3, h4 {
+		font-weight: 800 !important;
+		margin: 20px 0 5px !important;
+	  }
+
+	  h1 {
+		font-size: 22px !important;
+	  }
+
+	  h2 {
+		font-size: 18px !important;
+	  }
+
+	  h3 {
+		font-size: 16px !important;
+	  }
+
+	  .container {
+		padding: 0 !important;
+		width: 100% !important;
+	  }
+
+	  .content {
+		padding: 0 !important;
+	  }
+
+	  .content-wrap {
+		padding: 10px !important;
+	  }
+
+	  .invoice {
+		width: 100% !important;
+	  }
+	}
+	</style>
+
+</head>
+
+<body itemscope itemtype="http://schema.org/EmailMessage">
+
+<table class="body-wrap">
+	<tr>
+		<td></td>
+		<td class="container" width="600">
+			<div class="content">
+				<table class="main" width="100%" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="content-wrap aligncenter">
+							<table width="100%" cellpadding="0" cellspacing="0">
+								<tr>
+									<td>
+										<table width="100%">
+											<tr>
+												<td width="70%" class="alignleft" style="vertical-align:middle;">
+													&nbsp;
+												</td>
+												<td width="30%" class="alignright">
+													<img src="http://{{ site.domain }}{% static 'images/local_cosmos_logo_40.png' %}" height="40" />
+												</td>
+											</tr>
+										</table>
+									</td>
+								</tr>
+								<tr>
+									<td class="aligncenter">
+										<h2>{% blocktrans with username=sender_name %}Message from {{ username }}{% endblocktrans %}</h2>
+									</td>
+								</tr>
+								<tr>
+									<td class="content-block">
+										<br>
+										<h3>{{ subject }}</h3>
+										<br><br>
+
+										{{ message }}<br><br>
+
+										<p>
+											{% blocktrans with username=sender_name email=sender_email %}Reply to {{ username }}: {{ email }}{% endblocktrans %}
+										</p>
+									</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</table>
+				<div class="footer">
+					<table width="100%">
+						{% if support_email %}
+							<tr>
+								<td class="aligncenter content-block">
+									{% trans 'Questions?' %} E-Mail <a href="mailto:{{ support_email }}">{{ support_email }}</a>
+								</td>
+							</tr>
+						{% endif %}
+						<tr>
+							<td class="aligncenter content-block">
+								<a href="https://{{ site.domain }}{{ legal_notice_url }}" target="_blank">{% trans 'Legal notice' %}</a> &nbsp; &nbsp;
+								<a href="https://{{ site.domain }}{{ privacy_statement_url }}" target="_blank">{% trans 'Privacy statement' %}</a>
+							</td>
+						</tr>
+					</table>
+				</div></div>
+		</td>
+		<td></td>
+	</tr>
+</table>
+
+</body>
+</html>

localcosmos_server-0.24.11/localcosmos_server/templates/email/contact_staff.txt

@@ -0,0 +1,21 @@
+{% load i18n %}
+{% load i18n %}
+{{ app.name }}
+
+{% blocktrans with username=sender_name %}Message from {{ username }}{% endblocktrans %}
+
+{{ subject }}
+
+---------------------------------------------------------------------------=
+------------
+{{ message }}
+
+---------------------------------------------------------------------------=
+------------
+{% blocktrans with username=sender_name email=sender_email %}Reply to {{ username }}: {{ email }}{% endblocktrans %}
+
+
+---------------------------------------------------------------------------=
+---------------------------
+{% trans 'Legal notice' %}: https://{{ site.domain }}{{ legal_notice_url }}
+{% trans 'Privacy statement' %}: https://{{ site.domain }}{{ privacy_statement_url }}

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11/localcosmos_server.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localcosmos_server
-Version: 0.24.9
+Version: 0.24.11
 Summary: LocalCosmos Private Server. Run your own server for localcosmos.org apps.
 Home-page: https://github.com/SiSol-Systems/localcosmos-server
 Author: Thomas Uher

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/localcosmos_server.egg-info/SOURCES.txt

@@ -2726,6 +2726,8 @@ localcosmos_server/templates/el_pagination/page_link.html
 localcosmos_server/templates/el_pagination/previous_link.html
 localcosmos_server/templates/el_pagination/show_more.html
 localcosmos_server/templates/el_pagination/show_pages.html
+localcosmos_server/templates/email/contact_staff.html
+localcosmos_server/templates/email/contact_staff.txt
 localcosmos_server/templates/email/contact_user.html
 localcosmos_server/templates/email/contact_user.txt
 localcosmos_server/templates/email/registration_confirmation.html

{localcosmos_server-0.24.9 → localcosmos_server-0.24.11}/setup.py

@@ -25,7 +25,7 @@ install_requires = [
 
 setup(
     name='localcosmos_server',
-    version='0.24.9',
+    version='0.24.11',
     description='LocalCosmos Private Server. Run your own server for localcosmos.org apps.',
     long_description=long_description,
     long_description_content_type="text/markdown",