From 93d28bc552e9567bcdcf527934991f7bce6697f1 Mon Sep 17 00:00:00 2001 From: Truong Ngo Date: Fri, 23 Jun 2023 09:02:22 +0700 Subject: [PATCH 1/2] discussion --- package.json | 4 +- src/assets/logo/default-avatar.jpg | Bin 0 -> 932 bytes .../discussion/ChallengeDiscussion.vue | 233 ++++++++++++++++++ .../discussion/DiscussionComment.vue | 121 +++++++++ .../challenge-solve/ChallengeSolveView.vue | 18 +- 5 files changed, 367 insertions(+), 9 deletions(-) create mode 100644 src/assets/logo/default-avatar.jpg create mode 100644 src/components/challenge-solve/discussion/ChallengeDiscussion.vue create mode 100644 src/components/challenge-solve/discussion/DiscussionComment.vue diff --git a/package.json b/package.json index a0cfcae..56945a4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,9 @@ "parserOptions": { "ecmaVersion": 2020 }, - "rules": {} + "rules": { + "no-var-requires": true + } }, "browserslist": [ "> 1%", diff --git a/src/assets/logo/default-avatar.jpg b/src/assets/logo/default-avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3f271c1940fc0b32ddf1a1b38a9573aaa9ad1d00 GIT binary patch literal 932 zcmex=i3*BJ!6k`h{6D}T z$ia}nkig6+$iO7X$SlbC{|JLL(2-2cAm_pXGb2f?6Y?K4>^c1K!`HRDUiYY)Y?~A0`}G2+1Jn_# z&Q|XFZTBEE`r+vXvb=RNRSHJz<~DH^Z{{7-)X4R8&2fA&`R)_8bK#w5ReO63%~xv` zPQH1w>)tK}y#pX4L?hRm$EV-n)vmEDVP3fYaK8(i!}IHV?OxV8%-4Uu@V0`U1F|wp z-4$CuGO6p_j=$YAE6&^FAA{zzU!OPsbpODzp*!&6-gvRU4mVE!d{K6Sdjd!wYgqQ# z>o>nM2ksSH!+Uk=txMH~_pk8$o0|Xg_}|7Q-_3Tsxb>6KEdIRnHiwu7kOr;Iae4dB z?~n@nQS^e{Ilf)4gQxNQ`l{MXzZ&h3lxctFQT?8zX!UqaNJ)Ok_Sdi2w$3awJml$I z9WVNm=@I7&S36B$NZ9Rt`Q7^!%g=gSzMG6iAoGEMr98>t%aV87L^W-do~z2ne`6Ji z%Ja1io-!+Yg>a(osx>L!63?fA&8Rd#N(X+hx1Tjtq!41_pk! aaBk(zCQHSi9QZQH+jXZN2T-Q||4jhNZ8xs~ literal 0 HcmV?d00001 diff --git a/src/components/challenge-solve/discussion/ChallengeDiscussion.vue b/src/components/challenge-solve/discussion/ChallengeDiscussion.vue new file mode 100644 index 0000000..240265f --- /dev/null +++ b/src/components/challenge-solve/discussion/ChallengeDiscussion.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/components/challenge-solve/discussion/DiscussionComment.vue b/src/components/challenge-solve/discussion/DiscussionComment.vue new file mode 100644 index 0000000..b3bee12 --- /dev/null +++ b/src/components/challenge-solve/discussion/DiscussionComment.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/src/views/challenge-solve/ChallengeSolveView.vue b/src/views/challenge-solve/ChallengeSolveView.vue index 9cee40c..8312987 100644 --- a/src/views/challenge-solve/ChallengeSolveView.vue +++ b/src/views/challenge-solve/ChallengeSolveView.vue @@ -1,21 +1,23 @@ - + From 25bb986df7d8d9b5113eb68c19b305bb65788e1c Mon Sep 17 00:00:00 2001 From: Truong Ngo Date: Fri, 23 Jun 2023 09:22:17 +0700 Subject: [PATCH 2/2] discussion --- .../discussion/ChallengeDiscussion.vue | 13 ++++++-- .../discussion/DiscussionComment.vue | 30 +++++++++++++++++-- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/components/challenge-solve/discussion/ChallengeDiscussion.vue b/src/components/challenge-solve/discussion/ChallengeDiscussion.vue index 240265f..df2ab52 100644 --- a/src/components/challenge-solve/discussion/ChallengeDiscussion.vue +++ b/src/components/challenge-solve/discussion/ChallengeDiscussion.vue @@ -30,7 +30,7 @@
- +
@@ -88,7 +88,7 @@ import DiscussionComment from "./DiscussionComment.vue"; const defaultAvatar = require("@/assets/logo/default-avatar.jpg"); -const isLogin = ref(false); +const isLogin = ref(true); const comments = ref([ { name: "A", @@ -169,6 +169,9 @@ const sortOptions = ref([ .comment-header { display: flex; gap: 12px; + margin-bottom: 36px; + padding: 12px; + border-bottom: 1px solid #ddd; } .input-sort { width: 300px; @@ -180,7 +183,8 @@ const sortOptions = ref([ } .comment-post { display: flex; - gap: 4px; + gap: 8px; + margin-bottom: 8px; } .request-login-container { margin-top: 10px; @@ -230,4 +234,7 @@ const sortOptions = ref([ .link-wrapper:hover > a > .help-icon { color: #738f93; } +.comment-texteditor{ + width: 100%; +} diff --git a/src/components/challenge-solve/discussion/DiscussionComment.vue b/src/components/challenge-solve/discussion/DiscussionComment.vue index b3bee12..8b70e97 100644 --- a/src/components/challenge-solve/discussion/DiscussionComment.vue +++ b/src/components/challenge-solve/discussion/DiscussionComment.vue @@ -31,9 +31,24 @@
- Add Comment + Add Comment Permalink
+
+ +
+ Add Comment + Close +
+
@@ -49,7 +64,7 @@ import { defineProps, ref } from "vue"; const defaultAvatar = require("@/assets/logo/default-avatar.jpg"); - +const isLogin = ref(false); const props = defineProps({ comment: { type: Object, @@ -59,7 +74,10 @@ const props = defineProps({ const closeComment = ref(false); const closeContainer = () => { closeComment.value = !closeComment.value; - console.log("closeComment", closeComment.value); +}; +const openAddComment = ref(false); +const addCommentContainer = (value) => { + openAddComment.value = value; }; @@ -111,6 +129,7 @@ const closeContainer = () => { display: flex; gap: 12px; flex-direction: column; + width: 100%; } .user-comment { position: relative; @@ -118,4 +137,9 @@ const closeContainer = () => { padding: 0 16px 16px 16px; border-left: 1px solid #979faf; } +.text-editor { + display: flex; + flex-direction: column; + background: #f8f9fb; +}