cheeze.fr
/
CheezeNotes
1
0
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases Wiki Activity

sqliteification...

Browse Source
pull/17/head
Nicolas Sanchez 3 years ago
parent 61e4f5e9c4
commit dafb90a25a
23 changed files with 397 additions and 94 deletions
Show Stats Download Patch File Download Diff File

64
.vscode/launch.json vendored
Unescape View File

@ -0,0 +1,64 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'cheezenotes'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=cheezenotes"
],
"filter": {
"name": "cheezenotes",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'cheezenotes'",
"cargo": {
"args": [
"build",
"--bin=cheezenotes",
"--package=cheezenotes"
],
"filter": {
"name": "cheezenotes",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'cheezenotes'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=cheezenotes",
"--package=cheezenotes"
],
"filter": {
"name": "cheezenotes",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}

180
Cargo.lock generated
Unescape View File

@ -143,6 +143,23 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "actix-session"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43da8b818ae1f11049a4d218975345fe8e56ce5a5f92c11f972abcff5ff80e87"
dependencies = [
"actix-service",
"actix-utils",
"actix-web",
"anyhow",
"async-trait",
"derive_more",
"serde",
"serde_json",
"tracing",
]
[[package]]
name = "actix-utils"
version = "3.0.1"
@ -212,6 +229,41 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "aead"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
dependencies = [
"crypto-common",
"generic-array",
]
[[package]]
name = "aes"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
dependencies = [
"cfg-if",
"cipher",
"cpufeatures",
]
[[package]]
name = "aes-gcm"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
dependencies = [
"aead",
"aes",
"cipher",
"ctr",
"ghash",
"subtle",
]
[[package]]
name = "ahash"
version = "0.7.6"
@ -256,6 +308,12 @@ dependencies = [
"libc",
]
[[package]]
name = "anyhow"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
[[package]]
name = "askama"
version = "0.11.1"
@ -338,6 +396,12 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
[[package]]
name = "base64"
version = "0.21.0"
@ -440,6 +504,7 @@ name = "cheezenotes"
version = "0.2.0"
dependencies = [
"actix-files",
"actix-session",
"actix-web",
"askama",
"askama_actix",
@ -447,6 +512,8 @@ dependencies = [
"git2",
"lazy_static",
"mongodb",
"r2d2",
"r2d2_sqlite",
"regex",
"rusqlite",
"serde",
@ -468,6 +535,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "cipher"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e"
dependencies = [
"crypto-common",
"inout",
]
[[package]]
name = "clap"
version = "4.1.4"
@ -527,7 +604,14 @@ version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
dependencies = [
"aes-gcm",
"base64 0.20.0",
"hkdf",
"hmac",
"percent-encoding",
"rand",
"sha2",
"subtle",
"time 0.3.17",
"version_check",
]
@ -563,9 +647,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
dependencies = [
"generic-array",
"rand_core",
"typenum",
]
[[package]]
name = "ctr"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
dependencies = [
"cipher",
]
[[package]]
name = "cxx"
version = "1.0.91"
@ -857,6 +951,16 @@ dependencies = [
"wasi 0.11.0+wasi-snapshot-preview1",
]
[[package]]
name = "ghash"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
dependencies = [
"opaque-debug",
"polyval",
]
[[package]]
name = "git2"
version = "0.16.1"
@ -930,6 +1034,15 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
[[package]]
name = "hkdf"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
dependencies = [
"hmac",
]
[[package]]
name = "hmac"
version = "0.12.1"
@ -1046,6 +1159,15 @@ dependencies = [
"hashbrown",
]
[[package]]
name = "inout"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
dependencies = [
"generic-array",
]
[[package]]
name = "io-lifetimes"
version = "1.0.5"
@ -1407,6 +1529,12 @@ version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "opaque-debug"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl-probe"
version = "0.1.5"
@ -1504,6 +1632,18 @@ version = "0.3.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
[[package]]
name = "polyval"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
dependencies = [
"cfg-if",
"cpufeatures",
"opaque-debug",
"universal-hash",
]
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@ -1558,6 +1698,27 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "r2d2"
version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
dependencies = [
"log",
"parking_lot",
"scheduled-thread-pool",
]
[[package]]
name = "r2d2_sqlite"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4f5d0337e99cd5cacd91ffc326c6cc9d8078def459df560c4f9bf9ba4a51034"
dependencies = [
"r2d2",
"rusqlite",
]
[[package]]
name = "rand"
version = "0.8.5"
@ -1722,6 +1883,15 @@ version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "scheduled-thread-pool"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
dependencies = [
"parking_lot",
]
[[package]]
name = "scopeguard"
version = "1.1.0"
@ -2218,6 +2388,16 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
name = "universal-hash"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5"
dependencies = [
"crypto-common",
"subtle",
]
[[package]]
name = "untrusted"
version = "0.7.1"

3
Cargo.toml
Unescape View File

@ -11,6 +11,7 @@ clap = { version = "4.0.18", features = ["derive"] }
actix-web = "4"
actix-files = "0.6.2"
actix-session = { version = "0.7.2", features = ["cookie-session"] }
askama = { version = "0.11.1", features = ["with-actix-web"] }
askama_actix = "0.13.0"
@ -21,6 +22,8 @@ git2 = "0.16.0"
regex = "1"
r2d2 = "0.8"
r2d2_sqlite = "0.21.0"
rusqlite = {version = "0.28.0", features=["bundled"]}
lazy_static = "1.4.0"

5
db/db.sql
Unescape View File

@ -0,0 +1,5 @@
create table pages (
page_name text primary key,
page_text text,
active boolean default true not null
);

BIN
db/db.sqlite3
View File

Binary file not shown.

7
pages/BPCE-SI-Notes.md
Unescape View File

@ -1,12 +1,14 @@
[Notes](notes)
# Notes (BPCE-SI)
## A faire
- tiers-v2/corporateInformation -> identifiantLEI -> QrD5B3, QrD5F3, QrD17CIB00
- Gce.SirenSiretNonDistrib : **proxy-dc.sec.bpce-it.fr**
- Récupération des bilans dans les différents clients (évolution bilans).
- Voir les versions de .Net qu'on peut installer sur les serveurs batch PMM.
- Millesime 2022 liasse 2033 valeur 111 sur page A à renommer 111A
- Sujet Anaïs : Immatriculation avec données manquantes en base de données : 11315 509234258
- Modifier tâche de migration GIT avec les applis à migrer durant le sprint
- Voir Jean-Charles Bezard pour les grands clients nationnaux en fonction du grappage
- INC00100347
- Voir avec Julien la NDS semaine du 20/01/2023
- Regarder si on peut appareiller fichier index et xml dans SurveillanceSiren.
- Batch pour récupérer les siren confidentiels : tout le stock ou les mises à jour selon paramètre d'exécution.
@ -25,11 +27,12 @@
* [Forbearance](forbearance)
* [SPT](SPT)
* [Millésime 2022](millesime2022)
## Fonctionnel
- [Campagne Elocal]()
## Listes
- [Contacts](contacts-bpce-si)
- [Clients](clients-bpce-si)
## Suivi Anaïs
- [Feedback 27/01/2023](anais-feedback-27-01-2023)## Suivi Anaïs
- [Feedback 27/01/2023](anais-feedback-27-01-2023)
## Bidouille
- [bidouille]()

14
pages/Campagne Elocal.md
Unescape View File

@ -0,0 +1,14 @@
[retour](BPCE-SI-Notes)
# CampagnesElocal
## Calendrier2023
|||campagne 1|campagne 2|campagne 3|campagne 4|
|Batchs concernés|FI_SPT|:X:|:X:|::|::|
||SOCIO|X|X|X|?|
||RETRO_SP|X||X|?|
||BILAN_SEM|?|?|X|?|
||SOCIO_EPCI (auto)|X|X|X|?|
|Périodes|Livraison INPUTS|||||
||UTI|||||
||QPA|||||
||MEP|Février|Avril|Septembre|Nov.-Déc.|
|Terminé|Date|06/02/2023||||

13
pages/bidouille.md
Unescape View File

@ -1,13 +1,2 @@
[retour](BPCE-SI-Notes)
[](\\Prdgce7v2115\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2116\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2117\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2118\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2119\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2120\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2121\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2122\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2123\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2124\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2125\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
[](\\Prdgce7v2126\d\gcedoc\referentielproduction\clients\csctrmif\csctrmif\Documents)
# Bidouille

1
pages/dbtest.md
Unescape View File

@ -0,0 +1 @@
# test DB

2
pages/enveloppes.md
Unescape View File

@ -52,5 +52,5 @@
## 10 - resumé après modification
* Ajouter une zone de saisie pour permettre au conseiller de saisir la phrase (pour la synthèse)
## 11 - Synthèse (pdf)
* Grise la ligne enveloppe (gris plus clair)
* Griser la ligne enveloppe (gris plus clair)
* ligne dessous, CTO numéro de compte, si nouveau : "à souscrire"

1
pages/forbearance.md
Unescape View File

@ -3,3 +3,4 @@
Rechercher les valeurs possible des états et statut. fait.
* GECOCH : P34249
* Clarity : 031984-02
* synthesecorporateserv/rechercheBilan **->** voir si on a les données Elocal suffisantes (validé etc.)

5
pages/notes.md
Unescape View File

@ -2,6 +2,8 @@
# Notes
## BPCE-SI
- [Notes](BPCE-SI-Notes)
## Cheeze Notes
- exemple [r2d2 + rusqlite](https://github.com/actix/examples/blob/master/databases/sqlite/src/main.rs)
## Rust
*  [Idées](perso-idees)
*  [Crates](perso-crates)
@ -15,4 +17,5 @@
## Avec les enfants
- [Bricolages]()
- [mini-golf]()
- [Livres](livres enfants)
- [Livres](livres enfants)
- lapin de race feu noir

3
pages/test.md
Unescape View File

@ -1,3 +1,4 @@
[Accueil](accueil)
# Test pour développement CheezeNotes
test de gras au milieu d'un texte
test de gras au milieu d'un texte
[!](/static/cs.png) Salut les filles !

6
src/commons.rs
Unescape View File

@ -1,4 +1,6 @@
use clap::Parser;
use r2d2::Pool;
use r2d2_sqlite::SqliteConnectionManager;
#[derive(Parser)]
pub struct Arguments {
@ -26,7 +28,5 @@ impl Arguments {
pub struct AppData {
pub name: String,
pub root: String,
pub db_url: String,
pub db_user: String,
pub db_password: String,
pub pool: Pool<SqliteConnectionManager>,
}

12
src/database.rs
Unescape View File

@ -1,12 +0,0 @@
use rusqlite::{params, Connection, Result};
pub struct DatabaseConnection {
connection_string: String,
connection: Option<Connection>,
}
pub fn new(connection_string: String) -> DatabaseConnection {
let mut con = DatabaseConnection{ connection_string: connection_string.to_owned(), connection: None};
con.connection = Some(Connection::open(connection_string).unwrap());
con
}

51
src/db.rs
Unescape View File

@ -0,0 +1,51 @@
use actix_web::{error, web, Error};
use serde::{Deserialize, Serialize};
pub type Pool = r2d2::Pool<r2d2_sqlite::SqliteConnectionManager>;
pub type Connection = r2d2::PooledConnection<r2d2_sqlite::SqliteConnectionManager>;
#[derive(Debug, Serialize, Deserialize)]
pub struct Page {
pub page_name: String,
pub page_text: String,
}
pub async fn get_page_by_name(pool: &Pool, pagename: String) -> Result<Vec<Page>, 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 page_name, page_text from pages WHERE active=true and page_name=?")?;
stmt.query_map([pagename], |row| {
Ok(Page {
page_name: row.get(0)?,
page_text: row.get(1)?,
})
})
.and_then(Iterator::collect)
})
.await?
.map_err(error::ErrorInternalServerError)
}
pub async fn update_page(pool: &Pool, page_name: String, page_text: String) -> Result<usize, 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("insert or replace into pages (page_name, page_text, active) values (?, ?, true)")?;
stmt.execute([page_name, page_text, ])
})
.await?
.map_err(error::ErrorInternalServerError)
}

2
src/lib.rs
Unescape View File

@ -1,4 +1,4 @@
pub mod page;
pub mod index;
pub mod commons;
pub mod database;
pub mod db;

11
src/main.rs
Unescape View File

@ -1,6 +1,9 @@
use actix_web::{web, App, HttpServer};
use actix_files;
use r2d2::Pool;
use r2d2_sqlite::{self, SqliteConnectionManager};
use cheezenotes::commons::{Arguments, AppData};
use cheezenotes::{ page, index };
@ -13,12 +16,13 @@ async fn main() -> std::io::Result<()> {
let port = args.port;
let root = args.root;
let manager = SqliteConnectionManager::file("db/db.sqlite3");
let pool = Pool::new(manager).unwrap();
let appdata = AppData {
name: String::from("CheezeNotes"),
root,
db_url: String::from(""),
db_user: String::from(""),
db_password: String::from(""),
pool: pool.clone(),
};
HttpServer::new(move || {
@ -27,7 +31,6 @@ async fn main() -> std::io::Result<()> {
.service(index::index)
.service(page::page)
.service(page::save_page)
//.service(page::page_link)
.service(actix_files::Files::new("/static", "./static"))
.service(actix_files::Files::new("/static/modules", "./static/modules"))
})

86
src/page.rs
Unescape View File

@ -1,15 +1,14 @@
use actix_web::{get, put, Responder};
use actix_web::{web, HttpResponse};
use actix_web::{Responder, get, put};
use std::fs;
use std::io::Write;
//use regex::Regex;
use askama_actix::Template;
use askama_actix::TemplateToResponse;
use crate::commons::AppData;
//use crate::database::DatabaseConnection;
use crate::db;
#[derive(Template)]
#[template(path = "page.html")]
@ -23,57 +22,50 @@ pub struct PageTemplate {
#[get("/page/{page}")]
async fn page(path: web::Path<(String,)>, data: web::Data<AppData>) -> impl Responder {
let pagename = &path.0;
let fut_page_datas = db::get_page_by_name(&data.pool, pagename.to_owned());
let page_datas = fut_page_datas.await.unwrap();
let md;
match page_datas.first() {
None => {
let filename = String::from("pages/") + pagename.as_str() + ".md";
md = match fs::read_to_string(filename) {
Ok(txt) => {
db::update_page(&data.pool, pagename.to_owned(), txt.to_owned())
.await
.unwrap();
txt
}
Err(_) => String::from("# ") + pagename.replace("_", " ").as_str(),
};
}
Some(dat) => md = (*dat.page_text).to_string(),
}
let name = data.name.to_owned() + " " + pagename.as_str();
let root = data.root.to_owned();
let filename = String::from("pages/") + pagename.as_str() + ".md";
let md = match fs::read_to_string(filename) {
Ok(txt) => txt,
Err(_) => String::from("# Nouvelle page"),
};
let init = String::from("init();");
PageTemplate { name, root, md, init }.to_response()
PageTemplate {
name,
root,
md,
init,
}
.to_response()
}
#[put("/page/{page}")]
async fn save_page(body: String, path: web::Path<(String,)>) -> impl Responder {
async fn save_page(
body: String,
path: web::Path<(String,)>,
data: web::Data<AppData>,
) -> impl Responder {
let pagename = &path.0;
/*if pagename == "index" {
if pagename == "index" {
return HttpResponse::Ok();
}*/
let filename = String::from("pages/") + pagename.as_str() + ".md";
let mut file = match fs::File::create(&filename) {
Ok(f) => f,
Err(_) => return HttpResponse::Unauthorized(),
};
match file.write_all(body.as_bytes()) {
Ok(_) => HttpResponse::Ok(),
Err(_) => HttpResponse::Unauthorized(),
}
db::update_page(&data.pool, pagename.to_owned(), body)
.await
.unwrap();
HttpResponse::Ok()
}
/*#[get("/page/{oldpage}/{page}")]
async fn page_link(path: web::Path<(String, String,)>, data: web::Data<AppData>) -> impl Responder {
let pagename = &path.1;
let name = data.name.to_owned() + " " + pagename.as_str();
let filename = String::from("pages/") + pagename.as_str() + ".md";
let md = match fs::read_to_string(filename) {
Ok(txt) => txt,
Err(_) => String::from("# Nouvelle page"),
};
let init = format!("init('{}')", pagename);
PageTemplate { name, md, init }.to_response()
}*/
/*fn normalize_pagename(pagename: String) -> Result<String, ()> {
let pagename = pagename.trim();
let space_re = Regex::new(r"[-\s]").unwrap();
let pagename = &*space_re.replace_all(pagename, "_");
let re = Regex::new(r"").unwrap();
if re.is_match(pagename) {
Ok(pagename.to_owned())
} else {
Err(())
}
}*/

18
static/cheezenotes.css
Unescape View File

@ -14,14 +14,14 @@ html {
body {
margin: 0;
background-color: #f6f6f6;
background-color: #dddddd;
}
.material-icons {
font-family: 'Material Icons';
font-weight: normal;
font-style: normal;
font-size: 20px; /* Preferred icon size */
font-size: 24px; /* Preferred icon size */
display: inline-block;
line-height: 1;
text-transform: none;
@ -37,10 +37,11 @@ body {
div#buttons {
white-space: nowrap;
overflow-x: auto;
box-sizing: border-box;
padding: .2rem;
position: fixed;
background-color: #dddde5;
background-color: #dddddd;
top: 0;
left: 0;
right: 0;
@ -53,8 +54,8 @@ div#buttons button.button {
color: #444444;
padding: 0;
margin: 0;
height: 1.8rem;
width: 1.8rem;
height: 2.8rem;
width: 2.8rem;
background-color: #eeeeee;
border: 1px solid #cccccc;
border-right: none;
@ -68,14 +69,14 @@ div#buttons button.separator {
color: #bbbbbb;
border: none;
border-left: 1px solid #cccccc;
height: 1.8rem;
height: 2.8rem;
margin: 0;
padding: 0;
}
div#buttons button.text {
color: #444444;
font-size: 16px;
font-size: 18px;
vertical-align: bottom;
}
div#buttons button.text:disabled {
@ -123,7 +124,7 @@ textarea#ta {
}
div#cheezenotes {
margin-top: 2rem;
margin-top: 3rem;
margin-left: auto;
margin-right: auto;
max-width: 1200;
@ -314,6 +315,7 @@ div#cheezenotes:focus div.cheezenotes_line span.token {
div#cheezenotes div.body {
margin-top: 0.5rem;
line-height: 1;
margin-bottom: 0.5rem;
}
div#cheezenotes span.mono {

BIN
static/cs.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

6
static/modules/cheezenotes.js
Unescape View File

@ -154,8 +154,10 @@ function onedit(e) {
let prevline = line.previousSibling;
if (prevline != null && prevline.innerText == '\n') {
prevline.className = 'cheezenotes_line';
prevline.classList.add('body');
/*prevline.className = 'cheezenotes_line';
prevline.classList.add('body');*/
let newline = formatLine(prevline.innerText);
prevline.parentNode.replaceChild(newline, prevline);
}
let newline = formatLine(line.innerText);

1
static/modules/md.js
Unescape View File

@ -499,6 +499,7 @@ function addLink(line, listLink) {
}
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>');

Write Preview
Loading…
Cancel
Save