Skip to content

fix: otp sent for report recipe #178

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.

Sign up for GitHub

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

Open
captainPrime wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: otp sent for report recipe #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 50 additions & 15 deletions src/components/ReportIt.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<div class="ui red fluid button" :title="title" @click="ReportIt">
<div class="ui red fluid button" :title="title" @click="reportIt">
<i class="ui bug icon"></i>
Report it
</div>
Expand Down Expand Up @@ -109,19 +109,30 @@
</div>
</div>
<br />
<div>
<div >
<label for="emailorphone"
>Please provide your email or phone number:
(Required*)</label
>
<div class="field">
<input
type="text"
v-model="formData.email"
ref="emailorphone"
name="emailorphone"
required
/>
<div class="ui grid">
<div class="field ui email ten wide computer column sixteen wide mobile column">
<input
type="text"
v-model="formData.email"
ref="emailorphone"
name="emailorphone"
required
/>
</div>
<div class="ui input six wide computer column sixteen wide mobile column">
<button
class="ui tbb button otp"
@click="requestOtp"
v-bind:class="{ loading: is_loading }"
>
Send Code
</button>
</div>
</div>
</div>
<br />
Expand All @@ -133,6 +144,7 @@
ref="verificationcode"
v-model="formData.verification_code"
name="verificationcode"
required
/>
</div>
</div>
Expand All @@ -148,11 +160,21 @@
<i class="close icon"></i>
<div>Your report was submitted.</div>
</div>

<div class="ui negative message" v-if="report_failed">
<i class="close icon"></i>
<div>Error sending report.</div>
</div>

<div class="ui success message" v-if="otp_success">
<i class="close icon"></i>
<div>OTP has been sent the number or email above.</div>
</div>

<div class="ui negative message otp" v-if="otp_failed">
<i class="close icon"></i>
<div>Error sending OTP.</div>
</div>
<div class="">
<div class="ui input">
<button
Expand Down Expand Up @@ -187,10 +209,15 @@ export default {
report_failed() {
return this.$store.state.subscriptionStore.failed;
},
otp_success() {
return this.$store.state.subscriptionStore.otp_success;
},
otp_failed() {
return this.$store.state.subscriptionStore.otp_failed;
},
},

data() {

return {
showModal: false,
title: "Use this tool if you think this recipe is any of the following; inappropriate, unauthentic, not original, stolen or a duplicate.",
Expand All @@ -210,11 +237,15 @@ export default {
},

methods: {
ReportIt() {
reportIt() {
this.resetForm();
this.$store.dispatch("reset_report_form");
$(".ui.modal").modal("show");
},

requestOtp() {
store.dispatch("submit_report_otp", this.formData.email);
},
resetForm() {
// Reset the form data after successful submission
this.formData.inputField = "";
Expand Down Expand Up @@ -289,9 +320,9 @@ export default {
display: block;
}

.ui.modal input[name="verificationcode"] {
.ui.modal input[name="verificationcode"], .ui.modal input[name="emailorphone"] {
width: 100%;
padding: 5px;
padding: 10px;
border: 1px solid #ccc;
}

Expand All @@ -317,4 +348,8 @@ export default {
.message {
margin-bottom: 20px !important;
}

.email{
margin-top: 12px
}
</style>
73 changes: 59 additions & 14 deletions src/store/modules/subscriptionStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ export const subscriptionStore = {
state: () => ({
success: false,
report_success: false,
otp_success: false,
otp_failed: false,
failed: false,
}),
mutations: {
Expand All @@ -20,13 +22,21 @@ export const subscriptionStore = {
RESET_REPORT_FORM(state) {
state.report_success = false;
state.failed = false;
state.otp_success = false;
state.otp_failed = false;
},
SHOW_REPORT_SUCCESS_MESSAGE(state) {
state.report_success = true;
},
SHOW_OTP_SUCCESS_MESSAGE(state) {
state.otp_success = true;
},
SHOW_FAILED_MESSAGE(state) {
state.failed = true;
},
SHOW_FAILED_OTP(state) {
state.otp_failed = true;
},
},
actions: {
async subscribeUser(context, payload) {
Expand Down Expand Up @@ -64,20 +74,55 @@ export const subscriptionStore = {

const url = process.env.BASE_URL + "report-recipe";

this.state.api.client.post(url, {
payload
}, this.state.api.options, { headers: {
'Authorization': `Bearer ${this.state.access_token}`
}})
.then((response) => {
context.commit('SET_MODAL_STATE', false)
context.commit('SHOW_REPORT_SUCCESS_MESSAGE')
})
.catch((error) => {
context.commit('SET_MODAL_STATE', false)
context.commit('SHOW_FAILED_MESSAGE')
context.commit("HANDLE_ERROR", error.response);
})
this.state.api.client
.post(
url,
{
payload,
},
this.state.api.options,
{
headers: {
Authorization: `Bearer ${this.state.access_token}`,
},
},
)
.then((response) => {
context.commit("SET_MODAL_STATE", false);
context.commit("SHOW_REPORT_SUCCESS_MESSAGE");
})
.catch((error) => {
context.commit("SET_MODAL_STATE", false);
context.commit("SHOW_FAILED_MESSAGE");
context.commit("HANDLE_ERROR", error.response);
});
},
submit_report_otp(context, payload) {
context.commit("SET_MODAL_STATE", true);

const url = process.env.BASE_URL + "otp"; //not actual endpoint

this.state.api.client
.post(
url,
{
payload,
},
{
headers: {
Authorization: `Bearer ${this.state.access_token}`,
},
},
)
.then((response) => {
context.commit("SET_MODAL_STATE", false);
context.commit("SHOW_OTP_SUCCESS_MESSAGE");
})
.catch((error) => {
context.commit("SET_MODAL_STATE", false);
context.commit("SHOW_FAILED_OTP");
context.commit("HANDLE_ERROR", error.response);
Comment thread
captainPrime marked this conversation as resolved.
});
},
reset_report_form(context) {
context.commit("RESET_REPORT_FORM");
Expand Down
7 changes: 6 additions & 1 deletion test/e2e/specs/ReportIt.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ module.exports = {
"ReportIt Component Test": function (browser) {
browser
.url(`${process.env.VUE_APP_APP_URL}#/recipes/egusi-soup`)
.waitForElementVisible(".six.wide.computer.column.sixteen.wide.mobile.column", 15000)
.waitForElementVisible(
".six.wide.computer.column.sixteen.wide.mobile.column",
15000,
)
.waitForElementVisible(".ui.red.fluid.button", 9000000)
.click(".ui.red.fluid.button")
.waitForElementVisible(".ui.modal", 5000)
.setValue('input[name="emailorphone"]', "test@example.com")
.click("button.ui.tbb.button.otp")
.waitForElementVisible(".ui.success.message", 9000000)
.click('input[name="nudity"]')
.click('input[name="irrelevant"]')
.click('input[name="violation"]')
Expand Down