From 19f4136744c188062ae3ac57f9f88195b3a650f5 Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sat, 13 Dec 2014 01:53:12 +0000 Subject: [PATCH 1/6] added route to serve static files --- www/public/images/public_images_here | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/public/images/public_images_here diff --git a/www/public/images/public_images_here b/www/public/images/public_images_here new file mode 100644 index 0000000..e69de29 From 9b5384994e05ac14119b2253aed6845814f09175 Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sat, 13 Dec 2014 01:54:32 +0000 Subject: [PATCH 2/6] added remaining folders --- www/public/scripts/public_js_scripts_here | 0 www/public/stylesheets/public_css_files_here | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 www/public/scripts/public_js_scripts_here create mode 100644 www/public/stylesheets/public_css_files_here diff --git a/www/public/scripts/public_js_scripts_here b/www/public/scripts/public_js_scripts_here new file mode 100644 index 0000000..e69de29 diff --git a/www/public/stylesheets/public_css_files_here b/www/public/stylesheets/public_css_files_here new file mode 100644 index 0000000..e69de29 From 94dd677890355763c0b842b3c86763f944a64d06 Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sat, 13 Dec 2014 02:07:52 +0000 Subject: [PATCH 3/6] changed documentation --- README.md | 3 +++ src/app/controller/HomeController.hx | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/README.md b/README.md index c3eb880..a350956 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,9 @@ Contributions welcome! # Run a temporary server (Neko) (or shorter: `ufront s`) ufront server + **or** + cd www + nekotools server -rewrite -p 8000 -h localhost -d ./ # Run a temporary server (PHP) php -S localhost:8000 diff --git a/src/app/controller/HomeController.hx b/src/app/controller/HomeController.hx index 210ab3b..331b54f 100644 --- a/src/app/controller/HomeController.hx +++ b/src/app/controller/HomeController.hx @@ -14,6 +14,16 @@ class HomeController extends Controller { @:route("/ufadmin/*") public var ufAdminController:UFAdminHomeController; + /** + * Serve static files in ./public directory. + * In production mode it is preferable to use the server (nginx, apache etc..) to + * serve static files instead. + */ + @:route(GET, "/public/*") + function getPublicResource(rest:Array) { + return new DirectFilePathResult(rest.join('/')); + } + @:route(GET, "/$name") function homepage( ?name:String="World" ) { ufTrace( 'Hey $name, did you know you can trace straight to the browser console?' ); From 3da83925188761e9ddffc966845e0ba442c00093 Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sun, 1 Mar 2015 00:43:17 +0000 Subject: [PATCH 4/6] added server subfolder --- server.hxml | 2 +- src/{ => server}/Config.hx | 0 src/{ => server}/Server.hx | 0 src/{ => server}/Tasks.hx | 0 src/{ => server}/app/Permissions.hx | 0 src/{ => server}/app/api/SignupApi.hx | 0 src/{ => server}/app/controller/HomeController.hx | 0 src/{ => server}/app/model/Registration.hx | 0 src/{ => server}/conf/app.json | 0 src/{ => server}/conf/mysql.json | 0 src/{ => server}/conf/smtp.json | 0 tasks.hxml | 2 +- test.hxml | 2 +- 13 files changed, 3 insertions(+), 3 deletions(-) rename src/{ => server}/Config.hx (100%) rename src/{ => server}/Server.hx (100%) rename src/{ => server}/Tasks.hx (100%) rename src/{ => server}/app/Permissions.hx (100%) rename src/{ => server}/app/api/SignupApi.hx (100%) rename src/{ => server}/app/controller/HomeController.hx (100%) rename src/{ => server}/app/model/Registration.hx (100%) rename src/{ => server}/conf/app.json (100%) rename src/{ => server}/conf/mysql.json (100%) rename src/{ => server}/conf/smtp.json (100%) diff --git a/server.hxml b/server.hxml index 8bbb1b9..c07a9f4 100644 --- a/server.hxml +++ b/server.hxml @@ -1,4 +1,4 @@ --cp src +-cp src/server -lib ufront:1.0.0-rc.13 -lib ufront-mail:1.0.0-rc.4 -lib erazor:1.0.0-rc.1 diff --git a/src/Config.hx b/src/server/Config.hx similarity index 100% rename from src/Config.hx rename to src/server/Config.hx diff --git a/src/Server.hx b/src/server/Server.hx similarity index 100% rename from src/Server.hx rename to src/server/Server.hx diff --git a/src/Tasks.hx b/src/server/Tasks.hx similarity index 100% rename from src/Tasks.hx rename to src/server/Tasks.hx diff --git a/src/app/Permissions.hx b/src/server/app/Permissions.hx similarity index 100% rename from src/app/Permissions.hx rename to src/server/app/Permissions.hx diff --git a/src/app/api/SignupApi.hx b/src/server/app/api/SignupApi.hx similarity index 100% rename from src/app/api/SignupApi.hx rename to src/server/app/api/SignupApi.hx diff --git a/src/app/controller/HomeController.hx b/src/server/app/controller/HomeController.hx similarity index 100% rename from src/app/controller/HomeController.hx rename to src/server/app/controller/HomeController.hx diff --git a/src/app/model/Registration.hx b/src/server/app/model/Registration.hx similarity index 100% rename from src/app/model/Registration.hx rename to src/server/app/model/Registration.hx diff --git a/src/conf/app.json b/src/server/conf/app.json similarity index 100% rename from src/conf/app.json rename to src/server/conf/app.json diff --git a/src/conf/mysql.json b/src/server/conf/mysql.json similarity index 100% rename from src/conf/mysql.json rename to src/server/conf/mysql.json diff --git a/src/conf/smtp.json b/src/server/conf/smtp.json similarity index 100% rename from src/conf/smtp.json rename to src/server/conf/smtp.json diff --git a/tasks.hxml b/tasks.hxml index 8ccc729..02d3a9e 100644 --- a/tasks.hxml +++ b/tasks.hxml @@ -1,4 +1,4 @@ --cp src +-cp src/server -lib ufront:1.0.0-rc.13 -lib ufront-mail:1.0.0-rc.4 -lib erazor:1.0.0-rc.1 diff --git a/test.hxml b/test.hxml index e5cb270..6b63eb3 100644 --- a/test.hxml +++ b/test.hxml @@ -1,4 +1,4 @@ --cp src +-cp src/server -cp test/src -lib ufront:1.0.0-rc.13 -lib ufront-mail:1.0.0-rc.4 From b7337867d5d681ac16ae15f9af9f925879384f8b Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sun, 1 Mar 2015 00:45:49 +0000 Subject: [PATCH 5/6] removed static file route --- src/server/app/controller/HomeController.hx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/server/app/controller/HomeController.hx b/src/server/app/controller/HomeController.hx index 270aa92..23dc9f6 100644 --- a/src/server/app/controller/HomeController.hx +++ b/src/server/app/controller/HomeController.hx @@ -14,16 +14,6 @@ class HomeController extends Controller { @:route("/ufadmin/*") public var ufAdminController:UFAdminHomeController; - /** - * Serve static files in ./public directory. - * In production mode it is preferable to use the server (nginx, apache etc..) to - * serve static files instead. - */ - @:route(GET, "/public/*") - function getPublicResource(rest:Array) { - return new DirectFilePathResult(rest.join('/')); - } - @:route(GET, "/$name") public function homepage( ?name:String="World" ) { ufTrace( 'Hey $name, did you know you can trace straight to the browser console?' ); From 49fcb2aa5c252e8c8cc53902e98e2a7144dd900e Mon Sep 17 00:00:00 2001 From: TiagoLr Date: Sun, 1 Mar 2015 00:49:35 +0000 Subject: [PATCH 6/6] README.md change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85f2ee8..bccf406 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Contributions welcome! ufront server **or** cd www - nekotools server -rewrite -p 8000 -h localhost -d ./ + nekotools server # Run a temporary server (PHP) php -S localhost:2987