preklopil da kazem novo stran in zduzil datoteke po verziji strani

This commit is contained in:
Nikola Petrov 2023-06-23 00:58:43 +02:00
parent 9e9f46d56f
commit 7ac96e6036
17 changed files with 7849 additions and 20 deletions

2
.gitignore vendored
View File

@ -59,5 +59,3 @@ typings/
# next.js build output # next.js build output
.next .next
fontawesome/

8
app.js
View File

@ -4,8 +4,8 @@ var path = require('path');
var cookieParser = require('cookie-parser'); var cookieParser = require('cookie-parser');
var logger = require('morgan'); var logger = require('morgan');
var indexRouter = require('./routes/index'); var oldRouter = require('./routes/main/1_0');
var newRouter = require('./routes/new'); var newRouter = require('./routes/main/2_0');
var app = express(); var app = express();
@ -19,8 +19,8 @@ app.use(express.urlencoded({ extended: false }));
app.use(cookieParser()); app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
app.use('/', indexRouter); app.use('/', newRouter);
app.use('/new', newRouter); app.use('/old', oldRouter);
// catch 404 and forward to error handler // catch 404 and forward to error handler
app.use(function(req, res, next) { app.use(function(req, res, next) {

7831
public/1_0/assets/fontawesome/css/all.css vendored Normal file

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 71 KiB

View File

@ -3,7 +3,7 @@ var router = express.Router();
/* GET home page. */ /* GET home page. */
router.get('/', function(req, res, next) { router.get('/', function(req, res, next) {
res.render('index'); res.render('main/1_0');
}); });
module.exports = router; module.exports = router;

View File

@ -3,7 +3,7 @@ var router = express.Router();
/* GET home page. */ /* GET home page. */
router.get('/', function(req, res, next) { router.get('/', function(req, res, next) {
res.render('new'); res.render('main/2_0');
}); });
module.exports = router; module.exports = router;

View File

@ -9,12 +9,12 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>
<link rel="stylesheet" href="/assets/fontawesome/css/all.css"> <link rel="stylesheet" href="/1_0/assets/fontawesome/css/all.css">
<link rel="stylesheet" href="/css/intro.css"> <link rel="stylesheet" href="/1_0/css/intro.css">
<link rel="stylesheet" href="/css/styles.css"> <link rel="stylesheet" href="/1_0/css/styles.css">
<script defer src="/assets/WinBox/winbox.bundle.js"></script> <script defer src="/1_0/assets/WinBox/winbox.bundle.js"></script>
<script defer src="/js/main.js"></script> <script defer src="/1_0/js/main.js"></script>
</head> </head>
<body> <body>
@ -23,7 +23,7 @@
Hi, I am <strong>Nikola Petrov</strong> Hi, I am <strong>Nikola Petrov</strong>
</h1> </h1>
<p class="section__subtitle">2. Year RIT</p> <p class="section__subtitle">2. Year RIT</p>
<img src="images/Jaz.jpg" alt="a picture of Nikola Petrov" class="intro__img"> <img src="/images/Jaz.jpg" alt="a picture of Nikola Petrov" class="intro__img">
</section> </section>
<div class="container"> <div class="container">
@ -175,8 +175,8 @@
<div id="documents-content"> <div id="documents-content">
<div class="container margin-top"> <div class="container margin-top">
<div class="row"> <div class="row">
<a href="/assets/documents/CV.pdf" class="btn btn-info" download="Nikola_Petrov_CV">CV</a> <a href="/doc/CV.pdf" class="btn btn-info" download="Nikola_Petrov_CV">CV</a>
<a href="/assets/documents/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> </div>
</div> </div>

View File

@ -10,12 +10,12 @@
<!-- <!--
- favicon - favicon
--> -->
<link rel="shortcut icon" href="/images/logo.ico" type="image/x-icon"> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<!-- <!--
- custom css link - custom css link
--> -->
<link rel="stylesheet" href="/css/new.css"> <link rel="stylesheet" href="/2_0/css/style.css">
<!-- <!--
- google font link - google font link
@ -27,7 +27,7 @@
<!-- <!--
- custom js link - custom js link
--> -->
<script defer src="/js/new.js"></script> <script defer src="/2_0/js/script.js"></script>
<!-- <!--
- ionicon link - ionicon link