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

Replace messenger with telegram #3802

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
10 changes: 8 additions & 2 deletions website/src/config/app-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
"2022/2023",
"2023/2024"
],
"examAvailability": [1, 2, 3, 4],
"examAvailability": [
1,
2,
3,
4
],
"semesterNames": {
"1": "Semester 1",
"2": "Semester 2",
Expand All @@ -41,6 +46,7 @@
"githubOrg": "https://github.com/nusmodifications",
"githubRepo": "https://github.com/nusmodifications/nusmods",
"messenger": "https://m.me/nusmods",
"twitter": "https://twitter.com/nusmods"
"twitter": "https://twitter.com/nusmods",
"telegram": "https://t.me/nusmods"
}
}
1 change: 1 addition & 0 deletions website/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export type Config = {
githubOrg: string;
githubRepo: string;
messenger: string;
telegram: string;
twitter: string;
};

Expand Down
4 changes: 2 additions & 2 deletions website/src/views/components/FeedbackModal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
color: #fff;
}

&.messenger {
$button-bg: #0084ff;
&.telegram {
$button-bg: #3aa8db;

background: $button-bg;

Expand Down
12 changes: 6 additions & 6 deletions website/src/views/components/FeedbackModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { connect } from 'react-redux';
import { Heart, GitHub, Facebook, Mail } from 'react-feather';
import { Heart, GitHub, Mail, Send } from 'react-feather';

import config from 'config';
import { toggleFeedback } from 'actions/app';
Expand All @@ -18,9 +18,9 @@ type Props = {
export const FeedbackButtons: React.FC = () => (
<div>
<div className={styles.links}>
<ExternalLink className={styles.messenger} href={config.contact.messenger}>
<Facebook />
Messenger
<ExternalLink className={styles.telegram} href={config.contact.telegram}>
<Send />
Telegram
</ExternalLink>
<ExternalLink className={styles.github} href={config.contact.githubRepo}>
<GitHub />
Expand Down Expand Up @@ -52,8 +52,8 @@ export const FeedbackModalComponent: React.FC<Props> = (props) => (
<Heart className={styles.topIcon} />
<h1>Let us know what you think!</h1>
<p>
Thank you for your time! You can talk to us on Messenger, file an issue on GitHub, or send
us an email.
Thank you for your time! You can talk to us on Telegram, file an issue on GitHub, or send us
an email.
</p>
<FeedbackButtons />
</div>
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/layout/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const FooterComponent: React.FC<Props> = (props) => {
<ExternalLink href={config.contact.facebook}>Facebook</ExternalLink>
</li>
<li>
<ExternalLink href={config.contact.messenger}>Messenger</ExternalLink>
<ExternalLink href={config.contact.telegram}>Telegram</ExternalLink>
</li>
<li>
<ExternalLink href={config.contact.twitter}>Twitter</ExternalLink>
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/settings/BetaToggle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<div className={styles.toggle}>
<Toggle className={styles.betaToggle} isOn={betaTester} onChange={toggleStates} />
{betaTester && hasTests && (
<ExternalLink className="btn btn-success" href={config.contact.messenger}>
<ExternalLink className="btn btn-success" href={config.contact.telegram}>

Check warning on line 50 in website/src/views/settings/BetaToggle.tsx

View check run for this annotation

Codecov / codecov/patch

website/src/views/settings/BetaToggle.tsx#L50

Added line #L50 was not covered by tests
Leave Feedback
</ExternalLink>
)}
Expand Down
2 changes: 1 addition & 1 deletion website/src/views/static/AboutContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const AboutContainer: React.FC<Props> = (props) => (
</button>
</div>
<div className={classnames('col-lg', styles.btnContainer)}>
<ExternalLink href={config.contact.messenger} className="btn btn-primary btn-svg btn-block">
<ExternalLink href={config.contact.telegram} className="btn btn-primary btn-svg btn-block">
<Layers className="svg" />
We need designers!
</ExternalLink>
Expand Down
4 changes: 2 additions & 2 deletions website/src/views/static/FaqContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ const FaqContainer: React.FC = () => (
<p>
Congratulations on making it to the end! If you still want to contact us, you may reach us
via email at nusmods&#123;at&#125;googlegroups[dot]com or via{' '}
<ExternalLink href={config.contact.messenger}>Messenger</ExternalLink>. Please allow up to
90 working days for a reply. We are busy <Link to="/team">students</Link> as well!
<ExternalLink href={config.contact.telegram}>Telegram</ExternalLink>. Please allow up to 90
working days for a reply. We are busy <Link to="/team">students</Link> as well!
</p>
</div>
</StaticPage>
Expand Down