props markup fixes + shared lib to read images

main.go

@@ -63,7 +63,8 @@ func main() {
 
 	webfs := webfilesystem.NewWebFileSystem(client, dBName, webFsCollection)
 	wde := wde.NewWDE(webfs)
-	persPropsApp := personalprops.NewPersPropsApp()
+	persPropsApp := personalprops.NewPersPropsApp(webfs)
+
 	// finderApp := finder.FinderApplication{}
 	finderApp := finder.NewFinderApplication(webfs)
 	imgViewerApp := imgviewer.NewImgViewerApp(webfs)
@@ -186,10 +187,14 @@ func main() {
 			persPropApp.GET("render", func(ctx *gin.Context) {
 				isMobileParam := ctx.Query("isMobile")
 				isMobile := isMobileParam == "true"
+				ginH, err := persPropsApp.Render()
+				if err != nil {
+					ctx.JSON(http.StatusInternalServerError, "TODO") //TODO
+				}
 				if isMobile {
-					ctx.HTML(http.StatusOK, "personal-properties/mobile-app.tmpl", persPropsApp.Render())
+					ctx.HTML(http.StatusOK, "personal-properties/mobile-app.tmpl", ginH)
 				} else {
-					ctx.HTML(http.StatusOK, "personal-properties/app.tmpl", persPropsApp.Render())
+					ctx.HTML(http.StatusOK, "personal-properties/app.tmpl", ginH)
 				}
 			})
 		}

resources/sys/img-viewer/img-viewer.css

@@ -5,12 +5,13 @@
 .Img-Viewer-Picture{
     width: 100%;
     height: 100%;
-    background-image: url("./test-image.jpg");
+    /* background-image: url("./test-image.jpg");
     background-size:     contain;
     background-repeat:   no-repeat;
-    background-position: center center; 
+    background-position: center center;  */
 }
 
+
 .Img-Viewer-Picture-Toolbar{
     width: 100%;
     height: 35px;

resources/wde.js

@@ -4,7 +4,7 @@ document.addEventListener('DOMContentLoaded', function() {
     if (!WebDesktopEnvironment.isMobile){
         WebDesktopEnvironment.Open("finder", ["/home/user"])
         // WebDesktopEnvironment.Open("blog-viewer", ["/home/user/blog/test-1.blog"])
-        // WebDesktopEnvironment.Open("personal-properties", ["kek"])
+        WebDesktopEnvironment.Open("personal-properties", ["kek"])
     } else {
         WebDesktopEnvironment.Open("blog-viewer", ["/home/user/blog/test-1.blog"])
     }

templates/img-viewer/app.tmpl

@@ -11,9 +11,9 @@
         <!-- <div class="Img-Viewer-Picture-Toolbar">
             Toolbar
         </div> -->
-        <div class="Img-Viewer-Picture-Container">
-            <img src="data:{{.header}},{{.base64}}">
-        </div>
+        
+        <img class="Img-Viewer-Picture-Container"src="data:{{.header}},{{.base64}}">
+        
     </div>
 {{ end }}
 

templates/personal-properties/app.tmpl

@@ -1,6 +1,6 @@
 {{ define "personal-properties/app.tmpl" }}
     <!-- <div id="WindowBorder" class="PersonalPropertiesFrame"> -->
-        <div id="TestWindowHeader" class="WindowFrameTopBar">
+        <div id="TestWindowHeader" class="WindowFrameTopBar DragArea">
             <button id="closeWindowButton" class="WindowFrameTopBarButton" title="Close Window"></button>
             <div id="Drag" class="WindowDragArea"></div>
             <div class="WindowFrameTitle">
@@ -13,10 +13,11 @@
 			<div class="ScrollContent">
 				<div class="PropertiesList">
 					<div class="Personal-properties-bio">
-						<img src="res/img/default-avatar-photo-placeholder-profile-picture-vector.jpg" alt="My Photo" style="width: 48px;height: 48px;">
+						<img src="data:{{ .headerProps.Icon.Header }},{{ .headerProps.Icon.Base64 }}" alt="My Photo" style="width: 48px;height: 48px;">
 						<div class="Personal-properties-textbio">
-							<div>{{ .Name }}</div>
-							<div>{{ .BasicBio }}</div>
+							<div>{{ .headerProps.Name }}</div>
+							<div>{{ .headerProps.Info1 }}</div>
+							<div>{{ .headerProps.Info2 }}</div>
 						</div>
 					</div> 
 					{{ range $propIsland := .allprops }}

wde/imglib.go

@@ -0,0 +1,29 @@
+package wde
+
+import (
+	"errors"
+	"personalwebsite/webfilesystem"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+func ReadImage(img *webfilesystem.WebFSFile) (*Base64Img, error) {
+	header, ok := img.Data.(primitive.D).Map()["header"].(string)
+	if !ok {
+		return nil, errors.New("error in file decoding")
+	}
+	base64, ok := img.Data.(primitive.D).Map()["base64"].(string)
+	if !ok {
+		return nil, errors.New("error in file decoding")
+	}
+
+	return &Base64Img{
+		Header: header,
+		Base64: base64,
+	}, nil
+}
+
+type Base64Img struct {
+	Header string
+	Base64 string
+}

websiteapp/img-viewer/imgviewer.go

@@ -1,12 +1,11 @@
 package imgviewer
 
 import (
-	"errors"
+	"personalwebsite/wde"
 	"personalwebsite/webfilesystem"
 	"personalwebsite/websiteapp"
 
 	"github.com/gin-gonic/gin"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type ImgViewerApp struct {
@@ -37,16 +36,12 @@ func (p *ImgViewerApp) Render(path string, isMobile bool) (gin.H, error) {
 	if err != nil {
 		return nil, err
 	}
-	header, ok := img.Data.(primitive.D).Map()["header"]
-	if !ok {
-		return nil, errors.New("error in file decoding")
-	}
-	base64, ok := img.Data.(primitive.D).Map()["base64"]
-	if !ok {
-		return nil, errors.New("error in file decoding")
+	data, err := wde.ReadImage(img)
+	if err != nil {
+		return nil, err
 	}
 	return gin.H{
-		"header": header,
-		"base64": base64,
+		"header": data.Header,
+		"base64": data.Base64,
 	}, nil
 }

websiteapp/personalprops/personalprops.go

@@ -1,17 +1,23 @@
 package personalprops
 
 import (
+	"errors"
+	"personalwebsite/wde"
+	"personalwebsite/webfilesystem"
 	"personalwebsite/websiteapp"
 
 	"github.com/gin-gonic/gin"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type PersonalPropertiesApp struct {
+	fs       *webfilesystem.WebFileSystem
 	manifest websiteapp.ApplicationManifest
 }
 
-func NewPersPropsApp() PersonalPropertiesApp {
+func NewPersPropsApp(webFs *webfilesystem.WebFileSystem) PersonalPropertiesApp {
 	newApp := PersonalPropertiesApp{
+		fs: webFs,
 		manifest: websiteapp.ApplicationManifest{
 			AppId:      "personal-properties",
 			WindowName: "About me",
@@ -27,16 +33,7 @@ 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",
-	// })
+func (p *PersonalPropertiesApp) WriteToDb() {
 	allProps := make([]PropIsland, 0)
 
 	// careerProps := make([]Prop, 0)
@@ -123,26 +120,83 @@ func (p *PersonalPropertiesApp) Render() gin.H {
 			},
 		},
 	}
-	// testKeys := PropIsland{
-	// 	Header: "Test",
-	// 	Props: []PropElement{{
-	// 		Key:    "Urtt",
-	// 		Values: []string{"BakaBaka"},
-	// 	}},
-	// }
+
 	allProps = append(allProps, expertiseIsland, careerProps, eduIsland, volunteerProps)
-	return gin.H{
-		"Name":     "Greg Brzezinski",
-		"BasicBio": "Born 27.09.1998 at Saint-Petersburg",
-		// "BasicInfo": basicInfo,
-		// "career":    careerProps,
-		"allprops": allProps,
+	file := webfilesystem.WebFSFile{
+		MongoId: primitive.NewObjectID(),
+		Name:    "personal.props",
+		Type:    "props",
+		Data: PropertiesFile{
+			Props: allProps,
+		},
+	}
+	err := p.fs.CreateFile(&file, "/home/user/")
+	if err != nil {
+		println(err.Error())
+	} else {
+		println("Ok")
 	}
 }
 
-type Book struct {
-	Title  string
-	Author string
+func (p *PersonalPropertiesApp) Render() (gin.H, error) {
+	props, err := p.fs.Read("/home/user/personal.props")
+	if err != nil {
+		return nil, err
+	}
+	if props.Data == nil || props.Type != "props" {
+		return nil, errors.New("bad file")
+	}
+	headerProps := props.Data.(primitive.D).Map()["headerprops"].(primitive.D).Map()
+	file, err := p.fs.Read(headerProps["icon"].(string))
+	if err != nil {
+		//TODO
+	}
+
+	data, err := wde.ReadImage(file)
+	if err != nil {
+		return nil, err
+	}
+
+	hIsland := HeaderIsland{
+		Name:  headerProps["name"].(string),
+		Icon:  data,
+		Info1: "LLL",
+		Info2: "QQQ",
+	}
+
+	allProps := make([]PropIsland, 0)
+
+	for _, v := range props.Data.(primitive.D).Map()["props"].(primitive.A) {
+		island := PropIsland{}
+		island.Header = v.(primitive.D).Map()["header"].(string)
+		for _, prop := range v.(primitive.D).Map()["props"].(primitive.A) {
+			elem := PropElement{
+				Key: prop.(primitive.D).Map()["key"].(string),
+			}
+			if prop.(primitive.D).Map()["keycomments"] != nil {
+				for _, keyComments := range prop.(primitive.D).Map()["keycomments"].(primitive.A) {
+					elem.KeyComments = append(elem.KeyComments, keyComments.(string))
+				}
+			}
+			for _, elemValues := range prop.(primitive.D).Map()["values"].(primitive.A) {
+				elem.Values = append(elem.Values, elemValues.(string))
+			}
+			island.Props = append(island.Props, elem)
+		}
+		allProps = append(allProps, island)
+	}
+
+	return gin.H{
+		"headerProps": hIsland,
+		"allprops":    allProps,
+	}, nil
+}
+
+type HeaderIsland struct {
+	Name  string
+	Icon  *wde.Base64Img
+	Info1 string
+	Info2 string
 }
 
 type PropElement struct {
@@ -156,6 +210,6 @@ type PropIsland struct {
 	Props  []PropElement
 }
 
-// func (p *PersonalPropertiesApp) GetContent(ctx *gin.Context) interface{} {
-
-// }
+type PropertiesFile struct {
+	Props []PropIsland `bson:"props"`
+}