]] .. item.title .. [[
+ ]] .. item.title .. [[
diff --git a/src/.init.lua b/src/.init.lua
index 0dd58f4..8ac293b 100644
--- a/src/.init.lua
+++ b/src/.init.lua
@@ -14,8 +14,6 @@ HidePath('/usr/share/ssl/')
-- create
app = require("soakbean") {
- bin = "./xrforge.com",
- bindir = arg[-1]:gsub("/[a-zA-Z0-9-_ ]+.com$","/"),
cache = { items = {}, url = {} },
plugin = {},
opts = {},
@@ -62,11 +60,13 @@ app.plugin.moderation = app.addPlugin('plugin/moderation')
app.plugin.xrfragments = app.addPlugin('plugin/xrfragments')
app.plugin.janusxr = app.addPlugin('plugin/janusxr')
app.plugin.clouddrive = app.addPlugin('plugin/clouddrive')
+app.plugin.markdown = app.addPlugin('plugin/markdown')
+app.plugin.rssatom = app.addPlugin('plugin/rssatom')
app.plugin.federation = app.addPlugin('plugin/federation')
app.plugin.manyfold = app.addPlugin('plugin/manyfold')
+app.plugin.peertube = app.addPlugin('plugin/peertube')
app.plugin.git = app.addPlugin('plugin/git')
app.plugin.webhook = app.addPlugin('plugin/webhook')
-app.plugin.markdown = app.addPlugin('plugin/markdown')
app.plugin.staticwebgen = app.addPlugin('plugin/staticwebgen') -- should always be last
app.runcmd(app) -- run clicmds
@@ -92,7 +92,11 @@ app.post('^/save', function(req,res,next) -- setup inline POST endpoint
end)
app --
-.use( require("middleware/httpauth")() )
+.use( require("middleware/httpauth")({
+ user = app.opts.admin_user,
+ pass = app.opts.admin_pass,
+ path = "^/admin"
+}))
.use( require("json").middleware() ) -- try plug'n'play json API middleware
.use( require('page/dir').middleware ) -- directory browser
.use( app.router( app.url ) ) -- try url router
diff --git a/src/.lua/config.lua b/src/.lua/config.lua
index 87b5fd1..df9874f 100644
--- a/src/.lua/config.lua
+++ b/src/.lua/config.lua
@@ -7,6 +7,8 @@ return function(app)
baseurl="/",
admin_title = "admin panel",
admin_subtitle = "Manage your XR experiences here",
+ admin_user = "admin",
+ admin_pass = "admin"
}
local configfile = "xrforge.lua"
diff --git a/src/.lua/soakbean.lua b/src/.lua/soakbean.lua
index 5d15066..3ce5672 100644
--- a/src/.lua/soakbean.lua
+++ b/src/.lua/soakbean.lua
@@ -181,7 +181,8 @@ sb = {
run = function(req)
local next = function() end
local k = 0
- local req = {
+ local internal = req
+ req = req or {
param={},
method=GetMethod(),
host=GetHost(),
@@ -195,7 +196,7 @@ sb = {
_header={},
_body=""
}
- local params = GetParams()
+ local params = internal and {} or GetParams()
if params ~= nil then
for i,p in pairs(params) do req.param[ p[1] ] = p[2] end
end
@@ -238,6 +239,7 @@ sb = {
response = function()
return function(req,res,next)
+ sb.pub('response', {req=req, res=res, next=next})
if res._status ~= nil then
SetStatus(res._status)
for k,v in pairs(res._header) do
@@ -293,7 +295,7 @@ sb = {
end
print("\nUsage: " .. app.bin .. " +Say what?
+
+> Fitting an entire virtual world into 65 KB is like trying to condense the whole Marvel Cinematic Universe into a single tweet. It’s the digital equivalent of trying to build a full-scale, functioning Disneyland inside a hollowed-out peanut shell. -> This is a blockquote - -And [this](https://xrfragment.org) is an URL. +Read more about [best practices at xrfragment.org](https://xrfragment.org/#Best%20practices) diff --git a/src/myverse/tronverse/tron/tron.glb b/src/myverse/tronverse/tron/tron.glb index d60f133..0446ff4 100644 Binary files a/src/myverse/tronverse/tron/tron.glb and b/src/myverse/tronverse/tron/tron.glb differ diff --git a/src/myverse/x3d/test_world.x3d b/src/myverse/x3d/test_world.x3d deleted file mode 100644 index 2861716..0000000 --- a/src/myverse/x3d/test_world.x3d +++ /dev/null @@ -1,52 +0,0 @@ - - -
- 
+ 
Check the sourcecode
docker run codeforge.org/coderofsalvation/xrforge:latest @@ -79,7 +79,7 @@ div#xrecosystem{
- View from XR Device
- Content overview
- About
+ View from XR Device
+ Content overview
+ About
- Sourcecode
-
+ 
+ Sourcecode
+ {if footerlinks then + for i,v in pairs(footerlinks) do + print([[ + ]] .. v.title .. [[
+ ]]) + end + end}
diff --git a/src/page/header.html b/src/page/header.html
index ddf66d7..be1e8ac 100644
--- a/src/page/header.html
+++ b/src/page/header.html
@@ -5,7 +5,7 @@
${opts.plugin_global_title}
-
+
${opts.plugin_global_headertags}
+
Check the sourcecodedocker run codeforge.org/coderofsalvation/xrforge:latest @@ -79,7 +79,7 @@ div#xrecosystem{
- 
+ 
chat with community
irc.isvery.ninja port 443 via ObsidianIRC @@ -347,7 +347,7 @@ div#xrecosystem{
diff --git a/src/page/dir.lua b/src/page/dir.lua
index 132d2bd..d777100 100644
--- a/src/page/dir.lua
+++ b/src/page/dir.lua
@@ -6,17 +6,17 @@ return {
middleware = function(req,res,next)
local rootpath = "/" .. app.opts.plugin_diskscan_dirname
- local urlpath = GetPath()
- res.items = {}
- res.template = res.template or 'page/dir.html'
+ local urlpath = req.url
+ local isroot = urlpath == "/" or urlpath:match("^"..rootpath.."[/]?$")
+ res.items = {}
+ res.template = res.template or 'page/dir.html'
local isdir = urlpath:sub(-1) == "/"
local nslashes = util.countChar('/',urlpath)
local match = function(a,b) return util.stripPath(a) == util.stripPath(b) end
local urlhash = urlpath .. util.dump( req.param )
- if urlpath == "/"
- or urlpath:match("^"..rootpath)
- and not urlpath:gsub(".*/",""):match("%.")
+ if (isroot or urlpath:match("^"..rootpath))
+ and not urlpath:gsub(".*/",""):match("%.") -- no regular file with extension
and not req.param.url then
local redirect = false
@@ -26,10 +26,10 @@ return {
foreach( app.cache.items, function(k,v)
if req.authenticated or app.plugin.moderation.isAllowed(v) then
if v.parent then
- trace( "path = " .. util.stripPath(v.path) .. " " ..
- "parent = " .. util.stripPath(v.parent.path) .. " " ..
- "matchpath = " .. util.stripPath(matchpath)
- )
+-- trace( "path = " .. util.stripPath(v.path) .. " " ..
+-- "parent = " .. util.stripPath(v.parent.path) .. " " ..
+-- "matchpath = " .. util.stripPath(matchpath)
+-- )
if match(v.path, matchpath) then -- show parent folder if any
local parent = app.cache.items[ v.parent.id ]
if v.portal then
@@ -45,7 +45,6 @@ return {
-- add items from dir
if match(v.parent.path, matchpath) then
if v.dir or v.view3D then
- trace("-- dir item: " .. v.path )
local parent = app.cache.items[ v.parent.id ]
res.items[ v.id ] = v
res.parent = parent
@@ -57,32 +56,35 @@ return {
local data = util.merge({
url = req.param.url, -- query hint to render janus.url in iframe (index.html)
- html_items='',
items = {},
parent=res.parent
},{ opts = app.opts })
local i = 0
foreach( res.items, function(k,v)
- -- position items for janusxr JML (dir.html)
+ -- add extra metadata for janusxr JML (janusxr.html and dir.html)
table.insert(data.items, util.merge({x = i*2, i = i},v) )
i=i+1
if v.view3D then
- data.item = v
- data.title = data.item.title
- data.parent = v.parent
- local port = ':' .. GetPort()
- if port == 80 then port = '' end
- data.url = GetScheme() .. '://' .. GetHost() .. port .. v.url
- if v.janusxr and v.janusxr.jml then
- -- what to do here? no generated portals?
- data.janusxr = app.tpl( util.readfile(v.path), data )
+ local isMarkupExperience = function(v)
+ return v.janusxr and (v.janusxr.jml or v.janusxr.aframe)
+ end
+ -- prioritize markup experience above binary 3D files as experience containers
+ if not data.item or (isMarkupExperience(v) and not isMarkupExperience(data.item)) then
+ data.item = v
+ data.title = data.item.title
+ data.parent = v.parent
+ data.url = app.opts.baseurl .. util.stripPath(v.url) -- because we are running in iframe
+ if v.janusxr and (v.janusxr.jml or v.janusxr.aframe) then
+ -- what to do here? no generated portals?
+ data.janusxr = app.tpl( util.readfile(v.path), data )
+ end
end
end
end)
if data.item then
res.template = 'page/index.html'
end
- app.pub("dir", nil, {res=res,data=data, urlpath=urlpath, isdir=isdir})
+ app.pub("dir", nil, {res=res,data=data, urlpath=urlpath, isroot=isroot, isdir=isdir})
if not redirect then
app.cache.url[ urlhash ] = util.templateFile( res.template, data)
end
diff --git a/src/page/footer.html b/src/page/footer.html
index ad6f19b..b3ad9c1 100644
--- a/src/page/footer.html
+++ b/src/page/footer.html
@@ -17,13 +17,20 @@
NLNET
+
chat with community irc.isvery.ninja port 443 via ObsidianIRC @@ -347,7 +347,7 @@ div#xrecosystem{
JanusXR: The deep spatial web (within the web)
diff --git a/src/page/admin/index.lua b/src/page/admin/index.lua index 93f6a83..ddc2bd1 100644 --- a/src/page/admin/index.lua +++ b/src/page/admin/index.lua @@ -66,7 +66,7 @@ end) function pluginUI(seen,data) return function(name,plugin) if plugin.hide or seen[ plugin.name ] then return end -- already processed - table.insert( data.tabs, plugin.name ) -- insert tabname + table.insert( data.tabs, plugin.tab or plugin.name ) -- insert tabname seen[ plugin.name ] = true local plugindata = {plugin=plugin} plugindata.opts = "" @@ -88,6 +88,7 @@ function saveData() end end) if saveconfig then + app.set('app.opts', app.opts) data.notification = 'updated
'
else
data.notification = 'no changes detected
'
diff --git a/src/page/dir.html b/src/page/dir.html
index 40238a3..029b863 100644
--- a/src/page/dir.html
+++ b/src/page/dir.html
@@ -23,41 +23,37 @@ end}
local item = items[i]
local icon = 'list-tree'
local thumbnail = ''
- if #item.thumbnail > 0 then thumbnail = 'style="background-image: url(' .. EscapeFragment(item.thumbnail) .. ');"' end
+ if #item.thumbnail > 0 then thumbnail = 'style="background-image: url(' .. EscapeFragment( util.stripPath(item.thumbnail) ) .. ');"' end
if item.view3D or item.portal3D == false then icon = 'play' end
print([[
]])
end
end}
- {if parent.parent == nil then
- for i=1,5 do
- local urls = app.opts[ 'plugin_federation_url_' .. i]
- if #urls > 0 then
- local title = urls:gsub(' .*','')
- local fediurl = '/?url=' .. EscapeFragment(title)
- local thumburl = urls:gsub('.* ','')
- local icon = 'list-tree'
- local thumbnail = ''
- if #thumburl > 0 then thumbnail = 'style="background-image: url(' .. EscapeFragment(thumburl) .. ');"' end
- print([[
-
- ]])
- end
+ {if itemsremote then
+ for i=1,#itemsremote do
+ local item = itemsremote[i]
+ local icon = 'link'
+ local thumbnail = ''
+ if #item.thumbnail > 0 then thumbnail = 'style="background-image: url(' .. EscapeFragment( util.stripPath(item.thumbnail) ) .. ');"' end
+ if item.view3D or item.portal3D == false then icon = 'play' end
+ print([[
+
+ ]])
end
end}
- Content overview
- About
+ View from XR Device
+ Content overview
+ About
-
+ + Sourcecode
+ {if footerlinks then + for i,v in pairs(footerlinks) do + print([[ + ]] .. v.title .. [[
+ ]]) + end + end}