Skip to content

Commit

Permalink
Merge pull request #922 from the-hideout/feature/discord_fixes
Browse files Browse the repository at this point in the history
Discord fixes
  • Loading branch information
Shebuka authored Apr 11, 2024
2 parents e6fc4cd + 11c8486 commit 3df13b5
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Please delete any sections below which you do not need to fill out. You may keep
<summary> Expand for Help </summary>

- Have questions about the review or deployment process? View our [contributing docs](https://github.com/the-hideout/tarkov-dev/blob/main/CONTRIBUTING.md)
- Need additional help and want to chat in real time? Join our [community Discord](https://discord.gg/XPAsKGHSzH)
- Need additional help and want to chat in real time? Join our [community Discord](https://discord.gg/VGq6xtTD)

> By submitting this pull request, you agree to our [code of conduct](https://github.com/the-hideout/tarkov-dev/blob/main/CODE_OF_CONDUCT.md)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tarkov.dev 💻

[![deploy](https://github.com/the-hideout/tarkov-dev/actions/workflows/deploy.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/deploy.yml) [![ci](https://github.com/the-hideout/tarkov-dev/actions/workflows/ci.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/ci.yml) [![CodeQL](https://github.com/the-hideout/tarkov-dev/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/codeql-analysis.yml) ![contributors](https://img.shields.io/github/contributors-anon/the-hideout/tarkov-dev) [![Discord](https://img.shields.io/discord/956236955815907388?color=7388DA&label=Discord)](https://discord.gg/XPAsKGHSzH)
[![deploy](https://github.com/the-hideout/tarkov-dev/actions/workflows/deploy.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/deploy.yml) [![ci](https://github.com/the-hideout/tarkov-dev/actions/workflows/ci.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/ci.yml) [![CodeQL](https://github.com/the-hideout/tarkov-dev/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/the-hideout/tarkov-dev/actions/workflows/codeql-analysis.yml) ![contributors](https://img.shields.io/github/contributors-anon/the-hideout/tarkov-dev) [![Discord](https://img.shields.io/discord/956236955815907388?color=7388DA&label=Discord)](https://discord.gg/VGq6xtTD)

![react](https://img.shields.io/badge/lib-react-blue) ![JS](https://img.shields.io/badge/language-JS-blue)

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ The `main` branch of this repo is considered active and supported for all securi

## Reporting a Vulnerability

If you discover a security vulnerability, please reach out in our [community Discord](https://discord.gg/XPAsKGHSzH) to report it.
If you discover a security vulnerability, please reach out in our [community Discord](https://discord.gg/VGq6xtTD) to report it.
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function Fallback({ error, resetErrorBoundary }) {
<pre style={{ color: "red" }}>{error.message}</pre>
<pre>{error.stack}</pre>
You can <button style={{ padding: '.2rem', borderRadius: '4px' }} onClick={resetErrorBoundary}>try again</button> or report the issue by
joining our <a href="https://discord.gg/XJqw5T3H3u" target="_blank" rel="noopener noreferrer">Discord</a> server and
joining our <a href="https://discord.gg/VGq6xtTD" target="_blank" rel="noopener noreferrer">Discord</a> server and
copy/paste the above error and some details in <a href="https://discord.com/channels/956236955815907388/956239773742288896" target="_blank" rel="noopener noreferrer">#🐞bugs-issues</a> channel.
</details>
</div>
Expand Down
7 changes: 4 additions & 3 deletions src/components/footer/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
}

.discord {
width: 300px;
display: block;
width: 320px;
height: 70px;
transition: all 0.5s ease-in-out;
}

.discord:hover {
height: 500px;
width: 300px;
width: 320px;
height: 250px;
}

.stellate-wrapper img {
Expand Down
32 changes: 18 additions & 14 deletions src/components/footer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function Footer() {
</Trans>
<Trans i18nKey={'about-discord-p'}>
<p>
If you wanna have a chat, ask questions or request features, we have a <a href="https://discord.gg/XPAsKGHSzH" target="_blank" rel="noopener noreferrer"><DiscordIcon /> Discord</a> server.
If you wanna have a chat, ask questions or request features, we have a <a href="https://discord.gg/VGq6xtTD" target="_blank" rel="noopener noreferrer"><DiscordIcon /> Discord</a> server.
</p>
</Trans>
<Trans i18nKey={'about-x-p'}>
Expand All @@ -47,28 +47,26 @@ function Footer() {
<div className="footer-section-wrapper">
<h3>{t('Supporters')}</h3>
<Trans i18nKey={'about-support-ukraine-p'}>
<p>
We encourage everyone who can to donate to support the people of Ukraine using the button below.
</p>
<p>
We encourage everyone who can to donate to support the people of Ukraine using the button below.
</p>
</Trans>
<UkraineButton large={true}/>
<Trans i18nKey={'about-support-collective-p'}>
<p>
If you'd also like to support this project, you can make a donation and/or become a backer on <a href="https://opencollective.com/tarkov-dev" target="_blank" rel="noopener noreferrer">Open Collective</a>.
</p>
<p>
If you'd also like to support this project, you can make a donation and/or become a backer on <a href="https://opencollective.com/tarkov-dev" target="_blank" rel="noopener noreferrer">Open Collective</a>.
</p>
</Trans>
<OpenCollectiveButton large={true}/>
<h3>{t('Item Data')}</h3>
<p>
{t(
'Fresh EFT data courtesy of',
)}{' '}
{t('Fresh EFT data courtesy of')}{' '}
<a href="https://tarkov-changes.com" target="_blank" rel="noopener noreferrer">
<span>Tarkov-Changes</span>
</a>
</p>
<p>
{t('Additional data courtesy of')} {' '}
{t('Additional data courtesy of')}{' '}
<a href="https://www.sp-tarkov.com/" target="_blank" rel="noopener noreferrer">
<span>SPT-AKI</span>
</a>
Expand All @@ -84,18 +82,24 @@ function Footer() {
<div className="footer-section-wrapper">
<h3>{t('Resources')}</h3>
<p>
<Link to={'/api/'}>{t('Tarkov.dev API')}</Link>
<Link to={'/api/'}>
{t('Tarkov.dev API')}
</Link>
</p>
<p>
<a href="https://github.com/the-hideout/TarkovMonitor" target="_blank" rel="noopener noreferrer">
Tarkov Monitor
</a>
</p>
<p>
<Link to={'/moobot'}>{t('{{bot}} integration', { bot: 'Moobot' })}</Link>
<Link to={'/moobot'}>
{t('{{bot}} integration', { bot: 'Moobot' })}
</Link>
</p>
<p>
<Link to={'/nightbot/'}>{t('{{bot}} integration', { bot: 'Nightbot' })}</Link>
<Link to={'/nightbot/'}>
{t('{{bot}} integration', { bot: 'Nightbot' })}
</Link>
</p>
<p>
<Link to={'/streamelements/'}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/about/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function About() {
<h2>{t('Discussions & feedback')}</h2>
<Trans i18nKey={'about-discord-p'}>
<p>
If you wanna have a chat, ask questions or request features, we have a <a href="https://discord.gg/XPAsKGHSzH" target="_blank" rel="noopener noreferrer"><DiscordIcon /> Discord</a> server.
If you wanna have a chat, ask questions or request features, we have a <a href="https://discord.gg/VGq6xtTD" target="_blank" rel="noopener noreferrer"><DiscordIcon /> Discord</a> server.
</p>
</Trans>
<Trans i18nKey={'about-x-p'}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/api-users/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function ApiUsers() {
<h1>{t('API Users')} - {t('Tarkov.dev')}</h1>
<Trans i18nKey={'api-users-p'}>
<p>
Want to be included on this page? Join the <a href="https://discord.gg/XPAsKGHSzH" target="_blank" rel="noopener noreferrer">Discord</a> and tell us about what you've made!
Want to be included on this page? Join the <a href="https://discord.gg/VGq6xtTD" target="_blank" rel="noopener noreferrer">Discord</a> and tell us about what you've made!
</p>
</Trans>
{apiUsers.map((apiUser) => {
Expand Down

0 comments on commit 3df13b5

Please sign in to comment.