1
0
mirror of https://github.com/lxsang/antd-web-apps synced 2024-11-20 02:18:20 +01:00

fix stuff

This commit is contained in:
lxsang 2018-10-09 12:14:33 +02:00
parent c3f58c08ed
commit 0ad5eaa138
8 changed files with 23 additions and 14 deletions

View File

@ -1,5 +1,5 @@
BUILDDIR = ./build BUILDDIR = ./build
projs = grs info blog apps projs = grs info blog apps os
copyfiles = index.ls mimes.json copyfiles = index.ls mimes.json
main: clean copy main: clean copy
for f in $(projs); do make -C "$${f}" ; done for f in $(projs); do make -C "$${f}" ; done

View File

@ -29,6 +29,8 @@ class WebVNC extends window.classes.BaseObject
r('demo', 'demo') r('demo', 'demo')
@client.oncopy = (text) -> @client.oncopy = (text) ->
cosole.log text cosole.log text
@client.onerror = (m) ->
alert(m)
@client.init() @client.init()
.then () -> .then () ->
$("#connect").click (e) -> $("#connect").click (e) ->

View File

@ -199,6 +199,9 @@
this.client.oncopy = function(text) { this.client.oncopy = function(text) {
return cosole.log(text); return cosole.log(text);
}; };
this.client.onerror = function(m) {
return alert(m);
};
return this.client.init().then(function() { return this.client.init().then(function() {
$("#connect").click(function(e) { $("#connect").click(function(e) {
return me.client.connect("/opt/www/vnc.conf", { return me.client.connect("/opt/www/vnc.conf", {

View File

@ -5,7 +5,7 @@
-- some global variables -- some global variables
DIR_SEP = "/" DIR_SEP = "/"
WWW_ROOT = "/opt/www/htdocs/apps" WWW_ROOT = "/opt/www/htdocs/apps"
HTTP_ROOT = "https://10.1.10.84:9195/apps" HTTP_ROOT = "https://apps.lxsang.me"
-- class path: path.to.class -- class path: path.to.class
BASE_FRW = "" BASE_FRW = ""
-- class path: path.to.class -- class path: path.to.class
@ -21,7 +21,7 @@ POLICY.mimes["application/wasm"] = true
-- registry object store global variables -- registry object store global variables
local REGISTRY = {} local REGISTRY = {}
-- set logging level -- set logging level
REGISTRY.logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = true}} REGISTRY.logger = Logger:new{ levels = {INFO = false, ERROR = true, DEBUG = false}}
REGISTRY.db = DBHelper:new{db="iosapps"} REGISTRY.db = DBHelper:new{db="iosapps"}
REGISTRY.layout = 'default' REGISTRY.layout = 'default'
REGISTRY.fileaccess = true REGISTRY.fileaccess = true
@ -33,7 +33,7 @@ router:setPath(CONTROLLER_ROOT)
--router:route('edit', 'post/edit', "ALL" ) --router:route('edit', 'post/edit', "ALL" )
-- example of depedencies to the current main route -- example of depedencies to the current main route
-- each layout may have different dependencies --[[ -- each layout may have different dependencies
local default_routes_dependencies = { local default_routes_dependencies = {
edit = { edit = {
url = "post/edit", url = "post/edit",
@ -48,8 +48,8 @@ local default_routes_dependencies = {
-- url = "cat/index", -- url = "cat/index",
-- visibility = "ALL" -- visibility = "ALL"
--} --}
} }
router:route('default', default_routes_dependencies ) router:route('default', default_routes_dependencies )]]
router:delegate() router:delegate()
if REGISTRY.db then REGISTRY.db:close() end if REGISTRY.db then REGISTRY.db:close() end

View File

@ -5,7 +5,7 @@
-- some global variables -- some global variables
DIR_SEP = "/" DIR_SEP = "/"
WWW_ROOT = "/opt/www/htdocs/blog" WWW_ROOT = "/opt/www/htdocs/blog"
HTTP_ROOT = "https://blog.localhost:9195" HTTP_ROOT = "https://blog.lxsang.me"
-- class path: path.to.class -- class path: path.to.class
BASE_FRW = "" BASE_FRW = ""
-- class path: path.to.class -- class path: path.to.class
@ -25,7 +25,7 @@ end
-- registry object store global variables -- registry object store global variables
local REGISTRY = {} local REGISTRY = {}
-- set logging level -- set logging level
REGISTRY.logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = true}} REGISTRY.logger = Logger:new{ levels = {INFO = false, ERROR = true, DEBUG = false}}
REGISTRY.db = DBHelper:new{db="mrsang"} REGISTRY.db = DBHelper:new{db="mrsang"}
REGISTRY.layout = 'default' REGISTRY.layout = 'default'
REGISTRY.fileaccess = true REGISTRY.fileaccess = true
@ -52,8 +52,8 @@ router:setPath(CONTROLLER_ROOT)
} }
} }
} }
} ]] }
router:route('default', default_routes_dependencies ) router:route('default', default_routes_dependencies )]]
router:remap("index", "post") router:remap("index", "post")
router:remap("r", "post") router:remap("r", "post")
router:delegate() router:delegate()

