test

Karpikau Andrei
1 parent 7be1a548
Showing 5 changed files with 83 additions and 69 deletions
.idea/kanjai.iml
.idea/workspace.xml
Gemfile.lock
app/controllers/kanjai/client/page_controller.rb
app/controllers/kanjai/pages_controller.rb
--- a/.idea/kanjai.iml
View file @4a64056
+++ b/.idea/kanjai.iml
View file @4a64056
@@ -137,8 +137,8 @@
     <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.2.36, rbenv: 2.1.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.36, rbenv: 2.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
--- a/.idea/workspace.xml
View file @4a64056
+++ b/.idea/workspace.xml
View file @4a64056
@@ -74,22 +74,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
-              <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
-              <folding>
-                <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
-                <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
-                <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
-                <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
-                <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -128,16 +112,26 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
+      <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
               <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.875" vertical-offset="1481" max-vertical-offset="2115">
+              <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="IdeDocumentHistory">
@@ -186,7 +180,6 @@
         <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
         <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
         <option value="$PROJECT_DIR$/public/test_template/index.html" />
-        <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
         <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
         <option value="$PROJECT_DIR$/kanjai.gemspec" />
         <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
@@ -194,6 +187,7 @@
         <option value="$PROJECT_DIR$/lib/kanjai.rb" />
         <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
         <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
       </list>
     </option>
   </component>
@@ -306,6 +300,46 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="models" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kanjai" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kanjai" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kanjai" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="controllers" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kanjai" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kanjai" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="app" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="assets" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -507,7 +541,7 @@
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -538,14 +572,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="315">
-          <caret line="14" column="82" selection-start-line="14" selection-start-column="82" selection-end-line="14" selection-end-column="82" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="450">
@@ -829,14 +855,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1346" max-vertical-offset="2115">
-          <caret line="115" column="154" selection-start-line="115" selection-start-column="154" selection-end-line="115" selection-end-column="154" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="420">
@@ -874,7 +892,7 @@
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="n#!!doc" expanded="true" />
+            <element signature="n#!!doc" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -884,11 +902,11 @@
         <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
           <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
           <folding>
-            <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
-            <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
-            <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
-            <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
-            <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
+            <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
+            <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
           </folding>
         </state>
       </provider>
@@ -967,11 +985,19 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
           <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.875" vertical-offset="1481" max-vertical-offset="2115">
+          <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
--- a/Gemfile.lock
View file @4a64056
+++ b/Gemfile.lock
View file @4a64056
 PATH
   remote: .
   specs:
-    kanjai (0.0.1)
+    kanjai (0.0.2)
       acts_as_list
       acts_as_tree
       aws-sdk
@@ -64,12 +64,12 @@ GEM
     acts_as_tree (2.4.0)
       activerecord (>= 3.0.0)
     arel (6.0.3)
-    aws-sdk (2.2.36)
-      aws-sdk-resources (= 2.2.36)
-    aws-sdk-core (2.2.36)
+    aws-sdk (2.2.37)
+      aws-sdk-resources (= 2.2.37)
+    aws-sdk-core (2.2.37)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.36)
-      aws-sdk-core (= 2.2.36)
+    aws-sdk-resources (2.2.37)
+      aws-sdk-core (= 2.2.37)
     backport_new_renderer (1.0.0)
       rails
     bcrypt (3.1.11)
--- a/app/controllers/kanjai/client/page_controller.rb deleted 100644 → 0
View file @7be1a54
+++ b/app/controllers/kanjai/client/page_controller.rb deleted 100644 → 0
View file @7be1a54
-class Client::PageController < SiteController
-
-  layout false
-
-
-  def user_logo
-
-    render :text => 'hello world'
-  end
-
-
-end
--- a/app/controllers/kanjai/pages_controller.rb
View file @4a64056
+++ b/app/controllers/kanjai/pages_controller.rb
View file @4a64056
@@ -117,12 +117,12 @@ module Kanjai
             end
             layer.gsub!(marker, js_array.join(''))
           else
-            if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
-              page_marker = PageMarker.new
-              content = page_marker.method("process_#{marker.gsub('###', '')}").call(page_data)
-              layer.gsub!(marker, content)
-            end
-          #look exist or not function with this name
+            #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
+            #  page_marker = PageMarker.new
+            #  content = page_marker.method("process_#{marker.gsub('###', '')}").call(page_data)
+            #  layer.gsub!(marker, content)
+            #end
+
         end
       end