a4-kitzeller-karitta-zellerbach

.eslintrc.json

@@ -0,0 +1,24 @@
+{
+  "env": {
+    "browser": true,
+    "es6": true,
+    "node": true,
+    "jquery": true
+  },
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "globals": {
+    "Atomics": "readonly",
+    "SharedArrayBuffer": "readonly"
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "rules": {
+    "no-undef": "off",
+    "no-unused-vars": "off",
+    "no-prototype-builtins": "off",
+    "no-inner-declarations": "off"
+  }
+}

README.md

@@ -1,72 +1,59 @@
-Assignment 4 - Creative Coding: Interactive Multimedia Experiences
-===
+## A4: Wavelength
 
-Due: September 27th, by 11:59 PM.
+https://a4-kitzeller.herokuapp.com
 
-For this assignment we will focus on client-side development using popular audio/graphics/visualization technologies; the server requirements are minimal. The goal of this assignment is to refine our JavaScript knowledge while exploring the multimedia capabilities of the browser.
+Wavelength is a web application that facilitates real-time audio-visual collaboration. It makes use of 
+[Hydra](https://github.com/ojack/hydra), [Tone.js](https://tonejs.github.io/), 
+[Magenta.js](https://magenta.tensorflow.org/), [Gibber](https://github.com/charlieroberts/gibber.audio.lib), [Babylon.js](https://www.babylonjs.com/), and Canvas2d.
+The goal of the app is to allow users to work on live-coding projects together in real-time, without having to be physically 
+present. The app allows interaction with pre-existing music/visual libraries, as well as tools and interfaces I created. 
+Most of the challenges faced were related to websockets, audio timing, and figuring out when states should be saved, given that multiple
+users are editing the same content.
+Several challenges arose with using different canvases and contexts, webgl, 2d, etc. As well as having several audio
+contexts and sources.
 
-Baseline Requirements
----
+I used the built-in standard ESLint plugin on WebStorm, as well as running Code Inspection. I also used w3 to validate my HTML and CSS files, both
+on the website and the WebStorm plugin. I used 'eslint:recommended', adding support for jqeury. I also disabled some of the rules,
+like 'no-undef', as they were not happy with some of the js files I had to browserify to use within my app.
 
-Your application is required to implement the following functionalities:
+I created ES6 modules for the sequencer and the piano. Also, for user interaction, I made use of dat.gui input, mouse movement, 
+keypress events, file drag/drop, MIDI input and microphone/camera input. 
 
-- A server created using Express (you can also use an alternative server framework such as Koa) for basic file delivery and middleware. Your middleware stack should include the `compression` and `helmet` [middlewares]((https://expressjs.com/en/resources/middleware.html)) by default. You are not required to use Glitch for this assignment (but using Glitch is fine!); [Heroku](https://www.heroku.com) is another excellent option to explore. The course staff can't be resposible for helping with all other hosting options outside of Glitch, but some of us do have experience with other systems. It also never hurts to ask on Slack, as there's 99 other classmates who might have the experience you're looking for!
-- A client-side interactive experience using at least one of the web technologies frameworks we discussed in class over the past week.
-  - [Three.js](https://threejs.org/): A library for 3D graphics / VR experiences
-  - [D3.js](https://d3js.org): A library that is primarily used for interactive data visualizations
-  - [Canvas](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API): A 2D raster drawing API included in all modern browsers
-  - [SVG](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API): A 2D vector drawing framework that enables shapes to be defined via XML.
-  - [Web Audio API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Audio_API): An API for audio synthesis, analysis, processing, and file playback.
-- A user interface for interaction with your project, which must expose at least six parameters for user control. [dat.gui](https://workshop.chromeexperiments.com/examples/gui/#1--Basic-Usage) is highly recommended for this. You might also explore interaction by tracking mouse movement via the `window.onmousemove` event handler in tandem with the `event.clientX` and `event.clientY` properties. Consider using the [Pointer Events API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_events) to ensure that that mouse and touch events will both be supported in your app.
-- Your application should display basic documentation for the user interface when the application first loads. This documentation should be dismissable, however, users should be able to redisplay it via either a help buton (this could, for example, be inside a dat.gui interface) or via a keyboard shortcut (commonly the question mark).
-- Your application should feature at least two different ES6 modules that you write ([read about ES6 modules](https://www.sitepoint.com/understanding-es6-modules/)) and include into a main JavaScript file. This means that you will need to author *at least three JavaScript files* (a `app.js` or `main.js` file and two modules). We'll discuss modules in class on Monday 9/23; for this assignment modules should contain at least two functions.
-- You are required to use a linter for your JavaScript. There are plugins for most IDEs, however it will be difficult to run the linter directly in Glitch. If you haven't moved to developing on your personal laptop and then uploading to Glitch when your project is completed, this is the assignment to do so!
-- Your HTML and CSS should validate. There are options/plugins for most IDEs to check validation.
+To test, you can create an account, or use:
 
-The interactive experience should possess a reasonable level of complexity. Some examples:
-### Three.js
-- A generative algorithm creates simple agents that move through a virtual world. Your interface controls the behavior / appearance of these agents.
-- A simple 3D game
-- An 3D audio visualization of a song of your choosing. User interaction should control aspects of the visualization. 
-### Canvas
-- Implement a generative algorithm such as [Conway's Game of Life](https://bitstorm.org/gameoflife/) (or 1D cellular automata) and provide interactive controls. Note that the Game of Life has been created by 100s of people using <canvas>; we'll be checking to ensure that your implementation is not a copy of these.
-- Design a 2D audio visualizer of a song of your choosing. User interaction should control visual aspects of the experience. 
-### Web Audio API
-- Create a screen-based musical instrument using the Web Audio API. You can use projects such as [Interface.js](http://charlie-roberts.com/interface/) or [Nexus UI](https://nexus-js.github.io/ui/api/#Piano) to provide common musical interface elements, or use dat.GUI in combination with mouse/touch events (use the Pointer Events API). Your GUI should enable users to control aspects of sound synthesis.
-### D3.js
-- Create visualizations using the datasets found at [Awesome JSON Datasets](https://github.com/jdorfman/Awesome-JSON-Datasets). Experiment with providing different visualizations of the same data set, and providing users interactive control over visualization parameters and/or data filtering. Alternatively, create a single visualization with using one of the more complicated techniques shown at [d3js.org](d3js.org) and provide meaningful points of interaction for users.
+- username: kit
+- password: secret
 
-Deliverables
----
 
-Do the following to complete this assignment:
+![tone_mode](img/a4_tone.png)
 
-1. Implement your project with the above requirements.
-3. Test your project to make sure that when someone goes to your main page on Glitch/Heroku/etc., it displays correctly.
-4. Ensure that your project has the proper naming scheme `a4-yourname` so we can find it.
-5. Fork this repository and modify the README to the specifications below. *NOTE: If you don't use Glitch for hosting (where we can see the files) then you must include all project files that you author in your repo for this assignment*.
-6. Create and submit a Pull Request to the original repo. Name the pull request using the following template: `a4-gitname-firstname-lastname`.
+![piano_mode](img/a4_piano.png)
 
-Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions)
----
+![midi_d3_mode](img/a4_midi_d3.png)
 
-## Your Web Application Title
+![audio_vis](img/a4_audiovis.png)
 
-your hosting link e.g. http://a4-charlieroberts.glitch.me
+Here's cool gif I made using gource which shows my commits to the project repo!
 
-Include a very brief summary of your project here. Images are encouraged, along with concise, high-level text. Be sure to include:
+![gource](img/gource.gif)
 
-- the goal of the application
-- challenges you faced in realizing the application
-- a brief description of the JS linter you used and what rules it follows (we'll be looking at your JS files for consistency)
 
 ## Technical Achievements
-- **Tech Achievement 1**: I wrote my own custom GLSL shaders to use as a material for my Three.js objects.
-- **Tech Achievement 2**: My audiovisualizer uses both FFT and amplitude analysis to drive visualization.
-- **Tech Achievement 3**: I optimized the efficiency of my reaction-diffusion algorithm by...
-- **Tech Achievement 4**: I visualized the dataset X using three different visualization technqiues provided by D3, andprovided
+- **Tech Achievement 1**: I created a MIDI File visualizer using d3.js, and added other audio visualizations using canvas2d and babylon.js. The midi
+visualizer allows users to drag/drop files onto the page, or select from preloaded midi files on the bottom. The d3 mode allows users to draw sounds,
+ where the x-axis alters the frequency and the y-axis alters the amplitude of the sound.
+- **Tech Achievement 2**: I improved the RNN model and fixed the midi piano, adding more keys to the piano as well as Dat.GUI support
+for changing the piano attack and release, as well as the rnn step number and temperature (randomness).
+- **Tech Achievement 3**: I updated the sequencer to give it two modes, a "synth" mode and a "drum" mode. The synth mode
+produces sounds from Tone.js synths, whereas the drum mode allows users to toggle between various drumkits, like analog, electronic, percussion, dubstep and hiphop
+using the "change" button, which is only enabled when the user is in drum mode.
 
 ### Design/Evaluation Achievements
-- **Design Achievement 1**: I ensured that my application would run on both desktops / mobile devices by changing X
-- **Design Achievement 2**: I followed best practices for accessibility, including providing alt attributes for images and using semantic HTML. There are no `<div>` or `<span>` elements in my document.
-- **Design Achievement 3**: We tested the application with n=X users, finding that...
+- **Design Achievement 1**: I added more custom Hydra.js patterns to the "random" button in "hydra" mode.
+- **Design Achievement 2**: I designed all the audio visualizations as well as the d3 midi visualisers and reactive synth instrument.
+- **Design Achievement 3**: I designed the interaction for switching the drum pad mode from synth to drumkit.
+- **Design Achievement 4**: I updated the edit mode capabilities, allowing users to move around more of the UI, like the button columns on the 
+left and right of the screen. I also updated which buttons are shown/hidden on each mode, making the UI much more intuitive and user-friendly.
+This includes updating the "mode" button, so that now all possible modes appear, rather than forcing the user to cycle through each mode.
+- **Design Achievement 5**: I added mouse support for the MIDI piano to remove any hardware requirements (for accessibility)
+- **Design Achievement 6**: I tested my application on several people, making modifications to the UI/UX accordingly.

models/session.js

@@ -0,0 +1,8 @@
+var mongoose = require('mongoose');
+
+module.exports = mongoose.model('Session',{
+    hydra: String,
+    name: String,
+    user: String,
+    tone: Array
+});

models/user.js

@@ -0,0 +1,9 @@
+var mongoose = require('mongoose');
+
+module.exports = mongoose.model('User',{
+    username: String,
+    password: String,
+    email: String,
+    gender: String,
+    address: String
+});

package.json

@@ -0,0 +1,45 @@
+{
+  "name": "a3-persistence",
+  "version": "1.0.0",
+  "description": "Assignment 3 - Persistence: Two-tier Web Application with Flat File Database, Express server, and CSS template ===",
+  "main": "server.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kitzeller/a3-persistence.git"
+  },
+  "author": "kit zellerbach",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/kitzeller/a3-persistence/issues"
+  },
+  "homepage": "https://github.com/kitzeller/a3-persistence#readme",
+  "dependencies": {
+    "babel-eslint": "^10.0.3",
+    "bcryptjs": "^2.4.3",
+    "compression": "^1.7.4",
+    "connect-ensure-login": "^0.1.1",
+    "cookie-parser": "^1.4.4",
+    "ejs": "^2.7.1",
+    "express": "^4.17.1",
+    "express-session": "^1.16.2",
+    "helmet": "^3.21.0",
+    "hydra-synth": "^1.0.25",
+    "lowdb": "^1.0.0",
+    "mongoose": "^5.7.1",
+    "morgan": "^1.9.1",
+    "passport": "^0.4.0",
+    "passport-local": "^1.0.0",
+    "response-time": "^2.3.2",
+    "serve-favicon": "^2.5.0",
+    "socket.io": "^2.2.0",
+    "timesync": "^1.0.3",
+    "uuid": "^3.3.3"
+  },
+  "devDependencies": {
+    "eslint": "^6.4.0"
+  }
+}