فهرست منبع

링고 개편

https://github.com/openNAMU/openNAMU/issues/2361
잉여개발기 (SPDV) 1 سال پیش
والد
کامیت
1e0c036d37
7فایلهای تغییر یافته به همراه53 افزوده شده و 57 حذف شده
  1. 1 5
      views/ringo/css/main.css
  2. 6 7
      views/ringo/index.html
  3. 2 2
      views/ringo/info.json
  4. 5 3
      views/ringo/js/main.js
  5. 35 40
      views/ringo/js/sidebar.js
  6. 2 0
      views/ringo/js/skin_set.js
  7. 2 0
      views/ringo/js/skin_set_do.js

+ 1 - 5
views/ringo/css/main.css

@@ -214,7 +214,7 @@ aside {
 }
 
 aside button {
-    width: 25%;
+    width: 33.33%;
 }
 
 aside .side_button {
@@ -238,10 +238,6 @@ aside .side_button:hover {
     border-right: 0;
 }
 
-#side_button_3 {
-    border-right: 0;
-}
-
 #side_content {
     margin-top: 20px;
 }

+ 6 - 7
views/ringo/index.html

@@ -2,7 +2,7 @@
 <html lang="{{'language_tag'|load_lang}}">
     <head>
         <style id="ringo_add_style"></style>
-        <script src="/views/ringo/js/skin_set_do.js.cache_v2"></script>
+        <script src="/views/ringo/js/skin_set_do.js.cache_v3"></script>
         <meta charset="utf-8">
         {% if imp[3][0] != 0 %}
             <title>{{imp[0]}} {{imp[3][0]}} - {{imp[1][0]}}</title>
@@ -12,10 +12,10 @@
         {{imp[3][3]|safe}}
         <link href="https://cdn.jsdelivr.net/gh/sun-typeface/SUIT/fonts/static/woff2/SUIT.css" rel="stylesheet">
         <script defer src="https://code.iconify.design/1/1.0.3/iconify.min.js"></script>
-        <script defer src="/views/ringo/js/main.js.cache_v2"></script>
-        <script defer src="/views/ringo/js/sidebar.js.cache_v4"></script>
-        <script defer src="/views/ringo/js/skin_set.js.cache_v7"></script>
-        <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v11">
+        <script defer src="/views/ringo/js/main.js.cache_v3"></script>
+        <script defer src="/views/ringo/js/sidebar.js.cache_v5"></script>
+        <script defer src="/views/ringo/js/skin_set.js.cache_v8"></script>
+        <link rel="stylesheet" href="/views/ringo/css/main.css.cache_v12">
         {% if request.cookies.get('main_css_darkmode', '') == '1' %}
             {{imp[3][5]|safe}}
             <link rel="stylesheet" href="/views/ringo/css/dark.css.cache_v3">
@@ -236,8 +236,7 @@
             {% if imp[1][7][1] == '' %}
                 <button id="side_button_1" class="side_button selected">{{'edit'|load_lang}}</button><!--
              --><button id="side_button_2" class="side_button">{{'discussion'|load_lang}}</button><!--
-             --><button id="side_button_3" class="side_button">{{'toc'|load_lang}}</button><!--
-             --><button id="side_button_4" class="side_button">{{'footnote'|load_lang}}</button>
+             --><button id="side_button_3" class="side_button">{{'bbs'|load_lang}}</button>
                 <div id="side_content">
                     Loading...
                 </div>

+ 2 - 2
views/ringo/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Ringo",
-    "skin_ver" : "v1.1.7",
-    "require_ver" : "3500113"
+    "skin_ver" : "v1.1.8",
+    "require_ver" : "20240426"
 }

+ 5 - 3
views/ringo/js/main.js

