slthcore 0.3.1__tar.gz → 0.3.3__tar.gz

{slthcore-0.3.1/slthcore.egg-info → slthcore-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slthcore
-Version: 0.3.1
+Version: 0.3.3
 Summary: API generator based on yml file
 Home-page: https://github.com/brenokcc
 Author: Breno Silva

{slthcore-0.3.1 → slthcore-0.3.3}/setup.py

@@ -5,7 +5,7 @@ install_requires = []
 
 setup(
     name='slthcore',
-    version='0.3.1',
+    version='0.3.3',
     packages=find_packages(),
     install_requires=install_requires,
     include_package_data=True,

{slthcore-0.3.1 → slthcore-0.3.3}/slth/cmd/init/boilerplate/backend/api/settings.py

@@ -100,11 +100,11 @@ TIME_ZONE = 'America/Recife'
 USE_I18N = True
 USE_L10N = True
 USE_TZ = False
-MEDIA_ROOT = 'media'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 MEDIA_URL = 'media/'
 SITE_URL = os.environ.get('SITE_URL', 'http://localhost:8000')
-STATIC_ROOT = 'static'
-STATIC_URL = os.path.join(SITE_URL, 'static/')
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+STATIC_URL = 'static/'
 ALLOWED_HOSTS = ['selenium', '127.0.0.1', 'localhost', '*']
 SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 X_FRAME_OPTIONS = 'ALLOWALL'

{slthcore-0.3.1 → slthcore-0.3.3}/slth/cmd/init/boilerplate/backend/api/urls.py

@@ -1,7 +1,7 @@
 from django.urls import path, re_path, include
 from slth import urls
 from django.conf import settings
-from slth.views import dispatcher, index, service_worker
+from slth.views import dispatcher, index, service_worker, media
 from django.conf.urls.static import static
 
 urlpatterns = [
@@ -9,5 +9,6 @@ urlpatterns = [
     path('service-worker.js', service_worker),
     re_path(r'^app/(?P<path>.*)/$', index),
     path('api/', include(urls)),
-    path('', dispatcher)
-] + static('media', document_root=settings.MEDIA_ROOT)
+    path('', dispatcher),
+    path('media/<path:file_path>/', media, name='secure_media')
+]

{slthcore-0.3.1 → slthcore-0.3.3}/slth/components.py

@@ -169,6 +169,13 @@ class Table(dict):
         )
 
 
+class HtmlContent(dict):
+    def __init__(self, content, autoreload=None):
+        self["type"] = "html"
+        self["content"] = content
+        self["autoreload"] = autoreload * 1000 if autoreload else None
+
+
 class TemplateContent(dict):
     def __init__(self, name, context, autoreload=None):
         self["type"] = "html"
@@ -217,12 +224,13 @@ class ZoomMeet(dict):
 
 
 class Navbar(dict):
-    def __init__(self, title, subtitle=None, logo=None, user=None, search=False, roles=None):
+    def __init__(self, title, subtitle=None, logo=None, user=None, photo=None, search=False, roles=None):
         self["type"] = "navbar"
         self["title"] = title
         self["subtitle"] = subtitle
         self["logo"] = logo
         self["user"] = user
+        self["photo"] = photo
         self["usermenu"] = []
         self["adder"] = []
         self["tools"] = []

{slthcore-0.3.1 → slthcore-0.3.3}/slth/endpoints/__init__.py

@@ -331,7 +331,7 @@ class ModelEndpoint(Endpoint):
         super().__init__()
 
     def get_icon(self):
-        return self.model._meta.icon or super().get_icon()
+        return super().get_icon() or getattr(self.model._meta, 'icon', None)
 
 
 class QuerySetEndpoint(Generic[T], ModelEndpoint):
@@ -564,17 +564,22 @@ class Dashboard(Endpoint):
 class Application(PublicEndpoint):
     def get(self):
         user = None
+        photo = None
         navbar = None
         menu = None
         icon = build_url(self.request, APPLICATON["logo"])
         logo = build_url(self.request, APPLICATON["logo"])
         if self.request.user.is_authenticated:
             user = self.request.user.username.split()[0].split("@")[0]
+            profile = Profile.objects.filter(user=self.request.user).first()
+            photo = profile and profile.photo and build_url(self.request, profile.photo.url)
+
         navbar = Navbar(
             title=APPLICATON["title"],
             subtitle=APPLICATON["subtitle"],
             logo=logo,
             user=user,
+            photo=photo,
             search=False,
             roles=' | '.join((str(role) for role in self.objects('slth.role').filter(username=self.request.user.username)))
         )

{slthcore-0.3.1 → slthcore-0.3.3}/slth/endpoints/profile.py

@@ -1,6 +1,7 @@
 from .. import endpoints
 from .. import forms
 from ..models import Profile
+from ..components import Response
 
 
 class UserProfile(endpoints.Endpoint):
@@ -27,7 +28,7 @@ class UserProfile(endpoints.Endpoint):
                 self.request.user.save()
         else:
             raise forms.ValidationError('Repita a mesma senha.')
-        return super().post()
+        return Response(message="Ação realizada com sucesso", store=dict(application=None), redirect='/api/dashboard/')
     
     def get_profile(self):
         return Profile.objects.get_or_create(user=self.request.user, defaults=dict(photo=None))[0]

{slthcore-0.3.1 → slthcore-0.3.3}/slth/models.py

@@ -18,6 +18,7 @@ from django.core import serializers
 from django.template.loader import render_to_string
 from django.core.mail import EmailMultiAlternatives
 from .notifications import send_push_web_notification
+from .components import HtmlContent
 
 from slth import APPLICATON
 from django.contrib.auth.models import BaseUserManager
@@ -327,7 +328,7 @@ class PushNotification(models.Model):
 
 class EmailManager(models.Manager):
     def all(self):
-        return self.order_by('-id').rows()
+        return self.fields('subject', 'to', 'content', 'send_at', 'sent_at').search('subject', 'content', 'to').filters('send_at__gte', 'send_at__lte', 'sent_at__gte', 'sent_at__lte').rows().order_by('-id')
 
     def create(self, to, subject, content, send_at=None, action=None, url=None, key=None):
         to = [to] if isinstance(to, str) else list(to)
@@ -391,6 +392,16 @@ class Email(models.Model):
         ).fieldset(
             'Botão', ('action', 'url')
         )
