Skip to content

Commit d280775

Browse files
fix: replace my site urls and use env based redirection (#1381)
1 parent 45c0ed5 commit d280775

File tree

5 files changed

+35
-20
lines changed

5 files changed

+35
-20
lines changed

__tests__/Unit/Components/ExtensionRequest/ExtensionStatusModal.test.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,15 @@ describe('ExtensionStatusModal Component', () => {
121121

122122
test('should test formatToRelativeTime function', () => {
123123
const timestamp = 1640995200;
124+
const fixedNow = new Date('2025-01-01T00:00:00Z');
125+
126+
jest.useFakeTimers();
127+
jest.setSystemTime(fixedNow);
128+
124129
const result = formatToRelativeTime(timestamp);
125130
expect(result).toBe('3 years ago');
131+
132+
jest.useRealTimers();
126133
});
127134

128135
test('should open extension request form when request extension button is clicked', () => {

__tests__/Unit/Components/Navbar/Navbar.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ describe('Navbar', () => {
8989
);
9090
expect(eventLink).toHaveAttribute(
9191
'href',
92-
'https://www.realdevsquad.com/events.html'
92+
'https://www.realdevsquad.com/events'
9393
);
9494
expect(memberLink).toHaveAttribute(
9595
'href',

__tests__/Unit/Components/Tasks/Card.test.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,8 @@ describe('Task card', () => {
537537
});
538538

539539
it('renders "Started" with a specific date if status is not AVAILABLE', () => {
540+
jest.useFakeTimers();
541+
jest.setSystemTime(new Date('2025-01-01T00:00:00Z'));
540542
const { getByTestId } = renderWithRouter(
541543
<Provider store={store()}>
542544
<Card
@@ -549,6 +551,7 @@ describe('Task card', () => {
549551
);
550552
const spanElement = screen.getByTestId('started-on');
551553
expect(spanElement).toHaveTextContent('Started 4 years ago'); // Mocked date from moment
554+
jest.useRealTimers();
552555
});
553556
it('Should show the status of the task', () => {
554557
renderWithRouter(

src/components/Dropdown/Dropdown.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Link from 'next/link';
2-
import { LOGOUT_URL, MAIN_SITE_URL, MY_SITE_URL } from '../../constants/url';
2+
import { LOGOUT_URL, MAIN_SITE_URL } from '../../constants/url';
33
import styles from '@/components/Dropdown/dropdown.module.scss';
44

55
export const logout = () => {
@@ -18,23 +18,23 @@ const Dropdown = () => {
1818
<Link href={MAIN_SITE_URL} className={styles.dropdownLink}>
1919
<li className={styles.dropdownItem}>Home</li>
2020
</Link>
21-
<Link href={`${MY_SITE_URL}`} className={styles.dropdownLink}>
22-
<li className={styles.dropdownItem}>Status</li>
23-
</Link>
2421
<Link
25-
href={`${MY_SITE_URL}/profile`}
22+
href={`${MAIN_SITE_URL}/status`}
2623
className={styles.dropdownLink}
2724
>
28-
<li className={styles.dropdownItem}>Profile</li>
25+
<li className={styles.dropdownItem}>Status</li>
2926
</Link>
3027
<Link
31-
href={`${MY_SITE_URL}/tasks`}
28+
href={`${MAIN_SITE_URL}/profile`}
3229
className={styles.dropdownLink}
3330
>
31+
<li className={styles.dropdownItem}>Profile</li>
32+
</Link>
33+
<Link href="/tasks" className={styles.dropdownLink}>
3434
<li className={styles.dropdownItem}>Tasks</li>
3535
</Link>
3636
<Link
37-
href={`${MY_SITE_URL}/identity`}
37+
href={`${MAIN_SITE_URL}/identity`}
3838
className={styles.dropdownLink}
3939
>
4040
<li className={styles.dropdownItem}>Identity</li>

src/constants/url.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
export const BASE_URL = `${process.env.NEXT_PUBLIC_BASE_URL}`;
22
export const SUBSCRIBE_TO_CHALLENGE_URL = `${BASE_URL}/challenges/subscribe`;
33
export const MINE_TASKS_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/tasks/self`;
4-
export const USER_PROFILE_URL = 'https://my.realdevsquad.com/profile';
5-
export const HOME_URL = 'https://realdevsquad.com';
6-
export const WELCOME_URL = 'https://welcome.realdevsquad.com';
7-
export const EVENTS_URL = 'https://www.realdevsquad.com/events.html';
8-
export const CRYPTO_URL = 'https://crypto.realdevsquad.com';
9-
export const STATUS_URL = 'https://status.realdevsquad.com';
4+
5+
const isStaging = process.env.NEXT_PUBLIC_BASE_URL?.includes(
6+
'staging-api.realdevsquad.com'
7+
);
8+
const envPrefix = isStaging ? 'staging-' : '';
9+
10+
export const USER_PROFILE_URL = `https://${envPrefix}my.realdevsquad.com/profile`;
11+
export const HOME_URL = `https://${envPrefix}realdevsquad.com`;
12+
export const WELCOME_URL = `https://${envPrefix}welcome.realdevsquad.com`;
13+
export const EVENTS_URL = `https://${envPrefix}www.realdevsquad.com/events`;
14+
export const CRYPTO_URL = `https://${envPrefix}crypto.realdevsquad.com`;
15+
export const STATUS_URL = `https://${envPrefix}status.realdevsquad.com`;
1016
export const LOGIN_URL = `https://github.com/login/oauth/authorize?client_id=23c78f66ab7964e5ef97&state=${STATUS_URL}`;
11-
export const MEMBERS_URL = 'https://members.realdevsquad.com';
17+
export const MEMBERS_URL = `https://${envPrefix}members.realdevsquad.com`;
1218
export const CHALLENGES_URL = `${BASE_URL}/challenges`;
1319
export const USER_SELF = `${BASE_URL}/users?profile=true`;
1420
export const USERS_IDLE = `${BASE_URL}/users/search?state=IDLE`;
1521
export const DEFAULT_AVATAR = '/Avatar.png';
1622
export const RDS_LOGO = '/RDSLogo.png';
1723
export const GITHUB_LOGO = '/github-white.png';
18-
export const SIGNUP_LINK = 'https://my.realdevsquad.com/signup';
24+
export const SIGNUP_LINK = `https://${envPrefix}www.realdevsquad.com/new-signup`;
1925
export const LOGOUT_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/auth/signout`;
2026
export const IDLE_USERS_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/users/status?state=IDLE`;
2127
export const ITEM_BY_FILTER_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/items/filter`;
@@ -28,9 +34,8 @@ export const TASKS_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/tasks`;
2834
export const TASK_REQUEST_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/taskRequests`;
2935
export const ISSUES_URL = `${process.env.NEXT_PUBLIC_BASE_URL}/issues`;
3036
export const USERS_URL = `${BASE_URL}/users`;
31-
export const MAIN_SITE_URL = 'https://www.realdevsquad.com';
32-
export const MY_SITE_URL = 'https://my.realdevsquad.com';
33-
export const DASHBOARD_URL = 'https://dashboard.realdevsquad.com';
37+
export const MAIN_SITE_URL = `https://${envPrefix}www.realdevsquad.com`;
38+
export const DASHBOARD_URL = `https://${envPrefix}dashboard.realdevsquad.com`;
3439
export const USER_MANAGEMENT_URL = `${DASHBOARD_URL}/users/details/`;
3540
export const TASK_REQUESTS_DETAILS_URL = `${DASHBOARD_URL}/task-requests/details/`;
3641
export const TASK_EXTENSION_REQUEST_URL = `${DASHBOARD_URL}/extension-requests/`;

0 commit comments

Comments
 (0)