From 58fcb99e03cf4913178c0e9d18f66e88c414c247 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 7 Mar 2020 18:50:48 -0800 Subject: [PATCH] Rocket config changed to match the .env build-sass configuration chanced from using sass to sassc --- server/Rocket.toml | 4 ++-- server/scripts/build-sass.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/Rocket.toml b/server/Rocket.toml index 4444006..fa34e55 100644 --- a/server/Rocket.toml +++ b/server/Rocket.toml @@ -8,5 +8,5 @@ address="localhost" port=8080 templates_dir="static/html/" -[global.databases.freechat_sample_db ] -url = "mysql://freechat_dev:password@localhost:3306/freechat" \ No newline at end of file +[global.databases.freechat] +url = "mysql://freechat_dev:password@localhost:3306/freechat" diff --git a/server/scripts/build-sass.sh b/server/scripts/build-sass.sh index 2836fd2..7457713 100755 --- a/server/scripts/build-sass.sh +++ b/server/scripts/build-sass.sh @@ -5,7 +5,7 @@ cssDir='static/css/' build() { for i in $sassDir/*;do - sass $i $cssDir/`basename -s .scss $i`.css + sassc $i $cssDir/`basename -s .scss $i`.css done } @@ -14,7 +14,7 @@ watch() { for i in $sassDir*;do pairs="$i:$cssDir`basename -s .scss $i`.css $pairs" done - sass --watch $pairs + sassc --watch $pairs } "$@"