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

Compare commits

base: cyber-dream:2f2ad23fd6d4619e4871eba8b7729d48341f377a
Branches Tags
cyber-dream:new-back
..
compare: cyber-dream:0a8e438d4dd8b4bfe6b753e66bcfdb667a3c996a
Branches Tags
cyber-dream:new-back

No commits in common. "2f2ad23fd6d4619e4871eba8b7729d48341f377a" and "0a8e438d4dd8b4bfe6b753e66bcfdb667a3c996a" have entirely different histories.
2f2ad23fd6 ... 0a8e438d4d

12 changed files with 66 additions and 233 deletions
Show Stats Expand all files Collapse all files

35
main.go
View File

@ -63,11 +63,10 @@ func main() {
webfs := webfilesystem.NewWebFileSystem(client, dBName, webFsCollection)
wde := wde.NewWDE(webfs)
persPropsApp := personalprops.NewPersPropsApp(webfs)
persPropsApp := personalprops.NewPersPropsApp()
// finderApp := finder.FinderApplication{}
finderApp := finder.NewFinderApplication(webfs)
imgViewerApp := imgviewer.NewImgViewerApp(webfs)
imgViewerApp := imgviewer.NewImgViewerApp()
blogViewerApp := blogviewer.NewBlogViewerApp(webfs)
appsStorage := websiteapp.ApplicationsStorage{
Apps: map[string]websiteapp.WebDEApplication{},
@ -187,14 +186,10 @@ 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", ginH)
ctx.HTML(http.StatusOK, "personal-properties/mobile-app.tmpl", persPropsApp.Render())
} else {
ctx.HTML(http.StatusOK, "personal-properties/app.tmpl", ginH)
ctx.HTML(http.StatusOK, "personal-properties/app.tmpl", persPropsApp.Render())
}
})
}
@ -213,34 +208,16 @@ func main() {
finderAppRoute.GET("renderMobileDesktop", func(ctx *gin.Context) {
ctx.HTML(http.StatusOK, "finder/mobile-desktop.tmpl", gin.H{})
})
finderAppRoute.GET("renderDesktop", func(ctx *gin.Context) {
path := ctx.Query("path")
if path == "" {
ctx.JSON(http.StatusBadRequest, "no path provided")
return
}
ctx.HTML(http.StatusOK, "finder/desktop.tmpl", gin.H{})
})
}
imgViewerRoute := app.Group("img-viewer")
{
imgViewerRoute.GET("render", func(ctx *gin.Context) {
isMobileParam := ctx.Query("isMobile")
isMobile := isMobileParam == "true"
path := ctx.Query("path")
if path == "" {
ctx.JSON(http.StatusBadRequest, "no path provided")
return
}
ginH, err := imgViewerApp.Render(path, isMobile)
if err != nil {
ctx.JSON(http.StatusInternalServerError, "TODO")
return
}
if isMobile {
ctx.HTML(http.StatusOK, "img-viewer/mobile-app.tmpl", ginH)
ctx.HTML(http.StatusOK, "img-viewer/mobile-app.tmpl", imgViewerApp.Render(isMobile))
} else {
ctx.HTML(http.StatusOK, "img-viewer/app.tmpl", ginH)
ctx.HTML(http.StatusOK, "img-viewer/app.tmpl", imgViewerApp.Render(isMobile))
}
})

47
resources/sys/finder/finder.js
View File

@ -10,14 +10,10 @@ class Finder{
}
/**
* @param {string[]} args
* @param {string} path
*/
NewWindow(args){
this.path = args[0]
if (args[1] == "desktop"){
this.NewDesktop(args)
return
}
fetch(`${window.location.origin}/application/${this.appId}/render?` + new URLSearchParams({
isMobile: WebDesktopEnvironment.isMobile,
// path: this.path,
@ -29,7 +25,7 @@ class Finder{
newWindow.innerHTML = html
this.fileView = new FileView(newWindow.querySelector(".FileTileView"), (event) =>{
this.Click(event, false)
this.Click(event, this.path)
})
this.OpenDir(this.path)
@ -43,7 +39,7 @@ class Finder{
if (!WebDesktopEnvironment.isMobile){
// let scrollBar = new WdeScrollBar(newWindow.children[1].children[1], newWindow.children[1].children[0])// TODO to querry selector
// console.log(newWindow.querySelector("#closeWindowButton"))
console.log(newWindow.querySelector("#closeWindowButton"))
newWindow.querySelector("#closeWindowButton").addEventListener('click', function (params) {
WebDesktopEnvironment.CloseWindow(newWindow)
@ -56,29 +52,6 @@ class Finder{
})
}
/**
* @param {string[]} args
*/
NewDesktop(args){
fetch(`${window.location.origin}/application/${this.appId}/renderDesktop?` + new URLSearchParams({
isMobile: WebDesktopEnvironment.isMobile,
path: args[0]
}))
.then((response) => response.text())
.then((html) => {
// console.log(args)
args[2].innerHTML = html
this.fileView = new FileView(args[2].querySelector(".FileTileView"), (event) =>{
this.Click(event, true)
})
this.OpenDir(this.path)
})
.catch((error) => {
WebDesktopEnvironment.Alert(error);
})
}
OpenPreviousDir(){
if (this.pathHistory.length > 0){
// console.log(this.pathHistory)
@ -93,6 +66,7 @@ class Finder{
* @param {string} path
*/
OpenDir(path){
console.log()
this.pathHistory += this.path
this.path = path
this.fileView.OpenFolder(this.path)
@ -100,17 +74,12 @@ class Finder{
/**
* @param {MouseEvent} event
* @param {boolean} inNewWindow
*/
Click(event, inNewWindow){
Click(event){
let fileType = event.target.getAttribute("fileType")
let fileName = event.target.getAttribute("name")
switch (fileType) {
case "directory":
if (inNewWindow){
WebDesktopEnvironment.Open("finder", ["/home/user/" + fileName]) //FIXME this.path is shared for all windows
break
}
this.OpenDir(this.path +"/" + fileName)
break
case "blog-page":
@ -120,9 +89,9 @@ class Finder{
// //TODO get real id
// WebDesktopEnvironment.Open("personal-properties", [])
// break;
case "base64img":
WebDesktopEnvironment.Open("img-viewer", [this.path + "/" + fileName])
break;
// case "img":
// WebDesktopEnvironment.Open("img-viewer", ["pizda"])
// break;
default:
console.log("Unsupported file type")
break;

5
resources/sys/img-viewer/img-viewer.css
View File

@ -5,13 +5,12 @@
.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;

9
resources/sys/img-viewer/img-viewer.js
View File

@ -1,12 +1,11 @@
class ImgViewer{
appId = "img-viewer"
/**
* @param {string[]} args
* @param {string} path
*/
NewWindow(args){
NewWindow(path){
fetch(`${window.location.origin}/application/${this.appId}/render?`+ new URLSearchParams({
isMobile: WebDesktopEnvironment.isMobile,
path: args[0]
}))
.then((response) => response.text())
.then((html) => {
@ -25,3 +24,7 @@ class ImgViewer{
}
}
class test{
}

8
resources/wde.js
View File

@ -2,7 +2,7 @@ document.addEventListener('DOMContentLoaded', function() {
// console.log(window.screen.width)
wde = new WebDesktopEnvironment
if (!WebDesktopEnvironment.isMobile){
// WebDesktopEnvironment.Open("finder", ["/home/user"])
WebDesktopEnvironment.Open("finder", ["/home/user"])
// WebDesktopEnvironment.Open("blog-viewer", ["/home/user/blog/test-1.blog"])
// WebDesktopEnvironment.Open("personal-properties", ["kek"])
} else {
@ -58,12 +58,6 @@ class WebDesktopEnvironment{
} else{
document.body.style.setProperty('--zoom', 1)
let desktopLayer = document.createElement("div")
desktopLayer.setAttribute('id', 'desktop-layer')
desktopLayer.setAttribute('class', 'DesktopBackground')
document.body.appendChild(desktopLayer)
WebDesktopEnvironment.Open("finder", ["/home/user", "desktop", desktopLayer])
let windowsLayer = document.createElement("div")
windowsLayer.setAttribute('id', 'windows-layer')
document.body.appendChild(windowsLayer)

7
resources/wdeUI.css
View File

@ -349,10 +349,3 @@
width: 0;
height: 0;
}
.DesktopBackground{
position: absolute;
width: 100%;
height: 100%;
background-color: #9999CC;
}

6
templates/finder/desktop.tmpl
View File

@ -1,6 +0,0 @@
{{ define "finder/desktop.tmpl" }}
<div class="FileTileView">
</div>
{{ end }}

8
templates/img-viewer/app.tmpl
View File

@ -1,5 +1,5 @@
{{ define "img-viewer/app.tmpl" }}
<div id="TestWindowHeader" class="WindowFrameTopBar DragArea">
<div id="TestWindowHeader" class="WindowFrameTopBar">
<button id="closeWindowButton" class="WindowFrameTopBarButton" title="Close Window"></button>
<div id="Drag" class="WindowDragArea"></div>
<div class="WindowFrameTitle">
@ -11,9 +11,9 @@
<!-- <div class="Img-Viewer-Picture-Toolbar">
Toolbar
</div> -->
<img class="Img-Viewer-Picture-Container"src="data:{{.header}},{{.base64}}">
<div class="Img-Viewer-Picture-Container">
<div class="Img-Viewer-Picture">
</div>
</div>
{{ end }}

9
templates/personal-properties/app.tmpl
View File

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

29
wde/imglib.go
View File

@ -1,29 +0,0 @@
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
}

22
websiteapp/img-viewer/imgviewer.go
View File

@ -1,21 +1,17 @@
package imgviewer
import (
"personalwebsite/wde"
"personalwebsite/webfilesystem"
"personalwebsite/websiteapp"
"github.com/gin-gonic/gin"
)
type ImgViewerApp struct {
fs *webfilesystem.WebFileSystem
manifest websiteapp.ApplicationManifest
}
func NewImgViewerApp(webFs *webfilesystem.WebFileSystem) ImgViewerApp {
func NewImgViewerApp() ImgViewerApp {
newApp := ImgViewerApp{
fs: webFs,
manifest: websiteapp.ApplicationManifest{
AppId: "img-viewer",
WindowName: "About me", //TODO: delete
@ -31,17 +27,9 @@ func (p *ImgViewerApp) GetId() string {
return p.manifest.AppId
}
func (p *ImgViewerApp) Render(path string, isMobile bool) (gin.H, error) {
img, err := p.fs.Read(path)
if err != nil {
return nil, err
}
data, err := wde.ReadImage(img)
if err != nil {
return nil, err
}
func (p *ImgViewerApp) Render(isMobile bool) gin.H {
return gin.H{
"header": data.Header,
"base64": data.Base64,
}, nil
"Name": "Greg Brzezinski",
"BasicBio": "Born 27.09.1998 at Saint-Petersburg",
}
}

112
websiteapp/personalprops/personalprops.go
View File

@ -1,23 +1,17 @@
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(webFs *webfilesystem.WebFileSystem) PersonalPropertiesApp {
func NewPersPropsApp() PersonalPropertiesApp {
newApp := PersonalPropertiesApp{
fs: webFs,
manifest: websiteapp.ApplicationManifest{
AppId: "personal-properties",
WindowName: "About me",
@ -33,7 +27,16 @@ func (p *PersonalPropertiesApp) GetId() string {
return p.manifest.AppId
}
func (p *PersonalPropertiesApp) WriteToDb() {
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([]PropIsland, 0)
// careerProps := make([]Prop, 0)
@ -120,83 +123,26 @@ func (p *PersonalPropertiesApp) WriteToDb() {
},
},
}
// testKeys := PropIsland{
// Header: "Test",
// Props: []PropElement{{
// Key: "Urtt",
// Values: []string{"BakaBaka"},
// }},
// }
allProps = append(allProps, expertiseIsland, careerProps, eduIsland, volunteerProps)
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")
}
}
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,
"Name": "Greg Brzezinski",
"BasicBio": "Born 27.09.1998 at Saint-Petersburg",
// "BasicInfo": basicInfo,
// "career": careerProps,
"allprops": allProps,
}, nil
}
}
type HeaderIsland struct {
Name string
Icon *wde.Base64Img
Info1 string
Info2 string
type Book struct {
Title string
Author string
}
type PropElement struct {
@ -210,6 +156,6 @@ type PropIsland struct {
Props []PropElement
}
type PropertiesFile struct {
Props []PropIsland `bson:"props"`
}
// func (p *PersonalPropertiesApp) GetContent(ctx *gin.Context) interface{} {
// }