From edd4a86796dc6f2a3c101e2fe5da2ef837c19b6c Mon Sep 17 00:00:00 2001 From: cyber-dream Date: Mon, 20 Mar 2023 14:20:37 +0300 Subject: [PATCH] working scrollbar --- .../personalPropsRoute/personalPropsRoute.go | 13 -- main.go | 10 +- {resources => pure-html}/base.html | 0 {resources => pure-html}/basic-window.html | 0 pure-html/index.html | 41 ++++- resources/base.css | 169 +++++------------- resources/kek/kek.tmpl | 1 - .../personal-properies.css | 0 .../personal-properties.tmpl | 30 ---- resources/sys/apps/finder/app.js | 40 +++++ .../personal-properies.css | 166 +++++++++++++++++ .../personal-properties.js | 28 +-- resources/sys/wde/wde-scrollbar.js | 83 +++++++++ resources/wde.js | 8 +- resources/wdeUI.css | 140 ++++++++++++++- templates/base/index.tmpl | 3 + templates/finder/app.tmpl | 5 + templates/personal-properties/app.tmpl | 65 ++++++- websiteapp/finder/finder.go | 22 +++ 19 files changed, 622 insertions(+), 202 deletions(-) delete mode 100644 approutes/personalPropsRoute/personalPropsRoute.go rename {resources => pure-html}/base.html (100%) rename {resources => pure-html}/basic-window.html (100%) delete mode 100644 resources/kek/kek.tmpl delete mode 100644 resources/personal-properties/personal-properies.css delete mode 100644 resources/personal-properties/personal-properties.tmpl create mode 100644 resources/sys/apps/finder/app.js create mode 100644 resources/sys/personal-properties/personal-properies.css rename resources/{ => sys}/personal-properties/personal-properties.js (58%) create mode 100644 resources/sys/wde/wde-scrollbar.js create mode 100644 templates/finder/app.tmpl create mode 100644 websiteapp/finder/finder.go diff --git a/approutes/personalPropsRoute/personalPropsRoute.go b/approutes/personalPropsRoute/personalPropsRoute.go deleted file mode 100644 index 38d3ab5..0000000 --- a/approutes/personalPropsRoute/personalPropsRoute.go +++ /dev/null @@ -1,13 +0,0 @@ -package personalpropsroute - -import ( - "github.com/gin-gonic/gin" -) - -func Route(route *gin.RouterGroup) { - - // route.GET("/test", func(ctx *gin.Context) { - // test := persPropsApp.Render() - // ctx.HTML(http.StatusOK, "personal-properties.html", gin.H{"books": test}) - // }) -} diff --git a/main.go b/main.go index 6eea0fa..c6eabc3 100644 --- a/main.go +++ b/main.go @@ -3,9 +3,9 @@ package main import ( "log" "net/http" - personalpropsroute "personalwebsite/approutes/personalPropsRoute" "personalwebsite/routewde" "personalwebsite/websiteapp" + "personalwebsite/websiteapp/finder" "personalwebsite/websiteapp/personalprops" "github.com/gin-gonic/gin" @@ -39,10 +39,12 @@ func main() { }) persPropsApp := personalprops.NewPersPropsApp() + finderApp := finder.FinerApplication{} appsStorage := websiteapp.ApplicationsStorage{ Apps: map[string]websiteapp.WebDEApplication{}, } appsStorage.Apps["personal-properties"] = &persPropsApp + appsStorage.Apps["finder"] = &finderApp system := router.Group("system") { @@ -65,9 +67,9 @@ func main() { case "getmanifest": ctx.JSON(http.StatusOK, app.GetManifest()) case "app.js": - ctx.File("resources/" + appId + "/" + appId + ".js") + ctx.File("resources/sys/" + appId + "/" + appId + ".js") case "app.css": - ctx.File("resources/" + appId + "/" + appId + ".css") + ctx.File("resources/sys/" + appId + "/" + appId + ".css") default: ctx.Status(http.StatusBadRequest) } @@ -75,7 +77,7 @@ func main() { } websiteapp.Route(apps.Group("/storage"), &appsStorage) - personalpropsroute.Route(apps.Group("/personalproperties")) + // personalpropsroute.Route(apps.Group("/personalproperties")) } app := router.Group("application") diff --git a/resources/base.html b/pure-html/base.html similarity index 100% rename from resources/base.html rename to pure-html/base.html diff --git a/resources/basic-window.html b/pure-html/basic-window.html similarity index 100% rename from resources/basic-window.html rename to pure-html/basic-window.html diff --git a/pure-html/index.html b/pure-html/index.html index db576d8..3c5701f 100644 --- a/pure-html/index.html +++ b/pure-html/index.html @@ -1,10 +1,35 @@ - - + + - Website - - - - - + + + + + + + + + + + + +
+

↓Scrollable!↓

+

↓Scrollable!↓

+

↓Scrollable!↓

+

↓Scrollable!↓

+

↓Scrollable!↓

+
+ + \ No newline at end of file diff --git a/resources/base.css b/resources/base.css index b7ac7a0..a186625 100644 --- a/resources/base.css +++ b/resources/base.css @@ -1,8 +1,6 @@ @font-face{ font-family: "Virtue"; src:url("./virtue.ttf"); - - } @font-face{ @@ -21,6 +19,13 @@ body{ margin: 0px; /* font: normal 14px Summer Pixel 22, "res/SummerPixel22Regular.ttf"; */ + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Safari */ + -khtml-user-select: none; /* Konqueror HTML */ + -moz-user-select: none; /* Old versions of Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; /* Non-prefixed version, currently + supported by Chrome, Edge, Opera and Firefox */ } /* @font-face { @@ -74,15 +79,51 @@ body{ .VisualFrame{ width: 100%; height: 100%; - overflow: scroll; - overflow-x: hidden; + position: relative; + /* overflow: scroll; */ + /* overflow-x: hidden; */ + + + /* Inside auto layout */ + + flex: none; + order: 1; + align-self: stretch; + flex-grow: 1; background: #DDDDDD; border: 1px solid #000000; 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; + + /* Auto layout */ + + display: flex; + flex-direction: column; + align-items: center; + justify-content: start; + align-items: flex-start; + gap: 0px; + padding: 0px; } .ContentFrame{ + width: 100%; + height: auto; + /* background-color: aquamarine; */ + + /* Auto layout */ + display: flex; + flex-direction: column; + align-items: center; + padding: 12px; + padding-bottom: 0px; + gap:16px; + +} + + + +.Old { box-sizing: border-box; position: relative; padding: 10px; @@ -93,7 +134,7 @@ body{ padding: 12px; gap:16px; - width: auto; + width: 100%; height: auto; @@ -105,121 +146,5 @@ body{ align-self: stretch; flex-grow: 1; - /* overflow: scroll; */ + overflow: scroll; } - -.Personal-properties-bio{ - width: 100%; - height: auto; - /* margin-right: -20px; */ - - /* Auto layout */ - display: flex; - flex-direction: row; - align-items: center; - padding: 0px; - margin-right: 20; - gap:15px; -} - - - -.Personal-properties-textbio{ - /* width: 100%; - height: auto; */ - - /* Auto layout */ - display: flex; - flex-direction: column; - align-items: left; - padding: 0px; - gap:1px; -} - - -.Personal-properties-prop{ - width: 100%; - height: auto; - border: 1px solid #888888; - box-shadow: 1px 1px 0px #FFFFFF, inset 1px 1px 0px #FFFFFF; - padding-bottom: 10px; - - /* Auto layout */ - /* display: flex; - flex-direction: column; - align-items: center; - padding: 0px; - gap:1px; */ -} - - - - -.Personal-properties-prop-title{ - font-family: "Virtue"; - letter-spacing: 0.35px; - position:relative; - display: inline-block; - max-width: 100%; - background-color: #DDDDDD; - left: 12px; - top: -9px; -} - -.Personal-properties-prop-content{ - width: 100%; - /* top: 0px; */ - /* Auto layout */ - display: flex; - flex-direction: column; - justify-content: center; - padding: 0px; - gap: 12px; -} - -.Personal-properties-prop-row{ - margin-left: 12px; - margin-right: 12px; - /* Auto layout */ - display: flex; - flex-direction: row; - justify-content: center; - padding: 0px; - gap: 5px; -} -.Personal-properties-prop-key{ - position: relative; - font-family: "Virtue"; - font-size: 11px; - letter-spacing: 0.35px; - text-align: end; - width: 34%; - white-space: nowrap; - top: -1.5px; - - /* font-weight: bold; */ -} - -.Personal-properties-prop-key-comments{ - /* color: rgb(129, 129, 129); TODO*/ - color: #646464; - font-size: 9px; - font-style: italic; - text-align: end; - white-space:normal; - /* filter: drop-shadow(-.5px -.5px 0px #616161); */ -} -.Personal-properties-prop-values{ - width: 55%; - display: flex; - flex-direction: column; - justify-content: left; - padding: 0px; - gap: 5px; - -} - -.Personal-properties-prop-value{ - /* width: 55%; */ - -} \ No newline at end of file diff --git a/resources/kek/kek.tmpl b/resources/kek/kek.tmpl deleted file mode 100644 index d5f836a..0000000 --- a/resources/kek/kek.tmpl +++ /dev/null @@ -1 +0,0 @@ -
PIIIIIIZDA
\ No newline at end of file diff --git a/resources/personal-properties/personal-properies.css b/resources/personal-properties/personal-properies.css deleted file mode 100644 index e69de29..0000000 diff --git a/resources/personal-properties/personal-properties.tmpl b/resources/personal-properties/personal-properties.tmpl deleted file mode 100644 index 1f0ce1e..0000000 --- a/resources/personal-properties/personal-properties.tmpl +++ /dev/null @@ -1,30 +0,0 @@ -
- RIGHT FILE!!!! - -
-
{{ .Name }}
-
{{ .BasicBio }}
-
-
- -{{ range $props := .allprops }} -
-
- Test Title: -
-
- {{range $prop := $props}} -
-
{{.Key}}:
-
- {{ range $value := .Values }} -
- {{ $value }} -
- {{ end }} -
-
- {{ end }} -
-
-{{ end }} diff --git a/resources/sys/apps/finder/app.js b/resources/sys/apps/finder/app.js new file mode 100644 index 0000000..5c5e973 --- /dev/null +++ b/resources/sys/apps/finder/app.js @@ -0,0 +1,40 @@ + + +class Finder{ + appId = "finder" + /** + * @param {HTMLElement} appElem + */ + constructor(appElem){ + this.appElem = appElem + } + + Init(){ + console.log("Init") + fetch(`http://localhost:8080/application/${this.appId}/render`) //TODO Move to wde func + .then((response) => response.text()) + .then((html) => { + let newWindow = WebDesktopEnvironment.CreateNewWindow(this.appId, "Finder", 600, 500) + + newWindow.innerHTML = html + + let closeButton = newWindow.children[0].children[0] + + closeButton.addEventListener('click', function (params) { + WebDesktopEnvironment.CloseWindow(newWindow) + }) + }) + .catch((error) => { + WebDesktopEnvironment.Alert(error); + }); + } + + CloseWindow(id){ + console.log(id+"Close") + } + +} + +function reply_click(){ + console.log("QQQQQQQQQQQQQQQQQQQ") +} \ No newline at end of file diff --git a/resources/sys/personal-properties/personal-properies.css b/resources/sys/personal-properties/personal-properies.css new file mode 100644 index 0000000..eb8cd93 --- /dev/null +++ b/resources/sys/personal-properties/personal-properies.css @@ -0,0 +1,166 @@ +.ScrollContent { + width: 100%; + height: 100%; + overflow: scroll; + overflow-x: hidden; + scrollbar-width: none; /* Firefox */ + -ms-overflow-style: none; /* Internet Explorer 10+ */ + + /* Auto layout */ + display: flex; + flex-direction: row; + justify-content: center; + align-items: flex-start; + padding: 0px; +} + +.ScrollContent::-webkit-scrollbar { /* WebKit */ + width: 0; + height: 0; +} + +.PropertiesList{ + /* width: 100%; + height: auto; */ + + /* Inside auto layout */ + order: 0; + align-self: flex-start; + flex-grow: 0; + + /* Auto layout */ + display: flex; + flex-direction: column; + align-items: flex-start; + padding: 12px; + gap:16px; +} + + +.Personal-properties-bio{ + /* width: 100%; + height: auto; */ + /* margin-right: -20px; */ + + /* Inside auto layout */ + flex: none; + order: 0; + align-self: stretch; + flex-grow: 1; + + /* Auto layout */ + display: flex; + flex-direction: row; + align-items: center; + padding: 0px; + margin-right: 20; + gap:15px; +} + + + +.Personal-properties-textbio{ + /* width: 100%; + height: auto; */ + + /* Inside auto layout */ + flex: none; + order: 0; + align-self: stretch; + flex-grow: 1; + + /* Auto layout */ + display: flex; + flex-direction: column; + align-items: left; + padding: 0px; + gap:1px; +} + + +.Personal-properties-prop{ + width: 100%; + height: auto; + border: 1px solid #888888; + box-shadow: 1px 1px 0px #FFFFFF, inset 1px 1px 0px #FFFFFF; + padding-bottom: 10px; + + /* Auto layout */ + /* display: flex; + flex-direction: column; + align-items: center; + padding: 0px; + gap:1px; */ +} + + + + +.Personal-properties-prop-title{ + font-family: "Virtue"; + letter-spacing: 0.35px; + position:relative; + display: inline-block; + max-width: 100%; + background-color: #DDDDDD; + left: 12px; + top: -9px; +} + +.Personal-properties-prop-content{ + width: 100%; + /* top: 0px; */ + /* Auto layout */ + display: flex; + flex-direction: column; + justify-content: center; + padding: 0px; + gap: 12px; +} + +.Personal-properties-prop-row{ + margin-left: 12px; + margin-right: 12px; + /* Auto layout */ + display: flex; + flex-direction: row; + justify-content: center; + padding: 0px; + gap: 5px; +} +.Personal-properties-prop-key{ + position: relative; + font-family: "Virtue"; + font-size: 11px; + letter-spacing: 0.35px; + text-align: end; + width: 34%; + white-space: nowrap; + top: -1.5px; + + /* font-weight: bold; */ +} + +.Personal-properties-prop-key-comments{ + /* color: rgb(129, 129, 129); TODO*/ + color: #646464; + font-size: 9px; + font-style: italic; + text-align: end; + white-space:normal; + /* filter: drop-shadow(-.5px -.5px 0px #616161); */ +} +.Personal-properties-prop-values{ + width: 55%; + display: flex; + flex-direction: column; + justify-content: left; + padding: 0px; + gap: 5px; + +} + +.Personal-properties-prop-value{ + /* width: 55%; */ + +} \ No newline at end of file diff --git a/resources/personal-properties/personal-properties.js b/resources/sys/personal-properties/personal-properties.js similarity index 58% rename from resources/personal-properties/personal-properties.js rename to resources/sys/personal-properties/personal-properties.js index 4f86d82..83e69f3 100644 --- a/resources/personal-properties/personal-properties.js +++ b/resources/sys/personal-properties/personal-properties.js @@ -1,3 +1,4 @@ +// const simpleScrollbar = require("../wde/simple-scrollbar"); class PersonalProperties{ @@ -11,24 +12,29 @@ class PersonalProperties{ Init(){ console.log("Init") - // this.appElem.innerHTML = WebDesktopEnvironment.GetBasicWindow() - // console.log(this.appElem) - // let contentFrame = this.appElem.children[0].children[0].children[1] fetch("http://localhost:8080/application/personal-properties/render") //TODO Move to wde func .then((response) => response.text()) .then((html) => { - let newWindow = WebDesktopEnvironment.CreateNewWindow(this.appId, "Personal Properties", 350, 750) //TODO Get ~70% of user screen height + //TODO Get ~70% of user screen height + let newWindow = WebDesktopEnvironment.CreateNewWindow(this.appId, "Personal Properties", 300, 500) newWindow.innerHTML = html - // document.getElementById("closeWindowButton").onclick = function jsFunc() { - // console.log("keeek") - // } - - // console.log(newWindow.children[0].children[0]) let closeButton = newWindow.children[0].children[0] - // console.log(closeButton) - // // closeButton.onclick = this.CloseWindow("test") + let scrollDiv = newWindow.children[1] + // console.log(scrollDiv) + let scrollBar = new WdeScrollBar(scrollDiv.children[1].children[0]) + console.log(scrollBar) + + // scrollBar.BindHandler(scrollDiv.children[1].children[0]) + // scrollBar.BindHandler(scrollDiv.children[1].children[0]) + + // SimpleScrollbar.initEl(scrollDiv) + + // console.log("SimpleBar" + SimpleScrollbar) + + // SimpleScrollbar.initAll(); + closeButton.addEventListener('click', function (params) { WebDesktopEnvironment.CloseWindow(newWindow) }) diff --git a/resources/sys/wde/wde-scrollbar.js b/resources/sys/wde/wde-scrollbar.js new file mode 100644 index 0000000..cd9988e --- /dev/null +++ b/resources/sys/wde/wde-scrollbar.js @@ -0,0 +1,83 @@ +class WdeScrollBar{ + // max = 0 + // isDragged = false + /** + * @param {HTMLElement} handler + */ + constructor(handler){ + console.log( handler.clientHeight) + let max = handler.parentElement.clientHeight - handler.clientHeight + let yOffset = null + let yPosInit = 0 + handler.addEventListener('mousedown', (event) => { + // yOffset = event.offsetY + yPosInit = event.clientY - Number(handler.style.top.replace('px','' )) + + + + // console.log() + document.addEventListener('mousemove', drag); + document.addEventListener('mouseup', stop) + //TODO Document dissallow select + }) + + function drag() { + + console.log(event.clientY - yPosInit, Number(handler.style.top.replace('px','' ))) + + let pos = event.clientY - yPosInit + let clampPos = Math.min(Math.max(pos, 0), max) + handler.style.top = clampPos + "px"; + + + // let yPos = Number(handler.style.top.replace('px', 0)) + // console.log(event) + // console.log(yOffset) + // console.log(event.movementY) + + // let pos = event.clientY - handler.clientHeight + + + // console.log(pos) + // let pos2 = yPos + event.movementY + // console.log(event.clientY - yPosInit) + // console.log(event.offsetY) + // yPos += event.yOffset + // handler.style.top = event.clientY - yPosInit + 'px' + // console.log(handler.Y) + // let pos = yPosInit - event.clientY + // let newPos = Math.min(Math.max(pos, 0), max) + // console.log(handler.style.top , event.offsetY) + // handler.style.top = event.clientY+ "px"; + } + + function stop() { + console.log("stop") + document.removeEventListener('mousemove', drag); + document.removeEventListener('mouseup', stop) + } + } + // /** + // * @param {HTMLElement} element + // */ + // BindHandler(element) { + // element.addEventListener('mousedown', (event) => { + // this.isDragged = + // element.addEventListener('mouseup', this.stop); + // }); + // element.removeEventListener + // } + + // drag(){ + + // } + // stop(doc){ + // console.log("stop") + // doc.removeEventListener('mouseup', (event) => { + // this.stop(document) + // }); + // } + // MoveHandler(param) { + // console.log("Move") + // } +} \ No newline at end of file diff --git a/resources/wde.js b/resources/wde.js index 5489367..b870637 100644 --- a/resources/wde.js +++ b/resources/wde.js @@ -12,6 +12,7 @@ class WebDesktopEnvironment{ .then((html) => { WebDesktopEnvironment.SetBasicWindow(html) let app = this.loadApp("personal-properties") + // let finder = this.loadApp("finder") }) .catch((error) => { WebDesktopEnvironment.Alert(error); @@ -30,7 +31,7 @@ class WebDesktopEnvironment{ let script = document.createElement("script") - script.setAttribute("src", "http://localhost:8080/system/applications/personal-properties/app.js") + script.setAttribute("src", `http://localhost:8080/system/applications/${appId}/app.js`) script.setAttribute("async", "false") appElem.appendChild(script) script.addEventListener("load", function () { @@ -39,7 +40,7 @@ class WebDesktopEnvironment{ }, false) } - /** + /** * @param {string} appId * @param {string} windowName * @param {number} width @@ -71,14 +72,12 @@ class WebDesktopEnvironment{ static basicWindow /** - * * @param {string} html */ static SetBasicWindow(html){ this.basicWindow = html } /** - * * @returns {string} */ static GetBasicWindow(){ @@ -127,7 +126,6 @@ class WindowsCompositor{ } else { } - }) } diff --git a/resources/wdeUI.css b/resources/wdeUI.css index f9f8fe1..aa1975d 100644 --- a/resources/wdeUI.css +++ b/resources/wdeUI.css @@ -1,6 +1,25 @@ .StandartApplicationWindow{ - width: 100%; - min-height: 200px; + /* Auto layout */ + display: flex; + flex-direction: column; + align-items: flex-start; + padding: 4px; + padding-right: 6px; + gap: 4px; + + position: relative; + + background: #CCCCCC; + border: 1px solid #000000; + box-shadow: 1px 1px 0px rgba(0, 0, 0, 0.25), inset -1px -1px 0px rgba(0, 0, 0, 0.27), inset 1px 1px 0px #FFFFFF; + + /* Inside auto layout */ + flex: none; + order: 1; + align-self: stretch; + flex-grow: 1; + /* width: 100%; + background-color: #CCCCCC; @@ -13,10 +32,32 @@ flex-direction: column; align-items: flex-start; padding: 4px; - /* padding-bottom: 50px; */ + gap:4px; + overflow: hidden; */ +} + +.ContentBorder { + width: 100%; + height: 100%; + background-color: #DDDDDD; + border: 1px solid #000000; + + box-shadow: -1px -1px 0px rgba(0, 0, 0, 0.25), + 1px 1px 0px #FFFFFF, + inset -1px -1px 0px rgba(0, 0, 0, 0.27), + inset 1px 1px 0px #FFFFFF; + overflow: hidden; + overflow-x: hidden; + + /* Auto layout */ + display: flex; + flex-direction: row; + justify-content: center; + align-items: flex-start; + padding: 0px; } .WindowFrameTopBarButton{ @@ -47,6 +88,12 @@ justify-content: space-between; gap: 5px; padding: 0px; + + /* Inside auto layout */ + flex: none; + order: 0; + align-self: stretch; + flex-grow: 0; } .WindowFrameTopBar .WindowFrameTitle{ @@ -76,4 +123,91 @@ background: linear-gradient(transparent 0%,white 0%, white 50%, transparent 50%); background-size: 2px 2px; filter: drop-shadow(1px 1px 0px #777777); +} + + + + + + + + + + + + + + + + + + + +.scroller { + overflow-y: scroll; + scrollbar-color: #0A4C95 #C2D2E4; + border-radius: 0px; + } + + .scroll_content { + position: relative; + width: 400px; + height: 414px; + top: -17px; + padding: 20px 10px 20px 10px; + overflow-y: auto; +} + +.ScrollbarPlace{ + overflow: hidden; + + border-left: 1px solid #000000; + width: 14px; + height: 100%; + + bottom: 0px; + right: 0px; + width: 14px; + height: 100%; + + background-color: #AAAAAA; + box-shadow: inset -1px 0px 0px rgba(255, 255, 255, 0.29), inset -2px 0px 0px rgba(255, 255, 255, 0.19), inset 1px 1px 0px rgba(0, 0, 0, 0.14), inset 2px 2px 0px rgba(0, 0, 0, 0.19); + + /* Inside auto layout */ + flex: none; + order: 0; + align-self: stretch; + flex-grow: 1; +} + + +.ScrollBarScrollElement{ + position: relative; + + width: 14px; + height: 31px; + background: #9999FF; + + box-shadow: 0px -1px 0px #000000, 0px 1px 0px #000000, 0px 2px 0px rgba(0, 0, 0, 0.13), 0px 3px 0px rgba(0, 0, 0, 0.19), inset 0px 1px 0px rgba(255, 255, 255, 0.5), inset 1px 0px 0px rgba(255, 255, 255, 0.5), inset -1px -1px 0px rgba(102, 102, 204, 0.91); + + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-around; + gap: 5px; + padding: 0px; +} + +.ScrollBarScrollElementDrag{ + pointer-events: none; + /* background-color: #0A4C95; */ + width: 7px; + height: 7px; + margin-left: -1px; + + background: linear-gradient(transparent 0%,#CCCCFF 0%, #CCCCFF 50%, transparent 50%); + background-size: 2px 2px; + + /* TODO white pixels in rows start */ + filter: drop-shadow(1px 1px 0px #333399); } \ No newline at end of file diff --git a/templates/base/index.tmpl b/templates/base/index.tmpl index d8c90a9..c37212d 100644 --- a/templates/base/index.tmpl +++ b/templates/base/index.tmpl @@ -4,6 +4,9 @@ + + + diff --git a/templates/finder/app.tmpl b/templates/finder/app.tmpl new file mode 100644 index 0000000..3bdce64 --- /dev/null +++ b/templates/finder/app.tmpl @@ -0,0 +1,5 @@ +{{ define "finder/app.tmpl" }} + Test Finder +{{ end }} + + \ No newline at end of file diff --git a/templates/personal-properties/app.tmpl b/templates/personal-properties/app.tmpl index b3a8696..195d5f4 100644 --- a/templates/personal-properties/app.tmpl +++ b/templates/personal-properties/app.tmpl @@ -7,18 +7,68 @@ About me
- -
-
+ +
+
+
My Photo
{{ .Name }}
{{ .BasicBio }}
-
+
{{ range $propIsland := .allprops }} +
+
+ {{$propIsland.Header}}: +
+
+ {{range $prop := $propIsland.Props}} +
+
+ {{$prop.Key}}: + {{ range $value := $prop.KeyComments }} +
+ {{ $value }} +
+ {{ end }} +
+
+ {{ range $value := $prop.Values }} +
+ {{ $value }} +
+ {{ end }} +
+
+ {{ end }} +
+
+ {{ end }} +
+
+
+
+
+
+
+
+ +
diff --git a/websiteapp/finder/finder.go b/websiteapp/finder/finder.go new file mode 100644 index 0000000..c37345d --- /dev/null +++ b/websiteapp/finder/finder.go @@ -0,0 +1,22 @@ +package finder + +import ( + "personalwebsite/websiteapp" + + "github.com/gin-gonic/gin" +) + +type FinerApplication struct { + manifest websiteapp.ApplicationManifest +} + +func (f *FinerApplication) GetManifest() websiteapp.ApplicationManifest { + return f.manifest +} +func (f *FinerApplication) GetId() string { + return f.manifest.AppId +} + +func (f *FinerApplication) Render() gin.H { + return gin.H{} +}