diff --git a/Model.drawio b/Model.drawio new file mode 100644 index 0000000..629b961 --- /dev/null +++ b/Model.drawio @@ -0,0 +1 @@ +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 \ No newline at end of file diff --git a/_ext/svg/lospec_logo_1x.svg b/_ext/svg/lospec_logo_1x.svg new file mode 100644 index 0000000..d48ff76 --- /dev/null +++ b/_ext/svg/lospec_logo_1x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/_ext/svg/newfile.svg b/_ext/svg/newfile.svg new file mode 100644 index 0000000..ba18c86 --- /dev/null +++ b/_ext/svg/newfile.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/_ext/svg/openfile.svg b/_ext/svg/openfile.svg new file mode 100644 index 0000000..e69f4af --- /dev/null +++ b/_ext/svg/openfile.svg @@ -0,0 +1,16 @@ + + + + + diff --git a/build.js b/build.js index b053bb8..20f3c0d 100644 --- a/build.js +++ b/build.js @@ -17,6 +17,9 @@ console.log('Building Pixel Editor'); function copy_images(){ gulp.src('./images/*.png') .pipe(gulp.dest(path.join(BUILDDIR, SLUG))); + + gulp.src('./images/Splash images/*.png') + .pipe(gulp.dest(path.join(BUILDDIR, SLUG))); } function render_js(){ diff --git a/css/pixel-editor.scss b/css/pixel-editor.scss index 2a99c39..bb7d9e1 100644 --- a/css/pixel-editor.scss +++ b/css/pixel-editor.scss @@ -1577,6 +1577,7 @@ div#pb-options { background-image:url('https://cdn.discordapp.com/attachments/506277390050131978/795660870221955082/final.png'); background-size:cover; background-position:center; + background-repeat:no-repeat; } #black { diff --git a/images/Splash images/Caves.png b/images/Splash images/Caves.png new file mode 100644 index 0000000..d90689c Binary files /dev/null and b/images/Splash images/Caves.png differ diff --git a/images/Splash images/Eye.png b/images/Splash images/Eye.png new file mode 100644 index 0000000..3a938f2 Binary files /dev/null and b/images/Splash images/Eye.png differ diff --git a/images/Splash images/Fusionnist.png b/images/Splash images/Fusionnist.png new file mode 100644 index 0000000..1a97b49 Binary files /dev/null and b/images/Splash images/Fusionnist.png differ diff --git a/images/Splash images/Glacier.png b/images/Splash images/Glacier.png new file mode 100644 index 0000000..da4ddb4 Binary files /dev/null and b/images/Splash images/Glacier.png differ diff --git a/images/Splash images/Mountains.png b/images/Splash images/Mountains.png new file mode 100644 index 0000000..f59132d Binary files /dev/null and b/images/Splash images/Mountains.png differ diff --git a/images/Splash images/Polyphorge1.png b/images/Splash images/Polyphorge1.png new file mode 100644 index 0000000..88c859f Binary files /dev/null and b/images/Splash images/Polyphorge1.png differ diff --git a/images/Splash images/Polyphorge2.png b/images/Splash images/Polyphorge2.png new file mode 100644 index 0000000..2643f81 Binary files /dev/null and b/images/Splash images/Polyphorge2.png differ diff --git a/images/Splash images/Rayquaza.png b/images/Splash images/Rayquaza.png new file mode 100644 index 0000000..5b93c46 Binary files /dev/null and b/images/Splash images/Rayquaza.png differ diff --git a/images/Splash images/Sweetie.png b/images/Splash images/Sweetie.png new file mode 100644 index 0000000..1681973 Binary files /dev/null and b/images/Splash images/Sweetie.png differ diff --git a/js/_splashPage.js b/js/_splashPage.js new file mode 100644 index 0000000..e79fe18 --- /dev/null +++ b/js/_splashPage.js @@ -0,0 +1,25 @@ +function SplashCoverImage(path, author, link) { + this.path = path; + this.author = author; + this.link = link; +} + +let images = [ + new SplashCoverImage('Rayquaza', 'Unsettled', 'https://twitter.com/_unsettled_'), + new SplashCoverImage('Mountains', 'Skeddles', 'https://twitter.com/skeddles'), + new SplashCoverImage('Sweetie', 'GrafxKid', 'https://grafxkid.tumblr.com/'), + new SplashCoverImage('Glacier', 'WindfallApples', 'https://twitter.com/windfallapples'), + new SplashCoverImage('Polyphorge1', 'Polyphorge', 'https://lospec.com/poly-phorge'), + new SplashCoverImage('Fusionnist', 'Fusionnist', 'https://twitter.com/fusionnist') +]; + + +let coverImage = document.getElementById('editor-logo'); +let authorLink = coverImage.getElementsByTagName('a')[0]; +let chosenImage = images[Math.round(Math.random() * (images.length - 1))]; + +console.log ("Path: " + '/pixel-editor/' + chosenImage.path + '.png'); + +coverImage.style.backgroundImage = 'url("/pixel-editor/' + chosenImage.path + '.png")'; +authorLink.setAttribute('href', chosenImage.link); +authorLink.innerHTML = 'Art by ' + chosenImage.author; \ No newline at end of file diff --git a/js/pixel-editor.js b/js/pixel-editor.js index ceeb3ea..c0cf293 100644 --- a/js/pixel-editor.js +++ b/js/pixel-editor.js @@ -53,6 +53,7 @@ //=include _resizeSprite.js //=include _colorPicker.js //=include _paletteBlock.js +//=include _splashPage.js /**load file**/ //=include _loadImage.js diff --git a/package-lock.json b/package-lock.json index 2b1577c..6298697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3563,6 +3563,7 @@ }, "node_modules/handlebars-helper-svg": { "version": "2.0.1", + "resolved": "git+ssh://git@bitbucket.org/skeddles/npm-handlebars-helper-svg-lospec-open-source.git#2feeec5000aecce96ba2f714ec540880537ae208", "license": "ISC", "dependencies": { "ltx": "^2.3.0", @@ -10313,7 +10314,8 @@ } }, "handlebars-helper-svg": { - "version": "2.0.1", + "version": "git+ssh://git@bitbucket.org/skeddles/npm-handlebars-helper-svg-lospec-open-source.git#2feeec5000aecce96ba2f714ec540880537ae208", + "from": "handlebars-helper-svg@git+https://bitbucket.org/skeddles/npm-handlebars-helper-svg-lospec-open-source.git", "requires": { "ltx": "^2.3.0", "resolve": "^1.1.7" diff --git a/server.js b/server.js index 43a454a..596cf60 100644 --- a/server.js +++ b/server.js @@ -13,11 +13,12 @@ app.get('/', (req, res) => { console.log('error sending file', err); } else { console.log("Server: Successfully served index.html"); - setTimeout(()=>{ + + /*setTimeout(()=>{ console.log('closing server'); res.app.server.close(); process.exit(); - },1000*10); + },1000*10); */ } }); }); @@ -27,7 +28,7 @@ app.use(express.static(path.join(__dirname, BUILDDIR))); reload(app).then(() => { //start server - app.server = app.listen(PORT, function () { + app.server = app.listen(3000, function () { console.log('Web server listening on port ' + PORT) }) });