feat: Add new themes

Author: Abdur-rahmaanJ

pythoncms/migrations/versions/9c6ee690afb6_.py

@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: 9c6ee690afb6
+Revises: cb42bf1aaf17
+Create Date: 2023-01-31 23:13:25.916695
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "9c6ee690afb6"
+down_revision = "cb42bf1aaf17"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "contact",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("created_date", sa.DateTime(), nullable=True),
+        sa.Column("name", sa.String(length=100), nullable=True),
+        sa.Column("email", sa.String(length=100), nullable=True),
+        sa.Column("message", sa.String(length=1024), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("contact")
+    # ### end Alembic commands ###

pythoncms/modules/box__default/i18n/info.json

@@ -7,6 +7,6 @@
     "display_string": "I18n",
     "fa-icon": "fa fa-store",
     "module_name": "i18n",
-    "type": "show",
+    "type": "hide",
     "url_prefix": "/i18n"
 }

pythoncms/modules/box__default/i18n/view.py

@@ -1,6 +1,9 @@
+from flask import redirect
+from flask import request
 from flask import session
 from modules.box__default.i18n.helpers import lang_keys
 from shopyo.api.module import ModuleHelp
+from shopyo.api.security import get_safe_redirect
 
 # from flask import render_template
 # from flask import url_for
@@ -30,7 +33,7 @@ def set_lang():
         session["yo_current_lang"] = set_to_lang
         session["yo_default_lang"] = set_to_lang
 
-        return redirect(get_safe_url(next_url))
+        return redirect(get_safe_redirect(next_url))
 
 
 # If "dashboard": "/dashboard" is set in info.json

pythoncms/modules/box__default/page/view.py

@@ -5,6 +5,7 @@
 from flask_login import login_required
 from init import db
 from modules.box__default.i18n.helpers import get_current_lang
+from modules.box__default.theme.helpers import get_active_front_theme
 from shopyo.api.forms import flash_errors
 from shopyo.api.module import ModuleHelp
 
@@ -61,7 +62,9 @@ def view_page(slug):
     context = {}
     page = Page.query.filter(Page.slug == slug).first()
     context.update({"page": page})
-    return render_template("page/view_page.html", **context)
+
+    return render_template(f"{get_active_front_theme()}/page.html", **context)
+    # return render_template("page/view_page.html", **context)
 
 
 @module_blueprint.route(mhelp.info["dashboard"])

pythoncms/modules/box__default/theme/global.py

@@ -1,4 +1,4 @@
-from .helper import *
+from .helpers import *
 
 available_everywhere = {
     "get_active_front_theme": get_active_front_theme,

…cms/modules/box__default/theme/helper.py …ms/modules/box__default/theme/helpers.pypythoncms/modules/box__default/theme/helper.py renamed to pythoncms/modules/box__default/theme/helpers.py pythoncms/modules/box__default/theme/helper.py renamed to pythoncms/modules/box__default/theme/helpers.py

@@ -0,0 +1,29 @@
+from flask_wtf import FlaskForm
+from wtforms import EmailField
+from wtforms import StringField
+from wtforms import TextAreaField
+from wtforms.validators import DataRequired
+
+# from wtforms.validators import Length
+
+
+class ContactForm(FlaskForm):
+    name = StringField(
+        "Name",
+        [DataRequired()],
+        render_kw={"class": "form-control", "autocomplete": "off"},
+    )
+    email = EmailField(
+        "Email",
+        [DataRequired()],
+        render_kw={"class": "form-control", "autocomplete": "off"},
+    )
+    message = TextAreaField(
+        "Message",
+        [DataRequired()],
+        render_kw={
+            "class": "form-control",
+            "rows": "20",
+            "autocomplete": "off",
+        },
+    )

pythoncms/modules/contact/forms.py

@@ -0,0 +1,8 @@
+from flask import url_for
+
+
+def get_contact_url():
+    return url_for("contact.index")
+
+
+available_everywhere = {"get_contact_url": get_contact_url}

pythoncms/modules/contact/global.py

@@ -0,0 +1,12 @@
+{
+  "display_string": "Contact",
+  "type": "show",
+  "fa-icon": "fa fa-envelope",
+  "url_prefix": "/contact",
+  "dashboard": "/dashboard",
+  "author": {
+    "name":"Abdur-Rahmaan Janhangeer",
+    "website":"https://www.pythonkitchen.com/about-me/",
+    "mail":"arj.python@gmail.com"
+    }
+}

pythoncms/modules/contact/info.json

@@ -0,0 +1,24 @@
+from datetime import datetime
+
+from init import db
+
+
+class ContactMessage(db.Model):
+
+    __tablename__ = "contact"
+    id = db.Column(db.Integer, primary_key=True)
+    created_date = db.Column(db.DateTime, default=datetime.now())
+    name = db.Column(db.String(100))
+    email = db.Column(db.String(100))
+    message = db.Column(db.String(1024))
+
+    def insert(self):
+        db.session.add(self)
+        db.session.commit()
+
+    def update(self):
+        db.session.commit()
+
+    def delete(self):
+        db.session.delete(self)
+        db.session.commit()