-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(WikiSettings): Add QuestyCaptcha card to Wiki Settings #760
Changes from 17 commits
669461f
cb2c71f
ae1ff28
b29f8cf
3ba9b1c
77f2c51
132994e
5c1fbbc
0af47f9
3096695
cde17ae
fb1de61
2261d3e
fad3f5e
1da694a
909d581
1dd0255
f3ff79d
4c00bcb
3f24b32
9a7fd67
c4e7526
7ff3442
ec228ae
bf6cf41
c9c8149
e10cb35
1435654
48fcb89
d4f3143
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,227 @@ | ||
<template> | ||
<v-card> | ||
<v-card-title>Additional Spam Protection</v-card-title> | ||
<v-card-text class="pb-2"> | ||
QuestyCaptcha offers an extra layer of protection against spam accounts. During account creation, users will have to answer a question, which can be defined in settings. For more information on QuestyCaptcha, please visit the documentation page | ||
</v-card-text> | ||
<v-col class="checkbox"> | ||
<v-checkbox label="Activate spam protection" v-model="captchaActivate"></v-checkbox> | ||
</v-col> | ||
<!-- Setting Panel--> | ||
<v-expansion-panels v-model="panel"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this is the reason nothing is working; is this
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think so, it was added there to collapse the panel when saving is done (as Charlie said). https://github.com/wbstack/ui/pull/760/files#:~:text=%7D)-,this.panel%20%3D%20false,-%7D) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
<v-expansion-panel> | ||
<v-expansion-panel-header> | ||
<strong>SETTINGS</strong> | ||
</v-expansion-panel-header> | ||
<v-expansion-panel-content> | ||
<strong>Guidelines for creating questions and answers:</strong><br/> | ||
<ul> | ||
<li>Keep in mind that users have a wide variety of knowledge and abilities. We therefore recommend three questions at minimum, each requiring different abilities or knowledge.</li> | ||
<li>Consider cultural bias. Use questions that rely on universal knowledge or knowledge related to your wiki.</li> | ||
<li>Keep the answers short and simple. Ideally, try to use questions with only one possible answer.</li> | ||
</ul> | ||
<!-- Question/Answer Bundle--> | ||
<v-form ref="questyForm"> | ||
<div class="pt-10" v-for="(entry, index) in questionsFromStore" :key="index"> | ||
Question | ||
<v-text-field | ||
class="trash-icon pb-2" | ||
v-model="entry.question" | ||
outlined | ||
hide-details="auto" | ||
:append-outer-icon="showIcon ? 'mdi-delete-outline' : undefined" | ||
:rules="[() => !!entry.question || 'Field cannot be empty. Please provide a question']" | ||
@click:append-outer="removeQuestion(index)" | ||
dense | ||
></v-text-field> | ||
Answer | ||
<v-combobox | ||
:class="{'answer-box': true, 'answer-input-field': applyStyling}" | ||
v-model="entry.answers" | ||
:items="entry.answers" | ||
multiple | ||
outlined | ||
:rules="[required]" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it might be slightly clearer to either inline this rule or change the method name to something more descriptive than There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any suggestions? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
hide-selected | ||
hide-details="auto" | ||
dense | ||
> | ||
<template v-slot:selection="{ item }" > | ||
<v-chip class="chips"> | ||
<span class="pr-1"> | ||
{{ item }} | ||
</span> | ||
<v-icon | ||
small | ||
@click="removeAnswer(entry, item)" | ||
> | ||
mdi-close-circle | ||
</v-icon> | ||
</v-chip> | ||
</template> | ||
</v-combobox> | ||
</div> | ||
<!-- Buttons--> | ||
<div class="d-flex pb-12 pt-10"> | ||
<v-btn @click="addQuestion" elevation=0 plain class="ml-auto">+ ADD QUESTION</v-btn> | ||
</div> | ||
<div> | ||
<v-btn @click="saveForm" color="primary" width="100%">SAVE QUESTIONS</v-btn> | ||
</div> | ||
<div class="pt-4"> | ||
<v-btn @click="recoverDefaultQuestions" elevation=0 width="100%">RECOVER DEFAULT QUESTIONS</v-btn> | ||
</div> | ||
</v-form> | ||
<!-- Success/Error Message Snackbar--> | ||
<v-snackbar color="success" elevation="24" v-model="successMessage"> | ||
Your questions have been saved | ||
<template v-slot:action> | ||
<v-btn | ||
text | ||
variant="text" | ||
@click="closeAlert" | ||
> | ||
Close | ||
</v-btn> | ||
</template> | ||
</v-snackbar> | ||
<v-snackbar color="error" elevation="24" v-model="errorMessage"> | ||
Something is wrong with saving your questions. Please try again | ||
<template v-slot:action> | ||
<v-btn | ||
text | ||
variant="text" | ||
@click="closeAlert" | ||
> | ||
Close | ||
</v-btn> | ||
</template> | ||
</v-snackbar> | ||
</v-expansion-panel-content> | ||
</v-expansion-panel> | ||
</v-expansion-panels> | ||
</v-card> | ||
</template> | ||
|
||
<script> | ||
|
||
export default { | ||
name: 'QuestyCaptcha', | ||
props: [ | ||
'wikiId' | ||
], | ||
data () { | ||
return { | ||
successMessage: false, | ||
errorMessage: false, | ||
captchaActivate: false, | ||
questionsFromStore: [], | ||
showIcon: true, | ||
applyStyling: true | ||
} | ||
}, | ||
created () { | ||
this.questionsFromStore = this.$store.state.wikis.currentWikiSettings.captchaQuestions | ||
this.captchaActivate = this.$store.state.wikis.currentWikiSettings.wwUseQuestyCaptcha | ||
}, | ||
methods: { | ||
removeAnswer (question, answer) { | ||
const index = question.answers.indexOf(answer) | ||
if (index !== -1) { | ||
question.answers.splice(index, 1) | ||
} | ||
}, | ||
removeQuestion (index) { | ||
this.questionsFromStore.splice(index, 1) | ||
// hide trash icon when there is just one QA bundle | ||
if (this.questionsFromStore.length === 1) { | ||
this.showIcon = false | ||
this.applyStyling = false | ||
} | ||
}, | ||
addQuestion () { | ||
this.questionsFromStore.push({ | ||
question: '', | ||
answers: [] | ||
}) | ||
// show the trash icon again when there are more than one QA bundle | ||
this.showIcon = true | ||
this.applyStyling = true | ||
}, | ||
saveForm () { | ||
for (let i = 0; i < this.questionsFromStore.length; i++) { | ||
const entry = this.questionsFromStore[i] | ||
const noQuestion = entry.question.trim() === '' | ||
const noAnswer = entry.answers && entry.answers.length === 0 | ||
if (noQuestion && noAnswer && this.questionsFromStore.length > 1) { | ||
this.questionsFromStore.splice(i, 1) | ||
} | ||
} | ||
this.$nextTick(() => { | ||
if (!this.$refs.questyForm.validate()) { | ||
return | ||
} | ||
const wiki = this.wikiId | ||
const promises = [] | ||
const captchaEnabledSetting = 'wwUseQuestyCaptcha' | ||
const captchaQuestionsSetting = 'wwCaptchaQuestions' | ||
const enableValue = this.captchaActivate | ||
const questions = {} | ||
this.questionsFromStore.forEach(item => { | ||
questions[item.question] = item.answers | ||
}) | ||
const JSONQuestions = JSON.stringify(questions) | ||
promises.push( | ||
this.$store.dispatch('updateSetting', { wiki, setting: captchaEnabledSetting, value: enableValue }), | ||
this.$store.dispatch('updateSetting', { wiki, setting: captchaQuestionsSetting, value: JSONQuestions }) | ||
) | ||
Promise.all(promises) | ||
.then(() => { | ||
this.$store.dispatch('setEnabledQuestyCaptcha', enableValue) | ||
this.$store.dispatch('setQuestyCaptchaQuestions', this.questionsFromStore) | ||
this.successMessage = true | ||
}) | ||
.catch(err => { | ||
console.log(err.response) | ||
this.errorMessage = true | ||
}) | ||
this.panel = false | ||
}) | ||
}, | ||
recoverDefaultQuestions () { | ||
const recoveredDefaultQuestions = this.$store.state.wikis.currentWikiSettings.defaultQuestions | ||
this.questionsFromStore = JSON.parse(JSON.stringify(recoveredDefaultQuestions)) | ||
}, | ||
required (value) { | ||
if (value.length === 0) { | ||
return 'Field cannot be empty. Please provide an answer' | ||
} | ||
return !!value || 'Field cannot be empty. Please provide an answer' | ||
}, | ||
closeAlert () { | ||
this.successMessage = false | ||
this.errorMessage = false | ||
} | ||
} | ||
} | ||
</script> | ||
|
||
<style lang="css" scoped> | ||
AndrewKostka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
.checkbox { | ||
padding-left: 20px; | ||
padding-bottom: 0; | ||
padding-top: 0; | ||
} | ||
.answer-input-field { | ||
margin-right: 33px !important; | ||
} | ||
>>> .answer-box .v-input__append-inner { | ||
display: none !important; | ||
} | ||
.chips { | ||
margin: 0 8px 0 0 !important; | ||
} | ||
>>> .trash-icon .v-input__append-outer { | ||
margin-top: 0 !important; | ||
} | ||
</style> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can totally see why you added these comments but in general this might be a sign that in future it would be best to split up this single one large card into multiple smaller components that could also have similarly descriptive names. Let's not change this now though