1
0
mirror of https://github.com/byulmaru/quesdon synced 2024-11-27 14:28:04 +09:00

Merge pull request #8 from lnanase/update_user_answeredAt_format

update ロケールに沿った日付表示に変更
This commit is contained in:
りんすき 2017-12-14 15:49:09 +09:00 committed by GitHub
commit 80bd4601ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions

6
package-lock.json generated
View File

@ -6576,6 +6576,12 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
"xdate": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/xdate/-/xdate-0.8.2.tgz",
"integrity": "sha1-17AzwASF0CaVuvAET06s2j/JYaM=",
"dev": true
},
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",

View File

@ -38,7 +38,8 @@
"style-loader": "^0.19.0",
"ts-loader": "^3.2.0",
"typescript": "^2.6.2",
"webpack": "^3.10.0"
"webpack": "^3.10.0",
"xdate": "^0.8.2"
},
"dependencies": {
"koa": "^2.4.1",

View File

@ -6,7 +6,8 @@ import "jquery"
(<any>window).Popper = require("popper.js")
import "bootstrap/dist/js/bootstrap.min.js"
import "./ctrl-enter.ts"
(<any>window).XDate = require("xdate")
addEventListener("load", () => {
riot.mount("app")
})
})

View File

@ -5,7 +5,7 @@ page-user-top
.jumbotron(style="text-align: center")
img(src="{user.avatarUrl}",style="width:8em;height:8em;")
h1 {user.name}
p さんの{user.questionBoxName || "質問箱"}
p さんの{user.questionBoxName || "質問箱"}
a(href='{user.avatar || "https://"+user.acct.split("@")[1]+"/@"+user.acct.split("@")[0]}',rel="nofollow") Mastodonのプロフィール
p {user.description}
form(action="javascript://",onsubmit="{submit}")
@ -13,12 +13,12 @@ page-user-top
.d-flex.justify-content-end(style="line-height: 2.5em;")
span(ref="character_counter",style="padding-right: 1em;") {charcounter}
button.btn.btn-primary.col-xs-2(type="submit",disabled="{charcounter < 0}") 質問する
h2 回答
h2 回答
span.badge.badge-pill.badge-secondary(if="{questions.length}",style="font-size: 50%") {questions.length}
.card.mb-2(each="{question in questions}",if="{question_loaded}")
.card-body
h4.card-title {question.question}
h6.card-subtitle.mb-2: a(href="/@{user.acct}/questions/{question._id}").text-muted {question.answeredAt}
h6.card-subtitle.mb-2: a(href="/@{user.acct}/questions/{question._id}").text-muted {new XDate(question.answeredAt).toString("yyyy-MM-dd HH:mm:ss")}
p.card-text.question-text {question.answer}
loading(if="{!question_loaded}")
script.
@ -49,4 +49,4 @@ page-user-top
alert("質問しました!")
location.reload()
})
}
}