Merge pull request #15 from connorakey/rust-rewrite

Added Extra Features and Bug fixes

Author: connorakey

backend/src/main.rs

@@ -1,4 +1,4 @@
-use axum::{routing::post, Json, Router, http::StatusCode};
+use axum::{routing::post, Json, Router, http::StatusCode, extract::DefaultBodyLimit};
 use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use backend::openai::{get_step_by_step_guidance, get_final_answer};
@@ -49,7 +49,8 @@ async fn main() {
 
     let app = Router::new()
         .route("/api/openai", post(openai))
-        .route("/admin/add_api_key", post(add_api_key));
+        .route("/admin/add_api_key", post(add_api_key))
+        .layer(DefaultBodyLimit::max(100 * 1024 * 1024)); // 100MB limit
 
     // Get port from environment variable, default to 3000 if not set
     let port = std::env::var("PORT").unwrap_or_else(|_| "3000".to_string());

frontend/maths-online-app/src-tauri/src/request.rs

@@ -16,6 +16,14 @@ pub struct OpenAiRequest {
     pub request_type: OpenAiRequestType,
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OpenAiRequestWithUrl {
+    pub image_b64: String,
+    pub api_key: String,
+    pub request_type: OpenAiRequestType,
+    pub base_url: String,
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct OpenAiResponse {
     pub success: bool,

frontend/maths-online-app/src/App.tsx

@@ -38,10 +38,41 @@ function App() {
       if (screenshotResult.success) {
         // Process the screenshot with AI
         console.log('Screenshot captured successfully, processing with AI...');
-        // TODO: Send to AI for processing
-        setSolutionData({
-          solution: `Step-by-Step Solution (Screenshot Mode):\n\nScreenshot captured from coordinates (${coordinates.x1}, ${coordinates.y1}) to (${coordinates.x2}, ${coordinates.y2})\n\n1. First, identify the problem type...\n2. Apply the appropriate formula...\n3. Solve step by step...\n4. Check your answer.`
-        });
+        
+        // Get settings for API configuration
+        const settings = await invoke<{
+          base_url: string;
+          api_key: string;
+        }>('get_settings');
+        
+        console.log('Settings loaded:', settings);
+        
+        // Send to backend for processing
+        const requestParams = {
+          request: {
+            image_b64: screenshotResult.base64_data,
+            api_key: settings.api_key,
+            request_type: 'StepByStep'
+          },
+          baseUrl: settings.base_url
+        };
+        
+        console.log('Sending request with params:', requestParams);
+        
+        const apiResponse = await invoke<{
+          success: boolean;
+          response: string;
+        }>('send_openai_request', requestParams);
+        
+        if (apiResponse.success) {
+          setSolutionData({
+            solution: apiResponse.response
+          });
+        } else {
+          setSolutionData({
+            error: `API request failed: ${apiResponse.response}`
+          });
+        }
       } else {
         setSolutionData({
           error: `Screenshot failed: ${screenshotResult.error || 'Unknown error'}`
@@ -55,7 +86,7 @@ function App() {
     }
   };
 
-  const handleFormSubmit = (data: {
+  const handleFormSubmit = async (data: {
     requestType: RequestType;
     imageData?: string;
     useScreenshot: boolean;
@@ -69,22 +100,58 @@ function App() {
     // Set loading state
     setSolutionData({ isLoading: true });
 
-    if (data.useScreenshot) {
-      // Handle screenshot mode
-      console.log('Taking screenshot...');
-      handleScreenshotMode();
-    } else if (data.imageData) {
-      // Handle uploaded image
-      console.log('Processing uploaded image...');
-      // TODO: Implement image processing
-      // invoke('process_uploaded_image', { base64Input: data.imageData })
-      
-      // For now, simulate loading
-      setTimeout(() => {
-        setSolutionData({
-          solution: `Step-by-Step Solution (Upload Mode):\n\n1. Analyzing uploaded image...\n2. Identifying mathematical expressions...\n3. Applying solution method...\n4. Final answer: [Solution will appear here]`
-        });
-      }, 3000);
+    try {
+      if (data.useScreenshot) {
+        // Handle screenshot mode
+        console.log('Taking screenshot...');
+        await handleScreenshotMode();
+      } else if (data.imageData) {
+        // Handle uploaded image
+        console.log('Processing uploaded image...');
+        
+        // Get settings for API configuration
+        const settings = await invoke<{
+          base_url: string;
+          api_key: string;
+        }>('get_settings');
+        
+        console.log('Settings loaded for upload:', settings);
+        
+        // Determine request type based on form selection
+        const requestType = data.requestType === RequestType.StepByStep ? 'StepByStep' : 'FinalAnswer';
+        
+        // Send to backend for processing
+        const requestParams = {
+          request: {
+            image_b64: data.imageData,
+            api_key: settings.api_key,
+            request_type: requestType
+          },
+          baseUrl: settings.base_url
+        };
+        
+        console.log('Sending upload request with params:', requestParams);
+        
+        const apiResponse = await invoke<{
+          success: boolean;
+          response: string;
+        }>('send_openai_request', requestParams);
+        
+        if (apiResponse.success) {
+          setSolutionData({
+            solution: apiResponse.response
+          });
+        } else {
+          setSolutionData({
+            error: `API request failed: ${apiResponse.response}`
+          });
+        }
+      }
+    } catch (error) {
+      console.error('API request error:', error);
+      setSolutionData({
+        error: `Failed to process request: ${error}`
+      });
     }
   };
 

frontend/maths-online-app/src/components/MathQuestionForm.tsx

@@ -89,6 +89,7 @@ const MathQuestionForm: React.FC<MathQuestionFormProps> = ({ onSubmit }) => {
             <UploadBox 
               onImageUpload={handleImageUpload}
               onError={handleUploadError}
+              isUploaded={!!uploadedImage}
             />
           </div>
         )}

frontend/maths-online-app/src/components/Settings.css

@@ -238,6 +238,79 @@
   text-align: center;
 }
 
+/* Password Change Section */
+.secondary-button {
+  padding: 10px 16px;
+  background-color: #f3f4f6;
+  color: #374151;
+  border: 2px solid #e5e7eb;
+  border-radius: 8px;
+  font-size: 0.875rem;
+  font-weight: 500;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.secondary-button:hover {
+  background-color: #e5e7eb;
+  border-color: #d1d5db;
+}
+
+.password-change-section {
+  margin-top: 20px;
+  padding: 20px;
+  background-color: #f8fafc;
+  border: 1px solid #e5e7eb;
+  border-radius: 8px;
+  animation: slideDown 0.3s ease-out;
+}
+
+@keyframes slideDown {
+  from {
+    opacity: 0;
+    transform: translateY(-10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.password-change-section .setting-field {
+  margin-bottom: 16px;
+}
+
+.password-change-actions {
+  margin-top: 20px;
+  text-align: right;
+}
+
+.primary-button {
+  padding: 12px 24px;
+  background: linear-gradient(135deg, #3b82f6 0%, #2563eb 100%);
+  color: white;
+  border: none;
+  border-radius: 8px;
+  font-size: 0.875rem;
+  font-weight: 600;
+  cursor: pointer;
+  transition: all 0.2s;
+}
+
+.primary-button:hover:not(:disabled) {
+  background: linear-gradient(135deg, #2563eb 0%, #1d4ed8 100%);
+  transform: translateY(-1px);
+  box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3);
+}
+
+.primary-button:disabled {
+  background: #d1d5db;
+  color: #9ca3af;
+  cursor: not-allowed;
+  transform: none;
+  box-shadow: none;
+}
+
 .settings-footer {
   padding: 16px 24px;
   border-top: 1px solid #e5e7eb;