Merge branch 'sugarlabs:master' into master

Author: ac-mmi

css/themes.css

@@ -104,6 +104,17 @@
   color: white;
 }
 
+.dark .dropdown-content li > a {
+  background-color: #1c1c1c;
+  color: #3fe0d1;
+}
+
+.dark .dropdown-content li > a:hover {
+  background-color: #333;
+}
 
+.dark .dropdown-content {
+  background-color: #1c1c1c;
+}
 
 /* Your Custom Theme can go here if you don't want to modify the existing dark mode */

cypress.config.js

@@ -0,0 +1,12 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+  e2e: {
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+    viewportWidth: 1400,
+    viewportHeight: 1000,
+    testIsolation: false
+  },
+});

cypress/e2e/main.cy.js

@@ -0,0 +1,152 @@
+Cypress.on("uncaught:exception", (err, runnable) => {
+    return false;
+});
+
+describe("MusicBlocks Application", () => {
+    before(() => {
+        cy.visit("http://localhost:3000");
+    });
+
+    afterEach(() => {
+        console.log("Next test running, no reload should happen");
+    });
+
+    describe("Loading and Initial Render", () => {
+        it("should display the loading animation and then the main content", () => {
+            cy.get("#loading-image-container").should("be.visible");
+            cy.contains("#loadingText", "Loading Complete!", { timeout: 20000 }).should("be.visible");
+            cy.wait(10000);
+            cy.get("#canvas", { timeout: 10000 }).should("be.visible");
+        });
+
+        it("should display the Musicblocks guide page", () => {
+            cy.get(".heading").contains("Welcome to Music Blocks");
+        });
+    });
+
+    describe("Audio Controls", () => {
+        it("should have a functional play button", () => {
+            cy.get("#play").should("be.visible").click();
+            cy.window().then((win) => {
+                const audioContext = win.Tone.context;
+                cy.wrap(audioContext.state).should("eq", "running");
+            });
+        });
+
+        it("should have a functional stop button", () => {
+            cy.get("#stop").should("be.visible").click();
+        });
+    });
+
+    describe("Toolbar and Navigation", () => {
+        it("should open the language selection dropdown", () => {
+            cy.get("#aux-toolbar").invoke("show");
+            cy.get("#languageSelectIcon").click({ force: true });
+            cy.get("#languagedropdown").should("be.visible");
+        });
+
+        it("should toggle full-screen mode", () => {
+            cy.get("#FullScreen").click();
+            cy.document().its("fullscreenElement").should("exist");
+            cy.get("#FullScreen").click();
+            cy.document().its("fullscreenElement").should("not.exist");
+        });
+
+        it("should toggle the toolbar menu", () => {
+            cy.get("#toggleAuxBtn").click();
+            cy.get("#aux-toolbar").should("be.visible");
+            cy.get("#toggleAuxBtn").click();
+            cy.get("#aux-toolbar").should("not.be.visible");
+        });
+    });
+
+    describe("File Operations", () => {
+        it("should open the file load modal", () => {
+            cy.get("#load").click();
+            cy.get("#myOpenFile").should("exist");
+        });
+
+        it("should open the save dropdown", () => {
+            cy.get("#saveButton").click();
+            cy.get("#saveddropdownbeg").should("be.visible");
+        });
+
+        it("should display file save options", () => {
+            cy.get("#saveButton").click();
+            cy.get("#saveddropdownbeg").should("be.visible");
+            cy.get("#save-html-beg").should("exist");
+            cy.get("#save-png-beg").should("exist");
+        });
+
+        it('should click the New File button and verify "New Project" appears', () => {
+            cy.get('#newFile > .material-icons')
+              .should('exist')
+              .and('be.visible');    
+            cy.get('#newFile > .material-icons').click();
+            cy.wait(500);    
+            cy.contains('New project').should('be.visible');
+        });
+    });
+
+    describe("UI Elements", () => {
+        it('should verify that bottom bar elements exist and are visible', () => {
+            const bottomBarElements = [
+              '#Home\\ \\[HOME\\] > img',
+              '#Show\\/hide\\ blocks > img',
+              '#Expand\\/collapse\\ blocks > img',
+              '#Decrease\\ block\\ size > img',
+              '#Increase\\ block\\ size > img'
+            ];
+        
+            bottomBarElements.forEach(selector => {
+              cy.get(selector).should('exist').and('be.visible');
+            });
+        });
+
+        it('should verify sidebar elements exist, are visible, and clickable', () => {
+            const sidebarElements = [
+              'thead > tr > :nth-child(1) > img',
+              'tr > :nth-child(2) > img',
+              'tr > :nth-child(3) > img'
+            ];
+        
+            sidebarElements.forEach(selector => {
+              cy.get(selector)
+                .should('exist')  
+                .and('be.visible')  
+                .click(); 
+            });
+        });
+
+        it('should verify that Grid, Clear, and Collapse elements exist and are visible', () => {
+            const elements = [
+              '#Grid > img',     
+              '#Clear',          
+              '#Collapse > img'  
+            ];    
+            elements.forEach(selector => {
+              cy.get(selector).should('exist').and('be.visible');
+            });
+        });
+
+        it('should verify that all nth-child elements from 1 to 6 exist', () => {
+            for (let i = 1; i <= 6; i++) {
+              cy.get(`[width="126"] > tbody > :nth-child(${i})`)
+                .should('exist')  
+                .and('be.visible'); 
+            }
+        });
+    });
+
+    describe("Planet Page Interaction", () => {
+        it('should load the Planet page and return to the main page when clicking the close button', () => {
+            cy.get('#planetIcon > .material-icons')
+              .should('exist')
+              .and('be.visible')
+              .click();    
+            cy.get('#planet-iframe')
+              .should('be.visible');
+        });
+    });
+
+});

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "[email protected]",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

