diff --git a/controllers/apps.js b/controllers/apps.js index 0267aba..8ae0b6e 100644 --- a/controllers/apps.js +++ b/controllers/apps.js @@ -35,6 +35,13 @@ export const Apps = async (req, res) => { let list_end = (page * 28); let last_page = ''; + let pages = `
  • 1
  • +
  • 2
  • +
  • 3
  • +
  • 4
  • +
  • 5
  • ` + + let prev = '/apps/' + (page - 1) + '/' + template_param; let next = '/apps/' + (page + 1) + '/' + template_param; if (page == 1) { prev = '/apps/' + (page) + '/' + template_param; } @@ -76,6 +83,7 @@ export const Apps = async (req, res) => { for (let i = list_start; i < list_end && i < templates.length; i++) { let appCard = readFileSync('./views/partials/appCard.html', 'utf8'); let name = templates[i].name || templates[i].title.toLowerCase(); + let title = templates[i].title || templates[i].name; let desc = templates[i].description.slice(0, 60) + "..."; let description = templates[i].description.replaceAll(". ", ".\n") || "no description available"; let note = templates[i].note ? templates[i].note.replaceAll(". ", ".\n") : "no notes available"; @@ -91,6 +99,7 @@ export const Apps = async (req, res) => { categories += CatagoryColor(templates[i].categories[j]); } appCard = appCard.replace(/AppName/g, name); + appCard = appCard.replace(/AppTitle/g, title); appCard = appCard.replace(/AppShortName/g, name); appCard = appCard.replace(/AppDesc/g, desc); appCard = appCard.replace(/AppLogo/g, logo); @@ -117,6 +126,7 @@ export const Apps = async (req, res) => { alert: alert, template_list: '', json_templates: json_templates, + pages: pages, }); alert = ''; } @@ -459,8 +469,12 @@ export const InstallModal = async (req, res) => { export const LearnMore = async (req, res) => { let name = req.header('hx-trigger-name'); let id = req.header('hx-trigger'); - + let result = templates_global.find(t => t.name == name); + let modal = readFileSync('./views/modals/learnmore.html', 'utf8'); + modal = modal.replace(/AppName/g, result.title); + modal = modal.replace(/AppDesc/g, result.description); + res.send(modal); } diff --git a/views/apps.html b/views/apps.html index 6efc018..139c3bf 100644 --- a/views/apps.html +++ b/views/apps.html @@ -140,11 +140,9 @@ prev -
  • 1
  • -
  • 2
  • -
  • 3
  • -
  • 4
  • -
  • 5
  • + + <%- pages %> +
  • next @@ -160,48 +158,9 @@ - - + - - \ No newline at end of file diff --git a/views/modals/learnmore.html b/views/modals/learnmore.html index b0fb565..9daf7a0 100644 --- a/views/modals/learnmore.html +++ b/views/modals/learnmore.html @@ -2,8 +2,8 @@