seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

wip new session form

This commit is contained in:
Nuwan 2023-10-14 06:56:39 +05:30
parent 65bc188af1
commit 02f3201cb2
16 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitbucket-pipelines.yml
View File

@ -8,7 +8,7 @@ pipelines:
script: script:
- cd jam-ui - cd jam-ui
- npm install - 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: artifacts:
- jam-ui/build/** - jam-ui/build/**
- step: - step:
@ -24,7 +24,7 @@ pipelines:
script: script:
- cd jam-ui - cd jam-ui
- npm install - 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: artifacts:
- jam-ui/build/** - jam-ui/build/**

2
jam-ui/.env.development
View File

@ -1,7 +1,7 @@
HOST=beta.jamkazam.local HOST=beta.jamkazam.local
PORT=4000 PORT=4000
REACT_APP_ORIGIN=jamkazam.local 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_API_BASE_URL=http://www.jamkazam.local:3000/api
REACT_APP_BITBUCKET_BUILD_NUMBER=dev REACT_APP_BITBUCKET_BUILD_NUMBER=dev
REACT_APP_BITBUCKET_COMMIT=dev REACT_APP_BITBUCKET_COMMIT=dev

2
jam-ui/.env.development.example
View File

@ -1,7 +1,7 @@
HOST=beta.jamkazam.local HOST=beta.jamkazam.local
PORT=4000 PORT=4000
REACT_APP_ORIGIN=jamkazam.local 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_API_BASE_URL=http://www.jamkazam.local:3000/api
REACT_APP_BITBUCKET_BUILD_NUMBER=dev REACT_APP_BITBUCKET_BUILD_NUMBER=dev
REACT_APP_BITBUCKET_COMMIT=dev REACT_APP_BITBUCKET_COMMIT=dev

2
jam-ui/.env.production
View File

@ -1,5 +1,5 @@
HOST=beta.jamkazam.com HOST=beta.jamkazam.com
PORT=4000 PORT=4000
REACT_APP_ORIGIN=jamkazam.com 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 REACT_APP_API_BASE_URL=https://www.jamkazam.com/api

2
jam-ui/.env.staging
View File

@ -1,5 +1,5 @@
HOST=beta.staging.jamkazam.com HOST=beta.staging.jamkazam.com
PORT=4000 PORT=4000
REACT_APP_ORIGIN=staging.jamkazam.com 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 REACT_APP_API_BASE_URL=https://staging.jamkazam.com/api

2
jam-ui/README.md
View File

@ -8,7 +8,7 @@ The DOMAIN and PORT running this app is defined in env.production file. This fil
HOST=beta.jamkazam.local HOST=beta.jamkazam.local
PORT=4000 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 REACT_APP_API_BASE_URL=http://www.jamkazam.local:3000/api
## Subdomains setup (development) ## Subdomains setup (development)

2
jam-ui/src/components/auth/JKLoginRequest.js
View File

@ -16,7 +16,7 @@ function JKLoginRequest() {
<p>Please sign in to your jamkazam account</p> <p>Please sign in to your jamkazam account</p>
</Row> </Row>
<Row className="justify-content-center"> <Row className="justify-content-center">
<a className="btn btn-primary" href={`${process.env.REACT_APP_LEGACY_BASE_URL}/signin`}> <a className="btn btn-primary" href={`${process.env.REACT_APP_CLIENT_BASE_URL}/signin`}>
Sign in Sign in
</a> </a>
</Row> </Row>

4
jam-ui/src/components/auth/LogoutContent.js
View File

@ -7,7 +7,7 @@ import rocket from '../../assets/img/illustrations/rocket.png';
const LogoutContent = ({ layout, titleTag: TitleTag }) => { const LogoutContent = ({ layout, titleTag: TitleTag }) => {
const goToLogin = () => { 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 ( return (
<Fragment> <Fragment>
@ -16,7 +16,7 @@ const LogoutContent = ({ layout, titleTag: TitleTag }) => {
<p> <p>
Thanks for using JamKazam. You are <br className="d-none d-sm-block" /> Thanks for using JamKazam. You are <br className="d-none d-sm-block" />
now successfully signed out. now successfully signed out.
{process.env.REACT_APP_LEGACY_BASE_URL} {process.env.REACT_APP_CLIENT_BASE_URL}
</p> </p>
{/* <Button tag={Link} color="primary" size="sm" className="mt-3" to={`/authentication/${layout}/login`}> {/* <Button tag={Link} color="primary" size="sm" className="mt-3" to={`/authentication/${layout}/login`}>
<FontAwesomeIcon icon="chevron-left" transform="shrink-4 down-1" className="mr-1" /> <FontAwesomeIcon icon="chevron-left" transform="shrink-4 down-1" className="mr-1" />

2
jam-ui/src/components/auth/basic/Login.js
View File

@ -18,7 +18,7 @@ const Login = () => (
<p className="fs--1 text-600"> <p className="fs--1 text-600">
or {' '} or {' '}
{/* <Link to="/authentication/basic/register">create an account</Link> */} {/* <Link to="/authentication/basic/register">create an account</Link> */}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/signup`}>Sign up</a> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/signup`}>Sign up</a>
</p> </p>
</Col> </Col>
</Row> </Row>

