恭喜，你已成功注册， 你的用户名是 %s。
\ + ' % (username, username, username) + else: + return '用户名密码验证失败。' + + +@accountService.route("/login", methods=['GET', 'POST']) +def login(): + ''' + 登录 + :return: 根据登录是否成功返回不同页面 + ''' + if request.method == 'GET': + # GET请求 + if not session.get('logged_in'): + # 未登录，返回登录页面 + return render_template('login.html') + else: + # 已登录，提示信息并显示登出按钮 + return '你已登录 %s。 登出点击这里。' % ( + session['username'], session['username']) + elif request.method == 'POST': + # POST方法用于判断登录是否成功 + # check database and verify user + username = request.form['username'] + password = request.form['password'] + verified = verify_user(username, password) + if verified: + # 登录成功，写入session + session['logged_in'] = True + session[username] = username + session['username'] = username + user_expiry_date = get_expiry_date(username) + session['expiry_date'] = user_expiry_date + session['articleID'] = None + return redirect(url_for('user_bp.userpage', username=username)) + else: + return '无法通过验证。' + + +@accountService.route("/logout", methods=['GET', 'POST']) +def logout(): + ''' + 登出 + :return: 重定位到主界面 + ''' + # 将session标记为登出状态 + session['logged_in'] = False + return redirect(url_for('mainpage')) + + +@accountService.route("/reset", methods=['GET', 'POST']) +def reset(): + ''' + 重设密码 + :return: 返回适当的页面 + ''' + # 下列方法用于防止未登录状态下的修改密码 + if not session.get('logged_in'): + return render_template('login.html') + username = session['username'] + if username == '': + return redirect('/login') + if request.method == 'GET': + # GET请求返回修改密码页面 + return render_template('reset.html', username=session['username'], state='wait') + else: + # POST请求用于提交修改后信息 + old_psd = request.form['old-psd'] + new_psd = request.form['new-psd'] + flag = change_password(username, old_psd, new_psd) # flag表示是否修改成功 + if flag: + session['logged_in'] = False + return \ +''' + + +''' + + else: + return \ +''' + + +''' \ No newline at end of file diff --git a/app/layout/partial/footer.html b/app/layout/partial/footer.html new file mode 100644 index 0000000..329d585 --- /dev/null +++ b/app/layout/partial/footer.html @@ -0,0 +1,21 @@ + + \ No newline at end of file diff --git a/app/layout/partial/header.html b/app/layout/partial/header.html new file mode 100644 index 0000000..3d0f70a --- /dev/null +++ b/app/layout/partial/header.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/app/main.py b/app/main.py index 301d1bb..d903bf4 100644 --- a/app/main.py +++ b/app/main.py @@ -1,498 +1,114 @@ -#! /usr/bin/python3 -# -*- coding: utf-8 -*- - -########################################################################### -# Copyright 2019 (C) Hui LanAccording to your word list, your level is %4.2f and we have chosen an article with a difficulty level of %4.2f for you.
' % (user_level, text_level)
- s += 'Article added on: %s
' % (d['date']) - s += ''
- article_title = get_article_title(d['text'])
- article_body = get_article_body(d['text'])
- s += '
') - s += '%s' % (get_answer_part(d['question'])) - s += '
'
- session['articleID'] = d['article_id']
- return s
-
-
-def appears_in_test(word, d):
- if not word in d:
- return ''
- else:
- return ','.join(d[word])
-
-
-def get_time():
- return datetime.now().strftime('%Y%m%d%H%M') # upper to minutes
-
-
-def get_question_part(s):
- s = s.strip()
- result = []
- flag = 0
- for line in s.split('\n'):
- line = line.strip()
- if line == 'QUESTION':
- result.append(line)
- flag = 1
- elif line == 'ANSWER':
- flag = 0
- elif flag == 1:
- result.append(line)
- return '\n'.join(result)
-
-
-def get_answer_part(s):
- s = s.strip()
- result = []
- flag = 0
- for line in s.split('\n'):
- line = line.strip()
- if line == 'ANSWER':
- flag = 1
- elif flag == 1:
- result.append(line)
- # https://css-tricks.com/snippets/javascript/showhide-element/
- js = '''
-
- '''
- html_code = js
- html_code += '\n'
- html_code += '\n'
- html_code += '\n' % ('\n'.join(result))
- return html_code
-
-
-def get_flashed_messages_if_any():
- messages = get_flashed_messages()
- s = ''
- for message in messages:
- s += '%s
' % (article_title) - s += '%s
' % (article_body) - s += '%s
' % (d['source']) - s += '%s
' % (get_question_part(d['question'])) - s = s.replace('\n', '') - s += '%s' % (get_answer_part(d['question'])) - s += '
'
- s += f'Congratulations! {message}'
- s += '
'
- return s
-
-
-@app.route("/'
- page += '
'
- page += ''
- return page
-
-
-@app.route("/English Pal - Learn English smartly!
' - if session.get('logged_in'): - page += ' %s\n' % (session['username'], session['username']) - else: - page += '\n' - #page += '%s
' % (get_random_ads()) - page += '共有文章 %d 篇
' % (total_number_of_essays())
- page += '粘帖1篇文章 (English only)
' - page += '' - d = load_freq_history(path_prefix + 'static/frequency/frequency.p') - if len(d) > 0: - page += '最常见的词
' - for x in sort_in_descending_order(pickle_idea.dict2lst(d)): - if x[1] <= 99: - break - page += '%s %d\n' % (youdao_link(x[0]), x[0], x[1]) - - page += ' ' - page += '请先登录。
' - - user_expiry_date = session.get('expiry_date') - if datetime.now().strftime('%Y%m%d') > user_expiry_date: - return '账号 %s 过期。
为了提高服务质量，English Pal 收取会员费用， 每天0元。
请决定你要试用的时间长度，扫描下面支付宝二维码支付。 支付时请注明English Pal Membership Fee。 我们会于12小时内激活账号。
如果有问题，请加开发者微信 torontohui。
' % (username) - - - username = session.get('username') - - user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username) - - if request.method == 'POST': # when we submit a form - content = request.form['content'] - f = WordFreq(content) - lst = f.get_freq() - page = '' - page += '' - page += '勾选不认识的单词
' - page += '\n' - return page - - elif request.method == 'GET': # when we load a html page - page = '\n' - page += '\n' - page += '\n' # forbid treating numbers as cell numbers in smart phones - page += '' - page += ''
- page += '
'
- return page
-
-### Sign-up, login, logout ###
-@app.route("/signup", methods=['GET', 'POST'])
-def signup():
- if request.method == 'GET':
- return render_template('signup.html')
- elif request.method == 'POST':
- username = request.form['username']
- password = request.form['password']
-
- available = check_username_availability(username)
- if not available:
- flash('用户名 %s 已经被注册。' % (username))
- return render_template('signup.html')
- elif len(password.strip()) < 4:
- return '密码过于简单。'
- else:
- add_user(username, password)
- verified = verify_user(username, password)
- if verified:
- session['logged_in'] = True
- session[username] = username
- session['username'] = username
- session['expiry_date'] = get_expiry_date(username)
- session['articleID'] = None
- return 'English Pal for %s 登出
' % (username) - page += get_flashed_messages_if_any() - page += '阅读文章并回答问题
\n' - page += '' % (username) - page += '%s
' % (get_today_article(user_freq_record, session['articleID']))
- page += '收集生词吧 （可以在正文中划词，也可以复制黏贴）
' - page += '\n' - page += ''' - - ''' - if session.get('thisWord'): - page += ''' - - ''' - - d = load_freq_history(user_freq_record) - if len(d) > 0: - page += '我的生词簿
' - lst = pickle_idea2.dict2lst(d) - lst2 = [] - for t in lst: - lst2.append((t[0], len(t[1]))) - for x in sort_in_descending_order(lst2): - word = x[0] - freq = x[1] - if session.get('thisWord') == x[0] and session.get('time') == 1: - page += '' # 3. anchor - session['time'] = 0 # discard anchor - if isinstance(d[word], list): # d[word] is a list of dates - if freq > 1: - page += '\n' % (youdao_link(word), word, '; '.join(d[word]), freq,username, word,username,word, username,word) - else: - page += '\n' % (youdao_link(word), word, '; '.join(d[word]), freq,username, word,username,word, username,word) - elif isinstance(d[word], int): # d[word] is a frequency. to migrate from old format. - page += '%s%d\n' % (youdao_link(word), word, freq) - page += '' - page += '恭喜，你已成功注册， 你的用户名是 %s。
\ - ' % (username, username, username) - else: - return '用户名密码验证失败。' - - -@app.route("/login", methods=['GET', 'POST']) -def login(): - if request.method == 'GET': - if not session.get('logged_in'): - return render_template('login.html') - else: - return '你已登录 %s。 登出点击这里。' % (session['username'], session['username']) - elif request.method == 'POST': - # check database and verify user - username = request.form['username'] - password = request.form['password'] - verified = verify_user(username, password) - if verified: - session['logged_in'] = True - session[username] = username - session['username'] = username - user_expiry_date = get_expiry_date(username) - session['expiry_date'] = user_expiry_date - session['articleID'] = None - return redirect(url_for('userpage', username=username)) - else: - return '无法通过验证。' - - -@app.route("/logout", methods=['GET', 'POST']) -def logout(): - session['logged_in'] = False - return redirect(url_for('mainpage')) - - -if __name__ == '__main__': - #app.secret_key = os.urandom(16) - #app.run(debug=False, port='6000') - app.run(debug=True) - #app.run(debug=True, port='6000') - #app.run(host='0.0.0.0', debug=True, port='6000') +#! /usr/bin/python3 +# -*- coding: utf-8 -*- + +########################################################################### +# Copyright 2019 (C) Hui Lan 1) for (var n = 1; n < arguments.length; n++) t[n - 1] = arguments[n];
+ c.push(new f(e, t)), 1 !== c.length || p || l(y)
+ }, f.prototype.run = function () {
+ this.fun.apply(null, this.array)
+ }, r.title = "browser", r.browser = !0, r.env = {}, r.argv = [], r.version = "", r.versions = {}, r.on = v, r.addListener = v, r.once = v, r.off = v, r.removeListener = v, r.removeAllListeners = v, r.emit = v, r.prependListener = v, r.prependOnceListener = v, r.listeners = function (e) {
+ return []
+ }, r.binding = function (e) {
+ throw new Error("process.binding is not supported")
+ }, r.cwd = function () {
+ return "/"
+ }, r.chdir = function (e) {
+ throw new Error("process.chdir is not supported")
+ }, r.umask = function () {
+ return 0
+ }
+ }, function (e, t, n) {
+ "use strict";
+ (function (e, t) {
+ !function (e, n) {
+ if (!e.setImmediate) {
+ var i, a, r, o, s, l = 1, u = {}, c = !1, p = e.document,
+ d = Object.getPrototypeOf && Object.getPrototypeOf(e);
+ d = d && d.setTimeout ? d : e, "[object process]" === {}.toString.call(e.process) ? i = function (e) {
+ t.nextTick(function () {
+ y(e)
+ })
+ } : !function () {
+ if (e.postMessage && !e.importScripts) {
+ var t = !0, n = e.onmessage;
+ return e.onmessage = function () {
+ t = !1
+ }, e.postMessage("", "*"), e.onmessage = n, t
+ }
+ }() ? e.MessageChannel ? ((r = new MessageChannel).port1.onmessage = function (e) {
+ y(e.data)
+ }, i = function (e) {
+ r.port2.postMessage(e)
+ }) : p && "onreadystatechange" in p.createElement("script") ? (a = p.documentElement, i = function (e) {
+ var t = p.createElement("script");
+ t.onreadystatechange = function () {
+ y(e), t.onreadystatechange = null, a.removeChild(t), t = null
+ }, a.appendChild(t)
+ }) : i = function (e) {
+ setTimeout(y, 0, e)
+ } : (o = "setImmediate$" + Math.random() + "$", s = function (t) {
+ t.source === e && "string" == typeof t.data && 0 === t.data.indexOf(o) && y(+t.data.slice(o.length))
+ }, e.addEventListener ? e.addEventListener("message", s, !1) : e.attachEvent("onmessage", s), i = function (t) {
+ e.postMessage(o + t, "*")
+ }), d.setImmediate = function (e) {
+ "function" != typeof e && (e = new Function("" + e));
+ for (var t = new Array(arguments.length - 1), n = 0; n < t.length; n++) t[n] = arguments[n + 1];
+ var a = {callback: e, args: t};
+ return u[l] = a, i(l), l++
+ }, d.clearImmediate = h
+ }
+
+ function h(e) {
+ delete u[e]
+ }
+
+ function y(e) {
+ if (c) setTimeout(y, 0, e); else {
+ var t = u[e];
+ if (t) {
+ c = !0;
+ try {
+ !function (e) {
+ var t = e.callback, i = e.args;
+ switch (i.length) {
+ case 0:
+ t();
+ break;
+ case 1:
+ t(i[0]);
+ break;
+ case 2:
+ t(i[0], i[1]);
+ break;
+ case 3:
+ t(i[0], i[1], i[2]);
+ break;
+ default:
+ t.apply(n, i)
+ }
+ }(t)
+ } finally {
+ h(e), c = !1
+ }
+ }
+ }
+ }
+ }("undefined" == typeof self ? void 0 === e ? void 0 : e : self)
+ }).call(this, n(4), n(34))
+ }, function (e, t, n) {
+ "use strict";
+ var i = Function.prototype.apply;
+
+ function a(e, t) {
+ this._id = e, this._clearFn = t
+ }
+
+ t.setTimeout = function () {
+ return new a(i.call(setTimeout, window, arguments), clearTimeout)
+ }, t.setInterval = function () {
+ return new a(i.call(setInterval, window, arguments), clearInterval)
+ }, t.clearTimeout = t.clearInterval = function (e) {
+ e && e.close()
+ }, a.prototype.unref = a.prototype.ref = function () {
+ }, a.prototype.close = function () {
+ this._clearFn.call(window, this._id)
+ }, t.enroll = function (e, t) {
+ clearTimeout(e._idleTimeoutId), e._idleTimeout = t
+ }, t.unenroll = function (e) {
+ clearTimeout(e._idleTimeoutId), e._idleTimeout = -1
+ }, t._unrefActive = t.active = function (e) {
+ clearTimeout(e._idleTimeoutId);
+ var t = e._idleTimeout;
+ t >= 0 && (e._idleTimeoutId = setTimeout(function () {
+ e._onTimeout && e._onTimeout()
+ }, t))
+ }, n(35), t.setImmediate = setImmediate, t.clearImmediate = clearImmediate
+ }, function (e, t, n) {
+ "use strict";
+ (function (t) {
+ var n = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (e) {
+ return typeof e
+ } : function (e) {
+ return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e
+ }, i = setTimeout;
+
+ function a() {
+ }
+
+ function r(e) {
+ if (!(this instanceof r)) throw new TypeError("Promises must be constructed via new");
+ if ("function" != typeof e) throw new TypeError("not a function");
+ this._state = 0, this._handled = !1, this._value = void 0, this._deferreds = [], c(e, this)
+ }
+
+ function o(e, t) {
+ for (; 3 === e._state;) e = e._value;
+ 0 !== e._state ? (e._handled = !0, r._immediateFn(function () {
+ var n = 1 === e._state ? t.onFulfilled : t.onRejected;
+ if (null !== n) {
+ var i;
+ try {
+ i = n(e._value)
+ } catch (e) {
+ return void l(t.promise, e)
+ }
+ s(t.promise, i)
+ } else (1 === e._state ? s : l)(t.promise, e._value)
+ })) : e._deferreds.push(t)
+ }
+
+ function s(e, t) {
+ try {
+ if (t === e) throw new TypeError("A promise cannot be resolved with itself.");
+ if (t && ("object" === (void 0 === t ? "undefined" : n(t)) || "function" == typeof t)) {
+ var i = t.then;
+ if (t instanceof r) return e._state = 3, e._value = t, void u(e);
+ if ("function" == typeof i) return void c((a = i, o = t, function () {
+ a.apply(o, arguments)
+ }), e)
+ }
+ e._state = 1, e._value = t, u(e)
+ } catch (t) {
+ l(e, t)
+ }
+ var a, o
+ }
+
+ function l(e, t) {
+ e._state = 2, e._value = t, u(e)
+ }
+
+ function u(e) {
+ 2 === e._state && 0 === e._deferreds.length && r._immediateFn(function () {
+ e._handled || r._unhandledRejectionFn(e._value)
+ });
+ for (var t = 0, n = e._deferreds.length; t < n; t++) o(e, e._deferreds[t]);
+ e._deferreds = null
+ }
+
+ function c(e, t) {
+ var n = !1;
+ try {
+ e(function (e) {
+ n || (n = !0, s(t, e))
+ }, function (e) {
+ n || (n = !0, l(t, e))
+ })
+ } catch (e) {
+ if (n) return;
+ n = !0, l(t, e)
+ }
+ }
+
+ r.prototype.catch = function (e) {
+ return this.then(null, e)
+ }, r.prototype.then = function (e, t) {
+ var n = new this.constructor(a);
+ return o(this, new function (e, t, n) {
+ this.onFulfilled = "function" == typeof e ? e : null, this.onRejected = "function" == typeof t ? t : null, this.promise = n
+ }(e, t, n)), n
+ }, r.prototype.finally = function (e) {
+ var t = this.constructor;
+ return this.then(function (n) {
+ return t.resolve(e()).then(function () {
+ return n
+ })
+ }, function (n) {
+ return t.resolve(e()).then(function () {
+ return t.reject(n)
+ })
+ })
+ }, r.all = function (e) {
+ return new r(function (t, i) {
+ if (!e || void 0 === e.length) throw new TypeError("Promise.all accepts an array");
+ var a = Array.prototype.slice.call(e);
+ if (0 === a.length) return t([]);
+ var r = a.length;
+
+ function o(e, s) {
+ try {
+ if (s && ("object" === (void 0 === s ? "undefined" : n(s)) || "function" == typeof s)) {
+ var l = s.then;
+ if ("function" == typeof l) return void l.call(s, function (t) {
+ o(e, t)
+ }, i)
+ }
+ a[e] = s, 0 == --r && t(a)
+ } catch (e) {
+ i(e)
+ }
+ }
+
+ for (var s = 0; s < a.length; s++) o(s, a[s])
+ })
+ }, r.resolve = function (e) {
+ return e && "object" === (void 0 === e ? "undefined" : n(e)) && e.constructor === r ? e : new r(function (t) {
+ t(e)
+ })
+ }, r.reject = function (e) {
+ return new r(function (t, n) {
+ n(e)
+ })
+ }, r.race = function (e) {
+ return new r(function (t, n) {
+ for (var i = 0, a = e.length; i < a; i++) e[i].then(t, n)
+ })
+ }, r._immediateFn = "function" == typeof t && function (e) {
+ t(e)
+ } || function (e) {
+ i(e, 0)
+ }, r._unhandledRejectionFn = function (e) {
+ "undefined" != typeof console && console && console.warn("Possible Unhandled Promise Rejection:", e)
+ }, e.exports = r
+ }).call(this, n(36).setImmediate)
+ }, function (e, t, n) {
+ "use strict";
+ Object.defineProperty(t, "__esModule", {value: !0});
+ var i = function () {
+ function e(e, t) {
+ for (var n = 0; n < t.length; n++) {
+ var i = t[n];
+ i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(e, i.key, i)
+ }
+ }
+
+ return function (t, n, i) {
+ return n && e(t.prototype, n), i && e(t, i), t
+ }
+ }(), a = v(n(37)), r = v(n(0)), o = v(n(3)), s = v(n(18)), l = v(n(17)), u = v(n(13)), c = v(n(12)),
+ p = v(n(11)), d = v(n(9)), h = v(n(8)), y = v(n(7)), f = v(n(6));
+
+ function v(e) {
+ return e && e.__esModule ? e : {default: e}
+ }
+
+ var m = [], g = function () {
+ function e(t) {
+ if (function (e, t) {
+ if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function")
+ }(this, e), this.options = (0, s.default)(t), this.container = this.options.container, this.paused = !0, this.playedPromise = a.default.resolve(), this.mode = "normal", this.randomOrder = r.default.randomOrder(this.options.audio.length), this.container.classList.add("aplayer"), this.options.lrcType && !this.options.fixed && this.container.classList.add("aplayer-withlrc"), this.options.audio.length > 1 && this.container.classList.add("aplayer-withlist"), r.default.isMobile && this.container.classList.add("aplayer-mobile"), this.arrow = this.container.offsetWidth <= 300, this.arrow && this.container.classList.add("aplayer-arrow"), this.container = this.options.container, 2 === this.options.lrcType || !0 === this.options.lrcType) for (var n = this.container.getElementsByClassName("aplayer-lrc-content"), i = 0; i < n.length; i++) this.options.audio[i] && (this.options.audio[i].lrc = n[i].innerHTML);
+ this.template = new l.default({
+ container: this.container,
+ options: this.options,
+ randomOrder: this.randomOrder
+ }), this.options.fixed && (this.container.classList.add("aplayer-fixed"), this.template.body.style.width = this.template.body.offsetWidth - 18 + "px"), this.options.mini && (this.setMode("mini"), this.template.info.style.display = "block"), this.template.info.offsetWidth < 200 && this.template.time.classList.add("aplayer-time-narrow"), this.options.lrcType && (this.lrc = new p.default({
+ container: this.template.lrc,
+ async: 3 === this.options.lrcType,
+ player: this
+ })), this.events = new y.default, this.storage = new c.default(this), this.bar = new u.default(this.template), this.controller = new d.default(this), this.timer = new h.default(this), this.list = new f.default(this), this.initAudio(), this.bindEvents(), "random" === this.options.order ? this.list.switch(this.randomOrder[0]) : this.list.switch(0), this.options.autoplay && this.play(), m.push(this)
+ }
+
+ return i(e, [{
+ key: "initAudio", value: function () {
+ var e = this;
+ this.audio = document.createElement("audio"), this.audio.preload = this.options.preload;
+ for (var t = function (t) {
+ e.audio.addEventListener(e.events.audioEvents[t], function (n) {
+ e.events.trigger(e.events.audioEvents[t], n)
+ })
+ }, n = 0; n < this.events.audioEvents.length; n++) t(n);
+ this.volume(this.storage.get("volume"), !0)
+ }
+ }, {
+ key: "bindEvents", value: function () {
+ var e = this;
+ this.on("play", function () {
+ e.paused && e.setUIPlaying()
+ }), this.on("pause", function () {
+ e.paused || e.setUIPaused()
+ }), this.on("timeupdate", function () {
+ if (!e.disableTimeupdate) {
+ e.bar.set("played", e.audio.currentTime / e.duration, "width"), e.lrc && e.lrc.update();
+ var t = r.default.secondToTime(e.audio.currentTime);
+ e.template.ptime.innerHTML !== t && (e.template.ptime.innerHTML = t)
+ }
+ }), this.on("durationchange", function () {
+ 1 !== e.duration && (e.template.dtime.innerHTML = r.default.secondToTime(e.duration))
+ }), this.on("progress", function () {
+ var t = e.audio.buffered.length ? e.audio.buffered.end(e.audio.buffered.length - 1) / e.duration : 0;
+ e.bar.set("loaded", t, "width")
+ });
+ var t = void 0;
+ this.on("error", function () {
+ e.list.audios.length > 1 ? (e.notice("An audio error has occurred, player will skip forward in 2 seconds."), t = setTimeout(function () {
+ e.skipForward(), e.paused || e.play()
+ }, 2e3)) : 1 === e.list.audios.length && e.notice("An audio error has occurred.")
+ }), this.events.on("listswitch", function () {
+ t && clearTimeout(t)
+ }), this.on("ended", function () {
+ "none" === e.options.loop ? "list" === e.options.order ? e.list.index < e.list.audios.length - 1 ? (e.list.switch((e.list.index + 1) % e.list.audios.length), e.play()) : (e.list.switch((e.list.index + 1) % e.list.audios.length), e.pause()) : "random" === e.options.order && (e.randomOrder.indexOf(e.list.index) < e.randomOrder.length - 1 ? (e.list.switch(e.nextIndex()), e.play()) : (e.list.switch(e.nextIndex()), e.pause())) : "one" === e.options.loop ? (e.list.switch(e.list.index), e.play()) : "all" === e.options.loop && (e.skipForward(), e.play())
+ })
+ }
+ }, {
+ key: "setAudio", value: function (e) {
+ this.hls && (this.hls.destroy(), this.hls = null);
+ var t = e.type;
+ this.options.customAudioType && this.options.customAudioType[t] ? "[object Function]" === Object.prototype.toString.call(this.options.customAudioType[t]) ? this.options.customAudioType[t](this.audio, e, this) : console.error("Illegal customType: " + t) : (t && "auto" !== t || (t = /m3u8(#|\?|$)/i.exec(e.url) ? "hls" : "normal"), "hls" === t ? Hls.isSupported() ? (this.hls = new Hls, this.hls.loadSource(e.url), this.hls.attachMedia(this.audio)) : this.audio.canPlayType("application/x-mpegURL") || this.audio.canPlayType("application/vnd.apple.mpegURL") ? this.audio.src = e.url : this.notice("Error: HLS is not supported.") : "normal" === t && (this.audio.src = e.url)), this.seek(0), this.paused || this.audio.play()
+ }
+ }, {
+ key: "theme", value: function () {
+ var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : this.list.audios[this.list.index].theme || this.options.theme,
+ t = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : this.list.index;
+ (!(arguments.length > 2 && void 0 !== arguments[2]) || arguments[2]) && this.list.audios[t] && (this.list.audios[t].theme = e), this.template.listCurs[t] && (this.template.listCurs[t].style.backgroundColor = e), t === this.list.index && (this.template.pic.style.backgroundColor = e, this.template.played.style.background = e, this.template.thumb.style.background = e, this.template.volume.style.background = e)
+ }
+ }, {
+ key: "seek", value: function (e) {
+ e = Math.max(e, 0), e = Math.min(e, this.duration), this.audio.currentTime = e, this.bar.set("played", e / this.duration, "width"), this.template.ptime.innerHTML = r.default.secondToTime(e)
+ }
+ }, {
+ key: "setUIPlaying", value: function () {
+ var e = this;
+ if (this.paused && (this.paused = !1, this.template.button.classList.remove("aplayer-play"), this.template.button.classList.add("aplayer-pause"), this.template.button.innerHTML = "", setTimeout(function () {
+ e.template.button.innerHTML = o.default.pause
+ }, 100), this.template.skipPlayButton.innerHTML = o.default.pause), this.timer.enable("loading"), this.options.mutex) for (var t = 0; t < m.length; t++) this !== m[t] && m[t].pause()
+ }
+ }, {
+ key: "play", value: function () {
+ var e = this;
+ this.setUIPlaying();
+ var t = this.audio.play();
+ t && t.catch(function (t) {
+ console.warn(t), "NotAllowedError" === t.name && e.setUIPaused()
+ })
+ }
+ }, {
+ key: "setUIPaused", value: function () {
+ var e = this;
+ this.paused || (this.paused = !0, this.template.button.classList.remove("aplayer-pause"), this.template.button.classList.add("aplayer-play"), this.template.button.innerHTML = "", setTimeout(function () {
+ e.template.button.innerHTML = o.default.play
+ }, 100), this.template.skipPlayButton.innerHTML = o.default.play), this.container.classList.remove("aplayer-loading"), this.timer.disable("loading")
+ }
+ }, {
+ key: "pause", value: function () {
+ this.setUIPaused(), this.audio.pause()
+ }
+ }, {
+ key: "switchVolumeIcon", value: function () {
+ this.volume() >= .95 ? this.template.volumeButton.innerHTML = o.default.volumeUp : this.volume() > 0 ? this.template.volumeButton.innerHTML = o.default.volumeDown : this.template.volumeButton.innerHTML = o.default.volumeOff
+ }
+ }, {
+ key: "volume", value: function (e, t) {
+ return e = parseFloat(e), isNaN(e) || (e = Math.max(e, 0), e = Math.min(e, 1), this.bar.set("volume", e, "height"), t || this.storage.set("volume", e), this.audio.volume = e, this.audio.muted && (this.audio.muted = !1), this.switchVolumeIcon()), this.audio.muted ? 0 : this.audio.volume
+ }
+ }, {
+ key: "on", value: function (e, t) {
+ this.events.on(e, t)
+ }
+ }, {
+ key: "toggle", value: function () {
+ this.template.button.classList.contains("aplayer-play") ? this.play() : this.template.button.classList.contains("aplayer-pause") && this.pause()
+ }
+ }, {
+ key: "switchAudio", value: function (e) {
+ this.list.switch(e)
+ }
+ }, {
+ key: "addAudio", value: function (e) {
+ this.list.add(e)
+ }
+ }, {
+ key: "removeAudio", value: function (e) {
+ this.list.remove(e)
+ }
+ }, {
+ key: "destroy", value: function () {
+ m.splice(m.indexOf(this), 1), this.pause(), this.container.innerHTML = "", this.audio.src = "", this.timer.destroy(), this.events.trigger("destroy")
+ }
+ }, {
+ key: "setMode", value: function () {
+ var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "normal";
+ this.mode = e, "mini" === e ? this.container.classList.add("aplayer-narrow") : "normal" === e && this.container.classList.remove("aplayer-narrow")
+ }
+ }, {
+ key: "notice", value: function (e) {
+ var t = this, n = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : 2e3,
+ i = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : .8;
+ this.template.notice.innerHTML = e, this.template.notice.style.opacity = i, this.noticeTime && clearTimeout(this.noticeTime), this.events.trigger("noticeshow", {text: e}), n && (this.noticeTime = setTimeout(function () {
+ t.template.notice.style.opacity = 0, t.events.trigger("noticehide")
+ }, n))
+ }
+ }, {
+ key: "prevIndex", value: function () {
+ if (!(this.list.audios.length > 1)) return 0;
+ if ("list" === this.options.order) return this.list.index - 1 < 0 ? this.list.audios.length - 1 : this.list.index - 1;
+ if ("random" === this.options.order) {
+ var e = this.randomOrder.indexOf(this.list.index);
+ return 0 === e ? this.randomOrder[this.randomOrder.length - 1] : this.randomOrder[e - 1]
+ }
+ }
+ }, {
+ key: "nextIndex", value: function () {
+ if (!(this.list.audios.length > 1)) return 0;
+ if ("list" === this.options.order) return (this.list.index + 1) % this.list.audios.length;
+ if ("random" === this.options.order) {
+ var e = this.randomOrder.indexOf(this.list.index);
+ return e === this.randomOrder.length - 1 ? this.randomOrder[0] : this.randomOrder[e + 1]
+ }
+ }
+ }, {
+ key: "skipBack", value: function () {
+ this.list.switch(this.prevIndex())
+ }
+ }, {
+ key: "skipForward", value: function () {
+ this.list.switch(this.nextIndex())
+ }
+ }, {
+ key: "duration", get: function () {
+ return isNaN(this.audio.duration) ? 0 : this.audio.duration
+ }
+ }], [{
+ key: "version", get: function () {
+ return "1.10.1"
+ }
+ }]), e
+ }();
+ t.default = g
+ }, , function (e, t, n) {
+ }, function (e, t, n) {
+ "use strict";
+ Object.defineProperty(t, "__esModule", {value: !0}), n(40);
+ var i, a = n(38), r = (i = a) && i.__esModule ? i : {default: i};
+ console.log("\n %c APlayer v1.10.1 af84efb %c http://aplayer.js.org \n", "color: #fadfa3; background: #030307; padding:5px 0;", "background: #fadfa3; padding:5px 0;"), t.default = r.default
+ }]).default
+});
+//# sourceMappingURL=APlayer.min.js.map
\ No newline at end of file
diff --git a/app/static/js/Meting.js b/app/static/js/Meting.js
new file mode 100644
index 0000000..293bb59
--- /dev/null
+++ b/app/static/js/Meting.js
@@ -0,0 +1,84 @@
+"use strict";
+
+function _objectSpread(a) {
+ for (var b = 1; b < arguments.length; b++) {
+ var c = null == arguments[b] ? {} : arguments[b], d = Object.keys(c);
+ "function" == typeof Object.getOwnPropertySymbols && (d = d.concat(Object.getOwnPropertySymbols(c).filter(function (a) {
+ return Object.getOwnPropertyDescriptor(c, a).enumerable
+ }))), d.forEach(function (b) {
+ _defineProperty(a, b, c[b])
+ })
+ }
+ return a
+}
+
+function _defineProperty(a, b, c) {
+ return b in a ? Object.defineProperty(a, b, {
+ value: c,
+ enumerable: !0,
+ configurable: !0,
+ writable: !0
+ }) : a[b] = c, a
+}
+
+class MetingJSElement extends HTMLElement {
+ connectedCallback() {
+ window.APlayer && window.fetch && (this._init(), this._parse())
+ }
+
+ disconnectedCallback() {
+ this.lock || this.aplayer.destroy()
+ }
+
+ _camelize(a) {
+ return a.replace(/^[_.\- ]+/, "").toLowerCase().replace(/[_.\- ]+(\w|$)/g, (a, b) => b.toUpperCase())
+ }
+
+ _init() {
+ let a = {};
+ for (let b = 0; b < this.attributes.length; b += 1) a[this._camelize(this.attributes[b].name)] = this.attributes[b].value;
+ let b = ["server", "type", "id", "api", "auth", "auto", "lock", "name", "title", "artist", "author", "url", "cover", "pic", "lyric", "lrc"];
+ this.meta = {};
+ for (var c = 0; c < b.length; c++) {
+ let d = b[c];
+ this.meta[d] = a[d], delete a[d]
+ }
+ this.config = a, this.api = this.meta.api || window.meting_api || "https://api.i-meto.com/meting/api?server=:server&type=:type&id=:id&r=:r", this.meta.auto && this._parse_link()
+ }
+
+ _parse_link() {
+ let a = [["music.163.com.*song.*id=(\\d+)", "netease", "song"], ["music.163.com.*album.*id=(\\d+)", "netease", "album"], ["music.163.com.*artist.*id=(\\d+)", "netease", "artist"], ["music.163.com.*playlist.*id=(\\d+)", "netease", "playlist"], ["music.163.com.*discover/toplist.*id=(\\d+)", "netease", "playlist"], ["y.qq.com.*song/(\\w+).html", "tencent", "song"], ["y.qq.com.*album/(\\w+).html", "tencent", "album"], ["y.qq.com.*singer/(\\w+).html", "tencent", "artist"], ["y.qq.com.*playsquare/(\\w+).html", "tencent", "playlist"], ["y.qq.com.*playlist/(\\w+).html", "tencent", "playlist"], ["xiami.com.*song/(\\w+)", "xiami", "song"], ["xiami.com.*album/(\\w+)", "xiami", "album"], ["xiami.com.*artist/(\\w+)", "xiami", "artist"], ["xiami.com.*collect/(\\w+)", "xiami", "playlist"]];
+ for (var b = 0; b < a.length; b++) {
+ let c = a[b], d = new RegExp(c[0]), e = d.exec(this.meta.auto);
+ if (null !== e) return this.meta.server = c[1], this.meta.type = c[2], void (this.meta.id = e[1])
+ }
+ }
+
+ _parse() {
+ if (this.meta.url) {
+ let a = {
+ name: this.meta.name || this.meta.title || "Audio name",
+ artist: this.meta.artist || this.meta.author || "Audio artist",
+ url: this.meta.url,
+ cover: this.meta.cover || this.meta.pic,
+ lrc: this.meta.lrc || this.meta.lyric || "",
+ type: this.meta.type || "auto"
+ };
+ return a.lrc || (this.meta.lrcType = 0), this.innerText && (a.lrc = this.innerText, this.meta.lrcType = 2), void this._loadPlayer([a])
+ }
+ let a = this.api.replace(":server", this.meta.server).replace(":type", this.meta.type).replace(":id", this.meta.id).replace(":auth", this.meta.auth).replace(":r", Math.random());
+ fetch(a).then(a => a.json()).then(a => this._loadPlayer(a))
+ }
+
+ _loadPlayer(a) {
+ let b = {audio: a, mutex: !0, lrcType: this.meta.lrcType || 3, storageName: "metingjs"};
+ if (a.length) {
+ let a = _objectSpread({}, b, this.config);
+ for (let b in a) ("true" === a[b] || "false" === a[b]) && (a[b] = "true" === a[b]);
+ let c = document.createElement("div");
+ a.container = c, this.appendChild(c), this.aplayer = new APlayer(a)
+ }
+ }
+}
+
+console.log("\n %c MetingJS v2.0.1 %c https://github.com/metowolf/MetingJS \n", "color: #fadfa3; background: #030307; padding:5px 0;", "background: #fadfa3; padding:5px 0;"), window.customElements && !window.customElements.get("meting-js") && (window.MetingJSElement = MetingJSElement, window.customElements.define("meting-js", MetingJSElement));
\ No newline at end of file
diff --git a/app/static/js/fillword.js b/app/static/js/fillword.js
new file mode 100644
index 0000000..3e3fbd9
--- /dev/null
+++ b/app/static/js/fillword.js
@@ -0,0 +1,29 @@
+isRead = true;
+isChoose = true;
+var reader = window.speechSynthesis; // 全局定义朗读者，以便朗读和暂停
+
+function getWord(){
+ var word = window.getSelection?window.getSelection():document.selection.createRange().text;
+ return word;
+}
+function fillinWord(){
+ var word = getWord();
+ if (isRead) read(word);
+ if (!isChoose) return;
+ var element = document.getElementById("selected-words");
+ element.value = element.value + " " + word;
+}
+document.getElementById("text-content").addEventListener("click", fillinWord, false);
+function read(s){
+ var msg = new SpeechSynthesisUtterance(s);
+ reader.speak(msg);
+}
+function onReadClick(){
+ isRead = !isRead;
+ if(!isRead){
+ reader.cancel();
+ }
+}
+function onChooseClick(){
+ isChoose = !isChoose;
+}
\ No newline at end of file
diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
new file mode 100644
index 0000000..2e0d84a
--- /dev/null
+++ b/app/static/js/highlight.js
@@ -0,0 +1,95 @@
+var isHighlight = true;
+
+function cancelBtnHandler() {
+ cancel_highLight();
+ document.getElementById("text-content").removeEventListener("click", fillinWord, false);
+ document.getElementById("text-content").removeEventListener("touchstart", fillinWord, false);
+ document.getElementById("text-content").addEventListener("click", fillinWord2, false);
+ document.getElementById("text-content").addEventListener("touchstart", fillinWord2, false);
+}
+
+function showBtnHandler() {
+ document.getElementById("text-content").removeEventListener("click", fillinWord2, false);
+ document.getElementById("text-content").removeEventListener("touchstart", fillinWord2, false);
+ document.getElementById("text-content").addEventListener("click", fillinWord, false);
+ document.getElementById("text-content").addEventListener("touchstart", fillinWord, false);
+ highLight();
+}
+
+function getWord() {
+ var word = window.getSelection ? window.getSelection() : document.selection.createRange().text;
+ return word;
+}
+
+function highLight() {
+ if(!isHighlight) return;
+ var txt = document.getElementById("article").innerText;
+ var sel_word1 = document.getElementById("selected-words");
+ var sel_word2 = document.getElementById("selected-words2");
+ if (sel_word1 != null) {
+ var list = sel_word1.value.split(" ");
+ for (var i = 0; i < list.length; ++i) {
+ list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
+ if (list[i] != "" && "".indexOf(list[i]) == -1 && "".indexOf(list[i]) == -1) {
+ txt = txt.replace(new RegExp(list[i], "g"), "" + list[i] + "");
+ }
+ }
+ }
+ if (sel_word2 != null) {
+ var list2 = sel_word2.value.split(" ");
+ for (var i = 0; i < list2.length; ++i) {
+ list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
+ if (list2[i] != "" && "".indexOf(list2[i]) == -1 && "".indexOf(list2[i]) == -1) {
+ txt = txt.replace(new RegExp(list2[i], "g"), "" + list2[i] + "");
+ }
+ }
+ }
+ document.getElementById("article").innerHTML = txt;
+}
+
+function cancel_highLight() {
+ var txt = document.getElementById("article").innerText;
+ var sel_word1 = document.getElementById("selected-words");
+ var sel_word2 = document.getElementById("selected-words2");
+ if (sel_word1 != null) {
+ var list = sel_word1.value.split(" ");
+ for (var i = 0; i < list.length; ++i) {
+ list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");
+ if (list[i] != "") {
+ txt = txt.replace("" + list[i] + "", "list[i]");
+ }
+ }
+ }
+ if (sel_word2 != null) {
+ var list2 = sel_word1.value.split(" ");
+ for (var i = 0; i < list2.length; ++i) {
+ var list2 = sel_word2.value.split(" ");
+ list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, "");
+ if (list2[i] != "") {
+ txt = txt.replace("" + list[i] + "", "list[i]");
+ }
+ }
+ }
+ document.getElementById("article").innerHTML = txt;
+}
+
+function fillinWord() {
+ highLight();
+}
+
+function fillinWord2() {
+ cancel_highLight();
+}
+
+function ChangeHighlight() {
+ if (isHighlight) {
+ isHighlight = false;
+ cancel_highLight();
+ } else {
+ isHighlight = true;
+ highLight();
+
+ }
+}
+
+showBtnHandler();
diff --git a/app/static/usr/instructions.html b/app/static/usr/instructions.html
index 38126d7..d352523 100644
--- a/app/static/usr/instructions.html
+++ b/app/static/usr/instructions.html
@@ -1,86 +1,86 @@
-
-
-
-
-
- 怎么用English Pal
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 怎么用English Pal
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/templates/login.html b/app/templates/login.html
index ff11c74..e56b678 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,15 +1,21 @@
-{% block body %}
-{% if session['logged_in'] %}
-
-You're logged in already!
-
-{% else %}
-
-
-{% endif %}
-{% endblock %}
-
+{% block body %}
+{% if session['logged_in'] %}
+
+You're logged in already!
+
+{% else %}
+
+
+{% endif %}
+{% endblock %}
+
diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
new file mode 100644
index 0000000..66225a6
--- /dev/null
+++ b/app/templates/mainpage_get.html
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ {{ yml['header'] | safe }}
+ {% if yml['css']['item'] %}
+ {% for css in yml['css']['item'] %}
+
+ {% endfor %}
+ {% endif %}
+ {% if yml['js']['head'] %}
+ {% for js in yml['js']['head'] %}
+
+ {% endfor %}
+ {% endif %}
+
+ EnglishPal 英文单词高效记
+
+
+
+ Title
+
+ {{ yml['header'] | safe }}
+ {% if yml['css']['item'] %}
+ {% for css in yml['css']['item'] %}
+
+ {% endfor %}
+ {% endif %}
+ {% if yml['js']['head'] %}
+ {% for js in yml['js']['head'] %}
+
+ {% endfor %}
+ {% endif %}
+
+
+
+
+ {{ yml['footer'] | safe }}
+{% if yml['js']['bottom'] %}
+ {% for js in yml['js']['bottom'] %}
+
+ {% endfor %}
+ {% endif %}
+
+
\ No newline at end of file
diff --git a/app/templates/not_login.html b/app/templates/not_login.html
new file mode 100644
index 0000000..b268be0
--- /dev/null
+++ b/app/templates/not_login.html
@@ -0,0 +1,5 @@
+{% block body %}
+{% if not session['logged_in'] %}
+ 账号过期
+
+
+ EnglishPal Study Room for {{ username }}
+
+
+EnglishPal Study Room for {{username}}
+
+
+ /reset", methods=['GET', 'POST'])
+def user_reset(username):
+ '''
+ 用户界面
+ :param username: 用户名
+ :return: 返回页面内容
+ '''
+ if request.method == 'GET':
+ session['articleID'] = None
+ return redirect(url_for('user_bp.userpage', username=username))
+ else:
+ return 'Under construction'
+
+
+@userService.route("///unfamiliar", methods=['GET', 'POST'])
+def unfamiliar(username, word):
+ '''
+
+ :param username:
+ :param word:
+ :return:
+ '''
+ user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
+ pickle_idea.unfamiliar(user_freq_record, word)
+ session['thisWord'] = word # 1. put a word into session
+ session['time'] = 1
+ return redirect(url_for('user_bp.userpage', username=username))
+
+
+@userService.route("///familiar", methods=['GET', 'POST'])
+def familiar(username, word):
+ '''
+
+ :param username:
+ :param word:
+ :return:
+ '''
+ user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
+ pickle_idea.familiar(user_freq_record, word)
+ session['thisWord'] = word # 1. put a word into session
+ session['time'] = 1
+ return redirect(url_for('user_bp.userpage', username=username))
+
+
+@userService.route("///del", methods=['GET', 'POST'])
+def deleteword(username, word):
+ '''
+ 删除单词
+ :param username: 用户名
+ :param word: 单词
+ :return: 重定位到用户界面
+ '''
+ user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
+ pickle_idea2.deleteRecord(user_freq_record, word)
+ flash(f'{word} is no longer in your word list.')
+ return redirect(url_for('user_bp.userpage', username=username))
+
+
+@userService.route("/", methods=['GET', 'POST'])
+def userpage(username):
+ '''
+ 用户界面
+ :param username: 用户名
+ :return: 返回用户界面
+ '''
+ # 未登录，跳转到未登录界面
+ if not session.get('logged_in'):
+ return render_template('not_login.html')
+
+ # 用户过期
+ user_expiry_date = session.get('expiry_date')
+ # if datetime.now().strftime('%Y%m%d') > user_expiry_date:
+ # return render_template('out_time.html')
+
+ # 获取session里的用户名
+ username = session.get('username')
+
+ user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
+
+ if request.method == 'POST': # when we submit a form
+ content = request.form['content']
+ f = WordFreq(content)
+ lst = f.get_freq()
+ return render_template('userpage_post.html',username=username,lst = lst, yml=Yaml.yml)
+
+ elif request.method == 'GET': # when we load a html page
+ d = load_freq_history(user_freq_record)
+ lst = pickle_idea2.dict2lst(d)
+ lst2 = []
+ for t in lst:
+ lst2.append((t[0], len(t[1])))
+ lst3 = sort_in_descending_order(lst2)
+ words = ''
+ for x in lst3:
+ words += x[0] + ' '
+ return render_template('userpage_get.html',
+ username=username,
+ session=session,
+ flashed_messages=get_flashed_messages_if_any(),
+ today_article=get_today_article(user_freq_record, session['articleID']),
+ d_len=len(d),
+ lst3=lst3,
+ yml=Yaml.yml,
+ words=words)
+
+
+
+
+
+@userService.route("//mark", methods=['GET', 'POST'])
+def user_mark_word(username):
+ '''
+ 标记单词
+ :param username: 用户名
+ :return: 重定位到用户界面
+ '''
+ username = session[username]
+ user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
+ if request.method == 'POST':
+ # 提交标记的单词
+ d = load_freq_history(user_freq_record)
+ lst_history = pickle_idea2.dict2lst(d)
+ lst = []
+ for word in request.form.getlist('marked'):
+ lst.append((word, [get_time()]))
+ d = pickle_idea2.merge_frequency(lst, lst_history)
+ pickle_idea2.save_frequency_to_pickle(d, user_freq_record)
+ return redirect(url_for('user_bp.userpage', username=username))
+ else:
+ return 'Under construction'
+
+def get_time():
+ '''
+ 获取当前时间
+ :return: 当前时间
+ '''
+ return datetime.now().strftime('%Y%m%d%H%M') # upper to minutes
+
+def get_flashed_messages_if_any():
+ '''
+ 在用户界面显示黄色提示信息
+ :return: 包含HTML标签的提示信息
+ '''
+ messages = get_flashed_messages()
+ s = ''
+ for message in messages:
+ s += '
本软件的宗旨是：珍惜你的时间， 提高你的获取英文信息的速度与准确度。 不管你是英语爱好者，备考的学生，还是英语老师，都能从 English Pal 中发现用处。
- -如果你教英语，English Pal 可以帮你掌握题目词汇规律， 提高教学质量。
- -如果你学英语，English Pal 可以帮你迅速提高词汇， 轻松应对各种考试。
- -1秒内闪电查词，告别字典。 私人定制的单词簿，永久相伴，记录奋斗岁月。
- -现在就试试看吧。 English Pal 期待你的捷报， English Pal 期待你的远航。
- -
使用方法
- -在EnglishPal主页点击成为会员链接。支付会员费后即可开始使用。
- -活跃会员还有机会获得英文阅读10分钟一对一指导。
- -| 截图 | -说明 | -
|---|---|
 |
- 精选短文，让你窥见世界。 统计词频，让你掌握规律。 | -
 |
- 时间无价，个性化的生词簿，为你节省记背单词时间。 | -
 |
- 考试人人都怕，单词的考试分类，让你目的明确。 | -
本软件的宗旨是：珍惜你的时间， 提高你的获取英文信息的速度与准确度。 不管你是英语爱好者，备考的学生，还是英语老师，都能从 English Pal 中发现用处。
+ +如果你教英语，English Pal 可以帮你掌握题目词汇规律， 提高教学质量。
+ +如果你学英语，English Pal 可以帮你迅速提高词汇， 轻松应对各种考试。
+ +1秒内闪电查词，告别字典。 私人定制的单词簿，永久相伴，记录奋斗岁月。
+ +现在就试试看吧。 English Pal 期待你的捷报， English Pal 期待你的远航。
+ +使用方法
+ +在EnglishPal主页点击成为会员链接。支付会员费后即可开始使用。
+ +活跃会员还有机会获得英文阅读10分钟一对一指导。
+ +| 截图 | +说明 | +
|---|---|
|
+ 精选短文，让你窥见世界。 统计词频，让你掌握规律。 | +
|
+ 时间无价，个性化的生词簿，为你节省记背单词时间。 | +
|
+ 考试人人都怕，单词的考试分类，让你目的明确。 | +
+
+ {{ yml['footer'] | safe }}
+{% if yml['js']['bottom'] %}
+ {% for js in yml['js']['bottom'] %}
+
+ {% endfor %}
+ {% endif %}
+
+
\ No newline at end of file
diff --git a/app/templates/mainpage_post.html b/app/templates/mainpage_post.html
new file mode 100644
index 0000000..7357457
--- /dev/null
+++ b/app/templates/mainpage_post.html
@@ -0,0 +1,40 @@
+
+
+
+
+ English Pal - Learn English smartly!
+ {% if session['logged_in'] %} + {{session['username']}} + {% else %} + +{{random_ads|safe}}
+ {% endif %} +共有文章 {{number_of_essays}} 篇
+ 粘帖1篇文章 (English only)
+ + {% if d_len > 0 %} +最常见的词()
+ {% for x in lst if x[1]>99 %} + {{x[0]}} {{x[1]}} + {% endfor %} + {% endif %} + +请先登录
+{% endif %} +{% endblock %} diff --git a/app/templates/out_time.html b/app/templates/out_time.html new file mode 100644 index 0000000..43caa0a --- /dev/null +++ b/app/templates/out_time.html @@ -0,0 +1,16 @@ + + + + +您的账号{{ username }}过期。
+为了提高服务质量，English Pal 收取会员费用， 每天0元。
+请决定你要试用的时间长度，扫描下面支付宝二维码支付。 支付时请注明English Pal Membership Fee。 我们会于12小时内激活账号。
+
如果有问题，请加开发者微信 torontohui。
+ + + + diff --git a/app/templates/reset.html b/app/templates/reset.html new file mode 100644 index 0000000..e510d3d --- /dev/null +++ b/app/templates/reset.html @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/templates/signup.html b/app/templates/signup.html index 472fdaf..421def2 100644 --- a/app/templates/signup.html +++ b/app/templates/signup.html @@ -1,19 +1,19 @@ -{% block body %} -{% if session['logged_in'] %} - -You're logged in already! Logout. - -{% else %} - -{{ get_flashed_messages()[0] | safe }}
- -Sign up here.
- - -{% endif %} -{% endblock %} - +{% block body %} +{% if session['logged_in'] %} + +You're logged in already! Logout. + +{% else %} + +{{ get_flashed_messages()[0] | safe }}
+ +Sign up here.
+ + +{% endif %} +{% endblock %} + diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html new file mode 100644 index 0000000..f4ed6e4 --- /dev/null +++ b/app/templates/userpage_get.html @@ -0,0 +1,106 @@ + + + + + + + + {{ yml['header'] | safe }} + {% if yml['css']['item'] %} + {% for css in yml['css']['item'] %} + + {% endfor %} + {% endif %} + {% if yml['js']['head'] %} + {% for js in yml['js']['head'] %} + + {% endfor %} + {% endif %} + +
+
+{{ yml['footer'] | safe }}
+{% if yml['js']['bottom'] %}
+ {% for js in yml['js']['bottom'] %}
+
+ {% endfor %}
+{% endif %}
+
+
+
+
\ No newline at end of file
diff --git a/app/templates/userpage_post.html b/app/templates/userpage_post.html
new file mode 100644
index 0000000..ba3b38d
--- /dev/null
+++ b/app/templates/userpage_post.html
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+ {{ yml['header'] | safe }}
+ {% if yml['css']['item'] %}
+ {% for css in yml['css']['item'] %}
+
+ {% endfor %}
+ {% endif %}
+ {% if yml['js']['head'] %}
+ {% for js in yml['js']['head'] %}
+
+ {% endfor %}
+ {% endif %}
+
+ English Pal for {{ username }} + 登出 + 重设密码 +
+ {{ flashed_messages|safe }} +阅读文章并回答问题
+ 大声朗读 + 划词入库 + 单词高亮 + +{{ today_article|safe }}
+ 收集生词吧 （可以在正文中划词，也可以复制黏贴）
+ + {% if session.get['thisWord'] %} + + {% endif %} + + {% if d_len > 0 %} +我的生词簿
+ {% for x in lst3 %} + {% set word = x[0] %} + + {% set freq = x[1] %} + {% if session.get('thisWord') == x[0] and session.get('time') == 1 %} + + {% endif %} + {% if freq > 1 %} ++ {{ word }} + ( + {{ freq }} + ) + + 熟悉 + 不熟悉 + 删除 +
+ {% else %} ++ {{ word }} + ( + {{ freq }} + ) + 熟悉 + 不熟悉 + 删除 +
+ {% endif %} + {% else %} + {{ word }}{{ freq }} + {% endfor %} + + {% endif %} +勾选不认识的单词
+ + {{ yml['footer'] | safe }} + {% if yml['js']['bottom'] %} + {% for js in yml['js']['bottom'] %} + + {% endfor %} + {% endif %} + + \ No newline at end of file diff --git a/app/test/test_add_word.py b/app/test/test_add_word.py index ffac643..a08c376 100644 --- a/app/test/test_add_word.py +++ b/app/test/test_add_word.py @@ -6,18 +6,19 @@ from selenium.webdriver.common.desired_capabilities import DesiredCapabilities import random, time import string -import pytest -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' + def has_punctuation(s): return [c for c in s if c in string.punctuation] != [] - -@pytest.mark.usefixtures -def test_add_word(URL, driver): + +def test_add_word(): try: - driver.get(URL) + driver.get(HOME_PAGE) assert 'English Pal -' in driver.page_source # login diff --git a/app/test/test_add_word_and_essay_does_not_change.py b/app/test/test_add_word_and_essay_does_not_change.py index 8ee81d0..2746657 100644 --- a/app/test/test_add_word_and_essay_does_not_change.py +++ b/app/test/test_add_word_and_essay_does_not_change.py @@ -3,21 +3,22 @@ # docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest + import random, time import string -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' def has_punctuation(s): return [c for c in s if c in string.punctuation] != [] - -@pytest.mark.usefixtures -def test_add_word_and_essay_does_not_change(URL, driver): + +def test_add_word_and_essay_does_not_change(): try: - driver.get(URL) + driver.get(HOME_PAGE) assert 'English Pal -' in driver.page_source # login diff --git a/app/test/test_delete_word.py b/app/test/test_delete_word.py index 59128a7..5e2f31a 100644 --- a/app/test/test_delete_word.py +++ b/app/test/test_delete_word.py @@ -1,57 +1,61 @@ -# -*- coding: utf-8 -*- -# Run the docker image using the following command: -# docker run -d -p 4444:4444 selenium/standalone-chrome -from selenium import webdriver -from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest -import random, time -import string - -# 调用本地chromedriver -# driver = webdriver.Chrome(executable_path="D:\ChromeDriver\chromedriver.exe") -# driver.get("http://127.0.0.1:5000/") -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) -# driver.maximize_window() -# HOME_PAGE = "http://127.0.0.1:5000/" - -@pytest.mark.usefixtures -def test_delete_word(): - try: - driver.get(URL) - assert 'English Pal -' in driver.page_source - # login - elem = driver.find_element_by_link_text('登录') - elem.click() - - uname = 'lanhui' - password = 'l0ve1t' - elem = driver.find_element_by_name('username') - elem.send_keys(uname) - - elem = driver.find_element_by_name('password') - elem.send_keys(password) - - elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮 - elem.click() - - assert 'EnglishPal Study Room for ' + uname in driver.title - - # delete - elems = driver.find_element_by_class_name('new-word') - # 移动到元素elems对象的“顶端”与当前窗口的“顶部”对齐 - driver.execute_script("arguments[0].scrollIntoView();", elems) - driver.save_screenshot('test_delete_pic1.png') - current_2 = elems.text - elem = driver.find_element_by_link_text("删除") - elem.click() - elems = driver.find_element_by_class_name('new-word') - driver.execute_script("arguments[0].scrollIntoView();", elems) - driver.save_screenshot('test_delete_pic2.png') - now_2 = elems.text - - assert current_2 != now_2 - - finally: - driver.quit() - +# -*- coding: utf-8 -*- +# Run the docker image using the following command: +# docker run -d -p 4444:4444 selenium/standalone-chrome +from selenium import webdriver +from selenium.webdriver.common.desired_capabilities import DesiredCapabilities + +import random, time +import string + +# 调用本地chromedriver +# driver = webdriver.Chrome(executable_path="D:\ChromeDriver\chromedriver.exe") +# driver.get("http://127.0.0.1:5000/") +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) +# driver.maximize_window() +# HOME_PAGE = "http://127.0.0.1:5000/" + + +HOME_PAGE = 'http://121.4.94.30:91/' + + +def test_delete_word(): + try: + driver.get(HOME_PAGE) + assert 'English Pal -' in driver.page_source + # login + elem = driver.find_element_by_link_text('登录') + elem.click() + + uname = 'lanhui' + password = 'l0ve1t' + elem = driver.find_element_by_name('username') + elem.send_keys(uname) + + elem = driver.find_element_by_name('password') + elem.send_keys(password) + + elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮 + elem.click() + + assert 'EnglishPal Study Room for ' + uname in driver.title + + # delete + elems = driver.find_element_by_class_name('new-word') + # 移动到元素elems对象的“顶端”与当前窗口的“顶部”对齐 + driver.execute_script("arguments[0].scrollIntoView();", elems) + driver.save_screenshot('test_delete_pic1.png') + current_2 = elems.text + elem = driver.find_element_by_link_text("删除") + elem.click() + elems = driver.find_element_by_class_name('new-word') + driver.execute_script("arguments[0].scrollIntoView();", elems) + driver.save_screenshot('test_delete_pic2.png') + now_2 = elems.text + + assert current_2 != now_2 + + finally: + driver.quit() + +# test_delete_word() diff --git a/app/test/test_login.py b/app/test/test_login.py index d711cb0..bb4df51 100644 --- a/app/test/test_login.py +++ b/app/test/test_login.py @@ -3,17 +3,19 @@ # docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest + import random, string -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' -@pytest.mark.usefixtures -def test_login(URL, driver): + +def test_login(): try: - driver.get(URL) + driver.get(HOME_PAGE) driver.save_screenshot('./app/test/test_login_pic0.png') assert 'English Pal -' in driver.page_source @@ -39,7 +41,7 @@ def test_login(URL, driver): assert uname in driver.page_source # logout - driver.get(URL + 'logout') + driver.get(HOME_PAGE + 'logout') driver.save_screenshot('./app/test/test_login_pic3.png') # login diff --git a/app/test/test_login_security_fix.py b/app/test/test_login_security_fix.py index f17122a..461aaba 100644 --- a/app/test/test_login_security_fix.py +++ b/app/test/test_login_security_fix.py @@ -3,16 +3,17 @@ # docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest + import random, string -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' -@pytest.mark.usefixtures def test_login_security_fix(): try: - driver.get(URL) + driver.get(HOME_PAGE) elem = driver.find_element_by_link_text('登录') elem.click() diff --git a/app/test/test_next_essay.py b/app/test/test_next_essay.py index fb242d9..9814e58 100644 --- a/app/test/test_next_essay.py +++ b/app/test/test_next_essay.py @@ -3,16 +3,19 @@ # docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest + import random, string, time -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) -@pytest.mark.usefixtures -def test_next(URL, driver): +HOME_PAGE = 'http://121.4.94.30:91/' + + + +def test_next(): try: - driver.get(URL) + driver.get(HOME_PAGE) assert 'English Pal -' in driver.page_source # login diff --git a/app/test/test_page_position.py b/app/test/test_page_position.py index 4eb8ef9..be6ece3 100644 --- a/app/test/test_page_position.py +++ b/app/test/test_page_position.py @@ -6,10 +6,15 @@ Click the Familiar or Unfamiliar button (current word frequency is 1), and the p from random import randint from selenium import webdriver -import pytest from selenium.common.exceptions import NoSuchElementException from selenium.webdriver.common.desired_capabilities import DesiredCapabilities +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' + + def click_by_random(text): elements = driver.find_elements_by_link_text(text) # 点击单词表中的第一个单词的熟悉按钮 elements[randint(0, len(elements) - 1)].click() @@ -28,10 +33,10 @@ def get_scrollTop(): roll_height = driver.execute_script(js) return roll_height -@pytest.mark.usefixtures -def test_page_position(URL, driver): + +def test_page_position(): try: - driver.get(URL) + driver.get(HOME_PAGE) # login driver.find_element_by_link_text('登录').click() diff --git a/app/test/test_signup.py b/app/test/test_signup.py index d034107..a2664c5 100644 --- a/app/test/test_signup.py +++ b/app/test/test_signup.py @@ -3,19 +3,19 @@ # docker run -d -p 4444:4444 selenium/standalone-chrome from selenium import webdriver from selenium.webdriver.common.desired_capabilities import DesiredCapabilities -import pytest + import random, string -#driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) -#driver.implicitly_wait(10) +driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX) +driver.implicitly_wait(10) + +HOME_PAGE = 'http://121.4.94.30:91/' - -@pytest.mark.usefixtures -def test_signup(URL, driver): +def test_signup(): try: - driver.get(URL) + driver.get(HOME_PAGE) driver.save_screenshot('test_signup_pic0.png') assert 'English Pal -' in driver.page_source diff --git a/app/user_service.py b/app/user_service.py new file mode 100644 index 0000000..122a375 --- /dev/null +++ b/app/user_service.py @@ -0,0 +1,174 @@ +from datetime import datetime + +from flask import * + +# from app import Yaml +# from app.Article import get_today_article, load_freq_history +# from app.WordFreq import WordFreq +# from app.wordfreqCMD import sort_in_descending_order + +import Yaml +from Article import get_today_article, load_freq_history +from WordFreq import WordFreq +from wordfreqCMD import sort_in_descending_order + +import pickle_idea +import pickle_idea2 + +# 初始化蓝图 +userService = Blueprint("user_bp", __name__) + +path_prefix = '/var/www/wordfreq/wordfreq/' +path_prefix = './' # comment this line in deployment + + +@userService.route("/'
+ s += f'Congratulations! {message}'
+ s += '
'
+ return s
From b0d80096d6d73aded9dfcb4ef1026b2ed7944f5d Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Thu, 27 Jan 2022 11:27:26 +0800
Subject: [PATCH 03/10] templates/userpage_get.html: change the position and
order of the checkboxes.
---
app/templates/userpage_get.html | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index f4ed6e4..68cdfc5 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -27,12 +27,15 @@
重设密码
{{ flashed_messages|safe }}
+
+
阅读文章并回答问题
+{{ today_article|safe }}
+
+ 生词高亮
大声朗读
划词入库
- 单词高亮
-
- {{ today_article|safe }}
+
收集生词吧 （可以在正文中划词，也可以复制黏贴）