View File

@ -5,7 +5,7 @@
-- some global variables -- some global variables
DIR_SEP = "/" DIR_SEP = "/"
WWW_ROOT = "/opt/www/htdocs/info" WWW_ROOT = "/opt/www/htdocs/info"
HTTP_ROOT = "https://info.localhost:9195/" HTTP_ROOT = "https://info.lxsang.me"
-- class path: path.to.class -- class path: path.to.class
BASE_FRW = "" BASE_FRW = ""
-- class path: path.to.class -- class path: path.to.class
@ -21,7 +21,7 @@ require(BASE_FRW.."silk.api")
-- registry object store global variables -- registry object store global variables
local REGISTRY = {} local REGISTRY = {}
-- set logging level -- set logging level
REGISTRY.logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = true}} REGISTRY.logger = Logger:new{ levels = {INFO = false, ERROR = true, DEBUG = false}}
REGISTRY.db = DBHelper:new{db="mrsang"} REGISTRY.db = DBHelper:new{db="mrsang"}
REGISTRY.layout = 'default' REGISTRY.layout = 'default'
REGISTRY.fileaccess = true REGISTRY.fileaccess = true

View File

@ -15,5 +15,9 @@
"apj": { "apj": {
"mime": "text/antos-project", "mime": "text/antos-project",
"binary": false "binary": false
},
"wasm": {
"mime": "application/wasm",
"binary": true
} }
} }

View File

@ -5,7 +5,7 @@
-- some global variables -- some global variables
DIR_SEP = "/" DIR_SEP = "/"
WWW_ROOT = "/opt/www/htdocs/os" WWW_ROOT = "/opt/www/htdocs/os"
HTTP_ROOT = "http://os.localhost:9192" HTTP_ROOT = "https://os.lxsang.me"
-- class path: path.to.class -- class path: path.to.class
BASE_FRW = "" BASE_FRW = ""
-- class path: path.to.class -- class path: path.to.class
@ -26,7 +26,7 @@ require("common")
-- registry object store global variables -- registry object store global variables
local REGISTRY = {} local REGISTRY = {}
-- set logging level -- set logging level
REGISTRY.logger = Logger:new{ levels = {INFO = true, ERROR = true, DEBUG = true}} REGISTRY.logger = Logger:new{ levels = {INFO = false, ERROR = true, DEBUG = false}}
--REGISTRY.db = DBHelper:new{db="sysdb"} --REGISTRY.db = DBHelper:new{db="sysdb"}
REGISTRY.layout = 'default' REGISTRY.layout = 'default'
REGISTRY.fileaccess = true REGISTRY.fileaccess = true