-
+
+{{ range $props := .allprops }}
+
-
-
-
-
-
- {{ range $book := .books }}
-
+
-
- {{ end }}
- {{ .Title }}
- {{ .Author }}
-
+ 
+
\ No newline at end of file
+
+
+
-{{ .Name }}
+ {{ .BasicBio }}
+
+{{ end }}
diff --git a/resources/personal-properties.js b/resources/personal-properties.js
deleted file mode 100644
index 07f38b8..0000000
--- a/resources/personal-properties.js
+++ /dev/null
@@ -1,5 +0,0 @@
-class PersonalProperties {
- constructor(){
- console.log("pprops")
- }
-}
\ No newline at end of file
diff --git a/resources/wde.js b/resources/wde.js
index 7f25ed6..a4844e5 100644
--- a/resources/wde.js
+++ b/resources/wde.js
@@ -4,28 +4,77 @@ document.addEventListener('DOMContentLoaded', function() {
}, false);
class WebDesktopEnvironment{
+
constructor(){
this.wc = new WindowsCompositor
- fetch("http://localhost:8080/applications/personalproperties/test" /*, options */)
+ //Get basic window ready frame
+ fetch("http://192.168.88.10:8080/system/wde/getbasicwindow") //TODO Move to wde func
.then((response) => response.text())
.then((html) => {
- document.getElementById("WindowsLayer").innerHTML = html;
+ WebDesktopEnvironment.SetBasicWindow(html)
+ let app = this.loadApp("personal-properties")
})
.catch((error) => {
- console.warn(error);
+ WebDesktopEnvironment.Alert(error);
});
+ }
- // var iDiv = document.createElement('div');
- // iDiv.id = 'NewCoolApp';
- // iDiv.className = 'Application';
- // iDiv.style.width = "100px"
- // iDiv.style.height = "100px"
- // document.getElementById('WindowsLayer').appendChild(iDiv)
- // document.getElementById('WindowsLayer')[0].appendChild(iDiv);
+ /**
+ * @param {string} appId
+ * @returns {Application | undefined}
+ */
+ loadApp(appId){
+ let newApp = document.createElement("application")
+ newApp.setAttribute("id", `application-${appId}`)
+ let appElem = document.getElementById("WindowsLayer").appendChild(newApp)
+
+ let script = document.createElement("script")
+ script.setAttribute("src", "http://192.168.88.10:8080/system/applications/personal-properties/app.js")
+ script.setAttribute("async", "false")
+ appElem.appendChild(script)
+ script.addEventListener("load", function () {
+ let newApp = new PersonalProperties(appElem)
+ newApp.Init()
+ }, false)
+ }
+
+ static basicWindow
+ /**
+ *
+ * @param {string} html
+ */
+ static SetBasicWindow(html){
+ this.basicWindow = html
+ }
+ /**
+ *
+ * @returns {string}
+ */
+ static GetBasicWindow(){
+ // console.log(this.basicWindow)
+ return this.basicWindow
+ }
+
+ static Alert(alertText){
+ console.log(alertText)
}
}
+var getJSON = function(url, callback) {
+ var xhr = new XMLHttpRequest();
+ xhr.open('GET', url, true);
+ xhr.responseType = 'json';
+ xhr.onload = function() {
+ var status = xhr.status;
+ if (status === 200) {
+ callback(null, xhr.response);
+ } else {
+ callback(status, xhr.response);
+ }
+ };
+ xhr.send();
+};
class WindowsCompositor{
movingElement = null
@@ -53,7 +102,7 @@ class WindowsCompositor{
*/
catchClick(event){
switch (true) {
- case event.target.className == "WindowDragArea":
+ case event.target.className == "TestWindowHeader":
this.movingElement = event.target.parentElement.parentElement.parentElement
break;
default:
@@ -70,4 +119,5 @@ class WindowsCompositor{
element.style.left = posX + "px";
element.style.top = posY + "px";
}
-}
\ No newline at end of file
+}
+
diff --git a/resources/wdeUI.css b/resources/wdeUI.css
new file mode 100644
index 0000000..924f12a
--- /dev/null
+++ b/resources/wdeUI.css
@@ -0,0 +1,24 @@
+.WindowFrameTopBarButton{
+ width: 11px;
+ height: 11px;
+ padding: 0%;
+
+ background: #D9D9D9;
+ border: 1px solid #222222;
+ box-shadow: 0.5px 0.5px 0px 0.5px #FFFFFF,
+ -0.5px -0.5px 0px 0.5px rgba(0, 0, 0, 0.25),
+ inset 1px 1px 0px #FFFFFF,
+ inset -1px -1px 0px rgba(0, 0, 0, 0.25);
+
+ /* Inside auto layout */
+
+ flex: none;
+ order: 0;
+ flex-grow: 0;
+}
+
+.WindowFrameTopBarButton:active {
+ background-color: rgba(0, 0, 0, 0.4); /* Green */
+ box-shadow: 0.5px 0.5px 0px 0.5px #FFFFFF,
+ -0.5px -0.5px 0px 0.5px rgba(0, 0, 0, 0.25);
+}
\ No newline at end of file
diff --git a/routewde/wde.go b/routewde/wde.go
new file mode 100644
index 0000000..fb8f08b
--- /dev/null
+++ b/routewde/wde.go
@@ -0,0 +1,13 @@
+package routewde
+
+import (
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+)
+
+func Route(route *gin.RouterGroup) {
+ route.GET("/getbasicwindow", func(ctx *gin.Context) {
+ ctx.HTML(http.StatusOK, "basic-window.html", nil)
+ })
+}
diff --git a/websiteapp/personalprops/personalprops.go b/websiteapp/personalprops/personalprops.go
index c5f02e0..f17d72a 100644
--- a/websiteapp/personalprops/personalprops.go
+++ b/websiteapp/personalprops/personalprops.go
@@ -1,39 +1,107 @@
package personalprops
+import (
+ "personalwebsite/websiteapp"
+
+ "github.com/gin-gonic/gin"
+)
+
type PersonalPropertiesApp struct {
+ manifest websiteapp.ApplicationManifest
}
func NewPersPropsApp() PersonalPropertiesApp {
- newApp := PersonalPropertiesApp{}
+ newApp := PersonalPropertiesApp{
+ manifest: websiteapp.ApplicationManifest{
+ AppId: "personal-properties",
+ WindowName: "About me",
+ },
+ }
return newApp
}
-func (p *PersonalPropertiesApp) Render() []Book {
- books := make([]Book, 0)
- books = append(books, Book{
- Title: "About person:",
- Author: "General information about me",
+func (p *PersonalPropertiesApp) GetManifest() websiteapp.ApplicationManifest {
+ return p.manifest
+}
+func (p *PersonalPropertiesApp) GetId() string {
+ return p.manifest.AppId
+}
+
+func (p *PersonalPropertiesApp) Render() gin.H {
+ // books := make([]Book, 0)
+ // books = append(books, Book{
+ // Title: "Title 1",
+ // Author: "Author 1",
+ // })
+ // books = append(books, Book{
+ // Title: "Title 2",
+ // Author: "Author 2",
+ // })
+ allProps := make([][]Prop, 0)
+
+ basicInfo := make([]Prop, 0)
+
+ basicInfo = append(basicInfo, Prop{
+ Key: "",
+ Prop: "Greg Brzezinski",
})
- books = append(books, Book{
- Title: "Career:",
- Author: "Inforamtion about my career",
+
+ basicInfo = append(basicInfo, Prop{
+ Key: "",
+ Prop: "Saint-Petersburg",
})
- books = append(books, Book{
- Title: "TEST:",
- Author: "QQQQQQQ",
+
+ // careerkeys := make([]Prop, 0)
+ careerkeys := []Prop{
+ {
+ Key: "VR lab assistant",
+ Prop: "111",
+ },
+ {
+ Key: "3d artist",
+ Prop: "qweqwe",
+ },
+ {
+ Key: "Jr. Techartist",
+ Prop: "qweqwaaae",
+ },
+ }
+ // careerkeys = append(careerkeys, Prop{
+ // Key: "VR lab assistant ",
+ // Prop: "ALSK jlkJls kdfgjasdp jk sdf",
+ // })
+ // careerkeys = append(careerkeys, Prop{
+ // Key: "3d artist",
+ // Prop: "qweqwe",
+ // })
+ // careerkeys = append(careerkeys, Prop{})
+ testKeys := []Prop{}
+ testKeys = append(testKeys, Prop{
+ Key: "Urrtt",
+ Prop: "BakaBaka",
})
- books = append(books, Book{
- Title: "TEST:",
- Author: "QQQQQQQ",
- })
- books = append(books, Book{
- Title: "TEST:",
- Author: "QQQQQQQ",
- })
- return books
+
+ allProps = append(allProps, careerkeys, testKeys, testKeys, testKeys)
+ return gin.H{
+ "Name": "Greg Brzezinski",
+ "BasicBio": "Born 27.09.1998 at Saint-Petersburg",
+ "BasicInfo": basicInfo,
+ // "books": books,
+ "career": careerkeys,
+ "allprops": allProps,
+ }
}
type Book struct {
Title string
Author string
}
+
+type Prop struct {
+ Key string
+ Prop string
+}
+
+// func (p *PersonalPropertiesApp) GetContent(ctx *gin.Context) interface{} {
+
+// }
diff --git a/websiteapp/websiteapp.go b/websiteapp/websiteapp.go
index 26cb186..1408c71 100644
--- a/websiteapp/websiteapp.go
+++ b/websiteapp/websiteapp.go
@@ -1,5 +1,45 @@
package websiteapp
+import (
+ "net/http"
+
+ "github.com/gin-gonic/gin"
+)
+
type WebDEApplication interface {
- Render()
+ // Render()
+ GetManifest() ApplicationManifest
+ // GEtHtml()
+ GetId() string
+}
+
+type ApplicationManifest struct {
+ AppId string `json:"appid"`
+ WindowName string `json:"windowname"`
+}
+
+type ApplicationsStorage struct {
+ Apps map[string]WebDEApplication
+}
+
+// func NewApplicationsStorage() *ApplicationsStorage {
+// newStorage := ApplicationsStorage{}
+
+// return &newStorage
+// }
+
+func Route(route *gin.RouterGroup, aStorage *ApplicationsStorage) {
+ route.GET("/get", func(ctx *gin.Context) {
+ appId := ctx.Query("appid")
+ if appId == "" {
+ ctx.Status(http.StatusBadRequest)
+ return
+ }
+ app, isExist := aStorage.Apps[appId]
+ if !isExist {
+ ctx.Status(http.StatusNoContent)
+ return
+ }
+ ctx.JSON(http.StatusOK, app.GetManifest())
+ })
}
+ {{range $prop := $props}}
+
+
+
+ {{ end }}
+ {{.Key}}:
+ {{ .Prop }}
+