Merge branch 'hustsec_backup' into hustsec_dev

README.md

@@ -119,20 +119,20 @@ docker kill pwncollege/dojo
 docker rm pwncollege/dojo
 git pull
 docker build -t pwncollege/dojo "$DOJO_PATH"
-docker run --privileged -d -v "${DOJO_PATH}:/opt/pwn.college:shared" -p 22222:22 -p 8880:80 -p 44443:443 --name dojo pwncollege/dojo
+docker run --privileged -d -v "${DOJO_PATH}:/opt/pwn.college:shared" -p 22:22 -p 80:80 -p 443:443 --name dojo pwncollege/dojo
 ```
 
 This will cause downtime when the dojo is rebuilding.
 
 Some changes _can_ be applied without a complete restart, however this is not guaranteed.
 
-If you really know what you're doing (the changes that you're pulling in are just to `ctfd`), you can do the following:
+If you really know what you're doing (the changes that you're pulling in are just to `ctfd`), inside the `pwncollege/dojo` container you can do the following:
 
 ```sh
-docker exec dojo dojo update
+dojo update
 ```
 
-Note that `docker exec dojo dojo update` is not guaranteed to be successful and should only be used if you fully understand each commit/change that you are updating.
+Note that `dojo update` is not guaranteed to be successful and should only be used if you fully understand each commit/change that you are updating.
 
 ## Customization
 

dojo_plugin/pages/dojos.py

@@ -36,6 +36,7 @@ def listing():
         "Advanced": [],
         "Topics": [],
         "Courses": [],
+        "Archive":[],
         "More Material": [],
     }
     for dojo in Dojos.viewable(user=user):
@@ -49,6 +50,8 @@ def listing():
             typed_dojos["Advanced"].append(dojo)
         elif dojo.type == "topic":
             typed_dojos["Topics"].append(dojo)
+        elif dojo.type == "archive":
+            typed_dojos["Archive"].append(dojo)
         elif dojo.type == "course":
             typed_dojos["Courses"].append(dojo)
         elif dojo.type == "hidden":

dojo_theme/templates/dojo.html

@@ -100,6 +100,6 @@ <h2 class="row">道馆排名</h2>
 {% endblock %}
 
 {% block scripts %}
-<script defer onload="loadScoreboard(30, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
+<script defer onload="loadScoreboard(0, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
 <script defer src="{{ url_for('views.themes', path='js/dojo/copy.js') }}"></script>
 {% endblock %}

dojo_theme/templates/dojo_error.html

@@ -53,6 +53,6 @@ <h4 class="card-title">{{ module.name or module.id }}</h4>
 {% endblock %}
 
 {% block scripts %}
-<script defer onload="loadScoreboard(30, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
+<script defer onload="loadScoreboard(0, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
 <script defer src="{{ url_for('views.themes', path='js/dojo/copy.js') }}"></script>
 {% endblock %}

dojo_theme/templates/dojos.html

@@ -28,6 +28,9 @@ <h2>高级篇</h2>
     {% elif type == "Course" %}
     <h2>课程</h2>
     <p>我们在平台上提供了众多课程，包含软件安全。</p>
+    {% elif type == "Archive" %}
+    <h2>归档</h2>
+    <p>历史课程</p>
     {% endif %}
     <ul class="card-list">
       {% for dojo in dojos %}
@@ -51,6 +54,7 @@ <h2>课程</h2>
     </ul>
     <br>
   {% endfor %}
+
 {% endblock %}
 
 {% block scripts %}

dojo_theme/templates/module.html

@@ -157,5 +157,5 @@ <h2>模块排名</h2>
 {% block scripts %}
 
 <script defer src="{{ url_for('views.themes', path='js/dojo/challenges.js') }}"></script>
-<script defer onload="loadScoreboard(30, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
+<script defer onload="loadScoreboard(0, 1);" src="{{ url_for('views.themes', path='js/dojo/scoreboard.js') }}"></script>
 {% endblock %}