cyber-dream/personal-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: cyber-dream:559c22f6269b2a3035fa1d4d27dc6501ffb2b42b
Branches Tags
cyber-dream:new-back
..
compare: cyber-dream:68664c1bf3ca5b42637113920732e6af7fa4918c
Branches Tags
cyber-dream:new-back

No commits in common. "559c22f6269b2a3035fa1d4d27dc6501ffb2b42b" and "68664c1bf3ca5b42637113920732e6af7fa4918c" have entirely different histories.
559c22f626 ... 68664c1bf3

8 changed files with 35 additions and 74 deletions
Show Stats Expand all files Collapse all files

2
apps/finder/routes.go
View File

@ -21,11 +21,9 @@ func (f *FinderApplication) PublicRoutes(routes *gin.RouterGroup) {
ctx.HTML(http.StatusOK, "finder/app.tmpl", f.Render(appCtx)) ctx.HTML(http.StatusOK, "finder/app.tmpl", f.Render(appCtx))
}) })
//Obsolete
routes.GET("renderMobileDesktop", func(ctx *gin.Context) { routes.GET("renderMobileDesktop", func(ctx *gin.Context) {
ctx.HTML(http.StatusOK, "finder/mobile-desktop.tmpl", gin.H{}) ctx.HTML(http.StatusOK, "finder/mobile-desktop.tmpl", gin.H{})
}) })
routes.POST("renderDesktop", func(ctx *gin.Context) { routes.POST("renderDesktop", func(ctx *gin.Context) {
path := ctx.Query("path") path := ctx.Query("path")
if path == "" { if path == "" {

54
front/src/apps/finder/finder-window.js
View File

@ -98,9 +98,9 @@ export default class FinderWindow{
() => { this.ReRenderDir() }, () => { this.ReRenderDir() },
this.#wde) this.#wde)
newWindow.querySelector("#closeWindowButton").addEventListener('click', () => { // newWindow.querySelector("#closeWindowButton").addEventListener('click', () => {
this.#wde.Decorat.CloseWindow(newWindow) // this.#wde.Decorat.CloseWindow(newWindow)
}) // })
// newWindow.querySelector("#RootButton").addEventListener('click', () =>{ // newWindow.querySelector("#RootButton").addEventListener('click', () =>{
// this.RenderDir('/') // this.RenderDir('/')
@ -126,6 +126,7 @@ export default class FinderWindow{
* @returns * @returns
*/ */
async CreateMobileView(args, runContext){ async CreateMobileView(args, runContext){
const params = new URLSearchParams({isMobile: false}) //FIXME const params = new URLSearchParams({isMobile: false}) //FIXME
const response = await fetch(`/app/${this.#appId}/render?` + params, const response = await fetch(`/app/${this.#appId}/render?` + params,
{ {
@ -134,41 +135,14 @@ export default class FinderWindow{
}) })
if (response.status != 200){ if (response.status != 200){
const error = await response.json() const error = await response.json()
this.#finder.WDE().Alert(error.message) this.#wde.Alert(error.message)
return return
} }
const html = await response.text() const html = await response.text()
// console.log(html) console.log(this.#wde)
// console.log(this.#finder.WDE()) let newView = this.#wde.Decorat.CreateNewView(this.#appId)
let newView = this.#finder.WDE().Decorat.CreateNewView(this.#appId)
newView.innerHTML = html newView.innerHTML = html
this.fileView = new this.#wde.FileView(
newView.querySelector(".FileTileView"),
(event) => { this.Click(event) },
(event) => { this.RightClick(event) },
(event, draggedElem) => { this.DropEvent(event, draggedElem)},
() => { this.ReRenderDir() },
this.#wde)
// newView.querySelector("#closeWindowButton").addEventListener('click', () => {
// this.#wde.Decorat.CloseWindow(newView)
// })
// newView.querySelector("#RootButton").addEventListener('click', () =>{
// this.RenderDir('/')
// })
// newView.querySelector("#HomeButton").addEventListener('click', () =>{
// this.RenderDir('/home/user')
// })
// let scrollBar = new this.#wde.ScrollBar(newView.querySelector(".scrollbar-place"), newView.querySelector(".FileTileView"))
this.windowElem = newView
this.RenderDir(args[0])
} }
/** /**
* @param {string} path * @param {string} path
*/ */
@ -330,30 +304,30 @@ export default class FinderWindow{
let res = false let res = false
switch (event.target.children[0].getAttribute("action")) { switch (event.target.children[0].getAttribute("action")) {
case "createPathLink": case "createPathLink":
res = await this.#finder.WDE().WebFS().CreatePathLink(`${this.curPath}/${fileName}`, `${this.curPath}/Link to ${fileName}` ) res = await WebFS.CreatePathLink(`${this.curPath}/${fileName}`, `${this.curPath}/Link to ${fileName}` )
if (res){ if (res){
this.ReRenderDir() this.ReRenderDir()
} }
break break
case "createDir": case "createDir":
res = await this.#finder.WDE().WebFS().CreateDirectory(`${this.curPath}`) res = await WebFS.CreateDirectory(`${this.curPath}`)
// console.log(res) console.log(res)
if (res){ if (res){
this.ReRenderDir() this.ReRenderDir()
} }
break break
case "deleteFile": case "deleteFile":
res = await this.#finder.WDE().WebFS().DeleteFile(`${this.curPath}/${fileName}`) res = await WebFS.DeleteFile(`${this.curPath}/${fileName}`)
// console.log(res) console.log(res)
if (res){ if (res){
this.ReRenderDir() this.ReRenderDir()
} }
break break
case "getInfo": case "getInfo":
this.#finder.RenderProperites(path) Finder.RenderProperites(path)
break break
case "openAsDir": case "openAsDir":
this.#finder.WDE().Open(`/Applications/${this.#appId}.app`,[`${this.curPath}/${fileName}`]) this.#wde.Open(`/Applications/${this.#appId}.app`,[`${this.curPath}/${fileName}`])
break break
default: default:
break; break;

1
front/src/apps/finder/finder.js
View File

@ -41,6 +41,7 @@ export default class Finder extends WDEApplication{
* @returns {boolean} * @returns {boolean}
*/ */
async RenderProperites(path){ async RenderProperites(path){
// return
if (path == null || path ==""){ if (path == null || path ==""){
return return
} }

16
front/src/wde/wde.js
View File

@ -1,5 +1,5 @@
import WDEApplication from "./application.js" import WDEApplication from "./application.js"
import WebFS from "../web-fs/web-fs.js"
export default class AbstractWebDesktopEnvironment{ export default class AbstractWebDesktopEnvironment{
/** @type {string} */ /** @type {string} */
#apiAddress #apiAddress
@ -7,19 +7,12 @@ export default class AbstractWebDesktopEnvironment{
_applications = {} _applications = {}
/** @type {AbstractWebDesktopEnvironment} */ /** @type {AbstractWebDesktopEnvironment} */
#wde #wde
/** @type {WebFS} */
#webFS
/** @constructor */ /** @constructor */
constructor(apiAddress){ constructor(apiAddress){
this.#apiAddress = apiAddress this.#apiAddress = apiAddress
this.#webFS = WebFS
} }
/** /** @returns {string} */
* @deprecated
* @returns {string}
*/
GetApiAddress(){ GetApiAddress(){
return `${location.protocol}//${this.#apiAddress}` return `${location.protocol}//${this.#apiAddress}`
} }
@ -92,11 +85,6 @@ export default class AbstractWebDesktopEnvironment{
// console.log(appId) // console.log(appId)
return this._applications[appId] return this._applications[appId]
} }
/** @returns {WebFS} */
WebFS(){
return this.#webFS
}
} }
/** /**

4
front/src/wde/widgets/file-view/file-view.js
View File

@ -126,10 +126,10 @@ export default class WDEFileView{
const params = new URLSearchParams({ const params = new URLSearchParams({
path: path path: path
}) })
const response = await fetch(`/system/wde/widgets/file-tile-view?` + params) const response = await fetch(`${this.#wde.GetApiAddress()}/system/wde/widgets/file-tile-view?` + params)
if (response.status != 200){ if (response.status != 200){
//TODO Error text message //TODO Error text message
WebDesktopEnvironment.Alert("TODO") //TODO WebDesktopEnvironment.Alert("TODO")
return return
} }
let html = await response.text() let html = await response.text()

16
front/src/wde/widgets/file-view/file-view.less
View File

@ -3,7 +3,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
// background-color: @col-white; background-color: @col-white;
@ -65,13 +65,13 @@
/* background-image: url("./icons/folder.png"); */ /* background-image: url("./icons/folder.png"); */
background-size: cover; background-size: cover;
// image-rendering: optimizeSpeed; /* STOP SMOOTHING, GIVE ME SPEED */ image-rendering: optimizeSpeed; /* STOP SMOOTHING, GIVE ME SPEED */
// image-rendering: -moz-crisp-edges; /* Firefox */ image-rendering: -moz-crisp-edges; /* Firefox */
// image-rendering: -o-crisp-edges; /* Opera */ image-rendering: -o-crisp-edges; /* Opera */
// image-rendering: -webkit-optimize-contrast; /* Chrome (and eventually Safari) */ image-rendering: -webkit-optimize-contrast; /* Chrome (and eventually Safari) */
// image-rendering: pixelated; /* Universal support since 2021 */ image-rendering: pixelated; /* Universal support since 2021 */
// image-rendering: optimize-contrast; /* CSS3 Proposed */ image-rendering: optimize-contrast; /* CSS3 Proposed */
// -ms-interpolation-mode: nearest-neighbor; /* IE8+ */ -ms-interpolation-mode: nearest-neighbor; /* IE8+ */
} }
.FileTileView .Selected .Icon{ .FileTileView .Selected .Icon{

14
templates/finder/props.html → templates/finder/props.tmpl
View File

@ -1,13 +1,13 @@
{{ define "finder/props.tmpl" }} {{ define "finder/props.tmpl" }}
<div class="title-bar DragArea"> <div class="TitleBar DragArea">
<button id="closeWindowButton" class="button" title="Close Window"></button> <button id="closeWindowButton" class="Button" title="Close Window"></button>
<div id="Drag" class="visual-drag-area"></div> <div id="Drag" class="VisualDragArea"></div>
<div class="lable"> <div class="Lable">
Properties File Properties
</div> </div>
<div id="Drag" class="visual-drag-area"></div> <div id="Drag" class="VisualDragArea"></div>
</div> </div>
<div class="content-border"> <div class="ContentBorder">
<div class="PropertiesList"> <div class="PropertiesList">
<div class="Personal-properties-bio"> <div class="Personal-properties-bio">
<!-- <img src="data:{{ .headerProps.Icon.Header }},{{ .headerProps.Icon.Base64 }}" alt="File Icon" style="width: 48px;height: 48px;"> --> <!-- <img src="data:{{ .headerProps.Icon.Header }},{{ .headerProps.Icon.Base64 }}" alt="File Icon" style="width: 48px;height: 48px;"> -->