TS 폐지 및 API 통폐합

app.py

@@ -663,13 +663,10 @@ app.route('/bbs/edit/<int:bbs_num>/<int:post_num>/<comment_num>', methods = ['PO
 app.route('/bbs/delete/<int:bbs_num>/<int:post_num>/<comment_num>', methods = ['POST', 'GET'])(bbs_w_delete)
 
 # Func-api
-# 폐지 예정
-app.route('/api/w_tool/<tool>/<everything:name>', methods = ['GET', 'POST'])(api_w)
-
 # app.route('/api/render_tool/<tool>/<everything:name>', methods = ['POST'])(api_w_render)
 # app.route('/api/render_tool/<tool>', methods = ['POST'])(api_w_render)
-# app.route('/api/render/<everything:name>', methods = ['POST'])(api_w_render)
-# app.route('/api/render', methods = ['POST'])(api_w_render)
+app.route('/api/render/<everything:name>', methods = ['POST'])(api_w_render)
+app.route('/api/render', methods = ['POST'])(api_w_render)
 
 app.route('/api/raw_exist/<everything:name>', defaults = { 'exist_check' : 'on' })(api_w_raw)
 app.route('/api/raw_rev/<int(signed = True):rev>/<everything:name>')(api_w_raw)

route/__init__.py

@@ -9,7 +9,7 @@ from route.api_skin_info import api_skin_info
 from route.api_topic import api_topic
 from route.api_user_info import api_user_info
 from route.api_version import api_version
-from route.api_w import api_w
+from route.api_w_render import api_w_render
 from route.api_bbs_w_post import api_bbs_w_post
 from route.api_bbs_w_comment import api_bbs_w_comment
 from route.api_bbs_w_comment_one import api_bbs_w_comment_one

route/api_w.py

@@ -1,101 +0,0 @@
-from .tool.func import *
-
-def api_w(name = 'Test', tool = '', rev = ''):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        if flask.request.method == 'POST':
-            if tool == '' or tool == 'preview':
-                # data_in 말고 data_use_type이랑 data_use_num 추가 예정
-                data_org = flask.request.form.get('data', '')
-                data_pas = render_set(
-                    doc_name = name, 
-                    doc_data = data_org, 
-                    data_type = 'api_view'
-                )
-
-                return flask.jsonify({
-                    "data" : data_pas[0], 
-                    "js_data" : data_pas[1]
-                })
-            elif tool == 'include':
-                name_org = flask.request.form.get('name_org', '')
-                name_org = name if name_org == '' else name_org
-
-                include_data = flask.request.form.get('name_include', '')
-
-                try:
-                    include_list = json.loads(flask.request.form.get('include_list', ''))
-                except:
-                    include_list = []
-
-                curs.execute(db_change("select data from data where title = ?"), [name])
-                sql_data = curs.fetchall()
-                if not sql_data:
-                    return flask.jsonify({})
-                else:
-                    json_data = sql_data[0][0]
-
-                    get_all_change_1 = []
-                    find_replace_moment = re.findall(r'(@([^=@]+)=([^=@]+)@|@([^=@]+)@)', json_data)
-                    for i in find_replace_moment:
-                        if i[1] != '':
-                            get_all_change_1 += [[i[1], i[2]]]
-
-                            json_data = json_data.replace(i[0], '@' + i[1] + '@', 1)
-                        else:
-                            json_data = json_data.replace(i[0], '@' + i[3] + '@', 1)
-
-                    get_all_change_2 = include_list + get_all_change_1
-                    for i in get_all_change_2:
-                        json_data = json_data.replace('@' + i[0] + '@', i[1])
-
-                    data_pas = render_set(
-                        doc_name = name_org, 
-                        doc_data = json_data, 
-                        data_type = 'api_view',
-                        data_in = include_data
-                    )
-
-                    return flask.jsonify({
-                        "data" : data_pas[0], 
-                        "js_data" : data_pas[1]
-                    })
-            elif tool == 'exist':
-                try:
-                    title_list = json.loads(flask.request.form.get('title_list', ''))
-                    title_list = list(set(title_list))
-                except:
-                    title_list = [name]
-
-                data_exist = {}
-                for i in title_list:
-                    curs.execute(db_change("select title from data where title = ?"), [i])
-                    if curs.fetchall():
-                        data_exist[i] = '1'
-
-                return flask.jsonify(data_exist)
-
-            return flask.jsonify({})
-        else:
-            if tool == '' or tool == 'view':
-                if acl_check(name, 'render') != 1:
-                    if number_check(rev) == '':
-                        curs.execute(db_change("select data from data where title = ?"), [name])
-                    else:
-                        curs.execute(db_change("select data from history where title = ? and id = ?"), [name, rev])
-
-                    sql_data = curs.fetchall()
-                    if sql_data:
-                        data_pas = render_set(
-                            doc_name = name, 
-                            doc_data = sql_data[0][0], 
-                            data_type = 'api_view'
-                        )
-
-                        return flask.jsonify({
-                            "data" : data_pas[0], 
-                            "js_data" : data_pas[1]
-                        })
-
-            return flask.jsonify({})

route/api_w_render.py

@@ -0,0 +1,20 @@
+from .tool.func import *
+
+def api_w_render(name = ''):
+    with get_db_connect() as conn:
+        curs = conn.cursor()
+
+        if flask.request.method == 'POST':
+            data_org = flask.request.form.get('data', '')
+            data_pas = render_set(
+                doc_name = name, 
+                doc_data = data_org, 
+                data_type = 'api_view'
+            )
+
+            return flask.jsonify({
+                "data" : data_pas[0], 
+                "js_data" : data_pas[1]
+            })
+        else:
+            return ''

views/main_css/js/route/bbs_w_post.js

@@ -1,15 +1,14 @@
 function opennamu_change_comment(get_id) {
-    var _a;
-    var input = document.querySelector('#opennamu_comment_select');
-    if (input !== null) {
+    const input = document.querySelector('#opennamu_comment_select');
+    if(input !== null) {
         input.value = get_id;
-        (_a = document.getElementById('opennamu_edit_textarea')) === null || _a === void 0 ? void 0 : _a.focus();
+        document.getElementById('opennamu_edit_textarea')?.focus();
     }
 }
+
 function opennamu_return_comment() {
-    var _a;
-    var input = document.querySelector('#opennamu_comment_select');
-    if (input !== null) {
-        (_a = document.getElementById(input.value)) === null || _a === void 0 ? void 0 : _a.focus();
+    const input = document.querySelector('#opennamu_comment_select');
+    if(input !== null) {
+        document.getElementById(input.value)?.focus();
     }
-}
+}

views/main_css/js/route/bbs_w_post.ts

@@ -1,14 +0,0 @@
-function opennamu_change_comment(get_id : string): void {
-    const input = document.querySelector('#opennamu_comment_select') as HTMLInputElement | null;
-    if(input !== null) {
-        input.value = get_id;
-        document.getElementById('opennamu_edit_textarea')?.focus();
-    }
-}
-
-function opennamu_return_comment(): void {
-    const input = document.querySelector('#opennamu_comment_select') as HTMLInputElement | null;
-    if(input !== null) {
-        document.getElementById(input.value)?.focus();
-    }
-}

views/main_css/js/route/editor_sub.js

@@ -1,43 +1,50 @@
 function opennamu_do_editor_preview() {
     do_sync_monaco_and_textarea();
-    var input = document.querySelector('#opennamu_edit_textarea');
-    if (input !== null) {
-        var doc_name = 'test';
-        var doc_name_input = document.querySelector('#opennamu_editor_doc_name');
-        if (doc_name_input !== null) {
+
+    const input = document.querySelector('#opennamu_edit_textarea');
+    if(input !== null) {
+        let doc_name = 'test';
+
+        const doc_name_input = document.querySelector('#opennamu_editor_doc_name');
+        if(doc_name_input !== null) {
             doc_name = doc_name_input.value;
         }
-        fetch("/api/w_tool/preview/" + (opennamu_do_url_encode(doc_name)), {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body: new URLSearchParams({
+
+        fetch("/api/render/" + (opennamu_do_url_encode(doc_name)), {
+            method : 'POST',
+            headers : { 'Content-Type': 'application/x-www-form-urlencoded' },
+            body : new URLSearchParams({
                 'data': input.value,
             })
-        }).then(function (res) {
+        }).then(function(res) {
             return res.json();
-        }).then(function (text) {
-            var preview = document.querySelector('#opennamu_preview_area');
-            if (preview !== null) {
+        }).then(function(text) {
+            const preview = document.querySelector('#opennamu_preview_area');
+            if(preview !== null) {
                 preview.innerHTML = text.data;
                 eval(text.js_data);
             }
         });
     }
 }
+
 function opennamu_do_editor_temp_save() {
     do_sync_monaco_and_textarea();
-    var input = document.querySelector('#opennamu_edit_textarea');
-    if (input !== null) {
+
+    const input = document.querySelector('#opennamu_edit_textarea');
+    if(input !== null) {
         localStorage.setItem("key", input.value);
     }
 }
+
 function opennamu_do_editor_temp_save_load() {
-    var data = localStorage.getItem("key");
-    if (data !== null) {
-        var input = document.querySelector('#opennamu_edit_textarea');
-        if (input !== null) {
+    const data = localStorage.getItem("key");
+    if(data !== null) {
+        const input = document.querySelector('#opennamu_edit_textarea');
+        if(input !== null) {
             input.value = data;
         }
+        
         do_textarea_to_manaco();
     }
-}
+}

views/main_css/js/route/editor_sub.ts

@@ -1,58 +0,0 @@
-declare function opennamu_do_url_encode(data : any) : string;
-declare function do_sync_monaco_and_textarea();
-declare function do_textarea_to_manaco();
-
-interface Window {
-    editor? : any;
-}
-
-function opennamu_do_editor_preview() {
-    do_sync_monaco_and_textarea();
-
-    const input = document.querySelector('#opennamu_edit_textarea') as HTMLInputElement | null;
-    if(input !== null) {
-        let doc_name : string = 'test';
-
-        const doc_name_input = document.querySelector('#opennamu_editor_doc_name') as HTMLInputElement | null;
-        if(doc_name_input !== null) {
-            doc_name = doc_name_input.value;
-        }
-
-        fetch("/api/w_tool/preview/" + (opennamu_do_url_encode(doc_name)), {
-            method : 'POST',
-            headers : { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body : new URLSearchParams({
-                'data': input.value,
-            })
-        }).then(function(res) {
-            return res.json();
-        }).then(function(text) {
-            const preview = document.querySelector('#opennamu_preview_area') as HTMLInputElement | null;
-            if(preview !== null) {
-                preview.innerHTML = text.data;
-                eval(text.js_data);
-            }
-        });
-    }
-}
-
-function opennamu_do_editor_temp_save() {
-    do_sync_monaco_and_textarea();
-
-    const input = document.querySelector('#opennamu_edit_textarea') as HTMLInputElement | null;
-    if(input !== null) {
-        localStorage.setItem("key", input.value);
-    }
-}
-
-function opennamu_do_editor_temp_save_load() {
-    const data = localStorage.getItem("key");
-    if(data !== null) {
-        const input = document.querySelector('#opennamu_edit_textarea') as HTMLInputElement | null;
-        if(input !== null) {
-            input.value = data;
-        }
-        
-        do_textarea_to_manaco();
-    }
-}

views/main_css/js/route/topic.js

@@ -1,11 +1,14 @@
 function opennamu_do_remove_blind_thread() {
-    var style = document.querySelector('#opennamu_remove_blind');
-    if (style !== null) {
-        if (style.innerHTML !== "") {
+    const style = document.querySelector('#opennamu_remove_blind');
+    if(style !== null) {
+        if(style.innerHTML !== "") {
             style.innerHTML = '';
-        }
-        else {
-            style.innerHTML = "\n                .opennamu_comment_blind_js {\n                    display: none;\n                }\n            ";
+        } else {
+            style.innerHTML = `
+                .opennamu_comment_blind_js {
+                    display: none;
+                }
+            `;
         }
     }
-}
+}

views/main_css/js/route/topic.ts

@@ -1,14 +0,0 @@
-function opennamu_do_remove_blind_thread() {
-    const style = document.querySelector('#opennamu_remove_blind') as HTMLInputElement | null;
-    if(style !== null) {
-        if(style.innerHTML !== "") {
-            style.innerHTML = '';
-        } else {
-            style.innerHTML = `
-                .opennamu_comment_blind_js {
-                    display: none;
-                }
-            `;
-        }
-    }
-}