clients/crook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make changes for crook

Browse source
This commit is contained in:
hokkqido 2020-06-01 20:07:43 +02:00
parent a0c920aed3
commit d1242ada64
9 changed files with 51 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
assets/css/main.css
View file

@ -10,16 +10,15 @@
body { body {
font-family: 'Gotham', sans-serif; font-family: 'Gotham', sans-serif;
text-transform: uppercase;
}
.pbg {
background-image: url("../images/background.png"); background-image: url("../images/background.png");
background-size: cover; background-size: cover;
background-attachment: fixed; background-attachment: fixed;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
text-transform: uppercase;
}
iframe {
margin: 1.5% 1.5% 1.5% 1.5%;
} }
.socials { .socials {

2
assets/css/main.css.map
View file

@ -1,6 +1,6 @@
{ {
"version": 3, "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": [ "sources": [
"main.sass" "main.sass"
], ],

7
assets/css/main.sass
View file

@ -8,15 +8,14 @@
body body
font-family: 'Gotham', sans-serif font-family: 'Gotham', sans-serif
text-transform: uppercase
.pbg
background-image: url('../images/background.png') background-image: url('../images/background.png')
background-size: cover background-size: cover
background-attachment: fixed background-attachment: fixed
background-position: center background-position: center
background-repeat: no-repeat background-repeat: no-repeat
text-transform: uppercase
iframe
margin: 1.5% 1.5% 1.5% 1.5%
.socials .socials
font-size: 3vh font-size: 3vh

BIN
assets/images/background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 58 KiB

BIN
assets/images/them.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 53 KiB

9
constants.js
View file

@ -1,11 +1,6 @@
module.exports = { module.exports = {
socials: { socials: {
discord: "https://discord.gg/eXST5gv", discord: "https://discord.gg/eXST5gv",
bandcamp: "https://sorsor.bandcamp.com", twitter: "https://twitter.com/BastardCrook",
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"
}
}; };

66
server.js
View file

@ -7,7 +7,7 @@ const morgan = require("morgan");
const chalk = require("chalk"); const chalk = require("chalk");
const hbs = require("express-handlebars"); const hbs = require("express-handlebars");
let { port, hostname } = { let { port, hostname } = {
port: 50269 port: 18726,
}; };
const con = require("./constants"); const con = require("./constants");
@ -17,7 +17,7 @@ app.engine(
"hbs", "hbs",
hbs({ hbs({
extname: "hbs", extname: "hbs",
defaultView: "default" defaultView: "default",
}) })
); );
@ -27,7 +27,7 @@ app.use("/assets", express.static("./assets"));
app.use(express.json()); app.use(express.json());
app.use( app.use(
express.urlencoded({ express.urlencoded({
extended: true extended: true,
}) })
); );
app.use(helmet()); app.use(helmet());
@ -41,7 +41,7 @@ app.use(
chalk.hex("#ffb142").bold(tokens.status(req, res)), chalk.hex("#ffb142").bold(tokens.status(req, res)),
chalk.hex("#ff5252").bold(req.hostname + tokens.url(req, res)), chalk.hex("#ff5252").bold(req.hostname + tokens.url(req, res)),
chalk.hex("#2ed573").bold(tokens["response-time"](req, res) + "ms"), 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(" "); ].join(" ");
}) })
); );
@ -51,7 +51,7 @@ function breakSocials(social) {
return social.split(""); return social.split("");
} }
module.exports = async => { module.exports = (async) => {
app.get("/", async (req, res) => { app.get("/", async (req, res) => {
res.render("index", { res.render("index", {
layout: "main", layout: "main",
@ -60,55 +60,47 @@ module.exports = async => {
social: [ social: [
{ {
name: "Twitter", name: "Twitter",
link: "sor.dog/twitter", link: "bastard.ink/twitter",
character: breakSocials("Twitter") character: breakSocials("Twitter"),
}, },
{ {
name: "Spotify", name: "Discord",
link: "sor.dog/spotify", link: "bastard.ink/discord",
character: breakSocials("Spotify") character: breakSocials("Discord"),
}, },
{ {
name: "Soundcloud", name: "Commissions",
link: "sor.dog/soundcloud", link: "bastard.ink/commissions",
character: breakSocials("Soundcloud") character: breakSocials("Commissions"),
}, },
{ {
name: "Patreon", name: "Trello",
link: "sor.dog/patreon", link: "bastard.ink/trello",
character: breakSocials("Patreon") character: breakSocials("Trello"),
}, },
{ {
name: "Bandcamp", name: "Ko-Fi",
link: "sor.dog/bandcamp", link: "bastard.ink/kofi",
character: breakSocials("Bandcamp") character: breakSocials("Ko-Fi"),
}, },
{ ],
name: "Youtube",
link: "sor.dog/youtube",
character: breakSocials("Youtube")
}
]
}); });
}); });
app.get("/commissions", (req, res) => {
// TODO: Add Stuff
});
app.get("/spotify", (req, res) => {
res.redirect(con.socials.spotify);
});
app.get("/twitter", (req, res) => { app.get("/twitter", (req, res) => {
res.redirect(con.socials.twitter); res.redirect(con.socials.twitter);
}); });
app.get("/patreon", (req, res) => { app.get("/discord", (req, res) => {
res.redirect(con.socials.patreon); res.redirect(con.socials.discord);
}); });
app.get("/bandcamp", (req, res) => { app.get("/trello", (req, res) => {
res.redirect(con.socials.bandcamp); res.redirect(con.socials.trello);
}); });
app.get("/soundcloud", (req, res) => { app.get("/kofi", (req, res) => {
res.redirect(con.socials.soundcloud); res.redirect(con.socials.kofi);
});
app.get("/youtube", (req, res) => {
res.redirect(con.socials.youtube);
}); });
app.listen(port /* , hostname */, () => { app.listen(port /* , hostname */, () => {

10
views/index.hbs
View file

@ -1,9 +1,10 @@
<div class="pbg"></div>
<div id="main"> <div id="main">
<section class="socials"> <section class="socials">
<div class="floating"> <div class="floating">
<img class="them" src="./assets/images/them.png" alt="Sor's Icon" srcset="" /> <img class="them" src="./assets/images/them.png" alt="Crooks's Icon" srcset="" />
</div> </div>
<br /> <br />
@ -26,14 +27,11 @@
</div> </div>
<iframe width="97%" height="20" scrolling="no" frameborder="no" allow="autoplay" <div class="crook">
src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/723173407&color=%23a595ed&inverse=true&auto_play=false&show_user=true"></iframe>
<div class="sor">
<div class="credits"> <div class="credits">
<img class="logo" src="./assets/images/sor_white.png" alt="Sor's Logo" /> <img class="logo" src="./assets/images/crook_white.png" alt="Crook's Logo" />
</div> </div>

16
views/layouts/main.hbs
View file

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>sor | sor.dog</title> <title>Crook | bastard.ink</title>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -15,16 +15,16 @@
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<meta property="og:title" content="sor"> <meta property="og:title" content="sor">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:url" content="https://sor.dog"> <meta property="og:url" content="https://bastard.ink">
<meta property="og:description" content="your one-stop shop for all things sor"> <meta property="og:description" content="everything about crook">
<meta property="og:image" content="/assets/images/moon.png"> <meta property="og:image" content="/assets/images/them.png">
<meta name="description" content="your one-stop shop for all things sor."> <meta name="description" content="everything about crook">
<meta name="keywords" content="sor, music, commissions, producer"> <meta name="keywords" content="bastard, crook, art, commissions,artist">
<meta name="twitter:card" content="summary"> <meta name="twitter:card" content="summary">
<meta name="twitter:image" content="https://sor.dog/assets/images/moon.png"> <meta name="twitter:image" content="https://bastard.ink/assets/images/them.png">
<meta name="twitter:creator" content="@YaiSor"> <meta name="twitter:creator" content="@BastardCrook">
</head> </head>