From 40ca6e8d968559925bc59ec94402b67da65c56f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <mailport@mikescher.de>
Date: Fri, 19 Jan 2018 22:49:46 +0100
Subject: [PATCH] fix css_compress + include .idea/

---
 .gitignore                                    |  9 ++--
 .idea/.name                                   |  1 +
 .idea/Source.iml                              |  8 ++++
 .idea/codeStyleSettings.xml                   | 13 ++++++
 .idea/codeStyles/Project.xml                  |  7 +++
 .idea/codeStyles/codeStyleConfig.xml          |  5 +++
 .idea/copyright/profiles_settings.xml         |  3 ++
 .idea/deployment.xml                          | 14 ++++++
 .idea/dictionaries/Mike.xml                   |  3 ++
 .idea/encodings.xml                           |  5 +++
 .idea/frameworkRootSettings.xml               | 19 ++++++++
 .idea/inspectionProfiles/Project_Default.xml  | 11 +++++
 .../inspectionProfiles/profiles_settings.xml  |  7 +++
 .idea/misc.xml                                |  6 +++
 .idea/modules.xml                             |  8 ++++
 .idea/scopes/scope_settings.xml               |  5 +++
 .idea/sqldialects.xml                         |  6 +++
 .idea/vcs.xml                                 |  7 +++
 .idea/watcherTasks.xml                        | 45 +++++++++++++++++++
 .idea/www.mikescher.de.iml                    | 12 +++++
 data/css_compress/compress.py                 | 42 ++++++++++++++---
 21 files changed, 227 insertions(+), 9 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 .idea/Source.iml
 create mode 100644 .idea/codeStyleSettings.xml
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/deployment.xml
 create mode 100644 .idea/dictionaries/Mike.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/frameworkRootSettings.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/scopes/scope_settings.xml
 create mode 100644 .idea/sqldialects.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/watcherTasks.xml
 create mode 100644 .idea/www.mikescher.de.iml

diff --git a/.gitignore b/.gitignore
index 43bef57..6ed4df6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-.idea
 demos
-#www/images/programs
-workspace.xml
 *.secret
-.idea/
 runtime/
+
+**/.idea/workspace.xml
+**/.idea/tasks.xml
+
+**/.idea/dataSources*
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..7d709dc
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+www.mikescher.de
\ No newline at end of file
diff --git a/.idea/Source.iml b/.idea/Source.iml
new file mode 100644
index 0000000..c956989
--- /dev/null
+++ b/.idea/Source.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000..965792d
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..b3295c5
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="" />
+</component>
\ No newline at end of file
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 0000000..b4bc9e2
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData">
+    <serverData>
+      <paths name="local_xampp">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/dictionaries/Mike.xml b/.idea/dictionaries/Mike.xml
new file mode 100644
index 0000000..2fe4951
--- /dev/null
+++ b/.idea/dictionaries/Mike.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Mike" />
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..e206d70
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/.idea/frameworkRootSettings.xml b/.idea/frameworkRootSettings.xml
new file mode 100644
index 0000000..91f96f9
--- /dev/null
+++ b/.idea/frameworkRootSettings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FrameworkRootSettings" id="Yii">
+    <option name="typedPaths">
+      <list>
+        <element elementPath="$PROJECT_DIR$/www/assets" typeId="assets_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected" typeId="protected_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/controllers" typeId="protected_controllers_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/extensions" typeId="protected_extensions_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/models" typeId="protected_models_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/runtime" typeId="protected_runtime_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/views" typeId="protected_views_directory" />
+        <element elementPath="$PROJECT_DIR$/www/protected/views/layouts" typeId="protected_views_layouts_directory" />
+        <element elementPath="$PROJECT_DIR$/www/themes" typeId="themes_directory" />
+      </list>
+    </option>
+  </component>
+</project>
+
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..c66df00
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0" is_locked="false">
+    <option name="myName" value="Project Default" />
+    <option name="myLocal" value="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..30c3b65
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/www.mikescher.de.iml" filepath="$PROJECT_DIR$/.idea/www.mikescher.de.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000..922003b
--- /dev/null
+++ b/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 0000000..56782ca
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="PROJECT" dialect="MySQL" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c80f219
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
+
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
new file mode 100644
index 0000000..e6dd317
--- /dev/null
+++ b/.idea/watcherTasks.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectTasksOptions" suppressed-tasks="Babel">
+    <TaskOptions isEnabled="false">
+      <option name="arguments" value="--no-cache --update styles.scss:styles.css" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ERROR" />
+      <option name="fileExtension" value="scss" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="SCSS" />
+      <option name="output" value="styles.css:styles.css.map" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="C:/TOOLS/Ruby/bin/scss.bat" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="true" />
+      <option name="workingDir" value="$FileDir$" />
+      <envs />
+    </TaskOptions>
+    <TaskOptions isEnabled="true">
+      <option name="arguments" value="&quot;F:\Eigene Dateien\Dropbox\Programming\Web\Website - Mikescher\Source\data\css_compress\compress.py&quot; &quot;$FileDir$\styles.scss&quot; &quot;$FileDir$\styles.css&quot; &quot;$FileDir$\styles.min.css&quot;" />
+      <option name="checkSyntaxErrors" value="true" />
+      <option name="description" />
+      <option name="exitCodeBehavior" value="ALWAYS" />
+      <option name="fileExtension" value="scss" />
+      <option name="immediateSync" value="true" />
+      <option name="name" value="SCSS + Minimize" />
+      <option name="output" value="styles.min.css:styles.css:styles.css.map" />
+      <option name="outputFilters">
+        <array />
+      </option>
+      <option name="outputFromStdout" value="false" />
+      <option name="program" value="C:/TOOLS/python3/python.exe" />
+      <option name="runOnExternalChanges" value="true" />
+      <option name="scopeName" value="Project Files" />
+      <option name="trackOnlyRoot" value="true" />
+      <option name="workingDir" value="$PROJECT_DIR$/data/css_compress/" />
+      <envs />
+    </TaskOptions>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/www.mikescher.de.iml b/.idea/www.mikescher.de.iml
new file mode 100644
index 0000000..547ac33
--- /dev/null
+++ b/.idea/www.mikescher.de.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/www" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/demos" />
+      <excludePattern pattern="*.css" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/data/css_compress/compress.py b/data/css_compress/compress.py
index 76dedf5..01f7826 100644
--- a/data/css_compress/compress.py
+++ b/data/css_compress/compress.py
@@ -24,39 +24,64 @@ def countnl(str, start, end):
         if (str[i] == '\n'): cnt = cnt+1;
     return cnt;
 
-finput  = str.replace(sys.argv[1], '\\', '/')
-foutput = str.replace(sys.argv[2], '\\', '/')
+fsource = str.replace(sys.argv[1], '\\', '/')  # scss
+finput  = str.replace(sys.argv[2], '\\', '/')  # css
+foutput = str.replace(sys.argv[3], '\\', '/')  # min.css
 ftemp = '__temp_compresss_py_yui.tmp.css';
 
 print('======== INPUT ========');
 print();
+print(fsource);
 print(finput);
 print(foutput);
 print();
 print();
 
+print('======== CALL SCSS ========');
+out = subprocess.run(['C:/TOOLS/Ruby/bin/scss.bat', '--no-cache', '--update', fsource + ':' + finput], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+print('> C:/TOOLS/Ruby/bin/scss.bat --no-cache --update ' + fsource + ':' + finput)
+print('STDOUT:')
+print(out.stdout.decode('utf-8'))
+print('STDERR:')
+print(out.stderr.decode('utf-8'))
 
-print('======== CALL ========');
-#os.system("java -jar yuicompressor.jar \""+finput+"\" -o \""+ftemp+"\"")
+print('')
+print('')
+
+
+print('======== CALL YUI ========');
 out = subprocess.run(['java', '-jar', 'yuicompressor.jar', finput, '-o', ftemp], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+print('> java -jar yuicompressor.jar "'+finput+'" -o "'+ftemp+'"')
 print('STDOUT:');
 print(out.stdout.decode('utf-8'))
 print('STDERR:');
 print(out.stderr.decode('utf-8'))
 
+print('')
+print('')
+
 print('======== READ ========');
 with open(ftemp, 'r') as tf:
     data = tf.read()
 
+print('')
+print('')
+
 print('======== REM ========');
 try:
     os.remove(ftemp);
 except e:
     print(e)
 
+print('')
+print('')
+
 print('======== REGEX ========');
 data = re.sub(r'(\}*\})', '\g<1>\n', data);
 
+print('')
+print('')
+
 print('======== MEDIA ========');
 ins = []
 for i in range(len(data)):
@@ -78,6 +103,13 @@ for i in range(len(data)):
 for (l, c) in reversed(ins):
     data = data[:l] + c + data[l:]
 
+print('')
+print('')
+
 print('======== WRITE ========');
 with open(foutput, "w") as tf:
-    tf.write(data)
\ No newline at end of file
+    tf.write(data)
+
+print('')
+print('')
+print('Sinished.')