pinokiod 3.8.149 → 3.8.151

package/server/views/editor.ejs

@@ -591,12 +591,16 @@ document.addEventListener("DOMContentLoaded", async () => {
 //        })
 //      }
 
-      await this.createTerm()
+      <% if (theme === "dark") { %>
+      await this.createTerm(xtermTheme.FrontEndDelight)
+      <% } else { %>
+      await this.createTerm(xtermTheme.Tomorrow)
+      <% } %>
       await this.start(mode)
     }
-    async createTerm () {
+    async createTerm (_theme) {
       if (!this.term) {
-        const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+        const theme = Object.assign({ }, _theme, {
           selectionBackground: "red",
           selectionForeground: "white"
         })

package/server/views/file_explorer.ejs

@@ -455,9 +455,15 @@ var term
 const n = new N()
 let socket = new Socket()
 const pull = async () => {
-  if (!term) term = createTerm()
   socket.close()
   await new Promise((resolve, reject) => {
+    if (!term) {
+      <% if (theme === "dark") { %>
+      await createTerm(xtermTheme.FrontEndDelight)
+      <% } else { %>
+      await createTerm(xtermTheme.Tomorrow)
+      <% } %>
+    }
     let cwd
     let chunks = location.pathname.split("/").filter((x) => { return x })
     if (chunks.length > 0) {

package/server/views/index.ejs

@@ -489,7 +489,13 @@ var term
 const n = new N()
 let socket = new Socket()
 const pull = async () => {
-  if (!term) term = createTerm()
+  if (!term) {
+    <% if (theme === "dark") { %>
+    term = await createTerm(xtermTheme.FrontEndDelight)
+    <% } else { %>
+    term = await createTerm(xtermTheme.Tomorrow)
+    <% } %>
+  }
   socket.close()
   await new Promise((resolve, reject) => {
     let cwd

package/server/views/install.ejs

@@ -131,9 +131,7 @@ body {
 <script src="/notifyinput.js"></script>
 </head>
 <body class='<%=theme%>'>
-<!--
 <header class='grabbable'></header>
--->
 <div id='status-screen'><b><i class="fas fa-circle-notch fa-spin"></i> Setting up...</b><br>Setting up core modules including conda, uv, git, etc.</div>
 <div class='terminal-container'>
   <div id='terminal'></div>
@@ -144,8 +142,9 @@ body {
 //
 // /install_bin?type=bin&uri=conda
 //
-const createTerm = async () => {
-  const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+const createTerm = async (_theme) => {
+  //const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+  const theme = Object.assign({ }, _theme, {
     selectionBackground: "red",
     selectionForeground: "white"
   })
@@ -189,7 +188,11 @@ const createTerm = async () => {
 document.addEventListener("DOMContentLoaded", async () => {
   const n = new N()
   let socket = new Socket()
-  let term = await createTerm()
+  <% if (theme === "dark") { %>
+  let term = await createTerm(xtermTheme.FrontEndDelight)
+  <% } else { %>
+  let term = await createTerm(xtermTheme.Tomorrow)
+  <% } %>
   let params = new URLSearchParams(location.search)
   let entries = [...params.entries()]
   let options;

package/server/views/minterm.ejs

@@ -547,13 +547,17 @@ document.addEventListener("DOMContentLoaded", async () => {
 //        })
 //      }
 
-      await this.createTerm()
+      <% if (theme === "dark") { %>
+      await this.createTerm(xtermTheme.FrontEndDelight)
+      <% } else { %>
+      await this.createTerm(xtermTheme.Tomorrow)
+      <% } %>
       await this.start(mode)
     }
-    async createTerm () {
+    async createTerm (_theme) {
       console.log(xtermTheme)
       if (!this.term) {
-        const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+        const theme = Object.assign({ }, _theme, {
           selectionBackground: "red",
           selectionForeground: "white"
         })

package/server/views/network.ejs

@@ -381,16 +381,25 @@ input:checked + .slider:before {
     </div>
     <div class='config-body'>
       <div class='config-row'>
-        <div class='label'>Network Name</div>
-        <input id='name' type='text' value="<%=name%>">
+        <div class='label'>Instant HTTPS</div>
+        <label class="switcher">
+          <input id='https_active' type="checkbox" <%=https_active ? 'checked' : ''%>>
+          <span class="slider"></span>
+        </label>
       </div>
+    </div>
+    <div class='config-body'>
       <div class='config-row'>
         <div class='label'>Network Share</div>
         <label class="switcher">
-          <input id='active' type="checkbox" <%=active ? 'checked' : ''%>>
+          <input id='peer_active' type="checkbox" <%=peer_active ? 'checked' : ''%>>
           <span class="slider"></span>
         </label>
       </div>
+      <div class='config-row' id='network_name'>
+        <div class='label'>Network Name</div>
+        <input id='name' type='text' value="<%=name%>">
+      </div>
       <div class='flexible'></div>
       <button class='btn save'>Save</button>
     </div>
@@ -540,6 +549,21 @@ input:checked + .slider:before {
   </div>
 </main>
 <script>
+if (document.querySelector("#peer_active").checked) {
+  console.log("checked")
+  document.querySelector("#network_name").classList.remove("hidden")
+} else {
+  console.log("not checked")
+  document.querySelector("#network_name").classList.add("hidden")
+}
+document.querySelector("#peer_active").addEventListener("change", (e)=> {
+  console.log(e.target.checked)
+  if (e.target.checked) {
+    document.querySelector("#network_name").classList.remove("hidden")
+  } else {
+    document.querySelector("#network_name").classList.add("hidden")
+  }
+})
 document.querySelector("main").addEventListener("click", async (e) => {
   let target
 
@@ -551,8 +575,9 @@ document.querySelector("main").addEventListener("click", async (e) => {
 
   if (target) {
     let body = {
-      PINOKIO_NETWORK_NAME: document.querySelector("#name").value,
-      PINOKIO_NETWORK_ACTIVE: (document.querySelector("#active").checked ? "1": "0")
+      PINOKIO_NETWORK_NAME: document.querySelector("#network_name").value,
+      PINOKIO_NETWORK_ACTIVE: (document.querySelector("#peer_active").checked ? "1": "0"),
+      PINOKIO_HTTPS_ACTIVE: (document.querySelector("#https_active").checked ? "1": "0")
     }
     console.log(body)
     debugger

package/server/views/terminal.ejs

@@ -599,13 +599,16 @@ document.addEventListener("DOMContentLoaded", async () => {
 //        })
 //      }
 
-      await this.createTerm()
+      <% if (theme === "dark") { %>
+      await this.createTerm(xtermTheme.FrontEndDelight)
+      <% } else { %>
+      await this.createTerm(xtermTheme.Tomorrow)
+      <% } %>
       await this.start(mode)
     }
-    async createTerm () {
-      console.log(xtermTheme)
+    async createTerm (_theme) {
       if (!this.term) {
-        const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+        const theme = Object.assign({ }, _theme, {
           selectionBackground: "red",
           selectionForeground: "white"
         })