solutus 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae52f904903e09196391fcb54016663146fb2a5d5684a1c108b4d49c5d6dd89b
-  data.tar.gz: e130edaeb9cedfef9f7514d70cd20df83575da31a1c936dde187298321085c30
+  metadata.gz: 435bfbba6ee0bbf0d94cc46048475f2c97392b37444912473d03c691c41b88e4
+  data.tar.gz: 60d55368ad0c6785c53156990c1dc5924a50d42c8bda559167c51689ad4d2052
 SHA512:
-  metadata.gz: c4eb0309c57ac9974e34df6ab2eadce3e26d9950845010537575dde21456117963ad1440cc622a7e648d3dc8f35299d34b39f1ee692280f6ab6e85e9ca3749b7
-  data.tar.gz: 42018df96fbc29c1a8c57fcd404be2f979f4cf21876cdc96de787772ea684cbb41684fa21f07cf3548f4bfab032d90242347b141f22c87d0cd9c5bf1a12b7405
+  metadata.gz: 7024ced5ab758fcbd133472a0a1a238563b9d5b11d91aee0588342326566f11d43085a1de9791f34c4c711bfeb64d402bccb592c1de2baab7802d8ebb507dba7
+  data.tar.gz: 6fc781fde575954a42defbffc30019ca43e4ab74485147bfc43c5930b057ed33072b52ca708a6bc3ef169801a92163c7fc8c52938697fa224f942102fb192307

data/lib/solutus.rb

@@ -24,13 +24,13 @@ class Solutus
     SITE_PAGES_PATH = File.join("pages", "site-pages")
     POSTS_PATH = File.join("pages", "posts")
     BLOG_DATE_FORMAT = "%b %e, %Y"
-    BLOG_DATE_DATA = "%Y-%m-%e %I:%M:%S"
+    BLOG_DATE_DATA = "%Y-%m-%d %I:%M:%S"
     SETTINGS_FILE = "settings.yml"
     CACHE = ".solutus-cache"
     PASSWORD_FILE = "password.txt"
     DAY_ENDINGS = ["th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th", "th", "st"]
 
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
 
     @@blog_urls = Hash.new
     @@page_urls = Array.new
@@ -186,6 +186,26 @@ class Solutus
             "saved post @ #{path}"
         end
 
+        get "/editfile" do
+            if !session[:verified]
+                return render_login("You were logged out.")
+            end
+            path = params['path']
+            render_edit_file(path)
+        end
+
+        post "/savefile" do
+            if !session[:verified]
+                return 'error'
+            end
+            path = params['path']
+            content = params['content']
+            f = File.open(path, 'w')
+            f.write(content)
+            f.close
+            'saved'
+        end
+
         post "/publish" do
             if !session[:verified]
                 return "error"
@@ -212,7 +232,16 @@ class Solutus
             else
                 send_404
             end
-        end            
+        end      
+    
+        def render_edit_file(path)
+            #TODO: do smth diff for YML files...
+            ServerStache.template = File.read(File.join(path_to_resources, "editFile.html"))
+            result = ServerStache.new
+            result[:content] = File.read(path)
+            result[:path] = path
+            result.render
+        end
 
         def send_404
             send_file File.join(path_to_resources, "404.html")
@@ -307,6 +336,8 @@ class Solutus
             result[:blogs] = blog_select
             result[:pages] = page_select
             result[:css] = CSS
+            result[:files] = render_files
+            result[:version] = VERSION
             result.render
         end
 
@@ -321,6 +352,24 @@ class Solutus
             result
         end
 
+        def render_files 
+            result = "<select name=\"path\">\n"
+            dirs = [".", "static/css", "templates", "pages/site-pages"]
+            dirs.each do |dir|
+                result += "<optgroup label='#{dir}'>"
+                files = Dir.entries(dir).select {|f| !File.directory? f}
+                files.each do |filename|
+                    if !['password.txt', '.gitignore'].include?(filename)
+                        path = File.join(dir, filename)
+                        result += "<option value=\"#{path}\">#{filename}</option>\n"
+                    end
+                end
+                result += "</optgroup>"
+            end
+            result += "</select>"
+            result
+        end
+
         def blog_select
             result = "<select name=\"post-path\">\n"
             Solutus.blog_urls.each do |yr, arr|
