Use consistent port, update electrom shell template to display proper IP

michalsnik · michalsnik · commit bd5fbf225ffd · 2018-01-22T19:31:04.000+01:00
diff --git a/shells/electron/app.html b/shells/electron/app.html
@@ -34,7 +34,7 @@
     }
 
     #intro .content {
-      width: 370px;
+      width: 395px;
       font-size: 18px;
       line-height: 45px;
       text-align: center;
@@ -52,12 +52,13 @@
 
     #intro .content-row input {
       flex: 1;
-      margin-left: 10px;
-      font-size: 14px;
       height: 32px;
+      padding: 0 10px;
+      margin-left: 10px;
       border: 1px solid #cacaca;
       border-radius: 2px;
-      padding: 0 10px;
+      text-align: center;
+      font-size: 14px;
     }
   </style>
 </head>
@@ -81,6 +82,26 @@ <h2 class="title">
       </div>
     </div>
   </div>
+  <script>
+    const port = process.env.PORT || 8098
+    const localIp = require('ip').address();
+    const $ = document.querySelector.bind(document)
+
+    const $localhost = $('#script-localhost')
+    const $byIp = $('#script-byip')
+    const $intro = $('#intro')
+
+    $localhost.value = '<' + 'script src="http://localhost:' + port + '"><' + '/script>'
+    $byIp.value = '<' + 'script src="http://' + localIp + ':' + port + '"><' + '/script>'
+
+    function selectAll () {
+      this.selectionStart = 0
+      this.selectionEnd = this.value.length
+    }
+
+    $localhost.onclick = selectAll
+    $byIp.onclick = selectAll
+  </script>
   <script src="build/devtools.js"></script>
 </body>
 </html>
diff --git a/shells/electron/bin.js b/shells/electron/bin.js
@@ -1,11 +1,11 @@
+#!/usr/bin/env node
 const electron = require('electron')
 const spawn = require('cross-spawn')
+const argv = process.argv.slice(2)
 
 const result = spawn.sync(
   electron,
-  [
-    require.resolve('./app')
-  ],
+  [require.resolve('./app')].concat(argv),
   { stdio: 'ignore' }
 )
 
diff --git a/shells/electron/server.js b/shells/electron/server.js
@@ -3,6 +3,8 @@ const http = require('http').Server(app)
 const io = require('socket.io')(http)
 const path = require('path')
 
+const port = process.env.PORT || 8098
+
 app.get('/', function (req, res) {
   res.sendFile(path.join(__dirname, '/build/backend.js'))
 })
@@ -17,6 +19,6 @@ io.on('connection', function (socket) {
   })
 })
 
-http.listen(8098, () => {
-  console.log('listening on *:8098')
+http.listen(port, () => {
+  console.log('listening on *:' + port)
 })
diff --git a/shells/electron/src/devtools.js b/shells/electron/src/devtools.js
@@ -1,27 +1,9 @@
 import io from 'socket.io-client'
-import ip from 'ip'
 import { initDevTools } from 'src/devtools'
 import Bridge from 'src/bridge'
 
 const port = process.env.PORT || 8098
 const socket = io('http://localhost:' + port)
-const localIp = ip.address()
-const $ = document.querySelector.bind(document)
-
-const $localhost = $('#script-localhost')
-const $byIp = $('#script-byip')
-const $intro = $('#intro')
-
-$localhost.value = '<' + 'script src="http://localhost:' + port + '"><' + '/script>'
-$byIp.value = '<' + 'script src="http://' + localIp + ':' + port + '"><' + '/script>'
-
-function selectAll () {
-  this.selectionStart = 0
-  this.selectionEnd = this.value.length
-}
-
-$localhost.onclick = selectAll
-$byIp.onclick = selectAll
 
 let reload = null
 
@@ -31,8 +13,6 @@ socket.on('vue-devtools-init', () => {
 
   initDevTools({
     connect (callback) {
-      $intro.classList.add('hidden')
-
       const wall = {
         listen (fn) {
           socket.on('vue-message', data => fn(data))
