From 2edfccda87c5e11d4b39c7f2a633eaee2e1dd9c0 Mon Sep 17 00:00:00 2001 From: Nuwan Date: Fri, 24 Nov 2023 20:03:11 +0530 Subject: [PATCH] browse sessions page ui improvements --- .../assets/img/session/session_entrance.png | Bin 0 -> 301 bytes jam-ui/src/assets/scss/custom/_common.scss | 5 ++ jam-ui/src/components/sessions/JKSession.js | 56 ++++++++++++------ .../src/components/sessions/JKSessionUser.js | 23 +++++-- jam-ui/src/helpers/initFA.js | 5 ++ .../instruments/icon_instrument_accordion.svg | 1 + .../icon_instrument_acoustic_guitar.svg | 1 + .../instruments/icon_instrument_banjo.svg | 1 + .../icon_instrument_bass_guitar.svg | 1 + .../instruments/icon_instrument_cello.svg | 1 + .../instruments/icon_instrument_clarinet.svg | 1 + .../instruments/icon_instrument_computer.svg | 1 + .../instruments/icon_instrument_default.svg | 1 + .../icon_instrument_double_bass.svg | 1 + .../instruments/icon_instrument_drums.svg | 1 + .../icon_instrument_electric_guitar.svg | 1 + .../instruments/icon_instrument_euphonium.svg | 1 + .../instruments/icon_instrument_flute.svg | 1 + .../icon_instrument_french_horn.svg | 1 + .../instruments/icon_instrument_harmonica.svg | 1 + .../instruments/icon_instrument_keyboard.svg | 1 + .../instruments/icon_instrument_mandolin.svg | 1 + .../instruments/icon_instrument_oboe.svg | 1 + .../instruments/icon_instrument_other.svg | 1 + .../instruments/icon_instrument_piano.svg | 1 + .../instruments/icon_instrument_saxophone.svg | 1 + .../instruments/icon_instrument_trombone.svg | 1 + .../instruments/icon_instrument_trumpet.svg | 1 + .../instruments/icon_instrument_tuba.svg | 1 + .../instruments/icon_instrument_ukelele.svg | 1 + .../icon_instrument_upright_bass.svg | 1 + .../instruments/icon_instrument_viola.svg | 1 + .../instruments/icon_instrument_violin.svg | 1 + .../instruments/icon_instrument_vocal.svg | 1 + .../instruments/icon_instrument_voice.svg | 1 + jam-ui/src/routes.js | 4 +- jam-ui/src/store/features/sessionsSlice.js | 1 + 37 files changed, 97 insertions(+), 27 deletions(-) create mode 100644 jam-ui/src/assets/img/session/session_entrance.png create mode 100644 jam-ui/src/icons/instruments/icon_instrument_accordion.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_acoustic_guitar.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_banjo.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_bass_guitar.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_cello.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_clarinet.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_computer.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_default.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_double_bass.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_drums.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_electric_guitar.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_euphonium.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_flute.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_french_horn.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_harmonica.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_keyboard.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_mandolin.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_oboe.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_other.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_piano.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_saxophone.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_trombone.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_trumpet.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_tuba.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_ukelele.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_upright_bass.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_viola.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_violin.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_vocal.svg create mode 100644 jam-ui/src/icons/instruments/icon_instrument_voice.svg diff --git a/jam-ui/src/assets/img/session/session_entrance.png b/jam-ui/src/assets/img/session/session_entrance.png new file mode 100644 index 0000000000000000000000000000000000000000..b63575afa50284a2216331723d6c9ff0689fb65e GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oVGw3ym^DWND0tt~ z#W5tK@$Jlwd`yZ0Ea|XH z*S)`3zXjE%Fz5((jPO0hW8GP73`N7e}yp>e!0xJ=AjXX z_CJOh{d^xh+0p{8t(?bxtd;S_^lMSIe+y$g8U#BG7`EkHGvZ@pceuZU=g}dS8HJCl zQrIhu7;o9lFXPM&ozY*h`cnSlm;9UdxpUq1+EUE)b&?yq$9=!WNcM3hL+xAr)@t&{pck8`vFaPnfZvUtU^eTg=tDnm{r-UW|Yo&Ds literal 0 HcmV?d00001 diff --git a/jam-ui/src/assets/scss/custom/_common.scss b/jam-ui/src/assets/scss/custom/_common.scss index c191c40e1..5262ba11e 100644 --- a/jam-ui/src/assets/scss/custom/_common.scss +++ b/jam-ui/src/assets/scss/custom/_common.scss @@ -1,3 +1,8 @@ .table-responsive { display: table; } + +.even-row { + border: 1px solid $gray-400; + background-color: red; +} \ No newline at end of file diff --git a/jam-ui/src/components/sessions/JKSession.js b/jam-ui/src/components/sessions/JKSession.js index 524a6d713..da9faa9fd 100644 --- a/jam-ui/src/components/sessions/JKSession.js +++ b/jam-ui/src/components/sessions/JKSession.js @@ -15,6 +15,8 @@ import JKUserLatencyBadge from '../profile/JKUserLatencyBadge'; import JKSessionUser from './JKSessionUser'; import useNativeAppCheck from '../../hooks/useNativeAppCheck'; import { useNativeApp } from '../../context/NativeAppContext'; +import EnterIcon from '../../assets/img/session/session_entrance.png'; + function JKSession({ session }) { const { currentUser } = useAuth(); @@ -35,7 +37,7 @@ function JKSession({ session }) { toast.info(t('list.alerts.join_request_sent', { ns: 'sessions' })); } else { try { - await isNativeAppAvailable() + await isNativeAppAvailable(); const q = `joinSessionId~${session.id}`; const urlScheme = jkCustomUrlScheme('findSession', q); window.open(urlScheme, '_blank'); @@ -54,7 +56,7 @@ function JKSession({ session }) { } else if (session.musician_access && session.approval_required) { return t('list.descriptions.private_session', { ns: 'sessions' }); } else if (!session.musician_access && !session.approval_required) { - return t("list.descriptions.rsvp_session", { ns: "sessions" }); + return t('list.descriptions.rsvp_session', { ns: 'sessions' }); } }; @@ -66,16 +68,16 @@ function JKSession({ session }) { const hasFriendNote = session => { if (session.participants.find(p => p.user.is_friend)) { - return t('list.notes.has_friend', { ns: 'sessions' }) + return t('list.notes.has_friend', { ns: 'sessions' }); } }; const actionButtons = () => { return (
- + + enter + {/*