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

Working. Waiting on final UI approval

This commit is contained in:
Seth Call 2025-04-01 21:25:02 -05:00
parent 5ddf07802c
commit 11e4aa9481
6 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jam-ui/src/components/public/JKDownloads.js
View File

@ -116,7 +116,7 @@ const JKDownloads = () => {
<div>
<h5>Download the free JamKazam app</h5>
{/* <p>{currentOS}</p> */}
<p>
<p className="mb-lg-4">
You must use the JamKazam app to get into online sessions with other musicians. Our app also gives you the most feature-rich experience for JamTracks, recordings, live broadcasting, and other features. Click the button below to download the JamKazam app installer, then double click the installer to run it. For more detailed instructions,&nbsp;
{isMacOS ? <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130025" target='_blank'>see this help article</a> : isWindows && <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130024" target="_blank">see this help article</a>}.
</p>
@ -126,7 +126,7 @@ const JKDownloads = () => {
<img src={downloadImageUrl} alt="Download JamKazam" />
</a>
</div>
<div className='mt-3 mt-lg-0 ml-lg-3' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div className='mt-3 mt-lg-0 ml-lg-5' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div>Need a different version?</div>
<ul className='list-unstyled'>
{availablePlatforms.filter(platform => platform !== currentOS).map(platform => (

6
jam-ui/src/components/public/JKDownloadsLegacy.js
View File

@ -120,7 +120,7 @@ const JKDownloadsLegacy = () => {
<h5>Download the older legacy JamKazam app</h5>
{/* <p>{currentOS}</p>
<p>{selectedPlatform}</p> */}
<p>
<p className="mb-lg-4">
You must use the JamKazam app to get into online sessions with other musicians. Our app also gives you the most feature-rich experience for JamTracks, recordings, live broadcasting, and other features. Click the button below to download the JamKazam app installer, then double click the installer to run it. For more detailed instructions,&nbsp;
{isMacOS ? <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130025" target="_blank">see this help article</a> : isWindows && <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130024" target="_blank">see this help article</a>}.
</p>
@ -130,7 +130,7 @@ const JKDownloadsLegacy = () => {
<img src={downloadImageUrl} alt="Download JamKazam" />
</a>
</div>
<div className='mt-3 mt-lg-0 ml-lg-3' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div className='mt-3 mt-lg-0 ml-lg-5' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div>Need a different version?</div>
<ul className='list-unstyled'>
{availablePlatforms.filter(platform => platform !== selectedPlatform).map(platform => (
@ -142,7 +142,7 @@ const JKDownloadsLegacy = () => {
</ul>
</div>
</div>
<div className='mt-1 mt-lg-4'>
<div className='mt-lg-4'>
<div><strong>System Requirements</strong></div>
{selectedPlatform === 'MacOSX' ? (
<p>

80
jam-ui/src/components/public/JKObsDownloads.js
View File

@ -1,20 +1,20 @@
import React, { useState, useEffect } from 'react'
import { detectOS, isAppleSilicon } from '../../helpers/utils'
import { getClientDownloads } from '../../helpers/rest'
import {getClientDownloads, getObsPluginDownloads} from '../../helpers/rest'
import { Link } from 'react-router-dom'
const DownloadButtonMacAppleMx = '/img/downloads/Download-Button-Obs-Mac-Apple-Mx.svg'
const DownloadButtonMacIntel = '/img/downloads/Download-Button-Obs-Mac-Intel.svg'
const DownloadButtonWindows = '/img/downloads/Download-Button-Obs-Windows.svg'
const DownloadButtonMacAppleMx = '/img/downloads/Download-Button-Obs-Mac-Apple-Mx.png'
const DownloadButtonMacIntel = '/img/downloads/Download-Button-Obs-Mac-Intel.png'
const DownloadButtonWindows = '/img/downloads/Download-Button-Obs-Windows.png'
const JKDownloads = () => {
const JKObsDownloads = () => {
const [currentOS, setCurrentOS] = useState(null)
const [downloads, setDownloads] = useState({})
const availablePlatforms = React.useMemo(() => {
const keys = Object.keys(downloads)
//only show JamClientModern versions
const sortedStrings = keys.filter(key => key.startsWith('JamClientModern') && key !== 'MacOSX').map(key => key.substring('JamClientModern/'.length))
const sortedStrings = keys.filter(key => key.startsWith('OBSPlugin')).map(key => key.substring('OBSPlugin/'.length))
return sortedStrings
}, [downloads])
@ -38,7 +38,7 @@ const JKDownloads = () => {
}
const fetchClientDownloads = () => {
getClientDownloads()
getObsPluginDownloads()
.then(resp => {
if (resp.status === 200) {
return resp.json()
@ -46,7 +46,7 @@ const JKDownloads = () => {
}).then(data => {
const platforms = Object.keys(data)
const downloadUris = {}
platforms.filter(p => p === 'JamClientModern/MacOSX-M' || p === 'JamClientModern/MacOSX-Intel' || p === 'JamClientModern/Win32').forEach(platform => {
platforms.filter(p => p === 'OBSPlugin/MacOSX-M' || p === 'OBSPlugin/MacOSX-Intel' || p === 'OBSPlugin/Win32').forEach(platform => {
downloadUris[platform] = data[platform].uri
})
setDownloads(downloadUris)
@ -63,7 +63,7 @@ const JKDownloads = () => {
const downloadLink = React.useMemo(() => {
if (!currentOS) return null
return downloads[`JamClientModern/${currentOS}`]
return downloads[`OBSPlugin/${currentOS}`]
}, [currentOS]);
const selectPlatform = (platform) => {
@ -114,11 +114,22 @@ const JKDownloads = () => {
<>
{Object.keys(downloads).length > 0 && currentOS ? (
<div>
<h5>Download the free JamKazam app</h5>
<h5>Download and install OBS Studio</h5>
{/* <p>{currentOS}</p> */}
<p>
You must use the JamKazam app to get into online sessions with other musicians. Our app also gives you the most feature-rich experience for JamTracks, recordings, live broadcasting, and other features. Click the button below to download the JamKazam app installer, then double click the installer to run it. For more detailed instructions,&nbsp;
{isMacOS ? <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130025" target='_blank'>see this help article</a> : isWindows && <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000130024" target="_blank">see this help article</a>}.
Before installing the JamKazam plugin for OBS, you must first download and install OBS Studio.
If you have not already done so, <a target="_blank" href="https://jamkazam.freshdesk.com/support/solutions/articles/66000525817">follow the instructions in this help article</a> to download
and install OBS Studio version 30.2.3. Please note that you cannot use OBS video features with the legacy
JamKazam application - only with the current version of our app.
</p>
<h5 className="mt-lg-4">Download and install JamKazam plugin for OBS</h5>
<p className="mb-lg-4">
After installing OBS Studio as explained above, you'll need to install the JamKazam
plugin for OBS. This plugin lets JamKazam and OBS Studio work together. Click the button
below to download the plugin installer. When the download is complete, double click the
installer, and then follow the on-screen instructions to install the plugin. For more detailed
instructions, <a target="_blank" href="https://jamkazam.freshdesk.com/support/solutions/articles/66000525817">see this help article</a>.
</p>
<div className='mt-2 d-flex flex-column flex-md-row'>
<div style={ { flexGrow: 0, flexShrink: 0, flexBasis: '25%' } }>
@ -126,7 +137,7 @@ const JKDownloads = () => {
<img src={downloadImageUrl} alt="Download JamKazam" />
</a>
</div>
<div className='mt-3 mt-lg-0 ml-lg-3' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div className='mt-3 mt-lg-0 ml-lg-5' style={ { flexGrow: 1, flexShrink: 1, flexBasis: '75%' } }>
<div>Need a different version?</div>
<ul className='list-unstyled'>
{availablePlatforms.filter(platform => platform !== currentOS).map(platform => (
@ -135,48 +146,23 @@ const JKDownloads = () => {
</ul>
</div>
</div>
<div className='mt-1 mt-lg-4'>
<div><strong>System Requirements</strong></div>
<div className='mt-lg-4'>
<h5>System Requirements</h5>
{isMacOS ? (
<p>
To play an online session on JamKazam, you will need the following:<br />
- macOS 10.15 (Catalina) or higher <br />
- 75MB hard disk space for app installation <br />
- External audio interface for audio processing (<a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000122513" target='_blank'>see recommendations if you don't have one</a>) <br />
- Ability to connect computer to home router using Ethernet cable. WiFi not recommended (<a href='https://jamkazam.freshdesk.com/support/solutions/articles/66000124756' target='_blank'>learn how to do this</a>) <br />
- Broadband internet service with at least 1Mbps download and upload bandwidth (3-5Mbps preferred) <br />
To install the JamKazam plugin for OBS Studio:<br />
- OBS Studio version 30.2.3 must already be installed on your computer <br />
- Your Mac must be running macOS 10.15 (Catalina) or higher <br />
</p>
) : isWindows ? (
<p>
To play an online session on JamKazam, you will need the following:<br />
- Windows 10 or 11, 64-bit (32-bit not supported) <br />
- Dual core processor or higher (quad or higher preferred) <br />
- 75MB hard disk space for app installation <br />
- External audio interface for audio processing (<a href='https://jamkazam.freshdesk.com/support/solutions/articles/66000122514' target='_blank'>see recommendations if you don't have one</a>) <br />
- Ability to connect computer to home router using Ethernet cable, WiFi not recommended (<a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000124756" target='_blank'>learn how to do this</a>) <br />
- Broadband Internet service with at least 1Mbps download and upload bandwidth (3-5Mbps preferred)
To install the JamKazam plugin for OBS Studio<br />
- OBS Studio version 30.2.3 must already be installed on your computer <br />
- Your computer must be running Windows 10 or 11, 64-bit (32-bit not supported)
</p>
) : null}
</div>
{isMacOS ? (
<div>
<div><strong>Instructions for Users With Older Macs</strong></div>
<p>
If your Mac cannot support macOS 10.15 (Catalina) or higher, you can still play with everyone else on JamKazam using our legacy app. To do this, <Link to="/public/downloads-legacy">click here</Link> to go to a page where you can download JamKazam legacy app for older Macs. Download and install legacy app on your computer. Then <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000526271" target='_blank'>read this help article</a> about how to use the legacy app.
</p>
</div>
) : isWindows ? (
<div>
<div><strong>Instructions for Users With Older Windows PCs</strong></div>
<p>
If your Windows computer cannot support Win10 or Win11, you can still play with everyone else on JamKazam using our legacy app. To do this <Link to="/public/downloads-legacy">click here</Link> to go to a page where you can download the JamKazam legacy app for older Windows PCs. Download and install the legacy app on your Win7 computer. Then <a href="https://jamkazam.freshdesk.com/support/solutions/articles/66000526271" target='_blank'>read this help article</a> about how to use the legacy app.
</p>
</div>
) : null}
</div>
) : (
<div>Loading...</div>
@ -185,4 +171,4 @@ const JKDownloads = () => {
)
}
export default JKDownloads
export default JKObsDownloads

7
jam-ui/src/helpers/rest.js
View File

@ -661,6 +661,13 @@ export const getClientDownloads = () => {
.catch(error => reject(error));
});
}
export const getObsPluginDownloads = () => {
return new Promise((resolve, reject) => {
apiFetch(`/artifacts/OBSPlugin`)
.then(response => resolve(response))
.catch(error => reject(error));
});
}
//paypalPlaceOrder
export const paypalPlaceOrder = (options = {}) => {

3
jam-ui/src/layouts/JKPublicRoutes.js
View File

@ -10,6 +10,7 @@ import JKForum from '../components/public/help/JKForum';
import JKUnsubscribe from '../components/public/JKUnsubscribe';
import JKDownloads from '../components/public/JKDownloads';
import JKDownloadsLegacy from '../components/public/JKDownloadsLegacy';
import JKObsDownloads from '../components/public/JKObsDownloads';
import JKJamTracksLanding from '../components/jamtracks/JKJamTracksLandingDev';
import JKJamTracksArtistLanding from '../components/jamtracks/JKJamTracksArtistLandingDev';
@ -24,7 +25,7 @@ const JKPublicRoutes = ({ match: { url } }) => (
<Route path={`${url}/unsubscribe`} exact component={JKUnsubscribe} />
<Route path={`${url}/downloads`} exact component={JKDownloads} />
<Route path={`${url}/downloads-legacy`} exact component={JKDownloadsLegacy} />
<Route path={`${url}/obs-plugin-download`} exact component={JkObsDownloads} />
<Route path={`${url}/obs-plugin-download`} exact component={JKObsDownloads} />
<Route path={`${url}/backing-tracks/:artist/:song`} component={JKJamTracksLanding} />
<Route path={`${url}/backing-tracks/:artist`} component={JKJamTracksArtistLanding} />

8
web/app/controllers/artifacts_controller.rb
View File

@ -16,7 +16,13 @@ class ArtifactsController < ApiController
clients = ArtifactUpdate.where('product ilike ? and environment = ?', "JamClient/#{params[:type]}", ArtifactUpdate::DEFAULT_ENVIRONMENT).order(:product)
end
else
clients = ArtifactUpdate.where("product like '%JamClient%' and environment = '#{ArtifactUpdate::DEFAULT_ENVIRONMENT}'").order(:product)
if params[:type]
clients = ArtifactUpdate.where("product like ? and environment = '#{ArtifactUpdate::DEFAULT_ENVIRONMENT}'", "%" + params[:type] + "%").order(:product)
else
clients = ArtifactUpdate.where("product like '%JamClient%' and environment = '#{ArtifactUpdate::DEFAULT_ENVIRONMENT}'").order(:product)
end
end
if is_jamblaster && params[:serialno]