Compare commits

..

No commits in common. "cbe3a3331184318e4e10ebec7111df9b6d98e641" and "1c1d183dbe672f6d559bc8494ec95bf48646997c" have entirely different histories.

6 changed files with 6 additions and 37 deletions

View File

@ -1,11 +1,8 @@
[package]
name = "mixsy"
description = "combine Bitsy games"
version = "0.72.0"
name = "bitsy-merge"
version = "0.71.0"
authors = ["Max Bradbury <max@tinybird.info>"]
edition = "2018"
license = "MIT"
repository = "https://tinybird.dev/max/mixsy"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,6 +1,5 @@
#!/usr/bin/env bash
#!/bin/sh
cargo build
pug index.pug
set -ex
wasm-pack build --target web

View File

@ -8,24 +8,12 @@ async function run() {
const output = document.getElementById('c');
const merge_button = document.getElementById('merge');
function handleResult(inputElement, message) {
console.log(message);
let messageBox = inputElement.nextSibling;
messageBox.innerText = message;
messageBox.style.display = "block"
setTimeout(() => {messageBox.style.display = "none"}, 4000);
}
main.addEventListener('change', () => {
if (main.value) {
handleResult(main, load_main(main.value));
}
console.debug(load_main(main.value));
});
additional.addEventListener('change', () => {
if (additional.value) {
handleResult(additional, load_additional(additional.value));
}
console.debug(load_additional(additional.value));
});
function mix() {

View File

@ -3,8 +3,6 @@ html(lang="en-gb")
head
meta(content="text/html;charset=utf-8" http-equiv="Content-Type")
title mixsy
//- no favicon!! taken from: https://k1ss.org/blog/20191004a
<link href=data:, rel=icon>
style
include style.css
body
@ -15,11 +13,9 @@ html(lang="en-gb")
#main.square.left
h2 main
textarea#a(placeholder="Paste your main game data here...")
p.result
#additional.square.left
h2 additional
textarea#b(placeholder="Paste additional game data here...")
p.result
.row.middle
img.centre(src="merge.png" alt="")
button#merge.centre mix!

View File

@ -41,11 +41,6 @@ pub fn load_additional(game_data: String) -> String {
#[wasm_bindgen]
pub fn merge() -> String {
let state = STATE.lock().unwrap();
if state.main.is_none() || state.additional.is_none() {
return "".to_string();
}
let mut main = state.main.clone().unwrap();
let additional = state.additional.clone().unwrap();
main.merge(additional);

View File

@ -72,12 +72,6 @@ textarea {
float: left;
}
.result {
position: relative;
background: var(--bg);
color: var(--inverse);
}
.row {
width: 100%;
height: calc(82vmin / 3);