From 02f3201cb22587bbf1560b8fea6210aafd22cf86 Mon Sep 17 00:00:00 2001 From: Nuwan Date: Sat, 14 Oct 2023 06:56:39 +0530 Subject: [PATCH] wip new session form --- bitbucket-pipelines.yml | 4 ++-- jam-ui/.env.development | 2 +- jam-ui/.env.development.example | 2 +- jam-ui/.env.production | 2 +- jam-ui/.env.staging | 2 +- jam-ui/README.md | 2 +- jam-ui/src/components/auth/JKLoginRequest.js | 2 +- jam-ui/src/components/auth/LogoutContent.js | 4 ++-- jam-ui/src/components/auth/basic/Login.js | 2 +- jam-ui/src/components/auth/basic/Start.js | 2 +- .../components/dashboard/JKDashboardMain.js | 2 +- jam-ui/src/components/footer/JKFooter.js | 10 +++++----- .../navbar/JKTopNavRightSideNavItem.js | 2 +- jam-ui/src/components/page/JKHelp.js | 2 +- .../src/components/page/JKNewMusicSession.js | 9 ++++++--- .../javascripts/scheduled_session.js.erb | 18 ++++++++++++++++++ 16 files changed, 44 insertions(+), 23 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 033e4a3ac..433387269 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -8,7 +8,7 @@ pipelines: script: - cd jam-ui - npm install - - CI=false REACT_APP_ORIGIN=staging.jamkazam.com REACT_APP_LEGACY_BASE_URL=https://staging.jamkazam.com REACT_APP_API_BASE_URL=https://staging.jamkazam.com/api REACT_APP_BITBUCKET_BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER REACT_APP_BITBUCKET_COMMIT=$BITBUCKET_COMMIT npm run build + - CI=false REACT_APP_ORIGIN=staging.jamkazam.com REACT_APP_CLIENT_BASE_URL=https://staging.jamkazam.com REACT_APP_API_BASE_URL=https://staging.jamkazam.com/api REACT_APP_BITBUCKET_BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER REACT_APP_BITBUCKET_COMMIT=$BITBUCKET_COMMIT npm run build artifacts: - jam-ui/build/** - step: @@ -24,7 +24,7 @@ pipelines: script: - cd jam-ui - npm install - - CI=false REACT_APP_ORIGIN=jamkazam.com REACT_APP_LEGACY_BASE_URL=https://www.jamkazam.com REACT_APP_API_BASE_URL=https://www.jamkazam.com/api REACT_APP_BITBUCKET_BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER REACT_APP_BITBUCKET_COMMIT=$BITBUCKET_COMMIT npm run build + - CI=false REACT_APP_ORIGIN=jamkazam.com REACT_APP_CLIENT_BASE_URL=https://www.jamkazam.com REACT_APP_API_BASE_URL=https://www.jamkazam.com/api REACT_APP_BITBUCKET_BUILD_NUMBER=$BITBUCKET_BUILD_NUMBER REACT_APP_BITBUCKET_COMMIT=$BITBUCKET_COMMIT npm run build artifacts: - jam-ui/build/** diff --git a/jam-ui/.env.development b/jam-ui/.env.development index e92816d59..cc2e6087d 100644 --- a/jam-ui/.env.development +++ b/jam-ui/.env.development @@ -1,7 +1,7 @@ HOST=beta.jamkazam.local PORT=4000 REACT_APP_ORIGIN=jamkazam.local -REACT_APP_LEGACY_BASE_URL=http://www.jamkazam.local:3000 +REACT_APP_CLIENT_BASE_URL=http://www.jamkazam.local:3000 REACT_APP_API_BASE_URL=http://www.jamkazam.local:3000/api REACT_APP_BITBUCKET_BUILD_NUMBER=dev REACT_APP_BITBUCKET_COMMIT=dev \ No newline at end of file diff --git a/jam-ui/.env.development.example b/jam-ui/.env.development.example index e92816d59..cc2e6087d 100644 --- a/jam-ui/.env.development.example +++ b/jam-ui/.env.development.example @@ -1,7 +1,7 @@ HOST=beta.jamkazam.local PORT=4000 REACT_APP_ORIGIN=jamkazam.local -REACT_APP_LEGACY_BASE_URL=http://www.jamkazam.local:3000 +REACT_APP_CLIENT_BASE_URL=http://www.jamkazam.local:3000 REACT_APP_API_BASE_URL=http://www.jamkazam.local:3000/api REACT_APP_BITBUCKET_BUILD_NUMBER=dev REACT_APP_BITBUCKET_COMMIT=dev \ No newline at end of file diff --git a/jam-ui/.env.production b/jam-ui/.env.production index 14fe4f7a1..4b10dd841 100644 --- a/jam-ui/.env.production +++ b/jam-ui/.env.production @@ -1,5 +1,5 @@ HOST=beta.jamkazam.com PORT=4000 REACT_APP_ORIGIN=jamkazam.com -REACT_APP_LEGACY_BASE_URL=https://www.jamkazam.com +REACT_APP_CLIENT_BASE_URL=https://www.jamkazam.com REACT_APP_API_BASE_URL=https://www.jamkazam.com/api \ No newline at end of file diff --git a/jam-ui/.env.staging b/jam-ui/.env.staging index 5f09f9e85..6d976fa8b 100644 --- a/jam-ui/.env.staging +++ b/jam-ui/.env.staging @@ -1,5 +1,5 @@ HOST=beta.staging.jamkazam.com PORT=4000 REACT_APP_ORIGIN=staging.jamkazam.com -REACT_APP_LEGACY_BASE_URL=https://staging.jamkazam.com +REACT_APP_CLIENT_BASE_URL=https://staging.jamkazam.com REACT_APP_API_BASE_URL=https://staging.jamkazam.com/api \ No newline at end of file diff --git a/jam-ui/README.md b/jam-ui/README.md index 9ab81eefa..e5fe6f2a6 100644 --- a/jam-ui/README.md +++ b/jam-ui/README.md @@ -8,7 +8,7 @@ The DOMAIN and PORT running this app is defined in env.production file. This fil HOST=beta.jamkazam.local PORT=4000 -REACT_APP_LEGACY_BASE_URL=http://www.jamkazam.local:3000 +REACT_APP_CLIENT_BASE_URL=http://www.jamkazam.local:3000 REACT_APP_API_BASE_URL=http://www.jamkazam.local:3000/api ## Subdomains setup (development) diff --git a/jam-ui/src/components/auth/JKLoginRequest.js b/jam-ui/src/components/auth/JKLoginRequest.js index 7521442be..72f9eff52 100644 --- a/jam-ui/src/components/auth/JKLoginRequest.js +++ b/jam-ui/src/components/auth/JKLoginRequest.js @@ -16,7 +16,7 @@ function JKLoginRequest() {

Please sign in to your jamkazam account

- + Sign in diff --git a/jam-ui/src/components/auth/LogoutContent.js b/jam-ui/src/components/auth/LogoutContent.js index b277c4cd7..ebf0eb235 100644 --- a/jam-ui/src/components/auth/LogoutContent.js +++ b/jam-ui/src/components/auth/LogoutContent.js @@ -7,7 +7,7 @@ import rocket from '../../assets/img/illustrations/rocket.png'; const LogoutContent = ({ layout, titleTag: TitleTag }) => { const goToLogin = () => { - window.location.href = `${process.env.REACT_APP_LEGACY_BASE_URL}/signin` + window.location.href = `${process.env.REACT_APP_CLIENT_BASE_URL}/signin` } return ( @@ -16,7 +16,7 @@ const LogoutContent = ({ layout, titleTag: TitleTag }) => {

Thanks for using JamKazam. You are
now successfully signed out. - {process.env.REACT_APP_LEGACY_BASE_URL} + {process.env.REACT_APP_CLIENT_BASE_URL}

{/*