Updating to new server configuration. Test 1

2024-04-28 22:47:52 +01:00
parent 4d2770d003
commit 35804fb276
11 changed files with 16583 additions and 5948 deletions
--- a/pycache/app.cpython-311.pyc
+++ b/pycache/app.cpython-311.pyc
--- a/pycache/config.cpython-311.pyc
+++ b/pycache/config.cpython-311.pyc
--- a/pycache/forms.cpython-311.pyc
+++ b/pycache/forms.cpython-311.pyc
--- a/app.py
+++ b/app.py
@@ -42,6 +42,7 @@ import stripe
 import json
 from dotenv import load_dotenv, find_dotenv
 import os
+import sys
 from urllib.parse import quote_plus, urlencode
 from authlib.integrations.flask_client import OAuth
 import jwt
@@ -92,6 +93,15 @@ mail = Mail(app)


 # METHODS
+sys.path.insert(0, os.path.dirname(__file__))
+
+
+def application(environ, start_response):
+    start_response('200 OK', [('Content-Type', 'text/plain')])
+    message = 'It works!\n'
+    version = 'Python %s\n' % sys.version.split()[0]
+    response = '\n'.join([message, version])
+    return [response.encode()]


 # ROUTING
@@ -116,6 +126,7 @@ def contact():
    return render_template('_page_contact.html', model=Model_View_Contact(db, get_info_user(), app, form))

@app.route('/services', methods=['GET', 'POST'])
+@app.route('/public_html/services', methods=['GET', 'POST'])
 def services():
    return render_template('_page_services.html', model=Model_View_Home(db, get_info_user(), app))

@@ -672,6 +683,31 @@ def send_email():
    return "<html>Email sent</html>"
 """

+"""
+@app.route('/test-mysql', methods=['GET'])
+def test_mysql():
+    model = Model_View_Store(db, get_info_user(), app)
+    
+     _m = 'test_mysql'
+    proc_string = f'CALL {proc_name}('
+    if has_arguments:
+        arg_keys = list(argument_dict_list.keys())
+        for i in range(len(arg_keys)):
+            proc_string += f'{"" if i == 0 else ", "}:{arg_keys[i]}'
+    proc_string += ')'
+    proc_string = text(proc_string)
+    print(f'{_m}\nproc_string: {proc_string}\nargs: {argument_dict_list}')
+    # with self.db.session.begin() as session:
+    if has_arguments:
+        result = self.db.session.execute(proc_string, argument_dict_list)
+    else:
+        result = self.db.session.execute(proc_string)
+    print(f'result: {result}')
+
+    return "<html>MySQL test</html>"
+"""
+
+
 # Onload
 if __name__ == '__main__':
    # app.run()
--- a/models/pycache/model_view_base.cpython-311.pyc
+++ b/models/pycache/model_view_base.cpython-311.pyc
--- a/models/pycache/model_view_contact.cpython-311.pyc
+++ b/models/pycache/model_view_contact.cpython-311.pyc
--- a/passenger_wsgi.py
+++ b/passenger_wsgi.py
@@ -0,0 +1,13 @@
+import os
+import sys
+
+
+sys.path.insert(0, os.path.dirname(__file__))
+
+
+def application(environ, start_response):
+    start_response('200 OK', [('Content-Type', 'text/plain')])
+    message = 'It works!\n'
+    version = 'Python %s\n' % sys.version.split()[0]
+    response = '\n'.join([message, version])
+    return [response.encode()]
--- a/static/batch/sql_combine.bat
+++ b/static/batch/sql_combine.bat
@@ -16,7 +16,8 @@ set "strs_delete_4=%f_tmp%"
 set "strs_delete_5=701_p_shop_get_many_role_permission.sql"
 set "strs_delete_6=600_p_shop_save_product.sql"
 set "strs_delete_7=170_ish_tbl_ERP_Order.sql"
-set strs_n_max=7
+set "strs_delete_7=dump.sql"
+set strs_n_max=8
 set strs_list =%strs_delete_0% %strs_delete_1% %strs_delete_2% %strs_delete_3% %strs_delete_4% 
 set "str_true=true"
 set "str_replace="
--- a/static/sql/000_combine.sql
+++ b/static/sql/000_combine.sql
--- a/static/sql/dump.sql
+++ b/static/sql/dump.sql
--- a/static/sql/dump2.sql
+++ b/static/sql/dump2.sql