+ Test Title:
+
{{range $prop := $props}}
{{ 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/sys/personal-properties/personal-properties.js b/resources/sys/personal-properties/personal-properties.js
new file mode 100644
index 0000000..83e69f3
--- /dev/null
+++ b/resources/sys/personal-properties/personal-properties.js
@@ -0,0 +1,55 @@
+// const simpleScrollbar = require("../wde/simple-scrollbar");
+
+
+class PersonalProperties{
+ appId = "personal-properties"
+ /**
+ * @param {HTMLElement} appElem
+ */
+ constructor(appElem){
+ this.appElem = appElem
+ }
+
+ Init(){
+ console.log("Init")
+ fetch("http://localhost:8080/application/personal-properties/render") //TODO Move to wde func
+ .then((response) => response.text())
+ .then((html) => {
+ //TODO Get ~70% of user screen height
+ let newWindow = WebDesktopEnvironment.CreateNewWindow(this.appId, "Personal Properties", 300, 500)
+
+ newWindow.innerHTML = html
+
+ let closeButton = newWindow.children[0].children[0]
+ 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)
+ })
+ })
+ .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/wde/simple-scrollbar.css b/resources/sys/wde/simple-scrollbar.css
new file mode 100644
index 0000000..718e25e
--- /dev/null
+++ b/resources/sys/wde/simple-scrollbar.css
@@ -0,0 +1,56 @@
+.ss-wrapper {
+ overflow: hidden;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ z-index: 1;
+ float: left;
+}
+
+.ss-content {
+ height: 100%;
+ width: calc(100% + 18px);
+ padding: 0 0 0 0;
+ position: relative;
+ overflow: auto;
+ box-sizing: border-box;
+}
+
+.ss-content.rtl {
+ width: calc(100% + 18px);
+ right: auto;
+}
+
+.ss-scroll {
+ position: relative;
+ background: rgba(0, 0, 0, 0.1);
+ width: 14px;
+ height: 31px;
+ /* border-radius: 4px; */
+ top: 0;
+ z-index: 2;
+ cursor: pointer;
+ /* opacity: 0; */
+ /* transition: opacity 0.25s linear; */
+ background: #9999FF;
+ box-shadow: 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);
+}
+
+.ss-hidden {
+ display: none;
+}
+
+.ss-container:hover .ss-scroll,
+.ss-container:active .ss-scroll {
+ opacity: 1;
+}
+
+.ss-grabbed {
+ -o-user-select: none;
+ -ms-user-select: none;
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ user-select: none;
+}
diff --git a/resources/sys/wde/simple-scrollbar.js b/resources/sys/wde/simple-scrollbar.js
new file mode 100644
index 0000000..2ff768f
--- /dev/null
+++ b/resources/sys/wde/simple-scrollbar.js
@@ -0,0 +1,165 @@
+;(function(root, factory) {
+ if (typeof exports === 'object') {
+ module.exports = factory(window, document)
+ } else {
+ root.SimpleScrollbar = factory(window, document)
+ }
+})(this, function(w, d) {
+ var raf = w.requestAnimationFrame || w.setImmediate || function(c) { return setTimeout(c, 0); };
+
+ function initEl(el) {
+ Object.defineProperty(el, 'data-simple-scrollbar', { value: new SimpleScrollbar(el), configurable: true });
+ }
+
+ function unbindEl(el) {
+ if (!Object.prototype.hasOwnProperty.call(el, 'data-simple-scrollbar')) return;
+ el['data-simple-scrollbar'].unBind();
+ //Remove the elements property
+ delete el['data-simple-scrollbar'];
+ }
+
+ // Mouse drag handler
+ function dragDealer(el, context) {
+ var lastPageY;
+
+ el.addEventListener('mousedown', function(e) {
+ lastPageY = e.pageY;
+ el.classList.add('ss-grabbed');
+ d.body.classList.add('ss-grabbed');
+
+ d.addEventListener('mousemove', drag);
+ d.addEventListener('mouseup', stop);
+
+ return false;
+ });
+
+ function drag(e) {
+ var delta = e.pageY - lastPageY;
+ lastPageY = e.pageY;
+
+ raf(function() {
+ context.el.scrollTop += delta / context.scrollRatio;
+ });
+ }
+
+ function stop() {
+ el.classList.remove('ss-grabbed');
+ d.body.classList.remove('ss-grabbed');
+ d.removeEventListener('mousemove', drag);
+ d.removeEventListener('mouseup', stop);
+ }
+ }
+
+ // Constructor
+ function ss(el) {
+ this.target = el;
+ this.content = el.firstElementChild;
+
+ this.direction = w.getComputedStyle(this.target).direction;
+
+ this.bar = '{{.Key}}:
- {{ .Prop }}
+
+ {{ range $value := .Values }}
+
+ {{ $value }}
+
+ {{ end }}
+ ';
+ //Create a reference to the function binding to remove the event listeners
+ this.mB = this.moveBar.bind(this);
+
+ this.wrapper = d.createElement('div');
+ this.wrapper.setAttribute('class', 'ss-wrapper');
+
+ this.el = d.createElement('div');
+ this.el.setAttribute('class', 'ss-content');
+
+ if (this.direction === 'rtl') {
+ this.el.classList.add('rtl');
+ }
+
+ this.wrapper.appendChild(this.el);
+
+ while (this.target.firstChild) {
+ this.el.appendChild(this.target.firstChild);
+ }
+ this.target.appendChild(this.wrapper);
+
+ this.target.insertAdjacentHTML('beforeend', this.bar);
+ this.bar = this.target.lastChild;
+
+ dragDealer(this.bar, this);
+ this.moveBar();
+
+ w.addEventListener('resize', this.mB);
+ this.el.addEventListener('scroll', this.mB);
+ this.el.addEventListener('mouseenter', this.mB);
+
+ this.target.classList.add('ss-container');
+
+ var css = w.getComputedStyle(el);
+ if (css['height'] === '0px' && css['max-height'] !== '0px') {
+ el.style.height = css['max-height'];
+ }
+
+ this.unBind = function() {
+ //Remove event listeners
+ w.removeEventListener('resize', this.mB);
+ this.el.removeEventListener('scroll', this.mB);
+ this.el.removeEventListener('mouseenter', this.mB);
+
+ this.target.classList.remove('ss-container');
+
+ //Unwrap the initial content and remove remaining wrappers
+ this.target.insertBefore(this.content, this.wrapper);
+ this.target.removeChild(this.wrapper);
+
+ //Remove the bar including its drag-dealer event listener
+ this.target.removeChild(this.bar);
+ this.bar = null; //make way for the garbage collector
+ }
+ }
+
+ ss.prototype = {
+ moveBar: function(e) {
+ var totalHeight = this.el.scrollHeight,
+ ownHeight = this.el.clientHeight,
+ _this = this;
+
+ this.scrollRatio = ownHeight / totalHeight;
+
+ var isRtl = _this.direction === 'rtl';
+ var right = isRtl ?
+ (_this.target.clientWidth - _this.bar.clientWidth + 18) :
+ (_this.target.clientWidth - _this.bar.clientWidth) * -1;
+
+ raf(function() {
+ // Hide scrollbar if no scrolling is possible
+ if(_this.scrollRatio >= 1) {
+ _this.bar.classList.add('ss-hidden')
+ } else {
+ _this.bar.classList.remove('ss-hidden')
+ _this.bar.style.cssText = 'height:' + Math.max(_this.scrollRatio * 100, 10) + '%; top:' + (_this.el.scrollTop / totalHeight ) * 100 + '%;right:' + right + 'px;';
+ }
+ });
+ }
+ }
+
+ function initAll() {
+ var nodes = d.querySelectorAll('*[ss-container]');
+
+ for (var i = 0; i < nodes.length; i++) {
+ initEl(nodes[i]);
+ }
+ }
+
+ function unbindAll() {
+ var nodes = d.querySelectorAll('.ss-container');
+
+ for (var i = 0; i < nodes.length; i++) {
+ unbindEl(nodes[i]);
+ }
+ }
+
+ d.addEventListener('DOMContentLoaded', initAll);
+ ss.initEl = initEl;
+ ss.initAll = initAll;
+ ss.unbindEl = unbindEl;
+ ss.unbindAll = unbindAll;
+
+ var SimpleScrollbar = ss;
+ return SimpleScrollbar;
+});
\ No newline at end of file
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/virtue.ttf b/resources/virtue.ttf
new file mode 100644
index 0000000..c0ff54b
--- /dev/null
+++ b/resources/virtue.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:700761df65c2aa539cd5991e53e6c5349e53d5d4f7b7473a7a4f6d9e408aec92
+size 37204
diff --git a/resources/wde.js b/resources/wde.js
index a4844e5..b870637 100644
--- a/resources/wde.js
+++ b/resources/wde.js
@@ -1,19 +1,18 @@
document.addEventListener('DOMContentLoaded', function() {
wde = new WebDesktopEnvironment
-
}, false);
class WebDesktopEnvironment{
-
constructor(){
this.wc = new WindowsCompositor
//Get basic window ready frame
- fetch("http://192.168.88.10:8080/system/wde/getbasicwindow") //TODO Move to wde func
+ fetch("http://localhost:8080/system/wde/getbasicwindow") //TODO Move to wde func
.then((response) => response.text())
.then((html) => {
WebDesktopEnvironment.SetBasicWindow(html)
let app = this.loadApp("personal-properties")
+ // let finder = this.loadApp("finder")
})
.catch((error) => {
WebDesktopEnvironment.Alert(error);
@@ -27,10 +26,12 @@ class WebDesktopEnvironment{
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("src", `http://localhost:8080/system/applications/${appId}/app.js`)
script.setAttribute("async", "false")
appElem.appendChild(script)
script.addEventListener("load", function () {
@@ -39,16 +40,44 @@ class WebDesktopEnvironment{
}, false)
}
+ /**
+ * @param {string} appId
+ * @param {string} windowName
+ * @param {number} width
+ * @param {number} height
+ * @returns {HTMLElement}
+ */
+ static CreateNewWindow(appId, windowName, width, height) {
+ let appElem = document.getElementById(`application-${appId}`)
+ let newWindow = document.createElement("div")
+ newWindow.setAttribute("class", "StandartApplicationWindow")
+ newWindow.style.position = "absolute"
+ newWindow.style.width = width.toString() + "px"
+ newWindow.style.height = height.toString() + "px"
+ return appElem.appendChild(newWindow)
+ }
+
+ /**
+ * @param {HTMLElement} window
+ */
+ static CloseWindow(window) {
+ let app = window.parentElement
+ window.remove()
+ // console.log(app.childElementCount)
+ if (app.childElementCount < 2){
+ console.log(app)
+ app.remove()
+ }
+ }
+
static basicWindow
/**
- *
* @param {string} html
*/
static SetBasicWindow(html){
this.basicWindow = html
}
/**
- *
* @returns {string}
*/
static GetBasicWindow(){
@@ -56,6 +85,10 @@ class WebDesktopEnvironment{
return this.basicWindow
}
+ /**
+ *
+ * @param {string} alertText
+ */
static Alert(alertText){
console.log(alertText)
}
@@ -93,7 +126,6 @@ class WindowsCompositor{
} else {
}
-
})
}
@@ -101,9 +133,11 @@ class WindowsCompositor{
* @param {MouseEvent} event
*/
catchClick(event){
+
switch (true) {
- case event.target.className == "TestWindowHeader":
- this.movingElement = event.target.parentElement.parentElement.parentElement
+ case event.target.className == "WindowFrameTopBar":
+ this.movingElement = event.target.parentElement
+ // console.log(this.movingElement)
break;
default:
break;
@@ -115,9 +149,10 @@ class WindowsCompositor{
* @param {number} posX
* @param {number} posY
*/
- dragElement(element, posX, posY) {
- element.style.left = posX + "px";
- element.style.top = posY + "px";
+ dragElement(element, posX, posY) { //TODO
+ console.log()
+ element.style.left = (posX - element.clientWidth*0.5)+ "px";
+ element.style.top = (posY - element.children[0].clientHeight*0.5) + "px";
}
}
diff --git a/resources/wdeUI.css b/resources/wdeUI.css
index 924f12a..aa1975d 100644
--- a/resources/wdeUI.css
+++ b/resources/wdeUI.css
@@ -1,24 +1,213 @@
-.WindowFrameTopBarButton{
+.StandartApplicationWindow{
+ /* 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;
+
+ border: 1px solid #000000;
+ box-shadow: 1px 1px 0px #000,
+ inset -1px -1px 0px rgba(0, 0, 0, 0.27),
+ inset 1px 1px 0px #FFFFFF;
+
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ padding: 4px;
+
+ 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{
width: 11px;
height: 11px;
padding: 0%;
- background: #D9D9D9;
+ background: linear-gradient(135deg, #999999 18.18%, #FFFFFF 81.82%);
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);
-
+ inset 1px 1px 0px rgba(255, 255, 255, 0.5),
+ inset -1px -1px 0px rgba(0, 0, 0, 0.27);
+
/* Inside auto layout */
-
flex: none;
order: 0;
flex-grow: 0;
}
+.WindowFrameTopBar{
+ width: 100%;
+ height: 13px;
+
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ gap: 5px;
+ padding: 0px;
+
+ /* Inside auto layout */
+ flex: none;
+ order: 0;
+ align-self: stretch;
+ flex-grow: 0;
+}
+
+.WindowFrameTopBar .WindowFrameTitle{
+ position: relative;
+ top:1px;
+
+ pointer-events: none;
+ white-space: nowrap;
+
+ font-family: "Virtue";
+ letter-spacing: 0.35px;
+
+}
+
+
.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);
+}
+
+
+.WindowDragArea{
+ pointer-events: none;
+ width: 100%;
+ height: 100%;
+ 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
new file mode 100644
index 0000000..c37212d
--- /dev/null
+++ b/templates/base/index.tmpl
@@ -0,0 +1,22 @@
+
+
+ Greg Brzezinski
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
new file mode 100644
index 0000000..195d5f4
--- /dev/null
+++ b/templates/personal-properties/app.tmpl
@@ -0,0 +1,113 @@
+{{ define "personal-properties/app.tmpl" }}
+
+
+
+
+
+
+
+ About me
+
+
+
+
+
+
+{{ end }}
+
+
\ No newline at end of file
diff --git a/templates/posts/index.tmpl b/templates/posts/index.tmpl
new file mode 100644
index 0000000..88f493d
--- /dev/null
+++ b/templates/posts/index.tmpl
@@ -0,0 +1,7 @@
+{{ define "posts/index.tmpl" }}
+
+
+
+
+
+
+
+
+ 
+
+ {{ range $propIsland := .allprops }}
+
+
+
+ {{ .Name }}
+ {{ .BasicBio }}
+
+
+ {{ end }}
+
+ {{$propIsland.Header}}:
+
+
+ {{range $prop := $propIsland.Props}}
+
+
+
+ {{ end }}
+
+ {{$prop.Key}}:
+ {{ range $value := $prop.KeyComments }}
+
+
+ {{ $value }}
+
+ {{ end }}
+
+ {{ range $value := $prop.Values }}
+
+
+ {{ $value }}
+
+ {{ end }}
+ + {{ .title }} +
+Using posts/index.tmpl
+ +{{ end }} \ No newline at end of file diff --git a/templates/users/index.tmpl b/templates/users/index.tmpl new file mode 100644 index 0000000..1d76b6e --- /dev/null +++ b/templates/users/index.tmpl @@ -0,0 +1,7 @@ +{{ define "users/index.tmpl" }} ++ {{ .title }} +
+Using users/index.tmpl
+ +{{ end }} \ No newline at end of file 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{} +} diff --git a/websiteapp/personalprops/personalprops.go b/websiteapp/personalprops/personalprops.go index f17d72a..25aea9b 100644 --- a/websiteapp/personalprops/personalprops.go +++ b/websiteapp/personalprops/personalprops.go @@ -37,57 +37,105 @@ func (p *PersonalPropertiesApp) Render() gin.H { // Title: "Title 2", // Author: "Author 2", // }) - allProps := make([][]Prop, 0) + allProps := make([]PropIsland, 0) - basicInfo := make([]Prop, 0) - - basicInfo = append(basicInfo, Prop{ - Key: "", - Prop: "Greg Brzezinski", - }) - - basicInfo = append(basicInfo, Prop{ - Key: "", - Prop: "Saint-Petersburg", - }) - - // careerkeys := make([]Prop, 0) - careerkeys := []Prop{ - { - Key: "VR lab assistant", - Prop: "111", + // careerProps := make([]Prop, 0) + expertiseIsland := PropIsland{ + Header: "Area Of Expertise", + Props: []PropElement{{ + Key: "Programming", + Values: []string{ + "Creating tools and plugins for artists", + "Editor and basic gameplay scripting", + }, }, - { - Key: "3d artist", - Prop: "qweqwe", - }, - { - Key: "Jr. Techartist", - Prop: "qweqwaaae", + { + Key: "Game Art", + Values: []string{ + "Professional modeling", + "Complete knowledge in CG render theory", + }, + }, }, } - // 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", - }) - - allProps = append(allProps, careerkeys, testKeys, testKeys, testKeys) + eduIsland := PropIsland{ + Header: "Education", + Props: []PropElement{ + { + Key: "Gymnasium 526", + KeyComments: []string{"2005-2015"}, + Values: []string{"Extended natural sciences course", "Additional C++, media production and computer graphics courses", "Winner of conference “The future of a strong Russia is in high technology” in programming section"}, + }, + { + Key: "Lyceum 281", + KeyComments: []string{"2015-2016"}, + Values: []string{"Extended IT and Physical sciences course"}, + }, + { + Key: "University", + KeyComments: []string{"2017-2019"}, + Values: []string{"Faculty: Info-communication Networks and Systems", "Specialty: Information Security"}, + }, + }, + } + careerProps := PropIsland{ + Header: "Career", + Props: []PropElement{ + { + Key: "VR lab assistant", + KeyComments: []string{"Academy of Digital Technologies", "2019-2020"}, + Values: []string{"Teaching lessons for students in Unreal Engine 4, Unity and Blender editor courses", "Training students for World Skills Russia"}, + }, + { + Key: "3d artist", + KeyComments: []string{"Space Time VR", "2020-2020"}, + Values: []string{"Creating 3d assets for VR game"}, + }, + { + Key: "Jr. Techartist", + KeyComments: []string{"MP Games"}, + Values: []string{"Game content integration and production", "Shader coding", "Optimization asset production in artists pipeline"}, + }, + { + Key: "Techartist", + Values: []string{"Game content optimization and production", "Profiling and debugging render pipeline", "Creating in-house tools for pipeline software", "Working process pipeline integration and maintenance", "Linux servers administration"}, + }, + }, + } + volunteerProps := PropIsland{ + Header: "Volunteer Experience", + Props: []PropElement{ + { + Key: "Metrostroi Mod", + Values: []string{ + "Help unite fragmented community on one social platform", + "Worked on social elements of official site, create ranking", + "Took a part on creating ranking system for players", + "Creating models and maps for Steam Workshop"}, + }, + { + Key: "Age of Silence", + Values: []string{ + "Start as tech-artist, create naming system in big ue4 project", + "Promoted to chief of 3d Department", + "Project win Unreal Day 2019", + }, + }, + }, + } + // 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, - // "books": books, - "career": careerkeys, + "Name": "Greg Brzezinski", + "BasicBio": "Born 27.09.1998 at Saint-Petersburg", + // "BasicInfo": basicInfo, + // "career": careerProps, "allprops": allProps, } } @@ -97,9 +145,15 @@ type Book struct { Author string } -type Prop struct { - Key string - Prop string +type PropElement struct { + Key string + KeyComments []string + Values []string +} + +type PropIsland struct { + Header string + Props []PropElement } // func (p *PersonalPropertiesApp) GetContent(ctx *gin.Context) interface{} {