diff --git a/.eslintrc.json b/.eslintrc.json index eea70f52..f4332883 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,5 @@ { + "root": true, "env": { "browser": true, "commonjs": true, diff --git a/.gitignore b/.gitignore index 5d249d43..209cf680 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,4 @@ metals.sbt .classpath .project -custodia/stats.html \ No newline at end of file +react/stats.html \ No newline at end of file diff --git a/app/views/main.scala.html b/app/views/main.scala.html index 726842ab..79b1cff4 100644 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -177,6 +177,9 @@

Thanks for your feedback!

Rules + Sign In Sheet + @if(Utils.getOrgConfig(request).org.getAttendanceEnableOffCampus()) { Off campus time diff --git a/build_and_copy_to_server.sh b/build_and_copy_to_server.sh index 7d480aa5..434c1f2d 100755 --- a/build_and_copy_to_server.sh +++ b/build_and_copy_to_server.sh @@ -11,14 +11,14 @@ npm install rsync -v -h --progress target/universal/demschooltools-1.1.zip evan@demschooltools.com:/home/evan/ -## Custodia & Django stuff -(cd custodia && npm install && npm run compile) +## React & Django stuff +(cd react && npm install && npm run build) # -r is necessary here because ls-tree includes some symbolic link directories # and we want to include the files that are contained in them. git ls-tree -r --name-only head django | xargs zip -r django -# These files are generated by Custodia's build process and not in git +# These files are generated by vite's build process and not in git zip -r django django/static-vite/ rsync -v -h --progress django.zip evan@demschooltools.com:/home/evan/ diff --git a/conf/base.conf b/conf/base.conf index c3fa7c9b..68039904 100644 --- a/conf/base.conf +++ b/conf/base.conf @@ -30,8 +30,10 @@ play.i18n.langs = [ "en", "en-TRVS" ] # ~~~~~ db.default.pool = "hikaricp" db.default.hikaricp.maximumPoolSize = 4 -db.default.driver=org.postgresql.Driver -db.default.url="jdbc:postgresql://localhost:5432/school_crm?user=postgres&password=123" +db.default.driver = org.postgresql.Driver +db.default.url = "jdbc:postgresql://127.0.0.1:5432/school_crm" +db.default.username = "postgres" +db.default.password = "123" # Ebean configuration # ~~~~~ diff --git a/conf/routes b/conf/routes index 73010a6a..ad5a92ed 100644 --- a/conf/routes +++ b/conf/routes @@ -127,6 +127,9 @@ GET /attendance/jsonPeople controllers.Attendance.jsonPeople(t GET /attendance/viewWeek controllers.Attendance.viewWeek(date : String ?= "", request: Request) GET /attendance/editWeek controllers.Attendance.editWeek(date : String ?= "", request: Request) +GET /attendance/signInSheet controllers.Proxy.proxy0(request: Request) +GET /attendance/signInSheet/*extra controllers.Proxy.proxy(request: Request, extra: String) + GET /attendance/checkin controllers.Public.checkin() GET /attendance/checkin/data controllers.Checkin.checkinData(time: String, request: Request) POST /attendance/checkin/message controllers.Checkin.checkinMessage(time_string: String, personId: Integer, is_arriving: Boolean, request: Request) diff --git a/django/.gitignore b/django/.gitignore index 4ef41491..9a00a72a 100644 --- a/django/.gitignore +++ b/django/.gitignore @@ -1,2 +1,2 @@ static-vite/ -dev-static-root/ \ No newline at end of file +dev-static-root/ diff --git a/django/Procfile b/django/Procfile index 21c02161..e3357d36 100644 --- a/django/Procfile +++ b/django/Procfile @@ -1,2 +1,2 @@ django: uv run manage.py migrate && uv run manage.py runserver -custodia: cd ../custodia && npm install && npm run watch \ No newline at end of file +react: cd ../react && npm install && npm run watch \ No newline at end of file diff --git a/django/custodia/templates/index.html b/django/custodia/templates/index.html index 8bb95156..3ac54bbc 100644 --- a/django/custodia/templates/index.html +++ b/django/custodia/templates/index.html @@ -24,7 +24,7 @@ {% vite_hmr_client %} {% vite_react_refresh %} - {% vite_asset 'src/js/app.jsx' %} + {% vite_asset 'custodia/js/app.jsx' %} {% csrf_token %} diff --git a/django/custodia/templates/login.html b/django/custodia/templates/login.html index 71ac64c3..f6791335 100644 --- a/django/custodia/templates/login.html +++ b/django/custodia/templates/login.html @@ -23,7 +23,7 @@ {% vite_hmr_client %} {% vite_react_refresh %} - {% vite_asset 'src/js/cssonly.js' %} + {% vite_asset 'custodia/js/cssonly.js' %}