diff --git a/src/components/signupComp/StepOne/StepOne.js b/src/components/signupComp/StepOne/StepOne.js
index 3c94b0d85..41a2d1da1 100644
--- a/src/components/signupComp/StepOne/StepOne.js
+++ b/src/components/signupComp/StepOne/StepOne.js
@@ -2,6 +2,19 @@ import React from 'react';
import { MdChevronRight } from 'react-icons/md';
import { loginWithGitHubAccount } from '@/utils/utilis';
import Image from 'next/image';
+import { getCookie } from '@/utils/utilis';
+
+function getLoginUrlWithQuery() {
+ if (typeof window === 'undefined') {
+ return process.env.LOGIN_URL || 'https://control.msg91.com/signin/';
+ }
+ const baseUrl = process.env.LOGIN_URL || 'https://control.msg91.com/signin/';
+ const msg91Query = getCookie('msg91_query');
+ if (!msg91Query) return baseUrl;
+ const queryString = msg91Query.startsWith('?') ? msg91Query.substring(1) : msg91Query;
+ const separator = baseUrl.includes('?') ? '&' : '?';
+ return `${baseUrl}${separator}${queryString}`;
+}
class StepOne extends React.Component {
signupWithGitHub = () => {
diff --git a/src/pages/[[...slug]].js b/src/pages/[[...slug]].js
index ccd448d85..fbfb41bb2 100644
--- a/src/pages/[[...slug]].js
+++ b/src/pages/[[...slug]].js
@@ -27,7 +27,7 @@ import TermsComp from '@/components/TermsComp/TermsComp';
import ContactUsComp from '@/components/ContactUs';
import getPageInfo from '@/utils/getPageInfo';
import getCommonCompData from '@/utils/getCommonCompData';
-import SignUp from '@/components/signupComp/SignUp';
+import SignupParentComp from '@/components/SignupCompNew/SignupParentComp';
import ChatBotComp from '@/components/ChatBotComp/ChatBotComp';
import MagicLinkComp from '@/components/MagicLinkComp/MagicLinkComp';
import WhatsappLinkComp from '@/components/WhatsappLinkComp/WhatsappLinkComp';
@@ -91,7 +91,7 @@ const Components = {
NewHelloComp,
TermsComp,
ContactUsComp,
- SignUp,
+ SignUp: SignupParentComp,
ChatBotComp,
MagicLinkComp,
WhatsappLinkComp,
diff --git a/src/styles/_custom.scss b/src/styles/_custom.scss
index f011db932..f67e2d083 100644
--- a/src/styles/_custom.scss
+++ b/src/styles/_custom.scss
@@ -123,7 +123,7 @@ body {
content: '';
position: absolute;
width: 100%;
- height: 2px;
+ height: 1px;
bottom: 0;
left: 0;
transform: scaleX(0);
@@ -321,9 +321,6 @@ $button-transition-timing: 100ms;
}
}
-.iti .iti__country-list {
- // width: 350px !important;
-}
.tooltip.tooltip-modal {
&:before {
@@ -334,3 +331,7 @@ $button-transition-timing: 100ms;
:root:has(:is(.modal-open, .modal:target, .modal-toggle:checked + .modal, .modal[open])):has(.modal-scrollable) {
overflow: scroll !important;
}
+
+.input, select{
+ @apply focus:!outline-none;
+}
\ No newline at end of file
diff --git a/src/styles/globals.scss b/src/styles/globals.scss
index 3e545dcac..7fbfc2380 100644
--- a/src/styles/globals.scss
+++ b/src/styles/globals.scss
@@ -102,5 +102,28 @@ input[type='number'] {
display: none;
}
}
- }
-}
\ No newline at end of file
+ }
+}
+
+.toast {
+ @apply z-[10001] transition-all duration-300;
+ .alert {
+ @apply rounded-lg px-6 py-3 shadow-md border-none text-lg w-fit max-w-[400px];
+ &.alert-danger {
+ @apply text-white;
+ background: linear-gradient(90deg, #ff4d4f 0%, #f53100 100%);
+ }
+ &.alert-success {
+ @apply bg-green-500 text-white;
+ }
+ &.alert-info {
+ @apply bg-blue-500 text-white;
+ }
+ }
+ &.toast-hidded {
+ right: calc(-100% - 12px) !important;
+ }
+ &.toast-shown {
+ right: 12px !important;
+ }
+}
diff --git a/src/utils/getCountyFromIP.js b/src/utils/getCountyFromIP.js
new file mode 100644
index 000000000..a710e4600
--- /dev/null
+++ b/src/utils/getCountyFromIP.js
@@ -0,0 +1,9 @@
+export default async function getCountyFromIP() {
+ try {
+ const res = await fetch('https://api.db-ip.com/v2/free/self');
+ const data = await res.json();
+ return data;
+ } catch {
+ return { 'countryCode': 'us' };
+ }
+}
diff --git a/src/utils/getServices.js b/src/utils/getServices.js
new file mode 100644
index 000000000..b610c8d2f
--- /dev/null
+++ b/src/utils/getServices.js
@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+export default async function getServices() {
+ const response = await axios.get(`${process.env.API_BASE_URL}/api/v5/web/getAllServices`);
+ return response;
+}
diff --git a/src/utils/getURLParams.js b/src/utils/getURLParams.js
new file mode 100644
index 000000000..de8fa9cdc
--- /dev/null
+++ b/src/utils/getURLParams.js
@@ -0,0 +1,34 @@
+export default function getURLParams(paramsString) {
+ // Remove path before '?' or '/' if exists, keep only the query string part
+ if (typeof paramsString === 'string') {
+ // If paramsString contains '?', use substring after '?'
+ if (paramsString.includes('?')) {
+ paramsString = paramsString.substring(paramsString.indexOf('?'));
+ } else if (paramsString.includes('/')) {
+ // If no '?', but contains '/', use substring after last '/'
+ paramsString = paramsString.substring(paramsString.lastIndexOf('/') + 1);
+ }
+ }
+ // Remove leading '?' if present
+ const cleanString = paramsString.startsWith('?') ? paramsString.slice(1) : paramsString;
+
+ // Handle empty string
+ if (!cleanString || cleanString.trim() === '') {
+ return {};
+ }
+
+ // Split by '&' and map each parameter
+ const params = {};
+ const paramPairs = cleanString.split('&').filter((pair) => pair.trim() !== '');
+
+ paramPairs.forEach((pair) => {
+ const [key, value] = pair.split('=');
+ if (key) {
+ // Decode URL encoded values and handle boolean values
+ const decodedValue = decodeURIComponent(value || '');
+ params[key] = decodedValue === 'true' ? true : decodedValue === 'false' ? false : decodedValue;
+ }
+ });
+
+ return params;
+}