From 27c1850864e69c8e661baed591e2535bd57a8598 Mon Sep 17 00:00:00 2001
From: Abdur-Rahmaan Janhangeer <cryptolabour@gmail.com>
Date: Sun, 5 Feb 2023 16:01:03 +0400
Subject: [PATCH] feat: tinymce editors

fix: tinymce error
---
 MANIFEST.in                                   |  1 +
 .../modules/box__default/appadmin/admin.py    |  2 +-
 pythoncms/modules/box__default/auth/view.py   |  5 ++---
 .../page/templates/page/dashboard.html        | 18 ++++++++++-------
 .../templates/page/view_page_dashboard.html   | 20 +++++++++++--------
 .../static/themes/back/sneat/authbase.html    |  2 +-
 pythoncms/static/themes/back/sneat/base.html  |  2 +-
 pythoncms/static/themes/back/sneat/login.html |  2 +-
 .../static/themes/back/sneat/unconfirmed.html |  2 +-
 .../static/themes/front/editorial/base.html   |  1 +
 .../static/themes/front/editorial/page.html   |  2 +-
 11 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 3b44dad..7958c01 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,7 @@ include dev_requirements.txt
 exclude config.json
 recursive-include {projname} *
 recursive-exclude {projname}/instance *
+recursive-exclude {projname}/migrations *
 recursive-exclude {projname}/static/modules *
 recursive-exclude {projname}/.tox *
 recursive-exclude __pycache__ *
diff --git a/pythoncms/modules/box__default/appadmin/admin.py b/pythoncms/modules/box__default/appadmin/admin.py
index 4bfba91..4ce5833 100644
--- a/pythoncms/modules/box__default/appadmin/admin.py
+++ b/pythoncms/modules/box__default/appadmin/admin.py
@@ -7,7 +7,7 @@
 from shopyo.api.html import notify_warning
 
 login_manager.login_view = "auth.login"
-login_manager.login_message = notify_warning("Please login for access")
+# login_manager.login_message = "Please login for access"
 
 
 @login_manager.user_loader
diff --git a/pythoncms/modules/box__default/auth/view.py b/pythoncms/modules/box__default/auth/view.py
index ff31228..4aa7f9e 100644
--- a/pythoncms/modules/box__default/auth/view.py
+++ b/pythoncms/modules/box__default/auth/view.py
@@ -134,13 +134,12 @@ def login():
 @login_required
 def logout():
     logout_user()
-    flash("Successfully logged out", "ok")
 
     if "next" not in request.args:
-        next_url = url_for("dashboard.index")
+        next_url = url_for("www.index")
     else:
         if request.args.get("next") == "":
-            next_url = url_for("dashboard.index")
+            next_url = url_for("www.index")
         else:
             next_url = get_safe_redirect(request.args.get("next"))
     return redirect(next_url)
diff --git a/pythoncms/modules/box__default/page/templates/page/dashboard.html b/pythoncms/modules/box__default/page/templates/page/dashboard.html
index f322704..7d8254e 100644
--- a/pythoncms/modules/box__default/page/templates/page/dashboard.html
+++ b/pythoncms/modules/box__default/page/templates/page/dashboard.html
@@ -2,6 +2,7 @@
 
 {%block head%}
     <script src="{{url_for('static', filename='jquery_3.2.1.min.js')}}"></script>
+
 {%endblock%}
 {% block content %}
 <br>
@@ -40,17 +41,19 @@ <h3>New page</h3>
         </div>
     </div>
 </div>
