corrections diverses

Cargo.lock

@@ -518,6 +518,7 @@ dependencies = [
  "rusqlite",
  "serde",
  "serde_json",
+ "uuid 1.3.0",
 ]
 
 [[package]]
@@ -2431,6 +2432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
 dependencies = [
  "getrandom",
+ "rand",
  "serde",
 ]
 

Cargo.toml

@@ -9,6 +9,8 @@ edition = "2021"
 
 clap = { version = "4.0.18", features = ["derive"] }
 
+uuid = {version = "1.3.0", features=["v4", "fast-rng"]}
+
 actix-web = "4"
 actix-files = "0.6.2"
 actix-session = { version = "0.7.2", features = ["cookie-session"] }

db/db.sql

@@ -4,4 +4,8 @@ create table pages (
     page_text text,
     active boolean default true not null,
     primary key (domain, page_name)
+);
+
+create table pages_histo (
+    
 );

src/commons.rs

@@ -29,7 +29,7 @@ impl Arguments {
 
 #[derive(Clone)]
 pub struct AppData {
-    pub name: String,
-    pub root: String,
-    pub pool: Pool<SqliteConnectionManager>,
+    pub app_name: String,
+    pub base_url: String,
+    pub db_pool: Pool<SqliteConnectionManager>,
 }

src/db.rs

@@ -1,9 +1,16 @@
 use actix_web::{error, web, Error};
 use serde::{Deserialize, Serialize};
+use uuid::Uuid;
 
 pub type Pool = r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>;
 pub type Connection = r2d2::PooledConnection<r2d2_sqlite::SqliteConnectionManager>;
 
+#[allow(unused)]
+fn uuid4() -> String {
+    let id = Uuid::new_v4();
+    id.to_string()
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Page {
     pub domain: String,
@@ -11,7 +18,38 @@ pub struct Page {
     pub page_text: String,
 }
 
-pub async fn get_page_by_name(pool: &Pool, domain: String, pagename: String) -> Result<Vec<Page>, Error> {
+pub struct Domain {
+    pub domain: String,
+    pub domain_name: String,
+}
+
+pub async fn get_domains(pool: &Pool) -> Result<Vec<Domain>, Error> {
+    let pool = pool.clone();
+
+    let conn = web::block(move || pool.get())
+        .await?
+        .map_err(error::ErrorInternalServerError)?;
+    web::block(move || {
+        let mut stmt = conn
+            .prepare("SELECT distinct domain, REPLACE(domain, '_', ' ') from pages WHERE active=true order by domain")?;
+
+        stmt.query_map([], |row| {
+            Ok(Domain {
+                domain: row.get(0)?,
+                domain_name: row.get(1)?,
+            })
+        })
+        .and_then(Iterator::collect)
+    })
+    .await?
+    .map_err(error::ErrorInternalServerError)
+}
+
+pub async fn get_page_by_name(
+    pool: &Pool,
+    domain: String,
+    pagename: String,
+) -> Result<Vec<Page>, Error> {
     let pool = pool.clone();
 
     let conn = web::block(move || pool.get())
@@ -35,7 +73,12 @@ pub async fn get_page_by_name(pool: &Pool, domain: String, pagename: String) ->
     .map_err(error::ErrorInternalServerError)
 }
 
-pub async fn update_page(pool: &Pool, domain: String, page_name: String, page_text: String) -> Result<usize, Error> {
+pub async fn update_page(
+    pool: &Pool,
+    domain: String,
+    page_name: String,
+    page_text: String,
+) -> Result<usize, Error> {
     let pool = pool.clone();
 
     let conn = web::block(move || pool.get())

src/index.rs

@@ -5,17 +5,23 @@ use askama_actix::Template;
 use askama_actix::TemplateToResponse;
 
 use crate::commons::AppData;
+use crate::db;
+use crate::db::Domain;
 
 #[derive(Template)]
 #[template(path = "index.html")]
 pub struct PageTemplate {
-    pub name: String,
-    pub root: String,
+    pub app_name: String,
+    pub base_url: String,
+    pub domains: Vec<Domain>,
 }
 
 #[get("/")]
 async fn index(data: web::Data<AppData>) -> impl Responder {
-    let name = data.name.to_owned();
-    let root = data.root.to_owned();
-    PageTemplate { name, root }.to_response()
+    let app_name = data.app_name.to_owned();
+    let base_url = data.base_url.to_owned();
+
+    let domains = db::get_domains(&data.db_pool).await.unwrap();
+
+    PageTemplate { app_name, base_url, domains }.to_response()
 }

src/main.rs

@@ -14,16 +14,16 @@ async fn main() -> std::io::Result<()> {
 
     let ip = args.ip;
     let port = args.port;
-    let root = args.root;
+    let base_url = args.root;
     let db = args.db;
 
     let manager = SqliteConnectionManager::file(db);
     let pool = Pool::new(manager).unwrap();
 
     let appdata = AppData {
-        name: String::from("CheezeNotes"),
-        root,
-        pool: pool.clone(),
+        app_name: String::from("CheezeNotes"),
+        base_url,
+        db_pool: pool.clone(),
     };
 
     HttpServer::new(move || {

src/page.rs

@@ -1,4 +1,5 @@
 use actix_web::http::header::ContentType;
+use actix_web::web::Query;
 use actix_web::{get, put, Responder};
 use actix_web::{web, HttpResponse};
 use serde::Deserialize;
@@ -12,36 +13,49 @@ use crate::db;
 #[derive(Template)]
 #[template(path = "page.html")]
 pub struct PageTemplate {
-    pub name: String,
-    pub root: String,
+    pub app_name: String,
+    pub base_url: String,
     pub md: String,
     pub init: String,
 }
 
 #[derive(Debug, Deserialize)]
+#[allow(non_snake_case)]
 struct QueryParams {
     pub data: Option<String>,
+    pub fromDomain: Option<String>,
+    pub fromPage: Option<String>,
 }
 
-async fn get_data(data: & web::Data<AppData>, domain: String, page_name: String) -> String {
-    let fut_page_datas = db::get_page_by_name(&data.pool, domain.to_owned(), page_name.to_owned());
+fn new_page_text(page_name: String, domain_from: &Option<String>, page_from: &Option<String>) -> String {
+    let mut retour = String::from("");
+    if let Some(domain_f) = domain_from {
+        if let Some(page_f) = page_from {
+            retour = format!("[retour](/{}/{})\n", domain_f, page_f);
+        }
+    }
+    retour + "# " + page_name.replace("_", " ").as_str()
+}
+
+async fn get_data(data: &web::Data<AppData>, domain: String, page_name: String, params: &Query<QueryParams>) -> String {
+    let fut_page_datas = 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 => String::from("# ") + page_name.replace("_", " ").as_str(),
+        None => new_page_text(page_name, &params.fromDomain, &params.fromPage),
         Some(dat) => (*dat.page_text).to_string(),
     }
 }
 
 #[get("/{domain}/{page}")]
 async fn page(
-    path: web::Path<(String, String,)>,
+    path: web::Path<(String, String)>,
     data: web::Data<AppData>,
     params: web::Query<QueryParams>,
 ) -> impl Responder {
     let domain = &path.0;
     let page_name = &path.1;
 
-    let md = get_data(&data, domain.to_owned(), page_name.to_owned()).await;
+    let md = get_data(&data, domain.to_owned(), page_name.to_owned(), &params).await;
 
     match &params.data {
         Some(_) => {
@@ -52,13 +66,13 @@ async fn page(
         None => {}
     }
 
-    let name = data.name.to_owned() + " - " + page_name.as_str();
-    let root = data.root.to_owned();
+    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();");
+    let init = format!("init({:?}, {:?});", domain, page_name);
     PageTemplate {
-        name,
-        root,
+        app_name,
+        base_url,
         md,
         init,
     }
@@ -76,7 +90,7 @@ async fn save_page(
     if pagename == "index" {
         return HttpResponse::Ok();
     }
-    db::update_page(&data.pool, domain.to_owned(), pagename.to_owned(), body)
+    db::update_page(&data.db_pool, domain.to_owned(), pagename.to_owned(), body)
         .await
         .unwrap();
     HttpResponse::Ok()

static/cheezenotes.css

@@ -35,6 +35,11 @@ body {
   background-color: #dddddd;
 }
 
+p.domain {
+  padding-left: 2rem;
+  font-size: 2rem;
+}
+
 div#content {
   position: absolute;
   margin: 0;
@@ -47,9 +52,11 @@ div#content {
 }
 
 div#margindiv {
-  max-width: 1200px;
+  /*max-width: 1600px;
   margin-left: auto;
-  margin-right: auto;
+  margin-right: auto;*/
+  margin-left: .5rem;
+  margin-right: .5rem;
   top: 0;
   bottom: 0;
 }
@@ -60,8 +67,8 @@ div#cheezenotes {
   margin-top: 0;
   margin-bottom: 3rem;
   padding-top: 1rem;
-  padding-left: 3rem;
-  padding-right: 3rem;
+  padding-left: 1rem;
+  padding-right: 1rem;
   padding-bottom: 1rem;
   background-color: #ffffff;
   min-height: 100%;
@@ -79,9 +86,11 @@ div#buttons {
   top: 0;
   left: 0;
   right: 0;
+  /*margin-left: .5rem;
+  margin-right: .5rem;
   margin-left: auto;
   margin-right: auto;
-  max-width: 1200px;
+  max-width: 1600px;*/
 }
 
 div#buttons button.button {
@@ -142,9 +151,11 @@ div#buttons #lockButtonLabel {
 }
 
 div.ta { 
-  margin-left: auto;
+  margin-left: .5rem;
+  margin-right: .5rem;
+  /*margin-left: auto;
   margin-right: auto;
-  max-width: 1200px;
+  max-width: 1600px;*/
 }
 
 textarea#ta {
@@ -171,6 +182,10 @@ div#cheezenotes:focus {
   outline: none;
 }
 
+div#cheezenotes input.checkbox {
+  vertical-align: bottom;
+}
+
 div#cheezenotes div.line {
   border-bottom: 1px solid #dddddd;
   padding-top: 0rem;

static/modules/cheezenotes.js

@@ -356,8 +356,10 @@ function onpopstate(e) {
     }).catch((error) => { alert(error); });
 }
 
-function init() {
+function init(domain, page) {
     let cheezenotes = document.getElementById('cheezenotes');
+    window.domain = domain;
+    window.page = page;
 
     dpwidth(cheezenotes);
 

static/modules/md.js

@@ -104,7 +104,7 @@ function onlink(e) {
         if (link.host !== document.location.host) {
             open(link.href);
         } else {
-            fetch(link.href + "?data=").then((response) => {
+            fetch(link.href + '?data=&fromDomain=' + window.domain + '&fromPage=' + window.page).then((response) => {
                 let ta = document.getElementById('ta');
                 response.text().then((data) => {
                     let content = document.getElementById('content');
@@ -114,6 +114,15 @@ function onlink(e) {
                     window.history.pushState({}, "", link.href);
                     document.title = 'CheezeNotes - ' + link.getAttribute('data-href');
                     ta.value = data;
+                    let url = link.getAttribute('data-href').split('/');
+                    let page = url[0];
+                    let domain = window.domain;
+                    if (url.length == 3) {
+                        domain = url[1];
+                        page = url[2];
+                    }
+                    window.domain = domain;
+                    window.page = page;
                     load(document.getElementById('ta'), cheezenotes);
 
                     /*let editModeButton = document.getElementById('editModeButton');
@@ -198,6 +207,14 @@ function formatLine(line) {
         token = /^(\s*>(\s|$))/i;
         elem.classList.add('bq1');
         elem.classList.add('bq');
+    } else if (line.match(/^\s*\[[xXvV]?\]\s+/i)) {
+        //token = /^(\s*\[[xXvV]?\]\s+)/i;
+        let checked = '';
+        if (line.match(/^\s*\[[xXvV]\]\s+/i)) {
+            checked = ' checked="checked"';
+        }
+        line = line.replace(/^(\s*\[[xXvV]?\]\s+)/i, '<input class="checkbox" type="checkbox"' + checked + '><span class="token">$1</span></input>')
+        elem.classList.add('checkbox');
     } else {
         elem.classList.add('body');
     }
@@ -534,12 +551,37 @@ function addLink(line, listLink) {
     return line;
 }
 
-function formatLink(line) {
-    line = line.replace(/(\[!([^\]]*?)\]\(([^\)]+?)\))/ig, '<span class="token">[!</span><img style="vertical-align: top; max-height: 1rem;" class="image" src="$3">$2</img><span class="token">]($3)</span>');
-    line = line.replace(/(\[([^\]]+?)\]\(([^\)]+?)\))/ig, '<span class="token">[</span><a class="link" data-href="$3" href="$3">$2</a><span class="token">]($3)</span>');
-    line = line.replace(/(\[([^\]]+?)\]\(\))/ig, '<span class="token">[</span><a class="link" data-href="$2" href="$2">$2</a><span class="token">]()</span>');
-    line = line.replace(/(\[\]\(([^\)]+?)\))/ig, '<span class="token">[](</span><a class="link" data-href="$2" href="$2">$2</a><span class="token">)</span>');
-    return line;
+/*function formatLink(link) {
+    link = link.replace(/(\[!([^\]]*?)\]\(([^\)]+?)\))/i, '<span class="token">[!</span><img style="vertical-align: top; max-height: 1rem;" class="image" src="$3">$2</img><span class="token">]($3)</span>');
+    link = link.replace(/(\[([^\]]+?)\]\(([^\)]+?)\))/i, '<span class="token">[</span><a class="link" data-href="$3" href="$3">$2</a><span class="token">]($3)</span>');
+    link = link.replace(/(\[([^\]]+?)\]\(\))/i, '<span class="token">[</span><a class="link" data-href="$2" href="$2">$2</a><span class="token">]()</span>');
+    link = link.replace(/(\[\]\(([^\)]+?)\))/i, '<span class="token">[](</span><a class="link" data-href="$2" href="$2">$2</a><span class="token">)</span>');
+    return link;
+}*/
+
+function formatLink(link) {
+    let matches = link.match(/\[(.*)\]\((.*)\)/);
+    let libelle = matches[1];
+    let url = matches[2];
+    if (url == '' && libelle == '') {
+        return link;
+    }
+    let href = url;
+    if (href == '') {
+        href = libelle;
+    }
+    if (href.match(/^[^\:\/]+\/.*$/)) {
+        href = '/' + href;
+    }
+    if (libelle == '') {
+        return '<span class="token">[](</span><a class="link" data-href="' + href + '" 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>';
+        }
+    }
 }
 
 function addBold(line) {

templates/index.html

@@ -7,10 +7,13 @@
         <meta name="apple-mobile-web-app-capable" content="yes">
         <meta name="mobile-web-app-capable" content="yes">
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
-        <title>{{name}}</title>
-        <link rel="stylesheet" href="{{ root|safe }}static/cheezenotes.css">
+        <title>{{app_name}}</title>
+        <link rel="stylesheet" href="{{ base_url|safe }}static/cheezenotes.css">
     </head>
     <body>
-        <h1></h1>
+        <h1>{{app_name}}</h1>
+        {% for domain in domains %}
+        <p class="domain"><a href="{{ base_url|safe }}{{ domain.domain }}">{{ domain.domain_name }}</a></p>
+        {% endfor %}
     </body>
 </html>

templates/page.html

@@ -9,9 +9,9 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <title>{{name}}</title>
-    <link rel="stylesheet" href="{{ root|safe }}static/cheezenotes.css">
-    <script type="module" src="{{ root|safe }}static/modules/cheezenotes.js"></script>
+    <title>{{app_name}}</title>
+    <link rel="stylesheet" href="{{ base_url|safe }}static/cheezenotes.css">
+    <script type="module" src="{{ base_url|safe }}static/modules/cheezenotes.js"></script>
 </head>
 
 <body>
@@ -23,7 +23,7 @@
         </div>
     </div>
     <script type="module">
-        import { init } from '{{ root|safe }}static/modules/cheezenotes.js';
+        import { init } from '{{ base_url|safe }}static/modules/cheezenotes.js';
         {{ init|safe }}
     </script>
 </body>