Skip to content

Commit

Permalink
Add little bird song + add lower B
Browse files Browse the repository at this point in the history
  • Loading branch information
cvuorinen committed Oct 14, 2017
1 parent 0829151 commit 0119ba7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
12 changes: 11 additions & 1 deletion app/main.jsx
Expand Up @@ -69,6 +69,16 @@ class App extends React.Component {
['D4,8', 'C4,8', 'D4,8', 'E4,8'],
['C4,2', 'null,'],
]},
{ name: '\uD83D\uDC26 Little bird', score: [
['D4,2', 'null,', 'A4,2', 'null,'],
['G4,4', 'F4,8', 'E4,8', 'F4,4', 'D4,4'],
['E4,4', 'E4,4', 'A4,4', 'null,', 'G4,8'],
['F4,4', 'D4,8', 'F4,8', 'E4,2', 'null,'],
['E4,8', 'F4,8', 'E4,8', 'D4,8', 'C4,4', 'B3,8', 'B3,8'],
['D4,4', 'D4,4', 'E4,2', 'null,'],
['A4,4', 'G4,8', 'F4,4', 'E4,8', 'F4,8'],
['D4,4', 'D4,4', 'D4,4', 'null,'],
]},
{ name: '\u263A Kaisla\'s song', score: [
['F4,4', 'F4,4', 'G4,4', 'G4,4'],
['A4,4', 'A4,8'],
Expand Down Expand Up @@ -211,7 +221,7 @@ class Piano extends React.Component {
this.synth.triggerRelease()
}
render() {
let keys = ['C4', 'D4', 'E4', 'F4', 'G4', 'A4', 'B4', 'C5', 'D5', 'E5', 'F5', 'G5', 'A5']
let keys = ['B3', 'C4', 'D4', 'E4', 'F4', 'G4', 'A4', 'B4', 'C5', 'D5', 'E5', 'F5', 'G5']
let keyList = keys.map(key =>
<Key onPress={this.play.bind(this)} onRelease={this.release.bind(this)} note={key} />
)
Expand Down
4 changes: 2 additions & 2 deletions build/bundle.js
Expand Up @@ -68,7 +68,7 @@
_classCallCheck(this, App);

_get(Object.getPrototypeOf(App.prototype), 'constructor', this).call(this, props);
this.songs = [{ name: '★ Twinkle', score: [['C4,4', 'C4,4', 'G4,4', 'G4,4', 'A4,4', 'A4,4', 'G4,2'], ['F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2'], ['G4,4', 'G4,4', 'F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,2'], ['G4,4', 'G4,4', 'F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,2'], ['C4,4', 'C4,4', 'G4,4', 'G4,4', 'A4,4', 'A4,4', 'G4,2'], ['F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2']] }, { name: '🚶 Noa', score: [['C4,4', 'C4,4', 'C4,4', 'E4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,4'], ['E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2'], ['E4,4', 'E4,4', 'E4,4', 'E4,4', 'G4,2', 'F4,2'], ['D4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,2', 'E4,2'], ['C4,4', 'C4,4', 'C4,4', 'E4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,4'], ['E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2']] }, { name: '🎂 Birthday', score: [['D4,8', 'D4,8', 'E4,4', 'D4,4', 'G4,4', 'F4,2'], ['D4,8', 'D4,8', 'E4,4', 'D4,4', 'A4,4', 'G4,2'], ['D4,8', 'D4,8', 'D5,4', 'B4,4', 'G4,4', 'F4,4', 'E4,4'], ['C5,8', 'C5,8', 'B4,4', 'G4,4', 'A4,4', 'G4,2']] }, { name: '🐇 Rabbit', score: [['C4,8', 'D4,8', 'E4,8', 'F4,8', 'G4,4', 'G4,4'], ['A4,4', 'A4,4', 'G4,2', 'null,'], ['A4,4', 'A4,4', 'G4,2', 'null,'], ['G4,8', 'F4,8', 'F4,8', 'F4,8', 'F4,8', 'E4,8', 'E4,4'], ['E4,8', 'D4,8', 'D4,8', 'D4,8', 'D4,8', 'C4,8', 'C4,4'], ['C4,8', 'E4,8', 'G4,4'], ['C4,8', 'E4,8', 'G4,4'], ['G4,4', 'G4,4', 'C4,2']] }, { name: '❄ Frost', score: [['D4,8', 'F4,8', 'D4,8', 'F4,8'], ['E4,4', 'E4,4', 'null,'], ['E4,8', 'G4,8', 'C4,8', 'E4,8'], ['D4,4', 'D4,4', 'null,'], ['F4,8', 'F4,8', 'F4,8', 'F4,8'], ['A4,8', 'F4,8', 'A4,8', 'F4,8'], ['G4,8', 'G4,8', 'G4,8', 'G4,8'], ['B4,8', 'A4,8', 'A4,8', 'F4,8'], ['D4,8', 'F4,8', 'D4,8', 'F4,8'], ['E4,4', 'E4,4', 'null,'], ['E4,8', 'G4,8', 'C4,8', 'E4,8'], ['D4,4', 'D4,4', 'null,']] }, { name: '🕷 Spider', score: [['C4,8', 'C4,8', 'C4,8', 'D4,8'], ['E4,4', 'E4,4'], ['D4,8', 'C4,8', 'D4,8', 'E4,8'], ['C4,2', 'null,'], ['E4,8', 'E4,8', 'E4,8', 'F4,8'], ['G4,4', 'G4,4'], ['F4,8', 'E4,8', 'F4,8', 'G4,8'], ['E4,2', 'null,'], ['C5,4', 'C5,8', 'C5,8'], ['B4,4', 'B4,4'], ['A4,8', 'A4,8', 'A4,8', 'A4,8'], ['G4,2', 'null,'], ['C4,8', 'C4,8', 'C4,8', 'D4,8'], ['E4,4', 'E4,4'], ['D4,8', 'C4,8', 'D4,8', 'E4,8'], ['C4,2', 'null,']] }, { name: '☺ Kaisla\'s song', score: [['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,2', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,2', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,1', 'null,']] }];
this.songs = [{ name: '★ Twinkle', score: [['C4,4', 'C4,4', 'G4,4', 'G4,4', 'A4,4', 'A4,4', 'G4,2'], ['F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2'], ['G4,4', 'G4,4', 'F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,2'], ['G4,4', 'G4,4', 'F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,2'], ['C4,4', 'C4,4', 'G4,4', 'G4,4', 'A4,4', 'A4,4', 'G4,2'], ['F4,4', 'F4,4', 'E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2']] }, { name: '🚶 Noa', score: [['C4,4', 'C4,4', 'C4,4', 'E4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,4'], ['E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2'], ['E4,4', 'E4,4', 'E4,4', 'E4,4', 'G4,2', 'F4,2'], ['D4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,2', 'E4,2'], ['C4,4', 'C4,4', 'C4,4', 'E4,4', 'D4,4', 'D4,4', 'D4,4', 'F4,4'], ['E4,4', 'E4,4', 'D4,4', 'D4,4', 'C4,2']] }, { name: '🎂 Birthday', score: [['D4,8', 'D4,8', 'E4,4', 'D4,4', 'G4,4', 'F4,2'], ['D4,8', 'D4,8', 'E4,4', 'D4,4', 'A4,4', 'G4,2'], ['D4,8', 'D4,8', 'D5,4', 'B4,4', 'G4,4', 'F4,4', 'E4,4'], ['C5,8', 'C5,8', 'B4,4', 'G4,4', 'A4,4', 'G4,2']] }, { name: '🐇 Rabbit', score: [['C4,8', 'D4,8', 'E4,8', 'F4,8', 'G4,4', 'G4,4'], ['A4,4', 'A4,4', 'G4,2', 'null,'], ['A4,4', 'A4,4', 'G4,2', 'null,'], ['G4,8', 'F4,8', 'F4,8', 'F4,8', 'F4,8', 'E4,8', 'E4,4'], ['E4,8', 'D4,8', 'D4,8', 'D4,8', 'D4,8', 'C4,8', 'C4,4'], ['C4,8', 'E4,8', 'G4,4'], ['C4,8', 'E4,8', 'G4,4'], ['G4,4', 'G4,4', 'C4,2']] }, { name: '❄ Frost', score: [['D4,8', 'F4,8', 'D4,8', 'F4,8'], ['E4,4', 'E4,4', 'null,'], ['E4,8', 'G4,8', 'C4,8', 'E4,8'], ['D4,4', 'D4,4', 'null,'], ['F4,8', 'F4,8', 'F4,8', 'F4,8'], ['A4,8', 'F4,8', 'A4,8', 'F4,8'], ['G4,8', 'G4,8', 'G4,8', 'G4,8'], ['B4,8', 'A4,8', 'A4,8', 'F4,8'], ['D4,8', 'F4,8', 'D4,8', 'F4,8'], ['E4,4', 'E4,4', 'null,'], ['E4,8', 'G4,8', 'C4,8', 'E4,8'], ['D4,4', 'D4,4', 'null,']] }, { name: '🕷 Spider', score: [['C4,8', 'C4,8', 'C4,8', 'D4,8'], ['E4,4', 'E4,4'], ['D4,8', 'C4,8', 'D4,8', 'E4,8'], ['C4,2', 'null,'], ['E4,8', 'E4,8', 'E4,8', 'F4,8'], ['G4,4', 'G4,4'], ['F4,8', 'E4,8', 'F4,8', 'G4,8'], ['E4,2', 'null,'], ['C5,4', 'C5,8', 'C5,8'], ['B4,4', 'B4,4'], ['A4,8', 'A4,8', 'A4,8', 'A4,8'], ['G4,2', 'null,'], ['C4,8', 'C4,8', 'C4,8', 'D4,8'], ['E4,4', 'E4,4'], ['D4,8', 'C4,8', 'D4,8', 'E4,8'], ['C4,2', 'null,']] }, { name: '🐦 Little bird', score: [['D4,2', 'null,', 'A4,2', 'null,'], ['G4,4', 'F4,8', 'E4,8', 'F4,4', 'D4,4'], ['E4,4', 'E4,4', 'A4,4', 'null,', 'G4,8'], ['F4,4', 'D4,8', 'F4,8', 'E4,2', 'null,'], ['E4,8', 'F4,8', 'E4,8', 'D4,8', 'C4,4', 'B3,8', 'B3,8'], ['D4,4', 'D4,4', 'E4,2', 'null,'], ['A4,4', 'G4,8', 'F4,4', 'E4,8', 'F4,8'], ['D4,4', 'D4,4', 'D4,4', 'null,']] }, { name: '☺ Kaisla\'s song', score: [['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,2', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,2', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,4', 'G4,8', 'G4,8', 'G4,8', 'null,'], ['F4,4', 'F4,4', 'G4,4', 'G4,4'], ['A4,4', 'A4,8'], ['G4,1', 'null,']] }];

/*{ name: '\u266B Do-Re-Mi', score: [
['C4,4', 'D4,4', 'E4,4', 'F4,4', 'G4,4', 'A4,4'],
Expand Down Expand Up @@ -305,7 +305,7 @@
value: function render() {
var _this3 = this;

var keys = ['C4', 'D4', 'E4', 'F4', 'G4', 'A4', 'B4', 'C5', 'D5', 'E5', 'F5', 'G5', 'A5'];
var keys = ['B3', 'C4', 'D4', 'E4', 'F4', 'G4', 'A4', 'B4', 'C5', 'D5', 'E5', 'F5', 'G5'];
var keyList = keys.map(function (key) {
return React.createElement(Key, { onPress: _this3.play.bind(_this3), onRelease: _this3.release.bind(_this3), note: key });
});
Expand Down
4 changes: 4 additions & 0 deletions build/main.css
Expand Up @@ -92,6 +92,10 @@ note { font-size: 70px; font-family: FreeSerif; position: relative; padding: 0 2
.note.t2:after { content: "\1d15e"; } /* half note */
.note.t1:after { content: "\1d15d"; } /* whole note */
.note.clef:after { content: "\1d11e"; font-size: 80%; bottom: -30%; }
.note.B3 { bottom: -63%; }
.note.B3:before { content: ""; position: absolute; top: 75%;
left: 5%; width: 25px; border-top: 1px solid #000;
}
.note.C4 { bottom: -50%; }
.note.C4:before { content: ""; position: absolute; top: 75%;
left: 5%; width: 25px; border-top: 1px solid #000;
Expand Down
2 changes: 1 addition & 1 deletion cache.appcache
@@ -1,5 +1,5 @@
CACHE MANIFEST
# 2017-03-22:v2
# 2017-10-14:v1

# Explicitly cached entries
index.html
Expand Down

0 comments on commit 0119ba7

Please sign in to comment.