diff --git a/resources/dev-fs/apps/AboutMe/AboutMe.js b/res/dev-fs/apps/AboutMe/AboutMe.js similarity index 100% rename from resources/dev-fs/apps/AboutMe/AboutMe.js rename to res/dev-fs/apps/AboutMe/AboutMe.js diff --git a/resources/sys/personal-properties/personal-properies.css b/res/dev-fs/apps/AboutMe/about-me.css similarity index 100% rename from resources/sys/personal-properties/personal-properies.css rename to res/dev-fs/apps/AboutMe/about-me.css diff --git a/resources/dev-fs/apps/BlogViewer/BlogViewer.js b/res/dev-fs/apps/BlogViewer/BlogViewer.js similarity index 100% rename from resources/dev-fs/apps/BlogViewer/BlogViewer.js rename to res/dev-fs/apps/BlogViewer/BlogViewer.js diff --git a/resources/dev-fs/apps/BlogViewer/blog-viewer.css b/res/dev-fs/apps/BlogViewer/blog-viewer.css similarity index 100% rename from resources/dev-fs/apps/BlogViewer/blog-viewer.css rename to res/dev-fs/apps/BlogViewer/blog-viewer.css diff --git a/resources/dev-fs/apps/BlogWriter/BlogWriter.js b/res/dev-fs/apps/BlogWriter/BlogWriter.js similarity index 100% rename from resources/dev-fs/apps/BlogWriter/BlogWriter.js rename to res/dev-fs/apps/BlogWriter/BlogWriter.js diff --git a/resources/dev-fs/apps/finder/finder.css b/res/dev-fs/apps/Finder/finder.css similarity index 100% rename from resources/dev-fs/apps/finder/finder.css rename to res/dev-fs/apps/Finder/finder.css diff --git a/resources/dev-fs/apps/finder/finder.js b/res/dev-fs/apps/Finder/finder.js similarity index 100% rename from resources/dev-fs/apps/finder/finder.js rename to res/dev-fs/apps/Finder/finder.js diff --git a/resources/dev-fs/apps/FinderAdmin/FinderAdmin.js b/res/dev-fs/apps/FinderAdmin/FinderAdmin.js similarity index 100% rename from resources/dev-fs/apps/FinderAdmin/FinderAdmin.js rename to res/dev-fs/apps/FinderAdmin/FinderAdmin.js diff --git a/resources/dev-fs/apps/FinderAdmin/finder-admin.css b/res/dev-fs/apps/FinderAdmin/finder-admin.css similarity index 100% rename from resources/dev-fs/apps/FinderAdmin/finder-admin.css rename to res/dev-fs/apps/FinderAdmin/finder-admin.css diff --git a/resources/sys/img-viewer/img-viewer.css b/res/dev-fs/apps/ImgViewer/img-viewer.css similarity index 100% rename from resources/sys/img-viewer/img-viewer.css rename to res/dev-fs/apps/ImgViewer/img-viewer.css diff --git a/resources/sys/img-viewer/img-viewer.js b/res/dev-fs/apps/ImgViewer/img-viewer.js similarity index 100% rename from resources/sys/img-viewer/img-viewer.js rename to res/dev-fs/apps/ImgViewer/img-viewer.js diff --git a/resources/sys/img-viewer/test-image.jpg b/res/dev-fs/apps/ImgViewer/test-image.jpg similarity index 100% rename from resources/sys/img-viewer/test-image.jpg rename to res/dev-fs/apps/ImgViewer/test-image.jpg diff --git a/resources/EspySansRegular.ttf b/res/dev-fs/fonts/EspySansRegular.ttf similarity index 100% rename from resources/EspySansRegular.ttf rename to res/dev-fs/fonts/EspySansRegular.ttf diff --git a/resources/GnuUnifontFull-Pm9P.ttf b/res/dev-fs/fonts/GnuUnifontFull-Pm9P.ttf similarity index 100% rename from resources/GnuUnifontFull-Pm9P.ttf rename to res/dev-fs/fonts/GnuUnifontFull-Pm9P.ttf diff --git a/resources/JoganSoft-rgwKy.otf b/res/dev-fs/fonts/JoganSoft-rgwKy.otf similarity index 100% rename from resources/JoganSoft-rgwKy.otf rename to res/dev-fs/fonts/JoganSoft-rgwKy.otf diff --git a/resources/Pixel Sans Serif Condensed.ttf b/res/dev-fs/fonts/Pixel Sans Serif Condensed.ttf similarity index 100% rename from resources/Pixel Sans Serif Condensed.ttf rename to res/dev-fs/fonts/Pixel Sans Serif Condensed.ttf diff --git a/resources/Pixel Sans Serif.ttf b/res/dev-fs/fonts/Pixel Sans Serif.ttf similarity index 100% rename from resources/Pixel Sans Serif.ttf rename to res/dev-fs/fonts/Pixel Sans Serif.ttf diff --git a/resources/SummerPixel22Regular.ttf b/res/dev-fs/fonts/SummerPixel22Regular.ttf similarity index 100% rename from resources/SummerPixel22Regular.ttf rename to res/dev-fs/fonts/SummerPixel22Regular.ttf diff --git a/resources/virtue.ttf b/res/dev-fs/fonts/virtue.ttf similarity index 100% rename from resources/virtue.ttf rename to res/dev-fs/fonts/virtue.ttf diff --git a/resources/sys/libs/fs.js b/res/dev-fs/libs/fs.js similarity index 100% rename from resources/sys/libs/fs.js rename to res/dev-fs/libs/fs.js diff --git a/resources/base.css b/res/dev-fs/wde/base.css similarity index 92% rename from resources/base.css rename to res/dev-fs/wde/base.css index 405934a..f2e3a20 100644 --- a/resources/base.css +++ b/res/dev-fs/wde/base.css @@ -1,12 +1,12 @@ @font-face{ font-family: "Virtue"; - src:url("./virtue.ttf"); + src:url("/res/dev-fs/fonts/virtue.ttf"); } -@font-face{ +/* @font-face{ font-family: "Virtue"; - src:url("./virtue.ttf") -} + src:url("/res/dev-fs/fonts/virtue.ttf") +} */ /* @media screen and (max-device-width: 2048px) and (max-device-height: 2048px) { html { diff --git a/resources/sys/wde/basic-widgets.css b/res/dev-fs/wde/basic-widgets.css similarity index 100% rename from resources/sys/wde/basic-widgets.css rename to res/dev-fs/wde/basic-widgets.css diff --git a/resources/decorat.js b/res/dev-fs/wde/decorat.js similarity index 100% rename from resources/decorat.js rename to res/dev-fs/wde/decorat.js diff --git a/resources/sys/wde/file-view.css b/res/dev-fs/wde/file-view.css similarity index 100% rename from resources/sys/wde/file-view.css rename to res/dev-fs/wde/file-view.css diff --git a/resources/sys/wde/file-view.js b/res/dev-fs/wde/file-view.js similarity index 100% rename from resources/sys/wde/file-view.js rename to res/dev-fs/wde/file-view.js diff --git a/resources/sys/wde/icons/about-me.png b/res/dev-fs/wde/icons/about-me.png similarity index 100% rename from resources/sys/wde/icons/about-me.png rename to res/dev-fs/wde/icons/about-me.png diff --git a/resources/sys/wde/icons/desktop.png b/res/dev-fs/wde/icons/desktop.png similarity index 100% rename from resources/sys/wde/icons/desktop.png rename to res/dev-fs/wde/icons/desktop.png diff --git a/resources/sys/wde/icons/folder.png b/res/dev-fs/wde/icons/folder.png similarity index 100% rename from resources/sys/wde/icons/folder.png rename to res/dev-fs/wde/icons/folder.png diff --git a/resources/sys/wde/icons/ohno.png b/res/dev-fs/wde/icons/ohno.png similarity index 100% rename from resources/sys/wde/icons/ohno.png rename to res/dev-fs/wde/icons/ohno.png diff --git a/resources/sys/wde/icons/trash.png b/res/dev-fs/wde/icons/trash.png similarity index 100% rename from resources/sys/wde/icons/trash.png rename to res/dev-fs/wde/icons/trash.png diff --git a/resources/mobile-wdeUI.css b/res/dev-fs/wde/mobile-wdeUI.css similarity index 100% rename from resources/mobile-wdeUI.css rename to res/dev-fs/wde/mobile-wdeUI.css diff --git a/resources/sys/wde/simple-scrollbar.css b/res/dev-fs/wde/simple-scrollbar.css similarity index 100% rename from resources/sys/wde/simple-scrollbar.css rename to res/dev-fs/wde/simple-scrollbar.css diff --git a/resources/sys/wde/simple-scrollbar.js b/res/dev-fs/wde/simple-scrollbar.js similarity index 100% rename from resources/sys/wde/simple-scrollbar.js rename to res/dev-fs/wde/simple-scrollbar.js diff --git a/resources/sys/wde/wde-scrollbar.css b/res/dev-fs/wde/wde-scrollbar.css similarity index 100% rename from resources/sys/wde/wde-scrollbar.css rename to res/dev-fs/wde/wde-scrollbar.css diff --git a/resources/sys/wde/wde-scrollbar.js b/res/dev-fs/wde/wde-scrollbar.js similarity index 100% rename from resources/sys/wde/wde-scrollbar.js rename to res/dev-fs/wde/wde-scrollbar.js diff --git a/resources/wde.js b/res/dev-fs/wde/wde.js similarity index 96% rename from resources/wde.js rename to res/dev-fs/wde/wde.js index 14bfd1c..5c2bea2 100644 --- a/resources/wde.js +++ b/res/dev-fs/wde/wde.js @@ -34,14 +34,14 @@ class WebDesktopEnvironment{ } async loadWDE(){ - // await WebDesktopEnvironment.load2('/Applications/Finder.app', [ "desktop", document.querySelector('#desktop-layer')]) + // await WebDesktopEnvironment.load2('/Applications/Finder.app', [ "desktop", document.querySelector('#desktop-layer')]) //FIXME // await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user/.desktop", "-desktop", document.querySelector('#desktop-layer')]) await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user/Blogs",]) - await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user",]) - await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home",]) + // await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home/user",]) + // await WebDesktopEnvironment.Open('/Applications/Finder.app', ["/home",]) // WebDesktopEnvironment.Open('/Applications/AboutMe.app', []) // WebDesktopEnvironment.Open('/Applications/FinderAdmin.app', ["/home/user",]) - await WebDesktopEnvironment.Open('/Applications/BlogViewer.app', ["/home/user/Blogs/blog1.blog",]) + // await WebDesktopEnvironment.Open('/Applications/BlogViewer.app', ["/home/user/Blogs/blog1.blog",]) } /** @@ -132,7 +132,6 @@ class WebDesktopEnvironment{ newWindow.style.height = height.toString() + "px" document.body.querySelector('#windows-layer').appendChild(newWindow) - // WindowsCompositor.bringWindowToFront(newWindow) return newWindow } } diff --git a/resources/wdeUI.css b/res/dev-fs/wde/wdeUI.css similarity index 100% rename from resources/wdeUI.css rename to res/dev-fs/wde/wdeUI.css diff --git a/resources/webfs.js b/res/dev-fs/wde/webfs.js similarity index 100% rename from resources/webfs.js rename to res/dev-fs/wde/webfs.js diff --git a/routes/private.go b/routes/private.go index c0ed386..1641513 100644 --- a/routes/private.go +++ b/routes/private.go @@ -21,9 +21,9 @@ import ( func PrivateRoutes(webfs *webfilesystem.WebFileSystem, webde *wde.WDE, appsStorage *apps.ApplicationsStorage) { router := gin.New() router.Use(location.Default()) - router.Use(favicon.New("./resources/sys/wde/icons/ohno.png")) // set favicon middleware + router.Use(favicon.New("./res/dev-fs/wde/icons/ohno.png")) router.LoadHTMLGlob("templates/**/*") - router.Static("/res", "resources") + router.Static("/res", "res") // Set a lower memory limit for multipart forms (default is 32 MiB) router.MaxMultipartMemory = 8 << 20 // 8 MiB diff --git a/routes/public.go b/routes/public.go index 262a93b..451ceda 100644 --- a/routes/public.go +++ b/routes/public.go @@ -19,8 +19,8 @@ func PublicRoutes(webfs *webfilesystem.WebFileSystem, webde *wde.WDE, appsStorag router := gin.New() router.Use(location.Default()) router.LoadHTMLGlob("templates/**/*") - router.Use(favicon.New("./resources/sys/wde/icons/ohno.png")) // set favicon middleware - router.Static("/res", "resources") + router.Use(favicon.New("./res/dev-fs/wde/icons/ohno.png")) // set favicon middleware + router.Static("/res", "res") router.GET("/", func(ctx *gin.Context) { ctx.HTML(http.StatusOK, "index.tmpl", gin.H{}) diff --git a/templates/base/index.tmpl b/templates/base/index.tmpl index 8a57f25..b75e926 100644 --- a/templates/base/index.tmpl +++ b/templates/base/index.tmpl @@ -2,24 +2,25 @@ Greg Brzezinski - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - -