Dev to Main Sync (#1128)

iamitprakash · web-flow · commit 636007e6ad70 · 2026-01-16T23:44:06.000+05:30
* 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)
diff --git a/app/constants/urls.js b/app/constants/urls.js
@@ -11,10 +11,10 @@ const APP_URLS = {
     EVENTS: `${SCHEME}${DOMAIN}/events`,
     MEMBERS: `${SCHEME}members.${DOMAIN}`,
     STATUS: `${SCHEME}status.${DOMAIN}`,
-    PROFILE: `${SCHEME}my.${DOMAIN}/profile`,
-    TASKS: `${SCHEME}my.${DOMAIN}/tasks`,
-    IDENTITY: `${SCHEME}my.${DOMAIN}/identity`,
-    MY_STATUS: `${SCHEME}my.${DOMAIN}`,
+    PROFILE: `${SCHEME}${DOMAIN}/profile`,
+    TASKS: `${SCHEME}status.${DOMAIN}/tasks`,
+    IDENTITY: `${SCHEME}${DOMAIN}/identity`,
+    MY_STATUS: `${SCHEME}${DOMAIN}/status`,
     API_BACKEND: `${SCHEME}api.${DOMAIN}`,
     DASHBOARD: `${SCHEME}dashboard.${DOMAIN}`,
   },
@@ -25,24 +25,24 @@ const APP_URLS = {
     EVENTS: `${SCHEME}staging-www.${DOMAIN}/events`,
     MEMBERS: `${SCHEME}staging-members.${DOMAIN}`,
     STATUS: `${SCHEME}staging-status.${DOMAIN}`,
-    PROFILE: `${SCHEME}staging-my.${DOMAIN}/profile`,
-    TASKS: `${SCHEME}staging-my.${DOMAIN}/tasks`,
-    IDENTITY: `${SCHEME}staging-my.${DOMAIN}/identity`,
-    MY_STATUS: `${SCHEME}staging-my.${DOMAIN}`,
+    PROFILE: `${SCHEME}staging-www.${DOMAIN}/profile`,
+    TASKS: `${SCHEME}staging-status.${DOMAIN}/tasks`,
+    IDENTITY: `${SCHEME}staging-www.${DOMAIN}/identity`,
+    MY_STATUS: `${SCHEME}staging-www.${DOMAIN}/status`,
     API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
     DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
   },
   development: {
-    HOME: `${SCHEME}staging-www.${DOMAIN}`,
+    HOME: '/',
     WELCOME: `${SCHEME}staging-welcome.${DOMAIN}`,
-    GOTO: `${SCHEME}staging-www.${DOMAIN}/goto`,
-    EVENTS: `${SCHEME}staging-www.${DOMAIN}/events`,
+    GOTO: '/goto',
+    EVENTS: '/events',
     MEMBERS: `${SCHEME}staging-members.${DOMAIN}`,
     STATUS: `${SCHEME}staging-status.${DOMAIN}`,
-    PROFILE: `${SCHEME}staging-my.${DOMAIN}/profile`,
-    TASKS: `${SCHEME}staging-my.${DOMAIN}/tasks`,
-    IDENTITY: `${SCHEME}staging-my.${DOMAIN}/identity`,
-    MY_STATUS: `${SCHEME}staging-my.${DOMAIN}`,
+    PROFILE: '/profile',
+    TASKS: `${SCHEME}staging-status.${DOMAIN}/tasks`,
+    IDENTITY: '/identity',
+    MY_STATUS: '/status',
     DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
     API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
   },
