4 Commits
8 changed files with 898 additions and 824 deletions
Binary file not shown.
Binary file not shown.
+2 -1
View File
@@ -25,7 +25,7 @@ app = FastAPI(
# Middleware de Compresión GZip (optimiza transferencia a tablets por Wi-Fi) # Middleware de Compresión GZip (optimiza transferencia a tablets por Wi-Fi)
app.add_middleware(GZipMiddleware, minimum_size=1000) app.add_middleware(GZipMiddleware, minimum_size=1000)
# Middleware de CORS con soporte para Capacitor (Android/iOS), LAN y Web # Middleware de CORS con soporte para Capacitor (Android/iOS), LAN, PNA y Web
app.add_middleware( app.add_middleware(
CORSMiddleware, CORSMiddleware,
allow_origins=settings.ALLOWED_ORIGINS, allow_origins=settings.ALLOWED_ORIGINS,
@@ -33,6 +33,7 @@ app.add_middleware(
allow_credentials=True, allow_credentials=True,
allow_methods=["*"], allow_methods=["*"],
allow_headers=["*"], allow_headers=["*"],
allow_private_network=True,
) )
@@ -1,5 +1,16 @@
package com.oemspot.onevercontrol; package com.oemspot.onevercontrol;
import android.os.Bundle;
import androidx.core.view.WindowCompat;
import com.getcapacitor.BridgeActivity; import com.getcapacitor.BridgeActivity;
public class MainActivity extends BridgeActivity {} public class MainActivity extends BridgeActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// Asegurar que la ventana respete limpiamente las barras del sistema (Status Bar y Navigation Bar)
// evitando solapamientos y eliminando espacios vacíos redundantes
WindowCompat.setDecorFitsSystemWindows(getWindow(), true);
}
}
+1
View File
@@ -10,6 +10,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
org.gradle.java.home=C:/Program Files/Eclipse Adoptium/jdk-21.0.2.13-hotspot
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
+10 -1
View File
@@ -7,7 +7,16 @@ export function getBaseUrl(): string {
// 1. URL personalizada en localStorage (útil para configurar IP de backend en tablet) // 1. URL personalizada en localStorage (útil para configurar IP de backend en tablet)
const savedUrl = localStorage.getItem('on_ever_api_url'); const savedUrl = localStorage.getItem('on_ever_api_url');
if (savedUrl && savedUrl.trim()) { if (savedUrl && savedUrl.trim()) {
const trimmed = savedUrl.trim(); let trimmed = savedUrl.trim();
// Si en una tablet Android (Capacitor) guardan solo "/api/v1" o una ruta relativa,
// en la app nativa debe resolverse hacia la IP LAN del backend
if (Capacitor.isNativePlatform() && trimmed.startsWith('/')) {
return `http://192.168.0.100:8000${trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed}`;
}
// Si ingresaron la IP sin protocolo (ej: "192.168.0.100:8000" o "192.168.0.100:8000/api/v1")
if (!trimmed.startsWith('http://') && !trimmed.startsWith('https://') && !trimmed.startsWith('/')) {
trimmed = `http://${trimmed}`;
}
return trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed; return trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed;
} }
+82
View File
@@ -25,6 +25,8 @@ html, body {
touch-action: manipulation; touch-action: manipulation;
overscroll-behavior-y: contain; overscroll-behavior-y: contain;
user-select: none; user-select: none;
margin: 0;
padding: 0;
} }
#root { #root {
@@ -647,6 +649,75 @@ button:disabled, .btn:disabled, .touch-button:disabled {
border-bottom: 3px solid #2563EB; border-bottom: 3px solid #2563EB;
} }
.desktop-menu-hamburger-btn {
background: var(--input-bg);
border: 1px solid var(--border);
border-radius: 8px;
color: var(--text-1);
padding: 6px 12px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
transition: all 0.15s ease;
user-select: none;
}
.desktop-menu-hamburger-btn:hover {
background: var(--hover-bg, rgba(255, 255, 255, 0.08));
border-color: var(--brand-primary, #3B82F6);
}
/* ==============================================================================
NUEVO FLUJO COCKPIT UNIFICADO (OPTIMIZADO TABLETS Y ESCRITORIO)
Orden exacto: DATOS PERSONA -> UBICACION/DESTINO & OBSERVACIONES ->
DOCUMENTACION Y POLIZAS -> LECTOR & CAMARAS -> HISTORIAL
============================================================================== */
.cockpit-flow-container {
flex: 1;
display: flex;
flex-direction: column;
gap: 8px;
padding: 8px 12px;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
background-color: var(--bg-main, #0B1120);
}
.cockpit-dual-row {
display: grid;
grid-template-columns: 1.15fr 1fr;
gap: 8px;
}
@media (max-width: 680px) {
.cockpit-dual-row {
grid-template-columns: 1fr;
}
}
.cockpit-bottom-dock {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 14px;
padding-bottom: max(10px, env(safe-area-inset-bottom, 0px));
background-color: var(--bg-surface, #070D1E);
border-top: 1px solid var(--border-strong, #1E293B);
position: sticky;
bottom: 0;
z-index: 100;
box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.35);
flex-shrink: 0;
}
@keyframes slideInRight {
from {
transform: translateX(100%);
}
to {
transform: translateX(0);
}
}
.desktop-cockpit-grid { .desktop-cockpit-grid {
flex: 1; flex: 1;
display: grid; display: grid;
@@ -959,3 +1030,14 @@ button:disabled, .btn:disabled, .touch-button:disabled {
border: 1px dashed #94A3B8; border: 1px dashed #94A3B8;
} }
[data-theme="light"] .cockpit-flow-container {
background-color: #F1F5F9;
}
[data-theme="light"] .cockpit-bottom-dock {
background-color: #FFFFFF;
border-top: 1px solid #CBD5E1;
box-shadow: 0 -4px 12px rgba(0, 0, 0, 0.08);
}
File diff suppressed because it is too large Load Diff