From b523bea07ec2571e6d7969fe051e5a896da1a7fd Mon Sep 17 00:00:00 2001
From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Thu, 5 Sep 2019 20:19:26 -0500
Subject: [PATCH] bug fixes

---
 .gitignore                                | 3 ++-
 Tuprules.tup => codebox/Tuprules.tup      | 0
 codebox/controllers/account/register.moon | 4 ++--
 docker-compose.yaml                       | 4 ++++
 executer/Tuprules.tup                     | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)
 rename Tuprules.tup => codebox/Tuprules.tup (100%)
 create mode 100644 executer/Tuprules.tup

diff --git a/.gitignore b/.gitignore
index ca9a1b8..fa6efdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 config.env
 .tup/
-.vscode/
\ No newline at end of file
+.vscode/
+data/
\ No newline at end of file
diff --git a/Tuprules.tup b/codebox/Tuprules.tup
similarity index 100%
rename from Tuprules.tup
rename to codebox/Tuprules.tup
diff --git a/codebox/controllers/account/register.moon b/codebox/controllers/account/register.moon
index 0f3bc6b..9c29596 100644
--- a/codebox/controllers/account/register.moon
+++ b/codebox/controllers/account/register.moon
@@ -17,9 +17,9 @@ make_controller
 		@flow 'csrf_validate'
 
 		assert_valid @params, {
-			{ "username", exists: true, min_length: 2, matches_pattern: "%S+" }
+			{ "username", exists: true, min_length: 2, matches_pattern: "^%w+$" }
 			{ "nickname", exists: true, min_length: 2 }
-			{ "email", exists: true, min_length: 4, matches_pattern: "%S+@%S+%.%S+" }
+			{ "email", exists: true, min_length: 4, matches_pattern: "^%S+@%S+%.%S+$" }
 			{ "password", exists: true, min_length: 2 }
 			{ "password_confirmation", exists: true, min_length: 2, equals: @params.password, 'Passwords must be the same' }
 		}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 195f128..ce1d1bd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -41,8 +41,12 @@ services:
     postgres:
         env_file:
             - config.env
+        environment:
+            PGDATA: /var/lib/postgresql/data/pgdata
         image: "postgres:12-alpine"
         restart: always
+        volumes:
+            - ./data:/var/lib/postgresql/data/pgdata
         networks:
             appnet:
                 ipv4_address: 192.168.0.2
diff --git a/executer/Tuprules.tup b/executer/Tuprules.tup
new file mode 100644
index 0000000..d3dceca
--- /dev/null
+++ b/executer/Tuprules.tup
@@ -0,0 +1 @@
+: foreach *.coffee |> coffee -c -o %B.js %f |> %B.js
\ No newline at end of file
-- 
2.25.1