diff --git a/server/main.go b/server/main.go
index ad4cb98..025090e 100644
--- a/server/main.go
+++ b/server/main.go
@@ -118,7 +118,7 @@ func handleSite(w http.ResponseWriter, r *http.Request) {
func serveSiteFiles(w http.ResponseWriter, r *http.Request) {
path := r.URL.Path
- if(strings.Contains(path, "75820185")) {
+ if(strings.Contains(path, "75820185")) { // necessary because, if we are at a url path 2 layers or more, the browser will insert that path at the beginning of the url
_, after, _ := strings.Cut(path, "75820185")
path = after
} else {
diff --git a/ui/_/code/quill.js b/ui/_/code/quill.js
index 7546c0f..58f77c4 100644
--- a/ui/_/code/quill.js
+++ b/ui/_/code/quill.js
@@ -1,3 +1,10 @@
+/*
+ Sam Russell
+ Captured Sun
+ 11.6.25 - adding default value for "button()" "children" parameter
+ 10.29.25 - adding "gap()" and "label()" functions
+*/
+
/* $ NAVIGATION */
let oldPushState = history.pushState;
history.pushState = function pushState() {
@@ -601,7 +608,7 @@ window.span = function (innerText) {
return el
}
-window.button = function (children) {
+window.button = function (children = "") {
let el = document.createElement("button")
quill.setChildren(el, children)
quill.render(el)
diff --git a/ui/map.html b/ui/map.html
deleted file mode 100644
index c34aa98..0000000
--- a/ui/map.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Satellite Map with Custom Interactive Elements
-
-
-
-
-
-
-
-
Points of Interest
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/site/apps/Market.js b/ui/site/apps/Market.js
index 2222899..b6d88ee 100644
--- a/ui/site/apps/Market.js
+++ b/ui/site/apps/Market.js
@@ -19,7 +19,6 @@ css(`
input[type="checkbox"]:checked {
background-color: var(--red);
-
}
`)
@@ -29,6 +28,7 @@ class Market extends Shadow {
ZStack(() => {
HStack(() => {
VStack(() => {
+
HStack(() => {
input()
.attr({
@@ -41,6 +41,7 @@ class Market extends Shadow {
})
.marginLeft(0.5, em)
})
+
HStack(() => {
input()
.attr({
@@ -53,6 +54,32 @@ class Market extends Shadow {
})
.marginLeft(0.5, em)
})
+
+ HStack(() => {
+ input()
+ .attr({
+ "type": "checkbox",
+ "id": "new-check"
+ })
+ label("New")
+ .attr({
+ "for": "new-check"
+ })
+ .marginLeft(0.5, em)
+ })
+
+ HStack(() => {
+ input()
+ .attr({
+ "type": "checkbox",
+ "id": "used-check"
+ })
+ label("Used")
+ .attr({
+ "for": "used-check"
+ })
+ .marginLeft(0.5, em)
+ })
})
.paddingLeft(3, em)
.gap(1, em)
@@ -66,7 +93,7 @@ class Market extends Shadow {
.transform("translate(-50%, -50%)")
HStack(() => {
- input("Search for products...", "50vw")
+ input("Search for products...", "45vw")
.attr({
"type": "text"
})
@@ -77,6 +104,7 @@ class Market extends Shadow {
.outline("none")
.color("var(--accent)")
.borderRadius(10, px)
+
button("Search")
.marginLeft(2, em)
.borderRadius(10, px)
@@ -84,8 +112,18 @@ class Market extends Shadow {
.border("1px solid var(--accent)")
.color("var(--accent)")
.fontFamily("Bona Nova")
+
+ button("+ Add Item")
+ .width(7, em)
+ .marginLeft(1, em)
+ .borderRadius(10, px)
+ .background("transparent")
+ .border("1px solid var(--accent)")
+ .color("var(--accent)")
+ .fontFamily("Bona Nova")
+
})
- .x(50, vw).y(5, vh)
+ .x(55, vw).y(5, vh)
.position("absolute")
.transform("translateX(-50%)")
})
diff --git a/ui/site/components/Home.js b/ui/site/components/Home.js
index eb351f8..8ef142c 100644
--- a/ui/site/components/Home.js
+++ b/ui/site/components/Home.js
@@ -58,8 +58,8 @@ class Home extends Shadow {
.top("3em")
.right("2em")
.background("transparent")
- .border("1px solid var(--tan)")
- .color("var(--tan)")
+ .border(window.location.pathname === "/" ? "1px solid var(--tan)" : "1px solid var(--accent)")
+ .color(window.location.pathname === "/" ? "var(--tan)" : "var(--accent)")
.borderRadius(5, px)
.onHover(function (hovering) {
console.log('hovering', hovering, this)
@@ -68,10 +68,11 @@ class Home extends Shadow {
this.style.color = "black"
} else {
this.style.background = ""
- this.style.color = "var(--tan)"
+ this.style.color = window.location.pathname === "/" ? "var(--tan)" : "var(--accent)"
}
})
.onNavigate(function () {
+ console.log("navigate")
if(window.location.pathname === "/") {
this.style.border = "1px solid var(--tan)"
this.style.color = "var(--tan)"
@@ -81,7 +82,6 @@ class Home extends Shadow {
}
})
})
-
}
}