sh dashboard

Author: Abdur-rahmaanJ

.gitignore

@@ -126,3 +126,5 @@ shopyo/static/modules/
 
 # ignore secrets
 config.json
+
+exp/

pythoncms/config_demo.json

@@ -7,7 +7,6 @@
       "APP_NAME": "Demo",
       "ACTIVE_FRONT_THEME": "editorial",
       "ACTIVE_BACK_THEME": "sneat",
-      "ACTIVE_ICONSET": "fa",
       "SITE_TITLE": "My site",
       "SITE_DESCRIPTION": "description",
       "CURRENCY": "MUR",

pythoncms/conftest.py

@@ -102,10 +102,10 @@ def db(test_client, non_admin_user, admin_user, unconfirmed_user):
     _db.app = test_client
     _db.create_all()
 
-    # Insert admin, non admin, and unconfirmed
-    _db.session.add(non_admin_user)
-    _db.session.add(admin_user)
-    _db.session.add(unconfirmed_user)
+    # Insert admin, non admin, and unconfirmed if they don't exist
+    for u in [non_admin_user, admin_user, unconfirmed_user]:
+        if not User.query.filter_by(email=u.email).first():
+            _db.session.add(u)
 
     # add the default settings
     with open("config.json") as config:
@@ -118,7 +118,7 @@ def db(test_client, non_admin_user, admin_user, unconfirmed_user):
         else:
             existing.value = value
 
-    # Commit the changes for the users
+    # Commit the changes
     _db.session.commit()
 
     yield _db  # this is where the testing happens!
@@ -221,13 +221,13 @@ def __init__(self, client):
 
     def login(self, user, password="pass"):
         return self._client.post(
-            url_for("auth.login"),
+            url_for("shopyo_auth.login"),
             data=dict(email=user.email, password=password),
             follow_redirects=True,
         )
 
     def logout(self):
-        return self._client.get(url_for("auth.logout"), follow_redirects=True)
+        return self._client.get(url_for("shopyo_auth.logout"), follow_redirects=True)
 
 
 # Want TO USE THE BELOW 2 FIXTURES TO DYNAMICALLY

pythoncms/modules/api/info.json

@@ -1,10 +1,7 @@
 {
     "display_string": "API",
     "type": "show",
-    "icons": {
-        "fa": "fas fa-network-wired",
-        "boxicons": "bx bx-network-chart"
-    },
+    "fa-icon": "fas fa-network-wired",
     "url_prefix": "/api/v1",
     "menu-type": "no-menu",
     "module_name": "api",

pythoncms/modules/api/tests/__init__.py

@@ -1,10 +1,7 @@
 {
   "display_string": "Contact",
   "type": "show",
-  "icons":{
-		"fa": "fa fa-envelope",
-		"boxicons": "bx bx-envelope"
-	},
+  "fa-icon": "fa fa-envelope",
   "url_prefix": "/contact",
   "dashboard": "/dashboard",
   "author": {

pythoncms/modules/contact/info.json

@@ -1,4 +1,4 @@
-{%extends get_active_back_theme()+'/base.html'%}
+{% extends 'shopyo_dashboard/dashboard_base.html' %}
 
 
 {%block content%}

pythoncms/modules/contact/templates/contact/dashboard.html

@@ -0,0 +1,42 @@
+import pytest
+from init import db
+from modules.contact.models import ContactMessage
+from flask import url_for
+
+def test_contact_index(test_client):
+    response = test_client.get("/contact/")
+    assert response.status_code == 200
+    assert b"Contact" in response.data
+
+def test_contact_submit_fail_no_auth(test_client):
+    # validate_message requires login_required in view.py
+    response = test_client.post("/contact/validate_message", data={
+        "name": "Test",
+        "email": "test@test.com",
+        "message": "Hello"
+    }, follow_redirects=True)
+    # Redirects to login
+    assert b"Login" in response.data
+
+def test_contact_dashboard_no_auth(test_client):
+    response = test_client.get("/contact/dashboard", follow_redirects=True)
+    assert b"Login" in response.data
+
+def test_contact_submit_and_dashboard(test_client, login_admin_user):
+    # Now logged in as admin (from conftest.py login_admin_user fixture)
+    response = test_client.post("/contact/validate_message", data={
+        "name": "Test User",
+        "email": "testuser@test.com",
+        "message": "This is a test message"
+    }, follow_redirects=True)
+    
+    # Check if message is in DB
+    msg = ContactMessage.query.filter_by(email="testuser@test.com").first()
+    assert msg is not None
+    assert msg.name == "Test User"
+    
+    # Check dashboard
+    response = test_client.get("/contact/dashboard")
+    assert response.status_code == 200
+    assert b"Test User" in response.data
+    assert b"This is a test message" in response.data

pythoncms/modules/contact/tests/test_contact_functional.py

@@ -1,4 +1,4 @@
-{% extends get_active_back_theme()+'/base.html' %}
+{% extends 'shopyo_dashboard/dashboard_base.html' %}
 
 {% block content %}
 <div class="container-xxl flex-grow-1 container-p-y">

pythoncms/modules/contenttype/templates/contenttype/create.html

@@ -1,4 +1,4 @@
-{% extends get_active_back_theme()+'/base.html' %}
+{% extends 'shopyo_dashboard/dashboard_base.html' %}
 
 {% block content %}
 <div class="container-xxl flex-grow-1 container-p-y">