replace stop action in messenger

.mage.yml.dist

@@ -18,7 +18,6 @@ magephp:
                 - "/var/cache/*"
                 - "/var/log/*"
                 - "/public/media"
-                - "/.secrets"
             hosts:
                 - ssh_host
             on-deploy:

.novops.yml

@@ -1,39 +0,0 @@
-environments:
-  build:
-    variables:
-      - name: MYSQLDUMP
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: mysqldump
-
-  deploy:
-    variables:
-      - name: SSH_USER
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_user
-
-      - name: SSH_HOST
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_host
-
-      - name: SSH_PRIV_KEY
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_priv_key
-
-      - name: APP_DIRECTORY
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: app_directory

.woodpecker/build.yml

@@ -1,56 +1,55 @@
 variables:
-  volumes: &volumes
-    - node_cache:/root/.npm
-    - /data/${CI_REPO}:/builds
+  - &volumes
+    - node16_cache:/root/.npm
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [push, pull_request, tag, manual]
   branch: [master, master-*, develop, develop-*, feature/*]
 
 steps:
-  "Wait the database":
+  db-wait:
     image: gitnet.fr/deblan/timeout:latest
     commands:
       - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done'
 
-  "Create database":
+  db-create:
     image: mariadb:10.3
-    environment:
-      MYSQLDUMP:
-        from_secret: mysqldump
+    secrets: [mysqldump]
     commands:
       - mysql -hdb -uroot -proot -e "CREATE DATABASE app"
       - eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app
 
-  "Configure app":
+  app-config:
     image: deblan/php:8.1
     commands:
       - echo APP_ENV=prod >> .env.local
       - echo APP_SECRET=$(openssl rand -hex 32) >> .env.local
       - echo DATABASE_URL=mysql://root:root@db/app >> .env.local
 
-  "Installs PHP dependencies":
+  php-composer:
     image: deblan/php:8.1
     commands:
       - apt-get update && apt-get -y install git
       - composer install --no-scripts
 
-  "Migrates database":
-    image: deblan/php:8.3
+  db-migrate:
+    image: deblan/php:8.1
     environment:
-      PHP: php
+      - PHP=php
     commands:
       - ./bin/doctrine-migrate
 
-  "Generates JS routes":
-    image: deblan/php:8.3
+  app-jsroutes:
+    image: deblan/php:8.1
     commands:
       - php bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
 
-  "Build assets":
-    image: node:20-alpine
+  node-build:
+    image: node:16-alpine
     environment:
-      CPU_COUNT: 3
+      - CPU_COUNT=3
+    volumes: *volumes
     commands:
       - apk add --no-cache git
       - npm install -g svg2ttf ttf2eot ttf2woff2
@@ -61,13 +60,13 @@ steps:
       - test -f public/js/fos_js_routes.json || echo "{}" > public/js/fos_js_routes.json
       - npm run build
 
-  "Check dependencies":
+  security-check:
     image: gitnet.fr/deblan/osv-detector:v0.9
     commands:
       - osv-detector composer.lock yarn.lock
     failure: ignore
 
-  "Build the cache":
+  cache-build:
     image: deblan/mage
     volumes: *volumes
     commands:
@@ -78,7 +77,7 @@ services:
   db:
     image: mariadb:10.3
     environment:
-      MARIADB_ROOT_PASSWORD: root
+      - MARIADB_ROOT_PASSWORD=root
 
 volumes:
-  node_cache:
+  node16_cache:

.woodpecker/deploy.yml

@@ -1,6 +1,6 @@
 variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
+  - &volumes
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [deployment]
@@ -8,17 +8,9 @@ when:
 skip_clone: true
 
 steps:
-  "Deploy":
+  app-deploy:
     image: deblan/mage
-    environment:
-      SSH_PRIV_KEY:
-        from_secret: ssh_priv_key
-      SSH_USER:
-        from_secret: ssh_user
-      SSH_HOST:
-        from_secret: ssh_host
-      APP_DIRECTORY:
-        from_secret: app_directory
+    secrets: [ssh_user, ssh_host, ssh_priv_key, app_directory]
     volumes: *volumes
     commands:
       - cd "/builds/$CI_COMMIT_SHA"

assets/css/admin.scss

@@ -1,63 +1,57 @@
 @import "../../vendor/murph/murph-core/src/core/Resources/assets/css/admin.scss";
-@import "@kangc/v-md-editor/lib/style/base-editor.css";
-@import "@kangc/v-md-editor/lib/theme/style/vuepress.css";
+@import "~simplemde/dist/simplemde.min.css";
+
+.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
+    z-index: 2000;
+}
 
 .ejs-link {
-  margin: 10px auto;
-  max-width: 80%;
-  border: 2px solid #333;
-  border-radius: 5px;
+    margin: 10px auto;
+    max-width: 80%;
+    border: 2px solid #333;
+    border-radius: 5px;
 
-  &--anchor {
-    display: block;
-    padding: 30px;
-  }
-
-  &-content {
-    display: inline-block;
-    vertical-align: top;
-
-    &--title {
-      font-weight: bold;
+    &--anchor {
+        display: block;
+        padding: 30px;
     }
 
-    &--description {
-      font-size: 15px;
+    &-content {
+        display: inline-block;
+        vertical-align: top;
+
+        &--title {
+            font-weight: bold;
+        }
+
+        &--description {
+            font-size: 15px;
+        }
+
+        &--link {
+            padding-top: 10px;
+            font-size: 14px;
+            line-height: 20px;
+        }
     }
 
-    &--link {
-      padding-top: 10px;
-      font-size: 14px;
-      line-height: 20px;
+    $image-size: 85px;
+
+    &--anchor--with-image &-content {
+        width: calc(100% - $image-size - 5px);
+        padding-right: 25px;
     }
-  }
 
-  $image-size: 85px;
-
-  &--anchor--with-image &-content {
-    width: calc(100% - $image-size - 5px);
-    padding-right: 25px;
-  }
-
-  &--image {
-    display: inline-block;
-    width: $image-size;
-    height: $image-size;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-  }
+    &--image {
+        display: inline-block;
+        width: $image-size;
+        height: $image-size;
+        background-position: center center;
+        background-repeat: no-repeat;
+        background-size: cover;
+    }
 }
 
 .choices__list--dropdown {
   z-index: 3;
 }
-
-.v-md-editor {
-  border: 1px solid $input-border-color;
-  box-shadow: none;
-}
-
-.v-md-editor--fullscreen {
-  z-index: 3000;
-}

assets/css/app.scss

@@ -1,26 +1,29 @@
 @tailwind base;
-
 @tailwind components;
-
 @tailwind utilities;
 
 @import "app/config";
-@import "app/prism";
+@import 'app/prism';
 @import "app/typo";
 @import "~tingle.js/src/tingle.css";
 
 @font-face {
   font-family: "MainFont";
-  src: url("../fonts/ubuntu/ubuntu-light.woff2?20211108") format("woff2"), url("../fonts/ubuntu/ubuntu-light.woff?20211108") format("woff");
-
-  // url('../fonts/atkinson/WOFF2/Atkinson-Hyperlegible-Regular-102a.woff2?20220911') format('woff2'),
-  // url('../fonts/atkinson/WOFF/Atkinson-Hyperlegible-Regular-102.woff?20211108w20220911') format('woff');
+  src:
+    url('../fonts/ubuntu/ubuntu-light.woff2?20211108') format('woff2'),
+    url('../fonts/ubuntu/ubuntu-light.woff?20211108') format('woff');
+    // url('../fonts/atkinson/WOFF2/Atkinson-Hyperlegible-Regular-102a.woff2?20220911') format('woff2'),
+    // url('../fonts/atkinson/WOFF/Atkinson-Hyperlegible-Regular-102.woff?20211108w20220911') format('woff');
 }
 
 @font-face {
   font-family: "deblan-icon";
-  src: url("../fonts/deblan/deblan-icon.eot?20211108");
-  src: url("../fonts/deblan/deblan-icon.woff2?20211108") format("woff2"), url("../fonts/deblan/deblan-icon.woff?20211108") format("woff"), url("../fonts/deblan/deblan-icon.ttf?20211108") format("truetype");
+  src: url('../fonts/deblan/deblan-icon.eot?20211108');
+  src:
+    url('../fonts/deblan/deblan-icon.woff2?20211108') format('woff2'),
+    url('../fonts/deblan/deblan-icon.woff?20211108') format('woff'),
+    url('../fonts/deblan/deblan-icon.ttf?20211108') format('truetype');
+
   font-style: normal;
   font-weight: normal;
   text-rendering: optimizeLegibility;
@@ -58,7 +61,7 @@ $dicons: coffee server search project share contact list response twitter diaspo
 }
 
 .text-right {
-  text-align: right;
+    text-align: right;
 }
 
 .list--inline {
@@ -154,9 +157,8 @@ pre[class*="language-"] {
   height: 50px;
   overflow: hidden;
   display: inline-block;
-  margin-bottom: -19px;
+  margin-bottom: -19px;i
 
-  i
   &:active, &:focus {
     background: none;
   }
@@ -171,7 +173,6 @@ pre[class*="language-"] {
     background: url(../images/Refresh_icon.svg);
   }
 }
-
 //
 //   &-captcha {
 //     label {
@@ -303,11 +304,9 @@ pre[class*="language-"] {
   0% {
     background-position: 0 0%;
   }
-
   50% {
     background-position: 0 75%;
   }
-
   100% {
     background-position: 0 0%;
   }
@@ -348,20 +347,18 @@ pre[class*="language-"] {
   width: 100%;
   height: 10px;
   background: rgb(0, 0, 0);
-  background: linear-gradient(180deg, rgba(0, 0, 0, 0.3) 0%, rgba(255, 255, 255, 0) 100%);
+  background: linear-gradient(180deg, rgba(0, 0, 0, 0.3) 0%, rgba(255,255,255,0) 100%);
 }
 
 @keyframes HeaderGradient {
   0% {
-    background-position: 0 50%;
+    background-position: 0 50%
   }
-
   50% {
-    background-position: 100% 50%;
+    background-position: 100% 50%
   }
-
   100% {
-    background-position: 0 50%;
+    background-position: 0 50%
   }
 }
 
@@ -414,9 +411,6 @@ pre[class*="language-"] {
   .h1 {
     font-weight: normal;
     font-size: 40px;
-    font-family: MainFont;
-    text-shadow: none;
-    color: hsla(0, 0%, 100%, 0.7);
   }
 
   .h3 {
@@ -478,7 +472,7 @@ pre[class*="language-"] {
   }
 
   p a:not(.btn), ul:not(.btn-group) a:not(.btn) {
-    background: url("../images/link.svg") bottom left repeat-x;
+    background: url('../images/link.svg') bottom left repeat-x;
     padding-bottom: 5px;
   }
 
@@ -509,35 +503,6 @@ pre[class*="language-"] {
       @include make-pre-code;
     }
 
-    &.mermaid {
-      box-shadow: none;
-      background: #343c53;
-      border: 0;
-
-      text, tspan {
-        fill: #fff !important;
-      }
-
-      .actor, .noteText {
-        text, tspan {
-          fill: #333 !important;
-        }
-      }
-
-      .labelText {
-        fill: #333 !important;
-      }
-
-      line, path {
-        stroke: #fff !important;
-      }
-
-      svg {
-        display: block;
-        margin: auto;
-      }
-    }
-
     &.with-title {
       margin-top: 0;
       border-top-right-radius: 0;
@@ -548,13 +513,11 @@ pre[class*="language-"] {
       padding-bottom: 10px;
       padding-top: 10px;
       border: 1px solid $color-code-border;
-
       // overflow: hidden;
       //
       // &:hover {
       //   overflow: auto;
       // }
-   
     }
   }
 }
@@ -642,7 +605,7 @@ pre[class*="language-"] {
 @for $i from 1 through 6 {
   .review.offset-#{$i} {
     margin-left: 5% * $i - 1%;
-    width: 100% - $i * 5%;
+    width: 100% - ($i * 5%);
   }
 }
 
@@ -651,6 +614,7 @@ pre[class*="language-"] {
   max-width: calc($content-max-width - 60px - 2rem);
   overflow: auto;
 
+
   .review-avatar, .review-avatar img {
     width: 60px;
     max-width: 60px;
@@ -665,7 +629,7 @@ pre[class*="language-"] {
     border: 1px solid $color-hr-border;
 
     .review-content p {
-      margin-top: 0;
+        margin-top: 0;
     }
 
     > ul {
@@ -730,7 +694,7 @@ pre[class*="language-"] {
 
 .code-window {
   height: 50px;
-  background: $color-code-title-background url("../images/window.svg") no-repeat center right;
+  background: $color-code-title-background url('../images/window.svg') no-repeat center right;
   padding-left: 15px;
   font-family: Monospace;
   color: #ccc;
@@ -764,8 +728,7 @@ pre[class*="language-"] {
       width: 100%;
       height: 450px;
       background-position: center center;
-      background: #f2f2f2 url("../images/quick-post-load.png") no-repeat center center;
-
+      background: #f2f2f2 url('../images/quick-post-load.png') no-repeat center center;
       // border: 2px solid $color-very-light-grey;
       border-bottom: 0;
       cursor: pointer;
@@ -904,7 +867,19 @@ pre[class*="language-"] {
   border: 1px solid $color-white;
 }
 
-$links: (twitter: #20b8ff, rss: #fd9f13, linkedin: #006699, diaspora: #90b92e, github: #8cc345, code: #51d066, mastodon: #2984d2, pixelfed: #e72151, matrix: #1a588a, gpg: #42a73b, murph: #19b4db);
+$links: (
+  twitter: #20b8ff,
+  rss: #fd9f13,
+  linkedin: #006699,
+  diaspora: #90b92e,
+  github: #8cc345,
+  code: #51d066,
+  mastodon: #2984d2,
+  pixelfed: #e72151,
+  matrix: #1a588a,
+  gpg: #42a73b,
+  murph: #19b4db
+);
 
 @each $site, $bg in $links {
   .link-#{$site} {
@@ -987,10 +962,32 @@ $links: (twitter: #20b8ff, rss: #fd9f13, linkedin: #006699, diaspora: #90b92e, g
 }
 
 .card {
-  transition: transform .2s;
+  transition: transform .2s, background .2s, border .2s;
+
+  &:nth-child(2n+1) {
+    background-image: url(../images/halloween/spider.svg) !important;
+    background-repeat: no-repeat !important;
+    background-position: calc(100% - 10px) 100px !important;
+  }
+
+  &:nth-child(2n+2) {
+    background-image: url(../images/halloween/spider.svg) !important;
+    background-repeat: no-repeat !important;
+    background-position: calc(100% - 10px) 100px !important;
+  }
 
   &:hover {
     transform: scale(1.02);
+    background: $color-blue2;
+    background-position: calc(100% - 10px) 150px !important;
+
+    img {
+      border-bottom: 2px solid #333;
+    }
+
+    .card-title, .card-title a, p {
+      color: #fff;
+    }
   }
 
   figure {
@@ -1007,29 +1004,25 @@ $links: (twitter: #20b8ff, rss: #fd9f13, linkedin: #006699, diaspora: #90b92e, g
 }
 
 @keyframes bounceIn {
-  0% {
+  0%{
     opacity: 0;
   }
-
-  50% {
+  50%{
     opacity: 0.9;
   }
-
-  80% {
+  80%{
     opacity: 1;
   }
-
-  100% {
+  100%{
     opacity: 1;
   }
 }
 
 @keyframes knmc {
-  0% {
-    left: -256px;
+  0%{
+    left: -256px;;
   }
-
-  100% {
+  100%{
     left: 150vw;
   }
 }
@@ -1335,13 +1328,13 @@ $links: (twitter: #20b8ff, rss: #fd9f13, linkedin: #006699, diaspora: #90b92e, g
 }
 
 .invalid-feedback {
-  color: red;
-  padding-left: 10px;
-  padding-right: 10px;
+    color: red;
+    padding-left: 10px;
+    padding-right: 10px;
 
-  .form-error-icon {
-    display: none;
-  }
+    .form-error-icon {
+        display: none;
+    }
 }
 
 @media (prefers-color-scheme: dark) {
@@ -1379,7 +1372,7 @@ $links: (twitter: #20b8ff, rss: #fd9f13, linkedin: #006699, diaspora: #90b92e, g
   }
 
   .header-shadow {
-    background: linear-gradient(180deg, rgba(0, 0, 0, 0.3) 0%, rgba(255, 255, 255, 0) 100%);
+    background: linear-gradient(180deg, rgba(0, 0, 0, 0.3) 0%, rgba(255,255,255,0) 100%);
   }
 }
 

assets/css/app/alert.scss

@@ -1,34 +1,34 @@
 .alert {
-  padding: 20px;
-  border: 1px solid #333;
+    padding: 20px;
+    border: 1px solid #333;
 
-  &-success {
-    border-color: #9db024;
-    background: #c6ff69;
-    color: #415f29;
-  }
+    &-success {
+        border-color: #9db024;
+        background: #c6ff69;
+        color: #415f29;
+    }
 
-  &-notice {
-    border-color: $color-blue;
-    background: #66e6ff;
-    color: #254e5f;
-  }
+    &-notice {
+        border-color: $color-blue;
+        background: #66e6ff;
+        color: #254e5f;
+    }
 
-  &-warning {
-    border-color: #b07f29;
-    background: #ffd465;
-    color: #5f4520;
-  }
+    &-warning {
+        border-color: #b07f29;
+        background: #ffd465;
+        color: #5f4520;
+    }
 
-  &-error {
-    border-color: #b02e2a;
-    background: #ff6363;
-    color: #5f2521;
-  }
+    &-error {
+        border-color: #b02e2a;
+        background: #ff6363;
+        color: #5f2521;
+    }
 
-  &-notice-light {
-    border-color: $color-blue;
-    background: #d9fffc;
-    color: #254e5f;
-  }
+    &-notice-light {
+        border-color: $color-blue;
+        background: #d9fffc;
+        color: #254e5f;
+    }
 }

assets/css/app/config.scss

@@ -12,7 +12,8 @@ $color-red: #b02e2a;
 
 $code-color: $color-blue;
 
-$color-navigation-item-background: darken($color-dark-grey, 8%);
+//$color-navigation-item-background: darken($color-dark-grey, 8%);
+$color-navigation-item-background: darken($color-blue2, 8%);
 $color-navigation-item-background-active: lighten($color-dark-grey, 10%);
 
 $color-small-menu-background: $color-dark-grey;
@@ -62,7 +63,6 @@ $color-code-text: #f8f8f2;
 $color-code-mark-background: $color-light-blue;
 $color-code-title-background: #1d2231;
 $color-code-title-text: #e0e0e0;
-
 /* --- */
 
 :root {

assets/css/app/prism.scss

@@ -8,59 +8,61 @@ https://prismjs.com/download.html#themes=prism-okaidia&languages=markup+css+clik
 
 code[class*="language-"],
 pre[class*="language-"] {
-  color: #f8f8f2;
-  background: none;
-  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  font-size: 1em;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
+	color: #f8f8f2;
+	background: none;
+	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
+	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+	font-size: 1em;
+	text-align: left;
+	white-space: pre;
+	word-spacing: normal;
+	word-break: normal;
+	word-wrap: normal;
+	line-height: 1.5;
+
+	-moz-tab-size: 4;
+	-o-tab-size: 4;
+	tab-size: 4;
+
+	-webkit-hyphens: none;
+	-moz-hyphens: none;
+	-ms-hyphens: none;
+	hyphens: none;
 }
 
 /* Code blocks */
 pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-  border-radius: 0.3em;
+	padding: 1em;
+	margin: .5em 0;
+	overflow: auto;
+	border-radius: 0.3em;
 }
 
 :not(pre) > code[class*="language-"],
 pre[class*="language-"] {
-  background: #272822;
+	background: #272822;
 }
 
 /* Inline code */
 :not(pre) > code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
+	padding: .1em;
+	border-radius: .3em;
+	white-space: normal;
 }
 
 .token.comment,
 .token.prolog,
 .token.doctype,
 .token.cdata {
-  color: #8292a2;
+	color: #8292a2;
 }
 
 .token.punctuation {
-  color: #f8f8f2;
+	color: #f8f8f2;
 }
 
 .token.namespace {
-  opacity: .7;
+	opacity: .7;
 }
 
 .token.property,
