nikola/personal_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove layout.hbs

Browse Source
This commit is contained in:
Nikola Petrov 2024-07-31 15:53:27 +02:00
parent 0c19dde34d
commit 4c8e1460fb
9 changed files with 810 additions and 689 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/userController.ts
View File

@ -4,13 +4,13 @@ import UserModel, { values } from '../models/userModel';
export default {
render: async function (req: Request, res: Response) {
res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
res.render('user', { keys: UserModel.namesOfValues });
},
create: async function (req: Request, res: Response) {
const reqPassword: string = req.body.reqPassword;
if (!reqPassword) return res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
if (!reqPassword) return res.render('user', { keys: UserModel.namesOfValues });
const password = await UserModel.getValue(values.pass);
@ -20,11 +20,11 @@ export default {
if (affectedRows > 0) {
return res.redirect('/list');
}
return res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
return res.render('user', { keys: UserModel.namesOfValues });
}
// check if passwords equal
if (password != reqPassword) {
return res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
return res.render('user', { keys: UserModel.namesOfValues });
}
// update
@ -32,12 +32,12 @@ export default {
const value: string = req.body.value;
if (!name || !value) {
return res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
return res.render('user', { keys: UserModel.namesOfValues });
}
const affectedRows = await UserModel.updateValue(name, value);
if (affectedRows == 0) {
return res.render('user', { title: 'Register', keys: UserModel.namesOfValues });
return res.render('user', { keys: UserModel.namesOfValues });
}
return res.redirect('/list');

10
routes/main.ts
View File

@ -8,15 +8,15 @@ router.get('/', function (req: Request, res: Response) {
const project = userData.project;
const experience = userData.experience;
const education = userData.education;
res.render('main/2_0', { title: 'Nikola Petrov', disableBootStrap: true, project, experience, education });
res.render('main/2_0', { project, experience, education });
});
router.get('/cv', function (req: Request, res: Response) {
res.render('cv', { title: 'Nikola Petrov', disableBootStrap: true, userData });
res.render('cv', { userData });
});
router.get('/old', function (req: Request, res: Response) {
res.render('main/1_0', { title: 'Nikola Petrov' });
res.render('main/1_0');
});
router.get('/mail', function (req: Request, res: Response) {
@ -24,11 +24,11 @@ router.get('/mail', function (req: Request, res: Response) {
});
router.get('/list', function (req: Request, res: Response) {
res.render('list', { title: 'List' });
res.render('list');
});
router.get('/cash', function (req: Request, res: Response) {
res.render('cash', { title: 'Cash' });
res.render('cash');
});
//import userRouter from './user';

35
views/cash.hbs
View File

@ -1,6 +1,27 @@
<script type="module" src="/assets/build/cash.js"></script>
<!doctype html>
<html lang="en" data-bs-theme="dark">
<header>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
<title>Cash</title>
<script type="module" src="/assets/build/cash.js"></script>
</head>
<body>
<header>
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
@ -16,9 +37,9 @@
</div>
</div>
</nav>
</header>
</header>
<main class="bg-body-tertiary pt-5 pb-5">
<main class="bg-body-tertiary pt-5 pb-5">
<div class="container position-relative">
<table class="table">
<thead>
@ -40,4 +61,8 @@
</div>
</div>
</main>
</main>
</body>
</html>

47
views/cv.hbs
View File

@ -1,9 +1,27 @@
<script src="https://kit.fontawesome.com/cb81440751.js" crossorigin="anonymous"></script>
<!doctype html>
<html lang="en" data-bs-theme="dark">
<!-- Import stylesheets in CSS3 -->
<link rel="stylesheet" href="/assets/cv/stylesheets/style.css" type="text/css">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>CV</title>
<script src="https://kit.fontawesome.com/cb81440751.js" crossorigin="anonymous"></script>
<!-- Import stylesheets in CSS3 -->
<link rel="stylesheet" href="/assets/cv/stylesheets/style.css" type="text/css">
<header class="l-header" id="header">
<!-- HTML2PDF.js -->
<!-- Version 0.9.3 -->
<script defer src="/assets/cv/javascripts/html2pdf.v0.9.3.bundle.min.js"></script>
<!-- Main Javascript file -->
<script defer src="/assets/cv/javascripts/main.js"></script>
</head>
<body>
<header class="l-header" id="header">
<!-- Nav menu -->
<nav class="nav bd-container">
<a href="#" class="nav_logo">Léa GALLIER</a>
@ -39,9 +57,9 @@
<i class="fa-solid fa-bars"></i>
</div>
</nav>
</header>
{{#with userData}}
<main class="l-main bd-container">
</header>
{{#with userData}}
<main class="l-main bd-container">
<!-- Resume CV -->
<div class="resume" id="area-cv">
<div class="resume_left">
@ -158,15 +176,12 @@
</section>
</div>
</div>
</main>
{{/with}}
<a href="#" class="scrolltop" id="scroll-top">
</main>
{{/with}}
<a href="#" class="scrolltop" id="scroll-top">
<i class="fa-solid fa-arrow-up scrolltop_icon"></i>
</a>
</a>
<!-- HTML2PDF.js -->
<!-- Version 0.9.3 -->
<script src="/assets/cv/javascripts/html2pdf.v0.9.3.bundle.min.js"></script>
</body>
<!-- Main Javascript file -->
<script src="/assets/cv/javascripts/main.js"></script>
</html>

23
views/layout.hbs
View File

@ -1,23 +0,0 @@
<!doctype html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
{{#unless disableBootStrap}}
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
{{/unless}}
<title>{{title}}</title>
</head>
<body>
{{{body}}}
</body>
</html>

32
views/list.hbs
View File

@ -1,6 +1,24 @@
<script src="/assets/build/list.js"></script>
<!doctype html>
<html lang="en" data-bs-theme="dark">
<header>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
<title>List</title>
<script src="/assets/build/list.js"></script>
</head>
<body>
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
@ -41,12 +59,16 @@
</div>
</div>
</nav>
</header>
</header>
<main>
<main>
<div class="py-5 bg-body-tertiary mt-3">
<div class="container" id="root">
</div>
</div>
</main>
</main>
</body>
</html>

83
views/main/1_0.hbs
View File

@ -1,21 +1,41 @@
<!doctype html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
<title>Nikola Petrov</title>
<link rel="stylesheet" href="/assets/main/1_0/assets/fontawesome/css/all.css">
<link rel="stylesheet" href="/assets/main/1_0/css/intro.css">
<link rel="stylesheet" href="/assets/main/1_0/css/styles.css">
<script defer src="/assets/main/1_0/assets/WinBox/winbox.bundle.js"></script>
<script defer src="/assets/main/1_0/js/main.js"></script>
</head>
<body>
<link rel="stylesheet" href="/assets/main/1_0/assets/fontawesome/css/all.css">
<link rel="stylesheet" href="/assets/main/1_0/css/intro.css">
<link rel="stylesheet" href="/assets/main/1_0/css/styles.css">
<script defer src="/assets/main/1_0/assets/WinBox/winbox.bundle.js"></script>
<script defer src="/assets/main/1_0/js/main.js"></script>
<section class="intro">
<section class="intro">
<h1 class="section__title">
Hi, I am <strong>Nikola Petrov</strong>
</h1>
<p class="section__subtitle">2. Year RIT</p>
<img src="/images/Jaz.jpg" alt="a picture of Nikola Petrov" class="intro__img">
</section>
</section>
<div class="container">
<div class="container">
<div class="text-center" id="buttons">
<a class="btn btn-info btn-lg" id="git" href="https://gitlab.com/nikolape7">Git</a>
@ -31,16 +51,28 @@
<div class="row justify-content-md-center">
<div class="col col-lg-2">
<table class="centered">
<tr><th>Language</th></tr>
<tr><td>Slovenian</td></tr>
<tr><td>English</td></tr>
<tr>
<th>Language</th>
</tr>
<tr>
<td>Slovenian</td>
</tr>
<tr>
<td>English</td>
</tr>
</table>
</div>
<div class="col-md-auto">
<table class="centered">
<tr><th>Programming languages</th></tr>
<tr><td>C/C++</td></tr>
<tr><td>html/css/js/php</td></tr>
<tr>
<th>Programming languages</th>
</tr>
<tr>
<td>C/C++</td>
</tr>
<tr>
<td>html/css/js/php</td>
</tr>
</table>
</div>
</div>
@ -50,24 +82,28 @@
<br>
<h2>Contact</h2>
<table class="centered">
<tr><td>
<tr>
<td>
<a href="mailto:nikolape7@gmail.com">
<i class="fa fa-envelope"></i>
nikolape7@gmail.com
</a>
</td></tr>
<tr><td>
</td>
</tr>
<tr>
<td>
<a href="tel:070749506">
<i class="fa fa-phone"></i>
070 749 506
</a>
</td></tr>
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
<section class="hidden">
<section class="hidden">
<div id="work-experience-content">
<div class="container margin-top">
<div class="row">
@ -165,11 +201,14 @@
<div class="container margin-top">
<div class="row">
<a href="/doc/CV.pdf" class="btn btn-info" download="Nikola_Petrov_CV">CV</a>
<a href="/doc/Certificate.pdf" class="btn btn-info" download="Nikola_Petrov_electrotechnician_certificate">Electrotechnician certificate</a>
<a href="/doc/Certificate.pdf" class="btn btn-info"
download="Nikola_Petrov_electrotechnician_certificate">Electrotechnician certificate</a>
</div>
</div>
</div>
</section>
</section>
</body>
</html>

43
views/main/2_0.hbs
View File

@ -1,12 +1,24 @@
<script defer src="/assets/main/2_0/js/script.js"></script>
<link rel="stylesheet" href="/assets/main/2_0/css/style.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600&display=swap" rel="stylesheet">
<script defer type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
<script defer nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
<!doctype html>
<html lang="en" data-bs-theme="dark">
<main>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Nikola Petrov</title>
<script defer src="/assets/main/2_0/js/script.js"></script>
<link rel="stylesheet" href="/assets/main/2_0/css/style.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600&display=swap" rel="stylesheet">
<script defer type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
<script defer nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
</head>
<body>
<main>
<aside class="sidebar" data-sidebar>
<div class="sidebar-info">
<figure class="avatar-box">
@ -167,9 +179,11 @@
<section class="about-text">
<p>
I am currently an RIT student at FERI in Maribor and come from the beautiful city of Ljubljana.
What really excites me is the opportunity to build systems that have a direct and positive impact on people's
What really excites me is the opportunity to build systems that have a direct and positive impact on
people's
lives.
I find great satisfaction in using my skills to create practical solutions that address real-world challenges.
I find great satisfaction in using my skills to create practical solutions that address real-world
challenges.
</p>
<p>
@ -200,7 +214,8 @@
<h4 class="h4 service-item-title">Backend programming</h4>
<p class="service-item-text">
Backend programming focuses on server-side development, handling data storage, processing, and business
Backend programming focuses on server-side development, handling data storage, processing, and
business
logic to support the functionality of web and mobile applications
</p>
</div>
@ -349,4 +364,8 @@
</div>
</main>
</main>
</body>
</html>

28
views/user.hbs
View File

@ -1,4 +1,24 @@
<div class="container">
<!doctype html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
<title>User</title>
</head>
<body>
<div class="container">
<form action="/user" method="post">
<div class="mb-3">
<label class="form-label">Name</label>
@ -42,4 +62,8 @@
}
</script>
</div>
</div>
</body>
</html>