diff --git a/routes/about.js b/routes/about.js index eda7c08..eb6db0c 100644 --- a/routes/about.js +++ b/routes/about.js @@ -1,9 +1,9 @@ -var express = require('express'); -const axios = require('axios'); +var express = require("express"); +const axios = require("axios"); var router = express.Router(); /* GET home page. */ -router.get('/', function (req, res, _next) { +router.get("/", function (req, res, next) { const GHOST_KEY = process.env.GHOST_KEY; const base_url = `https://blog.pastel.codes/ghost/api/v3/content/posts/?key=${GHOST_KEY}`; @@ -15,8 +15,8 @@ router.get('/', function (req, res, _next) { .then( axios.spread((response1, response2) => { var base = { - title: 'About', - description: 'Who??? What??? AAAAaaa, about me.', + title: "About", + description: "Who??? What??? AAAAaaa, about me.", }; var blog = JSON.parse( JSON.stringify(response1.data).split('"posts":').join('"blog":') @@ -26,11 +26,17 @@ router.get('/', function (req, res, _next) { ); var out = Object.assign(base, blog, projects); - res.render('about', out); + res.render("about", out); }) ) .catch((error) => { - console.log(error); + var base = { + title: "About", + description: "Who??? What??? AAAAaaa, about me.", + }; + var out = Object.assign(base); + console.log("error", error); + res.render("about", out); }); }); diff --git a/views/about.pug b/views/about.pug index b0242f0..d8b1472 100644 --- a/views/about.pug +++ b/views/about.pug @@ -7,9 +7,6 @@ block nav-links a(href='#') li(class="py-3 bg-black text-green hover:bg-pink hover:text-black transition duration-500 ease-in-out") span About - a(href='#') - li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") - span CV a(href='https://github.com/aurora-dot') li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span Projects @@ -20,43 +17,48 @@ block nav-links li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span Contact + + block content div.mt-5 div.text-lg h1.font-sans.text-6xl.wavy.mb-10 Hello. - p.mb-5 I’m E, a 20 year old student in 3rd year of university, who studies computer science & artificial intelligence, somehow achieved a 1:1 for the previous two years. - p.mb-5 In my free time, I create small projects to learn new skills to be helpful for others, recently i have been focusing on Django and tailwind for my job. - p.mb-5 Graphic design is also very fun and i enjoy making small projects to post on instagram, it has helped a lot with UX/UI design for applications. - p.mb-5 Currently I am working as a freelance developer for Bounce Technologies! - div - h1.font-sans.text-6xl.wavy.my-10 Projects. + p.mb-5 I’m E, a 23 year year old full stack developer with three years experience, located in the UK. + p.mb-5 Currently I'm working at Bounce Technologies working on various projects using various languages. + p.mb-5 I also do UI, UX and DevOps! Currently learning Go and adjusting to TypeScript. + p.mb-5 I create digital art and electronic music-making, additionally in my free time, I play experimental and artistic video games. - div - each val in project - div(class="mb-10 text-center sm:text-left") - div.contents - a(href=val.url).contents - if val.feature_image - img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image) - else - img(src="/images/logo.png") - div.mt-2 - a(href=val.url) - span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title} - p.text-lg #{val.excerpt} + if project + div + h1.font-sans.text-6xl.wavy.my-10 Projects. + + div + each val in project + div(class="mb-10 text-center sm:text-left") + div.contents + a(href=val.url).contents + if val.feature_image + img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image) + else + img(src="/images/logo.png") + div.mt-2 + a(href=val.url) + span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title} + p.text-lg #{val.excerpt} - div - h1.font-sans.text-6xl.wavy.my-10 Blog. - div - each val in blog - div(class="mb-10 text-center sm:text-left") - div.contents - a(href=val.url).contents - if val.feature_image - img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image) - else - img(src="/images/logo.png") - div.mt-2 - a(href=val.url) - span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title} - p.text-lg #{val.excerpt} + if blog + div + h1.font-sans.text-6xl.wavy.my-10 Blog. + div + each val in blog + div(class="mb-10 text-center sm:text-left") + div.contents + a(href=val.url).contents + if val.feature_image + img(class="sm:w-2/3 mx-auto sm:mx-0" src=val.feature_image) + else + img(src="/images/logo.png") + div.mt-2 + a(href=val.url) + span(class="font-sans text-2xl sm:text-3xl mt-3 mb-3") #{val.title} + p.text-lg #{val.excerpt} diff --git a/views/contact.pug b/views/contact.pug index 0cf1f58..c706375 100644 --- a/views/contact.pug +++ b/views/contact.pug @@ -10,9 +10,6 @@ block nav-links a(href='/about') li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span About - a(href='#') - li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") - span CV a(href='https://github.com/aurora-dot') li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span Projects diff --git a/views/error.pug b/views/error.pug index 1833753..ffbd041 100644 --- a/views/error.pug +++ b/views/error.pug @@ -7,9 +7,6 @@ block nav-links li.nav-item a.nav-link(href='/about') span About - li.nav-item - a.nav-link(href='#') - span CV li.nav-item a.nav-link(href='https://github.com/aurora-dot') span Projects diff --git a/views/index.pug b/views/index.pug index 7970be9..5351701 100644 --- a/views/index.pug +++ b/views/index.pug @@ -7,9 +7,6 @@ block nav-links a(href='/about') li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span About - a(href='#') - li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") - span CV a(href='https://github.com/aurora-dot') li(class="py-3 bg-pink text-black hover:bg-black hover:text-pink transition duration-500 ease-in-out") span Projects