diff --git a/routes/about.js b/routes/about.js deleted file mode 100644 index c0832d3..0000000 --- a/routes/about.js +++ /dev/null @@ -1,17 +0,0 @@ -const routes = require('express').Router(); - -const pageBuilder = require('../utils/pageBuilder'); - -routes.get('/', (request, result) => -{ - pageBuilder.buildPageWithTemplate(request, result, - (p1,p2,p3)=>{}, "blog/about.html"); -}); - - -routes.get('*', (request, result) => -{ - pageBuilder.print404(result); -}); - -module.exports = routes; \ No newline at end of file diff --git a/routes/api/index.js b/routes/api/index.js new file mode 100644 index 0000000..32508cc --- /dev/null +++ b/routes/api/index.js @@ -0,0 +1,22 @@ +const routes = require('express').Router(); +const sql = require('../../utils/sql'); + + + +routes.get('/posts', (request, result) => +{ + sql.getAllPosts().then((data)=> + { + result.json(data).end();result + }).catch((err)=> + { + result.status(500).json([]).end(); + }); +}); + +routes.get('*', (request, result) => +{ + result.json([]).end(); +}); + +module.exports = routes; \ No newline at end of file diff --git a/routes/index.js b/routes/index.js index 517d077..bc9b491 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,8 +1,8 @@ const routes = require('express').Router(); -/** about page */ -const about = require('./about'); -routes.use('/about', about); +// /** about page */ +// const about = require('./about'); +// routes.use('/about', about); /** admin page and all of its sub pages */ const admin = require('./admin'); @@ -33,10 +33,25 @@ routes.use('/category', category); const pageBuilder = require('../utils/pageBuilder'); +routes.get('/about', (request, result) => +{ + pageBuilder.buildPageWithTemplate(request, result, + (p1,p2,p3)=>{}, "blog/about.html"); +}); + + +routes.get('/posts', (request, result) => +{ + pageBuilder.buildPageWithTemplate(request, result, + (p1,p2,p3)=>{}, "blog/posts.html"); +}); + + const project = require('./projects'); routes.use('/steam', project); - +const api = require('./api'); +routes.use('/api', api); //blog home page routes.get('/', (request, result) => diff --git a/templates/blog/posts.html b/templates/blog/posts.html new file mode 100644 index 0000000..db81b34 --- /dev/null +++ b/templates/blog/posts.html @@ -0,0 +1,165 @@ +{header} + + + + + + +




+
+

+
+ +
+
+
+
+
+

+
+
+ {>sideBar} +
+
+
+ + + + + + + + +{footer} \ No newline at end of file diff --git a/utils/sql.js b/utils/sql.js index f443da7..6762062 100644 --- a/utils/sql.js +++ b/utils/sql.js @@ -22,6 +22,7 @@ const config = require('../utils/configLoader').getConfig(); /** SQL connection */ const con = mysql.createConnection({ host: config.SQL_HOST, + port: config.SQL_PORT, user: config.SQL_USER, password: config.SQL_PASSWORD, database: config.SQL_DATABASE