diff --git a/app/package.json b/app/package.json index 6a326a0..bb5fe96 100644 --- a/app/package.json +++ b/app/package.json @@ -20,7 +20,9 @@ "@linux-odyssey/file-graph": "*", "@linux-odyssey/utils": "*", "axios": "^1.6.0", + "dompurify": "^3.0.6", "echarts": "^5.4.3", + "marked": "^10.0.0", "socket.io-client": "^4.7.1", "validator": "^13.11.0", "vue": "^3.3.4", diff --git a/app/src/components/HintPart.vue b/app/src/components/HintPart.vue index 115c438..3a95891 100644 --- a/app/src/components/HintPart.vue +++ b/app/src/components/HintPart.vue @@ -1,6 +1,7 @@ @@ -50,13 +57,13 @@ const right = () => { {{ current + 1 }} / - {{ sessionStore.session.hints.length }} + {{ hints.length }} @@ -65,12 +72,11 @@ const right = () => { - {{ hint }} - + v-html="hint" + > diff --git a/app/src/components/QuestPart.vue b/app/src/components/QuestPart.vue index 0874957..8feb98d 100644 --- a/app/src/components/QuestPart.vue +++ b/app/src/components/QuestPart.vue @@ -1,5 +1,23 @@ @@ -10,26 +28,37 @@ import sessionStore from '../store/session' - {{ sessionStore.quest.instruction }} + 任務: - - - ✓ - {{ task.name }} - - - ➤ - {{ task.name }} - - + Loading... + + diff --git a/app/src/utils/markdown.js b/app/src/utils/markdown.js new file mode 100644 index 0000000..32b4276 --- /dev/null +++ b/app/src/utils/markdown.js @@ -0,0 +1,7 @@ +import { marked } from 'marked' +import DOMPurify from 'dompurify' + +export default function markdown2HTML(markdown) { + const html = marked.parse(markdown) + return DOMPurify.sanitize(html) +} diff --git a/yarn.lock b/yarn.lock index e5c7d07..fb9b082 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2404,6 +2404,11 @@ dom-accessibility-api@^0.5.9: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453" integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg== +dompurify@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.6.tgz#925ebd576d54a9531b5d76f0a5bef32548351dae" + integrity sha512-ilkD8YEnnGh1zJ240uJsW7AzE+2qpbOUYjacomn3AvJ6J4JhKGSZ2nh4wUIXPZrEPppaCLx5jFe8T89Rk8tQ7w== + dotenv@^16.3.1: version "16.3.1" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e" @@ -4691,6 +4696,11 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" +marked@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-10.0.0.tgz#7fe1805bb908433d760e2de0fcc8841a2b2d745c" + integrity sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA== + media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
{{ current + 1 }}
/
- {{ sessionStore.session.hints.length }} + {{ hints.length }}
{{ sessionStore.quest.instruction }}
任務:
- ✓ - {{ task.name }} -
- ➤ - {{ task.name }} -
Loading...