EnglishPal/app/templates/userpage_get.html

<!DOCTYPE html>
<html lang="en">
  <head>
    <meta charset="UTF-8" />
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"
    />
    <meta name="format-detection" content="telephone=no" />

    {{ yml['header'] | safe }} {% if yml['css']['item'] %} {% for css in
    yml['css']['item'] %}
    <link href="{{ css }}" rel="stylesheet" />
    {% endfor %} {% endif %} {% if yml['js']['head'] %} {% for js in
    yml['js']['head'] %}
    <script src="{{ js }}"></script>
    {% endfor %} {% endif %}

    <title>EnglishPal Study Room for {{ username }}</title>

    <style>
      .shaking {
        animation: shakes 1600ms ease-in-out;
      }

      @keyframes shakes {
        10%,
        90% {
          transform: translate3d(-1px, 0, 0);
        }
        20%,
        50% {
          transform: translate3d(+2px, 0, 0);
        }
        30%,
        70% {
          transform: translate3d(-4px, 0, 0);
        }
        40%,
        60% {
          transform: translate3d(+4px, 0, 0);
        }
        50% {
          transform: translate3d(-4px, 0, 0);
        }
      }
    </style>
  </head>
  <body>
    <div class="container-fluid">
      <p>
        <b
          >English Pal for
          <font id="username" color="red">{{ username }}</font></b
        >

        {% if username == admin_name %}
        <a
          class="btn btn-secondary"
          href="/admin"
          role="button"
          onclick="stopRead()"
          >管理</a
        >
        {% endif %}
        <a
          id="quit"
          class="btn btn-secondary"
          href="/logout"
          role="button"
          onclick="stopRead()"
          >退出</a
        >
        <a
          class="btn btn-secondary"
          href="/reset"
          role="button"
          onclick="stopRead()"
          >重设密码</a
        >
      </p>
      {# {% for message in flashed_messages %}#} {#
      根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码
      #} {#
      <div class="alert alert-warning" role="alert">
        Congratulations! {{ message }}
      </div>
      #} {# {% endfor %}#}

      <button
        class="btn btn-success"
        id="load_next_article"
        onclick="load_next_article()"
      >
        下一篇 Next Article
      </button>
      <button
        class="btn btn-success"
        id="load_pre_article"
        onclick="load_pre_article()"
      >
        上一篇 Previous Article
      </button>

      <p><b>阅读文章并回答问题</b></p>
      <div id="text-content">
        <div id="found">
          <div class="alert alert-success" role="alert">
            According to your word list, your level is
            <span class="badge bg-success" id="user-level"
              >{{ today_article["user_level"] }}</span
            >
            and we have chosen an article with a difficulty level of
            <span class="badge bg-success" id="text_level"
              >{{ today_article["text_level"] }}</span
            >
            for you.
          </div>
          <p class="text-muted" id="date">
            Article added on: {{ today_article["date"] }}
          </p>
          <br />
          <div class="p-3 mb-2 bg-light text-dark">
            <br />
            <p class="display-5" id="article_title">
              {{ today_article["article_title"] }}
            </p>
            <br />
            <p class="lead">
              <font id="article" size="2"
                >{{ today_article["article_body"] }}</font
              >
            </p>
            <br />
            <p>
              <small class="text-muted" id="source"
                >{{ today_article['source'] }}</small
              >
            </p>
            <br />
            <p><b id="question">{{ today_article['question'] }}</b></p>
            <br />
            <script type="text/javascript">
              function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
                  const e = document.getElementById(id);
                  if(e.style.display === 'block')
                      e.style.display = 'none';
                  else
                      e.style.display = 'block';
              }
            </script>
            <button onclick="toggle_visibility('answer');">ANSWER</button>
            <div id="answer" style="display: none">
              {{ today_article['answer'] }}
            </div>
            <br />
          </div>
        </div>
        <div
          class="alert alert-success"
          role="alert"
          id="not_found"
          style="display: none"
        >
          <p class="text-muted">
            <span class="badge bg-success">Notes:</span><br />No article is
            currently available for you. You can try again a few times or mark
            new words in the passage to improve your level.
          </p>
        </div>
        <div
          class="alert alert-success"
          role="alert"
          id="read_all"
          style="display: none"
        >
          <p class="text-muted">
            <span class="badge bg-success">Notes:</span><br />You've read all
            the articles.
          </p>
        </div>
      </div>

      <input type="checkbox" onclick="toggleHighlighting()" checked />生词高亮
      <input type="checkbox" onclick="onReadClick()" checked />大声朗读
      <input type="checkbox" onclick="onChooseClick()" checked />划词入库
      <div class="range">
        <div class="field">
          <div class="sliderValue">
            <span id="rangeValue">1×</span>
          </div>
          <input
            type="range"
            id="rangeComponent"
            min="0.5"
            max="2"
            value="1"
            step="0.25"
          />
        </div>
      </div>
      <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
      <form method="post" action="/{{ username }}/userpage">
        <textarea
          name="content"
          id="selected-words"
          rows="10"
          cols="120"
        ></textarea
        ><br />
        <input type="submit" value="把生词加入我的生词库" />
        <input type="reset" value="清除" />
      </form>
      {% if session.get['thisWord'] %}
      <script type="text/javascript">
        //point to the anchor in the page whose id is aaa if it exists
        window.onload = function () {
          var element = document.getElementsByName("aaa");
          if (element != null)
            document.getElementsByName("aaa")[0].scrollIntoView(true);
        };
      </script>
      {% endif %} {% if d_len > 0 %}
      <p>
        <b>我的生词簿</b>
        <label for="move_dynamiclly">
          <input
            type="checkbox"
            name="move_dynamiclly"
            id="move_dynamiclly"
            checked
          />
          允许动态调整顺序
        </label>
      </p>
      <a name="aaa"></a>
      <div class="word-container">
        {% for x in lst3 %} {% set word = x[0] %} {% set freq = x[1] %} {% if
        session.get('thisWord') == x[0] and session.get('time') == 1 %} {% endif
        %}
        <p id="p_{{ word }}" class="new-word">
          <a
            id="word_{{ word }}"
            class="btn btn-light"
            href="http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index"
            role="button"
            >{{ word }}</a
          >
          ( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
          <a
            class="btn btn-success"
            onclick="familiar('{{ word }}')"
            role="button"
            >熟悉</a
          >
          <a
            class="btn btn-warning"
            onclick="unfamiliar('{{ word }}')"
            role="button"
            >不熟悉</a
          >
          <a
            class="btn btn-danger"
            onclick="delete_word('{{ word }}')"
            role="button"
            >删除</a
          >
        </p>
        {% endfor %}
      </div>
      <input id="selected-words2" type="hidden" value="{{ words }}" />
      {% endif %}
    </div>
    {{ yml['footer'] | safe }} {% if yml['js']['bottom'] %} {% for js in
    yml['js']['bottom'] %}
    <script src="{{ js }}"></script>
    {% endfor %} {% endif %}
    <script type="text/javascript">
      function load_next_article() {
        $.ajax({
          url: "/get_next_article/{{username}}",
          dataType: "json",
          success: function (data) {
            // 更新页面内容
            if (data["today_article"]) {
              update(data["today_article"]);
              check_pre(data["visited_articles"]);
              check_next(data["result_of_generate_article"]);
            }
          },
        });
      }
      function load_pre_article() {
        $.ajax({
          url: "/get_pre_article/{{username}}",
          dataType: "json",
          success: function (data) {
            // 更新页面内容
            if (data["today_article"]) {
              update(data["today_article"]);
              check_pre(data["visited_articles"]);
            }
          },
        });
      }
      function update(today_article) {
        $("#user-level").html(today_article["user_level"]);
        $("#text_level").html(today_article["text_level"]);
        $("#date").html("Article added on: " + today_article["date"]);
        $("#article_title").html(today_article["article_title"]);
        $("#article").html(today_article["article_body"]);
        $("#source").html(today_article["source"]);
        $("#question").html(today_article["question"]);
        $("#answer").html(today_article["answer"]);
      }
      <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
      function check_pre(visited_articles) {
        if (visited_articles == "" || visited_articles["index"] <= 0) {
          $("#load_pre_article").hide();
        } else {
          $("#load_pre_article").show();
        }
      }
      function check_next(result_of_generate_article) {
        if (result_of_generate_article == "found") {
          $("#found").show();
          $("#not_found").hide();
          $("#read_all").hide();
        } else if (result_of_generate_article == "not found") {
          $("#found").hide();
          $("#not_found").show();
          $("#read_all").hide();
        } else {
          $("#found").hide();
          $("#not_found").hide();
          $("#read_all").show();
        }
      }
    </script>
  </body>
  <style>
    mark {
        color: #{{ yml['highlight']['color'] }};
        background-color: rgba(0, 0, 0, 0);
    }
  </style>
</html>
-												Repalce old app folder with SoftArch王炫/english-pal-master/app/

											
										
										
											2022-01-26 21:10:09 +08:00
+								<!DOCTYPE html>
 								<html lang="en">
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								  <head>
 								    <meta charset="UTF-8" />
 								    <meta
 								      name="viewport"
 								      content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"
 								    />
 								    <meta name="format-detection" content="telephone=no" />
-												Repalce old app folder with SoftArch王炫/english-pal-master/app/

											
										
										
											2022-01-26 21:10:09 +08:00
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								    {{ yml['header'] | safe }} {% if yml['css']['item'] %} {% for css in
 								    yml['css']['item'] %}
 								    <link href="{{ css }}" rel="stylesheet" />
 								    {% endfor %} {% endif %} {% if yml['js']['head'] %} {% for js in
 								    yml['js']['head'] %}
 								    <script src="{{ js }}"></script>
 								    {% endfor %} {% endif %}
-												Repalce old app folder with SoftArch王炫/english-pal-master/app/

											
										
										
											2022-01-26 21:10:09 +08:00
 								    <title>EnglishPal Study Room for {{ username }}</title>
-												Bug521-LiYuFeng-Refactor (#72)

@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>

											
										
										
											2023-01-29 12:01:19 +08:00
 								    <style>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      .shaking {
 								        animation: shakes 1600ms ease-in-out;
 								      }
-												Bug521-LiYuFeng-Refactor (#72)

@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>

											
										
										
											2023-01-29 12:01:19 +08:00
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      @keyframes shakes {
 %,
 % {
 								          transform: translate3d(-1px, 0, 0);
 								        }
 %,
 % {
 								          transform: translate3d(+2px, 0, 0);
 								        }
 %,
 % {
 								          transform: translate3d(-4px, 0, 0);
-												Bug521-LiYuFeng-Refactor (#72)

@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>

											
										
										
											2023-01-29 12:01:19 +08:00
+								        }
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+%,
 % {
 								          transform: translate3d(+4px, 0, 0);
 								        }
 % {
 								          transform: translate3d(-4px, 0, 0);
 								        }
 								      }
-												Bug521-LiYuFeng-Refactor (#72)

@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>

											
										
										
											2023-01-29 12:01:19 +08:00
+								    </style>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								  </head>
 								  <body>
 								    <div class="container-fluid">
 								      <p>
 								        <b
 								          >English Pal for
 								          <font id="username" color="red">{{ username }}</font></b
 								        >
-												Resolve merge conflict

											
										
										
											2023-04-25 08:47:22 +08:00
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        {% if username == admin_name %}
 								        <a
 								          class="btn btn-secondary"
 								          href="/admin"
 								          role="button"
 								          onclick="stopRead()"
 								          >管理</a
 								        >
-												fix: set specific management displays for admin

											
										
										
											2023-03-20 20:15:58 +08:00
+								        {% endif %}
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        <a
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          id="quit"
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								          class="btn btn-secondary"
 								          href="/logout"
 								          role="button"
 								          onclick="stopRead()"
 								          >退出</a
 								        >
 								        <a
 								          class="btn btn-secondary"
 								          href="/reset"
 								          role="button"
 								          onclick="stopRead()"
 								          >重设密码</a
 								        >
 								      </p>
 								      {# {% for message in flashed_messages %}#} {#
 								      根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码
 								      #} {#
 								      <div class="alert alert-warning" role="alert">
 								        Congratulations! {{ message }}
 								      </div>
 								      #} {# {% endfor %}#}
-												templates/userpage_get.html: change the position and order of the checkboxes.

											
										
										
											2022-01-27 11:27:26 +08:00
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      <button
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        class="btn btn-success"
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								        id="load_next_article"
 								        onclick="load_next_article()"
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      >
 								        下一篇 Next Article
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      </button>
 								      <button
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        class="btn btn-success"
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								        id="load_pre_article"
 								        onclick="load_pre_article()"
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      >
 								        上一篇 Previous Article
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      </button>
-												Bug422-XuXing (#46)

增加了返回上一篇的按钮及相关功能的实现，当点击下一篇文章跳转至下一篇时，页面中会增加一个返回上一篇按钮，点击返回上一篇按钮后可以回到上一篇。

Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/46
Co-authored-by: 徐幸 <2567198082@qq.com>
Co-committed-by: 徐幸 <2567198082@qq.com>

											
										
										
											2022-07-21 23:13:33 +08:00
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      <p><b>阅读文章并回答问题</b></p>
 								      <div id="text-content">
-												AJAX载入文章数据

											
										
										
											2023-05-11 15:51:10 +08:00
+								        <div id="found">
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          <div class="alert alert-success" role="alert">
 								            According to your word list, your level is
 								            <span class="badge bg-success" id="user-level"
 								              >{{ today_article["user_level"] }}</span
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								            >
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								            and we have chosen an article with a difficulty level of
 								            <span class="badge bg-success" id="text_level"
 								              >{{ today_article["text_level"] }}</span
 								            >
 								            for you.
 								          </div>
 								          <p class="text-muted" id="date">
 								            Article added on: {{ today_article["date"] }}
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								          </p>
 								          <br />
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          <div class="p-3 mb-2 bg-light text-dark">
 								            <br />
 								            <p class="display-5" id="article_title">
 								              {{ today_article["article_title"] }}
 								            </p>
 								            <br />
 								            <p class="lead">
 								              <font id="article" size="2"
 								                >{{ today_article["article_body"] }}</font
 								              >
 								            </p>
 								            <br />
 								            <p>
 								              <small class="text-muted" id="source"
 								                >{{ today_article['source'] }}</small
 								              >
 								            </p>
 								            <br />
 								            <p><b id="question">{{ today_article['question'] }}</b></p>
 								            <br />
 								            <script type="text/javascript">
 								              function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
 								                  const e = document.getElementById(id);
 								                  if(e.style.display === 'block')
 								                      e.style.display = 'none';
 								                  else
 								                      e.style.display = 'block';
 								              }
 								            </script>
 								            <button onclick="toggle_visibility('answer');">ANSWER</button>
 								            <div id="answer" style="display: none">
 								              {{ today_article['answer'] }}
-												完成了对bug509的修复，以及重构项目（去掉了业务中的前端脚本）

											
										
										
											2023-03-08 16:33:13 +08:00
+								            </div>
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								            <br />
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								          </div>
 								        </div>
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								        <div
 								          class="alert alert-success"
 								          role="alert"
 								          id="not_found"
 								          style="display: none"
 								        >
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								          <p class="text-muted">
 								            <span class="badge bg-success">Notes:</span><br />No article is
 								            currently available for you. You can try again a few times or mark
 								            new words in the passage to improve your level.
 								          </p>
 								        </div>
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								        <div
 								          class="alert alert-success"
 								          role="alert"
 								          id="read_all"
 								          style="display: none"
 								        >
 								          <p class="text-muted">
 								            <span class="badge bg-success">Notes:</span><br />You've read all
 								            the articles.
 								          </p>
-												AJAX载入文章数据

											
										
										
											2023-05-11 15:51:10 +08:00
+								        </div>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      </div>
-												templates/userpage_get.html: change the position and order of the checkboxes.

											
										
										
											2022-01-27 11:27:26 +08:00
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      <input type="checkbox" onclick="toggleHighlighting()" checked />生词高亮
 								      <input type="checkbox" onclick="onReadClick()" checked />大声朗读
 								      <input type="checkbox" onclick="onChooseClick()" checked />划词入库
 								      <div class="range">
-												Bug477 重构 and 增加功能 (#48)

Co-authored-by: cjybyjk <cjybyjk@zjnu.edu.cn>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/48
Co-authored-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
Co-committed-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>

											
										
										
											2022-07-18 16:00:08 +08:00
+								        <div class="field">
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								          <div class="sliderValue">
 								            <span id="rangeValue">1×</span>
 								          </div>
 								          <input
 								            type="range"
 								            id="rangeComponent"
 								            min="0.5"
 								            max="2"
 								            value="1"
 								            step="0.25"
 								          />
-												Bug477 重构 and 增加功能 (#48)

Co-authored-by: cjybyjk <cjybyjk@zjnu.edu.cn>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/48
Co-authored-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
Co-committed-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>

											
										
										
											2022-07-18 16:00:08 +08:00
+								        </div>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								      </div>
 								      <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      <form method="post" action="/{{ username }}/userpage">
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        <textarea
 								          name="content"
 								          id="selected-words"
 								          rows="10"
 								          cols="120"
 								        ></textarea
 								        ><br />
 								        <input type="submit" value="把生词加入我的生词库" />
 								        <input type="reset" value="清除" />
 								      </form>
 								      {% if session.get['thisWord'] %}
 								      <script type="text/javascript">
 								        //point to the anchor in the page whose id is aaa if it exists
 								        window.onload = function () {
 								          var element = document.getElementsByName("aaa");
 								          if (element != null)
 								            document.getElementsByName("aaa")[0].scrollIntoView(true);
 								        };
 								      </script>
 								      {% endif %} {% if d_len > 0 %}
 								      <p>
 								        <b>我的生词簿</b>
 								        <label for="move_dynamiclly">
 								          <input
 								            type="checkbox"
 								            name="move_dynamiclly"
 								            id="move_dynamiclly"
 								            checked
 								          />
 								          允许动态调整顺序
 								        </label>
 								      </p>
 								      <a name="aaa"></a>
 								      <div class="word-container">
 								        {% for x in lst3 %} {% set word = x[0] %} {% set freq = x[1] %} {% if
 								        session.get('thisWord') == x[0] and session.get('time') == 1 %} {% endif
 								        %}
 								        <p id="p_{{ word }}" class="new-word">
 								          <a
 								            id="word_{{ word }}"
 								            class="btn btn-light"
 								            href="http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index"
 								            role="button"
 								            >{{ word }}</a
 								          >
 								          ( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
 								          <a
 								            class="btn btn-success"
 								            onclick="familiar('{{ word }}')"
 								            role="button"
 								            >熟悉</a
 								          >
 								          <a
 								            class="btn btn-warning"
 								            onclick="unfamiliar('{{ word }}')"
 								            role="button"
 								            >不熟悉</a
 								          >
 								          <a
 								            class="btn btn-danger"
 								            onclick="delete_word('{{ word }}')"
 								            role="button"
 								            >删除</a
 								          >
-												Bug521-LiYuFeng-Refactor (#72)

@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>

											
										
										
											2023-01-29 12:01:19 +08:00
+								        </p>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								        {% endfor %}
 								      </div>
 								      <input id="selected-words2" type="hidden" value="{{ words }}" />
 								      {% endif %}
 								    </div>
 								    {{ yml['footer'] | safe }} {% if yml['js']['bottom'] %} {% for js in
 								    yml['js']['bottom'] %}
 								    <script src="{{ js }}"></script>
 								    {% endfor %} {% endif %}
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								    <script type="text/javascript">
 								      function load_next_article() {
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								        $.ajax({
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          url: "/get_next_article/{{username}}",
 								          dataType: "json",
 								          success: function (data) {
 								            // 更新页面内容
 								            if (data["today_article"]) {
 								              update(data["today_article"]);
 								              check_pre(data["visited_articles"]);
 								              check_next(data["result_of_generate_article"]);
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								            }
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          },
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								        });
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      }
 								      function load_pre_article() {
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								        $.ajax({
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          url: "/get_pre_article/{{username}}",
 								          dataType: "json",
 								          success: function (data) {
 								            // 更新页面内容
 								            if (data["today_article"]) {
 								              update(data["today_article"]);
 								              check_pre(data["visited_articles"]);
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								            }
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								          },
-												AJAX载入文章数据

											
										
										
											2023-05-08 14:33:48 +08:00
+								        });
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      }
 								      function update(today_article) {
 								        $("#user-level").html(today_article["user_level"]);
 								        $("#text_level").html(today_article["text_level"]);
 								        $("#date").html("Article added on: " + today_article["date"]);
 								        $("#article_title").html(today_article["article_title"]);
 								        $("#article").html(today_article["article_body"]);
 								        $("#source").html(today_article["source"]);
 								        $("#question").html(today_article["question"]);
 								        $("#answer").html(today_article["answer"]);
 								      }
 								      <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
 								      function check_pre(visited_articles) {
 								        if (visited_articles == "" || visited_articles["index"] <= 0) {
 								          $("#load_pre_article").hide();
 								        } else {
 								          $("#load_pre_article").show();
-												AJAX载入文章数据

											
										
										
											2023-05-11 15:51:10 +08:00
+								        }
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      }
 								      function check_next(result_of_generate_article) {
 								        if (result_of_generate_article == "found") {
 								          $("#found").show();
 								          $("#not_found").hide();
 								          $("#read_all").hide();
 								        } else if (result_of_generate_article == "not found") {
 								          $("#found").hide();
 								          $("#not_found").show();
 								          $("#read_all").hide();
 								        } else {
 								          $("#found").hide();
 								          $("#not_found").hide();
 								          $("#read_all").show();
-												AJAX载入文章数据

											
										
										
											2023-05-11 15:51:10 +08:00
+								        }
-												Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin

											
										
										
											2023-05-24 14:41:42 +08:00
+								      }
 								    </script>
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								  </body>
 								  <style>
-												Repalce old app folder with SoftArch王炫/english-pal-master/app/

											
										
										
											2022-01-26 21:10:09 +08:00
+								    mark {
-												标注之前队伍的改动

											
										
										
											2023-02-21 20:05:48 +08:00
+								        color: #{{ yml['highlight']['color'] }};
 								        background-color: rgba(0, 0, 0, 0);
 								    }
-												Stop reading when user clicks next and previous button as well as selecting new text

											
										
										
											2023-04-25 15:51:39 +08:00
+								  </style>
-												templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐

											
										
										
											2022-01-27 20:15:26 +08:00
+								</html>