cypress/support/e2e.js

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'

dist/css/keyboard.css

@@ -8,6 +8,30 @@
   cursor: pointer;
   position: relative;
 }
+
+#countdownContainer {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 200;
+  background: rgba(53, 53, 53, 0.492);
+  pointer-events: all;
+}
+
+#countdownDisplay {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  background: black;
+  color: white;
+  padding: 20px;
+  border-radius: 10px;
+  text-align: center;
+}
+
 table {
   table-layout: fixed;
 }

documentation/README.md

@@ -102,6 +102,7 @@ The **Main** toolbar is located across the top of the screen. It contains severa
 
 -   **Play Button**: Starts playing the project.
 -   **Stop Button**: Stops the current project playback.
+-   **Fullscreen Button**: Toggles fullscreen mode on or off.
 -   **New Project Button**: Creates a new project from scratch.
 -   **Load Project from File Button**: Opens an existing project file.
 -   **Save Project Button**: Saves the current project.
@@ -117,6 +118,7 @@ The **Secondary** toolbar appears when you click the **hamburger button** (three
 
 -   **Run Slowly**: Executes the program slowly to allow you to follow the process step by step.
 -   **Run Step by Step**: Runs the program one step at a time, ideal for debugging and analysis.
+-   **Change theme**: Switch between light and dark mode for a customized workspace.
 -   **Merge with Current Project**: Combines the current project with another, promoting collaboration and reusability.
 -   **Turtle Wrap**: Enables wrapping of the turtle's position to seamlessly continue from the opposite edge of the canvas.
 -   **Set Pitch Preview**: Lets users preview pitches while composing, providing instant feedback.
@@ -128,7 +130,7 @@ The **Secondary** toolbar appears when you click the **hamburger button** (three
         3. *Delete Plugin*: Allows the removal of plugins that are no longer needed.<br>
         4. *Horizontal Scrolling*: Enables horizontal navigation for easier handling of large projects.<br>
         5. *JavaScript Editor*: Includes an editor for writing and embedding custom JavaScript code.<br>
-        6.*Record*: Adds a "Record" button to the main palette, enabling users to record their compositions directly.
+        6. *Record*: Adds a "Record" button to the main palette, enabling users to record their compositions directly.
 
 -   **Select Language**: Offers a multilingual interface, allowing users to change the language as per their preference.
 

js/SaveInterface.js

@@ -293,64 +293,12 @@ class SaveInterface {
      * @instance
      */
     afterSaveMIDI() {
+        const instrumentMIDI = getMidiInstrument();
+        const drumMIDI = getMidiDrum();
         const generateMidi = (data) => {
             const normalizeNote = (note) => {
                 return note.replace("♯", "#").replace("♭", "b");
             };
-            const MIDI_INSTRUMENTS = {
-                default: 0,   // Acoustic Grand Piano
-                piano: 0,
-                violin: 40,
-                viola: 41,
-                cello: 42,
-                "double bass": 43,
-                bass: 32,
-                sitar: 104,
-                guitar: 24,
-                "acoustic guitar": 25,
-                "electric guitar": 27,
-                flute: 73,
-                clarinet: 71,
-                saxophone: 65,
-                tuba: 58,
-                trumpet: 56,
-                oboe: 68,
-                trombone: 57,
-                banjo: 105,
-                koto: 107,
-                dulcimer: 15,
-                bassoon: 70,
-                celeste: 8,
-                xylophone: 13,
-                "electronic synth": 81,
-                sine: 81,  // Approximate with Lead 2 (Sawtooth)
-                square: 80,
-                sawtooth: 81,
-                triangle: 81,  // Approximate with Lead 2 (Sawtooth)
-                vibraphone: 11
-            };
-
-            const DRUM_MIDI_MAP = {
-                "snare drum": 38,
-                "kick drum": 36,
-                "tom tom": 41,
-                "floor tom tom": 43,
-                "cup drum": 47, // Closest: Low-Mid Tom
-                "darbuka drum": 50, // Closest: High Tom
-                "japanese drum": 56, // Closest: Cowbell or Tambourine
-                "hi hat": 42,
-                "ride bell": 53,
-                "cow bell": 56,
-                "triangle bell": 81,
-                "finger cymbals": 69, // Closest: Open Hi-Hat
-                "chime": 82, // Closest: Shaker
-                "gong": 52, // Closest: Chinese Cymbal
-                "clang": 55, // Closest: Splash Cymbal
-                "crash": 49,
-                "clap": 39,
-                "slap": 40,
-                "raindrop": 88  // Custom mapping (not in GM), can use melodic notes
-            };
 
             const midi = new Midi();
             midi.header.ticksPerBeat = 480;
@@ -379,7 +327,7 @@ class SaveInterface {
 
                         const drumTrack = trackMap.get(drum);
 
-                        const midiNumber = DRUM_MIDI_MAP[drum] || 36; // default to Bass Drum
+                        const midiNumber = drumMIDI[drum] || 36; // default to Bass Drum
                         drumTrack.addNote({
                             midi: midiNumber,
                             time: globalTime,
@@ -391,7 +339,7 @@ class SaveInterface {
                         if (!trackMap.has(instrument)) {
                             const instrumentTrack = midi.addTrack();
                             instrumentTrack.name = `Track ${parseInt(blockIndex) + 1} - ${instrument}`;
-                            instrumentTrack.instrument.number = MIDI_INSTRUMENTS[instrument] ?? MIDI_INSTRUMENTS["default"];
+                            instrumentTrack.instrument.number = instrumentMIDI[instrument] ?? instrumentMIDI["default"];
                             trackMap.set(instrument, instrumentTrack);
                         }
 
@@ -809,7 +757,7 @@ class SaveInterface {
         this.activity.logo.runLogoCommands();
     }
 
-    /** 
+    /**
     * Perform actions after saving an MXML file.
     *
     * This method handles post-processing steps after saving an MXML file.
@@ -827,3 +775,8 @@ class SaveInterface {
         this.activity.logo.runningMxml = false;
     }
 }
+
+
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = { SaveInterface };
+}