From 53328fa8dd630d4c921e602d4c9c7612422ba3bd Mon Sep 17 00:00:00 2001
From: Dexter Leng <dexterlengcs@gmail.com>
Date: Sat, 9 Jan 2021 02:33:37 +0800
Subject: [PATCH] fix chrome injection extension

---
 common/gameConfig.js       |  2 +-
 extension/src/js/inject.js | 48 ++++----------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/common/gameConfig.js b/common/gameConfig.js
index ec237a8..a01637b 100644
--- a/common/gameConfig.js
+++ b/common/gameConfig.js
@@ -7,7 +7,7 @@ const config = {
     PLAYER_SPEED: 1200,
     PLAYER_CHAT_TIMEOUT: 5000, // 5s
 
-    MAP_IMAGE: './images/bg.png',
+    MAP_IMAGE: 'https://raw.githubusercontent.com/juxd/discord-spatial-layer/master/public/images/bg.png',
 
     NEUTRAL_FACE: './images/tile000.png',
     HAPPY_FACE: './images/tile002.png',
diff --git a/extension/src/js/inject.js b/extension/src/js/inject.js
index 3f9a7bc..1b99e20 100644
--- a/extension/src/js/inject.js
+++ b/extension/src/js/inject.js
@@ -1,8 +1,4 @@
-import nengiConfig from '../../../common/nengiConfig'
-import main from '../../../client/runClient'
-
-console.log(nengiConfig)
-const SECRET_KEY_FORM_ID = 'secret-key-form'
+import UI from '../../../client/runClient'
 
 let container;
 
@@ -22,45 +18,9 @@ let container;
     container.style.top = '60%'
     container.style.backgroundColor = 'white'
 
-    container.insertAdjacentHTML('beforeend', renderSecretKeyForm())
-
-    // const canvas = document.createElement('canvas');
-    // canvas.id = 'game-canvas';
-    // canvas.style.height = '100%';
-    // canvas.style.width = '100%';
-    // canvas.style.backgroundColor = 'red';
+    const ui = new UI(container);
+    ui.start();
 
     body.appendChild(container)
-    // container.appendChild(canvas)
-}())
-
-function renderSecretKeyForm() {
-    return `
-    <form id="${SECRET_KEY_FORM_ID}">
-      <label for="secret-key">Secret Key:</label><br>
-      <input type="text" id="secret-key" name="secret-key"><br>
-      <input type="submit" value="Submit">
-    </form>
-  `
-}
-
-function handleSecretKeyFormSubmit(e) {
-    const secretKey = document.getElementById('secret-key').value
 
-    const canvas = '<canvas id=\'main-canvas\' style="height: 100%; width: 100%"></canvas>'
-    container.innerText = ''
-    container.insertAdjacentHTML('beforeend', canvas)
-
-    main(secretKey)
-}
-
-document.addEventListener('submit', e => {
-    e.preventDefault()
-
-    const form = e.target
-    const formId = form.getAttribute('id')
-
-    if (formId === SECRET_KEY_FORM_ID) {
-        handleSecretKeyFormSubmit(e)
-    }
-}, false)
+}())