Browse Source

Meteor upgrade; layout modified.

Frederic G. MARAND 5 years ago
parent
commit
bfa63b81a8

+ 2 - 3
.gitignore

@@ -1,3 +1,2 @@
-/node_modules/
-package-lock.json
-yarn.lock
+.idea/workspace.xml
+/filog

+ 7 - 0
.idea/dictionaries/fgm.xml

@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="fgm">
+    <words>
+      <w>cordova</w>
+    </words>
+  </dictionary>
+</component>

+ 6 - 0
.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

+ 11 - 0
.idea/filog_demo.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/filog/lib" />
+      <excludeFolder url="file://$MODULE_DIR$/meteor/.meteor/local" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 6 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="TsLint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

+ 6 - 0
.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Meteor project library" />
+  </component>
+</project>

+ 4 - 0
.idea/jsLinters/tslint.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="TsLintConfiguration" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/filog/tslint.json" />
+</project>

+ 12 - 0
.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ESLintProjectComponent">
+    <option name="eslintRcFile" value="$USER_HOME$/.eslintrc.js" />
+    <option name="eslintExecutable" value="/usr/local/lib/node_modules/eslint/bin/eslint.js" />
+    <option name="nodeInterpreter" value="/usr/local/bin/node" />
+    <option name="pluginEnabled" value="true" />
+  </component>
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

+ 8 - 0
.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/filog_demo.iml" filepath="$PROJECT_DIR$/.idea/filog_demo.iml" />
+    </modules>
+  </component>
+</project>

+ 20 - 0
.idea/mongoSettings.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MongoConfiguration">
+    <option name="serverConfigurations">
+      <list>
+        <ServerConfiguration>
+          <option name="label" value="Local default" />
+          <option name="serverUrls">
+            <list>
+              <option value="localhost:27017" />
+            </list>
+          </option>
+          <option name="sshTunnelingConfiguration">
+            <SshTunnelingConfiguration />
+          </option>
+        </ServerConfiguration>
+      </list>
+    </option>
+  </component>
+</project>

+ 14 - 0
.idea/php.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetector">
+    <phpmd_settings>
+      <MessDetectorConfiguration tool_path="/usr/local/opt/phpmd/bin/phpmd" />
+    </phpmd_settings>
+  </component>
+  <component name="PhpCodeSniffer">
+    <phpcs_settings>
+      <PhpCSConfiguration standards="MySource;PEAR;PHPCS;PSR1;PSR2;Squiz;Zend" tool_path="$PROJECT_DIR$/../../../Carrefour/sources/vendor/bin/phpcs" />
+    </phpcs_settings>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
+</project>

+ 12 - 0
.idea/runConfigurations/Jest_all.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Jest all" type="JavaScriptTestRunnerJest" factoryName="Jest">
+    <config-file value="$PROJECT_DIR$/filog/jest.config.js" />
+    <node-interpreter value="project" />
+    <node-options value="" />
+    <working-dir value="$PROJECT_DIR$/filog" />
+    <jest-options value="__tests__/unit/test.ts __tests__/integration/test.ts" />
+    <envs />
+    <scope-kind value="ALL" />
+    <method v="2" />
+  </configuration>
+</component>

+ 12 - 0
.idea/runConfigurations/Jest_integration.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Jest integration" type="JavaScriptTestRunnerJest" factoryName="Jest">
+    <config-file value="$PROJECT_DIR$/filog/jest.config.js" />
+    <node-interpreter value="project" />
+    <node-options value="" />
+    <working-dir value="$PROJECT_DIR$/filog" />
+    <jest-options value="__tests__/integration/test.ts" />
+    <envs />
+    <scope-kind value="ALL" />
+    <method v="2" />
+  </configuration>
+</component>

+ 12 - 0
.idea/runConfigurations/Jest_unit.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Jest unit" type="JavaScriptTestRunnerJest" factoryName="Jest">
+    <config-file value="$PROJECT_DIR$/filog/jest.config.js" />
+    <node-interpreter value="project" />
+    <node-options value="" />
+    <working-dir value="$PROJECT_DIR$/filog" />
+    <jest-options value="__tests__/unit/test.ts --watch" />
+    <envs />
+    <scope-kind value="ALL" />
+    <method v="2" />
+  </configuration>
+</component>

+ 13 - 0
.idea/runConfigurations/NPM_TS_Compile_watch.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="NPM TS Compile watch" type="js.build_tools.npm" factoryName="npm">
+    <package-json value="$PROJECT_DIR$/filog/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="ts-compile" />
+    </scripts>
+    <arguments value="--watch" />
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

+ 7 - 0
.idea/typescript-compiler.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="TypeScriptCompiler">
+    <option name="enableServiceForProjectsWithoutConfig" value="false" />
+    <option name="typeScriptCompilerParams" value="--lib dom,es2017" />
+  </component>
+</project>

+ 8 - 0
.idea/vcs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/filog" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/meteor/.meteor/local/build/programs/server/npm/node_modules/filog" vcs="Git" />
+  </component>
+</project>

+ 0 - 1
.meteor/release

@@ -1 +0,0 @@
-METEOR@1.7.0.4

+ 3 - 0
meteor/.gitignore

@@ -0,0 +1,3 @@
+/node_modules/
+package-lock.json
+yarn.lock

+ 0 - 0
.meteor/.finished-upgraders → meteor/.meteor/.finished-upgraders


+ 0 - 0
.meteor/.gitignore → meteor/.meteor/.gitignore


+ 0 - 0
.meteor/.id → meteor/.meteor/.id


+ 3 - 3
.meteor/packages → meteor/.meteor/packages

@@ -19,6 +19,6 @@ shell-server@0.3.1            # Server-side component of the `meteor shell` comm
 
 autopublish@1.0.7             # Publish all data to the clients (for prototyping)
 insecure@1.0.7                # Allow all DB writes from clients (for prototyping)
-dynamic-import@0.4.0
-accounts-password
-accounts-ui
+dynamic-import@0.4.2
+accounts-password@1.5.1
+accounts-ui@1.3.0

+ 0 - 0
.meteor/platforms → meteor/.meteor/platforms


+ 1 - 0
meteor/.meteor/release

@@ -0,0 +1 @@
+METEOR@1.7.0.5

+ 1 - 1
.meteor/versions → meteor/.meteor/versions

@@ -24,7 +24,7 @@ ddp-rate-limiter@1.0.7
 ddp-server@2.2.0
 deps@1.0.12
 diff-sequence@1.1.0
-dynamic-import@0.4.1
+dynamic-import@0.4.2
 ecmascript@0.11.1
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.7.2

+ 0 - 0
Makefile → meteor/Makefile


+ 0 - 0
client/main.css → meteor/client/main.css


+ 0 - 0
client/main.html → meteor/client/main.html


+ 2 - 0
client/main.js → meteor/client/main.js

@@ -34,11 +34,13 @@ Template.hello.events({
 class ExtendedBrowserProcessor extends BrowserProcessor {
 
   constructor(browserInfo) {
+    console.log("EBP constructor");
     super();
     this.browserInfo = pick(browserInfo, ['description', 'name', 'version', 'layout', 'os']);
   }
 
   process(context) {
+    console.log("EBP process");
     const result = super.process(context);
     return {
       ...result,

+ 0 - 0
package.json → meteor/package.json


+ 0 - 0
server/main.js → meteor/server/main.js