diff --git a/client/src/components/anims/wiggle.jsx b/client/src/components/anims/wiggle.jsx index c4f06b9b..995af86a 100644 --- a/client/src/components/anims/wiggle.jsx +++ b/client/src/components/anims/wiggle.jsx @@ -3,8 +3,10 @@ const anime = require('animejs').default; function wiggle(id, idle) { const duration = 300; const target = document.getElementById(id); - const x = (window.screen.width / anime.random(-100, 100)) * 0.1; - const y = (window.screen.height / anime.random(-20, 100)) * 0.1; + const x = window.screen.width * 0.01 * (Math.round(Math.random()) ? Math.random() : -Math.random()); + const y = window.screen.height * 0.01 * (Math.round(Math.random()) ? Math.random() : -Math.random()); + + console.log(x, y); return anime({ targets: target, rotate: 0, diff --git a/client/src/components/demo.jsx b/client/src/components/demo.jsx index 9777603f..68fb7fb8 100644 --- a/client/src/components/demo.jsx +++ b/client/src/components/demo.jsx @@ -154,13 +154,17 @@ function Demo(args) {
- - +
+
+ +
- - +
+
+ +
diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf index 73941ae9..c19c1f9d 100644 --- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf +++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf @@ -63,6 +63,23 @@ server { ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot } +server { + server_name minimalstudios.com.au; + + location / { + root /var/lib/mnml/public/press/; + index index.html; + try_files $uri $uri/ index.html; + } + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/minimalstudios.com.au/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/minimalstudios.com.au/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} + + # http -> https server { @@ -74,3 +91,8 @@ server { server_name minimal.gg; return 301 https://mnml.gg$request_uri; } + +server { + server_name minimalstudios.com.au; + return 301 https://minimalstudios.com.au$request_uri; +} diff --git a/server/src/img.rs b/server/src/img.rs index d4c92bad..93572360 100644 --- a/server/src/img.rs +++ b/server/src/img.rs @@ -76,7 +76,7 @@ pub fn invader_write(id: Uuid) -> Result { write!(&mut svg, "")?; let dest = format!("/var/lib/mnml/public/imgs/{}.svg", id); - println!("molecule dest={:?}", dest); + // info!("molecule dest={:?}", dest); let mut file = File::create(dest)?; file.write_all(&svg)?; @@ -232,7 +232,7 @@ pub fn shapes_write(id: Uuid) -> Result { write!(&mut svg, "")?; let dest = format!("/var/lib/mnml/public/imgs/{}.svg", id); - println!("/var/lib/mnml/public/imgs/{}.svg", id); + // println!("/var/lib/mnml/public/imgs/{}.svg", id); let mut file = File::create(dest)?; file.write_all(&svg)?; diff --git a/server/src/warden.rs b/server/src/warden.rs index 262f6187..38779346 100644 --- a/server/src/warden.rs +++ b/server/src/warden.rs @@ -148,7 +148,8 @@ fn fetch_instances(mut tx: Transaction) -> Result { } for mut instance in instances_idle(&mut tx)? { - instance_delete(&mut tx, instance.id)?; + instance.finish(); + instance_update(&mut tx, instance)?; } Ok(tx)