Skip to content

Commit 636007e

Browse files
authored
Dev to Main Sync (#1128)
* chore: remove dev flag from identity page (#1119) * chore: remove dev flag from discord (#1118) * chore: remove dev flag from notifications (#1117) * chore: remove dev flag from profile page (#1114) * chore: remove dev flag from profile page * fix: add test description * fix: naming for profile route test * chore: remove dev flag from new signup page (#1115) * chore: remove feature flag from mobile page (#1019) * chore: remove feature flag from mobile page * fix: naming for mobile route test * chore: replace my site url with updated links (#1129)
2 parents 51c80bc + 126fd13 commit 636007e

File tree

16 files changed

+37
-229
lines changed

16 files changed

+37
-229
lines changed

app/constants/urls.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ const APP_URLS = {
1111
EVENTS: `${SCHEME}${DOMAIN}/events`,
1212
MEMBERS: `${SCHEME}members.${DOMAIN}`,
1313
STATUS: `${SCHEME}status.${DOMAIN}`,
14-
PROFILE: `${SCHEME}my.${DOMAIN}/profile`,
15-
TASKS: `${SCHEME}my.${DOMAIN}/tasks`,
16-
IDENTITY: `${SCHEME}my.${DOMAIN}/identity`,
17-
MY_STATUS: `${SCHEME}my.${DOMAIN}`,
14+
PROFILE: `${SCHEME}${DOMAIN}/profile`,
15+
TASKS: `${SCHEME}status.${DOMAIN}/tasks`,
16+
IDENTITY: `${SCHEME}${DOMAIN}/identity`,
17+
MY_STATUS: `${SCHEME}${DOMAIN}/status`,
1818
API_BACKEND: `${SCHEME}api.${DOMAIN}`,
1919
DASHBOARD: `${SCHEME}dashboard.${DOMAIN}`,
2020
},
@@ -25,24 +25,24 @@ const APP_URLS = {
2525
EVENTS: `${SCHEME}staging-www.${DOMAIN}/events`,
2626
MEMBERS: `${SCHEME}staging-members.${DOMAIN}`,
2727
STATUS: `${SCHEME}staging-status.${DOMAIN}`,
28-
PROFILE: `${SCHEME}staging-my.${DOMAIN}/profile`,
29-
TASKS: `${SCHEME}staging-my.${DOMAIN}/tasks`,
30-
IDENTITY: `${SCHEME}staging-my.${DOMAIN}/identity`,
31-
MY_STATUS: `${SCHEME}staging-my.${DOMAIN}`,
28+
PROFILE: `${SCHEME}staging-www.${DOMAIN}/profile`,
29+
TASKS: `${SCHEME}staging-status.${DOMAIN}/tasks`,
30+
IDENTITY: `${SCHEME}staging-www.${DOMAIN}/identity`,
31+
MY_STATUS: `${SCHEME}staging-www.${DOMAIN}/status`,
3232
API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
3333
DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
3434
},
3535
development: {
36-
HOME: `${SCHEME}staging-www.${DOMAIN}`,
36+
HOME: '/',
3737
WELCOME: `${SCHEME}staging-welcome.${DOMAIN}`,
38-
GOTO: `${SCHEME}staging-www.${DOMAIN}/goto`,
39-
EVENTS: `${SCHEME}staging-www.${DOMAIN}/events`,
38+
GOTO: '/goto',
39+
EVENTS: '/events',
4040
MEMBERS: `${SCHEME}staging-members.${DOMAIN}`,
4141
STATUS: `${SCHEME}staging-status.${DOMAIN}`,
42-
PROFILE: `${SCHEME}staging-my.${DOMAIN}/profile`,
43-
TASKS: `${SCHEME}staging-my.${DOMAIN}/tasks`,
44-
IDENTITY: `${SCHEME}staging-my.${DOMAIN}/identity`,
45-
MY_STATUS: `${SCHEME}staging-my.${DOMAIN}`,
42+
PROFILE: '/profile',
43+
TASKS: `${SCHEME}staging-status.${DOMAIN}/tasks`,
44+
IDENTITY: '/identity',
45+
MY_STATUS: '/status',
4646
DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
4747
API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
4848
},
@@ -53,10 +53,10 @@ const APP_URLS = {
5353
EVENTS: `${SCHEME}${DOMAIN}/events`,
5454
MEMBERS: `${SCHEME}members.${DOMAIN}`,
5555
STATUS: `${SCHEME}status.${DOMAIN}`,
56-
PROFILE: `${SCHEME}my.${DOMAIN}/profile`,
57-
TASKS: `${SCHEME}my.${DOMAIN}/tasks`,
58-
IDENTITY: `${SCHEME}my.${DOMAIN}/identity`,
59-
MY_STATUS: `${SCHEME}my.${DOMAIN}`,
56+
PROFILE: `${SCHEME}${DOMAIN}/profile`,
57+
TASKS: `${SCHEME}status.${DOMAIN}/tasks`,
58+
IDENTITY: `${SCHEME}${DOMAIN}/identity`,
59+
MY_STATUS: `${SCHEME}${DOMAIN}/status`,
6060
API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
6161
DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
6262
},
@@ -73,7 +73,7 @@ export const ABOUT = {
7373
export const AUTH = {
7474
GITHUB_SIGN_IN: `${APPS.API_BACKEND}/auth/github/login`,
7575
GOOGLE_SIGN_IN: `${APPS.API_BACKEND}/auth/google/login?dev=true`,
76-
SIGN_UP: `${APPS.PROFILE}/new-signup`,
76+
SIGN_UP: `${APPS.HOME}/new-signup`,
7777
};
7878

7979
export const SOCIALS = {

app/controllers/new-signup.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ import apiRequest from '../utils/api-request';
1919
export default class NewSignupController extends Controller {
2020
@service toast;
2121

22-
queryParams = ['currentStep', 'dev', 'signupDev'];
22+
queryParams = ['currentStep', 'dev'];
2323

2424
@tracked dev;
25-
@tracked signupDev;
2625
@tracked isLoading = false;
2726
@tracked isButtonDisabled = true;
2827
@tracked error = '';
@@ -42,8 +41,7 @@ export default class NewSignupController extends Controller {
4241
};
4342

4443
get isDevMode() {
45-
// replace this signupDev with dev flag once new-signup page is not under dev flag
46-
return this.signupDev === 'true';
44+
return this.dev === 'true';
4745
}
4846

4947
async generateUsername(firstname, lastname) {

app/controllers/profile.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@ const BASE_URL = APPS.API_BACKEND;
99

1010
export default class ProfileController extends Controller {
1111
@service toast;
12-
@service router;
13-
get isDev() {
14-
if (
15-
this.router.currentRoute &&
16-
this.router.currentRoute.queryParams.dev === 'true'
17-
) {
18-
return this.router.currentRoute.queryParams.dev;
19-
}
20-
return false;
21-
}
12+
2213
get imageUploadUrl() {
2314
return `${BASE_URL}/users/picture`;
2415
}

app/routes/discord.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ export default class DiscordRoute extends Route {
1111
token: { refreshModel: true },
1212
};
1313

14-
beforeModel(transition) {
15-
if (!transition.to.queryParams.dev) {
16-
this.router.transitionTo('page-not-found');
17-
}
18-
}
19-
2014
async model() {
2115
try {
2216
const token = this.paramsFor('discord').token;

app/routes/identity.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ export default class IdentityRoute extends Route {
1010
@service login;
1111
@service fastboot;
1212

13-
beforeModel(transition) {
14-
if (transition?.to?.queryParams?.dev !== 'true') {
15-
this.router.transitionTo('/page-not-found');
16-
}
17-
}
18-
1913
async model() {
2014
if (this.fastboot.isFastBoot) {
2115
return null;

app/routes/mobile.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ export default class MobileRoute extends Route {
99
@service toast;
1010
@service router;
1111

12-
beforeModel(transition) {
13-
if (transition?.to?.queryParams?.dev !== 'true') {
14-
this.router.transitionTo('/page-not-found');
15-
}
16-
}
17-
1812
async model() {
1913
try {
2014
const response = await fetch(SELF_USER_PROFILE_URL, {

app/routes/new-signup.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ import redirectAuth from '../utils/redirect-auth';
1010
export default class NewSignupRoute extends Route {
1111
@service toast;
1212
@service router;
13-
isDevMode = false;
14-
15-
beforeModel(transition) {
16-
if (transition?.to?.queryParams?.dev !== 'true') {
17-
this.router.transitionTo('/page-not-found');
18-
}
19-
this.isDevMode = true;
20-
}
2113

2214
async model() {
2315
try {

app/routes/notifications.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,2 @@
11
import Route from '@ember/routing/route';
2-
import { inject as service } from '@ember/service';
3-
export default class NotificationsRoute extends Route {
4-
@service router;
5-
6-
queryParams = {
7-
dev: {
8-
refreshModel: false,
9-
},
10-
};
11-
12-
beforeModel(transition) {
13-
if (transition?.to?.queryParams?.dev !== 'true') {
14-
this.router.transitionTo('/page-not-found');
15-
}
16-
}
17-
}
2+
export default class NotificationsRoute extends Route {}

app/routes/profile.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ const BASE_URL = APPS.API_BACKEND;
1010
export default class ProfileRoute extends Route {
1111
@service toast;
1212
@service fastboot;
13-
@service router;
14-
beforeModel(transition) {
15-
if (transition?.to?.queryParams?.dev !== 'true') {
16-
this.router.transitionTo('/page-not-found');
17-
}
18-
}
13+
1914
async model() {
2015
try {
2116
const res = await fetch(`${BASE_URL}/users/isDeveloper`, {

tests/constants/urls.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ export const APPS = {
44
EVENTS: 'https://realdevsquad.com/events',
55
MEMBERS: 'https://members.realdevsquad.com',
66
STATUS: 'https://status.realdevsquad.com',
7-
PROFILE: 'https://my.realdevsquad.com/profile',
8-
TASKS: 'https://my.realdevsquad.com/tasks',
9-
IDENTITY: 'https://my.realdevsquad.com/identity',
10-
MY_STATUS: 'https://my.realdevsquad.com',
7+
PROFILE: 'https://realdevsquad.com/profile',
8+
TASKS: 'https://status.realdevsquad.com/tasks',
9+
IDENTITY: 'https://realdevsquad.com/identity',
10+
MY_STATUS: 'https://realdevsquad.com/status',
1111
STAGING_API_BACKEND: 'https://staging-api.realdevsquad.com',
1212
};
1313

0 commit comments

Comments
 (0)