Przeglądaj źródła

Merge branch 'dev' for v0.2.10

DricomDragon 4 lat temu
rodzic
commit
b7c3a88856

+ 0 - 13
.idea/StaticJovian.iml

@@ -1,13 +0,0 @@
-<?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$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jquery-3.3.1.slim" level="application" />
-  </component>
-</module>

+ 0 - 3
.idea/dictionaries/jovian.xml

@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="jovian" />
-</component>

+ 0 - 4
.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

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

@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <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>

+ 0 - 6
.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{jquery-3.3.1.slim}" />
-  </component>
-</project>

+ 0 - 6
.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

+ 0 - 8
.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/StaticJovian.iml" filepath="$PROJECT_DIR$/.idea/StaticJovian.iml" />
-    </modules>
-  </component>
-</project>

+ 0 - 8
.idea/php.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpIncludePathManager">
-    <include_path>
-      <path value="" />
-    </include_path>
-  </component>
-</project>

+ 0 - 6
.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

+ 0 - 456
.idea/workspace.xml

@@ -1,456 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="458baa9a-0ac3-475e-8174-3ab8ea444385" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-<<<<<<< HEAD
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
-=======
->>>>>>> master
-    </list>
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projects.html">
-          <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-            <state relative-caret-position="12">
-              <caret line="233" column="22" selection-start-line="233" selection-start-column="22" selection-end-line="233" selection-end-column="22" />
-=======
-            <state relative-caret-position="570">
-              <caret line="148" column="25" selection-start-line="148" selection-start-column="25" selection-end-line="148" selection-end-column="25" />
->>>>>>> master
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/custom/pagination.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="684">
-              <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/custom/main.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projets/pro_ascii_space.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="468">
-              <caret line="359" column="16" lean-forward="true" selection-start-line="359" selection-start-column="16" selection-end-line="359" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-<<<<<<< HEAD
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="544">
-              <caret line="91" column="75" lean-forward="true" selection-start-line="91" selection-start-column="75" selection-end-line="91" selection-end-column="75" />
-=======
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cv.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="28" selection-end-column="20" />
->>>>>>> master
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/index.html">
-          <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-            <state relative-caret-position="430">
-              <caret line="405" column="4" lean-forward="true" selection-start-line="405" selection-start-column="4" selection-end-line="412" selection-end-column="10" />
-=======
-            <state relative-caret-position="316">
-              <caret line="75" column="29" selection-end-line="98" selection-end-column="7" />
->>>>>>> master
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/error404.html">
-          <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-            <state relative-caret-position="399">
-              <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
-=======
-            <state relative-caret-position="658">
-              <caret line="85" column="10" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
->>>>>>> master
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1463">
-              <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1672">
-              <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="279">
-              <caret line="4886" selection-start-line="4886" selection-end-line="4890" selection-end-column="1" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="HTML File" />
-        <option value="CSS File" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>em</find>
-      <find>class=&quot;col-8&quot;</find>
-      <find>h2</find>
-      <find>bg-success</find>
-      <find>&lt;em&gt;([a-z\wé]*)&lt;/em&gt;</find>
-      <find>&lt;em&gt;([\sa-zé]*)&lt;/em&gt;</find>
-      <find>&lt;/b&gt;(\s*:[–\sa-zé]*)&lt;span class=&quot;city&quot;&gt;</find>
-      <find>pagination</find>
-      <find>page-item</find>
-      <find>page-link</find>
-      <find>disabled</find>
-      <find>cursor</find>
-      <find>col-4</find>
-      <find>card-columns</find>
-      <find>media</find>
-    </findStrings>
-    <replaceStrings>
-      <replace>class=&quot;col-9&quot;</replace>
-      <replace>h4</replace>
-      <replace>&lt;span class=&quot;city&quot;&gt;$1&lt;/span&gt;</replace>
-      <replace>&lt;/b&gt;&lt;span class=&quot;middle-info&quot;&gt;$1&lt;/span&gt;&lt;span class=&quot;city&quot;&gt;</replace>
-      <replace>col-xl-4 col-lg-6 col-md-12</replace>
-    </replaceStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/home.html" />
-        <option value="$PROJECT_DIR$/cv.html" />
-<<<<<<< HEAD
-        <option value="$PROJECT_DIR$/css/custom/main.css" />
-=======
->>>>>>> master
-        <option value="$PROJECT_DIR$/css/custom/pagination.css" />
-        <option value="$PROJECT_DIR$/projets/pro_static_site.html" />
-        <option value="$PROJECT_DIR$/contact.html" />
-        <option value="$PROJECT_DIR$/projets/pro_quoridor.html" />
-        <option value="$PROJECT_DIR$/projets/pro_pulsar.html" />
-        <option value="$PROJECT_DIR$/projects.html" />
-<<<<<<< HEAD
-        <option value="$PROJECT_DIR$/index.html" />
-=======
-        <option value="$PROJECT_DIR$/css/custom/main.css" />
-        <option value="$PROJECT_DIR$/projets/pro_ascii_space.html" />
-        <option value="$PROJECT_DIR$/index.html" />
-        <option value="$PROJECT_DIR$/error404.html" />
->>>>>>> master
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="960" />
-    <option name="y" value="28" />
-    <option name="width" value="960" />
-    <option name="height" value="1052" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
-              <item name="custom" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
-              <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
-              <item name="projets" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="list.type.of.created.stylesheet" value="CSS" />
-    <property name="nodejs.mocha.mocha_node_package_dir" value="" />
-    <property name="settings.editor.selected.configurable" value="web.server" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SpellCheckerSettings" BundledDictionaries="1" BundledDictionary0="english.dic" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="project-level" UseSingleDictionary="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="458baa9a-0ac3-475e-8174-3ab8ea444385" name="Default Changelist" comment="" />
-      <created>1544351302156</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1544351302156</updated>
-      <workItem from="1544351313044" duration="4545000" />
-      <workItem from="1544467535946" duration="8368000" />
-      <workItem from="1544552178602" duration="6585000" />
-      <workItem from="1544635542542" duration="4441000" />
-      <workItem from="1545071688272" duration="7592000" />
-      <workItem from="1547284178594" duration="3205000" />
-      <workItem from="1547575616175" duration="4557000" />
-      <workItem from="1547893759808" duration="7192000" />
-      <workItem from="1547980991085" duration="6558000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-<<<<<<< HEAD
-    <option name="totallyTimeSpent" value="53043000" />
-=======
-    <option name="totallyTimeSpent" value="55324000" />
->>>>>>> master
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-3" y="28" width="1926" height="1055" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.10648392" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/html/home.html" />
-    <entry file="file://$PROJECT_DIR$/home.html" />
-    <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1482">
-          <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/contact.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="684">
-          <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-<<<<<<< HEAD
-    <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="4608" column="15" selection-start-line="4608" selection-start-column="3" selection-end-line="4608" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/contact.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
-=======
-    <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1463">
-          <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1672">
-          <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/projects.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="148" column="25" selection-start-line="148" selection-start-column="25" selection-end-line="148" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/custom/pagination.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="684">
-          <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
->>>>>>> master
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
-      <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="701">
-          <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="259">
-          <caret line="77" column="10" lean-forward="true" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
-=======
-        <state relative-caret-position="279">
-          <caret line="4886" selection-start-line="4886" selection-end-line="4890" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/css/custom/main.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
->>>>>>> master
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/projets/pro_ascii_space.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="468">
-          <caret line="359" column="16" lean-forward="true" selection-start-line="359" selection-start-column="16" selection-end-line="359" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-<<<<<<< HEAD
-    <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
-=======
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="316">
-          <caret line="75" column="29" selection-end-line="98" selection-end-column="7" />
->>>>>>> master
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cv.html">
-      <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="430">
-          <caret line="405" column="4" lean-forward="true" selection-start-line="405" selection-start-column="4" selection-end-line="412" selection-end-column="10" />
-=======
-        <state relative-caret-position="171">
-          <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="28" selection-end-column="20" />
->>>>>>> master
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/error404.html">
-      <provider selected="true" editor-type-id="text-editor">
-<<<<<<< HEAD
-        <state relative-caret-position="12">
-          <caret line="233" column="22" selection-start-line="233" selection-start-column="22" selection-end-line="233" selection-end-column="22" />
-=======
-        <state relative-caret-position="658">
-          <caret line="85" column="10" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
->>>>>>> master
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="91" column="75" lean-forward="true" selection-start-line="91" selection-start-column="75" selection-end-line="91" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>

