From 14de1b716a7afcfd199fe69fc25e35bcd1c9dcc6 Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 22 Sep 2023 11:35:06 +0530 Subject: [PATCH 1/9] twitter bug fixed --- src/assets/x-twitter.svg | 1 + .../admin/createProjectSlider/CreateProjectSlide.vue | 4 ++-- .../participant/ActionInputs/TwitterRetweet.vue | 8 ++++---- src/mixins/fieldValidationMixin.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/assets/x-twitter.svg diff --git a/src/assets/x-twitter.svg b/src/assets/x-twitter.svg new file mode 100644 index 00000000..f5feed78 --- /dev/null +++ b/src/assets/x-twitter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/admin/createProjectSlider/CreateProjectSlide.vue b/src/components/admin/createProjectSlider/CreateProjectSlide.vue index acb68e26..6bec24b8 100644 --- a/src/components/admin/createProjectSlider/CreateProjectSlide.vue +++ b/src/components/admin/createProjectSlider/CreateProjectSlide.vue @@ -624,8 +624,8 @@ export default { ], socialAction: [ { text: "Select Social Action type", value: null }, - { text: "Twitter Follow", value: "TWITTER_FOLLOW" }, - { text: "Twitter Retweet", value: "TWITTER_RETWEET" }, + { text: "X (Previously Twitter) Follow", value: "TWITTER_FOLLOW" }, + { text: "X (Previously Twitter) Repost", value: "TWITTER_RETWEET" }, { text: "Telegram Join", value: "TELEGRAM_JOIN" }, { text: "Discord Join", value: "DISCORD_JOIN" }, { text: "Github PR", value: "GITHUB_PR" }, diff --git a/src/components/participant/ActionInputs/TwitterRetweet.vue b/src/components/participant/ActionInputs/TwitterRetweet.vue index f9c4d6cd..97c0dd9f 100644 --- a/src/components/participant/ActionInputs/TwitterRetweet.vue +++ b/src/components/participant/ActionInputs/TwitterRetweet.vue @@ -13,7 +13,7 @@ > - +
{{ data.title }}
@@ -46,12 +46,12 @@ " class="btn btn-outline-twitter text-black mb-2" > - - Retweet + + Repost Date: Fri, 22 Sep 2023 11:40:00 +0530 Subject: [PATCH 2/9] follow --- src/components/participant/ActionInputs/TwitterFollow.vue | 4 ++-- src/utils/messages/admin/en.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/participant/ActionInputs/TwitterFollow.vue b/src/components/participant/ActionInputs/TwitterFollow.vue index 56c207e5..1c6d5c7d 100644 --- a/src/components/participant/ActionInputs/TwitterFollow.vue +++ b/src/components/participant/ActionInputs/TwitterFollow.vue @@ -13,7 +13,7 @@ > - +
{{ data.title }}
@@ -48,7 +48,7 @@ " class="btn btn-outline-twitter text-black" > - + Follow @{{ twitter.sourceScreenName }} diff --git a/src/utils/messages/admin/en.js b/src/utils/messages/admin/en.js index 9c7e3d84..1cb4945f 100644 --- a/src/utils/messages/admin/en.js +++ b/src/utils/messages/admin/en.js @@ -65,7 +65,7 @@ const EVENTS = { URL_IN_SOCIAL_HANDLE: "Do not put url in Social Handle", RETWEET_VALID_URL: "Please Enter valid retweet url", INVALID_INVITE_LINK: "Invalid Invite Link", - INVALID_TWITTER_USERNAME: "Invalid Twitter Username", + INVALID_TWITTER_USERNAME: "Invalid X Username", INVALID_TELEGRAM_USERNAME: "Invalid Telegram Username", GITHUB_REPONAME_EMPTY: "GitHub Repo URL should not be empty", INVALID_GITHUB_URL: "Invalid GitHub repo URL" From 0f91dd3b5737be1cc04cba14e35d0a11f663ab13 Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 22 Sep 2023 11:47:39 +0530 Subject: [PATCH 3/9] small change --- src/mixins/fieldValidationMixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/fieldValidationMixin.js b/src/mixins/fieldValidationMixin.js index eb1012f5..74f4b60a 100644 --- a/src/mixins/fieldValidationMixin.js +++ b/src/mixins/fieldValidationMixin.js @@ -81,7 +81,7 @@ export function isNum(str) { } } export function isretweetUrl(str) { - if (!str.match(/https:\/\/x\.com\/.*\/status\/[0-9]+/)||!(str.match(/https:\/\/twitter\.com\/.*\/status\/[0-9]+/))) { + if (!(str.match(/https:\/\/x\.com\/.*\/status\/[0-9]+/)||!(str.match(/https:\/\/twitter\.com\/.*\/status\/[0-9]+/)))) { return true } } From e7362cc473492904e440263768a534e85fcedef1 Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 22 Sep 2023 11:50:11 +0530 Subject: [PATCH 4/9] changes --- src/mixins/fieldValidationMixin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mixins/fieldValidationMixin.js b/src/mixins/fieldValidationMixin.js index 74f4b60a..850b87de 100644 --- a/src/mixins/fieldValidationMixin.js +++ b/src/mixins/fieldValidationMixin.js @@ -81,7 +81,7 @@ export function isNum(str) { } } export function isretweetUrl(str) { - if (!(str.match(/https:\/\/x\.com\/.*\/status\/[0-9]+/)||!(str.match(/https:\/\/twitter\.com\/.*\/status\/[0-9]+/)))) { + if (!(str.match(/https:\/\/x\.com\/.*\/status\/[0-9]+/))||!(str.match(/https:\/\/twitter\.com\/.*\/status\/[0-9]+/))) { return true } } From d2149e5b5398de27851417a3f1d14dbecff368b7 Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 22 Sep 2023 12:20:03 +0530 Subject: [PATCH 5/9] AND added --- .../components/SocialEventActionConfig.vue | 9 ++++----- src/mixins/fieldValidationMixin.js | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue index f84fedbb..2da0e101 100644 --- a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue +++ b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue @@ -20,11 +20,10 @@ style="min-width: 120px" > - + + + + Date: Fri, 22 Sep 2023 12:29:02 +0530 Subject: [PATCH 6/9] error msg cganged --- src/components/participant/ActionInputs/TwitterFollow.vue | 2 +- src/components/participant/ActionInputs/TwitterRetweet.vue | 2 +- src/utils/messages/admin/en.js | 4 ++-- src/utils/messages/participants/en.js | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/participant/ActionInputs/TwitterFollow.vue b/src/components/participant/ActionInputs/TwitterFollow.vue index 1c6d5c7d..6cfde7fd 100644 --- a/src/components/participant/ActionInputs/TwitterFollow.vue +++ b/src/components/participant/ActionInputs/TwitterFollow.vue @@ -48,7 +48,7 @@ " class="btn btn-outline-twitter text-black" > - + Follow @{{ twitter.sourceScreenName }} diff --git a/src/components/participant/ActionInputs/TwitterRetweet.vue b/src/components/participant/ActionInputs/TwitterRetweet.vue index 97c0dd9f..8f275525 100644 --- a/src/components/participant/ActionInputs/TwitterRetweet.vue +++ b/src/components/participant/ActionInputs/TwitterRetweet.vue @@ -46,7 +46,7 @@ " class="btn btn-outline-twitter text-black mb-2" > - + Repost Date: Fri, 22 Sep 2023 13:48:32 +0530 Subject: [PATCH 7/9] twitter url modified --- .../components/SocialEventActionConfig.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue index 2da0e101..680688bc 100644 --- a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue +++ b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue @@ -513,6 +513,10 @@ export default { // Code to Add an Action let isvalid = this.handleEventActionValidation(); if (isvalid) { + if(this.selected.type === 'TWITTER_RETWEET' && this.selected.value.includes('x.com')){ + const modifiedUrl = this.selected.value.replace('x.com', "twitter.com"); + this.selected.value = modifiedUrl + } this.selected["id"] = this.eventActionType + "_" + this.eventActionList.length; this.eventActionList.push(this.selected); From 967b2c916a84dbcdf3160f99e21e218322c3d46e Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 6 Oct 2023 17:55:34 +0530 Subject: [PATCH 8/9] version update to v5.13.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c220822d..08ffc05c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hyperfye-frontend", - "version": "v5.13.0", + "version": "v5.13.1", "private": true, "scripts": { "serve": "vue-cli-service serve --mode production", From 819ff2410943456ee5c7861cc18311bf87ca147a Mon Sep 17 00:00:00 2001 From: Raj6939 Date: Fri, 6 Oct 2023 18:08:45 +0530 Subject: [PATCH 9/9] small change --- .../components/SocialEventActionConfig.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue index 680688bc..5ec94d9a 100644 --- a/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue +++ b/src/components/admin/createProjectSlider/components/SocialEventActionConfig.vue @@ -120,7 +120,7 @@
@@ -128,7 +128,7 @@ v-model="selected.value" type="text" :placeholder=" - selected.type === null ? '' : 'Please Enter Your Retweet URL' + selected.type === null ? '' : 'Please Enter Your Repost URL' " id="value" class="form-control w-100"