@@ -68,12 +70,12 @@ pre[class*="language-"] {
 .token.constant,
 .token.symbol,
 .token.deleted {
-  color: #f92672;
+	color: #f92672;
 }
 
 .token.boolean,
 .token.number {
-  color: #ae81ff;
+	color: #ae81ff;
 }
 
 .token.selector,
@@ -82,7 +84,7 @@ pre[class*="language-"] {
 .token.char,
 .token.builtin,
 .token.inserted {
-  color: #a6e22e;
+	color: #a6e22e;
 }
 
 .token.operator,
@@ -91,34 +93,34 @@ pre[class*="language-"] {
 .language-css .token.string,
 .style .token.string,
 .token.variable {
-  color: #f8f8f2;
+	color: #f8f8f2;
 }
 
 .token.atrule,
 .token.attr-value,
 .token.function,
 .token.class-name {
-  color: #e6db74;
+	color: #e6db74;
 }
 
 .token.keyword {
-  color: #66d9ef;
+	color: #66d9ef;
 }
 
 .token.regex,
 .token.important {
-  color: #fd971f;
+	color: #fd971f;
 }
 
 .token.important,
 .token.bold {
-  font-weight: bold;
+	font-weight: bold;
 }
-
 .token.italic {
-  font-style: italic;
+	font-style: italic;
 }
 
 .token.entity {
-  cursor: help;
+	cursor: help;
 }
+

assets/css/app/typo.scss

@@ -16,35 +16,34 @@
 // }
 //
 .h1, h1 {
-  font-size: 3.2rem;
-  line-height: 1.32;
+ font-size: 3.2rem;
+ line-height: 1.32
 }
 
 .h2, h2 {
-  font-size: 2.6rem;
-  line-height: 1.35;
+ font-size: 2.6rem;
+ line-height: 1.35
 }
 
 .h3, h3 {
-  font-size: 2.0rem;
-  line-height: 1.45;
+ font-size: 2.0rem;
+ line-height: 1.45
 }
 
 .h4, h4 {
-  font-size: 1.4rem;
-  line-height: 1.6;
+ font-size: 1.4rem;
+ line-height: 1.6
 }
 
 .h5, h5 {
-  font-size: 1.1rem;
-  line-height: 1.75;
+ font-size: 1.1rem;
+ line-height: 1.75
 }
 
 .h6, h6 {
-  font-size: 1.0rem;
-  line-height: 1.9;
+ font-size: 1.0rem;
+ line-height: 1.9
 }
-
 //
 // p {
 //   margin-top: 17px;
@@ -57,6 +56,7 @@
 //   }
 // }
 
+
 .h1,
 .h2,
 .h3,
@@ -69,7 +69,8 @@ h3,
 h4,
 h5,
 h6 {
-  font-weight: 600;
-  margin-bottom: 1rem;
-  margin-top: 0;
+ font-weight: 600;
+ margin-bottom: 1rem;
+ margin-top: 0
 }
+

assets/css/viewer.scss

@@ -1,10 +1,10 @@
 body {
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
+    margin: 0;
+    padding: 0;
+    overflow: hidden;
 }
 
 #mesh-viewer {
-  width: 100vw;
-  height: 100vh;
+    width: 100vw;
+    height: 100vh;
 }

assets/images/halloween/spider.svg

@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36.965439"
+   height="100"
+   viewBox="0 0 9.7804388 26.458333"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="spider.svg">
+  <metadata
+     id="metadata6">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#ffffff"
+     inkscape:document-units="px"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:zoom="5.2382156"
+     inkscape:cx="51.916187"
+     inkscape:cy="65.68455"
+     inkscape:window-width="1918"
+     inkscape:window-height="1038"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs1">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1586">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop1582" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop1584" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1586"
+       id="linearGradient1588"
+       x1="-10.670271"
+       y1="396.36423"
+       x2="0.2785832"
+       y2="352.64908"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-215.04257,53.193899)" />
+  </defs>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(220.6747,19.379824)">
+    <g
+       id="g1510"
+       transform="matrix(0.05431415,0,0,0.05431415,-208.68894,-18.327225)">
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962"
+         width="10.560449"
+         height="37.23737"
+         x="339.20847"
+         y="228.86655"
+         ry="5.2802243"
+         transform="rotate(80.141439)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3"
+         width="10.560452"
+         height="29.427628"
+         x="58.227398"
+         y="423.90332"
+         ry="5.2802243"
+         transform="rotate(36.060271)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5"
+         width="10.560452"
+         height="29.427628"
+         x="-179.66049"
+         y="415.8244"
+         ry="5.2802243"
+         transform="rotate(5.4519952)"
+         inkscape:transform-center-x="1.6060938"
+         inkscape:transform-center-y="3.0115919" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6"
+         width="10.560449"
+         height="37.23737"
+         x="180.74762"
+         y="380.55725"
+         ry="5.2802243"
+         transform="rotate(49.4151)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-2"
+         width="10.560452"
+         height="29.427628"
+         x="-154.35168"
+         y="428.24945"
+         ry="5.2802243"
+         transform="rotate(6.200258)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-9"
+         width="10.560452"
+         height="29.427628"
+         x="-399.80807"
+         y="265.58777"
+         ry="5.2802243"
+         transform="rotate(-31.328887)"
+         inkscape:transform-center-x="-0.51683556"
+         inkscape:transform-center-y="3.3737526" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-1"
+         width="10.560449"
+         height="37.23737"
+         x="-264.7019"
+         y="319.94562"
+         ry="5.2802243"
+         transform="rotate(-22.023483)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-2-2"
+         width="10.560452"
+         height="29.427628"
+         x="44.973415"
+         y="434.28424"
+         ry="5.2802243"
+         transform="rotate(20.824725)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-9-7"
+         width="10.560452"
+         height="29.427628"
+         x="188.48347"
+         y="415.05444"
+         ry="5.2802243"
+         transform="rotate(39.35706)"
+         inkscape:transform-center-x="3.0129304"
+         inkscape:transform-center-y="1.60359" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-0"
+         width="10.560449"
+         height="37.23737"
+         x="-396.88443"
+         y="110.33471"
+         ry="5.2802243"
+         transform="rotate(-57.767469)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-2-2-9"
+         width="10.560452"
+         height="29.427628"
+         x="-224.31264"
+         y="354.09039"
+         ry="5.2802243"
+         transform="rotate(-19.751182)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-9-7-3"
+         width="10.560452"
+         height="29.427628"
+         x="31.731018"
+         y="431.6391"
+         ry="5.2802243"
+         transform="rotate(14.874494)"
+         inkscape:transform-center-x="2.0774712"
+         inkscape:transform-center-y="2.7080125" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-0-6"
+         width="10.560449"
+         height="37.23737"
+         x="-385.12241"
+         y="-105.38716"
+         ry="5.2802243"
+         transform="rotate(-89.372472)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-2-2-9-0"
+         width="10.560452"
+         height="29.427628"
+         x="-321.51315"
+         y="-228.36681"
+         ry="5.2802243"
+         transform="rotate(-113.96375)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-9-7-3-6"
+         width="10.560452"
+         height="29.427628"
+         x="175.24963"
+         y="305.39377"
+         ry="5.2802243"
+         transform="rotate(37.497696)"
+         inkscape:transform-center-x="2.9593085"
+         inkscape:transform-center-y="1.7004981" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-0-6-2"
+         width="10.560449"
+         height="37.23737"
+         x="-256.46777"
+         y="-292.27197"
+         ry="5.2802243"
+         transform="rotate(-123.81743)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-2-2-9-0-6"
+         width="10.560452"
+         height="29.427628"
+         x="-173.66693"
+         y="-323.36835"
+         ry="5.2802243"
+         transform="rotate(-139.81004)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-9-7-3-6-1"
+         width="10.560452"
+         height="29.427628"
+         x="-87.327805"
+         y="303.24057"
+         ry="5.2802243"
+         transform="rotate(-3.3798593)"
+         inkscape:transform-center-x="1.1246826"
+         inkscape:transform-center-y="3.2224766" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-0-6-8"
+         width="10.560449"
+         height="37.23737"
+         x="-366.74966"
+         y="149.27838"
+         ry="5.2802243"
+         transform="rotate(-38.689657)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-7"
+         width="10.560452"
+         height="29.427628"
+         x="-285.86499"
+         y="250.49252"
+         ry="5.2802243"
+         transform="rotate(-17.285608)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-92"
+         width="10.560452"
+         height="29.427628"
+         x="-124.5529"
+         y="331.38336"
+         ry="5.2802243"
+         transform="rotate(12.113797)"
+         inkscape:transform-center-x="1.9446173"
+         inkscape:transform-center-y="2.8049425" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-6-0-6-8-2"
+         width="10.560449"
+         height="37.23737"
+         x="-194.70097"
+         y="308.48895"
+         ry="5.2802243"
+         transform="rotate(-4.3172138)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-7-3"
+         width="10.560452"
+         height="29.427628"
+         x="-48.101986"
+         y="336.93149"
+         ry="5.2802243"
+         transform="rotate(20.615546)" />
+      <rect
+         style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.25744;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+         id="rect962-3-5-92-7"
+         width="10.560452"
+         height="29.427628"
+         x="101.25393"
+         y="302.17734"
+         ry="5.2802243"
+         transform="rotate(45.966429)"
+         inkscape:transform-center-x="3.1774758"
+         inkscape:transform-center-y="1.2461632" />
+    </g>
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#333333;fill-opacity:1;stroke-width:0.0128871;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path863-2"
+       cx="-203.556"
+       cy="70.642334"
+       rx="2.2505465"
+       ry="3.0628297"
+       transform="rotate(18.912919)" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.0143706px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -218.22055,4.4175518 c 0.85731,0.9766939 -0.0464,1.1790983 -0.22936,0.1685086 z"
+       id="path933"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.0143706px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -216.36678,4.3267315 c 0.22439,1.2863975 -0.95801,1.0630903 -0.18007,0.080446 z"
+       id="path933-5"
+       sodipodi:nodetypes="ccc" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#4d4d4d;stroke-width:0.0115444;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path865-3"
+       cx="-217.48129"
+       cy="3.7207096"
+       r="1.3328036" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:url(#linearGradient1588);fill-opacity:1;stroke-width:0.0128871;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path863-2-8"
+       cx="-203.556"
+       cy="70.642334"
+       rx="2.2505465"
+       ry="3.0628297"
+       transform="rotate(18.912919)" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#1a1a1a;stroke-width:0.0139826;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path865"
+       cx="-217.16289"
+       cy="3.0791352"
+       r="1.6143011" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#f9f9f9;stroke-width:0.0110463;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path887"
+       cx="-217.91484"
+       cy="3.2273026"
+       r="0.51482779" />
+    <circle
+       style="color:#000000;overflow:visible;fill:#ececec;stroke-width:0.0110463;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path887-6"
+       cx="-217.07199"
+       cy="3.2430224"
+       r="0.51482779" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#000000;stroke-width:0.0139826;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path909"
+       cx="-217.92955"
+       cy="3.3541305"
+       rx="0.12689655"
+       ry="0.23106584" />
+    <ellipse
+       style="color:#000000;overflow:visible;fill:#000000;stroke-width:0.0139826;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke markers fill;stop-color:#000000"
+       id="path909-7"
+       cx="-217.0741"
+       cy="3.3541305"
+       rx="0.12689655"
+       ry="0.23106584" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:0.379384;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -214.45616,-1.7927667 V -19.379824"
+       id="path1590" />
+  </g>
+</svg>

assets/js/admin.js

@@ -1,6 +1,6 @@
 import '../../vendor/murph/murph-core/src/core/Resources/assets/js/admin.js'
 
-require('./admin_modules/md-editor')()
+require('./admin_modules/simplemde')()
 
 const $ = require('jquery')
 const Sortable = require('sortablejs').Sortable

assets/js/admin_modules/md-editor.js

@@ -1,34 +0,0 @@
-const Vue = require('vue').default
-const VueMarkdownEditor = require('@kangc/v-md-editor')
-const githubTheme = require('@kangc/v-md-editor/lib/theme/github.js')
-const fr = require('@kangc/v-md-editor/lib/lang/fr-FR').default
-const hljs = require('highlight.js')
-
-VueMarkdownEditor.use(githubTheme, {Hljs: hljs})
-VueMarkdownEditor.lang.use('fr-FR', fr)
-Vue.use(VueMarkdownEditor)
-
-module.exports = () => {
-  const components = document.querySelectorAll('.markdown-editor')
-
-  components.forEach((component) => {
-    return new Vue({
-      el: component,
-      template: `
-        <div>
-          <textarea :name="name" v-model="value" class="d-none"></textarea>
-          <v-md-editor v-model="value" mode="edit"></v-md-editor>
-        </div>
-      `,
-      data() {
-        return {
-          name: component.getAttribute('data-name'),
-          value: JSON.parse(component.getAttribute('data-value')),
-        }
-      },
-      components: {
-        VueMarkdownEditor
-      }
-    })
-  })
-}

assets/js/admin_modules/simplemde.js

@@ -13,7 +13,8 @@ module.exports = () => {
       autoDownloadFontAwesome: false,
       spellChecker: false,
       styleSelectedText: false,
-      toolbar: [{
+      toolbar: [
+        {
           name: 'bold',
           action: Editor.toggleBold,
           className: 'fa fa-bold',

assets/js/app.js

@@ -27,6 +27,6 @@ const app = new App([
   new SmallMenu(window)
 ])
 
-window.addEventListener('load', function() {
+window.addEventListener('load', function () {
   app.init()
 }, false)

assets/js/app/app.js

@@ -1,19 +1,19 @@
 class App {
-  constructor (components) {
-    this.components = components || []
-  }
-
-  add (c) {
-    this.components.push(c)
-
-    return this
-  }
-
-  init () {
-    for (let u = 0, x = this.components.length; u < x; u++) {
-      this.components[u].init()
+    constructor(components) {
+        this.components = components || []
+    }
+
+    add(c) {
+        this.components.push(c)
+
+        return this
+    }
+
+    init() {
+        for (let u = 0, x = this.components.length; u < x; u++) {
+            this.components[u].init()
+        }
     }
-  }
 }
 
 module.exports = App

assets/js/app/code.js

@@ -22,79 +22,78 @@ require('prismjs/components/prism-shell-session')
 require('prismjs/plugins/keep-markup/prism-keep-markup')
 require('prismjs/plugins/line-highlight/prism-line-highlight')
 require('prismjs/plugins/line-numbers/prism-line-numbers')
-require('mermaid')
 
 class Code {
-  constructor(w) {
-    this.window = w
-  }
-
-  init() {
-    Prism.highlightAllUnder(document)
-    let elements = this.window.document.querySelectorAll('code[data-title], div[data-title]')
-
-    for (let i = 0, len = elements.length; i < len; i++) {
-      const element = elements[i]
-
-      if (element.tagName === 'CODE') {
-        var code = element
-        var pre = code.parentNode
-        var post = pre.parentNode
-      } else {
-        var code = element.querySelector('code')
-
-        if (!code) {
-          continue
-        }
-
-        var pre = code.parentNode
-        var post = pre.parentNode
-      }
-
-      if (!pre || !post) {
-        continue
-      }
-
-      pre.classList.add('with-title')
-
-      const title = this.window.document.createElement('div')
-      title.classList.add('code-title')
-      title.textContent = element.getAttribute('data-title')
-
-      post.insertBefore(title, pre)
+    constructor(w) {
+        this.window = w
     }
 
-    elements = this.window.document.querySelectorAll('code.window')
+    init() {
+        Prism.highlightAllUnder(document)
+        let elements = this.window.document.querySelectorAll('code[data-title], div[data-title]')
 
-    for (let i = 0, len = elements.length; i < len; i++) {
-      const element = elements[i]
+        for (let i = 0, len = elements.length; i < len; i++) {
+            const element = elements[i]
 
-      if (element.tagName === 'CODE') {
-        var code = element
-        var pre = code.parentNode
-        var post = pre.parentNode
-      } else {
-        var code = element.querySelector('code')
+            if (element.tagName === 'CODE') {
+                var code = element
+                var pre = code.parentNode
+                var post = pre.parentNode
+            } else {
+                var code = element.querySelector('code')
 
-        if (!code) {
-          continue
+                if (!code) {
+                    continue
+                }
+
+                var pre = code.parentNode
+                var post = pre.parentNode
+            }
+
+            if (!pre || !post) {
+                continue
+            }
+
+            pre.classList.add('with-title')
+
+            const title = this.window.document.createElement('div')
+            title.classList.add('code-title')
+            title.textContent = element.getAttribute('data-title')
+
+            post.insertBefore(title, pre)
         }
 
-        var pre = code.parentNode
-        var post = pre.parentNode
-      }
+        elements = this.window.document.querySelectorAll('code.window')
 
-      if (!pre || !post) {
-        continue
-      }
+        for (let i = 0, len = elements.length; i < len; i++) {
+            const element = elements[i]
 
-      pre.classList.add('with-title')
-      const win = this.window.document.createElement('div')
-      win.classList.add('code-window')
+            if (element.tagName === 'CODE') {
+                var code = element
+                var pre = code.parentNode
+                var post = pre.parentNode
+            } else {
+                var code = element.querySelector('code')
 
-      post.insertBefore(win, pre)
+                if (!code) {
+                    continue
+                }
+
+                var pre = code.parentNode
+                var post = pre.parentNode
+            }
+
+            if (!pre || !post) {
+                continue
+            }
+
+            pre.classList.add('with-title')
+            const win = this.window.document.createElement('div')
+            win.classList.add('code-window')
+
+            post.insertBefore(win, pre)
+        }
     }
-  }
 }
 
 module.exports = Code

assets/js/app/form-pwn.js

@@ -1,32 +1,32 @@
 const Routing = require('./routing')
 
 class FormPnw {
-  constructor (w) {
-    this.window = w
-  }
+    constructor(w) {
+        this.window = w
+    }
 
-  init () {
-    const doc = this.window.document
+    init() {
+        const doc = this.window.document
 
-    doc.addEventListener('mousemove', function () {
-      const forms = doc.querySelectorAll('form[data-form-bot]')
+        doc.addEventListener('mousemove', function() {
+            const forms = doc.querySelectorAll('form[data-form-bot]')
 
-      for (let i = 0, len = forms.length; i < len; i++) {
-        const form = forms[i]
-        let action = form.getAttribute('action')
-        action = action.replace(
-          Routing.generate('blog_tech_form_without_javascript', {
-            _domain: window.location.hostname
-          }, false) + '?page=', ''
-        )
+            for (let i = 0, len = forms.length; i < len; i++) {
+                const form = forms[i]
+                let action = form.getAttribute('action')
+                action = action.replace(
+                    Routing.generate('blog_tech_form_without_javascript', {
+                        _domain: window.location.hostname
+                    }, false) + '?page=', ''
+                )
 
-        action = decodeURIComponent(action)
+                action = decodeURIComponent(action)
 
-        form.setAttribute('action', action)
-        form.removeAttribute('data-form-bot')
-      }
-    })
-  }
+                form.setAttribute('action', action)
+                form.removeAttribute('data-form-bot')
+            }
+        })
+    }
 }
 
 module.exports = FormPnw

assets/js/app/knmc.js

@@ -1,36 +1,36 @@
 const Mario = require('../../images/mario.gif')
 
 class Knmc {
-  constructor (w) {
-    this.window = w
-  }
+    constructor(w) {
+        this.window = w
+    }
 
-  init () {
-    let chars = ''
-    const seq = '38384040373937396665'
-    const body = this.window.document.querySelector('body')
+    init() {
+        let chars = ''
+        const seq = '38384040373937396665'
+        const body = this.window.document.querySelector('body')
 
-    body.addEventListener('keyup', function (e) {
-      chars += e.keyCode.toString()
+        body.addEventListener('keyup', function(e) {
+            chars += e.keyCode.toString()
 
-      if (chars.indexOf(seq) !== -1) {
-        chars = ''
-        const url = Mario
-        const image = new Image()
-        image.classList.add('fixed')
-        image.style.position = 'fixed'
-        image.style.bottom = '-11px'
-        image.style.left = '-256px'
+            if (chars.indexOf(seq) !== -1) {
+                chars = ''
+                const url = Mario
+                const image = new Image()
+                image.classList.add('fixed')
+                image.style.position = 'fixed'
+                image.style.bottom = '-11px'
+                image.style.left = '-256px'
 
-        image.onload = function () {
-          image.classList.add('knmc')
-          body.appendChild(image)
-        }
+                image.onload = function() {
+                    image.classList.add('knmc')
+                    body.appendChild(image)
+                }
 
-        image.src = url
-      }
-    })
-  }
+                image.src = url
+            }
+        })
+    }
 }
 
 module.exports = Knmc

assets/js/app/lazy-load.js

@@ -1,10 +1,10 @@
 const lozad = require('lozad')
 
 class LazyLoad {
-  init () {
-    const observer = lozad('.lazy-img')
-    observer.observe()
-  }
+    init() {
+        const observer = lozad('.lazy-img')
+        observer.observe()
+    }
 }
 
 module.exports = LazyLoad

assets/js/app/mesh-viewer.js

@@ -1,36 +1,36 @@
 const tingle = require('tingle.js/src/tingle.js')
 
 class MeshViewer {
-  constructor(w) {
-    this.window = w
-  }
-
-  init() {
-    const openers = this.window.document.querySelectorAll('*[data-modal]')
-
-    for (let i = 0, len = openers.length; i < len; i++) {
-      openers[i].addEventListener('click', (e) => {
-        e.preventDefault()
-
-        let target = e.target
-
-        if (target.tagName != 'A') {
-          target = target.parentNode
-        }
-
-        const modal = new tingle.modal({
-          footer: false,
-          stickyFooter: false,
-          closeMethods: ['overlay', 'button', 'escape'],
-          closeLabel: 'Close',
-          cssClass: ['tingle-modal-box--mesh']
-        })
-
-        modal.setContent('<iframe src="' + target.getAttribute('href') + '"></iframe>')
-        modal.open()
-      })
+    constructor(w) {
+        this.window = w
+    }
+
+    init() {
+        const openers = this.window.document.querySelectorAll('*[data-modal]')
+
+        for (let i = 0, len = openers.length; i < len; i++) {
+            openers[i].addEventListener('click', (e) => {
+                e.preventDefault()
+
+                let target = e.target
+
+                if (target.tagName != 'A') {
+                    target = target.parentNode
+                }
+
+                const modal = new tingle.modal({
+                    footer: false,
+                    stickyFooter: false,
+                    closeMethods: ['overlay', 'button', 'escape'],
+                    closeLabel: 'Close',
+                    cssClass: ['tingle-modal-box--mesh']
+                })
+
+                modal.setContent('<iframe src="' + target.getAttribute('href') + '"></iframe>')
+                modal.open()
+            })
+        }
     }
-  }
 }
 
 module.exports = MeshViewer

assets/js/app/particles.js

@@ -1,47 +1,47 @@
 require('particles.js')
 
 class Particles {
-  constructor(w) {
-    this.window = w
-  }
-
-  start() {
-    if (this.window.innerWidth < 708) {
-      return
+    constructor(w) {
+        this.window = w
     }
 
-    const height = this.header.offsetHeight
-    const width = this.header.offsetWidth
+    start() {
+        if (this.window.innerWidth < 708) {
+            return
+        }
 
-    this.particles.style.maxHeight = height + 'px'
-    this.particles.style.maxWidth = width + 'px'
+        const height = this.header.offsetHeight
+        const width = this.header.offsetWidth
 
-    particlesJS.load('particles', '/js/particles.json?v=3')
-  }
+        this.particles.style.maxHeight = height + 'px'
+        this.particles.style.maxWidth = width + 'px'
 
-  clean() {
-    this.particles.innerHTML = ''
-  }
-
-  init() {
-    this.particles = this.window.document.getElementById('particles')
-
-    if (!this.particles) {
-      return
+        particlesJS.load('particles', '/js/particles.json?v=3')
     }
 
-    this.header = this.particles.parentNode
+    clean() {
+        this.particles.innerHTML = ''
+    }
 
-    this.clean()
-    this.start()
+    init() {
+        this.particles = this.window.document.getElementById('particles')
 
-    const that = this
+        if (!this.particles) {
+            return
+        }
 
-    this.window.addEventListener('resize', function() {
-      that.clean()
-      that.start()
-    }, false)
-  }
+        this.header = this.particles.parentNode
+
+        this.clean()
+        this.start()
+
+        const that = this
+
+        this.window.addEventListener('resize', function() {
+            that.clean()
+            that.start()
+        }, false)
+    }
 }
 
 module.exports = Particles

assets/js/app/post.js

@@ -1,122 +1,122 @@
 const Routing = require('./routing')
 
 class Post {
-  constructor (w) {
-    this.window = w
-  }
-
-  commentsEvents () {
-    const document = this.window.document
-
-    const parentCommentIdField = document.getElementById('user_comment_parentCommentId')
-
-    if (!parentCommentIdField) {
-      return
+    constructor(w) {
+        this.window = w
     }
 
-    const isAnswerAlert = document.getElementById('answer-alert')
-    const cancelAnswerButton = document.getElementById('cancel-answer')
+    commentsEvents() {
+        const document = this.window.document
 
-    const toogleAnswerAlert = function () {
-      if (parentCommentIdField.value) {
-        isAnswerAlert.classList.remove('hidden')
-      } else {
-        isAnswerAlert.classList.add('hidden')
-      }
-    }
+        const parentCommentIdField = document.getElementById('user_comment_parentCommentId')
 
-    toogleAnswerAlert()
+        if (!parentCommentIdField) {
+            return
+        }
 
-    const answerButtons = document.querySelectorAll('a[data-answer]')
+        const isAnswerAlert = document.getElementById('answer-alert')
+        const cancelAnswerButton = document.getElementById('cancel-answer')
+
+        const toogleAnswerAlert = function() {
+            if (parentCommentIdField.value) {
+                isAnswerAlert.classList.remove('hidden')
+            } else {
+                isAnswerAlert.classList.add('hidden')
+            }
+        }
 
-    for (let i = 0, len = answerButtons.length; i < len; i++) {
-      answerButtons[i].addEventListener('click', function (e) {
-        parentCommentIdField.value = e.target.getAttribute('data-answer')
         toogleAnswerAlert()
-      }, false)
-    }
 
-    cancelAnswerButton.addEventListener('click', function (e) {
-      e.preventDefault()
+        const answerButtons = document.querySelectorAll('a[data-answer]')
 
-      parentCommentIdField.value = null
-      toogleAnswerAlert()
-    }, false)
-
-    const previewButton = document.querySelector('.preview-button')
-    const previewRender = document.querySelector('#preview')
-
-    previewButton.addEventListener('click', function () {
-      if (previewRender.innerHTML === '') {
-        previewRender.innerHTML = '<p>Chargement en cours…</p>'
-      }
-
-      const content = document.querySelector('#user_comment_content').value
-      const httpRequest = new XMLHttpRequest()
-
-      httpRequest.onreadystatechange = function (data) {
-        if (httpRequest.readyState === 4 && httpRequest.status === 200) {
-          const json = JSON.parse(httpRequest.response)
-          previewRender.innerHTML = json.render
-          document.location.href = '#preview'
+        for (let i = 0, len = answerButtons.length; i < len; i++) {
+            answerButtons[i].addEventListener('click', function(e) {
+                parentCommentIdField.value = e.target.getAttribute('data-answer')
+                toogleAnswerAlert()
+            }, false)
         }
-      }
 
-      httpRequest.open('POST', Routing.generate('api_blog_comment_preview'))
-      httpRequest.setRequestHeader(
-        'Content-Type',
-        'application/x-www-form-urlencoded'
-      )
-      httpRequest.send('content=' + encodeURIComponent(content))
-    }, false)
-  }
+        cancelAnswerButton.addEventListener('click', function(e) {
+            e.preventDefault()
 
-  imagesEvents () {
-    const document = this.window.document
-    let isFullscreen = false
-    const images = document.querySelectorAll('.body img')
-
-    const handleClick = function (image) {
-      if (isFullscreen) {
-        if (document.exitFullscreen) {
-          document.exitFullscreen()
-        } else if (document.webkitExitFullscreen) {
-          document.webkitExitFullscreen()
-        } else if (document.mozCancelFullScreen) {
-          document.mozCancelFullScreen()
-        }
-      } else {
-        if (image.requestFullscreen) {
-          image.requestFullscreen()
-        } else if (image.webkitRequestFullscreen) {
-          image.webkitRequestFullscreen()
-        } else if (image.mozRequestFullScreen) {
-          image.mozRequestFullScreen()
-        }
-      }
-
-      isFullscreen = !isFullscreen
-    }
-
-    for (let i = 0, len = images.length; i < len; i++) {
-      const image = images[i]
-
-      if (image.parentNode.tagName === 'A') {
-        continue
-      }
-
-      (function (i) {
-        i.addEventListener('click', function () {
-          handleClick(i)
+            parentCommentIdField.value = null
+            toogleAnswerAlert()
         }, false)
-      })(image)
-    }
-  }
 
-  init () {
-    this.commentsEvents()
-    this.imagesEvents()
-  }
+        const previewButton = document.querySelector('.preview-button')
+        const previewRender = document.querySelector('#preview')
+
+        previewButton.addEventListener('click', function() {
+            if (previewRender.innerHTML === '') {
+                previewRender.innerHTML = '<p>Chargement en cours…</p>'
+            }
+
+            const content = document.querySelector('#user_comment_content').value
+            const httpRequest = new XMLHttpRequest()
+
+            httpRequest.onreadystatechange = function(data) {
+                if (httpRequest.readyState === 4 && httpRequest.status === 200) {
+                    const json = JSON.parse(httpRequest.response)
+                    previewRender.innerHTML = json.render
+                    document.location.href = '#preview'
+                }
+            }
+
+            httpRequest.open('POST', Routing.generate('api_blog_comment_preview'))
+            httpRequest.setRequestHeader(
+                'Content-Type',
+                'application/x-www-form-urlencoded'
+            )
+            httpRequest.send('content=' + encodeURIComponent(content))
+        }, false)
+    }
+
+    imagesEvents() {
+        const document = this.window.document
+        let isFullscreen = false
+        const images = document.querySelectorAll('.body img')
+
+        const handleClick = function(image) {
+            if (isFullscreen) {
+                if (document.exitFullscreen) {
+                    document.exitFullscreen()
+                } else if (document.webkitExitFullscreen) {
+                    document.webkitExitFullscreen()
+                } else if (document.mozCancelFullScreen) {
+                    document.mozCancelFullScreen()
+                }
+            } else {
+                if (image.requestFullscreen) {
+                    image.requestFullscreen()
+                } else if (image.webkitRequestFullscreen) {
+                    image.webkitRequestFullscreen()
+                } else if (image.mozRequestFullScreen) {
+                    image.mozRequestFullScreen()
+                }
+            }
+
+            isFullscreen = !isFullscreen
+        }
+
+        for (let i = 0, len = images.length; i < len; i++) {
+            const image = images[i]
+
+            if (image.parentNode.tagName === 'A') {
+                continue
+            }
+
+            (function(i) {
+                i.addEventListener('click', function() {
+                    handleClick(i)
+                }, false)
+            })(image)
+        }
+    }
+
+    init() {
+        this.commentsEvents()
+        this.imagesEvents()
+    }
 }
 
 module.exports = Post

assets/js/app/px-image.js

@@ -1,34 +1,34 @@
 class PxImage {
-  constructor (w) {
-    this.window = w
-  }
-
-  init () {
-    const doc = this.window.document
-
-    const images = doc.querySelectorAll('.quick-image img, .card figure img')
-
-    for (let i = 0, len = images.length; i < len; i++) {
-      ((image) => {
-        const source = image.getAttribute('data-src')
-        const sourceError = image.getAttribute('data-src-error')
-        const color = image.getAttribute('data-color')
-        const loader = new Image()
-
-        loader.onload = () => {
-          image.style.background = `${color || null} url(${source})`
-          image.style.backgroundSize = 'cover'
-          image.style.backgroundPosition = 'center'
-        }
-
-        loader.onerror = () => {
-          image.style.background = `${color || null} url('${sourceError}') center center`
-        }
-
-        loader.src = source
-      })(images[i])
+    constructor(w) {
+        this.window = w
+    }
+
+    init() {
+        const doc = this.window.document
+
+        const images = doc.querySelectorAll('.quick-image img, .card figure img')
+
+        for (let i = 0, len = images.length; i < len; i++) {
+            ((image) => {
+                const source = image.getAttribute('data-src')
+                const sourceError = image.getAttribute('data-src-error')
+                const color = image.getAttribute('data-color')
+                const loader = new Image()
+
+                loader.onload = () => {
+                    image.style.background = `${color ? color : null} url(${source})`
+                    image.style.backgroundSize = 'cover'
+                    image.style.backgroundPosition = 'center'
+                }
+
+                loader.onerror = () => {
+                    image.style.background = `${color ? color : null} url('${sourceError}') center center`
+                }
+
+                loader.src = source
+            })(images[i])
+        }
     }
-  }
 }
 
 module.exports = PxImage

assets/js/app/small-menu.js

@@ -1,24 +1,24 @@
 const Routing = require('./routing')
 
 class SmallMenu {
-  constructor(w) {
-    this.window = w
-  }
+    constructor(w) {
+        this.window = w
+    }
 
-  addEvent() {
-    const document = this.window.document
-    const menu = document.querySelector('.small-menu')
-    const opener = document.querySelector('.menu-opener')
+    addEvent() {
+        const document = this.window.document
+        const menu = document.querySelector('.small-menu')
+        const opener = document.querySelector('.menu-opener')
 
-    opener.addEventListener('click', () => {
-      menu.classList.toggle('is-open')
-      opener.classList.toggle('is-open')
-    })
-  }
+        opener.addEventListener('click', () => {
+            menu.classList.toggle('is-open')
+            opener.classList.toggle('is-open')
+        })
+    }
 
-  init() {
-    this.addEvent()
-  }
+    init() {
+        this.addEvent()
+    }
 }
 
 module.exports = SmallMenu

assets/js/app/stats.js

@@ -1,19 +1,19 @@
 class Stats {
-  init() {
-    (function(f, a, t, h, o, m) {
-      a[h] = a[h] || function() {
-        (a[h].q = a[h].q || []).push(arguments)
-      }
-      o = f.createElement('script'),
-        m = f.getElementsByTagName('script')[0]
-      o.async = 1;
-      o.src = t;
-      o.id = 'fathom-script'
-      m.parentNode.insertBefore(o, m)
-    })(document, window, '//ftm.deblan.org/tracker.js', 'fathom')
-    fathom('set', 'siteId', 'HQAWS')
-    fathom('trackPageview')
-  }
+    init() {
+        (function(f, a, t, h, o, m) {
+            a[h] = a[h] || function() {
+                (a[h].q = a[h].q || []).push(arguments)
+            }
+            o = f.createElement('script'),
+                m = f.getElementsByTagName('script')[0]
+            o.async = 1;
+            o.src = t;
+            o.id = 'fathom-script'
+            m.parentNode.insertBefore(o, m)
+        })(document, window, '//ftm.deblan.org/tracker.js', 'fathom')
+        fathom('set', 'siteId', 'HQAWS')
+        fathom('trackPageview')
+    }
 }
 
 module.exports = Stats

assets/js/app/video-ratio.js

@@ -1,15 +1,15 @@
 class VideoRatio {
-  constructor (w) {
-    this.window = w
-  }
-
-  init () {
-    const videos = this.window.document.querySelectorAll('.video-ratio')
-
-    for (let i = 0, len = videos.length; i < len; i++) {
-      videos[i].style.paddingBottom = videos[i].getAttribute('data-ratio')
+    constructor(w) {
+        this.window = w
+    }
+
+    init() {
+        const videos = this.window.document.querySelectorAll('.video-ratio')
+
+        for (let i = 0, len = videos.length; i < len; i++) {
+            videos[i].style.paddingBottom = videos[i].getAttribute('data-ratio')
+        }
     }
-  }
 }
 
 module.exports = VideoRatio

assets/js/viewer.js

@@ -2,11 +2,10 @@ import '../css/viewer.scss'
 
 const container = document.getElementById('mesh-viewer')
 const viewer = new StlViewer(
-  container, {
+  container,
+  {
     auto_rotate: true,
     allow_drag_and_drop: true,
-    models: [{
-      filename: container.getAttribute('data-file')
-    }]
+    models: [{ filename: container.getAttribute('data-file') }]
   }
 )

bin/messenger

@@ -39,7 +39,7 @@ start_messenger() {
 }
 
 stop_messenger() {
-	php8.1 bin/console messenger:stop-workers 2>/dev/null >/dev/null
+	php8.1 bin/console messenger:stop-workers
 	log -t -l notice "Stopped"
 }
 

config/packages/twig.yaml

@@ -1,6 +1,6 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
-    form_themes: ['form/bootstrap_4_form_theme.html.twig']
+    form_themes: ['@Core/form/bootstrap_4_form_theme.html.twig']
     auto_reload: true
     paths:
         '%kernel.project_dir%/templates/core/': Core

nohup.out

@@ -0,0 +1,30 @@
+
+ [OK] Consuming messages from transport "async".                                
+
+ // The worker will automatically exit once it has received a stop signal via   
+ // the messenger:stop-workers command.                                         
+
+ // Quit the worker with CONTROL-C.                                             
+
+ // Re-run the command with a -vv option to see logs about consumed messages.   
+
+
+ [OK] Consuming messages from transport "async".                                
+
+ // The worker will automatically exit once it has received a stop signal via   
+ // the messenger:stop-workers command.                                         
+
+ // Quit the worker with CONTROL-C.                                             
+
+ // Re-run the command with a -vv option to see logs about consumed messages.   
+
+
+ [OK] Consuming messages from transport "async".                                
+
+ // The worker will automatically exit once it has received a stop signal via   
+ // the messenger:stop-workers command.                                         
+
+ // Quit the worker with CONTROL-C.                                             
+
+ // Re-run the command with a -vv option to see logs about consumed messages.   
+

package.json

@@ -8,16 +8,13 @@
         "build": "./node_modules/.bin/encore production"
     },
     "dependencies": {
-        "@kangc/v-md-editor": "^1.7.12",
         "daisyui": "^2.31.0",
-        "editorjs-hyperlink": "^1.0.6",
-        "editorjs-inline-tool": "^0.4.0",
         "encore": "^0.0.30-beta",
         "lozad": "^1.16.0",
-        "mermaid": "^11.0.2",
-        "murph-project": "^1.9.4",
+        "murph-project": "^1",
         "particles.js": "^2.0.0",
         "prismjs": "^1.23.0",
+        "simplemde": "^1.11.2",
         "tingle.js": "^0.16.0",
         "vanillajs-datepicker": "^1.1.4",
         "vue": "^2.6.14"
@@ -28,6 +25,5 @@
         "postcss": "^8.4.16",
         "postcss-loader": "^7.0.1",
         "tailwindcss": "^3.1.8"
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+    }
 }

src/Analytic/DateRangeAnalytic.php

@@ -29,7 +29,7 @@ class DateRangeAnalytic extends BaseDateRangeAnalytic
 
         foreach ($entities as $key => $entity) {
             if ('view' === $type) {
-                if (null === $this->path || str_starts_with($entity->getPath(), $this->path)) {
+                if ($this->path === null || str_starts_with($entity->getPath(), $this->path)) {
                     $newEntities[] = $entity;
                 }
             }

src/Api/InfluxDB.php

@@ -36,7 +36,7 @@ class InfluxDB
 
     public function isAvailable(): bool
     {
-        return null !== $this->getClient();
+        return $this->getClient() !== null;
     }
 
     public function getClient(): ?Client

src/Api/TTRssClient.php

@@ -14,7 +14,7 @@ class TTRssClient
         $result = @file_get_contents('https://tiny.deblan.org/deblan_api/?itemsPerPage=10&page='.$page);
 
         if ($result) {
-            $result = str_replace('\u0092', "'", $result);
+            $result = str_replace('\\u0092', "'", $result);
             $result = str_replace(''', "'", $result);
 
             return json_decode($result, true);

src/Controller/Blog/PostAdminController.php

@@ -2,30 +2,31 @@
 
 namespace App\Controller\Blog;
 
-use App\Analytic\DateRangeAnalytic;
 use App\Core\Controller\Admin\Crud\CrudController;
 use App\Core\Crud\CrudConfiguration;
 use App\Core\Crud\Field\DatetimeField;
 use App\Core\Crud\Field\TextField;
-use App\Core\Entity\EntityInterface;
 use App\Core\Form\FileUploadHandler;
 use App\Core\Manager\EntityManager;
-use App\Core\Repository\Site\NodeRepository;
-use App\Entity\Blog\Post;
 use App\Entity\Blog\Post as Entity;
 use App\Factory\Blog\PostFactory as EntityFactory;
 use App\Form\Blog\Filter\PostFilterType;
 use App\Form\Blog\PostType;
+use App\Form\Blog\PostType as EntityType;
 use App\Repository\Blog\PostRepositoryQuery as RepositoryQuery;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Form\Form;
+use App\Core\Entity\EntityInterface;
+use App\Entity\Blog\Post;
+use App\Analytic\DateRangeAnalytic;
+use App\Core\Repository\Site\NodeRepository;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 #[Route(path: '/admin/blog/post')]
 class PostAdminController extends CrudController
@@ -67,7 +68,7 @@ class PostAdminController extends CrudController
                 'attr' => ['class' => 'miw-400'],
             ])
             ->setField('index', 'ID', TextField::class, [
-                'property_builder' => function (EntityInterface $entity) {
+                'property_builder' => function(EntityInterface $entity) {
                     return sprintf('#%d', $entity->getId());
                 },
                 'sort' => ['id', '.id'],
@@ -84,7 +85,7 @@ class PostAdminController extends CrudController
                 'format' => 'd/m/Y H:i',
                 'sort' => ['publishedAt', '.publishedAt'],
                 'attr' => ['class' => 'miw-200'],
-                'inline_form' => function (FormBuilderInterface $builder) {
+                'inline_form' => function(FormBuilderInterface $builder) {
                     $builder->add(
                         'publishedAt',
                         DateTimeType::class,
@@ -106,7 +107,7 @@ class PostAdminController extends CrudController
                 'view' => 'blog/post_admin/field/status.html.twig',
                 'sort' => ['status', '.status'],
                 'attr' => ['class' => 'miw-100'],
-                'inline_form' => function (FormBuilderInterface $builder) {
+                'inline_form' => function(FormBuilderInterface $builder) {
                     $builder->add(
                         'status',
                         ChoiceType::class,
@@ -124,15 +125,15 @@ class PostAdminController extends CrudController
                             ],
                         ]
                     );
-                },
+                }
             ])
-            ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->delete($entity);
             })
-            ->setBatchAction('index', 'draft', 'Statut : publier', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'draft', 'Statut : publier', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->update($entity->setStatus(Post::PUBLISHED));
             })
-            ->setBatchAction('index', 'publish', 'Statut : brouillon', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'publish', 'Statut : brouillon', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->update($entity->setStatus(Post::DRAFT));
             })
         ;
@@ -151,7 +152,7 @@ class PostAdminController extends CrudController
             $factory->create($this->getUser()),
             $entityManager,
             $request,
-            function (Entity $entity, Form $form, Request $request) use ($fileUpload) {
+            function(Entity $entity, Form $form, Request $request) use ($fileUpload) {
                 $directory = 'uploads/post/'.date('Y');
 
                 $fileUpload->handleForm(
@@ -172,7 +173,7 @@ class PostAdminController extends CrudController
             $entity,
             $entityManager,
             $request,
-            function (Entity $entity, Form $form, Request $request) use ($fileUpload) {
+            function(Entity $entity, Form $form, Request $request) use ($fileUpload) {
                 $directory = 'uploads/post/'.date('Y');
 
                 $fileUpload->handleForm(
@@ -186,7 +187,7 @@ class PostAdminController extends CrudController
         );
     }
 
-    #[Route(path: '/inline_edit/{entity}/{context}/{label}', name: 'admin_blog_post_inline_edit', methods: ['GET', 'POST'])]
+    #[Route(path: "/inline_edit/{entity}/{context}/{label}", name: 'admin_blog_post_inline_edit', methods: ['GET', 'POST'])]
     public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response
     {
         return $this->doInlineEdit($context, $label, $entity, $entityManager, $request);
@@ -267,7 +268,8 @@ class PostAdminController extends CrudController
         DateRangeAnalytic $analytic,
         NodeRepository $nodeRepository,
         string $range = '7days'
-    ): Response {
+    ): Response
+    {
         if (!in_array($range, ['7days', '30days', '90days', '1year'])) {
             throw $this->createNotFoundException();
         }

src/Controller/Blog/PostController.php

@@ -7,19 +7,19 @@ use App\Core\Controller\Site\PageController;
 use App\Core\Manager\EntityManager;
 use App\Core\Site\SiteRequest;
 use App\Core\Site\SiteStore;
-use App\Core\Twig\Extension\BuilderExtension;
-use App\Core\Twig\Extension\EditorJsExtension;
 use App\Entity\Blog\Category;
 use App\Entity\Blog\Post;
 use App\Factory\Blog\CommentFactory;
 use App\Form\Blog\UserCommentType;
-use App\Manager\PostFollowManager;
 use App\Markdown\Parser\Post as PostParser;
 use App\Repository\Blog\PostRepositoryQuery;
 use App\UrlGenerator\PostGenerator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use App\Factory\Blog\PostFollowFactory;
+use App\Manager\PostFollowManager;
+use App\Core\Twig\Extension\EditorJsExtension;
 
 class PostController extends PageController
 {
@@ -149,13 +149,14 @@ class PostController extends PageController
         ]);
     }
 
-    public function tag(string $tag, int $page = 1): Response {}
+    public function tag(string $tag, int $page = 1): Response
+    {
+    }
 
     public function createQuery(bool $isPreview = false): PostRepositoryQuery
     {
         $query = $this->postQuery->create()
-            ->orderBy('.publishedAt', 'DESC')
-        ;
+            ->orderBy('.publishedAt', 'DESC');
 
         if (!$isPreview) {
             $query->published();
@@ -164,19 +165,14 @@ class PostController extends PageController
         return $query;
     }
 
-    public function rss(
-        PostParser $parser,
-        EditorJsExtension $editorJsExtension,
-        BuilderExtension $builderExtension
-    ): Response {
+    public function rss(PostParser $parser, EditorJsExtension $editorJsExtension): Response
+    {
         $entities = $this->createQuery()->paginate(1, 20);
         $items = [];
 
         foreach ($entities as $entity) {
-            if ('editorjs' === $entity->getContentFormat()) {
+            if ($entity->getContentFormat() === 'editorjs') {
                 $description = $editorJsExtension->buildHtml($entity->getContent());
-            } elseif ('builder' === $entity->getContentFormat()) {
-                $description = $builderExtension->buildHtml($entity->getContent());
             } else {
                 $description = $parser->transformMarkdown($entity->getContent());
             }
@@ -197,7 +193,7 @@ class PostController extends PageController
                     'post' => $entity->getId(),
                     'slug' => $entity->getSlug(),
                 ], UrlGeneratorInterface::ABSOLUTE_URL),
-                'linkGemini' => sprintf('gemini://deblan.fr/posts/%d.gmi', $entity->getId()),
+                'linkGemini' => sprintf('gemini://deblan.io/posts/%d.gmi', $entity->getId()),
             ];
         }
 

src/Controller/ContactController.php

@@ -4,10 +4,10 @@ namespace App\Controller;
 
 use App\Core\Controller\Site\PageController;
 use App\Core\Notification\MailNotifier;
-use App\Core\Setting\SettingManager;
 use App\Form\ContactType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use App\Core\Setting\SettingManager;
 
 class ContactController extends PageController
 {

src/Controller/DashboardAdminController.php

@@ -3,10 +3,10 @@
 namespace App\Controller;
 
 use App\Core\Controller\Dashboard\DashboardAdminController as Controller;
-use App\Repository\Blog\PostRepositoryQuery;
-use App\Repository\ProjectRepositoryQuery;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use App\Repository\Blog\PostRepositoryQuery;
+use App\Repository\ProjectRepositoryQuery;
 
 #[Route(path: '/admin')]
 class DashboardAdminController extends Controller
@@ -15,7 +15,8 @@ class DashboardAdminController extends Controller
     public function index(
         PostRepositoryQuery $postQuery,
         ProjectRepositoryQuery $projectQuery
-    ): Response {
+    ): Response
+    {
         $posts = $postQuery->create()
             ->orderBy('.id', 'DESC')
             ->paginate(1, 4)

src/Controller/ProjectAdminController.php

@@ -7,7 +7,6 @@ use App\Core\Crud\CrudConfiguration;
 use App\Core\Crud\Field;
 use App\Core\Entity\EntityInterface;
 use App\Core\Manager\EntityManager;
-use App\Entity\Project;
 use App\Entity\Project as Entity;
 use App\Factory\ProjectFactory as Factory;
 use App\Form\ProjectType as Type;
@@ -16,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
+use App\Entity\Project;
 
 class ProjectAdminController extends CrudController
 {
@@ -114,13 +114,13 @@ class ProjectAdminController extends CrudController
                 'attr' => ['class' => 'miw-100'],
             ])
 
-            ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->delete($entity);
             })
-            ->setBatchAction('index', 'draft', 'Statut : publier', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'draft', 'Statut : publier', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->update($entity->setStatus(Project::PUBLISHED));
             })
-            ->setBatchAction('index', 'publish', 'Statut : brouillon', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'publish', 'Statut : brouillon', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->update($entity->setStatus(Project::DRAFT));
             })
         ;

src/Controller/StlMeshAdminController.php

@@ -110,7 +110,7 @@ class StlMeshAdminController extends CrudController
                 'attr' => ['class' => 'col-md-12'],
             ])
 
-            ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
                 $manager->delete($entity);
             })
         ;

src/Controller/StlMeshController.php

@@ -2,11 +2,13 @@
 
 namespace App\Controller;
 
+use App\Api\TTRssClient;
 use App\Core\Controller\Site\PageController;
-use App\Entity\StlMesh;
-use App\Repository\StlMeshRepositoryQuery;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use App\Markdown\Parser\Post as PostParser;
 use Symfony\Component\HttpFoundation\Response;
+use App\Repository\StlMeshRepositoryQuery;
+use App\Entity\StlMesh;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -16,8 +18,7 @@ class StlMeshController extends PageController
     {
         $pager = $query->create()
             ->orderBy('.sortOrder')
-            ->paginate(1, 200)
-        ;
+            ->paginate(1, 200);
 
         return $this->defaultRender($this->siteRequest->getPage()->getTemplate(), [
             'pager' => $pager,

src/Controller/TextController.php

@@ -2,7 +2,9 @@
 
 namespace App\Controller;
 
+use App\Api\TTRssClient;
 use App\Core\Controller\Site\PageController;
+use App\Markdown\Parser\Post as PostParser;
 use Symfony\Component\HttpFoundation\Response;
 
 class TextController extends PageController

src/DependencyInjection/AppExtension.php

@@ -7,6 +7,9 @@ use Symfony\Component\DependencyInjection\Extension\Extension;
 
 class AppExtension extends Extension
 {
+    /**
+     * {@inheritdoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = $this->getConfiguration($configs, $container);
@@ -15,6 +18,9 @@ class AppExtension extends Extension
         $container->setParameter('app', $config);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function getConfiguration(array $configs, ContainerBuilder $container)
     {
         return new Configuration();

src/Entity/Blog/Comment.php

@@ -55,16 +55,6 @@ class Comment implements EntityInterface
         $this->postFollows = new ArrayCollection();
     }
 
-    public function __toString()
-    {
-        return sprintf(
-            '[%s] (%s) %s',
-            $this->getAuthor(),
-            $this->getCreatedAt()->format('d/m/Y'),
-            substr($this->getContent(), 0, 20).'…'
-        );
-    }
-
     public function getId(): ?int
     {
         return $this->id;
@@ -199,12 +189,25 @@ class Comment implements EntityInterface
      */
     public function getAvatar(): string
     {
-        $mail = $this->getEmail() ?? sprintf('%d@deblan.fr', $this->getId());
+        $mail = $this->getEmail() ?? sprintf('%d@deblan.io', $this->getId());
         $hash = md5($mail);
 
         return 'https://cdn.libravatar.org/avatar/'.$hash.'?s=90&d=retro';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        return sprintf(
+            '[%s] (%s) %s',
+            $this->getAuthor(),
+            $this->getCreatedAt()->format('d/m/Y'),
+            substr($this->getContent(), 0, 20).'…'
+        );
+    }
+
     /**
      * @return Collection|PostFollow[]
      */

src/Entity/Blog/Post.php

@@ -202,7 +202,7 @@ class Post implements EntityInterface
     }
 
     /**
-     * @return Category[]|Collection
+     * @return Collection|Category[]
      */
     public function getCategories(): Collection
     {

src/Entity/Page/CategoriesPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class CategoriesPage extends TitledPage {}
+class CategoriesPage extends TitledPage
+{
+}

src/Entity/Page/CategoryPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class CategoryPage extends TitledPage {}
+class CategoryPage extends TitledPage
+{
+}

src/Entity/Page/ContactPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class ContactPage extends SimplePage {}
+class ContactPage extends SimplePage
+{
+}

src/Entity/Page/LinksPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class LinksPage extends SimplePage {}
+class LinksPage extends SimplePage
+{
+}

src/Entity/Page/MeshPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class MeshPage extends SimplePage {}
+class MeshPage extends SimplePage
+{
+}

src/Entity/Page/PostPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class PostPage extends TitledPage {}
+class PostPage extends TitledPage
+{
+}

src/Entity/Page/PostsPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class PostsPage extends TitledPage {}
+class PostsPage extends TitledPage
+{
+}

src/Entity/Page/SearchPage.php

@@ -5,4 +5,6 @@ namespace App\Entity\Page;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
-class SearchPage extends TitledPage {}
+class SearchPage extends TitledPage
+{
+}

src/Entity/Page/SimplePage.php

@@ -4,7 +4,7 @@ namespace App\Entity\Page;
 
 use App\Core\Entity\Site\Page\Block;
 use App\Core\Entity\Site\Page\FileBlock;
-use App\Form\MarkdownBlockType;
+use App\Form\Type\SimpleMdTextareaBlockType;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -17,7 +17,7 @@ class SimplePage extends TitledPage
 
         $builder->add(
             'content',
-            MarkdownBlockType::class,
+            SimpleMdTextareaBlockType::class,
             [
                 'label' => 'Contenu',
                 'options' => [

src/Entity/Page/TextPage.php

@@ -3,10 +3,11 @@
 namespace App\Entity\Page;
 
 use App\Core\Entity\Site\Page\Block;
-use App\Core\Entity\Site\Page\Page;
+use App\Core\Entity\Site\Page\FileBlock;
 use App\Core\Form\Site\Page\TextareaBlockType;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
+use App\Core\Entity\Site\Page\Page;
 
 #[ORM\Entity]
 class TextPage extends Page

src/Entity/Project.php

@@ -13,8 +13,8 @@ class Project implements EntityInterface
 {
     use Timestampable;
 
-    public const DRAFT = 0;
-    public const PUBLISHED = 1;
+    const DRAFT = 0;
+    const PUBLISHED = 1;
 
     #[ORM\Id]
     #[ORM\GeneratedValue]

src/Entity/StlMesh.php

@@ -2,9 +2,9 @@
 
 namespace App\Entity;
 
-use App\Core\Entity\EntityInterface;
 use App\Repository\StlMeshRepository;
 use Doctrine\ORM\Mapping as ORM;
+use App\Core\Entity\EntityInterface;
 
 #[ORM\Entity(repositoryClass: StlMeshRepository::class)]
 class StlMesh implements EntityInterface
@@ -86,7 +86,7 @@ class StlMesh implements EntityInterface
     {
         $this->files = (array) $this->files;
 
-        usort($this->files, function ($a, $b) {
+        usort($this->files, function($a, $b) {
             if ($a['position'] > $b['position']) {
                 return 1;
             }

src/Entity/User.php

@@ -50,7 +50,9 @@ class User implements PasswordAuthenticatedUserInterface, UserInterface, TwoFact
     #[ORM\Column(type: 'boolean', options: ['default' => 0])]
     private $isWriter;
 
-    public function __construct() {}
+    public function __construct()
+    {
+    }
 
     public function __toString()
     {

src/EventListener/StatListener.php

@@ -13,7 +13,9 @@ use Symfony\Component\Messenger\MessageBusInterface;
  */
 class StatListener
 {
-    public function __construct(protected MessageBusInterface $bus) {}
+    public function __construct(protected MessageBusInterface $bus)
+    {
+    }
 
     public function onKernelRequest(RequestEvent $event)
     {

src/EventSubscriber/SettingEventSubscriber.php

@@ -4,12 +4,12 @@ namespace App\EventSubscriber;
 
 use App\Core\Event\Setting\SettingEvent;
 use App\Core\EventSubscriber\SettingEventSubscriber as EventSubscriber;
-use App\Core\Form\FileManager\FilePickerType;
-use App\Core\Form\Type\TinymceTextareaType;
 use App\Core\Setting\SettingManager;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use App\Core\Form\FileManager\FilePickerType;
+use App\Core\Form\Type\TinymceTextareaType;
 
 /**
  * class SettingEventSubscriber.

src/Factory/UserFactory.php

@@ -9,4 +9,6 @@ use App\Core\Factory\UserFactory as BaseUserFactory;
  *
  * @author Simon Vieille <simon@deblan.fr>
  */
-class UserFactory extends BaseUserFactory {}
+class UserFactory extends BaseUserFactory
+{
+}

src/Form/Blog/CategoryType.php

@@ -3,8 +3,6 @@
 namespace App\Form\Blog;
 
 use App\Entity\Blog\Category;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
@@ -12,6 +10,8 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Doctrine\ORM\EntityRepository;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 
 class CategoryType extends AbstractType
 {

src/Form/Blog/PostParameterType.php

@@ -2,6 +2,7 @@
 
 namespace App\Form\Blog;
 
+
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;

src/Form/Blog/PostType.php

@@ -2,13 +2,8 @@
 
 namespace App\Form\Blog;
 
-use App\Core\Form\FileManager\FilePickerType;
-use App\Core\Form\Type\BuilderType;
-use App\Core\Form\Type\CollectionType as MurphCollectionType;
-use App\Core\Form\Type\EditorJsTextareaType;
 use App\Entity\Blog\Category;
 use App\Entity\Blog\Post;
-use App\Form\MarkdownType;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -26,6 +21,10 @@ use Symfony\Component\Validator\Constraints\Image;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\Url;
+use App\Form\Type\SimpleMdTextareaType;
+use App\Core\Form\Type\EditorJsTextareaType;
+use App\Core\Form\FileManager\FilePickerType;
+use App\Core\Form\Type\CollectionType as MurphCollectionType;
 
 class PostType extends AbstractType
 {
@@ -52,7 +51,6 @@ class PostType extends AbstractType
                 'required' => true,
                 'choices' => [
                     'Markdown' => 'markdown',
-                    'Builder' => 'builder',
                     'HTML' => 'html',
                     'Editor JS' => 'editorjs',
                 ],
@@ -63,9 +61,8 @@ class PostType extends AbstractType
         );
 
         $types = [
-            'markdown' => MarkdownType::class,
-            'builder' => BuilderType::class,
-            'html' => MarkdownType::class,
+            'markdown' => SimpleMdTextareaType::class,
+            'html' => SimpleMdTextareaType::class,
             'editorjs' => EditorJsTextareaType::class,
         ];
 

src/Form/Blog/UserCommentType.php

@@ -3,9 +3,7 @@
 namespace App\Form\Blog;
 
 use App\Entity\Blog\Comment;
-use Gregwar\CaptchaBundle\Type\CaptchaType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
@@ -16,6 +14,8 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Url;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Gregwar\CaptchaBundle\Type\CaptchaType;
 
 class UserCommentType extends AbstractType
 {

src/Form/ContactType.php

@@ -2,7 +2,6 @@
 
 namespace App\Form;
 
-use Gregwar\CaptchaBundle\Type\CaptchaType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
@@ -11,6 +10,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Gregwar\CaptchaBundle\Type\CaptchaType;
 
 class ContactType extends AbstractType
 {

src/Form/MarkdownBlockType.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Form;
-
-use App\Core\Form\Site\Page\TextareaBlockType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class MarkdownBlockType extends TextareaBlockType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add(
-            'value',
-            MarkdownType::class,
-            array_merge([
-                'required' => false,
-                'label' => false,
-            ], $options['options']),
-        );
-    }
-}

src/Form/MarkdownType.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Form;
-
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-
-class MarkdownType extends TextareaType
-{
-    public function getBlockPrefix()
-    {
-        return 'markdown';
-    }
-}

src/Form/ProjectLinkType.php

@@ -3,10 +3,10 @@
 namespace App\Form;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class ProjectLinkType extends AbstractType
 {

src/Form/StlFileType.php

@@ -2,13 +2,13 @@
 
 namespace App\Form;
 
-use App\Core\Form\FileManager\FilePickerType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use App\Core\Form\FileManager\FilePickerType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 class StlFileType extends AbstractType
 {

src/Form/Type/SimpleMdTextareaType.php

@@ -8,6 +8,9 @@ use Symfony\Component\Form\FormView;
 
 class SimpleMdTextareaType extends TextareaType
 {
+    /**
+     * {@inheritdoc}
+     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         if (!isset($view->vars['attr']['data-simplemde'])) {

src/Form/UserType.php

@@ -4,4 +4,6 @@ namespace App\Form;
 
 use App\Core\Form\UserType as BaseUserType;
 
-class UserType extends BaseUserType {}
+class UserType extends BaseUserType
+{
+}

src/Kernel.php

@@ -2,9 +2,7 @@
 
 namespace App;
 
-use App\Core\DependencyInjection\Compiler\BuilderBlockPass;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
@@ -37,9 +35,4 @@ class Kernel extends BaseKernel
             (require $path)($routes->withPath($path), $this);
         }
     }
-
-    protected function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new BuilderBlockPass());
-    }
 }

src/Markdown/Parser/Post.php

@@ -11,9 +11,15 @@ use Knp\Bundle\MarkdownBundle\Parser\MarkdownParser;
  */
 class Post extends MarkdownParser
 {
-    // protected $id_class_attr_catch_re = '\{((?'.'>[ ]*[#.a-z][-_:a-zA-Z0-9="\'\/\*-]+){1,})[ ]*\}';
+    /**
+     * {@inheritdoc}
+     */
+    //protected $id_class_attr_catch_re = '\{((?'.'>[ ]*[#.a-z][-_:a-zA-Z0-9="\'\/\*-]+){1,})[ ]*\}';
     protected $id_class_attr_catch_re = '\{([^\}]+)\}';
 
+    /**
+     * {@inheritdoc}
+     */
     public function transformMarkdown($text)
     {
         $html = parent::transformMarkdown($text);
@@ -21,6 +27,9 @@ class Post extends MarkdownParser
         return str_replace(' role="doc-endnote"', '', $html);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     protected function doExtraAttributes($tag_name, $attr, $defaultIdValue = null, $classes = [])
     {
         if (empty($attr) && !$defaultIdValue && empty($classes)) {
@@ -93,11 +102,8 @@ class Post extends MarkdownParser
             $codeblock
         );
 
-        $codeblock = preg_replace_callback(
-            '/^\n+/',
-            [$this, '_doFencedCodeBlocks_newlines'],
-            $codeblock
-        );
+        $codeblock = preg_replace_callback('/^\n+/',
+            [$this, '_doFencedCodeBlocks_newlines'], $codeblock);
 
         $classes = [];
         if ('' != $classname) {
@@ -109,12 +115,7 @@ class Post extends MarkdownParser
         $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? 'pre' : 'code', $attrs, null, $classes);
         $pre_attr_str = $this->code_attr_on_pre ? $attr_str : '';
         $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-
-        if (preg_match('/mermaid/', $code_attr_str)) {
-            $codeblock = "<pre{$code_attr_str}>{$codeblock}</pre>";
-        } else {
-            $codeblock = "<pre{$pre_attr_str}><code{$code_attr_str}>{$codeblock}</code></pre>";
-        }
+        $codeblock = "<pre{$pre_attr_str}><code{$code_attr_str}>{$codeblock}</code></pre>";
 
         return "\n\n".$this->hashBlock($codeblock)."\n\n";
     }

src/Message/PageViewMessage.php

@@ -4,7 +4,9 @@ namespace App\Message;
 
 final class PageViewMessage
 {
-    public function __construct(public int $time) {}
+    public function __construct(public int $time)
+    {
+    }
 
     public function getTime(): int
     {

src/MessageHandler/PageViewMessageHandler.php

@@ -2,15 +2,17 @@
 
 namespace App\MessageHandler;
 
-use App\Api\InfluxDB;
 use App\Message\PageViewMessage;
-use InfluxDB2\Point;
-use InfluxDB2\WriteType;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use App\Api\InfluxDB;
+use InfluxDB2\WriteType;
+use InfluxDB2\Point;
 
 final class PageViewMessageHandler implements MessageHandlerInterface
 {
-    public function __construct(protected InfluxDB $influxDB) {}
+    public function __construct(protected InfluxDB $influxDB)
+    {
+    }
 
     public function __invoke(PageViewMessage $message)
     {

src/Repository/AppEntityBlogPostRepository.php

@@ -9,8 +9,8 @@ use Doctrine\Persistence\ManagerRegistry;
 /**
  * @extends ServiceEntityRepository<AppEntityBlogPost>
  *
- * @method null|AppEntityBlogPost find($id, $lockMode = null, $lockVersion = null)
- * @method null|AppEntityBlogPost findOneBy(array $criteria, array $orderBy = null)
+ * @method AppEntityBlogPost|null find($id, $lockMode = null, $lockVersion = null)
+ * @method AppEntityBlogPost|null findOneBy(array $criteria, array $orderBy = null)
  * @method AppEntityBlogPost[]    findAll()
  * @method AppEntityBlogPost[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
@@ -39,28 +39,28 @@ class AppEntityBlogPostRepository extends ServiceEntityRepository
         }
     }
 
-    //    /**
-    //     * @return AppEntityBlogPost[] Returns an array of AppEntityBlogPost objects
-    //     */
-    //    public function findByExampleField($value): array
-    //    {
-    //        return $this->createQueryBuilder('a')
-    //            ->andWhere('a.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->orderBy('a.id', 'ASC')
-    //            ->setMaxResults(10)
-    //            ->getQuery()
-    //            ->getResult()
-    //        ;
-    //    }
+//    /**
+//     * @return AppEntityBlogPost[] Returns an array of AppEntityBlogPost objects
+//     */
+//    public function findByExampleField($value): array
+//    {
+//        return $this->createQueryBuilder('a')
+//            ->andWhere('a.exampleField = :val')
+//            ->setParameter('val', $value)
+//            ->orderBy('a.id', 'ASC')
+//            ->setMaxResults(10)
+//            ->getQuery()
+//            ->getResult()
+//        ;
+//    }
 
-    //    public function findOneBySomeField($value): ?AppEntityBlogPost
-    //    {
-    //        return $this->createQueryBuilder('a')
-    //            ->andWhere('a.exampleField = :val')
-    //            ->setParameter('val', $value)
-    //            ->getQuery()
-    //            ->getOneOrNullResult()
-    //        ;
-    //    }
+//    public function findOneBySomeField($value): ?AppEntityBlogPost
+//    {
+//        return $this->createQueryBuilder('a')
+//            ->andWhere('a.exampleField = :val')
+//            ->setParameter('val', $value)
+//            ->getQuery()
+//            ->getOneOrNullResult()
+//        ;
+//    }
 }

src/Repository/Blog/CommentRepository.php

@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|Comment find($id, $lockMode = null, $lockVersion = null)
- * @method null|Comment findOneBy(array $criteria, array $orderBy = null)
+ * @method Comment|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Comment|null findOneBy(array $criteria, array $orderBy = null)
  * @method Comment[]    findAll()
  * @method Comment[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */

src/Repository/Blog/PostFollowRepositoryQuery.php

@@ -3,8 +3,8 @@
 namespace App\Repository\Blog;
 
 use App\Core\Repository\RepositoryQuery;
-use App\Repository\Blog\PostFollowRepository as Repository;
 use Knp\Component\Pager\PaginatorInterface;
+use App\Repository\Blog\PostFollowRepository as Repository;
 
 class PostFollowRepositoryQuery extends RepositoryQuery
 {

src/Repository/Blog/PostRepositoryQuery.php

@@ -151,7 +151,7 @@ class PostRepositoryQuery extends RepositoryQuery
                 }
             }
 
-            $matches = array_filter($matches, function ($match) use ($keywords) {
+            $matches = array_filter($matches, function($match) use ($keywords) {
                 return (100 * $match['count'] / count($keywords)) > 80;
             });
 

src/Repository/ProjectRepository.php

@@ -9,8 +9,8 @@ use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|Project find($id, $lockMode = null, $lockVersion = null)
- * @method null|Project findOneBy(array $criteria, array $orderBy = null)
+ * @method Project|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Project|null findOneBy(array $criteria, array $orderBy = null)
  * @method Project[]    findAll()
  * @method Project[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */

src/Repository/ProjectRepositoryQuery.php

@@ -3,9 +3,9 @@
 namespace App\Repository;
 
 use App\Core\Repository\RepositoryQuery;
-use App\Entity\Project;
-use App\Repository\ProjectRepository as Repository;
 use Knp\Component\Pager\PaginatorInterface;
+use App\Repository\ProjectRepository as Repository;
+use App\Entity\Project;
 
 class ProjectRepositoryQuery extends RepositoryQuery
 {

src/Repository/StlMeshRepository.php

@@ -7,8 +7,8 @@ use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @method null|StlMesh find($id, $lockMode = null, $lockVersion = null)
- * @method null|StlMesh findOneBy(array $criteria, array $orderBy = null)
+ * @method StlMesh|null find($id, $lockMode = null, $lockVersion = null)
+ * @method StlMesh|null findOneBy(array $criteria, array $orderBy = null)
  * @method StlMesh[]    findAll()
  * @method StlMesh[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */

src/Repository/StlMeshRepositoryQuery.php

@@ -3,8 +3,8 @@
 namespace App\Repository;
 
 use App\Core\Repository\RepositoryQuery;
-use App\Repository\StlMeshRepository as Repository;
 use Knp\Component\Pager\PaginatorInterface;
+use App\Repository\StlMeshRepository as Repository;
 
 class StlMeshRepositoryQuery extends RepositoryQuery
 {

src/Repository/UserRepository.php

@@ -6,8 +6,9 @@ use App\Entity\User;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
-use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 
 class UserRepository extends ServiceEntityRepository implements PasswordUpgraderInterface
 {

src/Twig/Extension/BlogExtension.php

@@ -40,9 +40,8 @@ class BlogExtension extends AbstractExtension
         $text = str_replace('http://upload.deblan.fr', 'https://upload.deblan.org', $text);
         $text = str_replace('http://dedi.geneweb.fr', 'http://kim.deblan.fr', $text);
         $text = str_replace('http://mediaplayer.deblan.fr', 'https://mediaplayer.deblan.org', $text);
-        $text = str_replace('http://blog.deblan.fr', 'https://www.deblan.fr', $text);
-        $text = str_replace('http://www.deblan.tv', 'https://www.deblan.fr', $text);
-        $text = str_replace('http://www.deblan.io', 'https://www.deblan.fr', $text);
+        $text = str_replace('http://blog.deblan.fr', 'https://www.deblan.io', $text);
+        $text = str_replace('http://www.deblan.tv', 'https://www.deblan.io', $text);
 
         $text = preg_replace_callback(
             '`<p([^>]*)>(.*)</p([^>]*)>`isU',
@@ -135,12 +134,10 @@ class BlogExtension extends AbstractExtension
                 '#<code langage=\'([^\']*)\'>(.*)</code>#isU',
             ],
             function ($data) {
-                $lang = strtolower(
-                    str_replace(
-                        ['console', 'texte', 'apache'],
-                        ['bash', 'text', 'html'],
-                        $data[1]
-                    )
+                $lang = strtolower(str_replace(
+                    ['console', 'texte', 'apache'],
+                    ['bash', 'text', 'html'],
+                    $data[1])
                 );
                 $class = 'language-'.$lang;
 

src/Twig/Extension/ColorExtension.php

@@ -30,9 +30,9 @@ class ColorExtension extends AbstractExtension
 
         return sprintf(
             '#%s%s%s',
-            2 != strlen($red) ? '0'.$red : $red,
-            2 != strlen($green) ? '0'.$green : $green,
-            2 != strlen($blue) ? '0'.$blue : $blue,
+            strlen($red) != 2 ? '0'.$red : $red,
+            strlen($green) != 2 ? '0'.$green : $green,
+            strlen($blue) != 2 ? '0'.$blue : $blue,
         );
     }
 }

src/Twig/Extension/LazyLoadExtension.php

@@ -21,7 +21,7 @@ class LazyLoadExtension extends AbstractExtension
 
     public function lazyLoad($text)
     {
-        return preg_replace_callback(
+        $text = preg_replace_callback(
             '`<img src="([^"]+)" alt="([^"]+)" />`isU',
             function ($data) {
                 $lazy = sprintf('<img class="lazy-img" src="#" data-src="%s" alt="%s" />', $data[1], $data[2]);
@@ -31,5 +31,7 @@ class LazyLoadExtension extends AbstractExtension
             },
             $text
         );
+
+        return $text;
     }
 }

src/Twig/Extension/TypoExtension.php

@@ -4,6 +4,7 @@ namespace App\Twig\Extension;
 
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
+use Twig\TwigFunction;
 
 class TypoExtension extends AbstractExtension
 {

src/UrlGenerator/PostGenerator.php

@@ -3,6 +3,7 @@
 namespace App\UrlGenerator;
 
 use App\Core\Entity\Site\Node;
+use App\Entity\Blog\Category;
 use App\Repository\Blog\CategoryRepositoryQuery;
 use App\Repository\Blog\PostRepositoryQuery;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;

templates/base.html.twig

@@ -70,8 +70,6 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
     #}
     <link rel="icon" href="{{ asset('build/webapp/favicon.svg') }}" >
     <link rel="manifest" href="{{ asset('build/webapp/manifest.json') }}">
-
-    {% block links_extra %}{% endblock %}
 </head>
 <body>
     <div class="flex items-stretch blog">

templates/blog/post_admin/_show.html.twig

@@ -72,8 +72,6 @@
 
         {% if entity.contentFormat == 'html' %}
             {{- entity.content|murph_url|file_attributes|post -}}
-        {% elseif entity.contentFormat == 'builder' %}
-            {{- entity.content|block_to_html|file_attributes|lazy_load -}}
         {% elseif entity.contentFormat == 'markdown' %}
             {{- entity.content|murph_url|file_attributes|markdown('post') -}}
         {% elseif entity.contentFormat == 'editorjs' %}

templates/blog/post_admin/show.html.twig

@@ -1,21 +1,9 @@
 {% extends '@Core/admin/crud/show.html.twig' %}
 
 {% block header_actions_after %}
-    <a href="{{ safe_path('blog_menu_post', {post: entity.id, slug: entity.slug}) }}" class="btn btn-success" target="_blank">
+    <a href="{{ safe_path('blog_menu_post', {post: entity.id, slug: entity.slug}) }}" class="btn btn-light" target="_blank">
         Voir en ligne
     </a>
 
-    {% if configuration.action(context, 'analytic_stats', true) %}
-        {% set analytics = path(
-            configuration.pageRoute('analytic_stats'),
-            {entity: entity.id}|merge(configuration.pageRouteParams('analytic_stats'))
-        ) %}
-
-        <a data-modal="{{ analytics }}" class="btn btn-light">
-            <span data-modal="{{ analytics }}" class="fa fa-chart-bar"></span>
-            Statistiques
-        </a>
-    {% endif %}
-
     {{ parent() }}
 {% endblock %}

templates/editorjs/link.html.twig

@@ -1,5 +1,5 @@
 {% block render %}
-    <div class="ejs-link rounded-2xl shadow-md p-1 flex justify-start bg-box">
+    <div class="ejs-link rounded-2xl shadow-md p-2 md:p-8 flex justify-start bg-box">
         <a href="{{ link }}" class="ejs-link--anchor {% if meta.image is defined and meta.image %}ejs-link--anchor--with-image{% endif %}" target="_blank">
             <div class="ejs-link-content">
                 {% if meta.title %}

templates/form/bootstrap_4_form_theme.html.twig

@@ -1,8 +0,0 @@
-{% extends '@Core/form/bootstrap_4_form_theme.html.twig' %}
-
-{% block markdown_widget %}
-    <div {% for attr, value in row_attr %}{{ attr }}="{{ value }}" {% endfor %}>
-        <div class="markdown-editor" data-value="{{ value|json_encode }}" data-name="{{ full_name }}" data-id="{{ id }}">
-        </div>
-    </div>
-{% endblock %}

templates/page/mesh/default.html.twig

@@ -12,28 +12,30 @@
     <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
         {% for mesh in pager %}
             <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
-                <figure>
-                    <img src="{{ asset('build/images/px.png') }}" data-color="{{ generate_color_by_string(mesh.id) }}" data-src="{{- asset(mesh.preview)|imagine_filter('mesh_preview_filter') -}}" data-src-error="{{ asset('build/images/post-image-logo.png') }}" alt="{{ mesh.label }}">
-                </figure>
-                <div class="card-body">
-                    <h2 class="card-title">{{ mesh.label }}</h2>
+                <div class="card">
+                    <figure>
+                        <img src="{{ asset('build/images/px.png') }}" data-color="{{ generate_color_by_string(mesh.id) }}" data-src="{{- asset(mesh.preview)|imagine_filter('mesh_preview_filter') -}}" data-src-error="{{ asset('build/images/post-image-logo.png') }}" alt="{{ mesh.label }}">
+                    </figure>
+                    <div class="card-body">
+                        <h2 class="card-title">{{ mesh.label }}</h2>
 
-                    {{- mesh.description|murph_url|file_attributes|markdown('post') -}}
+                        {{- mesh.description|murph_url|file_attributes|markdown('post') -}}
 
-                    <div class="card-actions mt-5">
-                        {% for key, item in mesh.files %}
-                            <div class="dropdown dropdown-top">
-                                <label tabindex="0" class="btn btn-xs">{{ item.name }}</label>
-                                <ul tabindex="0" class="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52">
-                                    <li>
-                                        <a class="mesh-viewer" data-modal href="{{ path('mesh_viewer', {stlMesh: mesh.id, key: key + 1}) }}">Voir en 3D</a>
-                                    </li>
-                                    <li>
-                                        <a target="_blank" href="{{ path('mesh_download', {stlMesh: mesh.id, key: key + 1}) }}">Télécharger</a>
-                                    </li>
-                                </ul>
-                            </div>
-                        {% endfor %}
+                        <div class="card-actions mt-5">
+                            {% for key, item in mesh.files %}
+                                <div class="dropdown dropdown-top">
+                                    <label tabindex="0" class="btn btn-xs">{{ item.name }}</label>
+                                    <ul tabindex="0" class="dropdown-content menu p-2 shadow bg-base-100 rounded-box w-52">
+                                        <li>
+                                            <a class="mesh-viewer" data-modal href="{{ path('mesh_viewer', {stlMesh: mesh.id, key: key + 1}) }}">Voir en 3D</a>
+                                        </li>
+                                        <li>
+                                            <a target="_blank" href="{{ path('mesh_download', {stlMesh: mesh.id, key: key + 1}) }}">Télécharger</a>
+                                        </li>
+                                    </ul>
+                                </div>
+                            {% endfor %}
+                        </div>
                     </div>
                 </div>
             </div>