Fix UI (#157)

Author: Punnawithsut

.gitignore

@@ -52,7 +52,7 @@ target*
 
 result*
 
-src-tauri/opencv_world4110.dll
+src-tauri/*.dll
 
 .venv*
 .env

src-tauri/libleptonica-6.dll

@@ -134,7 +134,7 @@ pub fn enter_database_information(app: AppHandle, uri: String, name: String) {
 }
 
 #[tauri::command]
-pub async fn login(username: String, password: String) -> Result<bool, String> {
+pub async fn login(app: AppHandle, username: String, password: String) -> Result<(), String> {
     let client = Client::new();
     let res = client
         .post("http://localhost:5000/login")
@@ -144,7 +144,36 @@ pub async fn login(username: String, password: String) -> Result<bool, String> {
         .map_err(|e| e.to_string())?;
 
     let body: LoginResponse = res.json().await.map_err(|e| e.to_string())?;
-    Ok(body.success)
+    if body.success {
+        info!("Authentication Passed!");
+        WebviewWindowBuilder::from_config(
+            &app,
+            app.config()
+                .app
+                .windows
+                .first()
+                .ok_or("the main window is not present in the config".to_string())?,
+        )
+        .map_err(|e| {
+            err_log!(&e);
+            "cannot create main window".to_string()
+        })?
+        .build()
+        .map_err(|e| {
+            err_log!(&e);
+            "cannot create main window".to_string()
+        })?;
+        app.webview_windows()
+            .get("auth")
+            .ok_or("missing auth window".to_string())?
+            .close()
+            .map_err(|e| {
+                err_log!(&e);
+                "cannot close auth window".to_string()
+            })
+    } else {
+        Err("Invalid username or password".to_string())
+    }
 }
 
 #[tauri::command]

src-tauri/libtesseract-5.5.dll

@@ -505,13 +505,18 @@ impl AnswerSheet {
             let subject_id_written = roi_range_frac(&subject_id_mat, 0.0..=1.0, 0.0..=0.128205)?;
             let student_id_written =
                 roi_range_frac(&student_id_mat, 0.112..=1.0, 0.0..=0.12565445)?;
-            let (written_subject_id, written_student_id) =
+            let (_written_subject_id, written_student_id) =
                 extract_subject_student_from_written_field(
                     subject_id_written,
                     student_id_written,
                     ocr,
                 )?;
-            if subject_id != written_subject_id || student_id != written_student_id {
+
+            if student_id.len() == 9 && student_id.starts_with('1') {
+                student_id.remove(0);
+            }
+            
+            if student_id != written_student_id {
                 //warn!("{} != {} && {} != {}", written_student_id, student_id, written_subject_id, subject_id);
                 if student_id.len() != 8 && written_student_id.len() == 8 {
                     student_id = written_student_id;
@@ -661,7 +666,10 @@ fn extract_user_information(
     // safe_imwrite("temp/debug_exam_seat.png", &exam_seat)?;
 
     let name_string = image_to_string(&name, ocr)?;
-    let subject_string = image_to_string(&subject_name, ocr)?;
+    let subject_string = image_to_string(&subject_name, ocr)?
+        .chars()
+        .filter(|c| c.is_alphabetic() || *c == ' ')
+        .collect::<String>();
     let exam_room_string = image_to_string(&exam_room, ocr)?
         .chars()
         .filter_map(|c| match c {

src-tauri/src/commands.rs

@@ -13,16 +13,16 @@
     "windows": [
       {
         "title": "Quikscore",
-        "width": 800,
-        "height": 600,
+        "width": 1280,
+        "height": 720,
         "create": false
       },
       {
         "title": "Quikscore Authentication",
         "url": "auth.html",
         "label": "auth",
-        "width": 380,
-        "height": 480,
+        "width": 540,
+        "height": 640,
         "create": true,
         "resizable": false
       }

src-tauri/src/image.rs

@@ -369,14 +369,14 @@ function avgMinMax(result: BlobbedAnswerScoreResult[]): { avg: number, min: numb
       <div class="form_group">
         <div class="form_wrapper">
           <label for="mongo_db_uri">MongoDB URI: </label>
-          <input type="text" id="mongo_db_uri" v-model="mongoDbUri" placeholder="URI...." />
+          <input type="text" id="mongo_db_uri" class="text-box" v-model="mongoDbUri" placeholder="URI...."/>
         </div>
         <div class="form_wrapper">
           <label for="mongo_db_name">MongoDB Name: </label>
-          <input type="text" id="mongo_db_name" v-model="mongoDbName" placeholder="Name...." />
+          <input type="text" id="mongo_db_name" class="text-box" v-model="mongoDbName" placeholder="Name...."/>
         </div>
+        <button class="mongo_db_enter" @click="enterDatabaseInfo">Enter</button>
       </div>
-      <button class="mongo_db_enter" @click="enterDatabaseInfo">Enter</button>
     </div>
 
 
@@ -609,6 +609,35 @@ p.credits {
   gap: 0.5rem;
 }
 
+.text-box {
+  padding: 0.5rem;           
+  border-radius: 25px;        
+  border: 1px solid #1e293b;    
+  width: 300px;                         
+  background-color: #1e293b;
+  color: #ffffff;
+}
+
+.mongo_db_enter {
+  border-radius: 20px;
+  border: 1px solid transparent;
+  padding: 1.0em 1.2em;
+  padding: 1vh;
+  margin-right: 1vh;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  transition: border-color 0.25s;
+  transition: all 0.2s ease;
+  box-shadow: 0 2px 2px rgba(2, 59, 98, 0.2);
+  background-color: #5d98f6;
+  color: #ffffff;
+}
+
+.mongo_db_enter:hover {
+  background-color: #2563eb;
+  border-color: #45475a;
+}
 
 .result {
   display: flex;

src-tauri/tauri.conf.json

@@ -146,14 +146,9 @@ const username = ref("")
 const password = ref("")
 
 async function handleLogin() {
-  let success  = await invoke("login", {
+  await invoke("login", {
     username: username.value,
     password: password.value
   });
-  if(success) {
-    window.location.href = "/#/"
-  } else {
-    alert("Invalid username or password")
-  }
 }
 </script>