Add Covid-19

yaozeliang · May 2, 2020 · 8114763 · 8114763
1 parent da63818
commit 8114763
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 52 deletions.
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/my_blog/settings.py b/my_blog/settings.py
@@ -55,7 +55,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
-    # 'whitenoise.runserver_nostatic',  # new!
+    'whitenoise.runserver_nostatic',  # new!
     'django.contrib.staticfiles',
 ]
 
@@ -71,7 +71,7 @@
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    # 'whitenoise.middleware.WhiteNoiseMiddleware', # new!
+    'whitenoise.middleware.WhiteNoiseMiddleware', # new!
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -230,8 +230,8 @@
 
 
 
-STATIC_URL = '/static/'
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
+# STATIC_URL = '/static/'
+# STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
 
 
 # """Deploy setting
@@ -242,7 +242,7 @@
 # """
 
 
-# STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') # new
-# STATIC_URL = '/static/'
-# STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
-# STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') # new
+STATIC_URL = '/static/'
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,5 @@
 asgiref==3.2.7
-beautifulsoup4==4.9.0
-bs4==0.0.1
-certifi==2020.4.5.1
-chardet==3.0.4
-defusedxml==0.6.0
-Django==2.2
-django-allauth==0.41.0
+Django==3.0.5
 django-appconf==1.0.4
 django-ckeditor==5.9.0
 django-crispy-forms==1.9.0
@@ -16,28 +10,17 @@ django-notifications-hq==1.6.0
 django-password-reset==2.0
 django-simpleui==3.9.1
 django-taggit==1.2.0
-djangorestframework==3.11.0
-gunicorn==19.9.0
-idna==2.9
+gunicorn==20.0.4
 jsonfield==3.1.0
-lxml==4.5.0
 Markdown==3.2.1
 numpy==1.18.3
-oauthlib==3.1.0
 pandas==1.0.3
 pilkit==2.0
 Pillow==7.1.1
 Pygments==2.6.1
 python-dateutil==2.8.1
-python3-openid==3.1.0
 pytz==2019.3
-requests==2.23.0
-requests-oauthlib==1.3.0
-simplejson==3.17.0
 six==1.14.0
-soupsieve==2.0
 sqlparse==0.3.1
 swapper==1.1.2.post1
-urllib3==1.25.9
-websocket-client==0.57.0
-whitenoise==3.3.1
+whitenoise==5.0.1
diff --git a/templates/base.html b/templates/base.html
@@ -15,6 +15,9 @@
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" 
     integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" 
     crossorigin="anonymous">
+    <!-- <link rel="stylesheet" href="{% static 'layui/css/layui.css' %}"> -->
+
+
 
     {%block extra_css%}
     {%endblock extra_css%}
@@ -46,7 +49,14 @@
 
     <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
     <script src="{% static 'layer/layer.js' %}"></script>
-
+    <!-- <script src="{% static 'layui/layui.js' %}"></script> -->
+    <!-- <script src="https://kit.fontawesome.com/bc53a4b4cc.js" crossorigin="anonymous"></script> -->
+    <script>
+        layui.use(['element', 'layer'], function(){
+        var element = layui.element;
+        var layer = layui.layer;
+        });
+    </script>
 
     {% block script %}
     {% endblock script %}

diff --git a/templates/covid19/general.html b/templates/covid19/general.html
@@ -27,7 +27,6 @@
         <div class="layui-col-md-lg-10 layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
             <ul class="layui-tab-title">
               <li class="layui-this">Global View</li>
-              <li>Europe</li>
               <li>France</li>
             </ul>
 
@@ -106,9 +105,7 @@
 
 
                 </div>
-                <!-- <div id="global_view">
 
-                </div> -->
               </div>
               <div class="layui-tab-item">内容2</div>
               <div class="layui-tab-item">内容3</div>

diff --git a/templates/header.html b/templates/header.html
@@ -2,20 +2,22 @@
 {% load notifications_tags %}
 {% notifications_unread as unread_count %}
 {% load static %}
+
+
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
   <div class="container">
     <!-- 导航栏商标 -->
     <!-- <a class="navbar-brand" href="#"></a> -->
 
     <a class="navbar-brand" href="/">
-      <!-- <span><img src="{% static 'images/self.jpg' %}" width="30" height="30" class="d-inline-block align-top"> 
-        YAO ZELIANG</span> -->
         YAO ZELIANG
     </a>
 
+
+
     <!-- 导航入口 -->
     <div>
-      <ul class="navbar-nav">
+      <ul class="navbar-nav" class="flex-direction: row;">
         <!-- 条目 -->
 
         <li class="nav-item ">
@@ -77,12 +79,10 @@
             <a class="dropdown-item" href='{% url "userprofile:logout" %}'>退出登录</a>
           </div>
         </li>
-        <!-- 如果用户未登录，则显示 “登录” -->
         {% else %}
         <li class="nav-item">
-          <a class="nav-link" href="{% url 'userprofile:login' %}">登录</a>
+          <a class="nav-link" href="{% url 'userprofile:login' %}">Login</a>
         </li>
-        <!-- if 语句在这里结束 -->
         {% endif %}
       </ul>
     </div>

diff --git a/templates/resume/resume.html b/templates/resume/resume.html
@@ -284,22 +284,9 @@ <h2 class="layui-colla-title">Others</h2>
 
 
 
-    <script src="{% static 'layui/layui.js' %}"></script>
-
-
-    <script
-    src="https://kit.fontawesome.com/bc53a4b4cc.js"
-    crossorigin="anonymous">
-    </script>
 
     {% block script %}
-    <script>
-    layui.use(['element', 'layer'], function(){
-      var element = layui.element;
-      var layer = layui.layer;
-      });
-    </script>
-
+
     {% endblock script %}