Merge branch 'bobby_dev' of https://github.com/WDI-Ideas/digest_backend into bobby_dev

Development

module_auth/api/serializers.py

@@ -3,7 +3,7 @@ from django.contrib.auth.hashers import make_password
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
 
-from module_iam.models import IAmPrincipal
+from module_iam.models import AppVersion, IAmPrincipal
 from module_project import constants
 
 # class BasePasswordSerializer(serializers.Serializer):
@@ -107,3 +107,13 @@ class PasswordResetSerializer(serializers.ModelSerializer):
             instance.password = make_password(new_password)
         instance.save()
         return instance
+
+class AppVersionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AppVersion
+        fields = [
+            "device_type",
+            "version",
+            "force_upgrade",
+            "recommend_upgrade",
+        ]

module_auth/api/urls.py

@@ -19,6 +19,5 @@ urlpatterns = [
     path('apple-signin/', views.AppleSignin.as_view(), name='apple_signin'),
 
     path('version-check/', views.VersionCheck.as_view(), name='version_check'),
-    path('app-version/', views.VersionCheck.as_view(), name='version_check'),
 
 ]

module_auth/api/views.py

@@ -15,7 +15,7 @@ from module_project import constants
 from module_project.service import EmailService, SMSService
 from module_project.utils import ApiResponse
 
