go.mod

@@ -13,22 +13,18 @@ require (
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
 )
 
 require (
 	github.com/bytedance/sonic v1.8.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
-	github.com/disintegration/imaging v1.6.2
-	github.com/gin-contrib/location v0.0.2
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.11.2 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
 	github.com/google/uuid v1.3.0
-	github.com/h2non/bimg v1.1.9
 	github.com/joho/godotenv v1.5.1
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
@@ -37,7 +33,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.9 // indirect

go.sum

@@ -6,28 +6,18 @@ github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhD
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
-github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/gin-contrib/location v0.0.2 h1:QZKh1+K/LLR4KG/61eIO3b7MLuKi8tytQhV6texLgP4=
-github.com/gin-contrib/location v0.0.2/go.mod h1:NGoidiRlf0BlA/VKSVp+g3cuSMeTmip/63PhEjRhUAc=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8=
 github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
 github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA=
 github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -36,11 +26,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/h2non/bimg v1.1.9 h1:WH20Nxko9l/HFm4kZCA3Phbgu2cbHvYzxwxn9YROEGg=
-github.com/h2non/bimg v1.1.9/go.mod h1:R3+UiYwkK4rQl6KVFTOFJHitgLbZXBZNFh2cv3AEbp8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
@@ -50,23 +37,18 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU=
 github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -76,7 +58,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -85,8 +66,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU=
 github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -104,14 +83,11 @@ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUu
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -119,8 +95,6 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
@@ -132,8 +106,6 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

libs/imglib.go

@@ -1,55 +0,0 @@
-package libs
-
-import (
-	"errors"
-	"personalwebsite/webfilesystem"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type ImagLib struct {
-	fs *webfilesystem.WebFileSystem
-}
-
-func ReadImage(img *webfilesystem.WebFSFile) (*Img, error) {
-	data, ok := img.Data.(primitive.D).Map()["srcdata"]
-	if !ok {
-		return nil, errors.New("error in file decoding")
-	}
-	bin := data.(primitive.Binary).Data
-
-	min32Data, ok := img.Data.(primitive.D).Map()["min32data"]
-	if !ok {
-		return nil, errors.New("error in file decoding")
-	}
-	min32Bin := min32Data.(primitive.Binary).Data
-	return &Img{
-		// Header: header,
-		Data:        bin,
-		Miniature32: min32Bin,
-	}, nil
-}
-
-func GetBase64Image(img *Base64Img, min string) (string, error) {
-	imgString := ""
-	switch min {
-	case "min32":
-		imgString = "data:" + img.Header + ", " + img.Base64Miniature32
-	default:
-		imgString = "data:" + img.Header + ", " + img.Base64
-	}
-
-	return imgString, nil
-}
-
-type Base64Img struct {
-	Header            string `bson:"header"`
-	Base64            string `bson:"base64"`
-	Base64Miniature32 string `bson:"base64min32"`
-}
-
-type Img struct {
-	Header      string `bson:"header"`
-	Data        []byte `bson:"srcdata"`
-	Miniature32 []byte `bson:"min32data"`
-}

main.go

@@ -3,11 +3,9 @@ package main
 import (
 	"context"
 	"errors"
-	"fmt"
 	"log"
 	"net/http"
 	"os"
-
 	"personalwebsite/routewde"
 	"personalwebsite/wde"
 	"personalwebsite/webfilesystem"
@@ -17,7 +15,6 @@ import (
 	imgviewer "personalwebsite/websiteapp/img-viewer"
 	"personalwebsite/websiteapp/personalprops"
 
-	"github.com/gin-contrib/location"
 	"github.com/gin-gonic/gin"
 	"github.com/joho/godotenv"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -26,6 +23,7 @@ import (
 )
 
 func main() {
+
 	if err := godotenv.Load(); err != nil {
 		println("No .env file found")
 	}
@@ -56,20 +54,17 @@ func main() {
 	}
 
 	router := gin.New()
-	router.Use(location.Default())
 	router.LoadHTMLGlob("templates/**/*")
 	router.Static("/res", "resources")
-	// Set a lower memory limit for multipart forms (default is 32 MiB)
-	router.MaxMultipartMemory = 8 << 20 // 8 MiB
 
 	router.GET("/", func(ctx *gin.Context) {
 		ctx.HTML(http.StatusOK, "index.tmpl", gin.H{})
 	})
 
 	webfs := webfilesystem.NewWebFileSystem(client, dBName, webFsCollection)
-	webde := wde.NewWDE(webfs)
+	wde := wde.NewWDE(webfs)
-
 	persPropsApp := personalprops.NewPersPropsApp(webfs)
+
 	// finderApp := finder.FinderApplication{}
 	finderApp := finder.NewFinderApplication(webfs)
 	imgViewerApp := imgviewer.NewImgViewerApp(webfs)
@@ -81,60 +76,12 @@ func main() {
 	appsStorage.Apps["finder"] = finderApp
 	appsStorage.Apps["img-viewer"] = &imgViewerApp
 	appsStorage.Apps["blog-viewer"] = blogViewerApp
-
-	router.POST("/upload", func(ctx *gin.Context) {
-		path := ctx.Query("path")
-		if path == "" {
-			ctx.JSON(http.StatusBadRequest, "TODO") //TODO json error struct
-			return
-		}
-		// single file
-		file, _ := ctx.FormFile("file")
-		// generateMins := c.Param("generateMins")
-		// log.Println(file.Filename)
-
-		// Upload the file to specific dst.
-		dst := "./test-img/" + file.Filename
-		ctx.SaveUploadedFile(file, dst)
-
-		err := webfs.UploadFile(dst, path)
-		if err != nil {
-			ctx.String(http.StatusInternalServerError, "TODO") //TODO
-			return
-		}
-
-		// webFsCollection.CreateMiniatures("./test-img/", file.Filename)
-
-		// webfs.CreateFile(&img, "/home/user/")
-
-		ctx.String(http.StatusOK, fmt.Sprintf("'%s' uploaded!", file.Filename))
-	})
-
 	system := router.Group("system")
 	{
-		libsGroup := system.Group("libs")
-		{
-			imgLibGroup := libsGroup.Group("img")
-			{
-				imgLibGroup.GET("get", func(ctx *gin.Context) {
-					path := ctx.Query("path")
-					if path == "" {
-						ctx.JSON(http.StatusBadRequest, "TODO") //TODO json error struct
-						return
-					}
 
-					file, err := webfs.Read(path)
-					if err != nil {
-						ctx.String(http.StatusInternalServerError, "TODO") //TODO
-					}
-
-					ctx.Data(200, "image/jpeg", file.Data.(primitive.Binary).Data)
-				})
-			}
-		}
 		wdeGroup := system.Group("wde")
 		{
-			routewde.Route(wdeGroup, webde)
+			routewde.Route(wdeGroup, wde)
 		}
 		apps := system.Group("applications")
 		{

resources/sys/finder/finder.js

@@ -29,7 +29,7 @@ class Finder{
             newWindow.innerHTML = html
             
             this.fileView = new FileView(newWindow.querySelector(".FileTileView"), (event) =>{
-                this.Open(event, false)
+                this.Click(event, false)
             })
             this.OpenDir(this.path)
             
@@ -70,7 +70,7 @@ class Finder{
             args[2].innerHTML = html
             
             this.fileView = new FileView(args[2].querySelector(".FileTileView"), (event) =>{
-                this.Open(event, true)
+                this.Click(event, true)
             })
             this.OpenDir(this.path)
         })
@@ -98,20 +98,11 @@ class Finder{
         this.fileView.OpenFolder(this.path)
     }
 
-
     /**
     * @param {MouseEvent} event
     * @param {boolean} inNewWindow
     */
     Click(event, inNewWindow){
-
-    }
-
-    /**
-    * @param {MouseEvent} event
-    * @param {boolean} inNewWindow
-    */
-    Open(event, inNewWindow){
         let fileType = event.target.getAttribute("fileType")
         let fileName = event.target.getAttribute("name")
         switch (fileType) {

resources/sys/wde/file-view.css

@@ -39,15 +39,10 @@
     flex-wrap: nowrap;
 }
 
-.FileTileView .Selected{
-    /* inherits: ; */
-    /* background-color: black; */
-}
-
 .FileTileView .Icon{
     width: 32px; 
     height: 32px; 
-    /* background-image: url("./icons/folder.png"); */
+    background-image: url("./icons/folder.png");
     background-size: cover;
 
     image-rendering: optimizeSpeed;             /* STOP SMOOTHING, GIVE ME SPEED  */
@@ -59,16 +54,6 @@
     -ms-interpolation-mode: nearest-neighbor;   /* IE8+                           */
 }
 
-.FileTileView .Selected .Icon{
-    filter: brightness(0.4);
-}
-
 .FileTileView .Lable{
     white-space: nowrap;
 }
-
-.FileTileView .Selected .Lable{
-    white-space: nowrap;
-    color: white;
-    background-color: black;
-}

resources/sys/wde/file-view.js

@@ -1,28 +1,21 @@
 class FileView{
     parentElem = undefined
-    selected = []
     /**
     * @param {HTMLElement} fileViewElem
-    * @param {Function} doubleClickCallback
+    * @param {Function} clickCallback
     */
-    constructor(fileViewElem, doubleClickCallback){
+    constructor(fileViewElem, clickCallback){
         //TODO check all params
         this.parentElem = fileViewElem
 
-        fileViewElem.addEventListener('click', (event) => {
+        // this.OpenFolder(path)
 
-            console.log(event)
+        // let scrollDiv = fileViewElem.children[1]
-            if (event.detail === 1){
+        // console.log(scrollDiv)
-                this.selected.forEach(element => {
+        // let scrollBar = new WdeScrollBar(fileViewElem.children[1].children[0], fileViewElem.children[0])
-                    // console.log
+
-                    element.classList.remove("Selected")    
+        fileViewElem.addEventListener('click', (event) => {
-                });
+            clickCallback(event)
-                this.selected = []
-                this.selected.push(event.target)
-                event.target.classList.add("Selected")
-            } else if (event.detail === 2) {
-                doubleClickCallback(event)
-            }
         })
     }
 

resources/wde.js

@@ -6,7 +6,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"])
     }

routewde/wde.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 	"personalwebsite/wde"
 
-	"github.com/gin-contrib/location"
 	"github.com/gin-gonic/gin"
 )
 
@@ -20,14 +19,12 @@ func Route(route *gin.RouterGroup, wde *wde.WDE) {
 	widgets := route.Group("widgets")
 	{
 		widgets.GET("/file-tile-view", func(ctx *gin.Context) {
-			url := location.Get(ctx)
-			_ = url
 			path := ctx.Query("path")
 			if path == "" {
 				ctx.JSON(http.StatusBadRequest, "TODO") //TODO json error struct
 				return
 			}
-			ginH, err := wde.RenderFileTileView(path, url.Scheme+"://"+url.Host)
+			ginH, err := wde.Render(path)
 			if err != nil {
 				ctx.JSON(http.StatusInternalServerError, "TODO") //TODO
 				return

templates/finder/app.tmpl

@@ -1,5 +1,5 @@
 {{ define "finder/app.tmpl" }}
-    <div class="TitleBar DragArea">
+    <div id="TestWindowHeader" class="TitleBar DragArea">
         <button id="closeWindowButton" class="Button" title="Close Window"></button>
         <div id="Drag" class="VisualDragArea"></div>
         <div class="Lable">

templates/img-viewer/app.tmpl

@@ -1,6 +1,6 @@
 {{ define "img-viewer/app.tmpl" }}
-    <div class="TitleBar DragArea">
+    <div id="TestWindowHeader" class="WindowFrameTopBar DragArea">
-        <button id="closeWindowButton" class="Button" title="Close Window"></button>
+        <button id="closeWindowButton" class="WindowFrameTopBarButton" title="Close Window"></button>
         <div id="Drag" class="VisualDragArea"></div>
         <div class="Lable">
             About me

templates/wde-widgets/file-tile-view.tmpl

@@ -1,8 +1,7 @@
 {{ define "wde-widgets/file-tile-view.tmpl" }}
         {{ range $fileTile := .Files }}
             <div fileType="{{ $fileTile.Type }}" class="Tile" name="{{$fileTile.Name}}">
-                <!-- <div class="Icon NoClick"></div> -->
+                <div class="Icon NoClick"></div>
-                <img class="Icon NoClick" src="{{ $fileTile.Icon }}">
                 <div class="Lable NoClick">{{ $fileTile.Name }}</div>
             </div>  
         {{ end }}

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
+}

wde/wde.go

@@ -1,7 +1,6 @@
 package wde
 
 import (
-	"path"
 	"personalwebsite/webfilesystem"
 
 	"github.com/gin-gonic/gin"
@@ -31,27 +30,3 @@ func (w *WDE) Render(path string) (gin.H, error) {
 		"Files": list,
 	}, nil
 }
-
-func (w *WDE) RenderFileTileView(directory string, host string) (gin.H, error) {
-	list, err := w.fs.List(directory)
-	if err != nil {
-		return nil, err
-	}
-	for _, file := range list {
-		switch file.Type {
-		case "directory":
-			file.Icon = host + "/system/libs/img/get?path=/wde/icons/macos9/folder.png" //FIXME
-		case "jpeg":
-			fallthrough
-		case "png":
-			fallthrough
-		case "jpg":
-			file.Icon = host + "/system/libs/img/get?path=" + path.Join(directory, file.Name) //FIXME
-		default:
-			file.Icon = host + "/system/libs/img/get?path=/wde/icons/macos9/about-me.png" //FIXME
-		}
-	}
-	return gin.H{
-		"Files": list,
-	}, nil
-}

webfilesystem/fileuploading.go

@@ -1,94 +0,0 @@
-package webfilesystem
-
-//sudo apt-get install libvips-tools
-
-import (
-	"errors"
-	"os"
-
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func (fs *WebFileSystem) UploadFile(realFilepath string, path string) error {
-	file, err := os.ReadFile(realFilepath)
-	if err != nil {
-		return err
-	}
-	splittedPath := fs.SplitPath(realFilepath)
-	fileName := splittedPath[len(splittedPath)-1]
-	extension := fs.GetExtension(fileName)
-
-	switch extension {
-	case "jpg":
-		fallthrough
-	case "jpeg":
-		newFile := WebFSFile{
-			MongoId: primitive.NewObjectID(),
-			Name:    fileName,
-			Type:    "jpeg",
-			Data:    file,
-			Icon:    "",
-		}
-		err := fs.CreateFile(&newFile, path)
-		return err
-	case "png":
-		newFile := WebFSFile{
-			MongoId: primitive.NewObjectID(),
-			Name:    fileName,
-			Type:    "png",
-			Data:    file,
-		}
-		err := fs.CreateFile(&newFile, path)
-		return err
-	default:
-		return errors.New("this filetype not allowed")
-	}
-
-}
-
-// func (fs *WebFileSystem) CreateMiniatures(parentDir string, file string) error {
-// 	src, err := imaging.Open(path.Join(parentDir, file))
-// 	if err != nil {
-// 		// log.Fatalf("failed to open image: %v", err)
-// 		return err
-// 	}
-
-// 	// Resize the cropped image to width = 200px preserving the aspect ratio.
-// 	src = imaging.Resize(src, 32, 0, imaging.Lanczos)
-
-// 	// Save the resulting image as JPEG.
-// 	splittedFileName := strings.Split(file, ".")
-// 	err = imaging.Save(src, path.Join(parentDir, splittedFileName[0]+"_32px."+splittedFileName[1]))
-// 	if err != nil {
-// 		// log.Fatalf("failed to save image: %v", err)
-// 		return err
-// 	}
-
-// 	data, err := os.ReadFile(path.Join(parentDir, file))
-// 	if err != nil {
-// 		return err
-// 	}
-
-// 	min32Data, err := os.ReadFile(path.Join(parentDir, splittedFileName[0]+"_32px."+splittedFileName[1]))
-// 	if err != nil {
-// 		return err
-// 	}
-// 	imgData := wde.Img{
-// 		Header:      "",
-// 		Data:        data,
-// 		Miniature32: min32Data,
-// 	}
-// 	newFile := WebFSFile{
-// 		MongoId: primitive.NewObjectID(),
-// 		Name:    file,
-// 		Type:    "picture",
-// 		Data:    imgData,
-// 		Icon:    "",
-// 	}
-// 	fs.CreateFile(&newFile, "/home/user/")
-// 	return nil
-// }
-
-// func toBase64(b []byte) string {
-// 	return base64.StdEncoding.EncodeToString(b)
-// }

webfilesystem/webfilesystem.go

@@ -111,7 +111,6 @@ func (fs *WebFileSystem) CreateDirectory(path string) error {
 }
 
 func (fs *WebFileSystem) CreateFile(file *WebFSFile, parentPath string) error {
-	//TODO Check file existance
 	parentDir, err := fs.Read(parentPath)
 	if err != nil {
 		return err
@@ -159,13 +158,6 @@ func (fs *WebFileSystem) SplitPath(path string) []string {
 	return resPath
 }
 
-func (fs *WebFileSystem) GetExtension(filename string) string {
-	// extension := []string{}
-	splittedName := strings.Split(filename, ".")
-
-	return splittedName[len(splittedName)-1]
-}
-
 func (fs *WebFileSystem) GetParentPath(path string) string {
 	splittedPath := fs.SplitPath(path)
 	parentPath := strings.Join(splittedPath[:len(splittedPath)-1], "/")
@@ -177,7 +169,6 @@ type WebFSFile struct {
 	Name    string             `bson:"name" json:"name"`
 	Type    string             `bson:"type" json:"type"`
 	Data    interface{}        `bson:"data" json:"-"`
-	Icon    string             `bson:"-"    json:"icon"`
 }
 
 type FolderData struct {

websiteapp/img-viewer/imgviewer.go

@@ -1,7 +1,7 @@
 package imgviewer
 
 import (
-	"personalwebsite/libs"
+	"personalwebsite/wde"
 	"personalwebsite/webfilesystem"
 	"personalwebsite/websiteapp"
 
@@ -36,12 +36,12 @@ func (p *ImgViewerApp) Render(path string, isMobile bool) (gin.H, error) {
 	if err != nil {
 		return nil, err
 	}
-	data, err := libs.ReadImage(img)
+	data, err := wde.ReadImage(img)
 	if err != nil {
 		return nil, err
 	}
 	return gin.H{
 		"header": data.Header,
-		// "base64": data.Base64,
+		"base64": data.Base64,
 	}, nil
 }

websiteapp/personalprops/personalprops.go

@@ -2,7 +2,7 @@ package personalprops
 
 import (
 	"errors"
-	"personalwebsite/libs"
+	"personalwebsite/wde"
 	"personalwebsite/webfilesystem"
 	"personalwebsite/websiteapp"
 
@@ -147,19 +147,19 @@ func (p *PersonalPropertiesApp) Render() (gin.H, error) {
 		return nil, errors.New("bad file")
 	}
 	headerProps := props.Data.(primitive.D).Map()["headerprops"].(primitive.D).Map()
-	// file, err := p.fs.Read(headerProps["icon"].(string))
+	file, err := p.fs.Read(headerProps["icon"].(string))
 	if err != nil {
 		//TODO err catch
 	}
 
-	// data, err := wde.ReadImage(file)
+	data, err := wde.ReadImage(file)
-	// if err != nil {
+	if err != nil {
-	// 	return nil, err
+		return nil, err
-	// }
+	}
 
 	hIsland := HeaderIsland{
-		Name: headerProps["name"].(string),
+		Name:  headerProps["name"].(string),
-		// Icon:  data,
+		Icon:  data,
 		Info1: "LLL",
 		Info2: "QQQ",
 	}
@@ -194,7 +194,7 @@ func (p *PersonalPropertiesApp) Render() (gin.H, error) {
 
 type HeaderIsland struct {
 	Name  string
-	Icon  *libs.Base64Img
+	Icon  *wde.Base64Img
 	Info1 string
 	Info2 string
 }