-
+
+
@@ -26,14 +27,11 @@
diff --git a/assets/css/main.css b/assets/css/main.css index d6483c3..a26d177 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -10,16 +10,15 @@ body { font-family: 'Gotham', sans-serif; + text-transform: uppercase; +} + +.pbg { background-image: url("../images/background.png"); background-size: cover; background-attachment: fixed; background-position: center; background-repeat: no-repeat; - text-transform: uppercase; -} - -iframe { - margin: 1.5% 1.5% 1.5% 1.5%; } .socials { diff --git a/assets/css/main.css.map b/assets/css/main.css.map index 0de1a05..4320b8a 100644 --- a/assets/css/main.css.map +++ b/assets/css/main.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "AAAA,UAAU;EACN,WAAW,EAAE,QAAQ;EACrB,GAAG,EAAE,2CAA2C;;;AAEpD,AAAA,CAAC,CAAC;EACE,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;CAAG;;AAEjB,AAAA,IAAI,CAAC;EACD,WAAW,EAAE,oBAAoB;EACjC,gBAAgB,EAAE,+BAA+B;EACjD,eAAe,EAAE,KAAK;EACtB,qBAAqB,EAAE,KAAK;EAC5B,mBAAmB,EAAE,MAAM;EAC3B,iBAAiB,EAAE,SAAS;EAC5B,cAAc,EAAE,SAAS;CAAG;;AAEhC,AAAA,MAAM,CAAC;EACH,MAAM,EAAE,mBAAmB;CAAG;;AAElC,AAAA,QAAQ,CAAC;EACL,SAAS,EAAE,GAAG;EACd,IAAI,EAAE,CAAC;EACP,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,IAAI;EACpB,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,GAAG;EACR,KAAK,EAAE,IAAI;EACX,cAAc,EAAE,SAAS;CAOA;;AAhB7B,AAWI,QAXI,CAWJ,CAAC,CAAC;EACE,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,OAAO;CAAG;;AAbzB,AAeI,QAfI,CAeJ,CAAC,AAAA,MAAM,CAAC;EACJ,KAAK,EAAE,SAAS;CAAG;;AAE3B,AAAA,MAAM,CAAC;EACH,OAAO,EAAE,YAAY;CAAG;;AAE5B,AAAA,CAAC,CAAC;EACE,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;CAAG;;AAErC,AAAA,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;CAAG;;AAEnB,AAAA,QAAQ,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,GAAG;EACT,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,KAAK;CAAG;;AAEzB,AAAA,QAAQ,CAAC;EACL,SAAS,EAAE,KAAK;EAChB,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,aAAa;EACtB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;CAAG;;AAEf,AAAA,QAAQ,CAAC,CAAC,CAAC;EACP,eAAe,EAAE,IAAI;EACrB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,OAAO;CAAG;;AAErB,AAAA,QAAQ,CAAC,CAAC,AAAA,MAAM,CAAC;EACb,KAAK,EAAE,SAAS;CAAG;;AAEvB,AAAA,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,KAAK;CAAG;;AAEzB,AAAA,SAAS,CAAC;EACN,cAAc,EAAE,QAAQ;EACxB,kBAAkB,EAAE,EAAE;EACtB,yBAAyB,EAAE,QAAQ;EACnC,yBAAyB,EAAE,WAAW;CAAG;;AAE7C,UAAU,CAAV,QAAU;EACN,IAAI;IACA,SAAS,EAAE,iBAAkB;;EACjC,GAAG;IACC,SAAS,EAAE,kBAAkB;;EACjC,EAAE;IACE,SAAS,EAAE,iBAAkB", + "mappings": "AAAA,UAAU;EACN,WAAW,EAAE,QAAQ;EACrB,GAAG,EAAE,2CAA2C;;;AAEpD,AAAA,CAAC,CAAC;EACE,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;CAAG;;AAEjB,AAAA,IAAI,CAAC;EACD,WAAW,EAAE,oBAAoB;EACjC,cAAc,EAAE,SAAS;CAAG;;AAEhC,AAAA,IAAI,CAAC;EACD,gBAAgB,EAAE,+BAA+B;EACjD,eAAe,EAAE,KAAK;EACtB,qBAAqB,EAAE,KAAK;EAC5B,mBAAmB,EAAE,MAAM;EAC3B,iBAAiB,EAAE,SAAS;CAAG;;AAEnC,AAAA,QAAQ,CAAC;EACL,SAAS,EAAE,GAAG;EACd,IAAI,EAAE,CAAC;EACP,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,IAAI;EACpB,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,GAAG;EACR,KAAK,EAAE,IAAI;EACX,cAAc,EAAE,SAAS;CAOA;;AAhB7B,AAWI,QAXI,CAWJ,CAAC,CAAC;EACE,eAAe,EAAE,IAAI;EACrB,KAAK,EAAE,OAAO;CAAG;;AAbzB,AAeI,QAfI,CAeJ,CAAC,AAAA,MAAM,CAAC;EACJ,KAAK,EAAE,SAAS;CAAG;;AAE3B,AAAA,MAAM,CAAC;EACH,OAAO,EAAE,YAAY;CAAG;;AAE5B,AAAA,CAAC,CAAC;EACE,OAAO,EAAE,IAAI;EACb,eAAe,EAAE,aAAa;CAAG;;AAErC,AAAA,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;CAAG;;AAEnB,AAAA,QAAQ,CAAC;EACL,QAAQ,EAAE,QAAQ;EAClB,IAAI,EAAE,GAAG;EACT,KAAK,EAAE,GAAG;EACV,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,KAAK;CAAG;;AAEzB,AAAA,QAAQ,CAAC;EACL,SAAS,EAAE,KAAK;EAChB,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,MAAM;EAClB,OAAO,EAAE,aAAa;EACtB,OAAO,EAAE,GAAG;EACZ,QAAQ,EAAE,QAAQ;EAClB,GAAG,EAAE,GAAG;CAAG;;AAEf,AAAA,QAAQ,CAAC,CAAC,CAAC;EACP,eAAe,EAAE,IAAI;EACrB,MAAM,EAAE,CAAC;EACT,OAAO,EAAE,CAAC;EACV,KAAK,EAAE,OAAO;CAAG;;AAErB,AAAA,QAAQ,CAAC,CAAC,AAAA,MAAM,CAAC;EACb,KAAK,EAAE,SAAS;CAAG;;AAEvB,AAAA,KAAK,CAAC;EACF,KAAK,EAAE,IAAI;EACX,MAAM,EAAE,IAAI;EACZ,WAAW,EAAE,KAAK;CAAG;;AAEzB,AAAA,SAAS,CAAC;EACN,cAAc,EAAE,QAAQ;EACxB,kBAAkB,EAAE,EAAE;EACtB,yBAAyB,EAAE,QAAQ;EACnC,yBAAyB,EAAE,WAAW;CAAG;;AAE7C,UAAU,CAAV,QAAU;EACN,IAAI;IACA,SAAS,EAAE,iBAAkB;;EACjC,GAAG;IACC,SAAS,EAAE,kBAAkB;;EACjC,EAAE;IACE,SAAS,EAAE,iBAAkB", "sources": [ "main.sass" ], diff --git a/assets/css/main.sass b/assets/css/main.sass index 08ac86c..4fb9690 100644 --- a/assets/css/main.sass +++ b/assets/css/main.sass @@ -8,15 +8,14 @@ body font-family: 'Gotham', sans-serif + text-transform: uppercase + +.pbg background-image: url('../images/background.png') background-size: cover background-attachment: fixed background-position: center background-repeat: no-repeat - text-transform: uppercase - -iframe - margin: 1.5% 1.5% 1.5% 1.5% .socials font-size: 3vh diff --git a/assets/images/background.png b/assets/images/background.png index 2a7ff06..ea8c4e1 100644 Binary files a/assets/images/background.png and b/assets/images/background.png differ diff --git a/assets/images/them.png b/assets/images/them.png index 18619b6..1ccd115 100644 Binary files a/assets/images/them.png and b/assets/images/them.png differ diff --git a/constants.js b/constants.js index 6edd858..ff6a8ba 100644 --- a/constants.js +++ b/constants.js @@ -1,11 +1,6 @@ module.exports = { socials: { discord: "https://discord.gg/eXST5gv", - bandcamp: "https://sorsor.bandcamp.com", - patreon: "https://patreon.com/sorsor", - youtube: "https://youtube.com/sorsor", - twitter: "https://twitter.com/YaiSor", - soundcloud: "https://soundcloud.com/yaisor", - spotify: "https://open.spotify.com/artist/2gR5b7EpjCvePrAZZ3KQPj" - } + twitter: "https://twitter.com/BastardCrook", + }, }; diff --git a/server.js b/server.js index 088506b..f37fa69 100644 --- a/server.js +++ b/server.js @@ -7,7 +7,7 @@ const morgan = require("morgan"); const chalk = require("chalk"); const hbs = require("express-handlebars"); let { port, hostname } = { - port: 50269 + port: 18726, }; const con = require("./constants"); @@ -17,7 +17,7 @@ app.engine( "hbs", hbs({ extname: "hbs", - defaultView: "default" + defaultView: "default", }) ); @@ -27,7 +27,7 @@ app.use("/assets", express.static("./assets")); app.use(express.json()); app.use( express.urlencoded({ - extended: true + extended: true, }) ); app.use(helmet()); @@ -41,7 +41,7 @@ app.use( chalk.hex("#ffb142").bold(tokens.status(req, res)), chalk.hex("#ff5252").bold(req.hostname + tokens.url(req, res)), chalk.hex("#2ed573").bold(tokens["response-time"](req, res) + "ms"), - chalk.hex("#f78fb3").bold("@ " + tokens.date(req, res)) + chalk.hex("#f78fb3").bold("@ " + tokens.date(req, res)), ].join(" "); }) ); @@ -51,7 +51,7 @@ function breakSocials(social) { return social.split(""); } -module.exports = async => { +module.exports = (async) => { app.get("/", async (req, res) => { res.render("index", { layout: "main", @@ -60,55 +60,47 @@ module.exports = async => { social: [ { name: "Twitter", - link: "sor.dog/twitter", - character: breakSocials("Twitter") + link: "bastard.ink/twitter", + character: breakSocials("Twitter"), }, { - name: "Spotify", - link: "sor.dog/spotify", - character: breakSocials("Spotify") + name: "Discord", + link: "bastard.ink/discord", + character: breakSocials("Discord"), }, { - name: "Soundcloud", - link: "sor.dog/soundcloud", - character: breakSocials("Soundcloud") + name: "Commissions", + link: "bastard.ink/commissions", + character: breakSocials("Commissions"), }, { - name: "Patreon", - link: "sor.dog/patreon", - character: breakSocials("Patreon") + name: "Trello", + link: "bastard.ink/trello", + character: breakSocials("Trello"), }, { - name: "Bandcamp", - link: "sor.dog/bandcamp", - character: breakSocials("Bandcamp") + name: "Ko-Fi", + link: "bastard.ink/kofi", + character: breakSocials("Ko-Fi"), }, - { - name: "Youtube", - link: "sor.dog/youtube", - character: breakSocials("Youtube") - } - ] + ], }); }); - - app.get("/spotify", (req, res) => { - res.redirect(con.socials.spotify); + app.get("/commissions", (req, res) => { + // TODO: Add Stuff }); + app.get("/twitter", (req, res) => { res.redirect(con.socials.twitter); }); - app.get("/patreon", (req, res) => { - res.redirect(con.socials.patreon); + app.get("/discord", (req, res) => { + res.redirect(con.socials.discord); }); - app.get("/bandcamp", (req, res) => { - res.redirect(con.socials.bandcamp); + app.get("/trello", (req, res) => { + res.redirect(con.socials.trello); }); - app.get("/soundcloud", (req, res) => { - res.redirect(con.socials.soundcloud); - }); - app.get("/youtube", (req, res) => { - res.redirect(con.socials.youtube); + app.get("/kofi", (req, res) => { + res.redirect(con.socials.kofi); }); app.listen(port /* , hostname */, () => { diff --git a/views/index.hbs b/views/index.hbs index abfbb40..b66dab7 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,9 +1,10 @@ +
+