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.

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

Feature: Social Icons Integration on Login and Signup Page #1326

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This document provides instructions on how to set up and start a running instanc
- [Installation](#installation)
- [Setting up this repository](#setting-up-this-repository)
- [Setting up npm](#setting-up-npm)
- [Setting up Typescript](#setting-up-typescript)
aialok marked this conversation as resolved.
Show resolved Hide resolved
- [Installing required packages/dependencies](#installing-required-packagesdependencies)
- [Configuration](#configuration)
- [Creating .env file](#creating-env-file)
Expand All @@ -25,8 +26,8 @@ This document provides instructions on how to set up and start a running instanc
- [Debugging tests](#debugging-tests)
- [Linting code files](#linting-code-files)
- [Husky for Git Hooks](#husky-for-git-hooks)
- [pre-commit hook](#pre-commit-hook)
- [post-merge hook](#post-merge-hook)
- [pre-commit hook](#pre-commit-hook)
- [post-merge hook](#post-merge-hook)

<!-- tocstop -->

Expand Down
4 changes: 4 additions & 0 deletions src/assets/svgs/social-icons/Facebook-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/svgs/social-icons/Github-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/assets/svgs/social-icons/Instagram-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/svgs/social-icons/Linkedin-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/svgs/social-icons/Reddit-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/assets/svgs/social-icons/Slack-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/svgs/social-icons/Twitter-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/svgs/social-icons/Youtube-Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/assets/svgs/social-icons/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import FacebookLogo from './Facebook-Logo.svg';
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 YoutubeLogo from './Youtube-Logo.svg';

export {
FacebookLogo,
GithubLogo,
InstagramLogo,
LinkedInLogo,
SlackLogo,
TwitterLogo,
YoutubeLogo,
};
14 changes: 14 additions & 0 deletions src/screens/LoginPage/LoginPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@
margin-bottom: 0;
padding: 1rem;
}

.socialIcons {
margin-bottom: 1rem;
}
}

@media (max-width: 577px) {
Expand All @@ -124,6 +128,10 @@
height: 120px;
margin: 0 auto 2rem auto;
}

.socialIcons {
margin-bottom: 1rem;
}
}

.active_tab {
Expand Down Expand Up @@ -186,3 +194,9 @@
transform: translateY(0);
}
}

.socialIcons {
display: flex;
gap: 16px;
justify-content: center;
}
62 changes: 62 additions & 0 deletions src/screens/LoginPage/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import { toast } from 'react-toastify';

import {
FacebookLogo,
LinkedInLogo,
GithubLogo,
InstagramLogo,
SlackLogo,
TwitterLogo,
YoutubeLogo,
} from 'assets/svgs/social-icons';

import { REACT_APP_USE_RECAPTCHA, RECAPTCHA_SITE_KEY } from 'Constant/constant';
import {
LOGIN_MUTATION,
Expand Down Expand Up @@ -223,6 +233,58 @@ function loginPage(): JSX.Element {
<PalisadoesLogo className={styles.palisadoes_logo} />
<p className="text-center">{t('fromPalisadoes')}</p>
</div>

<div className={styles.socialIcons}>
<a
href="https://www.facebook.com/palisadoesproject"
target="_blank"
rel="noopener noreferrer"
>
<img src={FacebookLogo} />
</a>
<a
href="https://twitter.com/palisadoesorg?lang=en"
target="_blank"
rel="noopener noreferrer"
>
<img src={TwitterLogo} className={styles.socialIcon} />
</a>
<a
href="https://www.linkedin.com/company/palisadoes/"
target="_blank"
rel="noopener noreferrer"
>
<img src={LinkedInLogo} />
</a>
<a
href="https://github.com/PalisadoesFoundation"
target="_blank"
rel="noopener noreferrer"
>
<img src={GithubLogo} />
</a>
<a
href="https://www.youtube.com/@PalisadoesOrganization"
target="_blank"
rel="noopener noreferrer"
>
<img src={YoutubeLogo} />
</a>
<a
href="https://www.palisadoes.org/slack"
target="_blank"
rel="noopener noreferrer"
>
<img src={SlackLogo} />
</a>
<a
href="https://www.instagram.com/palisadoes/"
target="_blank"
rel="noopener noreferrer"
>
<img src={InstagramLogo} />
</a>
</div>
</Col>
<Col sm={12} md={6} lg={5}>
<div className={styles.right_portion}>
Expand Down
10 changes: 10 additions & 0 deletions src/screens/UserPortal/UserLoginPage/UserLoginPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,14 @@ body::before {
.leftPane {
width: 100%;
}

.socialIcons {
margin-bottom: 1rem;
}
}

.socialIcons {
display: flex;
gap: 16px;
justify-content: center;
}
61 changes: 61 additions & 0 deletions src/screens/UserPortal/UserLoginPage/UserLoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ import Login from 'components/UserPortal/Login/Login';
import Register from 'components/UserPortal/Register/Register';
import styles from './UserLoginPage.module.css';

import {
FacebookLogo,
LinkedInLogo,
GithubLogo,
InstagramLogo,
SlackLogo,
TwitterLogo,
YoutubeLogo,
} from 'assets/svgs/social-icons';

export default function userLoginPage(): JSX.Element {
const { t } = useTranslation('translation', { keyPrefix: 'loginPage' });

Expand All @@ -27,6 +37,57 @@ export default function userLoginPage(): JSX.Element {
<h6 style={{ textAlign: `center` }}>
<p>{t('fromPalisadoes')}</p>
</h6>
<div className={styles.socialIcons}>
<a
href="https://www.facebook.com/palisadoesproject"
target="_blank"
rel="noopener noreferrer"
>
<img src={FacebookLogo} />
</a>
<a
href="https://twitter.com/palisadoesorg?lang=en"
target="_blank"
rel="noopener noreferrer"
>
<img src={TwitterLogo} className={styles.socialIcon} />
</a>
<a
href="https://www.linkedin.com/company/palisadoes/"
target="_blank"
rel="noopener noreferrer"
>
<img src={LinkedInLogo} />
</a>
<a
href="https://github.com/PalisadoesFoundation"
target="_blank"
rel="noopener noreferrer"
>
<img src={GithubLogo} />
</a>
<a
href="https://www.youtube.com/@PalisadoesOrganization"
target="_blank"
rel="noopener noreferrer"
>
<img src={YoutubeLogo} />
</a>
<a
href="https://www.palisadoes.org/slack"
target="_blank"
rel="noopener noreferrer"
>
<img src={SlackLogo} />
</a>
<a
href="https://www.instagram.com/palisadoes/"
target="_blank"
rel="noopener noreferrer"
>
<img src={InstagramLogo} />
</a>
</div>
</div>
<div className={`${styles.contentContainer} py-5`}>
<ChangeLanguageDropDown parentContainerStyle="m-0" />
Expand Down