diff --git a/src/.lua/config.lua b/src/.lua/config.lua index 2749b1c..0c8f328 100644 --- a/src/.lua/config.lua +++ b/src/.lua/config.lua @@ -5,7 +5,7 @@ return function(app) local config = { -- default name = "XRForge", baseurl="/", - host="localhost", + hostname="", admin_title = "admin panel", admin_subtitle = "Manage your XR experiences here", admin_user = "admin", diff --git a/src/.lua/util.lua b/src/.lua/util.lua index 2ef7e9e..2fde540 100644 --- a/src/.lua/util.lua +++ b/src/.lua/util.lua @@ -89,9 +89,14 @@ util.getURL = function(url,opts) return 'http://localhost:' .. app.port .. url else port = ':' .. GetPort() - if port == ':80' then port = '' end + if port == ':80' then port = '' end if arg[1] == 'generate' and port == ':8080' then port = '' end - return GetScheme() .. '://' .. (app.opts.host or GetHost()) .. port .. (url or GetPath()) + -- if hostname is not localhost or ip then we can assume live server (reverse proxy e.g.) + if port and not GetHost():match('localhost') and not GetHost():match('^[0-9]') then + port = '' + end + local host = #app.opts.hostname > 0 and app.opts.hostname or GetHost() + return GetScheme() .. '://' .. host .. port .. (url or GetPath()) end end diff --git a/src/img/xrforge_term.svg b/src/img/xrforge_term.svg deleted file mode 100644 index 91f5e4d..0000000 --- a/src/img/xrforge_term.svg +++ /dev/null @@ -1,322 +0,0 @@ - - - - - - - - - - - $ $ H $ Hi $ Hi! $ Hi! $ Hi! $ J $ Ju $ Jus $ Just $ Just $ Just w $ Just wa $ Just wan $ Just want $ Just wante $ Just wanted $ Just wanted $ Just wanted y $ Just wanted yo $ Just wanted you $ Just wanted you $ Just wanted you t $ Just wanted you to $ Just wanted you to $ Just wanted you to k $ Just wanted you to kn $ Just wanted you to kno $ Just wanted you to know $ Just wanted you to know. $ Just wanted you to know.. $ Just wanted you to know.. $ X $ XR $ XRF $ XRFo $ XRFor $ XRForg $ XRForge $ XRForge $ XRForge i $ XRForge is $ XRForge is $ XRForge is r $ XRForge is ra $ XRForge is rad $ XRForge is radi $ XRForge is radic $ XRForge is radica $ XRForge is radical $ XRForge is radicall $ XRForge is radically $ XRForge is radically $ XRForge is radically o $ XRForge is radically op $ XRForge is radically ope $ XRForge is radically open $ XRForge is radically opens $ XRForge is radically openso $ XRForge is radically opensou $ XRForge is radically opensour $ XRForge is radically opensourc $ XRForge is radically opensource $ XRForge is radically opensource. $ XRForge is radically opensource.. $ XRForge is radically opensource.. $ XRForge is radically opensource.. $ Y $ Yo $ You $ You $ You c $ You ca $ You can $ You can $ You can t $ You can $ You can r $ You can ru $ You can run $ You can run $ You can run i $ You can run it $ You can run it $ You can run it a $ You can run it as $ You can run it as $ You can run it as a $ You can run it as a $ You can run it as a s $ You can run it as a si $ You can run it as a sin $ You can run it as a sing $ You can run it as a singl $ You can run it as a single $ You can run it as a single $ You can run it as a single c $ You can run it as a single co $ You can run it as a single con $ You can run it as a single cont $ You can run it as a single conta $ You can run it as a single contai $ You can run it as a single contain $ You can run it as a single containe $ You can run it as a single container $ You can run it as a single container. $ You can run it as a single container.. $ You can run it as a single container.. $ You can run it as a single container.. $ ( $ (o $ (or $ (or $ (or y $ (or yo $ (or you $ (or your $ (or your $ (or your o $ (or your or $ (or your org $ (or your orga $ (or your organ $ (or your organi $ (or your organis $ (or your organisa $ (or your organisat $ (or your organisati $ (or your organisatio $ (or your organisation $ (or your organisation) $ (or your organisation) $ (or your organisation) $ l $ le $ let $ lets $ lets $ lets g $ lets go $ lets go. $ lets go.. $ lets go.. $ lets go.. $ d $ do $ doc $ dock $ docke $ docker $ docker $ docker r $ docker ru $ docker run $ docker run $ docker run - $ docker run -p $ docker run -p $ docker run -p 8 $ docker run -p 80 $ docker run -p 808 $ docker run -p 8080 $ docker run -p 8080: $ docker run -p 8080:3 $ docker run -p 8080:31 $ docker run -p 8080:312 $ docker run -p 8080:3124 $ docker run -p 8080:312 $ docker run -p 8080:31 $ docker run -p 8080:3 $ docker run -p 8080:32 $ docker run -p 8080:321 $ docker run -p 8080:3214 $ docker run -p 8080:3214 $ docker run -p 8080:3214 - $ docker run -p 8080:3214 -p $ docker run -p 8080:3214 -p $ docker run -p 8080:3214 -p 5 $ docker run -p 8080:3214 -p 55 $ docker run -p 8080:3214 -p 556 $ docker run -p 8080:3214 -p 5566 $ docker run -p 8080:3214 -p 5566: $ docker run -p 8080:3214 -p 5566:5 $ docker run -p 8080:3214 -p 5566:55 $ docker run -p 8080:3214 -p 5566:556 $ docker run -p 8080:3214 -p 5566:5566 $ docker run -p 8080:3214 -p 5566:5566: $ docker run -p 8080:3214 -p 5566:5566: $ docker run -p 8080:3214 -p 5566:5566 $ docker run -p 8080:3214 -p 5566:5566 - $ docker run -p 8080:3214 -p 5566:5566 -p $ docker run -p 8080:3214 -p 5566:5566 -p 5 55 557 5577 5577: 5577:5 5577:55 5577:557 5577:5577 5577:5577 5577:5577 c 5577:5577 co 5577:5577 cod 5577:5577 code 5577:5577 codeb 5577:5577 codebe 5577:5577 codeber 5577:5577 codeberg 5577:5577 codeberg. 5577:5577 codeberg.o 5577:5577 codeberg.or 5577:5577 codeberg.org 5577:5577 codeberg.org/ 5577:5577 codeberg.org/c 5577:5577 codeberg.org/co 5577:5577 codeberg.org/cod 5577:5577 codeberg.org/code 5577:5577 codeberg.org/coder 5577:5577 codeberg.org/codero 5577:5577 codeberg.org/coderof 5577:5577 codeberg.org/coderofs 5577:5577 codeberg.org/coderofsa 5577:5577 codeberg.org/coderofsal 5577:5577 codeberg.org/coderofsalv 5577:5577 codeberg.org/coderofsalva 5577:5577 codeberg.org/coderofsalvat 5577:5577 codeberg.org/coderofsalvati 5577:5577 codeberg.org/coderofsalvatio 5577:5577 codeberg.org/coderofsalvation 5577:5577 codeberg.org/coderofsalvation/ 5577:5577 codeberg.org/coderofsalvation/x 5577:5577 codeberg.org/coderofsalvation/xr 5577:5577 codeberg.org/coderofsalvation/xrfo or org orge orge: orge:l orge:la orge:lat orge:late orge:lates orge:latest orge:latest. .. ... ... profit! \o/exit - diff --git a/src/page/about.html b/src/page/about.html index 1e92259..21ab790 100644 --- a/src/page/about.html +++ b/src/page/about.html @@ -214,9 +214,6 @@ div#xrecosystem{ Hello post-scarcity technology.

-
- -
@@ -242,12 +239,12 @@ div#xrecosystem{ users can host content themselves ✅ HTTP/DAT/IPFS Open Protocols - ❌ we own your data + ❌ they own your data User operated content and viewers ✅ - ❌ we control both + ❌ they control both portals to remote content diff --git a/src/page/dir.html b/src/page/dir.html index 2524b9f..81ce6fa 100644 --- a/src/page/dir.html +++ b/src/page/dir.html @@ -21,7 +21,7 @@ end} {if items then function getURL(url) - if app.arg[1] == 'generate' and url:match("://") then + if app.arg[1] == 'generate' or url:match("://") then url = 'janusweb/index.html#janus.url=' .. EscapeFragment( url ) .. '&janus.referrer=' .. util.getURL(urlpath ) url = util.baseURLify(url)