From d88bb557dc6b2ed7d6bd3d8608646210ba733874 Mon Sep 17 00:00:00 2001 From: Alexander Bass Date: Fri, 24 Jun 2022 13:11:18 -0400 Subject: [PATCH] Updated build script. Supports SCSS now. --- .gitignore | 5 +- build.sh | 10 ++ client/{www/style.css => scss/main.scss} | 0 client/www/fonts/pixerif.woff2 | Bin 6312 -> 0 bytes client/www/fonts/pixserif.ttf | Bin 39092 -> 0 bytes client/www/styleold.css | 213 ----------------------- package-lock.json | 11 -- package.json | 1 - server/src/server/server.ts | 3 +- tsconfig.json | 2 +- 10 files changed, 15 insertions(+), 230 deletions(-) create mode 100644 build.sh rename client/{www/style.css => scss/main.scss} (100%) delete mode 100644 client/www/fonts/pixerif.woff2 delete mode 100644 client/www/fonts/pixserif.ttf delete mode 100644 client/www/styleold.css diff --git a/.gitignore b/.gitignore index c8e331e..7be159e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -*node_modules/* -*dist/* +*node_modules* +*dist* +*.sass-cache* diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..ab12409 --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +rm -rf dist +mkdir -p dist/server +mkdir -p dist/www/ +scss client/scss/main.scss dist/www/style.css +cp -r client/www/* dist/www +rm -rf .sass-cache +npx tsc +echo "Starting server......." +echo "~-+/\________________/==o=O=o==\________________/\+-~" +node dist/server/main.js diff --git a/client/www/style.css b/client/scss/main.scss similarity index 100% rename from client/www/style.css rename to client/scss/main.scss diff --git a/client/www/fonts/pixerif.woff2 b/client/www/fonts/pixerif.woff2 deleted file mode 100644 index 800b6781c3f85d2d75c5417d7a3bf6612b3f3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6312 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 KZ#F-^?f(FD)_O|- diff --git a/client/www/styleold.css b/client/www/styleold.css deleted file mode 100644 index a39e754..0000000 --- a/client/www/styleold.css +++ /dev/null @@ -1,213 +0,0 @@ - -/* #mydiv { - position: absolute; - cursor: move; - z-index: 10; - background: coral; - width: 30px; - height: 30px; - border: 1px solid #d3d3d3; -} */ - - - -span.button > img { - pointer-events: none; - image-rendering: optimizeSpeed; /* STOP SMOOTHING, GIVE ME SPEED */ - image-rendering: -moz-crisp-edges; /* Firefox */ - image-rendering: -o-crisp-edges; /* Opera */ - image-rendering: -webkit-optimize-contrast; /* Chrome (and eventually Safari) */ - image-rendering: pixelated; /* Chrome */ - -ms-interpolation-mode: nearest-neighbor; /* IE8+ */ - width: 70px; - height: 70px; - transform: translate(0, 8px); - border: 2px solid darkgray; - border-radius: 4px; - background: lightgray; -} - -span.button { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - display: inline-block; - background: tan; - width:90px; - height:90px; - margin: 5px 5px 5px 5px; - vertical-align: middle; - border-radius: 3px; - white-space: normal; - align-items: center; - cursor: pointer; - -} - -span.button:hover { - background: gray; -} - -.canvas1{ - z-index: 0; -} - -.canvas3 { - z-index: 2; -} - -.canvasStack { - - /* top: 50px; */ - - background: darkslategray; - -} - -#wrapper { - - /* display: flex; */ - /* justify-content: right; */ - /* left: 50%; */ - /* transform: translate(-50%, 0); */ - /* position: absolute; */ - background: khaki; - width: 750px; - height: 750px; -} - -#wrapwrap { - display: block; - margin: 0 auto; - margin-left: auto; - margin-right: auto; -} - -main { - - margin-left: auto; - margin-right: auto; -} - -canvas { - -webkit-user-select: none; /* Chrome all / Safari all */ - -moz-user-select: none; /* Firefox all */ - -ms-user-select: none; /* IE 10+ */ - -o-user-select: none; - user-select: none; - image-rendering: -moz-crisp-edges; - image-rendering: -webkit-crisp-edges; - image-rendering: pixelated; - image-rendering: crisp-edges; -} - - -.hidden { - display: none; -} - -body { -text-align: center; -background-color: #2c2f33; -color: white; -font-variant: normal; -font-family: verdana; -} - -h1 { - font-size: 25pt; - -} -h2 { - font-size: 20pt; -} -p{ - /* font-size: 12pt; */ - /* text-align: left; */ - margin: 0; -} - -h4 { - font-size: 12pt; - padding: 0; - margin: 0; -} - -.startButton { -width: 100.5%; -background-color: #4CAF50; -color: white; -padding-top: 14px; -padding-bottom: 14px; -margin-top: 4px; -margin-bottom: 4px; -border: none; -border-radius: 4px; -cursor: pointer; -} - -.subSection { - width: 100%; - text-align: center; - font-size: 12pt; - color: white; - padding: 0; - background-color: #4d5259; - border-style: solid; - border: solid white; - border-radius: 6px; - padding-bottom: 2px; - padding-top: 2px; - margin-top: 3px; - margin-bottom: 3px; -} - -.slider { - -webkit-appearance: none; - width: 98%; - background: none; - outline: none; - margin-top: 10px; - margin-bottom: 10px; - height: 1px; - border: 2px solid #white; - background-color: #fff; -} - -.slider::-webkit-slider-thumb { - -webkit-appearance: none; - border: 1px solid #bdc3c7; - width: 20px; - height: 20px; - background: #4CAF50; - border-radius: 3px; - cursor: pointer; -} - -.slider::-moz-range-thumb { - border: 1px solid #bdc3c7; - width: 20px; - height: 20px; - background: #4CAF50; - border-radius: 3px; - cursor: pointer; -} - -.slider::-moz-range-track { - width: 100%; - height: 5px; - background-color: #fff; -} - -span.spacer{ - display:inline-block; - width: 1px; - height: 25px; - color: #fff; - background-color: #fff; - border: 1px solid #fff; - border-radius: 6px; - - -} diff --git a/package-lock.json b/package-lock.json index 8c0f6c4..0bd0f8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,6 @@ "express": "^4.18.1", "sass": "^1.52.3", "socket.io": "^4.5.0", - "socket.js": "^0.1.4", "ts-node": "^10.8.1", "typescript": "^4.7.4" }, @@ -1078,11 +1077,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/socket.js": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/socket.js/-/socket.js-0.1.4.tgz", - "integrity": "sha512-2JqBbfPOslz48eSRibPa98123V2iR5vxWBQt7w3pSxEgCMOHafNqmjpdZLpwcXe6y6H+Mj0MablR1VXfU4NN2Q==" - }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -2042,11 +2036,6 @@ } } }, - "socket.js": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/socket.js/-/socket.js-0.1.4.tgz", - "integrity": "sha512-2JqBbfPOslz48eSRibPa98123V2iR5vxWBQt7w3pSxEgCMOHafNqmjpdZLpwcXe6y6H+Mj0MablR1VXfU4NN2Q==" - }, "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", diff --git a/package.json b/package.json index 1575e90..fe64a82 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "express": "^4.18.1", "sass": "^1.52.3", "socket.io": "^4.5.0", - "socket.js": "^0.1.4", "ts-node": "^10.8.1", "typescript": "^4.7.4" }, diff --git a/server/src/server/server.ts b/server/src/server/server.ts index 43032ab..725c56a 100644 --- a/server/src/server/server.ts +++ b/server/src/server/server.ts @@ -4,7 +4,6 @@ import { port } from "../env.js" var app = express() const __dirname = path.resolve(path.dirname('')); -app.use(express.static(path.normalize(__dirname + '/client/www/'))); -console.log(path.normalize(__dirname + '/client/www/')) +app.use(express.static(path.normalize(__dirname + '/dist/www/'))); export var webServer = app.listen(port, function () { }); diff --git a/tsconfig.json b/tsconfig.json index 254b9c9..2205b01 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "module": "es2015", "target": "es6", "rootDir": "server/src", - "outDir": "dist", + "outDir": "dist/server", "sourceMap": true, "strict": true },