Skip to content

Commit fbf8af2

Browse files
authored
Merge pull request #14 from JMCulhane/revert-13-MobileOptimization
Revert "Mobile optimization"
2 parents e22eb33 + 06feedd commit fbf8af2

File tree

6 files changed

+16
-52
lines changed

6 files changed

+16
-52
lines changed

chelle-fulk-main/src/components/recordings/RecordingContainer.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

chelle-fulk-main/src/components/recordings/RecordingContent.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ const RecordingsContent: React.FC<Props> = ({ recording }) => {
3636
target="_blank"
3737
rel="noopener noreferrer"
3838
className="inline-block bg-yellow-400/80 rounded-md px-4 py-2 text-white text-lg hover:bg-yellow-400 transition-colors"
39-
style={{ cursor: 'pointer', pointerEvents: 'auto', zIndex: 10 }}
4039
>
4140
Buy Album
4241
</a>

chelle-fulk-main/src/components/styling/HugContainer.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@
1212
flex-shrink: 0;
1313
}
1414

15-
.content-container {
16-
position: relative;
17-
width: clamp(150px, 20vw, 400px);
18-
aspect-ratio: 1;
19-
flex-shrink: 0;
15+
.shift-left {
16+
transform: translate(-5%, 20%);
2017
}
2118

2219
.shift-right {
23-
transform: translateX(5%);
20+
transform: translate(5%, 20%);
2421
}
2522

2623

chelle-fulk-main/src/components/styling/LeftHuggingContainer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22
import './HugContainer.scss';
33
import ScaleOnScroll from './ScaleOnScroll';
4+
import { MusicalNoteIcon } from '@heroicons/react/24/outline';
45
import { RecordingDTO } from '../../models/RecordingsDTO';
56
import AudioSamples from '../recordings/AudioSamples';
67
import RecordingContent from '../recordings/RecordingContent';
@@ -32,8 +33,6 @@ const LeftHuggingContainer: React.FC<Props> = ({ image, knot, recording, alignRi
3233
<div className="flex flex-row gap-8" style={samplesStyle}>
3334
<RecordingContent recording={recording} />
3435

35-
</div>
36-
<div>
3736
{recording.samples.length > 0 && (
3837
<div className="mt-2 samples-frame">
3938
<p className="text-lg font-fell text-yellow-400 mb-2">Listen to samples:</p>

chelle-fulk-main/src/components/styling/RightHuggingContainer.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,23 @@ type Props = {
1616
const RightHuggingContainer: React.FC<Props> = ({ image, knot, recording, deleteButton }) => {
1717
return (
1818
<ScaleOnScroll>
19-
<div className="shift-right">
20-
<div className="flex flex-row items-center gap-8">
19+
<div className="shift-left">
20+
<div className="flex flex-row-reverse items-center gap-8">
21+
<div className="relative knot-frame">
22+
{deleteButton}
23+
<img src={knot} alt="Knotwork" className="knot-img" draggable={false} />
24+
<img src={image} alt={recording.title} className="right-nested-img" />
25+
</div>
26+
2127
<div className="flex flex-row gap-8">
2228
{recording.samples.length > 0 && (
2329
<div className="mt-2 samples-frame">
2430
<p className="text-lg font-fell text-yellow-400 mb-2">Listen to samples:</p>
2531
<AudioSamples samples={recording.samples} />
2632
</div>
2733
)}
28-
</div>
29-
<div>
3034
<RecordingContent recording={recording} />
3135
</div>
32-
<div className="relative knot-frame">
33-
{deleteButton}
34-
<img src={knot} alt="Knotwork" className="knot-img" draggable={false} />
35-
<img src={image} alt={recording.title} className="right-nested-img" />
36-
</div>
3736
</div>
3837
</div>
3938
</ScaleOnScroll>

chelle-fulk-main/src/services/apis/recordingService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ export const getRecordings = async (): Promise<RecordingDTO[]> => {
1111
image: "/assets/recordings/images/2DoBeatles.png",
1212
title: "2 Do Beatles",
1313
// yearPublished removed
14-
description: "2 Do Beatles is a creative tribute to the legendary band, reimagining classic Beatles songs with unique instrumental arrangements for violin and friends. A fresh take on timeless hits for fans old and new.",
14+
description: "2 Do Beatles is a creative tribute to the legendary band, reimagining classic Beatles songs with unique arrangements for violin and friends. A fresh take on timeless hits for fans old and new.",
1515
performers: ["Chelle Fulk", "Robert Raines"],
1616
trackCount: 9,
17-
link: "https://chelle-fulk.square.site/product/2-do-beatles-by-chelle-fulk-and-robert-raines/1?cp=true&sa=true&sbp=false&q=false",
17+
link: "https://chellefulk.square.site/product/2-do-beatles/20?cp=true&sa=false&sbp=false&q=false&category_id=2",
1818
samples: [
1919
{
2020
trackName: "The Fool On the Hill",
@@ -53,7 +53,7 @@ export const getRecordings = async (): Promise<RecordingDTO[]> => {
5353
description: "Keltish brings together the best of Celtic and folk traditions, featuring lively fiddle tunes, heartfelt ballads, and a fusion of world music influences. A musical journey across the British Isles and beyond.",
5454
performers: ["Chelle Fulk"],
5555
trackCount: 12,
56-
link: "https://chelle-fulk.square.site/product/keltish-by-keltish/4?cp=true&sa=true&sbp=false&q=false",
56+
link: "https://chellefulk.square.site/product/keltish/1?cp=true&sa=false&sbp=false&q=false&category_id=2",
5757
samples: [
5858
{
5959
trackName: "Dublin Lullaby",
@@ -80,7 +80,7 @@ export const getRecordings = async (): Promise<RecordingDTO[]> => {
8080
description: "Island Time is a collection of original and classic tunes with a tropical flair, blending violin, steel drums, and guitar for a relaxing, beachy vibe. Perfect for unwinding or bringing the island spirit to any occasion.",
8181
performers: ["Chelle Fulk", "Pete Kudelich"],
8282
trackCount: 10,
83-
link: "https://chelle-fulk.square.site/product/island-time-by-chelle-fulk-and-peter-kudelich/5?cp=true&sa=true&sbp=false&q=false",
83+
link: "https://chellefulk.square.site/product/island-time/19?cp=true&sa=false&sbp=false&q=false&category_id=2",
8484
samples: [
8585
{ trackName: "Yell Yell", audioUrl: "/assets/recordings/islandTime/01 Yell Yell.mp3" },
8686
{ trackName: "Carolina in the Morning", audioUrl: "/assets/recordings/islandTime/02 Carolina in the Morning.mp3" },

0 commit comments

Comments
 (0)