web_sandbox_console 0.4.0 → 0.5.0

data/app/assets/stylesheets/web_sandbox_console/lucario.css

@@ -0,0 +1,45 @@
+/*
+  Name:       lucario
+  Author:     Raphael Amorim
+
+  Original Lucario color scheme (https://github.com/raphamorim/lucario)
+*/
+
+.cm-s-lucario.CodeMirror, .cm-s-lucario .CodeMirror-gutters {
+  background-color: #2b3e50 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-lucario .CodeMirror-gutters { color: #2b3e50; }
+.cm-s-lucario .CodeMirror-cursor { border-left: solid thin #E6C845; }
+.cm-s-lucario .CodeMirror-linenumber { color: #f8f8f2; }
+.cm-s-lucario .CodeMirror-selected { background: #243443; }
+.cm-s-lucario .CodeMirror-line::selection, .cm-s-lucario .CodeMirror-line > span::selection, .cm-s-lucario .CodeMirror-line > span > span::selection { background: #243443; }
+.cm-s-lucario .CodeMirror-line::-moz-selection, .cm-s-lucario .CodeMirror-line > span::-moz-selection, .cm-s-lucario .CodeMirror-line > span > span::-moz-selection { background: #243443; }
+.cm-s-lucario span.cm-comment { color: #5c98cd; }
+.cm-s-lucario span.cm-string, .cm-s-lucario span.cm-string-2 { color: #E6DB74; }
+.cm-s-lucario span.cm-number { color: #ca94ff; }
+.cm-s-lucario span.cm-variable { color: #f8f8f2; }
+.cm-s-lucario span.cm-variable-2 { color: #f8f8f2; }
+.cm-s-lucario span.cm-def { color: #72C05D; }
+.cm-s-lucario span.cm-operator { color: #66D9EF; }
+.cm-s-lucario span.cm-keyword { color: #ff6541; }
+.cm-s-lucario span.cm-atom { color: #bd93f9; }
+.cm-s-lucario span.cm-meta { color: #f8f8f2; }
+.cm-s-lucario span.cm-tag { color: #ff6541; }
+.cm-s-lucario span.cm-attribute { color: #66D9EF; }
+.cm-s-lucario span.cm-qualifier { color: #72C05D; }
+.cm-s-lucario span.cm-property { color: #f8f8f2; }
+.cm-s-lucario span.cm-builtin { color: #72C05D; }
+.cm-s-lucario span.cm-variable-3, .cm-s-lucario span.cm-type { color: #ffb86c; }
+
+.cm-s-lucario .CodeMirror-activeline-background { background: #243443; }
+.cm-s-lucario .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
+
+
+/* 特殊部分 补充 */
+.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
+.cm-s-default span.cm-arrow { color: red; }
+
+
+

data/app/controllers/web_sandbox_console/authorization_controller.rb

@@ -8,6 +8,8 @@ module WebSandboxConsole
     def fetch_token
       @token = SecureRandom.uuid
       save_cache_token(@token)
+      flash[:notice] = "令牌: #{@token}，此令牌先保存，后续使用。"
+      redirect_to auth_page_path
     end
 
     # 授权
@@ -42,7 +44,7 @@ module WebSandboxConsole
         
         if times > 20
           flash[:notice] = '一天内获取令牌不允许超过20次'
-          rediect_to root_path
+          redirect_to root_path
         end
         cache.write('fetch_token_times', times + 1)
       end

data/app/views/layouts/web_sandbox_console/application.html.erb

@@ -15,7 +15,7 @@
               <b>
                 <img src="/assets/web_sandbox_console/logo-icon.png" />
               </b>
-              <span style="left-padding: 10px;">运维控制台</span>
+              <span style="left-padding: 10px;" class="font-color">运维控制台</span>
            </a>
           </div>
 
@@ -59,7 +59,7 @@
               <li>
                 <%= link_to "https://github.com/dongmy54/web_sandbox_console", target: "_blank", class: 'waves-effect waves-dark' do %>
                   <i class="fa fa-bookmark-o"></i>
-                  <span class="hide-menu <%= action_name == 'auth_page' ? 'menu-active' : '' %>">说明文档</span>
+                  <span class="hide-menu">说明文档</span>
                 <% end %>
               </li>
             </ul>

data/app/views/web_sandbox_console/authorization/auth_page.html.erb

@@ -1,7 +1,7 @@
 <h3>升级授权</h3>
 
 <p>
-  <%= link_to '获取令牌', fetch_token_path,format: 'json', remote: true %>
+  <%= link_to '获取令牌', fetch_token_path %>
   <span> PS: 注意获取令牌一天最多20次,有效期仅5分钟</span>
 </p>
 
@@ -20,7 +20,7 @@
 
 <h4>说明令牌使用说明：</h4>
 <div>
-  <pre>
+  <pre class="no-border">
     require 'openssl'
     require 'base64'
 

data/app/views/web_sandbox_console/home/download_page.html.erb

@@ -14,7 +14,7 @@
 
 <h4>说明：</h4>
 <div>
-  <pre>
+  <pre class="no-border">
     1. 只可下载log目录下文件
     2. 下载时文件名需要带上后缀如：production.log
     3. csv文件下载后会被删除，不能重复下载

data/app/views/web_sandbox_console/home/index.html.erb

@@ -1,27 +1,65 @@
 <h3>执行代码</h3>
 
-<div class="console margin-b-20">
+<style type="text/css">
+  .wrapper-console {
+    position: relative;
+    top: 8px;
+    width: 100%;
+    height: 300px;
+ }
+
+ .left {
+    height: 100%;
+    /* 为了不占用绝对定位的宽度 这里计算下宽度*/
+    width: calc(100% - 200px);
+ }
+
+.right {
+    position: absolute;
+    width: 180px;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    padding-left: 15px;
+}
+</style>
+
+
+<div class="wrapper-console">
   <%= form_tag(web_sandbox_console.eval_code_path, remote: true, class: 'form')  do %>
-    <div class= "fl text_area_div">
-      <%= text_area_tag :code, '', class: 'text_area_box'%>
+    <div class= "left">
+      <%= text_area_tag :code, '# 这里输入ruby代码...', class: 'text_area_box'%>
     </div>
     
-    <div class="submit_div">
-      <div class="fr">
-        <div class="margin-t-100"><input type="reset" value="重置" class='reset-button' %></div>
-
-        <div class="margin-t-10">
-          <% if session[:pass_auth] %>
-            <span class="tip">授权成功(当前修改将写入数据库)</span>
-          <% end %>
-          <%= submit_tag '提交', data: { disable_with: "已发送，处理中..." }, class: 'send-button' %></div>
-        <div class="margin-t-10"><%= submit_tag '异步执行', data: { disable_with: "已发送，处理中..." }, class: 'send-button' %></div>
+    <div class="right">
+      <div style="position: absolute;bottom: 0;">
+        <% if session[:pass_auth] %>
+          <p class="tip">授权成功</p>
+          <p class="tip">(当前修改将写入数据库)</p>
+        <% end %>
+        <%= submit_tag '提交', data: { disable_with: "已发送，处理中..." }, class: 'send-button margin-t-10' %>
+        <%= submit_tag '异步执行', data: { disable_with: "已发送，处理中..." }, class: 'send-button margin-t-10' %>
       </div>
     </div>
   <% end %>
 </div>
 
-<%= button_tag '清除输出', type: 'button', onclick: "$('.output-content').empty();", class: 'clear-button' %>
+<div style="margin-top: 50px;">
+    <%= button_tag '清除输出', type: 'button', onclick: "$('.output-content').empty();", class: 'clear-button' %>
+<div>
 
 <div class="output-content">
 </div>
+
+
+<script>
+  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+    mode: "text/x-ruby",
+    matchBrackets: true,
+    indentUnit: 2,
+    indentWithTabs: true,
+    theme: 'lucario',
+    tabSize: 2,
+    lineNumbers: true
+  });
+</script>

data/lib/web_sandbox_console/version.rb

@@ -1,3 +1,3 @@
 module WebSandboxConsole
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_sandbox_console
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - dongmingyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,10 +52,17 @@ files:
 - app/assets/config/web_sandbox_console_manifest.js
 - app/assets/images/web_sandbox_console/logo-icon.png
 - app/assets/javascripts/web_sandbox_console/application.js
+- app/assets/javascripts/web_sandbox_console/code_editor.js
+- app/assets/javascripts/web_sandbox_console/codemirror.js
 - app/assets/javascripts/web_sandbox_console/home.js
+- app/assets/javascripts/web_sandbox_console/matchbrackets.js
+- app/assets/javascripts/web_sandbox_console/ruby.js
 - app/assets/stylesheets/web_sandbox_console/application.css
+- app/assets/stylesheets/web_sandbox_console/codemirror.css
 - app/assets/stylesheets/web_sandbox_console/common.css
+- app/assets/stylesheets/web_sandbox_console/docs.css
 - app/assets/stylesheets/web_sandbox_console/home.css
+- app/assets/stylesheets/web_sandbox_console/lucario.css
 - app/controllers/web_sandbox_console/application_controller.rb
 - app/controllers/web_sandbox_console/authorization_controller.rb
 - app/controllers/web_sandbox_console/home_controller.rb
@@ -65,7 +72,6 @@ files:
 - app/models/web_sandbox_console/application_record.rb
 - app/views/layouts/web_sandbox_console/application.html.erb
 - app/views/web_sandbox_console/authorization/auth_page.html.erb
-- app/views/web_sandbox_console/authorization/fetch_token.js.erb
 - app/views/web_sandbox_console/home/do_view_file.js.erb
 - app/views/web_sandbox_console/home/download_page.html.erb
 - app/views/web_sandbox_console/home/eval_code.js.erb

data/app/views/web_sandbox_console/authorization/fetch_token.js.erb

@@ -1,3 +0,0 @@
-alert("令牌: <%= @token %>，此令牌先保存，后续使用。");
-
-