2
jam-ui/src/components/auth/basic/Start.js
View File

@ -5,7 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
const Start = () => { const Start = () => {
const goToLogin = () => { const goToLogin = () => {
window.open(`${process.env.REACT_APP_LEGACY_BASE_URL}/signin`, '_blank') window.open(`${process.env.REACT_APP_CLIENT_BASE_URL}/signin`, '_blank')
} }
return( return(
<Fragment> <Fragment>

2
jam-ui/src/components/dashboard/JKDashboardMain.js
View File

@ -165,7 +165,7 @@ function JKDashboardMain() {
} }
}; };
useScript(`${process.env.REACT_APP_LEGACY_BASE_URL}/client_scripts`, initJKScripts); useScript(`${process.env.REACT_APP_CLIENT_BASE_URL}/client_scripts`, initJKScripts);
return ( return (
<div className={isFluid || isKanban ? 'container-fluid' : 'container'}> <div className={isFluid || isKanban ? 'container-fluid' : 'container'}>

10
jam-ui/src/components/footer/JKFooter.js
View File

@ -18,23 +18,23 @@ const JKFooter = () => {
<Col sm="auto"> <Col sm="auto">
<p className="mb-0 text-600 text-lowercase"> <p className="mb-0 text-600 text-lowercase">
{' '} {' '}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/corp/about`} target="_blank"> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/corp/about`} target="_blank">
{t('navigation.about', {ns: 'common'})} {t('navigation.about', {ns: 'common'})}
</a>{' '} </a>{' '}
|{' '} |{' '}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/corp/contact`} target="_blank"> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/corp/contact`} target="_blank">
{t('navigation.contact', {ns: 'common'})} {t('navigation.contact', {ns: 'common'})}
</a>{' '} </a>{' '}
|{' '} |{' '}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/corp/privacy`} target="_blank"> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/corp/privacy`} target="_blank">
{t('navigation.privacy', {ns: 'common'})} {t('navigation.privacy', {ns: 'common'})}
</a>{' '} </a>{' '}
|{' '} |{' '}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/corp/terms`} target="_blank"> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/corp/terms`} target="_blank">
{t('navigation.terms', {ns: 'common'})} {t('navigation.terms', {ns: 'common'})}
</a> </a>
|{' '} |{' '}
<a href={`${process.env.REACT_APP_LEGACY_BASE_URL}/help_desk`} target="_blank"> <a href={`${process.env.REACT_APP_CLIENT_BASE_URL}/help_desk`} target="_blank">
{t('navigation.help', {ns: 'common'})} {t('navigation.help', {ns: 'common'})}
</a> </a>
</p> </p>

