Merge branch 'race' of https://github.com/jekyll/jekyll-admin into race

Author: mertkahyaoglu

lib/jekyll-admin/apiable.rb

@@ -47,6 +47,10 @@ def to_api(include_content: false)
         output["name"] = basename
       end
 
+      if is_a?(Jekyll::StaticFile)
+        output["from_theme"] = from_theme_gem?
+      end
+
       output
     end
 
@@ -61,6 +65,10 @@ def file_path
       end
     end
 
+    def from_theme_gem?
+      @base == site.in_theme_dir
+    end
+
     # StaticFiles don't have `attr_accesor` set for @site or @name
     def site
       @site

lib/jekyll-admin/version.rb

@@ -1,3 +1,3 @@
 module JekyllAdmin
-  VERSION = "0.5.1".freeze
+  VERSION = "0.6.0".freeze
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jekyll-admin",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Admin Panel for Jekyll",
   "private": true,
   "scripts": {
@@ -36,6 +36,7 @@
     "moment": "2.17.1",
     "react": "15.4.1",
     "react-ace": "4.1.5",
+    "react-document-title": "^2.0.3",
     "react-dom": "15.4.1",
     "react-dropzone": "3.10.0",
     "react-hotkeys": "^0.9.0",
@@ -102,7 +103,9 @@
       "\\.(css|scss)$": "identity-obj-proxy",
       "^.+\\.(gif|ttf|eot|svg|woff|woff2|ico)$": "<rootDir>/tools/fileMock.js"
     },
-    "roots": ["src"],
+    "roots": [
+      "src"
+    ],
     "testMatch": [
       "**/*.spec.js"
     ]

src/components/FilePreview.js

@@ -30,11 +30,25 @@ export default class FilePreview extends Component {
     } else {
       nodeLink = <a href={file.http_url} target="_blank">{node}</a>;
     }
+
+    let overlay;
+    if (file.from_theme) {
+      overlay = (
+        <span className="theme-indicator">
+          <i className="fa fa-diamond" aria-hidden="true" title="Theme Asset" />
+        </span>
+      );
+    } else {
+      overlay = (
+        <button onClick={() => this.handleClickDelete(file.path)} className="delete" title="Delete file">x</button>
+      );
+    }
+
     return (
       <div className="file-preview">
+        {overlay}
         {nodeLink}
         <span className="filename">{file.path}</span>
-        <button onClick={() => this.handleClickDelete(file.path)} className="delete" title="Delete file">x</button>
       </div>
     );
   }

src/components/metadata/MetaField.js

@@ -7,6 +7,11 @@ import MetaButtons from './MetaButtons';
 
 export class MetaField extends Component {
 
+  componentDidMount() {
+    const isNewField = /New field/.test(this.props.fieldKey);
+    isNewField && this.refs.field_key.select();
+  }
+
   handleConvertClick(type) {
     const { convertField, nameAttr } = this.props;
     convertField(nameAttr, type);

src/components/tests/filepreview.spec.js

@@ -19,6 +19,8 @@ function setup(file=staticfile) {
     filename: component.find('.filename'),
     image: component.find('img'),
     div: component.find('.file-preview a div'),
+    indicator: component.find('.file-preview .theme-indicator'),
+    delete_btn: component.find('.file-preview .delete'),
     actions: actions
   };
 }
@@ -29,9 +31,20 @@ describe('Components::FilePreview', () => {
     expect(image.node).toBeTruthy();
     expect(div.node).toBeFalsy();
   });
+
   it('should render a div if the file does not have an image extension', () => {
     const { image, div } = setup({...staticfile, extname: 'html'});
     expect(image.node).toBeFalsy();
     expect(div.node).toBeTruthy();
   });
+
+  it('should render an indicator if file is from theme-gem', () => {
+    const { indicator } = setup({...staticfile, from_theme: true});
+    expect(indicator.node).toBeTruthy();
+  });
+
+  it('should not render a delete-button if file is from theme-gem', () => {
+    const { delete_btn } = setup({...staticfile, from_theme: true});
+    expect(delete_btn.node).toBeFalsy();
+  });
 });

src/constants/index.js

@@ -1,2 +1,2 @@
-export const VERSION = 'v0.5.1';
+export const VERSION = 'v0.6.0';
 export const ADMIN_PREFIX = '/admin';

src/constants/lang/da.js