+ 2 - 0
.lvimrc

@@ -0,0 +1,2 @@
+" To comply with exitsting code
+set expandtab

+ 102 - 130
web/cv.php

@@ -23,14 +23,10 @@
                 Curriculum Vitae
             </h2>
             <div class="row">
-                <div class="col-lg-12 col-xl-6 lead"><strong>Étudiant</strong> alternant ingénieur généraliste à l'École Centrale</div>
-                <div class="col-lg-12 col-xl-6 lead"><strong>Apprenti</strong> dans l'équipe STB Integration à Viaccess-Orca</div>
-                <div class="col-lg-12 col-xl-6">
+                <div class="col-12 lead"><strong>Ingénieur</strong> diplômé de l'École Centrale de Nantes</div>
+                <div class="col-12">
                     <img src="include/images/logoCN.png" class="mx-auto" alt="Logo Centrale Nantes">
                 </div>
-                <div class="col-lg-12 col-xl-6">
-                    <img src="include/images/logoVO.png" class="mx-auto" style="height:100%" alt="Logo Viaccess Orca">
-                </div>
             </div>
         </div>
         <h3>
@@ -41,14 +37,16 @@
 
             <!-- Centrale -->
             <div class="col-3">
-                2017 - aujourd'hui
+                2017 - 2020
             </div>
             <div class="col-9">
                 <b>École Centrale</b> – <span class="city">Nantes</span>
                 <br/>
