- [<>]
- ${opts.plugin_global_title}
+ [<>] ${opts.plugin_global_title}
{if url:match("admin") then
print('//')
print('${opts.admin_title}')
diff --git a/src/page/index.lua b/src/page/index.lua
deleted file mode 100644
index b0c35b8..0000000
--- a/src/page/index.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local util = require("util")
-
-if not app.cache['index.html'] then
- app.cache['index.html'] = util.memoize(
- function()
- print("processing!")
- local data = { url = util.getURL() .. app.opts.plugin_diskscan_dirname }
- local html = util.template( LoadAsset("page/index.html"),data)
- return html
- end,
- 60*5 -- re-run every 5 mins (otherwise return cache)
- )
-end
-
-SetStatus(200)
-SetHeader('Content-Type', 'text/html; charset=utf-8')
-Write( app.cache['index.html']() )
diff --git a/src/plugin/global.lua b/src/plugin/global.lua
index 816bed9..6808cbe 100644
--- a/src/plugin/global.lua
+++ b/src/plugin/global.lua
@@ -19,7 +19,7 @@ local plugin = {
key='app.opts.plugin_global_title',
title='Title',
info='Preferably dot-style domain-notation for easy recollection',
- default = "your.xr.forge",
+ default = "xrforge",
values=''
},
{
@@ -36,6 +36,13 @@ local plugin = {
default = "map",
values=''
},
+ {
+ key='app.opts.plugin_global_homepage',
+ title='Homepage',
+ info='Display 3D or 2D experiences on homepage',
+ default = "3D",
+ values={ ['3D'] = '3D', ['2D'] = '2D' },
+ },
{
key='app.opts.plugin_global_topmenu_html',
title='Menu html',
@@ -56,6 +63,16 @@ local plugin = {
control='textarea',
values=''
},
+ },
+ middleware = {
+ homepage_2D_or_3D = function(req,res,next)
+ if (app.opts.plugin_global_homepage == '3D') or (req.param.view == '3D') then
+ res.template = 'page/index.html'
+ else
+ res.template = 'page/dir.html'
+ end
+ next()
+ end
}
}
diff --git a/src/test/main.lua b/src/test/main.lua
index 46c8778..aa519fc 100644
--- a/src/test/main.lua
+++ b/src/test/main.lua
@@ -2,6 +2,19 @@ local lust = require 'test/lust'
local describe, it, expect = lust.describe, lust.it, lust.expect
-- usage: https://github.com/bjornbytes/lust
+lust.queueServerRequest = function(method, path, params, host, headers, body, scheme, port)
+ GetMethod = function() return method end
+ GetPath = function() return path end
+ GetParams = function() return params or {} end -- note: { {"key","value"} } format
+ GetHost = function() return host or 'localhost' end
+ GetHeaders = function() return headers or {} end
+ GetScheme = function() return scheme or 'https' end
+ GetBody = function() return body or '' end
+ GetPort = function() return port or 80 end
+end
+
+require('test/plugin_global')(lust)
+os.exit()
require('test/plugin_diskscan')(lust)
require('test/plugin_xrfragment')(lust)
diff --git a/src/test/plugin_global.lua b/src/test/plugin_global.lua
new file mode 100644
index 0000000..6291c74
--- /dev/null
+++ b/src/test/plugin_global.lua
@@ -0,0 +1,36 @@
+return function(lust)
+
+
+ local describe, it, expect = lust.describe, lust.it, lust.expect
+
+ describe('src/plugin/global.lua', function()
+
+ describe('set homepage', function() -- Can be nested
+
+ it('opts.plugin.global_homepage = "2D"', function()
+ app.init()
+ app.get('^/$', app.plugin.global.middleware.homepage_2D_or_3D )
+ app.use( require('page/dir').middleware ) -- directory browser
+ app.use( function(req,res,next)
+ if app.opts.plugin_global_homepage == '2D' and req.param.view == nil then
+ expect( res.template == 'page/dir.html' ).to.be.truthy()
+ end
+ if app.opts.plugin_global_homepage == '2D' and req.param.view == '3D' then
+ expect( res.template == 'page/index.html' ).to.be.truthy()
+ end
+ end)
+
+ -- this should render the 2D mode (dir.html)
+ app.opts.plugin_global_homepage = '2D'
+ lust.queueServerRequest('GET', '/' )
+ app.run()
+ -- this should render the 3D mode (index.html)
+ lust.queueServerRequest('GET', '/', { {'view','3D'} })
+ app.run()
+ end)
+
+ end)
+
+ end)
+
+end