Merge pull request 'Final updates for v2.0' (#29) from 1.3 into main

Reviewed-on: #29

assets/css/styles.css

@@ -136,6 +136,9 @@ button.button i {
 .ref-text h2 {
   display: block;
 }
+.ref-text a {
+  color: var(--primary);
+}
 
 #refQuery {
   position: fixed;
@@ -245,6 +248,15 @@ input:checked + .slider:before {
   border-radius: 50%;
 }
 
+#passage-popup {
+  position: absolute;
+  z-index: 1000;
+  background-color: var(--background);
+  border: solid 2px var(--border);
+  border-radius: 5px;
+  width: 400px;
+}
+
 #refQuery, #passage-popup, #modal-backdrop, #modal-container {
   display: none;
 }
@@ -260,4 +272,9 @@ textarea {
 #note-table a, #note-table a:active {
   color: var(--text);
   cursor: pointer;
+}
+
+#increaseFont:active, #decreaseFont:active {
+  background-color: var(--primary);
+  color: var(--background) !important;
 }/*# sourceMappingURL=styles.css.map */

assets/css/styles.css.map

@@ -1 +1 @@
-{"version":3,"sources":["styles.scss","styles.css"],"names":[],"mappings":"AAAQ,6BAAA;AACA,iCAAA;AACA,gCAAA;AACA,8BAAA;AAEA,oCAAA;AACA,gHAAA;AACR,0BAAA;AAEA;;;;;EAKE,2CAAA;EACA,8BAAA;ACDF;;ADIA;EACC,4BAAA;ACDD;;ADIA;EACC,qBAAA;EACA,UAAA;EACA,eAAA;EACA,iBAAA;ACDD;ADGC;EACC,qBAAA;EACA,UAAA;ACDF;ADIC;EACC,mBAAA;EACA,UAAA;ACFF;;ADMA;EACC,sBAAA;ACHD;;ADMA;EACE,8DAAA;EACA,mCAAA;EACA,kBAAA;EACA,SAAA;EACA,UAAA;ACHF;;ADMA;EACC,kBAAA;EACA,iCAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;ACHD;;ADKA;EACC,gBAAA;EACA,qBAAA;ACFD;;ADKA;EACE,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;EACA,eAAA;EACA,kBAAA;ACFF;;ADKA;;EAEC,qBAAA;EACA,wBAAA;EAEA,gBAAA;EAIA,qEAAA;EACA,6BAAA;EACA,oBAAA;EACA,SAAA;EACA,0CAAA;EACA,gCAAA;EACA,eAAA;EACA,qBAAA;EACA,iCAAA;EACA,gBAAA;EACA,gBAAA;EACA,WAAA;EACA,uBAAA;EACA,gBAAA;EACA,cAAA;EAGA,kBAAA;EACA,qBAAA;EACA,yBAAA;EACA,mBAAA;ACJD;;ADOA;EACC,gBAAA;ACJD;;ADOA;EACC,2CAAA;ACJD;;ADOA;EACC,yCAAA;ACJD;;ADOA;EAAkB,yBAAA;ACHlB;;ADKA;EACC,kBAAA;ACFD;ADIC;EACC,aAAA;EACA,sBAAA;EACA,kBAAA;EACA,0BAAA;EACA,YAAA;EACA,WAAA;EACA,gBAAA;ACFF;;ADMA;EACC,mBAAA;EAEA,cAAA;EACA,kBAAA;EAEA,+BAAA;EACA,mBAAA;EACA,0CAAA;EACA,UAAA;ACLD;ADQC;EACC,cAAA;ACNF;;ADUA;EACC,eAAA;EACA,mCAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;EACA,+BAAA;EACA,mBAAA;EACA,0CAAA;EACA,iBAAA;EACA,YAAA;ACPD;;ADUA;EACC,kBAAA;ACPD;;ADUA;EACC,sBAAA;ACPD;;ADUA;EACC,WAAA;ACPD;;ADUA;EACC,aAAA;EACA,UAAA;ACPD;;ADUA;EACC,qBAAA;ACPD;;ADUA,sBAAA;AACA;EACC,kBAAA;ACPD;;ADWA;EACC,mCAAA;EACA,kBAAA;ACRD;ADUC;EACC,gCAAA;EACA,kBAAA;ACRF;;ADYA,kBAAA;AACA,2CAAA;AACA;EACE,kBAAA;EACA,qBAAA;EACA,WAAA;EACA,YAAA;ACTF;;ADYA,+BAAA;AACA;EACE,UAAA;EACA,QAAA;EACA,SAAA;ACTF;;ADYA,eAAA;AACA;EACE,kBAAA;EACA,eAAA;EACA,MAAA;EACA,OAAA;EACA,QAAA;EACA,SAAA;EACA,sBAAA;EAEA,gBAAA;ACTF;;ADYA;EACE,kBAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,SAAA;EACA,WAAA;EACA,uBAAA;EAEA,gBAAA;ACTF;;ADYA;EACE,gCAAA;ACTF;;ADYA;EACE,kCAAA;ACTF;;ADYA;EAGE,2BAAA;ACTF;;ADYA,oBAAA;AACA;EACE,mBAAA;ACTF;;ADYA;EACE,kBAAA;ACTF;;ADYA;EACC,aAAA;ACTD;;ADYA;EACE,iBAAA;ACTF;;ADYA;EACC,mBAAA;ACTD;;ADYA;EACC,kBAAA;EACA,eAAA;ACTD","file":"styles.css"}
+{"version":3,"sources":["styles.scss","styles.css"],"names":[],"mappings":"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","file":"styles.css"}

