Skip to content

Commit e077306

Browse files
authored
Merge branch 'develop' into reload-fix
2 parents 8c0a832 + 135f2c9 commit e077306

36 files changed

+1552
-792
lines changed

maxun-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "maxun-core",
3-
"version": "0.0.9",
3+
"version": "0.0.10",
44
"description": "Core package for Maxun, responsible for data extraction",
55
"main": "build/index.js",
66
"typings": "build/index.d.ts",

maxun-core/src/interpret.ts

Lines changed: 258 additions & 178 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "maxun",
3-
"version": "0.0.7",
3+
"version": "0.0.8",
44
"author": "Maxun",
55
"license": "AGPL-3.0-or-later",
66
"dependencies": {
@@ -47,7 +47,7 @@
4747
"lodash": "^4.17.21",
4848
"loglevel": "^1.8.0",
4949
"loglevel-plugin-remote": "^0.6.8",
50-
"maxun-core": "^0.0.9",
50+
"maxun-core": "^0.0.10",
5151
"minio": "^8.0.1",
5252
"moment-timezone": "^0.5.45",
5353
"node-cron": "^3.0.3",

public/locales/de.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
"register_prompt": "Noch keinen Account?",
99
"register_link": "Registrieren",
1010
"welcome_notification": "Willkommen bei Maxun!",
11-
"error_notification": "Anmeldung fehlgeschlagen. Bitte versuchen Sie es erneut."
11+
"validation": {
12+
"required_fields": "E-Mail und Passwort sind erforderlich",
13+
"password_length": "Das Passwort muss mindestens 6 Zeichen lang sein"
14+
},
15+
"error": {
16+
"user_not_found": "Benutzer existiert nicht",
17+
"invalid_credentials": "Ungültige E-Mail oder Passwort",
18+
"server_error": "Anmeldung fehlgeschlagen. Bitte versuchen Sie es später erneut",
19+
"generic": "Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut"
20+
}
1221
},
1322
"register": {
1423
"title": "Konto registrieren",
@@ -19,7 +28,16 @@
1928
"register_prompt": "Bereits ein Konto?",
2029
"login_link": "Einloggen",
2130
"welcome_notification": "Willkommen bei Maxun!",
22-
"error_notification": "Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut."
31+
"validation": {
32+
"email_required": "E-Mail-Adresse ist erforderlich",
33+
"password_requirements": "Das Passwort muss mindestens 6 Zeichen lang sein"
34+
},
35+
"error": {
36+
"user_exists": "Ein Benutzer mit dieser E-Mail existiert bereits",
37+
"creation_failed": "Konto konnte nicht erstellt werden",
38+
"server_error": "Serverfehler aufgetreten",
39+
"generic": "Registrierung fehlgeschlagen. Bitte versuchen Sie es erneut"
40+
}
2341
},
2442
"recordingtable": {
2543
"run": "Ausführen",
@@ -40,8 +58,9 @@
4058
"delete": "Löschen",
4159
"duplicate": "Duplizieren",
4260
"notifications": {
43-
"delete_warning": "Roboter kann nicht gelöscht werden, da zugehörige Ausführungen vorhanden sind",
44-
"delete_success": "Roboter erfolgreich gelöscht"
61+
"delete_warning": "Der Roboter hat zugehörige Ausführungen. Löschen Sie zuerst die Ausführungen, um den Roboter zu löschen",
62+
"delete_success": "Roboter erfolgreich gelöscht",
63+
"auth_success": "Roboter erfolgreich authentifiziert"
4564
}
4665
},
4766
"mainmenu": {
@@ -61,6 +80,7 @@
6180
"delete": "Löschen",
6281
"settings": "Einstellungen",
6382
"search": "Ausführungen suchen...",
83+
"sort_tooltip": "Zum Sortieren klicken",
6484
"notifications": {
6585
"no_runs": "Keine Ausführungen gefunden. Bitte versuchen Sie es erneut.",
6686
"delete_success": "Ausführung erfolgreich gelöscht"
@@ -450,6 +470,7 @@
450470
"log": "Protokoll"
451471
},
452472
"empty_output": "Die Ausgabe ist leer.",
473+
"loading": "Ausführung läuft. Extrahierte Daten werden nach Abschluss des Durchlaufs hier angezeigt.",
453474
"captured_data": {
454475
"title": "Erfasste Daten",
455476
"download_json": "Als JSON herunterladen",

public/locales/en.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
"register_prompt": "Don't have an account?",
99
"register_link": "Register",
1010
"welcome_notification": "Welcome to Maxun!",
11-
"error_notification": "Login Failed. Please try again."
11+
"validation": {
12+
"required_fields": "Email and password are required",
13+
"password_length": "Password must be at least 6 characters"
14+
},
15+
"error": {
16+
"user_not_found": "User does not exist",
17+
"invalid_credentials": "Invalid email or password",
18+
"server_error": "Login failed. Please try again later",
19+
"generic": "An error occurred. Please try again"
20+
}
1221
},
1322
"register": {
1423
"title": "Register Account",
@@ -19,7 +28,16 @@
1928
"register_prompt": "Already have an account?",
2029
"login_link": "Login",
2130
"welcome_notification": "Welcome to Maxun!",
22-
"error_notification": "Registeration Failed. Please try again."
31+
"validation": {
32+
"email_required": "Email is required",
33+
"password_requirements": "Password must be at least 6 characters"
34+
},
35+
"error": {
36+
"user_exists": "User with this email already exists",
37+
"creation_failed": "Could not create account",
38+
"server_error": "Server error occurred",
39+
"generic": "Registration failed. Please try again"
40+
}
2341
},
2442
"recordingtable":{
2543
"run": "Run",
@@ -41,8 +59,9 @@
4159
"duplicate":"Duplicate",
4260
"search":"Search Robots...",
4361
"notifications": {
44-
"delete_warning": "Cannot delete robot as it has associated runs",
45-
"delete_success": "Robot deleted successfully"
62+
"delete_warning": "The robot has associated runs. First delete runs to delete the robot",
63+
"delete_success": "Robot deleted successfully",
64+
"auth_success": "Robot successfully authenticated"
4665
}
4766
},
4867
"mainmenu":{
@@ -62,6 +81,7 @@
6281
"delete":"Delete",
6382
"settings":"Settings",
6483
"search":"Search Runs...",
84+
"sort_tooltip": "Click to sort",
6585
"notifications": {
6686
"no_runs": "No runs found. Please try again.",
6787
"delete_success": "Run deleted successfully"
@@ -461,6 +481,7 @@
461481
"log": "Log"
462482
},
463483
"empty_output": "The output is empty.",
484+
"loading": "Run in progress. Extracted data will appear here once run completes.",
464485
"captured_data": {
465486
"title": "Captured Data",
466487
"download_json": "Download as JSON",

public/locales/es.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
"register_prompt": "¿No tienes una cuenta?",
99
"register_link": "Registrarse",
1010
"welcome_notification": "¡Bienvenido a Maxun!",
11-
"error_notification": "Error al iniciar sesión. Por favor, inténtalo de nuevo."
11+
"validation": {
12+
"required_fields": "El correo electrónico y la contraseña son obligatorios",
13+
"password_length": "La contraseña debe tener al menos 6 caracteres"
14+
},
15+
"error": {
16+
"user_not_found": "El usuario no existe",
17+
"invalid_credentials": "Correo electrónico o contraseña inválidos",
18+
"server_error": "Error al iniciar sesión. Por favor, inténtelo de nuevo más tarde",
19+
"generic": "Se produjo un error. Por favor, inténtelo de nuevo"
20+
}
1221
},
1322
"register": {
1423
"title": "Crear cuenta",
@@ -19,7 +28,16 @@
1928
"register_prompt": "¿Ya tienes una cuenta?",
2029
"login_link": "Iniciar sesión",
2130
"welcome_notification": "¡Bienvenido a Maxun!",
22-
"error_notification": "Error en el registro. Por favor, inténtalo de nuevo."
31+
"validation": {
32+
"email_required": "El correo electrónico es obligatorio",
33+
"password_requirements": "La contraseña debe tener al menos 6 caracteres"
34+
},
35+
"error": {
36+
"user_exists": "Ya existe un usuario con este correo electrónico",
37+
"creation_failed": "No se pudo crear la cuenta",
38+
"server_error": "Ocurrió un error en el servidor",
39+
"generic": "Error en el registro. Por favor, inténtelo de nuevo"
40+
}
2341
},
2442
"recordingtable": {
2543
"run": "Ejecutar",
@@ -41,8 +59,9 @@
4159
"duplicate": "Duplicar",
4260
"search": "Buscar robots...",
4361
"notifications": {
44-
"delete_warning": "No se puede eliminar el robot ya que tiene ejecuciones asociadas",
45-
"delete_success": "Robot eliminado exitosamente"
62+
"delete_warning": "El robot tiene ejecuciones asociadas. Primero elimine las ejecuciones para eliminar el robot",
63+
"delete_success": "Robot eliminado exitosamente",
64+
"auth_success": "Robot autenticado exitosamente"
4665
}
4766
},
4867
"mainmenu": {
@@ -62,6 +81,7 @@
6281
"delete": "Eliminar",
6382
"settings": "Ajustes",
6483
"search": "Buscar ejecuciones...",
84+
"sort_tooltip": "Haga clic para ordenar",
6585
"notifications": {
6686
"no_runs": "No se encontraron ejecuciones. Por favor, inténtelo de nuevo.",
6787
"delete_success": "Ejecución eliminada con éxito"
@@ -451,6 +471,7 @@
451471
"log": "Registro"
452472
},
453473
"empty_output": "La salida está vacía.",
474+
"loading": "Ejecución en curso. Los datos extraídos aparecerán aquí una vez que se complete la ejecución.",
454475
"captured_data": {
455476
"title": "Datos Capturados",
456477
"download_json": "Descargar como JSON",

public/locales/ja.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
"register_prompt": "アカウントをお持ちでないですか?",
99
"register_link": "登録する",
1010
"welcome_notification": "Maxunへようこそ!",
11-
"error_notification": "ログインに失敗しました。もう一度お試しください。"
11+
"validation": {
12+
"required_fields": "メールアドレスとパスワードは必須です",
13+
"password_length": "パスワードは6文字以上である必要があります"
14+
},
15+
"error": {
16+
"user_not_found": "ユーザーが存在しません",
17+
"invalid_credentials": "メールアドレスまたはパスワードが無効です",
18+
"server_error": "ログインに失敗しました。後でもう一度お試しください",
19+
"generic": "エラーが発生しました。もう一度お試しください"
20+
}
1221
},
1322
"register": {
1423
"title": "アカウントを登録する",
@@ -19,7 +28,16 @@
1928
"register_prompt": "既にアカウントをお持ちですか?",
2029
"login_link": "ログイン",
2130
"welcome_notification": "Maxunへようこそ!",
22-
"error_notification": "登録に失敗しました。もう一度お試しください。"
31+
"validation": {
32+
"email_required": "メールアドレスは必須です",
33+
"password_requirements": "パスワードは6文字以上である必要があります"
34+
},
35+
"error": {
36+
"user_exists": "このメールアドレスは既に登録されています",
37+
"creation_failed": "アカウントを作成できませんでした",
38+
"server_error": "サーバーエラーが発生しました",
39+
"generic": "登録に失敗しました。もう一度お試しください"
40+
}
2341
},
2442
"recordingtable": {
2543
"run": "実行",
@@ -41,8 +59,9 @@
4159
"duplicate": "複製",
4260
"search": "ロボットを検索...",
4361
"notifications": {
44-
"delete_warning": "関連する実行があるため、ロボットを削除できません",
45-
"delete_success": "ロボットが正常に削除されました"
62+
"delete_warning": "ロボットには関連する実行があります。ロボットを削除するには、まず実行を削除してください",
63+
"delete_success": "ロボットが正常に削除されました",
64+
"auth_success": "ロボットの認証に成功しました"
4665
}
4766
},
4867
"mainmenu": {
@@ -62,6 +81,7 @@
6281
"delete": "削除",
6382
"settings": "設定",
6483
"search": "実行を検索...",
84+
"sort_tooltip": "クリックして並べ替え",
6585
"notifications": {
6686
"no_runs": "実行が見つかりません。もう一度お試しください。",
6787
"delete_success": "実行が正常に削除されました"
@@ -451,6 +471,7 @@
451471
"log": "ログ"
452472
},
453473
"empty_output": "出力は空です。",
474+
"loading": "実行中です。実行が完了すると、抽出されたデータがここに表示されます。",
454475
"captured_data": {
455476
"title": "キャプチャされたデータ",
456477
"download_json": "JSONとしてダウンロード",

public/locales/zh.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,16 @@
88
"register_prompt": "还没有账号?",
99
"register_link": "注册",
1010
"welcome_notification": "欢迎使用 Maxun!",
11-
"error_notification": "登录失败。请重试。"
11+
"validation": {
12+
"required_fields": "邮箱和密码为必填项",
13+
"password_length": "密码必须至少6个字符"
14+
},
15+
"error": {
16+
"user_not_found": "用户不存在",
17+
"invalid_credentials": "邮箱或密码无效",
18+
"server_error": "登录失败,请稍后重试",
19+
"generic": "发生错误,请重试"
20+
}
1221
},
1322
"register": {
1423
"title": "注册账号",
@@ -19,7 +28,16 @@
1928
"register_prompt": "已有账号?",
2029
"login_link": "登录",
2130
"welcome_notification": "欢迎使用 Maxun!",
22-
"error_notification": "注册失败。请重试。"
31+
"validation": {
32+
"email_required": "邮箱是必填项",
33+
"password_requirements": "密码必须至少6个字符"
34+
},
35+
"error": {
36+
"user_exists": "该邮箱已被注册",
37+
"creation_failed": "无法创建账户",
38+
"server_error": "服务器错误",
39+
"generic": "注册失败,请重试"
40+
}
2341
},
2442
"recordingtable": {
2543
"run": "运行",
@@ -41,8 +59,9 @@
4159
"duplicate": "复制",
4260
"search": "搜索机器人...",
4361
"notifications": {
44-
"delete_warning": "无法删除机器人,因为它有关联的运行记录",
45-
"delete_success": "机器人删除成功"
62+
"delete_warning": "该机器人有关联的运行记录。请先删除运行记录才能删除机器人",
63+
"delete_success": "机器人删除成功",
64+
"auth_success": "机器人认证成功"
4665
}
4766
},
4867
"mainmenu": {
@@ -62,6 +81,7 @@
6281
"delete": "删除",
6382
"settings": "设置",
6483
"search": "搜索运行记录...",
84+
"sort_tooltip": "点击排序",
6585
"notifications": {
6686
"no_runs": "未找到运行记录。请重试。",
6787
"delete_success": "运行记录删除成功"
@@ -451,6 +471,7 @@
451471
"log": "日志"
452472
},
453473
"empty_output": "输出为空。",
474+
"loading": "运行中。运行完成后,提取的数据将显示在此处。",
454475
"captured_data": {
455476
"title": "捕获的数据",
456477
"download_json": "下载为JSON",

server/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN mkdir -p /tmp/chromium-data-dir && \
2525

2626
# Install dependencies
2727
RUN apt-get update && apt-get install -y \
28-
libgbm-dev \
28+
libgbm1 \
2929
libnss3 \
3030
libatk1.0-0 \
3131
libatk-bridge2.0-0 \
@@ -48,4 +48,4 @@ RUN apt-get update && apt-get install -y \
4848
EXPOSE ${BACKEND_PORT:-8080}
4949

5050
# Start the backend using the start script
51-
CMD ["npm", "run", "server"]
51+
CMD ["npm", "run", "server"]

server/src/models/Robot.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ interface RobotAttributes {
2626
google_access_token?: string | null;
2727
google_refresh_token?: string | null;
2828
schedule?: ScheduleConfig | null;
29-
isLogin?: boolean;
3029
}
3130

3231
interface ScheduleConfig {
@@ -55,7 +54,6 @@ class Robot extends Model<RobotAttributes, RobotCreationAttributes> implements R
5554
public google_access_token!: string | null;
5655
public google_refresh_token!: string | null;
5756
public schedule!: ScheduleConfig | null;
58-
public isLogin!: boolean;
5957
}
6058

6159
Robot.init(
@@ -101,11 +99,6 @@ Robot.init(
10199
type: DataTypes.JSONB,
102100
allowNull: true,
103101
},
104-
isLogin: {
105-
type: DataTypes.BOOLEAN,
106-
allowNull: false,
107-
defaultValue: false,
108-
},
109102
},
110103
{
111104
sequelize,

0 commit comments

Comments
 (0)