diff --git a/components/flatEditor.js b/components/flatEditor.js
index 52e9934..5a2ad8b 100644
--- a/components/flatEditor.js
+++ b/components/flatEditor.js
@@ -572,7 +572,7 @@ function FlatEditor({
}
if (slice) {
result = sliceScore(result, slice)
- }
+ } // FIXME: should slice and sliceIdx be mutually exclusive?
if (sliceIdx !== undefined) {
const [colorStart, colorStop] = nthSliceIdxs(result, sliceIdx);
result = nthScoreSlice(result, sliceIdx);
diff --git a/components/student/create/theoretical.js b/components/student/create/theoretical.js
index 8949eee..242131b 100644
--- a/components/student/create/theoretical.js
+++ b/components/student/create/theoretical.js
@@ -23,11 +23,15 @@ const FlatEditor = dynamic(() => import('../../flatEditor'), {
ssr: false,
});
-const bucketColors = {tonic:'#E75B5C', subdominant:'#265C5C', dominant:'#4390E2'};
+const bucketColors = {
+ tonic: '#E75B5C',
+ subdominant: '#265C5C',
+ dominant: '#4390E2',
+};
export default function CreativityActivity() {
const tonicNotes = notes(tonicScoreJSON);
-
+
// console.log('got into aural component');
const dispatch = useDispatch();
// I think this should show the melody for the current piece, but in the student's transposition
@@ -126,265 +130,239 @@ export default function CreativityActivity() {
return flatIOScoreForTransposition ? (
<>
-
-
- Step 1
-
- Compose a four-measure melody using only quarter notes and half
- notes and only the pitches that correspond with the color-coded
- measures.
-
- {
- // console.log('updated composition', data);
- score1Data = data;
- }}
- orig={melodyJson}
- colors={currentAssignment?.part?.chord_scale_pattern?.map(
- (color) => bucketColors[color]
- )}
- sliceIdx={0}
- />
-
-
-
- Step 2
-
- Compose a four-measure melody using only quarter notes and half
- notes and only the pitches that correspond with the color-coded
- measures.
-
- {
- // console.log('updated composition', data);
- score2Data = data;
- }}
- orig={melodyJson}
- colors={currentAssignment?.part?.chord_scale_pattern?.map(
- (color) => bucketColors[color]
- )}
- sliceIdx={1}
- />
-
-
-
- Step 3
-
- Compose a four-measure melody using only quarter notes and half
- notes and only the pitches that correspond with the color-coded
- measures.
-
- {
- // console.log('updated composition', data);
- score3Data = data;
- }}
- orig={melodyJson}
- colors={currentAssignment?.part?.chord_scale_pattern?.map(
- (color) => bucketColors[color]
- )}
- sliceIdx={2}
- />
-
-
-
- Step 4
-
- Compose a four-measure melody using only quarter notes and half
- notes and only the pitches that correspond with the color-coded
- measures.
-
- {
- // console.log('updated composition', data);
- score4Data = data;
- }}
- orig={melodyJson}
- colors={currentAssignment?.part?.chord_scale_pattern?.map(
- (color) => bucketColors[color]
- )}
- sliceIdx={3}
- />
-
-
-
- Step 5 - Combined
-
-
-
-
-
-
+
Step 1
+ Compose a four-measure melody using only quarter notes and half notes and
+ only the pitches that correspond with the color-coded measures.
+
+ {
+ // console.log('updated composition', data);
+ score1Data = data;
+ }}
+ orig={melodyJson}
+ colors={currentAssignment?.part?.chord_scale_pattern?.map(
+ (color) => bucketColors[color]
+ )}
+ sliceIdx={0}
+ />
+ Step 2
+ Compose a four-measure melody using only quarter notes and half notes and
+ only the pitches that correspond with the color-coded measures.
+
+ {
+ // console.log('updated composition', data);
+ score2Data = data;
+ }}
+ orig={melodyJson}
+ colors={currentAssignment?.part?.chord_scale_pattern?.map(
+ (color) => bucketColors[color]
+ )}
+ sliceIdx={0}
+ />
+ Step 3
+ Compose a four-measure melody using only quarter notes and half notes and
+ only the pitches that correspond with the color-coded measures.
+
+ {
+ // console.log('updated composition', data);
+ score3Data = data;
+ }}
+ orig={melodyJson}
+ colors={currentAssignment?.part?.chord_scale_pattern?.map(
+ (color) => bucketColors[color]
+ )}
+ sliceIdx={2}
+ />
+ Step 4
+ Compose a four-measure melody using only quarter notes and half notes and
+ only the pitches that correspond with the color-coded measures.
+
+ {
+ // console.log('updated composition', data);
+ score4Data = data;
+ }}
+ orig={melodyJson}
+ colors={currentAssignment?.part?.chord_scale_pattern?.map(
+ (color) => bucketColors[color]
+ )}
+ sliceIdx={3}
+ />
+ Step 5 - Combined
+
+
>
) : (