wip #7474 @0.25

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 91ca8ea8fcd54a0a6ea05135e9d62a2aab04a8d5..849b70382aff05b418865ef5cab26a07afa0b035 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -9,10 +9,11 @@ services:
             - './wwww/:/application/'
             - './config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         environment:
-            VIRTUAL_HOST: dev.fluidbook.com,en.dev.fluidbook.com
-            LETSENCRYPT_HOST: dev.fluidbook.com,en.dev.fluidbook.com
+            VIRTUAL_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com
+            LETSENCRYPT_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com
         networks:
             - fluidbook-v3-dev
+            - nginxproxy
         restart: unless-stopped
     php-fpm:
         container_name: fluidbook-v3-dev
@@ -42,6 +43,9 @@ services:
             - './config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini'
             # Web path
             - './wwww/:/application/'
+        tmpfs:
+          - /home/tmp
+          - /application/framework/data/temp
         ports:
           - '53371:22'
         networks:
@@ -58,13 +62,14 @@ services:
         LETSENCRYPT_HOST: adminer.dev.fluidbook.com
       networks:
         - fluidbook-v3-dev
+        - nginxproxy
 
     mariadb:
         container_name: fluidbook-v3-dev-mariadb
         image: 'mariadb:latest'
         restart: unless-stopped
         environment:
-          MARIADB_ROOT_PASSWORD: ryruth0YzzuUn7Eq
+          MARIADB_ROOT_PASSWORD: FB8qVD7R0jqsXYNR
           MARIADB_DATABASE: fluidbook-v3-dev
           MARIADB_AUTO_UPGRADE: 1
         volumes:
@@ -87,7 +92,7 @@ services:
         - "./database/backup:/backup"
       environment:
         USERNAME: root
-        PASSWORD: ryruth0YzzuUn7Eq
+        PASSWORD: FB8qVD7R0jqsXYNR
         DBHOST: fluidbook-v3-dev-mariadb
         DBEXCLUDE: "performance_schema information_schema"
         CRON_SCHEDULE: "0 0 * * *"
@@ -99,3 +104,6 @@ networks:
   fluidbook-v3-dev:
     external:
       name: fluidbook-v3-dev
+  nginxproxy:
+    external:
+      name: nginxproxy

diff --git a/.docker/dev/update b/.docker/dev/update
index 5c4a18a80f2b4fe0e6b4d0ea07bd00aa934cdcc5..ccce21a527f93aea793283322bf8868c332bed79 100644 (file)
--- a/.docker/dev/update
+++ b/.docker/dev/update
@@ -9,6 +9,7 @@ COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build
 
 docker compose down -v
+rm -f ./database/data/tc.log
 docker compose up -d
 
 ufw-docker allow fluidbook-v3-dev
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 72d471b6ead99a84c136b8df4e48b7cc328456e7..64eac4d1f8ff1935e309a517d844dccc9da0d0ff 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="#7257">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="try #7257 @2">
+      <change beforePath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/dev/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/update" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Navigation/Page.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Navigation/Page.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -260,34 +260,34 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "WebServerToolWindowFactoryState": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
-    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
-    "WebServerToolWindowPanel.toolwindow.show.date": "false",
-    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
-    "WebServerToolWindowPanel.toolwindow.show.size": "false",
-    "git-widget-placeholder": "master",
-    "ignore.virus.scanning.warn.message": "true",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/Works/FluidbookWebV3/framework/library/CubeIT/Bootstrap",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "ruby.rails.projectView.checked": "true",
-    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
+    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookWebV3/framework/library/CubeIT/Bootstrap&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookWebV3\framework\library\CubeIT\Bootstrap" />
@@ -845,7 +845,8 @@
       <workItem from="1739875492260" duration="818000" />
       <workItem from="1743588153623" duration="6412000" />
       <workItem from="1743685828952" duration="2161000" />
-      <workItem from="1744010760355" duration="3307000" />
+      <workItem from="1744010760355" duration="3501000" />
+      <workItem from="1744211486656" duration="1254000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1190,7 +1191,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="179" />
+    <option name="localTasksCounter" value="180" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1222,7 +1223,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wip #3726 @0.5" />
     <MESSAGE value="wip #3853 @0.5" />
     <MESSAGE value="wait #3693 @1.5" />
     <MESSAGE value="wait #3885 @0:50" />
@@ -1247,7 +1247,8 @@
     <MESSAGE value="wip #7257 @2" />
     <MESSAGE value="wip #3702 @0.25" />
     <MESSAGE value="#7257" />
-    <option name="LAST_COMMIT_MESSAGE" value="#7257" />
+    <MESSAGE value="try #7257 @2" />
+    <option name="LAST_COMMIT_MESSAGE" value="try #7257 @2" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">