-from .serializers import (LoginSerializer, OtpVerificationSerializer,
+from .serializers import (AppVersionSerializer, LoginSerializer, OtpVerificationSerializer,
                           PasswordResetSerializer, RegistrationSerializer)
 from .utils import (AuthService, GoogleAuthService,
                     authticate_with_otp_and_passsword, blacklist_token,
@@ -369,30 +369,18 @@ class AppleSignin(APIView):
 
 
 class VersionCheck(APIView):
-    authentication_classes = []
+    authentication_classes = [JWTAuthentication]
-    permission_classes = []
+    permission_classes = [IsAuthenticated]
     model = AppVersion
 
     def get(self, request, *args, **kwargs):
-        # app_version = request.GET.get('appVersion')
+        print("app version is called")
         device_type = request.GET.get('deviceType')
 
         if not device_type:
-            return ApiResponse.error(message=constants.FAILURE, errors="App version and device type is required")
+            return ApiResponse.error(message=constants.FAILURE, errors="device type is required")
         # Query the database to retrieve the upgrade flags based on the app version
-        try:
+        version = self.model.objects.filter(device_type=device_type).last()
-            version = self.model.objects.filter(device_type=device_type).last()
+        version_data = AppVersionSerializer(version)
-        except self.model.DoesNotExist:
-            version = None
 
-        if version:
+        return ApiResponse.success(message=constants.SUCCESS, data=version_data.data)
-            upgrade_flags = {
-                'forceUpgrade': version.force_upgrade,
-                'recommendUpgrade': version.recommend_upgrade,
-            }
-        else:
-            upgrade_flags = {
-                'forceUpgrade': False,
-                'recommendUpgrade': False,
-            }
-        return ApiResponse.success(message=constants.SUCCESS, data=upgrade_flags)

module_iam/migrations/0010_alter_appversion_device_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-05-21 14:09
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('module_iam', '0009_alter_appversion_device_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appversion',
+            name='device_type',
+            field=models.CharField(choices=[('ios', 'ios'), ('android', 'android')], max_length=10, verbose_name='Device Type (ios / android)'),
+        ),
+    ]

module_iam/permission.py

@@ -1,5 +1,6 @@
 from functools import wraps
 from django.core.exceptions import PermissionDenied
+from django.shortcuts import render
 from . import models
 from django.db.models import Q
 # import logging
@@ -69,7 +70,7 @@ class ResourcePermissionRequiredMixin:
     def dispatch(self, request, *args, **kwargs):
         if not self.has_resource_permission(request.user, self.resource):
             # logger.warning(f"Permission denied for user {request.user} accessing {self.resource}:{self.action}")
-            raise PermissionDenied("You do not have permission to access this resource.")
+            return render(request, "module_iam/permission_denied.html")
         return super().dispatch(request, *args, **kwargs)
 
     @classmethod
@@ -80,7 +81,7 @@ class ResourcePermissionRequiredMixin:
                 instance = cls()
                 instance.resource = resource
                 if not instance.has_resource_permission(request.user, instance.resource):
-                    raise PermissionDenied("You do not have permission to access this resource.")
+                    return render(request, "module_iam/permission_denied.html")
                 return view_func(request, *args, **kwargs)
             return _wrapped_view
         return decorator

module_project/settings/base.py

@@ -32,7 +32,7 @@ if READ_DOT_ENV_FILE:
 SECRET_KEY = env.str("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = env.bool("DJANGO_DEBUG", True)
+DEBUG = env.bool("DJANGO_DEBUG", False)
 
 ALLOWED_HOSTS = []
 

module_project/settings/production.py

@@ -4,7 +4,7 @@ import os
 import colorlog
 from logging.handlers import TimedRotatingFileHandler
 
-# DEBUG = True
+DEBUG = False
 ALLOWED_HOSTS = ["admin.eatwithdigest.com"]
 
 # CORS_ALLOWED_ORIGINS = [

module_project/urls.py

@@ -17,8 +17,18 @@ Including another URLconf
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
+from django.shortcuts import render
 from django.urls import include, path
 
+def handler404(request, exception):
+    if request.user.is_authenticated:
+        print("True")
+        return render(request, '404.html')
+    else:
+        print("False")
+        return render(request, '1404.html')
+
+
 urlpatterns = [
     path('admin/', admin.site.urls),
 
@@ -40,8 +50,13 @@ urlpatterns = [
     path('api/notification/', include("module_notification.api.urls")),
 ]
 
+# handler404 = handler404
+
 if settings.DEBUG:
     import debug_toolbar
 
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
     urlpatterns += [path('__debug__/', include(debug_toolbar.urls))]
+
+if not settings.DEBUG:
+    handler404 = handler404

templates/1404.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no">
+    <title>Digest</title>
+    {% load static %}
+    <link rel="icon" type="image/x-icon" href="../src/assets/img/favicon.ico"/>
+    <!-- BEGIN GLOBAL MANDATORY STYLES -->
+    <link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700" rel="stylesheet">
+    <link href="{% static 'src/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet" type="text/css" />
+
+    <link href="{% static 'layouts/collapsible-menu/css/light/plugins.css' %}" rel="stylesheet" type="text/css" />
+    <link href="{% static 'src/assets/css/light/pages/error/error.css' %}" rel="stylesheet" type="text/css" />
+
+    <!-- END GLOBAL MANDATORY STYLES -->
+
+    <style>
+        body.dark .theme-logo.light-element {
+            display: none;
+        }
+        .theme-logo.light-element {
+            display: inline-block;
+        }
+
+        .error-gif{
+            background-image: url(https://cdn.dribbble.com/users/722246/screenshots/3066818/404-page.gif);
+            height: 600px;
+            background-position: center;
+            background-repeat: no-repeat;
+        }
+    </style>
+    
+</head>
+<body class="text-center">.
+
+    
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-md-4 mr-auto mt-5 text-md-left text-center">
+                {% comment %} <a href="index.html" class="ml-md-5">
+                    <img alt="image-404" src="../src/assets/img/logo.svg" class="dark-element theme-logo">
+                    <img alt="image-404" src="../src/assets/img/logo2.svg" class="light-element theme-logo">
+                </a> {% endcomment %}
+            </div>
+        </div>
+    </div>
+    <div class="container-fluid error-content">
+        <div class="">
+            <h2>Ooops!</h2>
+            <h3 class="m-1">The page you requested was not found!</h3>
+            <a href="{% url 'module_auth:login'%}" class="btn btn-dark m-1">Login Page</a>
+            <div class="error-gif"></div>
+        </div>
+    </div>    
+    <!-- BEGIN GLOBAL MANDATORY SCRIPTS -->
+    <script src="{% static 'src/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
+    <!-- END GLOBAL MANDATORY SCRIPTS -->
+</body>
+</html>

templates/404.html

@@ -0,0 +1,36 @@
+{% extends 'base_structure/layout/base_template.html' %}
+{% load static %}
+{% block stylesheet %}
+{% endblock %}
+
+{% block content %}
+
+<div class="row layout-top-spacing">
+     <div id="content-wrapper">
+
+      <div class="container-fluid">
+
+        <!-- Breadcrumbs-->
+        <ol class="breadcrumb">
+          <li class="breadcrumb-item">
+            <a href="{% url 'module_iam:dashboard'%}">Dashboard</a>
+          </li>
+          <li class="breadcrumb-item active">404 Error</li>
+        </ol>
+
+        <!-- Page Content -->
+        <h1 class="display-1">404</h1>
+        <p class="lead">Page not found. You can
+          <a class="btn" href="javascript:history.back()">go back</a>
+          to the previous page, or
+          <a class="btn" href="{% url 'module_iam:dashboard'%}">return home</a>.</p>
+
+      </div>
+</div>
+
+
+{% endblock content %}
+
+{% block javascript %}
+
+{% endblock %}

templates/base_structure/elements/sidebar.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shadow-bottom"></div>
         <ul class="list-unstyled menu-categories" id="accordionExample">
-            <li class="menu {% if page_name == iam_constants_context.RESOURCE_MANAGE_DASHBOARD %}active{% endif %}">
+            <li class="menu {% if page_name == iam_constants_context.RESOURCE_MANAGE_DASHBOARD or not page_name%}active{% endif %}">
                 <a href="{% url 'module_iam:dashboard'%}" aria-expanded="false" class="dropdown-toggle">
                     <div class="">
                         <span class="material-symbols-outlined">dashboard</span>

templates/module_auth/user_view.html

@@ -401,13 +401,14 @@ var mealUrl = "{% url 'module_activity:meal_detail' pk=0 %}"
 var medicationUrl = "{% url 'module_activity:medication_detail' pk=0 %}"
 var bowelUrl = "{% url 'module_activity:bowel_detail' pk=0 %}"
 var symptomUrl = "{% url 'module_activity:meal_symptom_detail' pk=0 %}"
+
 var reportUrl = "{% url 'module_activity:report_data' principal_id=obj.id %}?date_range=date_range_data"
 
 // Entry point
 $(document).ready(function() {
     tableName = $('#table');
     //dataTableInstance = initializeDataTable(tableName, activityMainUrl);
-    
+
     var selectedDays = $('input[name="dateFilter"]:checked').val();
     getReportData(selectedDays);
 
@@ -538,7 +539,6 @@ function filterActivityData(dateRange){
 }
 */
 
-
 function getReportData(days){
     console.log("data range is ", days)
     var url = days ? reportUrl.replace("date_range_data", days) : reportUrl

templates/module_iam/permission_denied.html

@@ -0,0 +1,25 @@
+{% extends 'base_structure/layout/base_template.html' %}
+{% load static %}
+{% block stylesheet %}
+{% endblock %}
+
+{% block content %}
+
+<div class="row layout-top-spacing">
+    <div id="content-wrapper">
+        <div class="container-fluid text-center">
+            <h1 class="w3-jumbo w3-animate-top w3-center"><code>Access Denied</code></h1>
+            <hr class="w3-border-white w3-animate-left" style="margin:auto;width:50%">
+            <h3 class="w3-center w3-animate-right">You dont have permission to view this site.</h3>
+            <h3 class="w3-center w3-animate-zoom">🚫🚫🚫🚫</h3>
+            <h6 class="w3-center w3-animate-zoom">error code:403 forbidden</h6>
+        </div>
+    </div>
+</div>
+
+
+{% endblock content %}
+
+{% block javascript %}
+
+{% endblock %}

templates/module_support/feedback.html

@@ -68,6 +68,7 @@
         </div>
 
  <!-- modal for View Feedback Question Answer  -->
+
 <div class="modal fade" id="feedbackmodal" tabindex="-1" role="dialog" aria-labelledby="feedbackmodalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-scrollable" role="document">
       <div class="modal-content" >
@@ -126,7 +127,7 @@ function initializeDataTable(tableName, mainUrl) {
             {
                 data: "comment",
                 render: function (data, type, row) {
-                    return `<button class="btn btn-primary view-comment" data-comment="${data}">View</button>`;
+                    return `<button class="btn btn-primary view-comment" data-comment="${data}">View</button>`; 
                 }
             }
         ],