@@ -781,6 +830,7 @@ stylesheets: |
 scripts: |
     <script></script>
 recents-count: 3
+advanced: false
 HERE
 
         styles_file = <<HERE

data/resources/editFile.html

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<head>
+    <title>Editing {{path}}</title>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/codemirror.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/codemirror.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/mode/htmlmixed/htmlmixed.js"></script>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.38.0/theme/lesser-dark.css">
+    <style type="text/css">
+        
+    </style>
+    {{{stylesheets}}}
+</head>
+
+<body>
+    <h1>Editing {{path}} (<span id='status'></span>)</h1>
+    <a href='/edit'>Back</a>
+    <button id='solutus-save-button'>Save</button>
+    <textarea id='editor' style='height: 100%;'>{{{content}}}</textarea>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.2.1/dist/jquery.min.js"></script>
+    <script>
+        var myCodeMirror = CodeMirror.fromTextArea(document.getElementById('editor'), {
+            lineNumbers: true,
+            styleActiveLine: true,
+            matchBrackets: true,
+            theme: 'lesser-dark'
+        });
+        myCodeMirror.setSize(null, 600)
+
+        function updateStatus(status) {
+            $("#status").html(status);
+        }
+
+        function save() {
+            updateStatus("Saving...")
+            $.post("/savefile", {
+                "path": "{{path}}",
+                "content": myCodeMirror.getValue()
+            }, function(response) {
+                console.log(response);
+                updateStatus("Saved.");
+            });
+        }
+
+        $("#solutus-save-button").click(save);
+        $(document).keydown(function() {
+            updateStatus("Unsaved changes.")
+        })
+
+        updateStatus("Saved.");
+    </script>
+</body>
+</html>

data/resources/index.html

@@ -8,9 +8,24 @@
 </head>
 
 <body>
-    <h1>Editing {{name}}</h1>
-    <p>[<a href="/">View Site</a>]</p>
+    <h1>{{name}} Admin</h1>
+    {{^advanced}}
+    <p>[<a href="/">View Unpublished Site</a>]</p>
+    {{/advanced}}
     <p>[<a href="http://{{domain}}">View Public Site @ {{domain}}</a>]</p>
+    {{#advanced}}
+    You are in advanced mode.
+    <p>
+        <form method="get" action="/editfile">
+            <fieldset>
+                <legend>Edit File</legend>
+                {{{files}}}
+                <p><button type="submit">Edit file</button></fieldset></p>
+            </fieldset>
+        </form>
+    </p>
+    {{/advanced}}
+    {{^advanced}}
     <p>
         <form method="get" action="/editpage">
             <fieldset>
@@ -20,6 +35,7 @@
             </fieldset>
         </form>
     </p>
+    {{/advanced}}
     <p>
         <form method="post" action="/newpost">
             <fieldset>
@@ -38,13 +54,15 @@
             </fieldset>
         </form>
     </p>
+    {{^advanced}}
     <p>
         <button type="button" id="publish">Publish to web</button>
         <span id="status"></span>
     </p>
+    {{/advanced}}
 
     <p style="text-align: center;">
-        <small>Powered by <a href="https://github.com/jeromew21/solutus">Solutus</a></small>
+        <small>Powered by <a href="https://github.com/jeromew21/solutus">Solutus</a> {{version}}</small>
     </p>
     <script>
         $("#publish").click(function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solutus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jerome Wei
@@ -77,6 +77,7 @@ files:
 - lib/solutus.rb
 - resources/404.html
 - resources/editBlog.html
+- resources/editFile.html
 - resources/editPage.html
 - resources/index.html
 - resources/login.html