assets/css/styles.scss

@@ -147,6 +147,10 @@ button.button i {
 	h2 {
 		display: block;
 	}
+
+	& a {
+		color: var(--primary);
+	}
 }
 
 #refQuery {
@@ -263,6 +267,15 @@ input:checked + .slider:before {
   border-radius: 50%;
 }
 
+#passage-popup {
+	position: absolute;
+	z-index: 1000;
+	background-color: var(--background);
+	border: solid 2px var(--border);
+	border-radius: 5px;
+	width: 400px;
+}
+
 #refQuery, #passage-popup, #modal-backdrop, #modal-container {
 	display: none;
 }
@@ -278,4 +291,9 @@ textarea {
 #note-table a, #note-table a:active {
 	color: var(--text);
 	cursor: pointer;
+}
+
+#increaseFont:active, #decreaseFont:active {
+	background-color: var(--primary);
+	color: var(--background) !important;
 }

assets/js/note.js

@@ -198,7 +198,7 @@ export function validateNote() {
  * @return {void} This function does not return anything.
  */
 export function newNote() {
-    notes = document.querySelector('#notes');
+    var notes = document.querySelector('#notes');
     notes.text = '';
     notes.value = '';
     state.references = {};
@@ -230,7 +230,7 @@ export function newNote() {
  * @return {void} No explicit return value.
  */
 export function saveNote(event) {
-    console.debug('called saveNote '+new Date());
+    //console.debug('called saveNote '+new Date());
     if (event) {
         event.preventDefault();
     }
@@ -354,7 +354,7 @@ export function findRefLinks() {
                     showPassage(
                         e,
                         "<button onclick='note.closePopup()'>Close</button>&nbsp;&nbsp;" +
-                        "<button onclick=\"ref.queryRef('bible', '" + book + "', '" + cv + "')\">Open Ref</button><br/>" +
+                        "<button onclick=\"ref.queryRef(event, 'bible', '" + book + "', '" + cv + "')\">Open Ref</button><br/>" +
                         result);
                 });
         });
@@ -401,7 +401,7 @@ export function findLinks() {
                     showPassage(
                         e,
                         "<button onclick='note.closePopup()'>Close</button>&nbsp;&nbsp;" +
-                        "<button onclick=\"ref.queryRef('bible', '" + book + "', '" + cv + "')\">Open Ref</button><br/>" +
+                        "<button onclick=\"ref.queryRef(event, 'bible', '" + book + "', '" + cv + "')\">Open Ref</button><br/>" +
                         result);
                 });
         });