-<script type="text/javascript" src="{{ url_for('static', filename='tinymce/tinymce.min.js') }}"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.3.1/tinymce.min.js" integrity="sha512-eV68QXP3t5Jbsf18jfqT8xclEJSGvSK5uClUuqayUbF5IRK8e2/VSXIFHzEoBnNcvLBkHngnnd3CY7AFpUhF7w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script type="text/javascript">
 tinymce.init({
     selector: '#content',
-    plugins: [
-        'advlist autolink link image imagetools lists charmap print preview hr anchor pagebreak spellchecker',
-        'searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking',
-        'save table contextmenu directionality template paste textcolor codesample'
-    ],
+    plugins: `advlist autolink link image imagetools lists
+                charmap print preview hr anchor pagebreak
+        searchreplace wordcount visualblocks visualchars code
+        fullscreen insertdatetime media nonbreaking
+        save table directionality template paste
+        codesample`
+    ,
     imagetools_toolbar: "rotateleft rotateright | flipv fliph | editimage imageoptions",
-    toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | print preview media fullpage | forecolor backcolor emoticons | codesample',
+    toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | print preview media fullpage | forecolor backcolor emoticons | codesample | table tabledelete | tableprops tablerowprops tablecellprops | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol',
     relative_urls: false,
     images_upload_url: "",
     image_title: true,
@@ -65,6 +68,7 @@ <h3>New page</h3>
         { text: 'Python', value: 'python' }
     ],
     width: "100%",
+    promotion: false
 });
 </script>
 <script type="text/javascript">
diff --git a/pythoncms/modules/box__default/page/templates/page/view_page_dashboard.html b/pythoncms/modules/box__default/page/templates/page/view_page_dashboard.html
index 70f90b9..02dacd5 100644
--- a/pythoncms/modules/box__default/page/templates/page/view_page_dashboard.html
+++ b/pythoncms/modules/box__default/page/templates/page/view_page_dashboard.html
@@ -2,6 +2,7 @@
 
 {%block head%}
     <script src="{{url_for('static', filename='jquery_3.2.1.min.js')}}"></script>
+
 {%endblock%}
 {% block content %}
 <br>
@@ -36,7 +37,7 @@
                 <div class="field">
                     {{ form.content.label }} <br>
                     <div class="input-group mb-3">
-                        <textarea class="form-control" name="content">{{ form.content }}</textarea>
+                        <textarea id="content" class="form-control" name="content">{{ form.content }}</textarea>
                     </div>
                 </div>
 
@@ -48,17 +49,19 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="{{ url_for('static', filename='tinymce/tinymce.min.js') }}"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.3.1/tinymce.min.js" integrity="sha512-eV68QXP3t5Jbsf18jfqT8xclEJSGvSK5uClUuqayUbF5IRK8e2/VSXIFHzEoBnNcvLBkHngnnd3CY7AFpUhF7w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script type="text/javascript">
 tinymce.init({
     selector: '#content',
-    plugins: [
-        'advlist autolink link image imagetools lists charmap print preview hr anchor pagebreak spellchecker',
-        'searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking',
-        'save table contextmenu directionality template paste textcolor codesample'
-    ],
+    plugins: `advlist autolink link image imagetools lists
+                charmap print preview hr anchor pagebreak
+        searchreplace wordcount visualblocks visualchars code
+        fullscreen insertdatetime media nonbreaking
+        save table directionality template paste
+        codesample`
+    ,
     imagetools_toolbar: "rotateleft rotateright | flipv fliph | editimage imageoptions",
-    toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | print preview media fullpage | forecolor backcolor emoticons | codesample',
+    toolbar: 'insertfile undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | print preview media fullpage | forecolor backcolor emoticons | codesample | table tabledelete | tableprops tablerowprops tablecellprops | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol',
     relative_urls: false,
     images_upload_url: "",
     image_title: true,
@@ -73,6 +76,7 @@
         { text: 'Python', value: 'python' }
     ],
     width: "100%",
+    promotion: false
 });
 </script>
 <script type="text/javascript">
diff --git a/pythoncms/static/themes/back/sneat/authbase.html b/pythoncms/static/themes/back/sneat/authbase.html
index a974826..2819317 100644
--- a/pythoncms/static/themes/back/sneat/authbase.html
+++ b/pythoncms/static/themes/back/sneat/authbase.html
@@ -69,7 +69,7 @@
                   <span class="app-brand-logo demo">
                     <img width=40 height=40 src="{{ url_for('static', filename='logo.svg') }}">
                   </span>