+    
+    def serializer(self):
+        return super().serializer().fieldset(
+            'Dados Gerais', ('subject', 'to', 'get_content', ('send_at', 'sent_at'))
+        ).fieldset(
+            'Botão', ('action', 'url')
+        )
+    
+    def get_content(self):
+        return HtmlContent(self.content)
 
 
 class Profile(models.Model):

{slthcore-0.3.1 → slthcore-0.3.3}/slth/queryset.py

@@ -407,6 +407,7 @@ class QuerySet(models.QuerySet):
         field = None
         value = None
         ignore = 'icontains', 'contains', 'gt', 'gte', 'lt', 'lte', 'id', 'year', 'month'
+        symbols = dict(gt=' >', gte=' ⋝', lt=' <', lte=' ⋜')
         tmp = []
         for lookup in name.split('__'):
             if lookup in ignore:
@@ -441,7 +442,10 @@ class QuerySet(models.QuerySet):
                 choices = [{'id': '', 'value':''}]
                 choices.extend([{'id': k, 'value': v} for k, v in field.choices])
                 choices.append({'id': 'null', 'value':'Nulo'})
-            data = dict(name=name, type=field_type, value=value, label=str(field.verbose_name).title(), required=False, mask=None)
+            label = str(field.verbose_name).title()
+            symbol = symbols.get(suffix) if suffix else None
+            label = label + symbol if symbol else label
+            data = dict(name=name, type=field_type, value=value, label=label, required=False, mask=None)
             if choices:
                 data.update(choices=choices)
             return data