Commit 6cc163b030295764737357d696d4156232b3221c
2024-09-27T16:46:39
wip test/httpd nav and File.read_all
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
diff --git a/README.md b/README.md
index 584972d..aac28d9 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Supported architectures :
### Install dependencies
-#### Debian / Ubuntu / PopOS
+#### Debian / Ubuntu / PopOS / Mint
```
# install build tools
@@ -45,11 +45,11 @@ sudo apt install pkg-config clang libtool-bin make ruby time
# install dependencies
sudo apt install libffi-dev libbsd-dev libevent-dev
+# install demo dependencies
+sudo apt install libsdl2-dev libxkbcommon-dev libfreetype-dev
+
# use clang
export CC=clang
-
-# create symlinks to libs
-make lib_links
```
diff --git a/httpd/fx/app/controllers/fx_controller.kc3 b/httpd/fx/app/controllers/fx_controller.kc3
index a1d3fa0..63d6c2d 100644
--- a/httpd/fx/app/controllers/fx_controller.kc3
+++ b/httpd/fx/app/controllers/fx_controller.kc3
@@ -134,7 +134,7 @@ defmodule FXController do
def tag_route = fn (req) {
if (req.url == "/tag" ||
Str.starts_with?(req.url, "/tag/")) do
- ["", "tag", tag | url] = Str.split(req.url, "/")
+ ["", "tag", tag | url] = Str.split(req.url, "/")
path = "./fx" + req.url
if (req.method == GET) do
response = tag_create(path, tag)
@@ -148,4 +148,55 @@ defmodule FXController do
end
}
+ def property_create = fn (path, property, value) {
+ body = """
+<html>
+ <head>
+ <title>Property create</title>
+ </head>
+ <body>
+ <p><h1>Property create</h1></p>
+ <p>Path : #{HTML.escape(inspect(path))}</p>
+ <p>Property : #{HTML.escape(inspect(property))}</p>
+ <p>Value : #{HTML.escape(inspect(value))}</p>
+ </body>
+</html>
+"""
+ %HTTP.Response{body: body}
+ }
+
+ def property_delete = fn (path, property, value) {
+ body = """
+<html>
+ <head>
+ <title>Property delete</title>
+ </head>
+ <body>
+ <p><h1>Property delete</h1></p>
+ <p>Path : #{HTML.escape(inspect(path))}</p>
+ <p>Property : #{HTML.escape(inspect(property))}</p>
+ <p>Value : #{HTML.escape(inspect(value))}</p>
+ </body>
+</html>
+"""
+ %HTTP.Response{body: body}
+ }
+
+ def property_route = fn (req) {
+ if (req.url == "/property" ||
+ Str.starts_with?(req.url, "/property/")) do
+ ["", "property", property, value | url] = Str.split(req.url, "/")
+ path = "./fx" + req.url
+ if (req.method == GET) do
+ response = property_create(path, property, value)
+ else
+ if (req.method == DELETE) do
+ response = property_delete(path, property, value)
+ else
+ error_404_page(req)
+ end
+ end
+ end
+ }
+
end
diff --git a/httpd/fx/config/routes.kc3 b/httpd/fx/config/routes.kc3
index b75b2be..31443b0 100644
--- a/httpd/fx/config/routes.kc3
+++ b/httpd/fx/config/routes.kc3
@@ -2,7 +2,7 @@ def HTTPd.routes = []
def_route("/fx/", FXController.fx_route)
def_route("/tag/", FXController.tag_route)
-#def_route("/property/", FXController.property_route)
+def_route("/property/", FXController.property_route)
def_static_route("/file", "./fx/", 1)
diff --git a/test/httpd/app/controllers/doc_controller.kc3 b/test/httpd/app/controllers/doc_controller.kc3
index 3b0b56b..f9d29fd 100644
--- a/test/httpd/app/controllers/doc_controller.kc3
+++ b/test/httpd/app/controllers/doc_controller.kc3
@@ -63,7 +63,7 @@ defmodule DocController do
index = doc_index("./doc/", path_html)
menu = DocView.render_menu(index)
title = "kc3-lang.org"
- html = File.read(path_html)
+ html = File.read_all(path_html)
page = DocView.render_show(menu, html)
body = LayoutView.render(title, page)
%HTTP.Response{body: body}
@@ -73,7 +73,7 @@ defmodule DocController do
index = doc_index("./doc/", path_md)
menu = DocView.render_menu(index)
title = "kc3-lang.org"
- md = File.read(path_md)
+ md = File.read_all(path_md)
html = Markdown.to_html_str(md)
page = DocView.render_show(menu, html)
body = LayoutView.render(title, page)
diff --git a/test/httpd/app/templates/footer.html.ekc3 b/test/httpd/app/templates/footer.html.ekc3
new file mode 100644
index 0000000..abf96ec
--- /dev/null
+++ b/test/httpd/app/templates/footer.html.ekc3
@@ -0,0 +1,5 @@
+<footer>
+ <a href="https://kmx.io/">kmx.io</a>
+ <a href="https://git.kmx.io/kc3-lang/kc3">kc3_httpd</a>
+ <a href="https://kc3-lang.org/release/v0.1.13/">v0.1.13</a>
+</footer>
diff --git a/test/httpd/app/templates/layout.html.ekc3 b/test/httpd/app/templates/layout.html.ekc3
index 01ecf1f..2ce18c6 100644
--- a/test/httpd/app/templates/layout.html.ekc3
+++ b/test/httpd/app/templates/layout.html.ekc3
@@ -13,7 +13,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="/_images/kc3.16.png">
</head>
<body>
- <%= raw EKC3.render_file("app/templates/nav.html.ekc3") %>
+ <%= raw nav %>
<%= raw page %>
</body>
</html>
diff --git a/test/httpd/app/views/layout_view.kc3 b/test/httpd/app/views/layout_view.kc3
index e3043d1..672aada 100644
--- a/test/httpd/app/views/layout_view.kc3
+++ b/test/httpd/app/views/layout_view.kc3
@@ -2,6 +2,10 @@ defmodule LayoutView do
def template = EKC3.load("app/templates/layout.html.ekc3")
+ def template_nav = EKC3.load("app/templates/nav.html.ekc3")
+
+ def nav = EKC3.render(template_nav)
+
def render = fn (title, page) {
EKC3.render(template)
}