@@ -1,3 +1,5 @@
+"use strict";
+
 let ringo_save_data = '';
 let ringo_open = 0;
 let ringo_menu_list = [
@@ -10,7 +12,7 @@ let ringo_menu_list = [
 function ringo_opening(data) {
     let element = [data];
     
-    for(for_a in ringo_menu_list) {
+    for(let for_a in ringo_menu_list) {
         if(ringo_menu_list[for_a] + '_in' !== data) {
             element.push(ringo_menu_list[for_a] + '_in');
         }
@@ -19,7 +21,7 @@ function ringo_opening(data) {
     if((document.getElementById(element[0]).style.display === 'none' && ringo_open === 0) || ringo_save_data !== data) {
         document.getElementById(element[0]).style.display = 'block';
 
-        for(for_a in element) {
+        for(let for_a in element) {
             if(for_a !== '0') { 
                 if(document.getElementById(element[for_a]) !== null) {
                     document.getElementById(element[for_a]).style.display = 'none';
@@ -40,7 +42,7 @@ function ringo_opening(data) {
 
 document.addEventListener("click", function() {
     let cel_list = [];
-    for(for_a in ringo_menu_list) {
+    for(let for_a in ringo_menu_list) {
         cel_list.push(document.getElementById(ringo_menu_list[for_a]));
     }
 

+ 35 - 40
views/ringo/js/sidebar.js

@@ -1,3 +1,5 @@
+"use strict";
+
 // func
 function ringo_do_xss_encode(data) {
     data = data.replace(/'/g, '&#x27;');
@@ -14,10 +16,10 @@ function ringo_do_url_encode(data) {
 
 // event
 function ringo_do_side_button_1() {
-    fetch("/api/recent_change/10").then(function(res) {
-        return res.json();
-    }).then(function(text) {
-        if(temp_save[0] === '') {
+    if(temp_save[0] === '') {
+        fetch("/api/recent_change/10").then(function(res) {
+            return res.json();
+        }).then(function(text) {
             let data = '';
             for(let for_a = 0; for_a < text.length; for_a++) {
                 if(text[for_a][6] === '') {
@@ -28,19 +30,19 @@ function ringo_do_side_button_1() {
 
             document.getElementById('side_content').innerHTML = data;
             temp_save[0] = data;
-        } else {
-            document.getElementById('side_content').innerHTML = temp_save[0];
-        }
-    }).catch(function(error) {
-        document.getElementById('side_content').innerHTML = 'Error';
-    });
+        }).catch(function(error) {
+            document.getElementById('side_content').innerHTML = 'Error';
+        });
+    } else {
+        document.getElementById('side_content').innerHTML = temp_save[0];
+    }
 }
 
 function ringo_do_side_button_2() {
-    fetch("/api/recent_discuss/10").then(function(res) {
-        return res.json();
-    }).then(function(text) {
-        if(temp_save[1] === '') {
+    if(temp_save[1] === '') {
+        fetch("/api/recent_discuss/10").then(function(res) {
+            return res.json();
+        }).then(function(text) {
             let data = '';
             for(let for_a = 0; for_a < text.length; for_a++) {
                 data += '<a href="/thread/' + ringo_do_url_encode(text[for_a][3]) + '">' + ringo_do_xss_encode(text[for_a][1]) + '</a><br>';
@@ -49,50 +51,43 @@ function ringo_do_side_button_2() {
 
             document.getElementById('side_content').innerHTML = data;
             temp_save[1] = data;
-        } else {
-            document.getElementById('side_content').innerHTML = temp_save[1];
-        }
-    }).catch(function(error) {
-        document.getElementById('side_content').innerHTML = 'Error';
-    });
+        }).catch(function(error) {
+            document.getElementById('side_content').innerHTML = 'Error';
+        });
+    } else {
+        document.getElementById('side_content').innerHTML = temp_save[1];
+    }
 }
 
 function ringo_do_side_button_3() {
     if(temp_save[2] === '') {
-        if(document.getElementsByClassName('opennamu_TOC').length > 0) {
-            temp_save[2] = document.getElementsByClassName('opennamu_TOC')[0].innerHTML;
-            document.getElementById('side_content').innerHTML = temp_save[2];
-        }
-    } else {
-        document.getElementById('side_content').innerHTML = temp_save[2];
-    }
-}
+        fetch("/api/v2/bbs/main").then(function(res) {
+            return res.json();
+        }).then(function(data) {
+            let end_data = '';
 
-function ringo_do_side_button_4() {
-    if(temp_save[3] === '') {
-        if(document.getElementsByClassName('opennamu_footnote').length > 0) {
-            let data = '';
-            for(let for_a = 0; for_a < document.getElementsByClassName('opennamu_footnote').length; for_a++) {
-                data += document.getElementsByClassName('opennamu_footnote')[for_a].innerHTML + '<br>';
+            let text = data['data'];
+            for(let for_a = 0; for_a < text.length; for_a++) {
+                end_data += '<a href="/bbs/w/' + text[for_a].set_id + '/' + text[for_a].set_code + '">' + ringo_do_xss_encode(text[for_a].title) + '</a><br>';
+                end_data += text[for_a].date + ' | ' + text[for_a].user_id +'<br>';
             }
 
-            document.getElementById('side_content').innerHTML = data;
-            temp_save[3] = data;
-        }
+            document.getElementById('side_content').innerHTML = end_data;
+            temp_save[2] = end_data;
+        });
     } else {
-        document.getElementById('side_content').innerHTML = temp_save[3];
+        document.getElementById('side_content').innerHTML = temp_save[2];
     }
 }
 
 // init
-let temp_save = ['', '', '', ''];
+let temp_save = ['', '', ''];
 
 window.addEventListener('DOMContentLoaded', function() {
     if(document.getElementById("side_button_1")) {
         document.getElementById("side_button_1").addEventListener("click", ringo_do_side_button_1);
         document.getElementById("side_button_2").addEventListener("click", ringo_do_side_button_2);
         document.getElementById("side_button_3").addEventListener("click", ringo_do_side_button_3);
-        document.getElementById("side_button_4").addEventListener("click", ringo_do_side_button_4);
 
         ringo_do_side_button_1();
     }

+ 2 - 0
views/ringo/js/skin_set.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function ringo_do_regex_data(data) {
     return new RegExp('(?:^|; )' + data + '=([^;]*)');
 }

+ 2 - 0
views/ringo/js/skin_set_do.js

@@ -1,3 +1,5 @@
+"use strict";
+
 function ringo_do_regex_data(data) {
     return new RegExp('(?:^|; )' + data + '=([^;]*)');
 }