-                Formation ingénieur généraliste par Alternance
+                Diplôme d'ingénieur
+                <br/>
+                Filière généraliste par alternance
                 <br/>
-                Apprentissage effectué chez Viaccess-Orca
+                Option informatique spécialité génie informatique
             </div>
 
             <!-- Chateaubriand -->
@@ -56,24 +54,25 @@
                 2015 - 2017
             </div>
             <div class="col-9">
-                <b>Lycée Chateaubriand</b> : <span class="middle-info">Classe Préparatoire Grandes Écoles</span> – <span
-                    class="city">Rennes</span>
+                <b>Lycée Chateaubriand</b> – <span class="city">Rennes</span>
                 <br/>
-                Filière MPSI (Maths Physique Sciences de l'Ingénieur) – MP* (Maths Physique)
+                Classe Préparatoire aux Grandes Écoles
                 <br/>
-                option informatique
+                Filière MPI (Maths, Physique, Informatique)
+                <br/>
+                Option informatique théorique
             </div>
 
             <!-- Réaumur -->
             <div class="col-3">
-                juin 2015
+                2013 - 2015
             </div>
             <div class="col-9">
                 <b>Lycée Réaumur</b> – <span class="city">Laval</span>
                 <br/>
-                Baccalauréat Scientifique spécialité Sciences de l'Ingénieur
+                Bac général
                 <br/>
-                mention Très Bien
+                Filière SSI (Scientifique spécialité Sciences de l'Ingénieur)
             </div>
         </div>
         <h3>
@@ -82,21 +81,21 @@
         </h3>
         <div class="row">
             <div class="col-lg-12 col-xl-6">
-                <h4>Monde de l'entreprise</h4>
+                <h4>Professionnelles</h4>
 
                 <!-- Viaccess France -->
                 <div class="row">
                     <div class="col-3">
-                        déc. 2017 - aujourd'hui
+                        2017 - 2020
                     </div>
                     <div class="col-9">
                         <b>Viaccess Orca</b> – <span class="city">Cesson Sévigné</span>
                         <br/>
-                        Apprentissage par alternance effectué avec l'École Centrale de Nantes
+                        Développeur dans l'équipe outil
                         <br/>
-                        Développement informatique dans l'équipe Intégration décodeur
+                        Apprentissage en alternance
                         <br/>
-                        Application web de suivi de processus (Backend/Frontend)
+                        Développement d'une application web de suivi de processus
                     </div>
                 </div>
 
@@ -108,25 +107,11 @@
                     <div class="col-9">
                         <b>Viaccess Orca Finland</b> – <span class="city">Tampere</span> – <em>Finlande</em>
                         <br/>
-						Développements expérimentaux sur une application Android
-						<br/>
-						Mise en place d'un serveur Jenkins d'intégration continue
-                    </div>
-                </div>
-
-                <!-- ARA-Technology -->
-                <div class="row">
-                    <div class="col-3">
-                        avril 2014
-                    </div>
-                    <div class="col-9">
-                        <b>ARA-Technology</b> – <span class="city">Laval</span>
+                        Développeur dans l'équipe Android
                         <br/>
-                        stage d'observation
+                        Développement d'application mobile
                         <br/>
-                        Start-up spécialisée en
-                        réalité augmentée sur
-                        smartphones et tablettes
+                        Réinstallation et modernisation d'un serveur d'intégration continue
                     </div>
                 </div>
 
@@ -134,55 +119,38 @@
 
             <div class="col-lg-12 col-xl-6">
 
-                <h4>Projets scolaires</h4>
+                <h4>Scolaires</h4>
 
-                <!-- TIPE -->
+                <!-- Projet de Centrale -->
                 <div class="row">
                     <div class="col-3">
-                        2016-2017
+                        2019 - 2020
                     </div>
                     <div class="col-9">
-                        <b>TIPE</b> : <span class="middle-info">Travaux d'Initiative Personnelle Encadrés</span>
+                        <b>Conception d'un jeu-vidéo</b>
                         <br/>
-                        Projet de concours
+                        Projet professionnalisant
                         <br/>
-                        développement d'intelligences
-                        artificielles sur un jeu de stratégie
+                        Développement du jeu et administration des outils de projet
                         <br/>
-                        20/20 au concours Centrale
+                        En équipe avec une graphiste et un responsable de projet
                     </div>
                 </div>
 
-                <!-- PPE -->
+                <!-- TIPE -->
                 <div class="row">
                     <div class="col-3">
-                        avril 2014
+                        2016 - 2017
                     </div>
                     <div class="col-9">
-                        <b>PPE</b> : <span class="middle-info">Projet Pluridisciplinaire Encadré</span>
+                        <b>Conception d'IA</b>
                         <br/>
-                        projet de baccalauréat
+                        Projet de concours
                         <br/>
-                        automatisation d'un distributeur autonome de
-                        nourriture pour chats
+                        Développement d'Intelligences Artificielles (IA) sur le jeu de stratégie Quoridor
                     </div>
                 </div>
 
-                <!-- Club-Programmation informatique -->
-                <div class="row">
-                    <div class="col-3">
-                        2013-2015
-                    </div>
-                    <div class="col-9">
-                        <b>Club-Programmation informatique</b>
-                        <br/>
-                        fondation et animation 4h/semaine
-                        <br/>
-                        travail en projets
-                        <br/>
-                        partage de connaissances
-                    </div>
-                </div>
             </div>
         </div>
 
@@ -193,31 +161,32 @@
 
         <div class="row">
             <div class="col-lg-12 col-xl-4">
-                <h4>Langues</h4><!-- Langues -->
+                <h4>Langues</h4>
 
                 <div class="row">
-                    <!-- Français -->
-                    <b class="col-3">
+                    <b class="col-4">
                         Français
                     </b>
-                    <div class="col-9">
+                    <div class="col-8">
                         Langue maternelle
                     </div>
 
-                    <!-- Anglais -->
-                    <b class="col-3">
+                    <b class="col-4">
                         Anglais
                     </b>
-                    <div class="col-9">
-                        Fluide
+                    <div class="col-8">
+                        Courant
+                        <br/>
+                        score <strong>920</strong> au TOEIC
                     </div>
 
-                    <!-- Allemand -->
-                    <b class="col-3">
+                    <b class="col-4">
                         Allemand
                     </b>
-                    <div class="col-9">
-                        Bonnes bases
+                    <div class="col-8">
+                        Intermédiaire
+                        <br/>
+                        équivalent A2
                     </div>
 
                     <br/>
@@ -226,64 +195,57 @@
 
             <div class="col-lg-12 col-xl-8">
 
-                <h4>Informatique</h4><!-- Informatique -->
+                <h4>Informatique</h4>
 
                 <div class="row">
-                    <!-- C++ -->
-                    <b class="col-3">
-                        C++
+                    <b class="col-4">
+                        Langages
                     </b>
-                    <div class="col-4">
-                        Très bonne maîtrise
+                    <div class="col-8">
+                        C++ Python Java Groovy Kotlin Haskell
                     </div>
-                    <em class="col-5">
-                        7 ans d'expérience
-                    </em>
 
-                    <!-- Python -->
-                    <b class="col-3">
-                        Python
+                    <b class="col-4">
+                        GNU/Linux
                     </b>
-                    <div class="col-4">
-                        Bonne maîtrise
+                    <div class="col-8">
+                        SSH Shell Ubuntu APT Systemd QEMU/KVM
                     </div>
-                    <em class="col-5">
-                        4 ans d'expérience
-                    </em>
 
-                    <!-- Java -->
-                    <b class="col-3">
-                        Java
+                    <b class="col-4">
+                        Outils
                     </b>
-                    <div class="col-4">
-                        Bonne maîtrise
+                    <div class="col-8">
+                        Git Vim Jenkins IntelliJ GitLab
                     </div>
-                    <em class="col-5">
-                        1 an d'expérience
-                    </em>
 
-                    <!-- GNU/Linux -->
-                    <b class="col-3">
-                        GNU/Linux
+                    <b class="col-4">
+                        Données
                     </b>
-                    <div class="col-4">
-                        Niveau intermédiaire
+                    <div class="col-8">
+                        SQL PostgreSQL Modélisation
                     </div>
-                    <em class="col-5">
-                        1 an d'expérience
-                    </em>
-                </div>
 
-                <div class="row">
-                    <b class="col-3">
+                    <b class="col-4">
                         Web
                     </b>
-                    <div class="col-4">
-                        Novice
+                    <div class="col-8">
+                        Bootstrap Angular HTML
+                    </div>
+
+                    <b class="col-4">
+                        Méthodes
+                    </b>
+                    <div class="col-8">
+                        UML Kanban Scrum
+                    </div>
+
+                    <b class="col-4">
+                        Administration de systèmes
+                    </b>
+                    <div class="col-8">
+                        Sécurité Réseau WakeOnLan Cron
                     </div>
-                    <em class="col-5">
-                        1 an d'expérience
-                    </em>
                 </div>
             </div>
         </div>
@@ -295,17 +257,19 @@
         <div class="row">
             <div class="col-md-12 col-lg-6 col-xl-4">
 
-                <h4>Sport</h4>
-                Pratique du Badmindton
+                <h4>Engagement associatif</h4>
+                Bénévole à Ingénieurs Sans Frontières
+                <br/>
+                - groupe local de Nantes (3 ans)
                 <br/>
-                Déplacements en vélo quotidiens
+                - équipe systèmes d'information de la coordination nationale (depuis mais 2020)
             </div>
 
             <div class="col-md-12 col-lg-6 col-xl-4">
 
                 <h4>Voyages</h4>
-				Stage international : <em>Finlande</em>
-				<br/>
+                Stage international : <em>Finlande</em>
+                <br/>
                 Touristiques : <em>Maroc, Angleterre, Italie, Espagne</em>
                 <br/>
                 Hébergé chez l'habitant : <em>Pays de Galles</em>
@@ -313,14 +277,22 @@
                 Échanges et jumelage : <em>Allemagne</em>
             </div>
 
-            <div class="col-md-12 col-lg-6 col-xl-4">
+            <div class="col-md-12 col-lg-6 col-xl-2">
 
-                <h4>Musique</h4>
-                7 ans de clarinette dont 3 de clarinette basse
+                <h4>Sport</h4>
+                Vélo
+                <br/>
+                Course à pieds
                 <br/>
-                4 ans membre de l'Harmonie d'Andouillé
+                Badmindton
+            </div>
+
+            <div class="col-md-12 col-lg-6 col-xl-2">
+
+                <h4>Musique</h4>
+                Clarinettiste en orchestre d'harmonie
                 <br/>
-                débutant en guitare
+                Débutant en guitare
             </div>
         </div>
 

+ 28 - 28
web/include/head.php

@@ -2,36 +2,36 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-	<!-- Description variables -->
-	<?php
-		$shareImg = "/include/images/avatar-cartoon600.png";
-		$author = "Jovian HERSEMEULE";
-		$description = "Le site officiel de Jovian Hersemeule";
-	?>
+    <!-- Description variables -->
+    <?php
+        $shareImg = "/include/images/avatar-cartoon600.png";
+        $author = "Jovian HERSEMEULE";
+        $description = "Le site officiel de Jovian Hersemeule";
+    ?>
 
     <!-- Generic description -->
-	<meta name="description" content="<?php echo $description; ?>">
-	<meta name="author" content="<?php echo $author; ?>">
-
-	<!-- Google / Search Engine Tags -->
-	<meta itemprop="name" content="<?php echo $author; ?>">
-	<meta itemprop="description" content="<?php echo $description; ?>">
-	<meta itemprop="image" content="<?php echo $shareImg; ?>">
-
-	<!-- Facebook Meta Tags -->
-	<meta property="og:url" content="https://www.jovian-hersemeule.eu">
-	<meta property="og:type" content="website">
-	<meta property="og:title" content="<?php echo $author; ?>">
-	<meta property="og:description" content="<?php echo $description; ?>">
-	<meta property="og:image" content="<?php echo $shareImg; ?>">
-
-	<!-- Twitter Meta Tags -->
-	<meta name="twitter:card" content="summary_large_image">
-	<meta name="twitter:title" content="<?php echo $author; ?>">
-	<meta name="twitter:description" content="<?php echo $description; ?>">
-	<meta name="twitter:image" content="<?php echo $shareImg; ?>">
-
-	<!-- Meta Tags Generated via http://heymeta.com -->
+    <meta name="description" content="<?php echo $description; ?>">
+    <meta name="author" content="<?php echo $author; ?>">
+
+    <!-- Google / Search Engine Tags -->
+    <meta itemprop="name" content="<?php echo $author; ?>">
+    <meta itemprop="description" content="<?php echo $description; ?>">
+    <meta itemprop="image" content="<?php echo $shareImg; ?>">
+
+    <!-- Facebook Meta Tags -->
+    <meta property="og:url" content="https://www.jovian-hersemeule.eu">
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="<?php echo $author; ?>">
+    <meta property="og:description" content="<?php echo $description; ?>">
+    <meta property="og:image" content="<?php echo $shareImg; ?>">
+
+    <!-- Twitter Meta Tags -->
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="<?php echo $author; ?>">
+    <meta name="twitter:description" content="<?php echo $description; ?>">
+    <meta name="twitter:image" content="<?php echo $shareImg; ?>">
+
+    <!-- Meta Tags Generated via http://heymeta.com -->
 
     <!-- Style sheet -->
     <link href="/include/css/bootstrap.css" rel="stylesheet">

BIN
web/include/images/logoVO.png