Merge branch 'develop' into reload-fix

Author: RohitR311

maxun-core/package.json

@@ -1,6 +1,6 @@
 {
  "name": "maxun-core",
- "version": "0.0.9",
+ "version": "0.0.10",
  "description": "Core package for Maxun, responsible for data extraction",
  "main": "build/index.js",
  "typings": "build/index.d.ts",

maxun-core/src/interpret.ts

@@ -1,6 +1,6 @@
 {
  "name": "maxun",
- "version": "0.0.7",
+ "version": "0.0.8",
  "author": "Maxun",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
@@ -47,7 +47,7 @@
  "lodash": "^4.17.21",
  "loglevel": "^1.8.0",
  "loglevel-plugin-remote": "^0.6.8",
- "maxun-core": "^0.0.9",
+ "maxun-core": "^0.0.10",
  "minio": "^8.0.1",
  "moment-timezone": "^0.5.45",
  "node-cron": "^3.0.3",

package.json

@@ -8,7 +8,16 @@
  "register_prompt": "Noch keinen Account?",
  "register_link": "Registrieren",
  "welcome_notification": "Willkommen bei Maxun!",
- "error_notification": "Anmeldung fehlgeschlagen. Bitte versuchen Sie es erneut."
+ "validation": {
+ "required_fields": "E-Mail und Passwort sind erforderlich",
+ "password_length": "Das Passwort muss mindestens 6 Zeichen lang sein"
+ },
+ "error": {
+ "user_not_found": "Benutzer existiert nicht",
+ "invalid_credentials": "Ungültige E-Mail oder Passwort",
+ "server_error": "Anmeldung fehlgeschlagen. Bitte versuchen Sie es später erneut",
+ "generic": "Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut"
+ }
  },
  "register": {
  "title": "Konto registrieren",
@@ -19,7 +28,16 @@
  "register_prompt": "Bereits ein Konto?",
  "login_link": "Einloggen",
  "welcome_notification": "Willkommen bei Maxun!",
- "error_notification": "Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut."
+ "validation": {
+ "email_required": "E-Mail-Adresse ist erforderlich",
+ "password_requirements": "Das Passwort muss mindestens 6 Zeichen lang sein"
+ },
+ "error": {
+ "user_exists": "Ein Benutzer mit dieser E-Mail existiert bereits",
+ "creation_failed": "Konto konnte nicht erstellt werden",
+ "server_error": "Serverfehler aufgetreten",
+ "generic": "Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut"
+ }
  },
  "recordingtable": {
  "run": "Ausführen",
@@ -40,8 +58,9 @@
  "delete": "Löschen",
  "duplicate": "Duplizieren",
  "notifications": {
- "delete_warning": "Roboter kann nicht gelöscht werden, da zugehörige Ausführungen vorhanden sind",
- "delete_success": "Roboter erfolgreich gelöscht"
+ "delete_warning": "Der Roboter hat zugehörige Ausführungen. Löschen Sie zuerst die Ausführungen, um den Roboter zu löschen",
+ "delete_success": "Roboter erfolgreich gelöscht",
+ "auth_success": "Roboter erfolgreich authentifiziert"
  }
  },
  "mainmenu": {
@@ -61,6 +80,7 @@
  "delete": "Löschen",
  "settings": "Einstellungen",
  "search": "Ausführungen suchen...",
+ "sort_tooltip": "Zum Sortieren klicken",
  "notifications": {
  "no_runs": "Keine Ausführungen gefunden. Bitte versuchen Sie es erneut.",
  "delete_success": "Ausführung erfolgreich gelöscht"
@@ -450,6 +470,7 @@
  "log": "Protokoll"
  },
  "empty_output": "Die Ausgabe ist leer.",
+ "loading": "Ausführung läuft. Extrahierte Daten werden nach Abschluss des Durchlaufs hier angezeigt.",
  "captured_data": {
  "title": "Erfasste Daten",
  "download_json": "Als JSON herunterladen",

public/locales/de.json

@@ -8,7 +8,16 @@
  "register_prompt": "Don't have an account?",
  "register_link": "Register",
  "welcome_notification": "Welcome to Maxun!",
- "error_notification": "Login Failed. Please try again."
+ "validation": {
+ "required_fields": "Email and password are required",
+ "password_length": "Password must be at least 6 characters"
+ },
+ "error": {
+ "user_not_found": "User does not exist",
+ "invalid_credentials": "Invalid email or password",
+ "server_error": "Login failed. Please try again later",
+ "generic": "An error occurred. Please try again"
+ }
  },
  "register": {
  "title": "Register Account",
@@ -19,7 +28,16 @@
  "register_prompt": "Already have an account?",
  "login_link": "Login",
  "welcome_notification": "Welcome to Maxun!",
- "error_notification": "Registeration Failed. Please try again."
+ "validation": {
+ "email_required": "Email is required",
+ "password_requirements": "Password must be at least 6 characters"
+ },
+ "error": {
+ "user_exists": "User with this email already exists",
+ "creation_failed": "Could not create account",
+ "server_error": "Server error occurred",
+ "generic": "Registration failed. Please try again"
+ }
  },
  "recordingtable":{
  "run": "Run",
@@ -41,8 +59,9 @@
  "duplicate":"Duplicate",
  "search":"Search Robots...",
  "notifications": {
- "delete_warning": "Cannot delete robot as it has associated runs",
- "delete_success": "Robot deleted successfully"
+ "delete_warning": "The robot has associated runs. First delete runs to delete the robot",
+ "delete_success": "Robot deleted successfully",
+ "auth_success": "Robot successfully authenticated"
  }
  },
  "mainmenu":{
@@ -62,6 +81,7 @@
  "delete":"Delete",
  "settings":"Settings",
  "search":"Search Runs...",
+ "sort_tooltip": "Click to sort",
  "notifications": {
  "no_runs": "No runs found. Please try again.",
  "delete_success": "Run deleted successfully"
@@ -461,6 +481,7 @@
  "log": "Log"
  },
  "empty_output": "The output is empty.",
+ "loading": "Run in progress. Extracted data will appear here once run completes.",
  "captured_data": {
  "title": "Captured Data",
  "download_json": "Download as JSON",

public/locales/en.json

@@ -8,7 +8,16 @@
  "register_prompt": "¿No tienes una cuenta?",
  "register_link": "Registrarse",
  "welcome_notification": "¡Bienvenido a Maxun!",
- "error_notification": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
+ "validation": {
+ "required_fields": "El correo electrónico y la contraseña son obligatorios",
+ "password_length": "La contraseña debe tener al menos 6 caracteres"
+ },
+ "error": {
+ "user_not_found": "El usuario no existe",
+ "invalid_credentials": "Correo electrónico o contraseña inválidos",
+ "server_error": "Error al iniciar sesión. Por favor, inténtelo de nuevo más tarde",
+ "generic": "Se produjo un error. Por favor, inténtelo de nuevo"
+ }
  },
  "register": {
  "title": "Crear cuenta",
@@ -19,7 +28,16 @@
  "register_prompt": "¿Ya tienes una cuenta?",
  "login_link": "Iniciar sesión",
  "welcome_notification": "¡Bienvenido a Maxun!",
- "error_notification": "Error en el registro. Por favor, inténtalo de nuevo."
+ "validation": {
+ "email_required": "El correo electrónico es obligatorio",
+ "password_requirements": "La contraseña debe tener al menos 6 caracteres"
+ },
+ "error": {
+ "user_exists": "Ya existe un usuario con este correo electrónico",
+ "creation_failed": "No se pudo crear la cuenta",
+ "server_error": "Ocurrió un error en el servidor",
+ "generic": "Error en el registro. Por favor, inténtelo de nuevo"
+ }
  },
  "recordingtable": {
  "run": "Ejecutar",
@@ -41,8 +59,9 @@
  "duplicate": "Duplicar",
  "search": "Buscar robots...",
  "notifications": {
- "delete_warning": "No se puede eliminar el robot ya que tiene ejecuciones asociadas",
- "delete_success": "Robot eliminado exitosamente"
+ "delete_warning": "El robot tiene ejecuciones asociadas. Primero elimine las ejecuciones para eliminar el robot",
+ "delete_success": "Robot eliminado exitosamente",
+ "auth_success": "Robot autenticado exitosamente"
  }
  },
  "mainmenu": {
@@ -62,6 +81,7 @@
  "delete": "Eliminar",
  "settings": "Ajustes",
  "search": "Buscar ejecuciones...",
+ "sort_tooltip": "Haga clic para ordenar",
  "notifications": {
  "no_runs": "No se encontraron ejecuciones. Por favor, inténtelo de nuevo.",
  "delete_success": "Ejecución eliminada con éxito"
@@ -451,6 +471,7 @@
  "log": "Registro"
  },
  "empty_output": "La salida está vacía.",
+ "loading": "Ejecución en curso. Los datos extraídos aparecerán aquí una vez que se complete la ejecución.",
  "captured_data": {
  "title": "Datos Capturados",
  "download_json": "Descargar como JSON",

public/locales/es.json

@@ -8,7 +8,16 @@
  "register_prompt": "アカウントをお持ちでないですか？",
  "register_link": "登録する",
  "welcome_notification": "Maxunへようこそ！",
- "error_notification": "ログインに失敗しました。もう一度お試しください。"
+ "validation": {
+ "required_fields": "メールアドレスとパスワードは必須です",
+ "password_length": "パスワードは6文字以上である必要があります"
+ },
+ "error": {
+ "user_not_found": "ユーザーが存在しません",
+ "invalid_credentials": "メールアドレスまたはパスワードが無効です",
+ "server_error": "ログインに失敗しました。後でもう一度お試しください",
+ "generic": "エラーが発生しました。もう一度お試しください"
+ }
  },
  "register": {
  "title": "アカウントを登録する",
@@ -19,7 +28,16 @@
  "register_prompt": "既にアカウントをお持ちですか？",
  "login_link": "ログイン",
  "welcome_notification": "Maxunへようこそ！",
- "error_notification": "登録に失敗しました。もう一度お試しください。"
+ "validation": {
+ "email_required": "メールアドレスは必須です",
+ "password_requirements": "パスワードは6文字以上である必要があります"
+ },
+ "error": {
+ "user_exists": "このメールアドレスは既に登録されています",
+ "creation_failed": "アカウントを作成できませんでした",
+ "server_error": "サーバーエラーが発生しました",
+ "generic": "登録に失敗しました。もう一度お試しください"
+ }
  },
  "recordingtable": {
  "run": "実行",
@@ -41,8 +59,9 @@
  "duplicate": "複製",
  "search": "ロボットを検索...",
  "notifications": {
- "delete_warning": "関連する実行があるため、ロボットを削除できません",
- "delete_success": "ロボットが正常に削除されました"
+ "delete_warning": "ロボットには関連する実行があります。ロボットを削除するには、まず実行を削除してください",
+ "delete_success": "ロボットが正常に削除されました",
+ "auth_success": "ロボットの認証に成功しました"
  }
  },
  "mainmenu": {
@@ -62,6 +81,7 @@
  "delete": "削除",
  "settings": "設定",
  "search": "実行を検索...",
+ "sort_tooltip": "クリックして並べ替え",
  "notifications": {
  "no_runs": "実行が見つかりません。もう一度お試しください。",
  "delete_success": "実行が正常に削除されました"
@@ -451,6 +471,7 @@
  "log": "ログ"
  },
  "empty_output": "出力は空です。",
+ "loading": "実行中です。実行が完了すると、抽出されたデータがここに表示されます。",
  "captured_data": {
  "title": "キャプチャされたデータ",
  "download_json": "JSONとしてダウンロード",

public/locales/ja.json

@@ -8,7 +8,16 @@
  "register_prompt": "还没有账号？",
  "register_link": "注册",
  "welcome_notification": "欢迎使用 Maxun！",
- "error_notification": "登录失败。请重试。"
+ "validation": {
+ "required_fields": "邮箱和密码为必填项",
+ "password_length": "密码必须至少6个字符"
+ },
+ "error": {
+ "user_not_found": "用户不存在",
+ "invalid_credentials": "邮箱或密码无效",
+ "server_error": "登录失败，请稍后重试",
+ "generic": "发生错误，请重试"
+ }
  },
  "register": {
  "title": "注册账号",
@@ -19,7 +28,16 @@
  "register_prompt": "已有账号？",
  "login_link": "登录",
  "welcome_notification": "欢迎使用 Maxun！",
- "error_notification": "注册失败。请重试。"
+ "validation": {
+ "email_required": "邮箱是必填项",
+ "password_requirements": "密码必须至少6个字符"
+ },
+ "error": {
+ "user_exists": "该邮箱已被注册",
+ "creation_failed": "无法创建账户",
+ "server_error": "服务器错误",
+ "generic": "注册失败，请重试"
+ }
  },
  "recordingtable": {
  "run": "运行",
@@ -41,8 +59,9 @@
  "duplicate": "复制",
  "search": "搜索机器人...",
  "notifications": {
- "delete_warning": "无法删除机器人，因为它有关联的运行记录",
- "delete_success": "机器人删除成功"
+ "delete_warning": "该机器人有关联的运行记录。请先删除运行记录才能删除机器人",
+ "delete_success": "机器人删除成功",
+ "auth_success": "机器人认证成功"
  }
  },
  "mainmenu": {
@@ -62,6 +81,7 @@
  "delete": "删除",
  "settings": "设置",
  "search": "搜索运行记录...",
+ "sort_tooltip": "点击排序",
  "notifications": {
  "no_runs": "未找到运行记录。请重试。",
  "delete_success": "运行记录删除成功"
@@ -451,6 +471,7 @@
  "log": "日志"
  },
  "empty_output": "输出为空。",
+ "loading": "运行中。运行完成后，提取的数据将显示在此处。",
  "captured_data": {
  "title": "捕获的数据",
  "download_json": "下载为JSON",

public/locales/zh.json

@@ -25,7 +25,7 @@ RUN mkdir -p /tmp/chromium-data-dir && \
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
- libgbm-dev \
+ libgbm1 \
  libnss3 \
  libatk1.0-0 \
  libatk-bridge2.0-0 \
@@ -48,4 +48,4 @@ RUN apt-get update && apt-get install -y \
 EXPOSE ${BACKEND_PORT:-8080}
 
 # Start the backend using the start script
-CMD ["npm", "run", "server"]
+CMD ["npm", "run", "server"]

server/Dockerfile

@@ -26,7 +26,6 @@ interface RobotAttributes {
  google_access_token?: string | null;
  google_refresh_token?: string | null;
  schedule?: ScheduleConfig | null;
- isLogin?: boolean;
 }
 
 interface ScheduleConfig {
@@ -55,7 +54,6 @@ class Robot extends Model<RobotAttributes, RobotCreationAttributes> implements R
  public google_access_token!: string | null;
  public google_refresh_token!: string | null;
  public schedule!: ScheduleConfig | null;
- public isLogin!: boolean;
 }
 
 Robot.init(
@@ -101,11 +99,6 @@ Robot.init(
  type: DataTypes.JSONB,
  allowNull: true,
  },
- isLogin: { 
- type: DataTypes.BOOLEAN,
- allowNull: false,
- defaultValue: false,
- },
  },
  {
  sequelize,