Skip to content
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

Fix : #2147 by changing the ref of twitter with X #2191

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Fix : #2147 by changing the ref of twitter with X #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb8abac
fix the ref of twitter
AnshulKahar2729 Aug 17, 2024
e6ae902
Merge branch 'develop' into twitter_ref_fix
AnshulKahar2729 Aug 17, 2024
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
2 changes: 1 addition & 1 deletion src/GraphQl/Queries/Queries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ export const GET_COMMUNITY_DATA = gql`
facebook
gitHub
instagram
twitter
X
linkedIn
youTube
reddit
Expand Down
0 ...assets/svgs/social-icons/Twitter-Logo.svg → src/assets/svgs/social-icons/X-Logo.svg
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions src/assets/svgs/social-icons/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import GithubLogo from './Github-Logo.svg';
import InstagramLogo from './Instagram-Logo.svg';
import LinkedInLogo from './Linkedin-Logo.svg';
import SlackLogo from './Slack-Logo.svg';
import TwitterLogo from './Twitter-Logo.svg';
import XLogo from './X-Logo.svg';
import YoutubeLogo from './Youtube-Logo.svg';
import RedditLogo from './Reddit-Logo.svg';

Expand All @@ -13,7 +13,7 @@ export {
InstagramLogo,
LinkedInLogo,
SlackLogo,
TwitterLogo,
XLogo,
YoutubeLogo,
RedditLogo,
};
8 changes: 4 additions & 4 deletions src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
GithubLogo,
InstagramLogo,
SlackLogo,
TwitterLogo,
XLogo,
YoutubeLogo,
RedditLogo,
} from 'assets/svgs/social-icons';
Expand All @@ -16,9 +16,9 @@ export const socialMediaLinks = [
logo: FacebookLogo,
},
{
tag: 'twitter',
href: 'https://twitter.com/palisadoesorg?lang=en',
logo: TwitterLogo,
tag: 'X',
href: 'https://X.com/palisadoesorg?lang=en',
logo: XLogo,
},
{
tag: 'linkedIn',
Expand Down
20 changes: 10 additions & 10 deletions src/screens/CommunityProfile/CommunityProfile.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const MOCKS1 = [
socialMediaUrls: {
facebook: 'https://socialurl.com',
instagram: 'https://socialurl.com',
twitter: 'https://socialurl.com',
X: 'https://socialurl.com',
linkedIn: 'https://socialurl.com',
gitHub: 'https://socialurl.com',
youTube: 'https://socialurl.com',
Expand Down Expand Up @@ -74,7 +74,7 @@ const MOCKS2 = [
linkedIn: null,
reddit: null,
slack: null,
twitter: null,
X: null,
},
},
},
Expand Down Expand Up @@ -115,7 +115,7 @@ const MOCKS3 = [
linkedIn: 'http://sociallink.com',
reddit: 'http://sociallink.com',
slack: 'http://sociallink.com',
twitter: 'http://sociallink.com',
X: 'http://sociallink.com',
},
},
},
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('Testing Community Profile Screen', () => {
expect(screen.getByPlaceholderText(/Website Link/i)).toBeInTheDocument();
expect(screen.getByTestId(/facebook/i)).toBeInTheDocument();
expect(screen.getByTestId(/instagram/i)).toBeInTheDocument();
expect(screen.getByTestId(/twitter/i)).toBeInTheDocument();
expect(screen.getByTestId(/X/i)).toBeInTheDocument();
expect(screen.getByTestId(/linkedIn/i)).toBeInTheDocument();
expect(screen.getByTestId(/github/i)).toBeInTheDocument();
expect(screen.getByTestId(/youtube/i)).toBeInTheDocument();
Expand Down Expand Up @@ -220,7 +220,7 @@ describe('Testing Community Profile Screen', () => {
const logo = screen.getByTestId(/fileInput/i);
const facebook = screen.getByTestId(/facebook/i);
const instagram = screen.getByTestId(/instagram/i);
const twitter = screen.getByTestId(/twitter/i);
const X = screen.getByTestId(/X/i);
const linkedIn = screen.getByTestId(/linkedIn/i);
const github = screen.getByTestId(/github/i);
const youtube = screen.getByTestId(/youtube/i);
Expand All @@ -233,7 +233,7 @@ describe('Testing Community Profile Screen', () => {
userEvent.type(websiteLink, profileVariables.websiteLink);
userEvent.type(facebook, profileVariables.socialUrl);
userEvent.type(instagram, profileVariables.socialUrl);
userEvent.type(twitter, profileVariables.socialUrl);
userEvent.type(X, profileVariables.socialUrl);
userEvent.type(linkedIn, profileVariables.socialUrl);
userEvent.type(github, profileVariables.socialUrl);
userEvent.type(youtube, profileVariables.socialUrl);
Expand All @@ -247,7 +247,7 @@ describe('Testing Community Profile Screen', () => {
// expect(logo).toBeTruthy();
expect(facebook).toHaveValue(profileVariables.socialUrl);
expect(instagram).toHaveValue(profileVariables.socialUrl);
expect(twitter).toHaveValue(profileVariables.socialUrl);
expect(X).toHaveValue(profileVariables.socialUrl);
expect(linkedIn).toHaveValue(profileVariables.socialUrl);
expect(github).toHaveValue(profileVariables.socialUrl);
expect(youtube).toHaveValue(profileVariables.socialUrl);
Expand Down Expand Up @@ -276,7 +276,7 @@ describe('Testing Community Profile Screen', () => {
expect(screen.getByPlaceholderText(/Website Link/i)).toHaveValue('');
expect(screen.getByTestId(/facebook/i)).toHaveValue('');
expect(screen.getByTestId(/instagram/i)).toHaveValue('');
expect(screen.getByTestId(/twitter/i)).toHaveValue('');
expect(screen.getByTestId(/X/i)).toHaveValue('');
expect(screen.getByTestId(/linkedIn/i)).toHaveValue('');
expect(screen.getByTestId(/github/i)).toHaveValue('');
expect(screen.getByTestId(/youtube/i)).toHaveValue('');
Expand All @@ -302,7 +302,7 @@ describe('Testing Community Profile Screen', () => {
expect(screen.getByPlaceholderText(/Website Link/i)).toHaveValue('');
expect(screen.getByTestId(/facebook/i)).toHaveValue('');
expect(screen.getByTestId(/instagram/i)).toHaveValue('');
expect(screen.getByTestId(/twitter/i)).toHaveValue('');
expect(screen.getByTestId(/X/i)).toHaveValue('');
expect(screen.getByTestId(/linkedIn/i)).toHaveValue('');
expect(screen.getByTestId(/github/i)).toHaveValue('');
expect(screen.getByTestId(/youtube/i)).toHaveValue('');
Expand All @@ -324,7 +324,7 @@ describe('Testing Community Profile Screen', () => {
expect(screen.getByPlaceholderText(/Website Link/i)).toHaveValue('');
expect(screen.getByTestId(/facebook/i)).toHaveValue('');
expect(screen.getByTestId(/instagram/i)).toHaveValue('');
expect(screen.getByTestId(/twitter/i)).toHaveValue('');
expect(screen.getByTestId(/X/i)).toHaveValue('');
expect(screen.getByTestId(/linkedIn/i)).toHaveValue('');
expect(screen.getByTestId(/github/i)).toHaveValue('');
expect(screen.getByTestId(/youtube/i)).toHaveValue('');
Expand Down
22 changes: 11 additions & 11 deletions src/screens/CommunityProfile/CommunityProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { UPDATE_COMMUNITY, RESET_COMMUNITY } from 'GraphQl/Mutations/mutations';
import {
FacebookLogo,
InstagramLogo,
TwitterLogo,
XLogo,
LinkedInLogo,
GithubLogo,
YoutubeLogo,
Expand Down Expand Up @@ -54,7 +54,7 @@ const CommunityProfile = (): JSX.Element => {
socialMediaUrls: {
facebook: string | undefined;
instagram: string | undefined;
twitter: string | undefined;
X: string | undefined;
linkedIn: string | undefined;
gitHub: string | undefined;
youTube: string | undefined;
Expand All @@ -70,7 +70,7 @@ const CommunityProfile = (): JSX.Element => {
logoUrl: '',
facebook: '',
instagram: '',
twitter: '',
X: '',
linkedIn: '',
github: '',
youtube: '',
Expand All @@ -96,7 +96,7 @@ const CommunityProfile = (): JSX.Element => {
logoUrl: preLoginData.logoUrl ?? '',
facebook: preLoginData.socialMediaUrls.facebook ?? '',
instagram: preLoginData.socialMediaUrls.instagram ?? '',
twitter: preLoginData.socialMediaUrls.twitter ?? '',
X: preLoginData.socialMediaUrls.X ?? '',
linkedIn: preLoginData.socialMediaUrls.linkedIn ?? '',
github: preLoginData.socialMediaUrls.gitHub ?? '',
youtube: preLoginData.socialMediaUrls.youTube ?? '',
Expand Down Expand Up @@ -136,7 +136,7 @@ const CommunityProfile = (): JSX.Element => {
socialMediaUrls: {
facebook: profileVariable.facebook,
instagram: profileVariable.instagram,
twitter: profileVariable.twitter,
X: profileVariable.X,
linkedIn: profileVariable.linkedIn,
gitHub: profileVariable.github,
youTube: profileVariable.youtube,
Expand Down Expand Up @@ -166,7 +166,7 @@ const CommunityProfile = (): JSX.Element => {
logoUrl: '',
facebook: '',
instagram: '',
twitter: '',
X: '',
linkedIn: '',
github: '',
youtube: '',
Expand Down Expand Up @@ -308,14 +308,14 @@ const CommunityProfile = (): JSX.Element => {
/>
</div>
<div className="mb-3 d-flex align-items-center gap-3">
<img src={TwitterLogo} alt="Twitter Logo" />
<img src={XLogo} alt="X Logo" />
<Form.Control
type="url"
id="twitter"
name="twitter"
data-testid="twitter"
id="X"
name="X"
data-testid="X"
className={styles.socialInput}
value={profileVariable.twitter}
value={profileVariable.X}
onChange={handleOnChange}
placeholder={t('url')}
autoComplete="off"
Expand Down
2 changes: 1 addition & 1 deletion src/screens/LoginPage/LoginPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ const MOCKS2 = [
linkedIn: 'http://url.com',
reddit: 'http://url.com',
slack: 'http://url.com',
twitter: null,
X: null,
__typename: 'SocialMediaUrls',
},
},
Expand Down
Loading