-                  <span class="app-brand-text demo text-body fw-bolder">PyCMS</span>
+                  <span class="app-brand-text demo text-body fw-bolder">PythonCMS</span>
                 </a>
               </div>
               {%block content%}
diff --git a/pythoncms/static/themes/back/sneat/base.html b/pythoncms/static/themes/back/sneat/base.html
index 97374e3..b95c1f3 100644
--- a/pythoncms/static/themes/back/sneat/base.html
+++ b/pythoncms/static/themes/back/sneat/base.html
@@ -82,7 +82,7 @@
               <span class="app-brand-logo demo">
                 <img width=40 height=40 src="{{ url_for('static', filename='logo.svg') }}">
               </span>
-              <span class="app-brand-text demo menu-text fw-bolder ms-2">PyCMS</span>
+              <span class="app-brand-text demo menu-text fw-bolder ms-2">PythonCMS</span>
             </a>
 
             <a href="javascript:void(0);" class="layout-menu-toggle menu-link text-large ms-auto d-block d-xl-none">
diff --git a/pythoncms/static/themes/back/sneat/login.html b/pythoncms/static/themes/back/sneat/login.html
index a5d3849..fbf714a 100644
--- a/pythoncms/static/themes/back/sneat/login.html
+++ b/pythoncms/static/themes/back/sneat/login.html
@@ -1,7 +1,7 @@
 {%extends 'sneat/authbase.html' %}
 
 {%block content%}
-<h4 class="mb-2">Welcome to PyCMS! 👋</h4>
+<h4 class="mb-2">Welcome to PythonCMS! 👋</h4>
               <p class="mb-4">Please sign-in to your account and start the adventure</p>
 
               <form id="formAuthentication" class="mb-3" action="{{url_for('auth.login')}}" method="POST">
diff --git a/pythoncms/static/themes/back/sneat/unconfirmed.html b/pythoncms/static/themes/back/sneat/unconfirmed.html
index de47bfc..0200810 100644
--- a/pythoncms/static/themes/back/sneat/unconfirmed.html
+++ b/pythoncms/static/themes/back/sneat/unconfirmed.html
@@ -1,7 +1,7 @@
 {%extends 'sneat/authbase.html' %}
 
 {%block content%}
-<h4 class="mb-2">Welcome to PyCMS! 👋</h4>
+<h4 class="mb-2">Welcome to PythonCMS! 👋</h4>
 <!-- <p class="mb-4">Please sign-in to your account and start the adventure</p> -->
 <div >
 
diff --git a/pythoncms/static/themes/front/editorial/base.html b/pythoncms/static/themes/front/editorial/base.html
index 32510e1..0d798da 100644
--- a/pythoncms/static/themes/front/editorial/base.html
+++ b/pythoncms/static/themes/front/editorial/base.html
@@ -9,6 +9,7 @@
 		<title>Editorial by HTML5 UP</title>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1/css/all.min.css" integrity="sha512-MV7K8+y+gLIBoVD59lQIYicR65iaqukzvf/nwasF0nqhPay5w/9lJmVM2hMDcnK1OnMGCdVK+iQrJ7lzPJQd1w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 		<link rel="stylesheet" href="{{url_for('static', filename='themes/front/editorial/assets/css/main.css')}}" />
 	</head>
 	<body class="is-preload">
diff --git a/pythoncms/static/themes/front/editorial/page.html b/pythoncms/static/themes/front/editorial/page.html
index 3d357ff..9e4a49f 100644
--- a/pythoncms/static/themes/front/editorial/page.html
+++ b/pythoncms/static/themes/front/editorial/page.html
@@ -28,7 +28,7 @@
 									<h1>{{page.title}}</h1>
 								</header>
 
-								<p>{{page.get_content()}}</p>
+								<p>{{page.get_content() | safe}}</p>
 
 							</section>