Work fine for v0.1.0

This commit is contained in:
Dryusdan 2017-07-03 08:14:53 +02:00
parent 676ae5bee4
commit e870e9a5a7
5 changed files with 30 additions and 22 deletions

4
app.js
View File

@ -92,7 +92,7 @@ class App {
]).then(data => {
var nav = data[0];
var dataCategories = data[1];
var dataCategories = data[2];
var content = data[2];
res.setHeader("Content-type", "text/html");
var tplData = {
"blogName": config.blogName,
@ -103,7 +103,7 @@ class App {
res.render('template.hbs', tplData);
}).catch(err => {
res.setHeader("Content-type", "text/plain");
console.log(err);
res.end("erreur");
});
});

View File

@ -12,11 +12,11 @@ var title,
class Articles {
getArticle(categories, article){
getArticle(categorie, article){
return new Promise((resolve, reject) => {
fs.readFile('./views/articles/article.hbs', 'utf-8', (error, source) => {
var paramPath = "./ressources/"+catehorie+"/"+article+".json"; // path to param of article
var contentPath = "./ressources/"+catehorie+"/"+article+".md"; //path to article
var paramPath = "./ressources/"+categorie+"/"+article+".json"; // path to param of article
var contentPath = "./ressources/"+categorie+"/"+article+".md"; //path to article
fs.access(paramPath, fs.constants.F_OK || fs.constants.R_OK, (error) => {
if(error)
resolve(new Error("File not exist"));
@ -25,17 +25,25 @@ class Articles {
if(error)
resolve(new Error("File not exist"));
else{
console.log(markdown.toHTML(require("."+contentPath)));
fs.readFile(contentPath, 'utf-8', (error, content) => {
var content = markdown.toHTML(content);
const articleParams = require("."+paramPath);
var data = {
'title':articleParams.title,
'author': articleParams.author,
'content': content
};
console.log(data);
hbs.registerHelper('articles', (articles) =>{
return articles;
});
var template = hbs.compile(source);
var html = template(data);
resolve(html);
});
}
});
});
const data = require('../ressources/lastArticles.json');
hbs.registerHelper('articles', (articles) =>{
return articles;
});
var template = hbs.compile(source);
var html = template(data);
resolve(html);
});
});
}

View File

@ -1,5 +1,5 @@
body {
background: black url("../img/fairyland-canyon-1632749-low.jpg") no-repeat top center;
background: black url("/img/fairyland-canyon-1632749-low.jpg") no-repeat top center;
-webkit-background-size: 100%;
background-size: 100%;
display: flex;
@ -87,7 +87,7 @@ body {
position: relative;
border: none;
padding: 40px;
background: transparent url(../img/close.svg) no-repeat center center;
background: transparent url(/img/close.svg) no-repeat center center;
background-size: 20px 20px;
width: 20px;
height: 20px;

View File

@ -5,6 +5,6 @@
<div class="navItem"><a href="portfolio.html">Portfolio</a></div>
<div class="navItem">Contact</div>-->
<div class="navItem" id="openSearchTool">
<img class="navIcon" src="assets/img/search.png">
<img class="navIcon" src="/assets/img/search.png">
</div>
</nav>

View File

@ -1,14 +1,14 @@
<main>
<section>
<!--<nav>
<button class="prev"><img src="assets/img/prev.png">Précédent</button>
<img class="blackAsset separator" src="assets/img/separator.png">
<button class="next">Suivant<img src="assets/img/next.png"></button>
</nav>-->
<nav>
<button class="prev"><img src="/assets/img/prev.png">Précédent</button>
<img class="blackAsset separator" src="/assets/img/separator.png">
<button class="next">Suivant<img src="/assets/img/next.png"></button>
</nav>
<article>
<div class="articleTitle">
<h1>{{title}}</h1>
<p class="author">{{author}}</p>
<p class="author">Par {{author}}</p>
</div>
<div class="content">
{{{content}}}