diff --git a/.gitignore b/.gitignore index b2bd22f..315ba79 100644 --- a/.gitignore +++ b/.gitignore @@ -60,4 +60,4 @@ typings/ # next.js build output .next -public/assets/fontawesome/ \ No newline at end of file +fontawesome/ \ No newline at end of file diff --git a/app.js b/app.js index 391b04d..d48ffb7 100644 --- a/app.js +++ b/app.js @@ -5,7 +5,6 @@ var cookieParser = require('cookie-parser'); var logger = require('morgan'); var indexRouter = require('./routes/index'); -var usersRouter = require('./routes/users'); var app = express(); @@ -20,7 +19,6 @@ app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); app.use('/', indexRouter); -app.use('/users', usersRouter); // catch 404 and forward to error handler app.use(function(req, res, next) { diff --git a/routes/index.js b/routes/index.js index 8542506..b1c3f15 100644 --- a/routes/index.js +++ b/routes/index.js @@ -3,7 +3,7 @@ var router = express.Router(); /* GET home page. */ router.get('/', function(req, res, next) { - res.render('index', { title: 'Nik' }); + res.render('index'); }); module.exports = router; diff --git a/routes/users.js b/routes/users.js deleted file mode 100644 index 623e430..0000000 --- a/routes/users.js +++ /dev/null @@ -1,9 +0,0 @@ -var express = require('express'); -var router = express.Router(); - -/* GET users listing. */ -router.get('/', function(req, res, next) { - res.send('respond with a resource'); -}); - -module.exports = router; diff --git a/views/error.hbs b/views/error.hbs index 3b7457b..b458c56 100644 --- a/views/error.hbs +++ b/views/error.hbs @@ -1,2 +1,19 @@ -

{{message}}

-

{{error.status}}

\ No newline at end of file + + + + + + Document + + + +

{{message}}

+

{{error.status}}

+ + + diff --git a/views/index.hbs b/views/index.hbs index b78c90f..a8dc0d7 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -1,162 +1,185 @@ -
-

- Hi, I am Nikola Petrov -

-

2. Year RIT

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

Skills

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

Contact

- - - -
- - - nikolape7@gmail.com - -
- - - 070 749 506 - -
-
-
-
- - + + + + diff --git a/views/layout.hbs b/views/layout.hbs index d60af0f..4839ad4 100644 --- a/views/layout.hbs +++ b/views/layout.hbs @@ -1,22 +1 @@ - - - - - - - Portfolio - - - - - - - - - - - - - {{{body}}} - - +{{{body}}} \ No newline at end of file