@@ -419,7 +419,7 @@ export function showPassage(event, text) {
     // Create a new div element for the popup
     const popup = document.querySelector('#passage-popup');
     popup.innerHTML = state.md.render(text);
-
+    
     // Position the popup relative to the cursor
     let x = event.clientX + window.scrollX;
     let y = event.clientY + window.scrollY;
@@ -428,6 +428,7 @@ export function showPassage(event, text) {
     popup.style.top = `${y}px`;
     popup.style.left = `${x}px`;
     popup.style.display = 'block';
+    popup.style.position = 'absolute';
 }
 
 /**

assets/js/reference.js

@@ -1,6 +1,6 @@
 import { state } from './state.js';
 import { closeRef, makeButton } from './home.js';
-import { saveNote, findRefLinks } from './note.js';
+import { saveNote, findRefLinks, closePopup } from './note.js';
 
 /**
  * Retrieves the reference type from the server and populates the reference series dropdown.
@@ -282,6 +282,7 @@ export function queryRef(e, type = null, book = null, input = null) {
             state.references[results.title] = results.text;
 
             closeRef();
+            closePopup();
 
             state.saved = false;
             state.textDirty = true;

composer.lock

@@ -8230,16 +8230,16 @@
     "packages-dev": [
         {
             "name": "masterminds/html5",
-            "version": "2.10.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fd5018f6815fff903946d0564977b44ce8010e29",
-                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
+                "reference": "fd5018f6815fff903946d0564977b44ce8010e29",
                 "shasum": ""
             },
             "require": {
@@ -8247,7 +8247,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9 || ^10"
             },
             "type": "library",
             "extra": {
@@ -8291,9 +8291,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.1"
             },
-            "time": "2025-07-25T09:04:22+00:00"
+            "time": "2026-06-23T18:43:15+00:00"
         },
         {
             "name": "myclabs/deep-copy",

config/packages/doctrine.yaml

@@ -16,6 +16,7 @@ doctrine:
 
     orm:
         auto_generate_proxy_classes: true
+        enable_native_lazy_objects: true
         enable_lazy_ghost_objects: true
         # report_fields_where_declared: true
         # validate_xml_mapping: true

config/routes/framework.yaml

@@ -1,4 +1,4 @@
 when@dev:
     _errors:
-        resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+        resource: '@FrameworkBundle/Resources/config/routing/errors.php'
         prefix: /_error

config/routes/web_profiler.yaml

@@ -1,8 +1,8 @@
 when@dev:
     web_profiler_wdt:
-        resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+        resource: '@WebProfilerBundle/Resources/config/routing/wdt.php'
         prefix: /_wdt
 
     web_profiler_profiler:
-        resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+        resource: '@WebProfilerBundle/Resources/config/routing/profiler.php'
         prefix: /_profiler

src/Controller/AjaxController.php

@@ -262,7 +262,7 @@ class AjaxController extends AbstractController
         $user = $this->getUser();
         $res = new Response();
         $data = json_decode($req->getContent());
-        $note = $emi->getRepository(Note::class)->findNote($data->query, $user->getId()->toBinary());
+        $note = $emi->getRepository(Note::class)->findNote($data->query, $user);
         $res->setContent(json_encode($note));
 
         return $res;

src/Controller/RegistrationController.php

@@ -2,6 +2,7 @@
 
 namespace App\Controller;
 
+use App\Entity\MetaData;
 use App\Entity\User;
 use App\Form\RegistrationFormType;
 use App\Utils\Utils;
@@ -42,6 +43,14 @@ class RegistrationController extends AbstractController
                 )
             );
             $user->setRoles($role);
+            $user->setMetaData([
+                'saveInterval' => 30,
+                'saveReferences' => true,
+                'noteTextSize' => 14,
+                'trackSaveSize' => false,
+                'saveTimeout' => 10,
+                'saveFailureCount' => 3,
+            ]);
 
             $entityManager->persist($user);
             $entityManager->flush();
@@ -51,7 +60,7 @@ class RegistrationController extends AbstractController
             return $this->redirectToRoute('app_home');
         }
         else {
-            dd($form);
+            //dd($form);
         }
 
         return $this->render('registration/register.html.twig', [

src/Repository/NoteRepository.php

@@ -25,7 +25,7 @@ class NoteRepository extends ServiceEntityRepository
 
         $ret = $this->createQueryBuilder('n')
             ->where('n.user = :user')
-            ->setParameter('user', $user->getId()->toBinary())
+            ->setParameter('user', $user->getId(), 'uuid')
             ->orderBy('n.date', 'DESC')
             ->getQuery()
             ->getResult();
@@ -40,7 +40,7 @@ class NoteRepository extends ServiceEntityRepository
         }
         $ret = $this->createQueryBuilder('n')
             ->where('n.user = :user')
-            ->setParameter('user', $user->getId()->toBinary())
+            ->setParameter('user', $user->getId(), 'uuid')
             ->orderBy('n.date', 'DESC')
             ->setMaxResults(4)
             ->getQuery()
@@ -49,7 +49,7 @@ class NoteRepository extends ServiceEntityRepository
         return $ret;
     }
 
-    public function findNote(string $query, string $userId): array
+    public function findNote(string $query, User $user): array
     {
         $ret = $this->createQueryBuilder('n')
             ->where('n.title LIKE :query')
@@ -57,7 +57,7 @@ class NoteRepository extends ServiceEntityRepository
             ->orWhere('n.text LIKE :query')
             ->andWhere('n.user = :user')
             ->setParameter('query', "%{$query}%")
-            ->setParameter('user', $userId)
+            ->setParameter('user', $user->getId(), 'uuid')
             ->orderBy('n.date', 'DESC')
             ->setMaxResults(3)
             ->getQuery()

src/Repository/ReferenceRepository.php

@@ -25,13 +25,13 @@ class ReferenceRepository extends ServiceEntityRepository
             ->getResult();
     }
 
-    public function findHeidelberg($ref): array|Reference
+    public function findHeidelberg(string $ref): array|Reference
     {
         if (substr($ref, 0, 2) == 'ld') {
             $num = substr($ref, 2);
             $qb = $this->createQueryBuilder('r');
             $r = $qb->where($qb->expr()->like('r.label', ':ld'))
-                ->setParameter('ld', "ld{$num}-%")
+                ->setParameter('ld', "LD{$num}-%")
                 ->getQuery()
                 ->getResult()
             ;
@@ -39,7 +39,7 @@ class ReferenceRepository extends ServiceEntityRepository
             $num = substr($ref, 2);
             $qb = $this->createQueryBuilder('r');
             $r = $qb->where($qb->expr()->like('r.label', ':hc'))
-                ->setParameter('hc', "%-hc{$num}")
+                ->setParameter('hc', "%-HC{$num}")
                 ->getQuery()
                 ->getResult()
             ;

templates/default/cheat-sheet.html.twig

@@ -27,7 +27,7 @@
 <div style='padding-left:5px;'>
 <h1>Markdown Cheat Sheet</h1>
 
-<p>The following was provided by <a href='https://www.markdownguide.com'>The Markdown Guid</a></p>
+<p>The following was provided by <a href='https://www.markdownguide.com'>The Markdown Guide</a></p>
 
 <p> This Markdown cheat sheet provides a quick overview of all the Markdown syntax elements.  It can't cover every edge case, so if you need more information about any of these elements, refere to the reference guides for <a href='//www.markdownguide.org/basic-syntax/'>basic syntax</a> and </a href='//www.markdownguide.org/extended-syntax/'>extended syntax</a>.</p>
 

templates/editors/reference-editor.html.twig

@@ -2,17 +2,17 @@
 <html>
     <head>
         <title>Reference Editor</title>
+        {{ importmap('app') }}
+
         <script type='module'>
-            import {setHeight, setBooks, setEventListeners} from "{{ asset('js/home.js') }}";
+            import {setBooks, setEventListeners} from "{{ asset('js/home.js') }}";
-            import {retrieveReference, retrieveReferenceType, saveReference} from '{{ asset("js/reference.js") }}';
+            import * as ref from "{{ asset('js/reference.js') }}";
-            window.retrieveReference = retrieveReference;
+            window.ref = ref;
-            window.retrieveReferenceType = retrieveReferenceType;
-            window.saveReference = saveReference;
         </script>
     </head>
 
     <body>
-        <select id='referenceTypes' onchange='retrieveReferenceType(this)'>
+        <select id='referenceTypes' onchange='ref.retrieveReferenceType(this)'>
             <option value=''>-- Select Reference --</option>
             <option value='new'>-- Insert New --</option>
             <option value='creed'>Creed</option>
@@ -29,10 +29,10 @@
             <option value='39a'>Thirty-Nine Articles</option>
             <option value='lbc'>London Baptist Confession</option>
         </select>&nbsp;&nbsp;
-        <select id='referenceSeries' onchange='retrieveReference(this)'>
+        <select id='referenceSeries' onchange='ref.retrieveReference(this)'>
         </select>&nbsp;&nbsp;
         <input type='text' name='name' id='refName' style='display:none;' />&nbsp;&nbsp;
-        <button id='save' name='save' onclick='saveReference()'>Save</button>
+        <button id='save' name='save' onclick='ref.saveReference()'>Save</button>
         <a href='/home'>Back</a><br />
 
         <textarea id='reference' name='reference' rows=45 cols=100></textarea>

templates/editors/template-editor.html.twig

@@ -20,8 +20,8 @@
             <textarea id='template_value' name='template' wrap='hard' cols=100 rows=45></textarea>
         </form>
 
-        <script src='{{ asset("js/script.js") }}'></script>
         <script type='module'>
+            import * as state from "{{ asset('js/state.js') }}";
             import {retrieveTemplate, saveTemplate} from "{{ asset('js/template.js') }}";
             window.retrieveTemplate = retrieveTemplate;
             window.saveTemplate = saveTemplate;