@@ -75,7 +75,7 @@ export const labels = {
     label: 'Upload filer'
   },
   viewToggle: {
-    label: 'Skift Udsigt til Raw Editor',
-    triggeredLabel: 'Skift Udsigt til Raw Editor'
+    label: 'Skift visning til grafisk redigering',
+    triggeredLabel: 'Skift visning til tekst redigering'
   }
 };

src/containers/App.js

@@ -2,6 +2,7 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { HotKeys } from 'react-hotkeys';
+import DocumentTitle from 'react-document-title';
 
 import { fetchConfig } from '../actions/config';
 import keyboardShortcuts from '../constants/keyboardShortcuts';
@@ -33,23 +34,25 @@ class App extends Component {
     }
 
     return (
-      <HotKeys
-        keyMap={keyboardShortcuts}
-        className="wrapper">
-        {
-          config.content &&
-          <div>
-            <Sidebar config={config.content} />
-            <div className="container">
-              <Header config={config.content} />
-              <div className="content">
-                {this.props.children}
+      <DocumentTitle title="Jekyll Admin">
+        <HotKeys
+          keyMap={keyboardShortcuts}
+          className="wrapper">
+          {
+            config.content &&
+            <div>
+              <Sidebar config={config.content} />
+              <div className="container">
+                <Header config={config.content} />
+                <div className="content">
+                  {this.props.children}
+                </div>
               </div>
+              <Notifications />
             </div>
-            <Notifications />
-          </div>
-        }
-      </HotKeys>
+          }
+        </HotKeys>
+      </DocumentTitle>
     );
   }
 }

src/containers/views/Configuration.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { withRouter } from 'react-router';
 import { HotKeys } from 'react-hotkeys';
+import DocumentTitle from 'react-document-title';
 import DataGUI from '../MetaFields';
 import Editor from '../../components/Editor';
 import Errors from '../../components/Errors';
@@ -71,44 +72,46 @@ export class Configuration extends Component {
     };
 
     return (
-      <HotKeys handlers={keyboardHandlers} className="single">
-        {errors && errors.length > 0 && <Errors errors={errors} />}
-        <div className="content-header">
-          <h1>Configuration</h1>
-          <div className="page-buttons multiple">
-            <Button // TODO: Hide toggle for non-YAML config files (e.g. '_config.toml')
-              onClick={this.toggleView}
-              type="view-toggle"
-              active={true}
-              triggered={this.state.guiView}
-              block />
-            <Button
-              onClick={this.handleClickSave}
-              type="save"
-              active={editorChanged || fieldChanged}
-              triggered={updated}
-              block />
+      <DocumentTitle title="Configuration">
+        <HotKeys handlers={keyboardHandlers} className="single">
+          {errors && errors.length > 0 && <Errors errors={errors} />}
+          <div className="content-header">
+            <h1>Configuration</h1>
+            <div className="page-buttons multiple">
+              <Button // TODO: Hide toggle for non-YAML config files (e.g. '_config.toml')
+                onClick={this.toggleView}
+                type="view-toggle"
+                active={true}
+                triggered={this.state.guiView}
+                block />
+              <Button
+                onClick={this.handleClickSave}
+                type="save"
+                active={editorChanged || fieldChanged}
+                triggered={updated}
+                block />
+            </div>
           </div>
-        </div>
-          {
-            this.state.guiView && content &&
-              <div className="content-body">
-                <div className="warning">
-                  CAUTION! Any existing comments and formatting will be lost when editing via this view.
-                  Switch to the <strong>Raw Editor</strong> to preserve comments and formatting.
+            {
+              this.state.guiView && content &&
+                <div className="content-body">
+                  <div className="warning">
+                    CAUTION! Any existing comments and formatting will be lost when editing via this view.
+                    Switch to the <strong>Raw Editor</strong> to preserve comments and formatting.
+                  </div>
+                  <DataGUI fields={content} dataview/>
                 </div>
-                <DataGUI fields={content} dataview/>
-              </div>
+            }
+          {
+            !this.state.guiView && raw_content &&
+              <Editor
+                editorChanged={editorChanged}
+                onEditorChange={onEditorChange}
+                content={raw_content}
+                ref="editor" />
           }
-        {
-          !this.state.guiView && raw_content &&
-            <Editor
-              editorChanged={editorChanged}
-              onEditorChange={onEditorChange}
-              content={raw_content}
-              ref="editor" />
-        }
-      </HotKeys>
+        </HotKeys>
+      </DocumentTitle>
     );
   }
 }