Skip to content

Commit

Permalink
Merge pull request #76 from ankush-maherwal/ankush-newaltv1
Browse files Browse the repository at this point in the history
manual merge
  • Loading branch information
ankush-maherwal authored Oct 18, 2024
2 parents 2e5dba1 + 0567e8d commit 74549d8
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion packages/admin/.env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
2 changes: 1 addition & 1 deletion packages/admin/.env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
4 changes: 2 additions & 2 deletions packages/common-lib/.env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
4 changes: 2 additions & 2 deletions packages/common-lib/.env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
2 changes: 1 addition & 1 deletion packages/common-lib/src/services/RestClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const getState = async (header = {}) => {

try {
const result = await get(
'https://alt-dev.uniteframework.io/api/v1/student/getStatesList',
'https://alt.uniteframework.io/api/v1/student/getStatesList',
{ headers }
);

Expand Down
6 changes: 3 additions & 3 deletions packages/core/.env.development
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_AUTH_URL="https://alt.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
6 changes: 3 additions & 3 deletions packages/core/.env.production
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_AUTH_URL="https://alt-dev.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_AUTH_URL="https://alt.uniteframework.io/auth/realms/hasura-app/protocol/openid-connect/token"
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
4 changes: 2 additions & 2 deletions packages/student-app/.env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
4 changes: 2 additions & 2 deletions packages/student-app/.env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
REACT_APP_SECRET_KEY=9ca6e96d-f72e-4208-91f4-a2d8e681f767
4 changes: 2 additions & 2 deletions packages/studentprogram/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io
4 changes: 2 additions & 2 deletions packages/studentprogram/.env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
REACT_APP_OAUTH_PROXY_ENABLED=false
REACT_APP_API_URL=https://alt-dev.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt-dev.uniteframework.io
REACT_APP_API_URL=https://alt.uniteframework.io/api/v1
REACT_APP_BASE_URL=https://alt.uniteframework.io

0 comments on commit 74549d8

Please sign in to comment.