Skip to content

Commit

Permalink
Convert SASS to CSS with nesting
Browse files Browse the repository at this point in the history
 * Use generic preset picker UI for synth designer module presets
 * Some style tweaks + cleanups
  • Loading branch information
Ameobea committed Jul 29, 2024
1 parent 34838d4 commit 440e977
Show file tree
Hide file tree
Showing 78 changed files with 397 additions and 484 deletions.
8 changes: 1 addition & 7 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
DATABASE_URL="mysql://username:[email protected]/database_name"
ROCKET_DATABASES='{ web_synth = { url = "mysql://username:[email protected]/datbase_name"} }'

GCLOUD_REGION="us-central1"

BACKEND_SERVICE_NAME="web-synth-backend"
BACKEND_IMAGE_NAME="gcr.io/gcloud-project-id/web-synth-backend:latest"
ROCKET_DATABASES='{ web_synth = { url = "mysql://username:[email protected]/datbase_name", timeout=250 } }'

FAUST_COMPILER_SERVICE_NAME="web-synth-faust-compiler"
FAUST_COMPILER_IMAGE_NAME="gcr.io/gcloud-project-id/web-synth-faust-compiler:latest"
Expand All @@ -14,6 +9,5 @@ BACKEND_BASE_URL="https://web-synth-api.ameo.design"
FAUST_COMPILER_ENDPOINT="http://localhost:4565"
# FAUST_COMPILER_ENDPOINT="https://faust-compiler.ameo.design"

CI_BUILDER_DOCKER_IMAGE_NAME="docker.pkg.github.com/ameobea/web-synth/ci-builder:latest"
GITHUB_USERNAME="ameobea"
GITHUB_TOKEN="1010101aaa"
9 changes: 8 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,12 @@
"importOrderMergeDuplicateImports": true,
"importOrderParserPlugins": ["typescript", "jsx", "decorators-legacy"],
"importOrderBuiltinModulesToTop": true,
"parser": "babel-ts"
"overrides": [
{
"files": ["*.ts", "*.tsx"],
"options": {
"parser": "babel-ts"
}
}
]
}
29 changes: 1 addition & 28 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -159,28 +159,8 @@ run-frontend:
yarn start

deploy:
# cd backend && just docker-build
# docker tag ameo/notes-backend:latest $BACKEND_IMAGE_NAME
# docker push $BACKEND_IMAGE_NAME
# cd backend && just build-and-deploy

# cd faust-compiler && just docker-build
# docker tag ameo/faust-compiler-server:latest $FAUST_COMPILER_IMAGE_NAME
# docker push $FAUST_COMPILER_IMAGE_NAME

# gcloud config set run/region $GCLOUD_REGION

# gcloud beta run deploy $BACKEND_SERVICE_NAME \
# --platform managed \
# --set-env-vars="ROCKET_DATABASES=$ROCKET_DATABASES,AUTH_TOKEN=$AUTH_TOKEN,ROCKET_ADDRESS=0.0.0.0" \
# --image $BACKEND_IMAGE_NAME

# gcloud beta run deploy $FAUST_COMPILER_SERVICE_NAME \
# --platform managed \
# --set-env-vars="FAUST_WORKLET_TEMPLATE_FILE_NAME=/opt/faustWorkletTemplate.template.js,SOUL_WORKLET_TEMPLATE_FILE_NAME=/opt/SoulAWP.template.js,AUTH_TOKEN=$AUTH_TOKEN" \
# --image $FAUST_COMPILER_IMAGE_NAME

# just build-all
# phost update notes patch ./dist
rsync -Prv -e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -F /dev/null" ./dist/* [email protected]:/var/www/synth.ameo.dev/

deploy-headless:
Expand All @@ -189,13 +169,6 @@ deploy-headless:
loc:
tokei --exclude src/vocalSynthesis/hts_engine_API --exclude src/vocalSynthesis/sinsy .

build-docker-ci:
docker build -t $CI_BUILDER_DOCKER_IMAGE_NAME -f Dockerfile.CI .

push-docker-ci:
docker login docker.pkg.github.com --username $GITHUB_USERNAME -p $GITHUB_TOKEN
docker push $CI_BUILDER_DOCKER_IMAGE_NAME

debug-engine:
cd ./engine/engine && cargo build --target wasm32-unknown-unknown && \
cd .. && wasm-bindgen ./target/wasm32-unknown-unknown/debug/engine.wasm --browser --remove-producers-section --out-dir ./build && \
Expand Down
Loading

0 comments on commit 440e977

Please sign in to comment.