@@ -53,10 +53,10 @@ const APP_URLS = {
     EVENTS: `${SCHEME}${DOMAIN}/events`,
     MEMBERS: `${SCHEME}members.${DOMAIN}`,
     STATUS: `${SCHEME}status.${DOMAIN}`,
-    PROFILE: `${SCHEME}my.${DOMAIN}/profile`,
-    TASKS: `${SCHEME}my.${DOMAIN}/tasks`,
-    IDENTITY: `${SCHEME}my.${DOMAIN}/identity`,
-    MY_STATUS: `${SCHEME}my.${DOMAIN}`,
+    PROFILE: `${SCHEME}${DOMAIN}/profile`,
+    TASKS: `${SCHEME}status.${DOMAIN}/tasks`,
+    IDENTITY: `${SCHEME}${DOMAIN}/identity`,
+    MY_STATUS: `${SCHEME}${DOMAIN}/status`,
     API_BACKEND: `${SCHEME}staging-api.${DOMAIN}`,
     DASHBOARD: `${SCHEME}staging-dashboard.${DOMAIN}`,
   },
@@ -73,7 +73,7 @@ export const ABOUT = {
 export const AUTH = {
   GITHUB_SIGN_IN: `${APPS.API_BACKEND}/auth/github/login`,
   GOOGLE_SIGN_IN: `${APPS.API_BACKEND}/auth/google/login?dev=true`,
-  SIGN_UP: `${APPS.PROFILE}/new-signup`,
+  SIGN_UP: `${APPS.HOME}/new-signup`,
 };
 
 export const SOCIALS = {
diff --git a/app/controllers/new-signup.js b/app/controllers/new-signup.js
@@ -19,10 +19,9 @@ import apiRequest from '../utils/api-request';
 export default class NewSignupController extends Controller {
   @service toast;
 
-  queryParams = ['currentStep', 'dev', 'signupDev'];
+  queryParams = ['currentStep', 'dev'];
 
   @tracked dev;
-  @tracked signupDev;
   @tracked isLoading = false;
   @tracked isButtonDisabled = true;
   @tracked error = '';
@@ -42,8 +41,7 @@ export default class NewSignupController extends Controller {
   };
 
   get isDevMode() {
-    // replace this signupDev with dev flag once new-signup page is not under dev flag
-    return this.signupDev === 'true';
+    return this.dev === 'true';
   }
 
   async generateUsername(firstname, lastname) {
diff --git a/app/controllers/profile.js b/app/controllers/profile.js
@@ -9,16 +9,7 @@ const BASE_URL = APPS.API_BACKEND;
 
 export default class ProfileController extends Controller {
   @service toast;
-  @service router;
-  get isDev() {
-    if (
-      this.router.currentRoute &&
-      this.router.currentRoute.queryParams.dev === 'true'
-    ) {
-      return this.router.currentRoute.queryParams.dev;
-    }
-    return false;
-  }
+
   get imageUploadUrl() {
     return `${BASE_URL}/users/picture`;
   }
diff --git a/app/routes/discord.js b/app/routes/discord.js
@@ -11,12 +11,6 @@ export default class DiscordRoute extends Route {
     token: { refreshModel: true },
   };
 
-  beforeModel(transition) {
-    if (!transition.to.queryParams.dev) {
-      this.router.transitionTo('page-not-found');
-    }
-  }
-
   async model() {
     try {
       const token = this.paramsFor('discord').token;
diff --git a/app/routes/identity.js b/app/routes/identity.js
@@ -10,12 +10,6 @@ export default class IdentityRoute extends Route {
   @service login;
   @service fastboot;
 
-  beforeModel(transition) {
-    if (transition?.to?.queryParams?.dev !== 'true') {
-      this.router.transitionTo('/page-not-found');
-    }
-  }
-
   async model() {
     if (this.fastboot.isFastBoot) {
       return null;
diff --git a/app/routes/mobile.js b/app/routes/mobile.js
@@ -9,12 +9,6 @@ export default class MobileRoute extends Route {
   @service toast;
   @service router;
 
-  beforeModel(transition) {
-    if (transition?.to?.queryParams?.dev !== 'true') {
-      this.router.transitionTo('/page-not-found');
-    }
-  }
-
   async model() {
     try {
       const response = await fetch(SELF_USER_PROFILE_URL, {
diff --git a/app/routes/new-signup.js b/app/routes/new-signup.js
@@ -10,14 +10,6 @@ import redirectAuth from '../utils/redirect-auth';
 export default class NewSignupRoute extends Route {
   @service toast;
   @service router;
-  isDevMode = false;
-
-  beforeModel(transition) {
-    if (transition?.to?.queryParams?.dev !== 'true') {
-      this.router.transitionTo('/page-not-found');
-    }
-    this.isDevMode = true;
-  }
 
   async model() {
     try {
diff --git a/app/routes/notifications.js b/app/routes/notifications.js
@@ -1,17 +1,2 @@
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-export default class NotificationsRoute extends Route {
-  @service router;
-
-  queryParams = {
-    dev: {
-      refreshModel: false,
-    },
-  };
-
-  beforeModel(transition) {
-    if (transition?.to?.queryParams?.dev !== 'true') {
-      this.router.transitionTo('/page-not-found');
-    }
-  }
-}
+export default class NotificationsRoute extends Route {}
diff --git a/app/routes/profile.js b/app/routes/profile.js
@@ -10,12 +10,7 @@ const BASE_URL = APPS.API_BACKEND;
 export default class ProfileRoute extends Route {
   @service toast;
   @service fastboot;
-  @service router;
-  beforeModel(transition) {
-    if (transition?.to?.queryParams?.dev !== 'true') {
-      this.router.transitionTo('/page-not-found');
-    }
-  }
+
   async model() {
     try {
       const res = await fetch(`${BASE_URL}/users/isDeveloper`, {
diff --git a/tests/constants/urls.js b/tests/constants/urls.js
@@ -4,10 +4,10 @@ export const APPS = {
   EVENTS: 'https://realdevsquad.com/events',
   MEMBERS: 'https://members.realdevsquad.com',
   STATUS: 'https://status.realdevsquad.com',
-  PROFILE: 'https://my.realdevsquad.com/profile',
-  TASKS: 'https://my.realdevsquad.com/tasks',
-  IDENTITY: 'https://my.realdevsquad.com/identity',
-  MY_STATUS: 'https://my.realdevsquad.com',
+  PROFILE: 'https://realdevsquad.com/profile',
+  TASKS: 'https://status.realdevsquad.com/tasks',
+  IDENTITY: 'https://realdevsquad.com/identity',
+  MY_STATUS: 'https://realdevsquad.com/status',
   STAGING_API_BACKEND: 'https://staging-api.realdevsquad.com',
 };
 
diff --git a/tests/unit/controllers/new-signup-test.js b/tests/unit/controllers/new-signup-test.js
@@ -200,7 +200,7 @@ module('Unit | Controller | new-signup', function (hooks) {
   });
 
   test('signup catches error and shows correct error message (dev flag enabled)', async function (assert) {
-    controller.signupDev = 'true'; // replace signupDev with dev once dev is removed from new-signup
+    controller.dev = 'true';
     controller.signupDetails = {
       firstName: fakeUserData.first_name,
       lastName: fakeUserData.last_name,
diff --git a/tests/unit/routes/identity-test.js b/tests/unit/routes/identity-test.js
@@ -25,35 +25,6 @@ module('Unit | Route | identity', function (hooks) {
     assert.ok(this.route);
   });
 
-  test('beforeModel redirects to page-not-found when dev param is not true', function (assert) {
-    const transition = {
-      to: {
-        queryParams: {
-          dev: 'false',
-        },
-      },
-    };
-
-    this.route.beforeModel(transition);
-    assert.ok(
-      this.route.router.transitionTo.calledWith('/page-not-found'),
-      'should redirect to page-not-found',
-    );
-  });
-
-  test('beforeModel allows navigation when dev param is true', function (assert) {
-    const transition = {
-      to: {
-        queryParams: {
-          dev: 'true',
-        },
-      },
-    };
-
-    this.route.beforeModel(transition);
-    assert.notOk(this.route.router.transitionTo.called, 'should not redirect');
-  });
-
   test('model returns null in FastBoot', async function (assert) {
     this.route.fastboot.isFastBoot = true;
     const result = await this.route.model();
diff --git a/tests/unit/routes/mobile-test.js b/tests/unit/routes/mobile-test.js
@@ -10,34 +10,16 @@ module('Unit | Route | mobile', function (hooks) {
   hooks.beforeEach(function () {
     this.fetchStub = sinon.stub(window, 'fetch');
     this.route = this.owner.lookup('route:mobile');
-    sinon.stub(this.route.router, 'transitionTo');
   });
 
   hooks.afterEach(function () {
     this.fetchStub.restore();
-    sinon.restore();
   });
 
-  test('redirects to 404 page if dev flag is not present', function (assert) {
-    const transition = { to: { queryParams: { dev: 'false' } } };
-
-    this.route.beforeModel(transition);
-
-    assert.ok(
-      this.route.router.transitionTo.calledOnceWith('/page-not-found'),
-      'Redirected to /page-not-found when dev is not true',
-    );
-  });
-
-  test('allows access when dev flag is true', function (assert) {
-    const transition = { to: { queryParams: { dev: 'true' } } };
-
-    this.route.beforeModel(transition);
-
-    assert.ok(
-      this.route.router.transitionTo.notCalled,
-      'No redirection occurs when dev query param is true',
-    );
+  test('mobile route exists and is accessible', function (assert) {
+    assert.expect(1);
+    const route = this.owner.lookup('route:mobile');
+    assert.ok(route, 'The mobile route exists');
   });
 
   test('it fetches user profile and returns userId if API responds with 200', async function (assert) {
diff --git a/tests/unit/routes/new-signup-test.js b/tests/unit/routes/new-signup-test.js
@@ -22,28 +22,6 @@ module('Unit | Route | new-signup', function (hooks) {
     this.clock.restore();
   });
 
-  test('redirects to 404 page if dev flag is not present', function (assert) {
-    const transition = { to: { queryParams: { dev: 'false' } } };
-
-    this.route.beforeModel(transition);
-
-    assert.ok(
-      this.route.router.transitionTo.calledOnceWith('/page-not-found'),
-      'Redirected to /page-not-found when dev is not true',
-    );
-  });
-
-  test('allows new-signup page access when dev flag is true', function (assert) {
-    const transition = { to: { queryParams: { dev: 'true' } } };
-
-    this.route.beforeModel(transition);
-
-    assert.ok(
-      this.route.router.transitionTo.notCalled,
-      'Signup page accessed when dev query param is true',
-    );
-  });
-
   test('displays error in case of 401 response', async function (assert) {
     this.fetchStub.resolves(new Response(JSON.stringify({}), { status: 401 }));
     const result = await this.route.model();
diff --git a/tests/unit/routes/notifications-test.js b/tests/unit/routes/notifications-test.js
@@ -9,51 +9,4 @@ module('Unit | Route | notifications', function (hooks) {
     const route = this.owner.lookup('route:notifications');
     assert.ok(route, 'The route exists');
   });
-
-  test('it should redirect to "/page-not-found" page when dev flag is not present', function (assert) {
-    assert.expect(3);
-
-    const route = this.owner.lookup('route:notifications');
-
-    let transitionToCalls = [];
-
-    route.router = {
-      transitionTo(routeName) {
-        transitionToCalls.push(routeName);
-      },
-    };
-
-    route.beforeModel({
-      to: {
-        queryParams: { dev: 'false' },
-      },
-    });
-    assert.strictEqual(
-      transitionToCalls[0],
-      '/page-not-found',
-      'Redirected to /page-not-found when dev=false',
-    );
-
-    route.beforeModel({
-      to: {
-        queryParams: {},
-      },
-    });
-    assert.strictEqual(
-      transitionToCalls[1],
-      '/page-not-found',
-      'Redirected to /page-not-found when dev flag is missing',
-    );
-
-    route.beforeModel({
-      to: {
-        queryParams: { dev: 'true' },
-      },
-    });
-    assert.strictEqual(
-      transitionToCalls.length,
-      2,
-      'Did not redirect when dev=true',
-    );
-  });
 });
diff --git a/tests/unit/routes/profile-test.js b/tests/unit/routes/profile-test.js
