漏洞详情页面加关注按钮/其余页面修改

shadowsiren · Jun 7, 2020 · 9d26e08 · 9d26e08
1 parent 66b7a19
commit 9d26e08
Show file tree

Hide file tree

Showing 19 changed files with 128 additions and 116 deletions.
diff --git a/POCScan/__pycache__/POCScan.cpython-38.pyc b/POCScan/__pycache__/POCScan.cpython-38.pyc
diff --git a/__pycache__/BaseMessage.cpython-38.pyc b/__pycache__/BaseMessage.cpython-38.pyc
diff --git a/__pycache__/BugScan.cpython-38.pyc b/__pycache__/BugScan.cpython-38.pyc
diff --git a/__pycache__/DomainMessage.cpython-38.pyc b/__pycache__/DomainMessage.cpython-38.pyc
diff --git a/__pycache__/SZheConsole.cpython-38.pyc b/__pycache__/SZheConsole.cpython-38.pyc
diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
diff --git a/__pycache__/models.cpython-38.pyc b/__pycache__/models.cpython-38.pyc
diff --git a/static/css/bug-details.css b/static/css/bug-details.css
@@ -56,6 +56,40 @@
   border-left: 5px solid #0fbcf9;
   padding: 1px 10px;
 }
+.content-titles form {
+  display: block;
+  position: absolute;
+  top: 53px;
+  left: 620px;
+  width: 120px;
+  z-index: 100;
+}
+.follow {
+  display: block;
+  width: 90%;
+  height: 40px;
+  margin: 0 auto;
+  margin-top: 8px;
+  background-color: #0fbcf9;
+  border: 1px solid #fff;
+  border-radius: 4px;
+  color: #f8f8ff;
+  outline: none;
+}
+.follow:hover {
+  background-color: #0bb1ee;
+  cursor: pointer;
+}
+.follow span {
+  font-size: 15px;
+  font-weight: 500;
+}
+.true {
+  display: inline;
+}
+.false {
+  display: none;
+}
 .domain-details {
   font-size: 16px;
   position: relative;

diff --git a/static/css/bug-list.css b/static/css/bug-list.css
@@ -467,18 +467,16 @@ header .burger {
   /* height: 2000px; */
   /* padding: 15px 0; */
 }
-.bugLists {
-  height: 1500px;
-}
+
 .right-context .list {
-  /* flex-basis: 120px; */
   flex: 1;
   width: 100%;
   height: 100px;
   padding: 10px 17px 10px 45px;
   margin-left: 20px;
   display: flex;
   flex-direction: row;
+  column-gap: 15px;
   align-items: flex-start;
   justify-items: center;
   border-bottom: 1px solid #b6b6b6;
@@ -494,10 +492,11 @@ header .burger {
   margin-right: 10px;
   position: relative;
   left: -20px;
-  width: 100%;
+  /* width: 50%; */
   height: 120px;
   color: #747373;
   font-size: 14px;
+  word-break: break-all;
   /* flex-basis: 300px; */
 }
 .right-context .list .domain-name p {
@@ -506,6 +505,10 @@ header .burger {
 .right-context .list .domain-name .two-p {
   flex: 1;
 }
+.right-context .list .domain-name .two-p a {
+  word-break: break-all;
+  width: 100%;
+}
 .right-context .list .domain-name .two-p a:link {
   color: rgb(43, 43, 248);
 }

diff --git a/static/css/console.css b/static/css/console.css
@@ -270,6 +270,8 @@
   border-bottom-right-radius: 4px;
   margin-right: 10px;
   background-color: #0fbcf9;
+
+  background-color: rgb(22, 122, 253);
   opacity: 0.7;
   align-items: center;
   justify-content: center;
@@ -283,7 +285,7 @@
 }
 .content-mid form button:hover {
   cursor: pointer;
-  background-color: #0394e7;
+  opacity: 1;
 }
 .contentNums {
   flex: 1;
@@ -302,10 +304,10 @@
   margin-bottom: 13px;
   align-items: flex-start;
 }
-.contentNums .p1 {
+/* .contentNums .p1 {
   position: relative;
   left: -40px;
-}
+} */
 .charts {
   /* flex: 1; */
   display: flex;

diff --git a/static/css/domain-detail.css b/static/css/domain-detail.css
@@ -162,6 +162,8 @@
 }
 .tab-content .tanPane .historys p {
   margin-bottom: 10px;
+  width: 100%;
+  word-break: break-all;
 }
 
 .tab-custom .tab button.active,

diff --git a/static/css/homeOne.css b/static/css/homeOne.css
@@ -461,6 +461,7 @@ header .burger {
   width: 100%;
   display: flex;
   flex-direction: row;
+  column-gap: 15px;
   background-color: #f8f8ff;
   z-index: 100;
   margin: 0px 20px 0 20px;
@@ -494,6 +495,9 @@ header .burger {
 .newest .domain-name .two-p {
   flex: 1;
 }
+.newest .domain-name .two-p a {
+  word-break: break-all;
+}
 .newest .domain-name .two-p a:link {
   color: rgb(43, 43, 248);
 }

diff --git a/static/js/bug-details.js b/static/js/bug-details.js
@@ -11,3 +11,15 @@ function openList(evt, cityName) {
   document.getElementById(cityName).style.display = "block";
   evt.currentTarget.className += " active";
 }
+function show1() {
+  var True = document.getElementsByClassName(true);
+  var False = document.getElementsByClassName(false);
+  var x = 1;
+  if (True[0].style.display != "none") {
+    True[0].style.display = "none";
+    False[0].style.display = "inline";
+  } else {
+    True[0].style.display = "inline";
+    False[0].style.display = "none";
+  }
+}
diff --git a/templates/bug-details.html b/templates/bug-details.html
@@ -13,7 +13,15 @@
 {% block rightcontext %}
 <div class="content">
     <div class="content-titles">
+        <!-- <div class="contentTitle"> -->
         <h2>漏洞详情</h2>
+        <form class="Follows" method="POST" action="" id="follows" name="myFollow">
+            <button class="follow" onclick="show1()">
+                <span class="true" id="true">关 注</span>
+                <span class="false" id="false">已关注</span>
+            </button>
+        </form>
+        <!-- </div> -->
         <div class="domain-details">
             <div class="domain-detail">
                 <i class="fa fa-check-circle-o"></i>

diff --git a/templates/bug-list.html b/templates/bug-list.html
@@ -12,73 +12,47 @@
 <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> -->
 <!-- <script type="text/javascript" src="http://echarts.baidu.com/gallery/vendors/echarts/echarts.min.js"></script> -->
 {% endblock %}
-<div class="bugLists">
-    {% block rightcontext %}
-    {% for bug in bugs %}
-    <div class="list domain">
-        <div class="domain-name">
-            <div class="two-p">
-                <a href="{{url_for('bugdetail',id=bug.id)}}">
-                    <i class="fa fa-link"></i>
-                    <p class="pgr">{{bug.bugurl}}</p>
-                </a>
-            </div>
-            <!-- <div class="three-p">
+<!-- <div class="bugLists"> -->
+{% block rightcontext %}
+{% for bug in bugs %}
+<div class="list domain">
+    <div class="domain-name">
+        <div class="two-p">
+            <a href="{{url_for('bugdetail',id=bug.id)}}">
+                <i class="fa fa-link"></i>
+                <p class="pgr">{{bug.bugurl}}</p>
+            </a>
+        </div>
+        <!-- <div class="three-p">
                 <i class="fa fa-clock-o"></i>
                 <p>所属: {{bug.oldurl}}</p>
             </div> -->
-            <p>所属: {{bug.oldurl}}</p>
-            <p>漏洞: {{bug.bugname}}</p>
-            <p>漏洞等级: {{bug.buggrade}}</p>
-        </div>
-        <div class="tab-pane">{{bug.bugdetail}}<br /></div>
-
+        <p>所属: {{bug.oldurl}}</p>
+        <p>漏洞: {{bug.bugname}}</p>
+        <p>漏洞等级: {{bug.buggrade}}</p>
     </div>
-    {% endfor %}
-    <!-- <table frame=void class="page-number" style="position: absolute;top:1550px;left:190px;background-color: #f8f8ff;">
-        <tr>
-            <td class="td" style="margin-right:10px;white-space: nowrap;position: relative;left:-170px;color: #4b4a4a;">
-                当前页数:
-                {{paginate.page}}</td>
-            <td class="td" style="margin-right:20px;position: relative;left:-130px;color: #4b4a4a;">总页数:
-                {{paginate.pages}}</td>
-            <td class="td" style="position: relative;left:-80px;color: #4b4a4a;">共有 {{paginate.total}} 条数据</td>
-            <td class="td" style="position: relative;left:90px;color: #4b4a4a;">
-                页码：
-                {% for i in paginate.iter_pages() %}
-                <a href="{{url_for('buglist',page=i)}}"
-                    style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius:2px;">{{ i }}</a>
-                {% endfor %}</td>
+    <div class="tab-pane">{{bug.bugdetail}}<br /></div>
+
+</div>
+{% endfor %}
+<div class="pageNumber">
+    <ul>
+        <li class="pageLi">
             {% if paginate.has_prev %}
-            <td class="td" style="margin-right:20px;">
-                <a href="{{url_for('buglist',page=paginate.prev_num)}}"
-                    style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius: 4px;position: relative;left:110px;">上一页</a>
-                {% endif %}</td>
-            <td class="td" style="margin-right:20px;">
-                {% if paginate.has_next %}
-                <a href="{{url_for('buglist',page=paginate.next_num)}}"
-                    style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius: 4px;position: relative;left:110px;">下一页</a>
-                {% endif %}</td>
-        </tr>
-    </table> -->
-    <div class="pageNumber">
-        <ul>
-            <li class="pageLi">
-                {% if paginate.has_prev %}
-                <button class="pageBtn" style="width:100px" id="prePage"><a
-                        href="{{url_for('buglist',page=paginate.prev_num)}}">上一页</a></button>
-                {% endif %}
-            </li>
-            {% for i in paginate.iter_pages() %}
-            <li class="pageLi">
-                <button class="pageBtn" id="{{ i }}"><a href="{{url_for('buglist',page=i)}}">{{ i }}</a></button>
-            </li>
-            {% endfor %}
-            {% if paginate.has_next %}
-            <button class="pageBtn" style="width:100px" id="sufPage"> <a
-                    href="{{url_for('buglist',page=paginate.next_num)}}">下一页</a></button>
+            <button class="pageBtn" style="width:100px" id="prePage"><a
+                    href="{{url_for('buglist',page=paginate.prev_num)}}">上一页</a></button>
             {% endif %}
-            </li>
-        </ul>
-    </div>
+        </li>
+        {% for i in paginate.iter_pages() %}
+        <li class="pageLi">
+            <button class="pageBtn" id="{{ i }}"><a href="{{url_for('buglist',page=i)}}">{{ i }}</a></button>
+        </li>
+        {% endfor %}
+        {% if paginate.has_next %}
+        <button class="pageBtn" style="width:100px" id="sufPage"> <a
+                href="{{url_for('buglist',page=paginate.next_num)}}">下一页</a></button>
+        {% endif %}
+        </li>
+    </ul>
+</div>
 </div>{% endblock %}
diff --git a/templates/console.html b/templates/console.html
@@ -87,23 +87,23 @@ <h5 class="bar-title">运行服务
 <script>
 
     //漏洞类型部分
-        $('.skill-per').each(function () {
-            var $this = $(this);
-            var per = $this.attr('per');
-            $this.css("width", per + '%');
-            $({ animatedValue: 0 }).animate(
-                { animatedValue: per },
-                {
-                    duration: 300,
-                    step: function () {
-                        $this.attr('per', Math.floor(this.animatedValue) + '%');
-                    },
-                    complete: function () {
-                        $this.attr('per', Math.floor(this.animatedValue) + '%');
-                    }
+    $('.skill-per').each(function () {
+        var $this = $(this);
+        var per = $this.attr('per');
+        $this.css("width", per + '%');
+        $({ animatedValue: 0 }).animate(
+            { animatedValue: per },
+            {
+                duration: 300,
+                step: function () {
+                    $this.attr('per', Math.floor(this.animatedValue) + '%');
+                },
+                complete: function () {
+                    $this.attr('per', Math.floor(this.animatedValue) + '%');
                 }
-            );
-        });
+            }
+        );
+    });
 
     //饼状图部分
     var dom = document.getElementById("container");

diff --git a/templates/domain-detail.html b/templates/domain-detail.html
@@ -155,7 +155,7 @@ <h2>域名详情</h2>
                     </div>
                 </div>
                 {% endif %}
-                <div class="tabPane" id="tab_7" style="display:none;"></div>
+                <!-- <div class="tabPane" id="tab_7" style="display:none;"></div> -->
             </div>
         </div>
     </div>

diff --git a/templates/homeOne.html b/templates/homeOne.html
@@ -30,34 +30,7 @@
     </div>
     <div class="tab-pane">{{info.responseheader}}<br /></div>
   </div>{% endfor %}
-  <!-- <table frame=void class="page-number" style="position: absolute;
-  top: 1530px;left:390px;">
-    <tr>
-      <td class=" td" style="margin-right:10px;white-space: nowrap;position: relative;left:15px;color: #4b4a4a;">
-        当前页数:
-        {{paginate.page}}</td>
-      <td class="td" style="margin-right:20px;position: relative;left:60px;color: #4b4a4a;">总页数:
-        {{paginate.pages}}</td>
-      <td class="td" style="position: relative;color: #4b4a4a;left:150px;">共有 {{paginate.total}} 条数据</td>
-      <td class="td" style="position: relative;color: #4b4a4a;left:260px;">
-        页码：
-        {% for i in paginate.iter_pages() %}
-        <a href="{{url_for('index',page=i)}}"
-          style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius:2px;">{{ i }}</a>
-        {% endfor %}</td>
-      {% if paginate.has_prev %}
-      <td class="td" style="margin-right:20px;">
-        <a href="{{url_for('index',page=paginate.prev_num)}}"
-          style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius: 4px;position: relative;left:270px;">上一页</a>
-        {% endif %}</td>
 
-      <td class="td" style="margin-right:20px;">
-        {% if paginate.has_next %}
-        <a href="{{url_for('index',page=paginate.next_num)}}"
-          style="border:#d3d3d3 solid 1px;padding:2px 5px;border-radius: 4px;position: relative;left:280px;">下一页</a>
-        {% endif %}</td>
-    </tr>
-  </table> -->
   <div class="pageNumber">
     <ul>
       <li class="pageLi">

diff --git a/templates/sign_in.html b/templates/sign_in.html
@@ -36,7 +36,7 @@ <h2 class="title">
             <i class="fa fa-user"></i>
           </div>
           <div class="input-num passw">
-            <input type="password" placeholder="密 码" name="password"  />
+            <input type="password" placeholder="密 码" name="password" />
             <i class="fa fa-eye-slash"></i>
           </div>
           <div class="remember-btn">
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,7 +155,7 @@ <h2>域名详情</h2> @@
                         </div>
                     </div>
                     {% endif %}
-                    <div class="tabPane" id="tab_7" style="display:none;"></div>
+                    <!-- <div class="tabPane" id="tab_7" style="display:none;"></div> -->
                 </div>
             </div>
         </div>
@@ Expand Down @@