area in top, fix docker file

BennyThink · BennyThink · commit 724d264708d7 · 2021-02-08T15:26:55.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.8-alpine as builder
 
-RUN apk update && apk add  --no-cache tzdata ca-certificates alpine-sdk libressl-dev libffi-dev
+RUN apk update && apk add  --no-cache tzdata ca-certificates alpine-sdk libressl-dev libffi-dev cargo
+
 COPY requirements.txt /requirements.txt
 RUN pip3 install  --user -r /requirements.txt && rm /requirements.txt
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
-requests
+requests==2.24.0
 pytelegrambotapi==3.7.6
-beautifulsoup4
+beautifulsoup4==4.9.1
 tgbot-ping
-redis
-apscheduler
-pymongo
-tornado
-cryptography
+redis==3.5.3
+apscheduler==3.6.3
+pymongo==3.11.2
+tornado==6.0.4
+cryptography==3.4.1
diff --git a/web/index.html b/web/index.html
@@ -53,7 +53,44 @@
         /*a:hover::after {*/
         /*    display: block;*/
         /*}*/
+        /* Style the tab */
+        .tab {
+            overflow: hidden;
+            border: 1px solid #ccc;
 
+            /*background-color: #f1f1f1;*/
+        }
+
+        /* Style the buttons inside the tab */
+        .tab button {
+            text-align: center;
+            background-color: inherit;
+            float: inherit;
+            border: none;
+            outline: none;
+            cursor: pointer;
+            padding: 14px 16px;
+            transition: 0.3s;
+            font-size: 17px;
+        }
+
+        /* Change background color of buttons on hover */
+        .tab button:hover {
+            background-color: #ddd;
+        }
+
+        /* Create an active/current tablink class */
+        .tab button.active {
+            background-color: #ccc;
+        }
+
+        /* Style the tab content */
+        .tabcontent {
+            display: none;
+            padding: 6px 12px;
+            border: 1px solid #ccc;
+            border-top: none;
+        }
     </style>
 </head>
 <body>
@@ -71,11 +108,23 @@ <h2>本站数据库<b><a style="text-decoration: none;color: skyblue" href="http
         </label>
         <input type="submit" value="搜索">
     </form>
-    <hr>
+    <br>
     <div id="tv">
         <h2>大家都在看……</h2>
+        <div class="tab">
+            <button class="tablinks" onclick="openCity(event, 'US')">美剧</button>
+            <button class="tablinks" onclick="openCity(event, 'JP')">日剧</button>
+        </div>
+
+
+        <div id="US" class="tabcontent">
+        </div>
+
+        <div id="JP" class="tabcontent">
+        </div>
+
     </div>
-    <hr>
+
     <h2>相关资源</h2>
     <h3>
         联系我 <a style="text-decoration: none;color: green" href="https://t.me/BennyThink">Benny 小可爱</a>・
@@ -107,19 +156,43 @@ <h3>
 
     function showTop(data) {
 
-        let div = document.getElementById("tv");
         for (let i = 0; i < data.length; i++) {
             let info = data[i].data.info
+            console.log(info.area)
+            let div = HTMLElement
+
+            if (info.area === "美国") {
+                div = document.getElementById("US");
+            } else if (info.area === "日本") {
+                div = document.getElementById("JP");
+            }
             let name = `${info.cnname} ${info.enname} ${info.aliasname}`;
             let html = `<h4><a title="浏览量 ${info.views}" style="text-decoration: none;color: cornflowerblue" href="/resource.html?id=${info.id}">${name}</a></h4>`;
             let backup = div.innerHTML;
             div.innerHTML = backup + html;
 
         }
-
+        a = document.getElementById("US");
+        document.getElementsByClassName("tab")[0].firstElementChild.className += " active"
+        a.style.display = "block"
     }
 
     accessMetrics();
 
+    function openCity(evt, cityName) {
+        var i, tabcontent, tablinks;
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+            tabcontent[i].style.display = "none";
+        }
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+            tablinks[i].className = tablinks[i].className.replace(" active", "");
+        }
+        document.getElementById(cityName).style.display = "block";
+        console.log(evt)
+        evt.currentTarget.className += " active";
+    }
+
 </script>
 </html>
diff --git a/web/server.py b/web/server.py
@@ -98,7 +98,7 @@ def search_resource(self):
         projection = {'_id': False,
                       'data.info': True,
                       }
-        print(111,param)
+
         data = self.mongo.db["yyets"].find({
             "$or": [
                 {"data.info.cnname": {'$regex': f'.*{param}.*', "$options": "-i"}},
@@ -125,15 +125,19 @@ class TopHandler(BaseHandler):
 
     @run_on_executor()
     def get_top_resource(self):
-        top_type = self.get_query_argument("type", "all")
         projection = {'_id': False,
                       'data.info': True,
                       }
-        if top_type == "all":
-            data = self.mongo.db["yyets"].find({}, projection).sort("data.info.views", pymongo.DESCENDING).limit(10)
-        else:
-            data = []
-        return dict(data=list(data))
+
+        us = self.mongo.db["yyets"].find({"data.info.area": "美国"}, projection).sort("data.info.views",
+                                                                                    pymongo.DESCENDING).limit(10)
+
+        jp = self.mongo.db["yyets"].find({"data.info.area": "日本"}, projection).sort("data.info.views",
+                                                                                    pymongo.DESCENDING).limit(10)
+        us_data = list(us)
+        jp_data = list(jp)
+        us_data.extend(jp_data)
+        return dict(data=us_data)
 
     @gen.coroutine
     def get(self):
