From 2c87014a81c643c8aaa513f057970839e1cc1384 Mon Sep 17 00:00:00 2001 From: monty Date: Sat, 30 Nov 2019 14:14:32 +0100 Subject: [PATCH] basically done --- assets/css/main.css | 121 ++++++++++++++++++++++++++++++++--- assets/css/main.css.map | 2 +- assets/css/main.scss | 54 ++++++++++++++-- assets/css/portfolio.css | 4 +- assets/css/portfolio.css.map | 2 +- assets/css/portfolio.scss | 4 +- assets/icons/discord.svg | 1 + assets/icons/gitdab.svg | 1 + assets/icons/github.svg | 1 + assets/icons/gitlab.svg | 1 + assets/icons/keybase.svg | 1 + assets/icons/mastodon.svg | 1 + assets/icons/patreon.svg | 1 + assets/icons/steam.svg | 1 + assets/icons/twitch.svg | 1 + assets/icons/twitter.svg | 1 + constants.js | 2 +- package-lock.json | 5 ++ package.json | 1 + routes/portfolio.js | 19 ++---- server.js | 40 +++++++++++- views/index.hbs | 17 ++++- 22 files changed, 238 insertions(+), 43 deletions(-) create mode 100644 assets/icons/discord.svg create mode 100644 assets/icons/gitdab.svg create mode 100644 assets/icons/github.svg create mode 100644 assets/icons/gitlab.svg create mode 100644 assets/icons/keybase.svg create mode 100644 assets/icons/mastodon.svg create mode 100644 assets/icons/patreon.svg create mode 100644 assets/icons/steam.svg create mode 100644 assets/icons/twitch.svg create mode 100644 assets/icons/twitter.svg diff --git a/assets/css/main.css b/assets/css/main.css index ad3e05c..2a55ece 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -19,6 +19,12 @@ body { .title { font-size: 13vh; margin: 0; +} + +.subtitle { + font-size: 3vh; + bottom: 50px; + text-align: center; cursor: -webkit-grab; cursor: grab; } @@ -56,7 +62,7 @@ body.light a { #box { position: absolute; z-index: 999; - border: 25px solid white; + border: 3vh solid black; -webkit-box-sizing: border-box; box-sizing: border-box; top: 0; @@ -71,7 +77,7 @@ body.light a { body.light #box { position: absolute; z-index: 999; - border: 25px solid black; + border: 3vh solid white; -webkit-box-sizing: border-box; box-sizing: border-box; top: 0; @@ -83,6 +89,101 @@ body.light #box { transition: border-color 0.5s ease-in-out; } +a.twitter { + fill: #1da1f2 !important; + color: #1da1f2 !important; +} + +a.twitter.light { + fill: #1da1f2 !important; + color: #1da1f2 !important; +} + +a.keybase { + fill: #33a0ff !important; + color: #33a0ff !important; +} + +a.keybase.light { + fill: #33a0ff !important; + color: #33a0ff !important; +} + +a.discord { + fill: #7289da !important; + color: #7289da !important; +} + +a.discord.light { + fill: #7289da !important; + color: #7289da !important; +} + +a.mastodon { + fill: #3088d4 !important; + color: #3088d4 !important; +} + +a.mastodon.light { + fill: #3088d4 !important; + color: #3088d4 !important; +} + +a.twitch { + fill: #6441a4 !important; + color: #6441a4 !important; +} + +a.twitch.light { + fill: #6441a4 !important; + color: #6441a4 !important; +} + +a.gitdab { + fill: #faacb7 !important; + color: #faacb7 !important; +} + +a.gitdab.light { + fill: #faacb7 !important; + color: #faacb7 !important; +} + +a.github { + fill: #333 !important; + color: #333 !important; +} + +a.github.light { + fill: #333 !important; + color: #333 !important; +} + +a.gitlab { + fill: #e24329 !important; + color: #e24329 !important; +} + +a.gitlab.light { + fill: #e24329 !important; + color: #e24329 !important; +} + +.socials { + width: 90%; + font-size: 4vh; + text-align: center; +} + +divide { + display: block; + height: 1vh; + border: 0; + border-top: 0px solid rgba(204, 204, 204, 0); + margin: 1vh 0; + padding: 1vh; +} + .portfolio:hover { color: #ff6a5f; } @@ -111,6 +212,10 @@ body.light .portfolio::selection { background-color: #ff8479; } +.portfolio { + font-size: 6vh; +} + .lore:hover { color: #92a9f3; } @@ -139,6 +244,10 @@ body.light .lore::selection { background-color: #acc3ff; } +.lore { + font-size: 6vh; +} + .art:hover { color: #c974da; } @@ -167,14 +276,6 @@ body.light .art::selection { background-color: #e38ef4; } -.portfolio { - font-size: 6vh; -} - -.lore { - font-size: 6vh; -} - .art { font-size: 6vh; } diff --git a/assets/css/main.css.map b/assets/css/main.css.map index 7cb6eaa..efc3d26 100644 --- a/assets/css/main.css.map +++ b/assets/css/main.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "main.scss" ], diff --git a/assets/css/main.scss b/assets/css/main.scss index ff40091..5557ed8 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -3,8 +3,8 @@ $accent-color: red; body { - background-color: rgb(0, 0, 0); - color: rgb(255, 255, 255); + background-color: black; + color: white; //font-size: 3vw; } @@ -23,6 +23,13 @@ body { //font-family: 'Source Sans Pro', sans-serif !important; font-size: 13vh; margin: 0; +} +.subtitle { + //font-family: 'Source Sans Pro', sans-serif !important; + font-size: 3vh; + bottom: 50px; + //height: 1%; + text-align: center; cursor: grab; } sub { @@ -48,7 +55,7 @@ body.light a { #box { position: absolute; z-index: 999; - border: 25px solid white; + border: 3vh solid black; box-sizing: border-box; top: 0; left: 0; @@ -61,7 +68,7 @@ body.light a { body.light #box { position: absolute; z-index: 999; - border: 25px solid black; + border: 3vh solid white; box-sizing: border-box; top: 0; left: 0; @@ -71,6 +78,43 @@ body.light #box { transition: border-color 0.5s ease-in-out; } +$socials: ( + "twitter": #1da1f2, + "keybase": #33a0ff, + "discord": #7289da, + "mastodon": #3088d4, + "twitch": #6441a4, + "gitdab":#faacb7, + "github": #333, + "gitlab": #e24329 +); + +@each $site, $accent in $socials { + a.#{$site} { + fill: $accent !important; + color: $accent !important; + } + a.#{$site}.light { + fill: $accent !important; + color: $accent !important; + } +} + +.socials { + width: 90%; + font-size: 4vh; + text-align: center; +} + +divide { + display: block; + height: 1vh; + border: 0; + border-top: 0px solid rgba(204, 204, 204, 0); + margin: 1vh 0; + padding: 1vh; +} + $accents: ("portfolio": #ff6a5f, "lore": #92a9f3, "art": #c974da); $links: ('portfolio', 'lore', 'art'); $time: 2s; @@ -91,8 +135,6 @@ $time: 2s; color: black; background-color: $color + 26; } -} -@each $link in $links { .#{$link} { font-size: 6vh; } diff --git a/assets/css/portfolio.css b/assets/css/portfolio.css index f26c9ca..a6a46c1 100644 --- a/assets/css/portfolio.css +++ b/assets/css/portfolio.css @@ -67,7 +67,7 @@ body.light a { #box { position: absolute; z-index: 999; - border: 25px solid white; + border: 3vh solid black; -webkit-box-sizing: border-box; box-sizing: border-box; top: 0; @@ -82,7 +82,7 @@ body.light a { body.light #box { position: absolute; z-index: 999; - border: 25px solid black; + border: 3vh solid white; -webkit-box-sizing: border-box; box-sizing: border-box; top: 0; diff --git a/assets/css/portfolio.css.map b/assets/css/portfolio.css.map index c36b0ac..ead544d 100644 --- a/assets/css/portfolio.css.map +++ b/assets/css/portfolio.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "portfolio.scss" ], diff --git a/assets/css/portfolio.scss b/assets/css/portfolio.scss index fb4201b..579ee5f 100644 --- a/assets/css/portfolio.scss +++ b/assets/css/portfolio.scss @@ -61,7 +61,7 @@ body.light a { #box { position: absolute; z-index: 999; - border: 25px solid white; + border: 3vh solid black; box-sizing: border-box; top: 0; left: 0; @@ -74,7 +74,7 @@ body.light a { body.light #box { position: absolute; z-index: 999; - border: 25px solid black; + border: 3vh solid white; box-sizing: border-box; top: 0; left: 0; diff --git a/assets/icons/discord.svg b/assets/icons/discord.svg new file mode 100644 index 0000000..85d9849 --- /dev/null +++ b/assets/icons/discord.svg @@ -0,0 +1 @@ +Discord icon \ No newline at end of file diff --git a/assets/icons/gitdab.svg b/assets/icons/gitdab.svg new file mode 100644 index 0000000..f795f63 --- /dev/null +++ b/assets/icons/gitdab.svg @@ -0,0 +1 @@ +Git icon \ No newline at end of file diff --git a/assets/icons/github.svg b/assets/icons/github.svg new file mode 100644 index 0000000..3899712 --- /dev/null +++ b/assets/icons/github.svg @@ -0,0 +1 @@ +GitHub icon \ No newline at end of file diff --git a/assets/icons/gitlab.svg b/assets/icons/gitlab.svg new file mode 100644 index 0000000..987c459 --- /dev/null +++ b/assets/icons/gitlab.svg @@ -0,0 +1 @@ +GitLab icon \ No newline at end of file diff --git a/assets/icons/keybase.svg b/assets/icons/keybase.svg new file mode 100644 index 0000000..0709ece --- /dev/null +++ b/assets/icons/keybase.svg @@ -0,0 +1 @@ +Keybase icon \ No newline at end of file diff --git a/assets/icons/mastodon.svg b/assets/icons/mastodon.svg new file mode 100644 index 0000000..79e1d80 --- /dev/null +++ b/assets/icons/mastodon.svg @@ -0,0 +1 @@ +Mastodon icon \ No newline at end of file diff --git a/assets/icons/patreon.svg b/assets/icons/patreon.svg new file mode 100644 index 0000000..47cab8e --- /dev/null +++ b/assets/icons/patreon.svg @@ -0,0 +1 @@ +Patreon icon \ No newline at end of file diff --git a/assets/icons/steam.svg b/assets/icons/steam.svg new file mode 100644 index 0000000..1a66672 --- /dev/null +++ b/assets/icons/steam.svg @@ -0,0 +1 @@ +Steam icon \ No newline at end of file diff --git a/assets/icons/twitch.svg b/assets/icons/twitch.svg new file mode 100644 index 0000000..9cfefe3 --- /dev/null +++ b/assets/icons/twitch.svg @@ -0,0 +1 @@ +Twitch icon \ No newline at end of file diff --git a/assets/icons/twitter.svg b/assets/icons/twitter.svg new file mode 100644 index 0000000..af5b7c3 --- /dev/null +++ b/assets/icons/twitter.svg @@ -0,0 +1 @@ +Twitter icon \ No newline at end of file diff --git a/constants.js b/constants.js index c9ca477..accf9ae 100644 --- a/constants.js +++ b/constants.js @@ -1,3 +1,3 @@ module.exports = { - name: 'x' + name: 'ry' }; diff --git a/package-lock.json b/package-lock.json index 5f811b2..e0bb221 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1261,6 +1261,11 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, + "shell-exec": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shell-exec/-/shell-exec-1.0.2.tgz", + "integrity": "sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==" + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", diff --git a/package.json b/package.json index 3553c22..5a3d7d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "helmet": "^3.21.2", "morgan": "^1.9.1", "nodemon": "^2.0.1", + "shell-exec": "^1.0.2", "ua-parser-js": "^0.7.20" }, "devDependencies": {}, diff --git a/routes/portfolio.js b/routes/portfolio.js index 5f46a56..d86fc31 100644 --- a/routes/portfolio.js +++ b/routes/portfolio.js @@ -7,20 +7,11 @@ portfolio.get('/', (req, res) => { layout: 'portfolio', name: `${con.name} - portfolio`, host: req.hostname, - portfolio: { - 2: { - name: 'thaldrin', - source: 'https://gitdab.com/r/thaldrin' - }, - 1: { - name: 'yiff', - source: 'https://github.com/codepupper/yiff' - }, - 0: { - name: 'homepage', - source: 'https://gitdab.com/codepupper/website' - } - } + portfolio: [ + { name: 'thaldrin', source: 'https://gitdab.com/r/thaldrin' }, + { name: 'homepage', source: 'https://gitdab.com/y/website' }, + { name: 'yiff', source: 'https://github.com/codepupper/yiff' } + ] }); }); diff --git a/server.js b/server.js index b8ca02c..382b531 100644 --- a/server.js +++ b/server.js @@ -7,6 +7,8 @@ const morgan = require('morgan'); const chalk = require('chalk'); const hbs = require('express-handlebars'); const UA = require('ua-parser-js'); +const exec = require('shell-exec'); + const con = require('./constants'); let { port, hostname } = { port: 3621 @@ -62,11 +64,43 @@ module.exports = (client) => { layout: 'main', name: con.name, host: req.hostname, - item: { - 0: { name: 'portfolio', source: '/portfolio' } - } + item: [ { name: 'portfolio', source: '/portfolio' } ], + social: [ + { name: 'keybase', color: '33a0ff', link: 'keybase.io/codepupper' }, + { name: 'discord', color: '7289da', link: 'thaldr.in/discord' }, + { name: 'mastodon', color: '3088d4', link: 'pounced-on.me/@code' }, + { name: 'twitter', color: '1DA1F2', link: 'twitter.com/codepupper' }, + { name: 'gitdab', color: 'faacb7', link: 'gitdab.com/y' }, + { name: 'github', color: '333', link: 'github.com/codepupper' }, + { name: 'gitlab', color: 'E24329', link: 'gitlab.com/codepupper' }, + { name: 'twitch', color: '6441a4', link: 'twitch.tv/codepupper' } + ] }); }); + app.get('/update', async (req, res) => { + if (req.headers.authorization !== 'Update') { + res.status(400).jsonp({ + success: false, + message: 'You are not authorized to access this Endpoint' + }); + } + await exec('git pull') + .then((r) => { + console.log('Pulled latest changes'); + res.status(200).jsonp({ + success: true, + message: 'Successfully pulled latest changes' + }); + trying.edit('```fix\n' + r.stdout + '```'); + }) + .catch((error) => { + res.status(400).jsonp({ + success: false, + message: error.message + }); + console.error(error); + }); + }); app.listen( port, diff --git a/views/index.hbs b/views/index.hbs index 4e0cd7f..93302ea 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,11 +1,22 @@
-

{{name}}

- {{#each item}} +

{{name}}

+

dark/light

+ + {{#each item}} {{this.name}} {{/each}} + +
+ {{#each social}} + + {{name}} + + {{!-- {{name}} Icon --}} + {{/each}} +
-{{!-- portfolio + {{!-- portfolio lore art --}}