update

.envrc

@@ -1,3 +1,4 @@
 strict_env
 
-export HOUHOU_SRC=$PWD
+export HOUHOU_SRC=$PWD
+export DATABASE_URL=$HOUHOU_SRC/src-tauri/SrsDatabase.sqlite

src-tauri/.gitignore

@@ -3,4 +3,6 @@
 /target/
 
 *-shm
-*-wal
+*-wal
+
+SrsDatabase.sqlite

src-tauri/migrations/20230608093603_initial.sql

@@ -0,0 +1,18 @@
+CREATE TABLE [SrsEntrySet] (
+  [ID] integer NOT NULL PRIMARY KEY AUTOINCREMENT, 
+  [CreationDate] bigint NOT NULL DEFAULT CURRENT_TIMESTAMP, 
+  [NextAnswerDate] bigint, 
+  [Meanings] [nvarchar(300)] NOT NULL, 
+  [Readings] [nvarchar(100)] NOT NULL, 
+  [CurrentGrade] smallint NOT NULL DEFAULT 0, 
+  [FailureCount] integer NOT NULL DEFAULT 0, 
+  [SuccessCount] integer NOT NULL DEFAULT 0, 
+  [AssociatedVocab] [nvarchar(100)], 
+  [AssociatedKanji] [nvarchar(10)], 
+  [MeaningNote] [nvarchar(1000)], 
+  [ReadingNote] [nvarchar(1000)], 
+  [SuspensionDate] bigint, 
+  [Tags] [nvarchar(300)], 
+  [LastUpdateDate] BIGINT, 
+  [IsDeleted] BOOLEAN NOT NULL DEFAULT false, 
+  [ServerId] integer);

src-tauri/src/kanji.rs

@@ -29,6 +29,7 @@ impl Kanji {
     let character = row.get("Character");
     let meaning = row.get("Meaning");
     let most_used_rank = row.get("MostUsedRank");
+
     Kanji {
       character,
       meaning,

src-tauri/src/main.rs

@@ -7,23 +7,23 @@ extern crate derivative;
 extern crate serde;
 
 mod kanji;
+mod srs;
 
 use std::str::FromStr;
 
 use anyhow::{Context, Result};
 use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
 use tauri::SystemTray;
+use tokio::fs;
 
 use crate::kanji::KanjiDb;
-
+use crate::srs::SrsDb;
-// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
-#[tauri::command]
-fn greet(name: &str) -> String {
-  format!("Hello, {}! You've been greeted from Rust!", name)
-}
 
 #[tokio::main]
 async fn main() -> Result<()> {
+  let app_dir = dirs::config_dir().unwrap().join("houhou");
+  fs::create_dir_all(&app_dir).await?;
+
   // Open kanji db
   let kanji_db_options =
     SqliteConnectOptions::from_str("./KanjiDatabase.sqlite")?.read_only(true);
@@ -31,15 +31,28 @@ async fn main() -> Result<()> {
     .connect_with(kanji_db_options)
     .await?;
 
+  // Open SRS db
+  let srs_db_path = app_dir.join("srs_db.sqlite");
+  let srs_db_options =
+    SqliteConnectOptions::from_str(&srs_db_path.display().to_string())?
+      .create_if_missing(true);
+  println!("Opening srs database at {} ...", srs_db_path.display());
+  let srs_pool = SqlitePoolOptions::new()
+    .connect_with(srs_db_options)
+    .await?;
+  println!("Running migrations...");
+  sqlx::migrate!().run(&srs_pool).await?;
+
   // System tray
   let tray = SystemTray::new();
 
   // Build tauri
   tauri::Builder::default()
     .manage(KanjiDb(kanji_pool))
+    .manage(SrsDb(srs_pool))
     .system_tray(tray)
     .invoke_handler(tauri::generate_handler![
-      greet,
+      srs::get_srs_stats,
       kanji::get_kanji,
       kanji::get_single_kanji
     ])

src-tauri/src/srs.rs

@@ -0,0 +1,9 @@
+use sqlx::SqlitePool;
+use tauri::State;
+
+pub struct SrsDb(pub SqlitePool);
+
+#[tauri::command]
+pub async fn get_srs_stats(db: State<'_, SrsDb>) -> Result<(), ()> {
+  Ok(())
+}

src/App.module.scss

@@ -27,5 +27,5 @@ main.main {
 
 .link-active {
   border-top-color: #09c;
-  background-color: lightskyblue;
+  background-color: hsl(203, 91%, 91%);
 }

src/components/DashboardReviewStats.tsx

@@ -0,0 +1,3 @@
+export default function DashboardReviewStats() {
+  return <></>;
+}

src/panes/KanjiPane.module.scss

@@ -6,12 +6,24 @@
 
 .kanji-link {
   padding: 4px 8px;
-  border: 1px solid lightgray;
+  border-left: 4px solid transparent;
+  user-select: none;
 }
 
 .kanji-list-scroll {
+  direction: rtl;
+  overflow-y: scroll;
+}
+
+.kanji-list-inner {
   display: flex;
   flex-direction: column;
   gap: 4px;
-  overflow-y: scroll;
+
+  direction: ltr;
 }
+
+.kanji-link-active {
+  border-left-color: #09c;
+  background-color: hsl(203, 91%, 91%);
+}

src/panes/KanjiPane.tsx

@@ -6,6 +6,7 @@ import styles from "./KanjiPane.module.scss";
 import { Link, useParams } from "react-router-dom";
 import KanjiDisplay from "../components/KanjiDisplay";
 import { Kanji } from "../types/Kanji";
+import classNames from "classnames";
 
 export interface GetKanjiResult {
   count: number;
@@ -25,21 +26,29 @@ function KanjiList({ data, selectedCharacter }: KanjiListProps) {
       </small>
 
       <div className={styles["kanji-list-scroll"]}>
-        {data.kanji.map((kanji) => (
+        <div className={styles["kanji-list-inner"]}>
-          <Link
+          {data.kanji.map((kanji) => {
-            key={kanji.character}
+            const active = kanji.character == selectedCharacter;
-            className={styles["kanji-link"]}
+            const className = classNames(styles['kanji-link'], active && styles['kanji-link-active'])
-            to={`/kanji/${kanji.character}`}
+            return <Link
-          >
+              key={kanji.character}
-            <Grid templateRows="repeat(2, 1fr)" templateColumns="1fr 3fr">
+              className={className}
-              <GridItem rowSpan={2} style={{ fontSize: "24px", textAlign: "center" }}>
+              to={`/kanji/${kanji.character}`}
-                {kanji.character}
+            >
-              </GridItem>
+              <Grid templateRows="repeat(2, 1fr)" templateColumns="1fr 3fr">
-              <GridItem>{kanji.meaning}</GridItem>
+                <GridItem rowSpan={2} style={{ fontSize: "24px", textAlign: "center" }}>
-              <GridItem>#{kanji.most_used_rank} most used</GridItem>
+                  {kanji.character}
-            </Grid>
+                </GridItem>
-          </Link>
+                <GridItem>{kanji.meaning}</GridItem>
-        ))}
+                <GridItem>
+                  <small>
+                    #{kanji.most_used_rank} most used
+                  </small>
+                </GridItem>
+              </Grid>
+            </Link>
+          })}
+        </div>
       </div>
     </>
   );