2
jam-ui/src/components/navbar/JKTopNavRightSideNavItem.js
View File

@ -30,7 +30,7 @@ const TopNavRightSideNavItem = () => {
<NavbarText className="d-none d-md-inline">{t('keep_jamkazam_improving', { ns: 'common' })}:</NavbarText> <NavbarText className="d-none d-md-inline">{t('keep_jamkazam_improving', { ns: 'common' })}:</NavbarText>
<NavItem className="d-none d-md-inline ml-1 mr-6"> <NavItem className="d-none d-md-inline ml-1 mr-6">
<a className="nav-link" href={`${process.env.REACT_APP_LEGACY_BASE_URL}/client#/account/subscription`} target="_blank"> <a className="nav-link" href={`${process.env.REACT_APP_CLIENT_BASE_URL}/client#/account/subscription`} target="_blank">
{t('subscribe', { ns: 'common' })} {t('subscribe', { ns: 'common' })}
</a> </a>
</NavItem> </NavItem>

2
jam-ui/src/components/page/JKHelp.js
View File

@ -2,7 +2,7 @@ import React, {useEffect} from 'react'
const JKHelp = () => { const JKHelp = () => {
useEffect(() => { useEffect(() => {
window.location.href = `${process.env.REACT_APP_LEGACY_BASE_URL}/help_desk` window.location.href = `${process.env.REACT_APP_CLIENT_BASE_URL}/help_desk`
return () => { return () => {
}; };
}, []) }, [])

9
jam-ui/src/components/page/JKNewMusicSession.js
View File

@ -63,10 +63,13 @@ const JKNewMusicSession = () => {
const payload = { const payload = {
privacy: formData.get('privacy'), privacy: formData.get('privacy'),
description: formData.get('description'), description: formData.get('description'),
inviteeIds: invitees.map(i => i.id) inviteeIds: invitees.map(i => i.id).join()
}; };
console.log(payload); //TODO: handle payload console.log(payload);
//window.open jamkazam app url using custom URL scheme
//an example URL would be: jamkazam://url=https://www.jamkazam.com/client#/createSession/privacy~2|description~hello|inviteeIds~1,2,3,4
const q = `privacy~${payload.privacy}|description~${payload.description}|inviteeIds~${payload.inviteeIds}`
window.open(`jamkazam://url=${process.env.REACT_APP_CLIENT_BASE_URL}/client#/createSession/${q}`)
try { try {
//store this payload in localstorage. //store this payload in localstorage.
localStorage.setItem('formData', JSON.stringify(payload)) localStorage.setItem('formData', JSON.stringify(payload))

18
web/app/assets/javascripts/scheduled_session.js.erb
View File

@ -1517,6 +1517,24 @@
$startOrScheduledBtn.on('click', clickStartOrSchedule) $startOrScheduledBtn.on('click', clickStartOrSchedule)
} }
//handle jamkazam:// custom URL scheme params
function decodeCustomSchemaParams(){
const hash = context.location.hash;
const qStr = hash.substring(hash.lastIndexOf('/') + 1);
//an example URL would be: https://www.jamkazam.com/client#/createSession/privacy~2|description~hello|inviteeIds~1,2,3,4
const qParamsArr = qStr.split('|');
let privacy, description, inviteeIds;
qParamsArr.each(function(q){
const qp = q.split('~')
if(qp[0] === 'privacy') privacy = qp[1]
if(qp[0] === 'description') description = qp[1]
if(qp[0] === 'inviteeIds') inviteeIds = qp[1]
})
}
function initialize(invitationDialogInstance, friendSelectorDialog, instrumentSelectorInstance, instrumentRSVPSelectorInstance) { function initialize(invitationDialogInstance, friendSelectorDialog, instrumentSelectorInstance, instrumentRSVPSelectorInstance) {
inviteMusiciansUtil = new JK.InviteMusiciansUtil(app); inviteMusiciansUtil = new JK.InviteMusiciansUtil(app);