Merge pull request from multiplayerpiano/sass

Sass
This commit is contained in:
BopItFreak 2021-08-27 13:02:22 -04:00 committed by GitHub
commit 50d1781db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 4279 additions and 997 deletions

4
.gitignore vendored

@ -4,4 +4,8 @@ node_modules
# TSC
dist/js/
# CSS
dist/css/
.github

2030
dist/css/screen.css vendored

File diff suppressed because it is too large Load Diff

4
dist/index.html vendored

@ -4,7 +4,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<title>Multiplayer Piano</title>
<meta name="description" content="An online piano you can play alone or with others in real-time. MIDI support, 88 keys, velocity sensitive. You can show off your skill or chat while listening to others play."/>
<link rel="stylesheet" href="/css/screen.css"/>
<link rel="stylesheet" href="css/screen.css">
</head>
<body>
@ -104,6 +104,6 @@
<!---<script src="/js/NoteQuota.js"></script>>--->
<!---<script src="/js/Color.js"></script>>--->
<!---<script src="/js/ebsprite.js"></script>--->
<script src="/js/script.js"></script>
<script src="js/script.js"></script>
</body>
</html>

2063
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -5,7 +5,9 @@
"private": true,
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack"
"build": "npm run build-webpack && npm run build-sass",
"build-webpack": "npx webpack",
"build-sass": "npx sass scss/:dist/css/ --no-source-map"
},
"author": "Brandon Lockaby",
"contributors": [
@ -23,6 +25,9 @@
"devDependencies": {
"@types/jquery": "^3.5.5",
"@types/webmidi": "^2.0.4",
"css-loader": "^5.2.6",
"dart-sass": "^1.25.0",
"sass": "^1.38.1",
"webpack": "^5.39.0",
"webpack-cli": "^4.7.2"
}

1154
scss/screen.scss Normal file

File diff suppressed because it is too large Load Diff

@ -1,4 +1,4 @@
self.onmessage = event =>
self.onmessage = function(event)
{
setTimeout(function(){
postMessage({args:event.data.args});

@ -1,4 +1,4 @@
const path = require('path');
const { resolve } = require('path');
module.exports = {
entry: './src/index.ts',
@ -10,6 +10,14 @@ module.exports = {
use: 'ts-loader',
exclude: /node_modules/,
},
{
test: /sass\/\.s[ac]ss$/i,
use: [
'style-loader',
'css-loader',
'sass-loader'
]
},
],
},
resolve: {
@ -17,6 +25,6 @@ module.exports = {
},
output: {
filename: 'script.js',
path: path.resolve(__dirname, 'dist/js'),
path: resolve(__dirname, 'dist/js'),
},
};