Bläddra i källkod

topic list Golang 이전

잉여개발기 (SPDV) 3 månader sedan
förälder
incheckning
d227c03c76
5 ändrade filer med 4 tillägg och 133 borttagningar
  1. 4 2
      app.py
  2. 0 2
      route/__init__.py
  3. 0 13
      route/n_topic_list.py
  4. 0 45
      route/topic_list.py
  5. 0 71
      views/main_css/js/route/topic_list.js

+ 4 - 2
app.py

@@ -752,8 +752,10 @@ app.route('/move/<everything:name>', methods = ['POST', 'GET'])(edit_move)
 app.route('/move_all')(edit_move_all)
 
 # Func-topic
-app.route('/topic/<everything:name>', methods = ['POST', 'GET'])(topic_list)
-app.route('/topic_page/<int:page>/<everything:name>', methods = ['POST', 'GET'])(topic_list)
+app.route('/topic/<everything:name>')(golang_view())
+app.route('/topic_page/<int:page>/<everything:name>')(golang_view())
+app.route('/topic_close/<int:page>/<everything:name>')(golang_view())
+app.route('/topic_agree/<int:page>/<everything:name>')(golang_view())
 
 app.route('/thread/<int:topic_num>', methods = ['POST', 'GET'])(topic)
 app.route('/thread/0/<everything:doc_name>', defaults = { 'topic_num' : '0' }, methods = ['POST', 'GET'])(topic)

+ 0 - 2
route/__init__.py

@@ -149,8 +149,6 @@ from route.vote_select import vote_select
 
 from route.n_list_user_check_submit import list_user_check_submit
 
-from route.n_topic_list import topic_list
-
 from route.n_give_auth import give_auth
 
 from route.n_bbs_w_set import bbs_w_set

+ 0 - 13
route/n_topic_list.py

@@ -1,13 +0,0 @@
-from .tool.func import *
-
-async def topic_list(page = 1, name = 'Test'):
-    return await render_template(
-        name,
-        '' + \
-            '<div id="opennamu_topic_list"></div>' + \
-            '<script defer src="/views/main_css/js/route/topic_list.js' + cache_v() + '"></script>' + \
-            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_topic_list(); });</script>' + \
-        '',
-        '(' + await get_lang('discussion_list') + ')',
-        [['w/' + url_pas(name), await get_lang('document')]]
-    )

+ 0 - 45
route/topic_list.py

@@ -1,45 +0,0 @@
-from .tool.func import *
-
-async def topic_list(name = 'Test'):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        div = ''
-        tool = flask.request.args.get('tool', '')
-
-        plus = ''
-        menu = [['topic/' + url_pas(name), await get_lang('return')]]
-
-        if tool == 'close':
-            curs.execute(db_change("select code, sub from rd where title = ? and stop = 'O' order by sub asc"), [name])
-
-            sub = await get_lang('closed_discussion')
-        elif tool == 'agree':
-            curs.execute(db_change("select code, sub from rd where title = ? and agree = 'O' order by sub asc"), [name])
-
-            sub = await get_lang('agreed_discussion')
-        else:
-            sub = await get_lang('discussion_list')
-            menu = [['w/' + url_pas(name), await get_lang('document')]]
-
-            plus = '''
-                <a href="/topic/''' + url_pas(name) + '?tool=close">(' + await get_lang('closed_discussion') + ''')</a>
-                <a href="/topic/''' + url_pas(name) + '?tool=agree">(' + await get_lang('agreed_discussion') + ''')</a>
-                <hr class="main_hr">
-                <a href="/thread/0/''' + url_pas(name) + '''">(''' + await get_lang('make_new_topic') + ''')</a>
-            '''
-
-            curs.execute(db_change("select code, sub from rd where title = ? and stop != 'O' order by date desc"), [name])
-
-        for data in curs.fetchall():
-            div += '<h2><a href="/thread/' + data[0] + '">' + data[0] + '. ' + html.escape(data[1]) + '</a></h2>'
-
-        if div == '':
-            plus = re.sub(r'^<br>', '', plus)
-
-        return await render_template(
-            name,
-            div + plus,
-            '(' + sub + ')',
-            menu
-        )

+ 0 - 71
views/main_css/js/route/topic_list.js

@@ -1,71 +0,0 @@
-"use strict";
-
-function opennamu_topic_list() {
-    const url = window.location.pathname;
-    const url_split = url.split('/');
-
-    let num;
-    if(url_split[1] === 'topic') {
-        num = '1';
-    } else {
-        num = url_split[2];
-    }
-    
-    let doc_name;
-    if(url_split[1] === 'topic') {
-        doc_name = url_split.slice(2, undefined).join('/');
-    } else {
-        doc_name = url_split.slice(3, undefined).join('/');
-    }
-
-    let lang_data = new FormData();
-    lang_data.append('data', 'closed stop agreed_discussion make_new_topic');
-
-    fetch('/api/v2/lang', {
-        method : 'POST',
-        body : lang_data,
-    }).then(function(res) {
-        return res.json();
-    }).then(function(lang) {
-        lang = lang["data"];
-
-        fetch('/api/v2/topic/' + num + '/normal/' + doc_name).then(function(res) {
-            return res.json();
-        }).then(function(data) {
-            data = data['data'];
-
-            let data_html = '';
-
-            for(let for_a = 0; for_a < data.length; for_a++) {
-                let left = '<a href="/thread/' + data[for_a][0] + '">' + opennamu_xss_filter(data[for_a][1]) + '</a>';
-                
-                let right = '';
-                if(data[for_a][2] === 'O') {
-                    right += lang['closed'] + ' | ';
-                } else if(data[for_a][2] === 'S') {
-                    right += lang['stop'] + ' | ';
-                }
-
-                if(data[for_a][3] !== '') {
-                    right += lang['agreed_discussion'] + ' | ';
-                }
-
-                right += '<a href="/thread/' + data[for_a][0] + '#' + data[for_a][7] + '">#' + data[for_a][7] + '</a> | ';
-                right += data[for_a][5] + ' | ';
-                right += data[for_a][6];
-
-                data_html += opennamu_make_list(left, right);
-            }
-
-            if(data_html !== '') {
-                data_html += '<hr class="main_hr">';
-            }
-
-            data_html += '<a href="/thread/0/' + doc_name + '">(' + lang['make_new_topic'] + ')</a>';
-
-            data_html += opennamu_page_control('/topic_page/{}/normal/' + doc_name, Number(num), data.length);
-
-            document.getElementById('opennamu_topic_list').innerHTML = data_html;
-        });
-    });
-}