diff --git a/app.js b/app.js index 9ece057..cf6beb2 100644 --- a/app.js +++ b/app.js @@ -75,7 +75,7 @@ app.use(function(err, req, res, next) { // render the error page res.status(err.status || 500); - res.render('error'); + res.render('error', {title:'Error'}); }); const port = 80; diff --git a/routes/main/1_0.js b/routes/main/1_0.js index ee9fbe2..4b0cfdb 100644 --- a/routes/main/1_0.js +++ b/routes/main/1_0.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('main/1_0'); + res.render('main/1_0', {title:'Nikola Petrov'}); }); module.exports = router; diff --git a/routes/main/2_0.js b/routes/main/2_0.js index 60b8806..9230cec 100644 --- a/routes/main/2_0.js +++ b/routes/main/2_0.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('main/2_0'); + res.render('main/2_0', {title:'Nikola Petrov'}); }); module.exports = router; \ No newline at end of file diff --git a/routes/movies/movieShow.js b/routes/movies/movieShow.js index 8548d67..a21926c 100644 --- a/routes/movies/movieShow.js +++ b/routes/movies/movieShow.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('movies/show'); + res.render('movies/show', { title: 'Movies' }); }); module.exports = router; \ No newline at end of file diff --git a/views/error.hbs b/views/error.hbs index 9e2882d..3b7457b 100644 --- a/views/error.hbs +++ b/views/error.hbs @@ -1,17 +1,2 @@ - - - - - - - Document - - - - - -

{{message}}

-

{{error.status}}

- - - +

{{message}}

+

{{error.status}}

\ No newline at end of file diff --git a/views/layout.hbs b/views/layout.hbs index 4839ad4..29f6a5f 100644 --- a/views/layout.hbs +++ b/views/layout.hbs @@ -1 +1,15 @@ -{{{body}}} \ No newline at end of file + + + + + + + + + + {{title}} + + + {{{body}}} + + diff --git a/views/main/1_0.hbs b/views/main/1_0.hbs index 5255e63..2b10685 100644 --- a/views/main/1_0.hbs +++ b/views/main/1_0.hbs @@ -1,191 +1,175 @@ - - - - - - - Portfolio - - - - - - - - - - - - - - + + + + + -
-

- Hi, I am Nikola Petrov -

-

2. Year RIT

- a picture of Nikola Petrov -
-
+
+

+ Hi, I am Nikola Petrov +

+

2. Year RIT

+ a picture of Nikola Petrov +
-
- Git - - - -
+
-
-
-
-

Skills

-
-
- - - - -
Language
Slovenian
English
-
-
- - - - -
Programming languages
C/C++
html/css/js/php
-
+
+ Git + + + +
+ +
+
+
+

Skills

+
+
+ + + + +
Language
Slovenian
English
+
+
+ + + + +
Programming languages
C/C++
html/css/js/php
+
-
-
-

Contact

- - - -
- - - nikolape7@gmail.com - -
- - - 070 749 506 - -
+
+
+

Contact

+ + + +
+ + + nikolape7@gmail.com + +
+ + + 070 749 506 + +
+
+
+
+ + - - diff --git a/views/main/2_0.hbs b/views/main/2_0.hbs index e193838..d4c78c7 100644 --- a/views/main/2_0.hbs +++ b/views/main/2_0.hbs @@ -1,659 +1,612 @@ - - - - - - - Nikola Petrov + + + + + + + - - +
+ + + + +
+ + + + + + + +
+ +
+

About me

+
+ +
+

+ I am currently studying at RIT at FERI in Maribor, and I come from the beautiful city of Ljubljana. + What truly 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. +

+ +

+ Being able to merge my technical knowledge with my passion for helping others is incredibly fulfilling for me. + Throughout my studies, I have been inspired to develop innovative systems that can make a meaningful difference in society. + I am driven by the belief that technology can be a powerful tool for improving lives. +

+ +

+ I am enthusiastic about the potential of my work and the opportunities that lie ahead. + With my dedication and expertise, I am determined to contribute to the development of solutions that enhance people's experiences and make a positive impact in the world. +

+
+ + + + +
+ +

Projects

+ +
    + + +
  • +
    + +
    + +
    + +

    Car caunter

    +     + +

    + Program that counts number of cars on the Slovenia highways. With the help of Pythorch and Python. + Data is stored in a mongoDB database with Express.js and Node.js. + For displaying the data React.js is used. +

    +
    +
    • + + +
  • + +
    + +
    + +
    + +

    Web page

    +     +

    + Git repository for my personal website. +

    +
    + +
    • + + + +
  • + +
    + +
    + +
    + +

    Movie tracker

    +     + +

    + WPF application for tracking movies and series. +

    +
    + +
    • + + + +
  • + +
    + +
    + +
    + +

    Arduino controld meat grinder

    +     +

    + Arduino is used as a controller for the electric motro of the meat grinder. +

    +
    + +
    • + + +
+ +
+ +
+ + + +
+ +
+

Resume

+
+ +
+ +
+
+ +
+ +

Education

+
+ +
    + +
  1. + +

    (FERI) Faculty of Electrical Engineering and Computer Science, University of Maribor

    + + 01/10/2021 - CURRENT + +

    + Graduate engineer of computer science and information technology +

    + +
    2. + +
  2. + +

    (SŠTS Šiška) Secondary school of technical professions šiška

    + + 01/09/2016 - 07/07/2021 + +

    + Electrotechnician +

    + +
    3. + +
+ +
+ +
+ +
+
+ +
+ +

Experience

+
+ +
    + +
  1. +

    LightAct [ Developer/IT ]

    + 01/07/2022 - 01/09/2022 +

    + I helped maintaining data base, wored on the application (integrated a capture card and IP camera), + assembled new server rack, installed new UTP/power conectors in the office. +

    +
    2. + +
  2. +

    Institute 404 [ Mentor ]

    + 08/06/2020 - 19/06/2020 +

    + I helped primary school children with their projects with soldering, laser cutting, + and building. +

    +
    3. + +
  3. +

    Hella Saturnos d.o.o. [ Maintenance technician ]

    + 04/09/2018 - 18/01/2019 +

    + I maintained and repaired machines from plastic presses to personal stations. +

    +
    4. + +
  4. +

    Best Western Premier Hotel Slon [ Maintenance technician ]

    + 01/03/2018 - 04/05/2018 +

    + I helped with setting up the conference/event rooms. + I helped customers and fixed problems like replacing light bulbs, wall sockets, hair-dryers. +

    +
    5. + +
+ +
+ +
+ + + + +
+ +
+

Portfolio

+
+ +
+ +
    + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
+ +
+ + + +
    + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
  • + +
    • + +
+ +
+ + + +
+ +
+ +
+ +
\ No newline at end of file diff --git a/views/movies/show.hbs b/views/movies/show.hbs index f1c89dd..5792f5c 100644 --- a/views/movies/show.hbs +++ b/views/movies/show.hbs @@ -1,24 +1,11 @@ - - - - - - Movies - - - - - - - - -
-
-
- -
-
-
- - - + + + + +
+
+
+ +
+
+
\ No newline at end of file