changement de format des url et correction cases à cocher

launch.bash

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+cargo run -- --port 9090 --root https://vscode.cheeze.fr/proxy/9090/

src/commons.rs

@@ -12,7 +12,7 @@ impl NormalizeName for String {
 
     fn normalize_name(&self) -> String {
         let space_re = Regex::new(r"[\s_]+").unwrap();
-        let remove_re = Regex::new(r"[^a-z0-9_]").unwrap();
+        let remove_re = Regex::new(r"[^a-z0-9_\-]").unwrap();
 
         let mut str = unidecode(self);
         str = space_re.replace_all(&str, "_").to_string();

src/page.rs

@@ -26,6 +26,7 @@ struct QueryParams {
     pub data: Option<String>,
     pub fromDomain: Option<String>,
     pub fromPage: Option<String>,
+    pub libelle: Option<String>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -53,12 +54,17 @@ fn new_page_text(
     page_name: String,
     domain_from: &Option<String>,
     page_from: &Option<String>,
+    libelle: &Option<String>,
 ) -> String {
     let mut retour = String::from("");
     if let (Some(domain_f), Some(page_f)) = (domain_from, page_from) {
-        retour = format!("[retour](/{}/{})\n", domain_f, page_f);
+        retour = format!("[retour]({}:{})\n", domain_f, page_f);
     }
-    retour + "# " + page_name.replace("_", " ").as_str()
+    let mut titre = page_name.replace("_", " ");
+    if let Some(lib) = libelle {
+        titre = lib.to_string();
+    }
+    retour + "# " + titre.as_str()
 }
 
 async fn get_data(
@@ -71,12 +77,12 @@ async fn get_data(
         db::get_page_by_name(&data.db_pool, domain.to_owned(), page_name.to_owned());
     let page_datas = fut_page_datas.await.unwrap();
     match page_datas.first() {
-        None => new_page_text(page_name, &params.fromDomain, &params.fromPage),
+        None => new_page_text(page_name, &params.fromDomain, &params.fromPage, &params.libelle),
         Some(dat) => (*dat.page_text).to_string(),
     }
 }
 
-#[get("/{domain}/{page}")]
+#[get("/{domain}:{page}")]
 async fn page(
     path: web::Path<(String, String)>,
     data: web::Data<AppData>,
@@ -99,7 +105,7 @@ async fn page(
     let app_name = data.app_name.to_owned() + " - " + page_name.as_str();
     let base_url = data.base_url.to_owned();
     //let init = String::from("init();");
-    let init = format!("init({:?}, {:?});", domain, page_name);
+    let init = format!("init({:?}, {:?}, {:?});", domain, base_url, page_name);
     PageTemplate {
         app_name,
         base_url,
@@ -109,7 +115,7 @@ async fn page(
     .to_response()
 }
 
-#[put("/{domain}/{page}")]
+#[put("/{domain}:{page}")]
 async fn save_page(
     body: String,
     path: web::Path<(String, String)>,

static/cheezenotes.css

@@ -40,7 +40,12 @@ body {
 
 p.domain {
   padding-left: 2rem;
-  font-size: 2rem;
+  font-size: 1.5rem;
+}
+
+p.page {
+  padding-left: 2rem;
+  font-size: 1.5rem;
 }
 
 div#content {

static/modules/cheezenotes.js

@@ -156,6 +156,10 @@ function onedit(e) {
     let line = ret[0];
     let position = ret[1];
 
+    if (! line) {
+        return;
+    }
+
     if (line.innerText == '\n') {
         line.className = 'cheezenotes_line';
         line.classList.add('body');
@@ -360,10 +364,11 @@ function onparentbutton(e) {
 
 }
 
-function init(domain, page) {
+function init(domain, base_url, page) {
     let cheezenotes = document.getElementById('cheezenotes');
     window.domain = domain;
     window.page = page;
+    window.base_url = base_url;
 
     dpwidth(cheezenotes);
 

static/modules/md.js

@@ -1,11 +1,12 @@
 import { saveSelection, loadSelection } from "./caret.js";
-import { normalizePagename } from "./tools.js";
+import { normalizeName } from "./tools.js";
 
 function setEditable() {
     let editModeButton = document.getElementById('editModeButton');
     let cheezenotes = document.getElementById('cheezenotes');
     if (editModeButton.classList.contains('buttonoff')) {
         cheezenotes.contentEditable = false;
+        window.getSelection().removeAllRanges();
     } else {
         cheezenotes.contentEditable = true;
     }
@@ -94,6 +95,7 @@ function onlinkin(e) {
     let link = e.currentTarget;
     if (document.getElementById('cheezenotes') !== document.activeElement) {
         document.getElementById('cheezenotes').contentEditable = false;
+        window.getSelection().removeAllRanges();
     }
 }
 
@@ -103,10 +105,11 @@ function onlink(e) {
         e.preventDefault();
         setEditable();
         let link = e.currentTarget;
-        if (link.host !== document.location.host) {
+        let datahref = link.getAttribute('data-href');
+        if (datahref.includes('/')) {
             open(link.href);
         } else {
-            fetch(link.href + '?data=&fromDomain=' + window.domain + '&fromPage=' + window.page).then((response) => {
+            fetch(link.href + '?data=&fromDomain=' + window.domain + '&fromPage=' + window.page + '&libelle=' + link.innerText).then((response) => {
                 let ta = document.getElementById('ta');
                 response.text().then((data) => {
                     let content = document.getElementById('content');
@@ -114,9 +117,9 @@ function onlink(e) {
                     let top = content.scrollTop;
                     window.history.replaceState({ top: top, left: left }, "");
                     window.history.pushState({}, "", link.href);
-                    document.title = 'CheezeNotes - ' + link.getAttribute('data-href');
+                    document.title = 'CheezeNotes - ' + datahref;
                     ta.value = data;
-                    let url = link.getAttribute('data-href').split('/');
+                    let url = datahref.split(':');
                     let page = url[0];
                     let domain = window.domain;
                     if (url.length == 3) {
@@ -145,7 +148,19 @@ function onlinkout(e) {
     }
 }
 
+function onclickcheckbox(e) {
+    let cheezenotes = document.getElementById('cheezenotes');
+    cheezenotes.contentEditable = false;
+    window.getSelection().removeAllRanges();
+    console.log("onclickcheckbox");
+}
+
 function oncheckbox(e) {
+    /*let cheezenotes = document.getElementById('cheezenotes');
+    cheezenotes.contentEditable = false;
+    window.getSelection().removeAllRanges();*/
+    console.log("oncheckbox");
+
     let cb = e.currentTarget;
     let line = cb.parentNode;
     let text = line.innerText;
@@ -270,6 +285,7 @@ function formatLine(line) {
     for (let i = 0; i < checkboxes.length; i++) {
         let checkbox = checkboxes[i];
         checkbox.addEventListener('mouseover', onlinkin);
+        checkbox.addEventListener('click', onclickcheckbox);
         checkbox.addEventListener('change', oncheckbox);
         checkbox.addEventListener('mouseout', onlinkout);
     }
@@ -581,16 +597,26 @@ function formatLink(link) {
     if (href == '') {
         href = libelle;
     }
-    if (href.match(/^[^\:\/]+\/.*$/)) {
-        href = '/' + href;
+    let datahref = href;
+
+    if (href.match(/\:\/\//)) {
+        datahref = href;
+    } else {
+        let dh = datahref.split(':');
+        if (dh.length === 1) {
+            datahref = window.domain + ":" + datahref;
+        }
+        datahref = normalizeName(datahref);
+        href = window.base_url + datahref;
     }
+
     if (libelle == '') {
-        return '<span class="token">[](</span><a class="link" data-href="' + href + '" href="' + href + '">' + url + '</a><span class="token">)</span>';
+        return '<span class="token">[](</span><a class="link" data-href="' + datahref + '" href="' + href + '">' + url + '</a><span class="token">)</span>';
     } else {
         if (libelle.startsWith('!')) {
             return '<span class="token">[' + libelle + '</span><img style="vertical-align: top; max-height: 1rem;" class="image" src="' + href + '" title="' + libelle.substring(1) + '" /><span class="token">](' + url + ')</span>';
         } else {
-            return '<span class="token">[</span><a class="link" data-href="' + href + '" href="' + href + '">' + libelle + '</a><span class="token">](' + url + ')</span>';
+            return '<span class="token">[</span><a class="link" data-href="' + datahref + '" href="' + href + '">' + libelle + '</a><span class="token">](' + url + ')</span>';
         }
     }
 }

static/modules/tools.js

@@ -1,6 +1,6 @@
 
-function normalizeName(pagename) {
-    return str.normalize("NFKD").replace(/\p{Diacritic}/gu, "").toLowerCase().replace(/œ/g, "oe").replace(/æ/g, "ae").replace(/\s+/g, "_").replace(/[^a-z0-9_]/g, "").replace(/_+/g, "_");
+function normalizeName(name) {
+    return name.normalize("NFKD").replace(/\p{Diacritic}/gu, "").toLowerCase().replace(/œ/g, "oe").replace(/æ/g, "ae").replace(/[\s_]+/g, "_").replace(/[^a-z0-9_\-:]/g, "");
 }
 
 export { normalizeName };

templates/domain.html

@@ -12,8 +12,9 @@
     </head>
     <body>
         <h1>{{app_name}} {{ domain }}</h1>
+        <h2>Liste des pages</h2>
         {% for page in pages %}
-        <p class="page"><a href="{{ base_url|safe }}{{ page.domain }}/{{ page.page_name }}">{{ page.page_name }}</a></p>
+        <p class="page"><a href="{{ base_url|safe }}{{ page.domain }}:{{ page.page_name }}">{{ page.page_name }}</a></p>
         {% endfor %}
     </body>
 </html>

templates/index.html

@@ -12,6 +12,7 @@
     </head>
     <body>
         <h1>{{app_name}}</h1>
+        <h2>Liste des domaines</h2>
         {% for domain in domains %}
         <p class="domain"><a href="{{ base_url|safe }}{{ domain.domain }}">{{ domain.domain_name }}</a></p>
         {% endfor %}