diff --git a/controllers/userController.ts b/controllers/userController.ts index 1151641..ef130b8 100644 --- a/controllers/userController.ts +++ b/controllers/userController.ts @@ -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'); diff --git a/routes/main.ts b/routes/main.ts index ff86925..dfa25ee 100644 --- a/routes/main.ts +++ b/routes/main.ts @@ -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'; diff --git a/views/cash.hbs b/views/cash.hbs index 7e86e7f..0817485 100644 --- a/views/cash.hbs +++ b/views/cash.hbs @@ -1,43 +1,68 @@ - + + -
- -
+ + -
-
- - - - - - - - - - - - - - -
#DayMonthYearAmountTypeCompany
-
-
-
+
+
+ + + + + + + + + + + + + + +
#DayMonthYearAmountTypeCompany
+
+
+
-
-
\ No newline at end of file +
+
+ + + + \ No newline at end of file diff --git a/views/cv.hbs b/views/cv.hbs index 9b438bd..55dde0e 100644 --- a/views/cv.hbs +++ b/views/cv.hbs @@ -1,172 +1,187 @@ - + + - - + + + + + + CV + + + - -{{#with userData}} -
- -
-
+ + + + {{#with userData}} +
+ +
+
- -
-
+ +
+
-
- Icon picture - -

{{first_name}} {{last_name}}

-

{{occupation}}

-
- -
- - {{living_location}} - - - {{birth}} - - - - {{email}} - - - - - {{phone_number}} - - - - - {{web_link}} - - -
-
- - - - - - - -
- - - -
- -
- - -
-

Experience

- -
- {{#each experience}} -
-
- - {{#unless @last}} - - {{/unless}} +
+ Icon picture + +

{{first_name}} {{last_name}}

+

{{occupation}}

-
-

{{title}}

- {{company}} - {{time}} -

- {{des}} -

+ +
+ + {{living_location}} + + + {{birth}} + + + + {{email}} + + + + + {{phone_number}} + + + + + {{web_link}} + +
- {{/each}} -
-
- -
-

Education

+ + + + + + +
+ + + +
-
- +
+ + +
+

Experience

+ +
+ {{#each experience}} +
+
+ + {{#unless @last}} + + {{/unless}} +
+
+

{{title}}

+ {{company}} + {{time}} +

+ {{des}} +

+
+
+ {{/each}} +
+
+ + +
+

Education

+ +
+ + {{#each education}} +
+
+ + {{#unless @last}} + + {{/unless}} +
+
+

{{des}}

+ {{title}} + {{time}} +
+
+ {{/each}} + +
+
+
-
-
-{{/with}} - - - + + {{/with}} + + + - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/views/layout.hbs b/views/layout.hbs deleted file mode 100644 index 238c628..0000000 --- a/views/layout.hbs +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - {{#unless disableBootStrap}} - - - {{/unless}} - {{title}} - - - - {{{body}}} - - - \ No newline at end of file diff --git a/views/list.hbs b/views/list.hbs index 88118c9..0a39356 100644 --- a/views/list.hbs +++ b/views/list.hbs @@ -1,52 +1,74 @@ - + + + + + + + + + + + + + List + + + + +
+ +
+ +
+
+
-
- -
+
-
-
-
+ -
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/views/main/1_0.hbs b/views/main/1_0.hbs index 5c35040..7a693d3 100644 --- a/views/main/1_0.hbs +++ b/views/main/1_0.hbs @@ -1,175 +1,214 @@ + + + + + + + + + + + + + Nikola Petrov + + + + + + + + + - - - - - -
-

- 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 + + +
-
-
-

Contact

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

Skills

+
+
+ + + + + + + + + + +
Language
Slovenian
English
+
+
+ + + + + + + + + + +
Programming languages
C/C++
html/css/js/php
+
+
+
- + + + \ No newline at end of file diff --git a/views/main/2_0.hbs b/views/main/2_0.hbs index feec465..330989c 100644 --- a/views/main/2_0.hbs +++ b/views/main/2_0.hbs @@ -1,352 +1,371 @@ - - - - - - - + + -
-
- + - -
+
- - - -
+
-
-

About me

-
+
+

About me

+
-
-

- 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 - lives. - I find great satisfaction in using my skills to create practical solutions that address real-world challenges. -

+
+

+ 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 + lives. + I find great satisfaction in using my skills to create practical solutions that address real-world + challenges. +

-

- I am excited by 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 - the people's experiences and make a positive difference in the world. -

-
+

+ I am excited by 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 + the people's experiences and make a positive difference in the world. +

+
- -
+
-

Interests

+

Interests

-
    +
      -
    • -
      - -
      +
    • +
      + +
      -
      +
      -

      Backend programming

      -

      - Backend programming focuses on server-side development, handling data storage, processing, and business - logic to support the functionality of web and mobile applications -

      -
      -
      • +

      Backend programming

      +

      + Backend programming focuses on server-side development, handling data storage, processing, and + business + logic to support the functionality of web and mobile applications +

      +
+ -
  • +
  • -
    - -
    +
    + +
    -
    +
    -

    Embedded systems

    +

    Embedded systems

    -

    - Embedded systems are specialized computing devices integrated into everyday products, performing - dedicated functions with real-time constraints. -

    -
    +

    + Embedded systems are specialized computing devices integrated into everyday products, performing + dedicated functions with real-time constraints. +

    +
    -
    • + -
  • +
  • -
    - -
    +
    + +
    -
    -

    Application programming

    -

    - Application programming involves writing code to create software applications that perform specific - tasks or functions. -

    -
    +
    +

    Application programming

    +

    + Application programming involves writing code to create software applications that perform specific + tasks or functions. +

    +
    -
    • + - + - + - + - -
    +
    -
    -

    Resume

    -
    +
    +

    Resume

    +
    -
    +
    -
    -
    - +
    +
    + +
    + +

    Education

    -

    Education

    -
    +
      + {{#each education}} +
    1. +

      {{title}}

      + {{time}} +

      {{des}}

      +
      2. + {{/each}} +
    -
      - {{#each education}} -
    1. -

      {{title}}

      - {{time}} -

      {{des}}

      -
      2. - {{/each}} -
    +
    -
    +
    -
    +
    +
    + +
    -
    -
    - +

    Experience

    -

    Experience

    -
    +
      + {{#each experience}} +
    1. +

      {{title}} [ {{company}} ]

      + {{time}} +

      + {{des}} +

      +
      2. + {{/each}} -
        - {{#each experience}} -
      1. -

        {{title}} [ {{company}} ]

        - {{time}} -

        - {{des}} -

        -
        2. - {{/each}} +
      -
    +
    -
    - -
    +
    - - -
    +
    - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/views/user.hbs b/views/user.hbs index 5afa989..a7b35d8 100644 --- a/views/user.hbs +++ b/views/user.hbs @@ -1,45 +1,69 @@ -
    -
    -
    - - -
    + + -
    - - -
    + + + + + -
    - - -
    + + - -
    -
    -
    Get
    -
    -
    + User + - -
    \ No newline at end of file +
    + + +
    + +
    + + +
    + + + +
    +
    Get
    +
    +
    + + +
    + + + + \ No newline at end of file