Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a36b74a1cf | ||
|
|
c881e6a2b2 | ||
|
|
7693a02c98 | ||
|
|
528a1622d0 | ||
|
|
51a4cb9ed2 | ||
|
|
22307d44de | ||
|
|
41e0501e6b | ||
|
|
f675b86dc8 | ||
|
|
8ed1b57f1d | ||
|
|
bf1725a4b8 | ||
|
|
8954535e08 | ||
|
|
b93be6c6cb |
@@ -64,7 +64,9 @@ jobs:
|
|||||||
- name: Setup Android SDK
|
- name: Setup Android SDK
|
||||||
uses: android-actions/setup-android@v3
|
uses: android-actions/setup-android@v3
|
||||||
with:
|
with:
|
||||||
packages: 'platforms;android-36 build-tools;36.0.0 ndk;28.0.13004108'
|
packages: 'platforms;android-36 build-tools;36.0.0'
|
||||||
|
- name: Pin NDK version
|
||||||
|
run: echo "ANDROID_NDK_HOME=${ANDROID_SDK_ROOT}/ndk/$(ls ${ANDROID_SDK_ROOT}/ndk | sort -V | head -1)" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Setup Rust with Android targets
|
- name: Setup Rust with Android targets
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
@@ -92,7 +94,6 @@ jobs:
|
|||||||
path: |
|
path: |
|
||||||
~/.gradle/caches
|
~/.gradle/caches
|
||||||
~/.gradle/wrapper
|
~/.gradle/wrapper
|
||||||
apps/tauri/gen/android/.gradle
|
|
||||||
key: ${{ runner.os }}-gradle-android-${{ hashFiles('apps/tauri/Cargo.lock') }}
|
key: ${{ runner.os }}-gradle-android-${{ hashFiles('apps/tauri/Cargo.lock') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-gradle-android-
|
${{ runner.os }}-gradle-android-
|
||||||
@@ -131,7 +132,9 @@ jobs:
|
|||||||
JAVA_HOME: ${{ env.JAVA_HOME_21_X64 }}
|
JAVA_HOME: ${{ env.JAVA_HOME_21_X64 }}
|
||||||
ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}
|
ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}
|
||||||
NDK_HOME: ${{ env.ANDROID_NDK_HOME }}
|
NDK_HOME: ${{ env.ANDROID_NDK_HOME }}
|
||||||
run: bun tauri android init
|
run: |
|
||||||
|
rm -rf gen/android
|
||||||
|
bun tauri android init
|
||||||
|
|
||||||
- name: Build Tauri Android APK
|
- name: Build Tauri Android APK
|
||||||
working-directory: apps/tauri
|
working-directory: apps/tauri
|
||||||
@@ -139,7 +142,7 @@ jobs:
|
|||||||
JAVA_HOME: ${{ env.JAVA_HOME_21_X64 }}
|
JAVA_HOME: ${{ env.JAVA_HOME_21_X64 }}
|
||||||
ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}
|
ANDROID_HOME: ${{ env.ANDROID_SDK_ROOT }}
|
||||||
NDK_HOME: ${{ env.ANDROID_NDK_HOME }}
|
NDK_HOME: ${{ env.ANDROID_NDK_HOME }}
|
||||||
run: bun tauri android build
|
run: bun tauri android build --apk
|
||||||
|
|
||||||
- name: Decode keystore
|
- name: Decode keystore
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
|
|||||||
@@ -189,8 +189,17 @@ jobs:
|
|||||||
docker rm -f zeavis-web zeavis-api zeavis-ml zeavis-node-exporter 2>/dev/null || true
|
docker rm -f zeavis-web zeavis-api zeavis-ml zeavis-node-exporter 2>/dev/null || true
|
||||||
docker compose pull
|
docker compose pull
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
# Wait for containers to be healthy (up to 60s)
|
||||||
|
wait_container() {
|
||||||
|
local name=$1
|
||||||
|
for i in $(seq 1 30); do
|
||||||
|
docker compose ps | grep -q "${name}.*Up" && return 0
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
wait_container zeavis-web || exit 1
|
||||||
|
wait_container zeavis-api || exit 1
|
||||||
|
wait_container zeavis-ml || exit 1
|
||||||
|
wait_container zeavis-node-exporter || echo "⚠️ node_exporter not running (non-fatal)"
|
||||||
docker compose ps
|
docker compose ps
|
||||||
docker compose ps | grep -q "zeavis-web.*Up" || exit 1
|
|
||||||
docker compose ps | grep -q "zeavis-api.*Up" || exit 1
|
|
||||||
docker compose ps | grep -q "zeavis-ml.*Up" || exit 1
|
|
||||||
docker compose ps | grep -q "zeavis-node-exporter.*Up" || echo "⚠️ node_exporter not running (non-fatal)"
|
|
||||||
|
|||||||
+4
-1
@@ -1,9 +1,10 @@
|
|||||||
FROM oven/bun:1.3.14 AS deps
|
FROM oven/bun:1.3.14 AS deps
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package.json bunfig.toml tsconfig.base.json ./
|
COPY package.json bun.lock bunfig.toml tsconfig.base.json ./
|
||||||
COPY apps/api/package.json apps/api/package.json
|
COPY apps/api/package.json apps/api/package.json
|
||||||
COPY apps/web/package.json apps/web/package.json
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY apps/tauri/package.json apps/tauri/package.json
|
||||||
COPY packages/shared/package.json packages/shared/package.json
|
COPY packages/shared/package.json packages/shared/package.json
|
||||||
RUN bun install --production
|
RUN bun install --production
|
||||||
|
|
||||||
@@ -13,6 +14,8 @@ ENV NODE_ENV=production
|
|||||||
ENV API_PORT=3000
|
ENV API_PORT=3000
|
||||||
|
|
||||||
COPY --from=deps /app/node_modules ./node_modules
|
COPY --from=deps /app/node_modules ./node_modules
|
||||||
|
COPY --from=deps /app/apps/api/node_modules apps/api/node_modules
|
||||||
|
COPY --from=deps /app/bun.lock ./bun.lock
|
||||||
COPY package.json bunfig.toml tsconfig.base.json ./
|
COPY package.json bunfig.toml tsconfig.base.json ./
|
||||||
COPY apps/api apps/api
|
COPY apps/api apps/api
|
||||||
COPY packages/shared packages/shared
|
COPY packages/shared packages/shared
|
||||||
|
|||||||
@@ -8,6 +8,13 @@ const googleOAuthEnabled = Boolean(
|
|||||||
);
|
);
|
||||||
|
|
||||||
const webAppUrl = Bun.env.WEB_APP_URL ?? 'http://localhost:5173';
|
const webAppUrl = Bun.env.WEB_APP_URL ?? 'http://localhost:5173';
|
||||||
|
const allowedOrigins = [
|
||||||
|
webAppUrl,
|
||||||
|
'https://tauri.localhost',
|
||||||
|
'http://tauri.localhost',
|
||||||
|
'tauri://localhost',
|
||||||
|
'http://localhost:5173',
|
||||||
|
];
|
||||||
const secureCookies = Bun.env.SECURE_COOKIES === 'true' || webAppUrl.startsWith('https://');
|
const secureCookies = Bun.env.SECURE_COOKIES === 'true' || webAppUrl.startsWith('https://');
|
||||||
|
|
||||||
export const env = {
|
export const env = {
|
||||||
@@ -24,6 +31,7 @@ export const env = {
|
|||||||
googleClientSecret: Bun.env.GOOGLE_CLIENT_SECRET,
|
googleClientSecret: Bun.env.GOOGLE_CLIENT_SECRET,
|
||||||
googleRedirectUri: Bun.env.GOOGLE_REDIRECT_URI,
|
googleRedirectUri: Bun.env.GOOGLE_REDIRECT_URI,
|
||||||
webAppUrl,
|
webAppUrl,
|
||||||
|
allowedOrigins,
|
||||||
secureCookies,
|
secureCookies,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ assertRequiredEnv();
|
|||||||
|
|
||||||
const app = new Elysia()
|
const app = new Elysia()
|
||||||
.use(cors({
|
.use(cors({
|
||||||
origin: env.webAppUrl,
|
origin: env.allowedOrigins,
|
||||||
credentials: true,
|
credentials: true,
|
||||||
}))
|
}))
|
||||||
.use(metricsRoutes)
|
.use(metricsRoutes)
|
||||||
|
|||||||
@@ -28,14 +28,26 @@ function hashToken(token: string) {
|
|||||||
return createHash('sha256').update(`${env.sessionSecret}:${token}`).digest('hex');
|
return createHash('sha256').update(`${env.sessionSecret}:${token}`).digest('hex');
|
||||||
}
|
}
|
||||||
|
|
||||||
export function createSessionCookie(token: string) {
|
function isSecureRequest(headers?: { get(name: string): string | null }) {
|
||||||
|
if (env.secureCookies) return true;
|
||||||
|
// Detect HTTPS behind proxy (X-Forwarded-Proto)
|
||||||
|
const proto = headers?.get('x-forwarded-proto');
|
||||||
|
if (proto === 'https') return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildSameSite(headers?: { get(name: string): string | null }) {
|
||||||
|
return isSecureRequest(headers) ? 'SameSite=None; Secure' : 'SameSite=Lax';
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createSessionCookie(token: string, headers?: { get(name: string): string | null }) {
|
||||||
const maxAge = 60 * 60 * 24 * 30;
|
const maxAge = 60 * 60 * 24 * 30;
|
||||||
const sameSite = env.secureCookies ? 'SameSite=None; Secure' : 'SameSite=Lax';
|
const sameSite = buildSameSite(headers);
|
||||||
return `${sessionCookieName}=${token}; HttpOnly; Path=/; ${sameSite}; Max-Age=${maxAge}`;
|
return `${sessionCookieName}=${token}; HttpOnly; Path=/; ${sameSite}; Max-Age=${maxAge}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function clearSessionCookie() {
|
export function clearSessionCookie(headers?: { get(name: string): string | null }) {
|
||||||
const sameSite = env.secureCookies ? 'SameSite=None; Secure' : 'SameSite=Lax';
|
const sameSite = buildSameSite(headers);
|
||||||
return `${sessionCookieName}=; HttpOnly; Path=/; ${sameSite}; Max-Age=0`;
|
return `${sessionCookieName}=; HttpOnly; Path=/; ${sameSite}; Max-Age=0`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,6 +61,19 @@ export function readSessionToken(cookieHeader: string | null | undefined) {
|
|||||||
return decodeURIComponent(sessionCookie.slice(sessionCookieName.length + 1));
|
return decodeURIComponent(sessionCookie.slice(sessionCookieName.length + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract bearer token from Authorization header.
|
||||||
|
* Used as fallback when cookies are blocked (e.g. Android WebView third-party blocking).
|
||||||
|
*/
|
||||||
|
export function readBearerToken(headers?: { get(name: string): string | null }) {
|
||||||
|
if (!headers) return null;
|
||||||
|
const auth = headers.get('authorization');
|
||||||
|
if (!auth) return null;
|
||||||
|
const parts = auth.split(' ');
|
||||||
|
if (parts.length !== 2 || parts[0] !== 'Bearer') return null;
|
||||||
|
return parts[1];
|
||||||
|
}
|
||||||
|
|
||||||
export async function createSession(userId: string) {
|
export async function createSession(userId: string) {
|
||||||
const db = createDbClient();
|
const db = createDbClient();
|
||||||
const token = randomBytes(32).toString('base64url');
|
const token = randomBytes(32).toString('base64url');
|
||||||
@@ -71,8 +96,12 @@ export async function deleteSession(token: string | null) {
|
|||||||
await db.delete(sessions).where(eq(sessions.tokenHash, hashToken(token)));
|
await db.delete(sessions).where(eq(sessions.tokenHash, hashToken(token)));
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getCurrentUser(cookieHeader: string | null | undefined): Promise<CurrentUser | null> {
|
export async function getCurrentUser(
|
||||||
const token = readSessionToken(cookieHeader);
|
cookieHeader: string | null | undefined,
|
||||||
|
headers?: { get(name: string): string | null },
|
||||||
|
): Promise<CurrentUser | null> {
|
||||||
|
// Try cookie first, then Authorization header (for Android WebView where 3rd-party cookies are blocked)
|
||||||
|
const token = readSessionToken(cookieHeader) ?? readBearerToken(headers);
|
||||||
if (!token) return null;
|
if (!token) return null;
|
||||||
|
|
||||||
const db = createDbClient();
|
const db = createDbClient();
|
||||||
|
|||||||
@@ -32,13 +32,13 @@ function validatePassword(password: unknown) {
|
|||||||
|
|
||||||
export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
||||||
.get('/me', async ({ request }) => {
|
.get('/me', async ({ request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
return {
|
return {
|
||||||
user,
|
user,
|
||||||
features: getAuthFeatures(),
|
features: getAuthFeatures(),
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.post('/register', async ({ body, set }) => {
|
.post('/register', async ({ body, set, request }) => {
|
||||||
const req = body as Partial<RegisterRequest> | undefined;
|
const req = body as Partial<RegisterRequest> | undefined;
|
||||||
const email = normalizeEmail(req?.email);
|
const email = normalizeEmail(req?.email);
|
||||||
const name = normalizeName(req?.name);
|
const name = normalizeName(req?.name);
|
||||||
@@ -62,7 +62,7 @@ export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
|||||||
|
|
||||||
const user = inserted[0];
|
const user = inserted[0];
|
||||||
const token = await createSession(user.id);
|
const token = await createSession(user.id);
|
||||||
set.headers['Set-Cookie'] = createSessionCookie(token);
|
set.headers['Set-Cookie'] = createSessionCookie(token, request.headers);
|
||||||
|
|
||||||
authCounter.labels('register', 'true').inc();
|
authCounter.labels('register', 'true').inc();
|
||||||
|
|
||||||
@@ -73,13 +73,14 @@ export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
|||||||
name: user.name,
|
name: user.name,
|
||||||
role: 'user' as const,
|
role: 'user' as const,
|
||||||
},
|
},
|
||||||
|
token,
|
||||||
features: getAuthFeatures(),
|
features: getAuthFeatures(),
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
return serviceUnavailable('Database unavailable');
|
return serviceUnavailable('Database unavailable');
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.post('/login', async ({ body, set }) => {
|
.post('/login', async ({ body, set, request }) => {
|
||||||
const req = body as Partial<AuthRequest> | undefined;
|
const req = body as Partial<AuthRequest> | undefined;
|
||||||
const email = normalizeEmail(req?.email);
|
const email = normalizeEmail(req?.email);
|
||||||
|
|
||||||
@@ -98,7 +99,7 @@ export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
|||||||
}
|
}
|
||||||
|
|
||||||
const token = await createSession(user.id);
|
const token = await createSession(user.id);
|
||||||
set.headers['Set-Cookie'] = createSessionCookie(token);
|
set.headers['Set-Cookie'] = createSessionCookie(token, request.headers);
|
||||||
|
|
||||||
authCounter.labels('login', 'true').inc();
|
authCounter.labels('login', 'true').inc();
|
||||||
|
|
||||||
@@ -109,6 +110,7 @@ export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
|||||||
name: user.name,
|
name: user.name,
|
||||||
role: user.role === 'expert' ? 'expert' as const : 'user' as const,
|
role: user.role === 'expert' ? 'expert' as const : 'user' as const,
|
||||||
},
|
},
|
||||||
|
token,
|
||||||
features: getAuthFeatures(),
|
features: getAuthFeatures(),
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -116,8 +118,9 @@ export const authRoutes = new Elysia({ prefix: '/api/v1/auth' })
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.post('/logout', async ({ request, set }) => {
|
.post('/logout', async ({ request, set }) => {
|
||||||
await deleteSession(readSessionToken(request.headers.get('cookie')));
|
const cookieHeader = request.headers.get('cookie');
|
||||||
set.headers['Set-Cookie'] = clearSessionCookie();
|
await deleteSession(readSessionToken(cookieHeader));
|
||||||
|
set.headers['Set-Cookie'] = clearSessionCookie(request.headers);
|
||||||
return { ok: true };
|
return { ok: true };
|
||||||
})
|
})
|
||||||
.get('/google', ({ set }) => {
|
.get('/google', ({ set }) => {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export const dashboardRoutes = new Elysia({ prefix: '/api/v1' })
|
|||||||
.get('/dashboard/summary', async ({ request }) => {
|
.get('/dashboard/summary', async ({ request }) => {
|
||||||
try {
|
try {
|
||||||
const db = createDbClient();
|
const db = createDbClient();
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
|
|
||||||
const diseases = await db.select().from(diseaseCatalog).orderBy(diseaseCatalog.displayOrder);
|
const diseases = await db.select().from(diseaseCatalog).orderBy(diseaseCatalog.displayOrder);
|
||||||
const manualRows = await db.select().from(manualClassifications).orderBy(desc(manualClassifications.createdAt)).limit(1);
|
const manualRows = await db.select().from(manualClassifications).orderBy(desc(manualClassifications.createdAt)).limit(1);
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ function getFileFromBody(body: unknown): File | null {
|
|||||||
|
|
||||||
export const diagnosisRoutes = new Elysia({ prefix: '/api/v1' })
|
export const diagnosisRoutes = new Elysia({ prefix: '/api/v1' })
|
||||||
.post('/diagnoses', async ({ body, request }) => {
|
.post('/diagnoses', async ({ body, request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
if (!user) return unauthorized('Authentication required');
|
if (!user) return unauthorized('Authentication required');
|
||||||
|
|
||||||
const file = getFileFromBody(body);
|
const file = getFileFromBody(body);
|
||||||
@@ -251,7 +251,7 @@ export const diagnosisRoutes = new Elysia({ prefix: '/api/v1' })
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.get('/diagnoses', async ({ request }) => {
|
.get('/diagnoses', async ({ request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
if (!user) return unauthorized('Authentication required');
|
if (!user) return unauthorized('Authentication required');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -270,7 +270,7 @@ export const diagnosisRoutes = new Elysia({ prefix: '/api/v1' })
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.get('/diagnoses/:id', async ({ params, request }) => {
|
.get('/diagnoses/:id', async ({ params, request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
if (!user) return unauthorized('Authentication required');
|
if (!user) return unauthorized('Authentication required');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ function isDiagnosisRecordOrNull(record: unknown): record is DiagnosisRecord {
|
|||||||
|
|
||||||
export const expertRoutes = new Elysia({ prefix: '/api/v1/expert' })
|
export const expertRoutes = new Elysia({ prefix: '/api/v1/expert' })
|
||||||
.get('/reviews', async ({ request }) => {
|
.get('/reviews', async ({ request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
if (!user) return unauthorized('Authentication required');
|
if (!user) return unauthorized('Authentication required');
|
||||||
if (user.role !== 'expert') return forbidden('Expert role required');
|
if (user.role !== 'expert') return forbidden('Expert role required');
|
||||||
|
|
||||||
@@ -36,7 +36,7 @@ export const expertRoutes = new Elysia({ prefix: '/api/v1/expert' })
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.post('/reviews/:diagnosisId', async ({ params, body, request }) => {
|
.post('/reviews/:diagnosisId', async ({ params, body, request }) => {
|
||||||
const user = await getCurrentUser(request.headers.get('cookie'));
|
const user = await getCurrentUser(request.headers.get('cookie'), request.headers);
|
||||||
if (!user) return unauthorized('Authentication required');
|
if (!user) return unauthorized('Authentication required');
|
||||||
if (user.role !== 'expert') return forbidden('Expert role required');
|
if (user.role !== 'expert') return forbidden('Expert role required');
|
||||||
|
|
||||||
|
|||||||
Generated
+3
@@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
+1870
File diff suppressed because it is too large
Load Diff
Generated
+13
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DeviceTable">
|
||||||
|
<option name="columnSorters">
|
||||||
|
<list>
|
||||||
|
<ColumnSorterState>
|
||||||
|
<option name="column" value="Name" />
|
||||||
|
<option name="order" value="ASCENDING" />
|
||||||
|
</ColumnSorterState>
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+17
@@ -0,0 +1,17 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DiscordProjectSettings">
|
||||||
|
<option name="show" value="ASK" />
|
||||||
|
<option name="description" value="" />
|
||||||
|
<option name="applicationTheme" value="default" />
|
||||||
|
<option name="iconsTheme" value="default" />
|
||||||
|
<option name="button1Title" value="" />
|
||||||
|
<option name="button1Url" value="" />
|
||||||
|
<option name="button2Title" value="" />
|
||||||
|
<option name="button2Url" value="" />
|
||||||
|
<option name="customApplicationId" value="" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2">
|
||||||
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/tauri.iml" filepath="$PROJECT_DIR$/.idea/tauri.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+9
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
Generated
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Patches the generated AndroidManifest.xml to add CAMERA permission.
|
||||||
|
# Run after `tauri android init` to apply.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
MANIFEST="gen/android/app/src/main/AndroidManifest.xml"
|
||||||
|
|
||||||
|
if [ ! -f "$MANIFEST" ]; then
|
||||||
|
echo "ERROR: $MANIFEST not found. Run 'tauri android init' first." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if grep -q 'android.permission.CAMERA' "$MANIFEST"; then
|
||||||
|
echo "CAMERA permission already present in AndroidManifest.xml"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Adding CAMERA permission to AndroidManifest.xml..."
|
||||||
|
sed -i 's|<uses-permission android:name="android.permission.INTERNET" />|<uses-permission android:name="android.permission.INTERNET" />\n <uses-permission android:name="android.permission.CAMERA" />\n <uses-feature android:name="android.hardware.camera" android:required="false" />\n <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />|' "$MANIFEST"
|
||||||
|
echo "Done."
|
||||||
+2
-1
@@ -1,10 +1,11 @@
|
|||||||
FROM oven/bun:1.3.14 AS builder
|
FROM oven/bun:1.3.14 AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY package.json bunfig.toml tsconfig.base.json ./
|
COPY package.json bun.lock bunfig.toml tsconfig.base.json ./
|
||||||
COPY packages/shared/package.json packages/shared/package.json
|
COPY packages/shared/package.json packages/shared/package.json
|
||||||
COPY apps/web/package.json apps/web/package.json
|
COPY apps/web/package.json apps/web/package.json
|
||||||
COPY apps/api/package.json apps/api/package.json
|
COPY apps/api/package.json apps/api/package.json
|
||||||
|
COPY apps/tauri/package.json apps/tauri/package.json
|
||||||
RUN bun install
|
RUN bun install
|
||||||
|
|
||||||
COPY packages/shared packages/shared
|
COPY packages/shared packages/shared
|
||||||
|
|||||||
@@ -10,27 +10,32 @@ type AuthGuardProps = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function AuthGuard({ children, requireExpert = false }: AuthGuardProps) {
|
export function AuthGuard({ children, requireExpert = false }: AuthGuardProps) {
|
||||||
|
const user = useAuthStore((state) => state.user);
|
||||||
const setUser = useAuthStore((state) => state.setUser);
|
const setUser = useAuthStore((state) => state.setUser);
|
||||||
const query = useQuery({
|
const query = useQuery({
|
||||||
queryKey: ['auth', 'me'],
|
queryKey: ['auth', 'me'],
|
||||||
queryFn: () => apiClient.getMe(),
|
queryFn: () => apiClient.getMe(),
|
||||||
|
staleTime: 30_000,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (query.data) {
|
if (query.data?.user) {
|
||||||
setUser(query.data.user);
|
setUser(query.data.user);
|
||||||
}
|
}
|
||||||
}, [query.data, setUser]);
|
}, [query.data, setUser]);
|
||||||
|
|
||||||
if (query.isLoading) {
|
// Tunjukkan loading hanya jika belum ada user di store
|
||||||
|
if (query.isLoading && !user) {
|
||||||
return <main className="min-h-screen p-8 text-center text-muted-foreground">Memeriksa sesi...</main>;
|
return <main className="min-h-screen p-8 text-center text-muted-foreground">Memeriksa sesi...</main>;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!query.data?.user) {
|
// Cek store dulu, baru query — mencegah redirect saat refetch background
|
||||||
|
const currentUser = query.data?.user ?? user;
|
||||||
|
if (!currentUser) {
|
||||||
return <Navigate to="/login" replace />;
|
return <Navigate to="/login" replace />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (requireExpert && query.data.user.role !== 'expert') {
|
if (requireExpert && currentUser.role !== 'expert') {
|
||||||
return <Navigate to="/dashboard" replace />;
|
return <Navigate to="/dashboard" replace />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,11 @@ export function AuthInitializer() {
|
|||||||
queryKey: ['auth', 'me'],
|
queryKey: ['auth', 'me'],
|
||||||
queryFn: () => apiClient.getMe(),
|
queryFn: () => apiClient.getMe(),
|
||||||
retry: false,
|
retry: false,
|
||||||
|
staleTime: 30_000,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (query.data) {
|
if (query.data?.user) {
|
||||||
setUser(query.data.user);
|
setUser(query.data.user);
|
||||||
}
|
}
|
||||||
}, [query.data, setUser]);
|
}, [query.data, setUser]);
|
||||||
|
|||||||
@@ -0,0 +1,202 @@
|
|||||||
|
import { useRef, useState, useCallback, useEffect } from "react";
|
||||||
|
import { SwitchCamera, CameraOff, Aperture } from "lucide-react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
|
||||||
|
interface CameraCaptureProps {
|
||||||
|
onCapture: (file: File) => void;
|
||||||
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
type FacingMode = "environment" | "user";
|
||||||
|
|
||||||
|
export function CameraCapture({ onCapture, onClose }: CameraCaptureProps) {
|
||||||
|
const videoRef = useRef<HTMLVideoElement | null>(null);
|
||||||
|
const streamRef = useRef<MediaStream | null>(null);
|
||||||
|
const canvasRef = useRef<HTMLCanvasElement | null>(null);
|
||||||
|
const [facingMode, setFacingMode] = useState<FacingMode>("environment");
|
||||||
|
const [status, setStatus] = useState<"loading" | "ready" | "error" | "denied">("loading");
|
||||||
|
const [errorMsg, setErrorMsg] = useState<string>("");
|
||||||
|
|
||||||
|
const stopStream = useCallback(() => {
|
||||||
|
if (streamRef.current) {
|
||||||
|
streamRef.current.getTracks().forEach((t) => t.stop());
|
||||||
|
streamRef.current = null;
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const startCamera = useCallback(
|
||||||
|
async (mode: FacingMode) => {
|
||||||
|
stopStream();
|
||||||
|
setStatus("loading");
|
||||||
|
setErrorMsg("");
|
||||||
|
|
||||||
|
try {
|
||||||
|
const stream = await navigator.mediaDevices.getUserMedia({
|
||||||
|
video: {
|
||||||
|
facingMode: mode,
|
||||||
|
width: { ideal: 1920 },
|
||||||
|
height: { ideal: 1080 },
|
||||||
|
},
|
||||||
|
audio: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
streamRef.current = stream;
|
||||||
|
if (videoRef.current) {
|
||||||
|
videoRef.current.srcObject = stream;
|
||||||
|
await videoRef.current.play();
|
||||||
|
}
|
||||||
|
setStatus("ready");
|
||||||
|
} catch (err: unknown) {
|
||||||
|
const e = err as DOMException;
|
||||||
|
if (e.name === "NotAllowedError" || e.name === "PermissionDeniedError") {
|
||||||
|
setStatus("denied");
|
||||||
|
setErrorMsg("Izin kamera ditolak. Buka pengaturan untuk mengizinkan akses kamera.");
|
||||||
|
} else if (e.name === "NotFoundError") {
|
||||||
|
setStatus("error");
|
||||||
|
setErrorMsg("Kamera tidak ditemukan pada perangkat ini.");
|
||||||
|
} else if (e.name === "NotReadableError") {
|
||||||
|
setStatus("error");
|
||||||
|
setErrorMsg("Kamera sedang digunakan oleh aplikasi lain.");
|
||||||
|
} else {
|
||||||
|
setStatus("error");
|
||||||
|
setErrorMsg(`Gagal mengakses kamera: ${e.message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[stopStream],
|
||||||
|
);
|
||||||
|
|
||||||
|
// Start camera on mount
|
||||||
|
useEffect(() => {
|
||||||
|
startCamera(facingMode);
|
||||||
|
return () => stopStream();
|
||||||
|
}, []); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
|
const toggleFacing = () => {
|
||||||
|
const next = facingMode === "environment" ? "user" : "environment";
|
||||||
|
setFacingMode(next);
|
||||||
|
startCamera(next);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleCapture = () => {
|
||||||
|
const video = videoRef.current;
|
||||||
|
const canvas = canvasRef.current;
|
||||||
|
if (!video || !canvas) return;
|
||||||
|
|
||||||
|
const vw = video.videoWidth;
|
||||||
|
const vh = video.videoHeight;
|
||||||
|
canvas.width = vw;
|
||||||
|
canvas.height = vh;
|
||||||
|
|
||||||
|
const ctx = canvas.getContext("2d");
|
||||||
|
if (!ctx) return;
|
||||||
|
|
||||||
|
ctx.drawImage(video, 0, 0, vw, vh);
|
||||||
|
canvas.toBlob(
|
||||||
|
(blob) => {
|
||||||
|
if (!blob) return;
|
||||||
|
const file = new File([blob], `camera-${Date.now()}.jpg`, {
|
||||||
|
type: "image/jpeg",
|
||||||
|
});
|
||||||
|
stopStream();
|
||||||
|
onCapture(file);
|
||||||
|
},
|
||||||
|
"image/jpeg",
|
||||||
|
0.92,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col items-center gap-3 w-full">
|
||||||
|
{/* Viewfinder */}
|
||||||
|
<div className="relative w-full rounded-xl overflow-hidden bg-black aspect-[4/3] max-h-[420px]">
|
||||||
|
{status === "loading" && (
|
||||||
|
<div className="absolute inset-0 flex items-center justify-center bg-black/80 text-white">
|
||||||
|
<div className="flex flex-col items-center gap-2">
|
||||||
|
<div className="h-8 w-8 border-2 border-white border-t-transparent rounded-full animate-spin" />
|
||||||
|
<span className="text-sm">Membuka kamera...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{(status === "error" || status === "denied") && (
|
||||||
|
<div className="absolute inset-0 flex items-center justify-center bg-black/90 text-white p-6">
|
||||||
|
<div className="flex flex-col items-center gap-3 text-center">
|
||||||
|
<CameraOff className="text-red-400" size={40} />
|
||||||
|
<p className="text-sm text-red-300">{errorMsg}</p>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
className="h-9 px-3 text-sm text-white border-white/30 hover:bg-white/10"
|
||||||
|
onClick={() => startCamera(facingMode)}
|
||||||
|
>
|
||||||
|
Coba Lagi
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<video
|
||||||
|
ref={videoRef}
|
||||||
|
autoPlay
|
||||||
|
playsInline
|
||||||
|
muted
|
||||||
|
className={`w-full h-full object-cover ${status === "ready" ? "opacity-100" : "opacity-0"}`}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* Scan area overlay */}
|
||||||
|
{status === "ready" && (
|
||||||
|
<div className="absolute inset-0 flex items-center justify-center pointer-events-none">
|
||||||
|
<div className="absolute inset-0 bg-black/20" />
|
||||||
|
<div
|
||||||
|
className="relative flex items-center justify-center"
|
||||||
|
style={{ width: "70%", height: "75%" }}
|
||||||
|
>
|
||||||
|
<div className="absolute top-0 left-0 w-6 h-6 border-t-2 border-l-2 border-lime-300" />
|
||||||
|
<div className="absolute top-0 right-0 w-6 h-6 border-t-2 border-r-2 border-lime-300" />
|
||||||
|
<div className="absolute bottom-0 left-0 w-6 h-6 border-b-2 border-l-2 border-lime-300" />
|
||||||
|
<div className="absolute bottom-0 right-0 w-6 h-6 border-b-2 border-r-2 border-lime-300" />
|
||||||
|
<div className="text-white text-center flex flex-col gap-1">
|
||||||
|
<span className="text-xs font-semibold tracking-widest">
|
||||||
|
AREA SCAN
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Controls */}
|
||||||
|
<div className="flex items-center justify-center gap-4 w-full">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
className="rounded-full h-12 w-12 p-0"
|
||||||
|
onClick={onClose}
|
||||||
|
title="Tutup kamera"
|
||||||
|
>
|
||||||
|
<CameraOff size={20} />
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
className="rounded-full h-16 w-16 p-0 bg-white border-4 border-green-500 hover:bg-green-50"
|
||||||
|
onClick={handleCapture}
|
||||||
|
disabled={status !== "ready"}
|
||||||
|
title="Ambil foto"
|
||||||
|
>
|
||||||
|
<Aperture className="text-green-600" size={32} />
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
className="rounded-full h-12 w-12 p-0"
|
||||||
|
onClick={toggleFacing}
|
||||||
|
title="Ganti kamera"
|
||||||
|
>
|
||||||
|
<SwitchCamera size={20} />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Hidden canvas for capture */}
|
||||||
|
<canvas ref={canvasRef} className="hidden" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -14,7 +14,29 @@ import type {
|
|||||||
} from '@zeavis/shared';
|
} from '@zeavis/shared';
|
||||||
import { recordApiCall } from './telemetry';
|
import { recordApiCall } from './telemetry';
|
||||||
|
|
||||||
const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? '';
|
const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? 'https://zeavisedu.asepharyana.my.id';
|
||||||
|
|
||||||
|
const AUTH_TOKEN_KEY = 'zeavis_auth_token';
|
||||||
|
|
||||||
|
function getAuthToken(): string | null {
|
||||||
|
try {
|
||||||
|
return localStorage.getItem(AUTH_TOKEN_KEY);
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setAuthToken(token: string | null) {
|
||||||
|
try {
|
||||||
|
if (token) {
|
||||||
|
localStorage.setItem(AUTH_TOKEN_KEY, token);
|
||||||
|
} else {
|
||||||
|
localStorage.removeItem(AUTH_TOKEN_KEY);
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
// localStorage may throw in private browsing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export interface ApiError extends Error {
|
export interface ApiError extends Error {
|
||||||
status: number;
|
status: number;
|
||||||
@@ -24,10 +46,21 @@ export interface ApiError extends Error {
|
|||||||
async function fetchApi<T>(endpoint: string, options?: RequestInit): Promise<T> {
|
async function fetchApi<T>(endpoint: string, options?: RequestInit): Promise<T> {
|
||||||
const start = performance.now();
|
const start = performance.now();
|
||||||
const url = `${apiBaseUrl}${endpoint}`;
|
const url = `${apiBaseUrl}${endpoint}`;
|
||||||
|
const token = getAuthToken();
|
||||||
|
const headers = new Headers(options?.headers);
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
headers.set('Authorization', `Bearer ${token}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options?.body && !options.method) {
|
||||||
|
// auto-set Content-Type for JSON bodies
|
||||||
|
}
|
||||||
|
|
||||||
const response = await fetch(url, {
|
const response = await fetch(url, {
|
||||||
credentials: 'include',
|
credentials: 'include',
|
||||||
...options,
|
...options,
|
||||||
headers: options?.headers,
|
headers,
|
||||||
});
|
});
|
||||||
|
|
||||||
const duration = performance.now() - start;
|
const duration = performance.now() - start;
|
||||||
@@ -93,23 +126,29 @@ export const apiClient = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async register(payload: RegisterRequest): Promise<AuthResponse> {
|
async register(payload: RegisterRequest): Promise<AuthResponse> {
|
||||||
return fetchApi('/api/v1/auth/register', {
|
const result = await fetchApi<AuthResponse>('/api/v1/auth/register', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(payload),
|
body: JSON.stringify(payload),
|
||||||
});
|
});
|
||||||
|
if (result.token) setAuthToken(result.token);
|
||||||
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
async login(payload: AuthRequest): Promise<AuthResponse> {
|
async login(payload: AuthRequest): Promise<AuthResponse> {
|
||||||
return fetchApi('/api/v1/auth/login', {
|
const result = await fetchApi<AuthResponse>('/api/v1/auth/login', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify(payload),
|
body: JSON.stringify(payload),
|
||||||
});
|
});
|
||||||
|
if (result.token) setAuthToken(result.token);
|
||||||
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
async logout(): Promise<{ ok: boolean }> {
|
async logout(): Promise<{ ok: boolean }> {
|
||||||
return fetchApi('/api/v1/auth/logout', { method: 'POST' });
|
const result = await fetchApi<{ ok: boolean }>('/api/v1/auth/logout', { method: 'POST' });
|
||||||
|
setAuthToken(null);
|
||||||
|
return result;
|
||||||
},
|
},
|
||||||
|
|
||||||
// Disease catalog methods
|
// Disease catalog methods
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useRef, useState } from "react";
|
import { useRef, useState, useCallback } from "react";
|
||||||
import { useNavigate, Link } from "react-router-dom";
|
import { useNavigate, Link } from "react-router-dom";
|
||||||
import { useMutation, useQueryClient, useQuery } from "@tanstack/react-query";
|
import { useMutation, useQueryClient, useQuery } from "@tanstack/react-query";
|
||||||
import {
|
import {
|
||||||
@@ -19,6 +19,7 @@ import type { DiagnosisRecord } from "@zeavis/shared";
|
|||||||
import { apiClient } from "@/lib/api-client";
|
import { apiClient } from "@/lib/api-client";
|
||||||
import { trackScan, trackDiagnosisResult } from "@/lib/telemetry";
|
import { trackScan, trackDiagnosisResult } from "@/lib/telemetry";
|
||||||
import { DiagnosisResultView } from "../components/diagnose-result-view";
|
import { DiagnosisResultView } from "../components/diagnose-result-view";
|
||||||
|
import { CameraCapture } from "../components/camera-capture";
|
||||||
|
|
||||||
export function ScanPage() {
|
export function ScanPage() {
|
||||||
const [fileName, setFileName] = useState<string | null>(null);
|
const [fileName, setFileName] = useState<string | null>(null);
|
||||||
@@ -32,6 +33,24 @@ export function ScanPage() {
|
|||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
||||||
|
// Camera mode state
|
||||||
|
const [useCamera, setUseCamera] = useState(false);
|
||||||
|
const handleCameraCapture = useCallback(
|
||||||
|
(file: File) => {
|
||||||
|
setFileName(file.name);
|
||||||
|
const url = URL.createObjectURL(file);
|
||||||
|
setPreviewUrl(url);
|
||||||
|
|
||||||
|
const img = new Image();
|
||||||
|
img.onload = () => {
|
||||||
|
setImageDimensions({ width: img.width, height: img.height });
|
||||||
|
};
|
||||||
|
img.src = url;
|
||||||
|
setUseCamera(false);
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
const mutation = useMutation({
|
const mutation = useMutation({
|
||||||
mutationFn: (file: File) => apiClient.createDiagnosis(file),
|
mutationFn: (file: File) => apiClient.createDiagnosis(file),
|
||||||
onSuccess: (diagnosis) => {
|
onSuccess: (diagnosis) => {
|
||||||
@@ -111,33 +130,70 @@ export function ScanPage() {
|
|||||||
|
|
||||||
{!previewUrl ? (
|
{!previewUrl ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
<div
|
{/* Mode toggle */}
|
||||||
className="w-full border-2 border-dashed border-green-300 rounded-md p-10 h-60 text-center cursor-pointer"
|
<div className="flex rounded-lg bg-gray-100 p-1">
|
||||||
onClick={() => inputRef.current?.click()}
|
<button
|
||||||
>
|
type="button"
|
||||||
<Upload className="mx-auto text-green-500 mb-3" size={48} />
|
onClick={() => setUseCamera(false)}
|
||||||
<h3 className="font-semibold text-base text-gray-800 mb-1">
|
className={`flex-1 py-2 px-3 rounded-md text-sm font-medium transition-colors ${
|
||||||
Seret & Lepas Foto Daun
|
!useCamera
|
||||||
</h3>
|
? "bg-white text-green-700 shadow-sm"
|
||||||
<p className="text-xs text-gray-500 mb-3">
|
: "text-gray-500 hover:text-gray-700"
|
||||||
atau klik untuk memilih file berkas dari perangkat Anda
|
}`}
|
||||||
</p>
|
>
|
||||||
<div className="flex flex-wrap gap-2 justify-center">
|
<Upload size={16} className="inline mr-1.5" />
|
||||||
<div className="bg-green-100 text-green-700 px-3 py-1 rounded-full inline-flex items-center gap-1 text-xs font-medium">
|
Unggah
|
||||||
<Check size={14} /> PNG, JPG, JPEG, WEBP
|
</button>
|
||||||
</div>
|
<button
|
||||||
<div className="bg-green-100 text-green-700 px-3 py-1 rounded-full inline-flex items-center gap-1 text-xs font-medium">
|
type="button"
|
||||||
<Check size={14} /> Maks. 5 MB
|
onClick={() => setUseCamera(true)}
|
||||||
</div>
|
className={`flex-1 py-2 px-3 rounded-md text-sm font-medium transition-colors ${
|
||||||
</div>
|
useCamera
|
||||||
|
? "bg-white text-green-700 shadow-sm"
|
||||||
|
: "text-gray-500 hover:text-gray-700"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<Camera size={16} className="inline mr-1.5" />
|
||||||
|
Kamera
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button
|
|
||||||
type="button"
|
{useCamera ? (
|
||||||
onClick={() => inputRef.current?.click()}
|
<CameraCapture
|
||||||
className="w-full bg-green-600 hover:bg-green-700 text-white font-medium py-2.5 px-4 rounded-lg transition-colors flex items-center justify-center gap-2"
|
onCapture={handleCameraCapture}
|
||||||
>
|
onClose={() => setUseCamera(false)}
|
||||||
<Upload size={18} /> Pilih Berkas
|
/>
|
||||||
</button>
|
) : (
|
||||||
|
<>
|
||||||
|
<div
|
||||||
|
className="w-full border-2 border-dashed border-green-300 rounded-md p-10 h-60 text-center cursor-pointer"
|
||||||
|
onClick={() => inputRef.current?.click()}
|
||||||
|
>
|
||||||
|
<Upload className="mx-auto text-green-500 mb-3" size={48} />
|
||||||
|
<h3 className="font-semibold text-base text-gray-800 mb-1">
|
||||||
|
Seret & Lepas Foto Daun
|
||||||
|
</h3>
|
||||||
|
<p className="text-xs text-gray-500 mb-3">
|
||||||
|
atau klik untuk memilih file berkas dari perangkat Anda
|
||||||
|
</p>
|
||||||
|
<div className="flex flex-wrap gap-2 justify-center">
|
||||||
|
<div className="bg-green-100 text-green-700 px-3 py-1 rounded-full inline-flex items-center gap-1 text-xs font-medium">
|
||||||
|
<Check size={14} /> PNG, JPG, JPEG, WEBP
|
||||||
|
</div>
|
||||||
|
<div className="bg-green-100 text-green-700 px-3 py-1 rounded-full inline-flex items-center gap-1 text-xs font-medium">
|
||||||
|
<Check size={14} /> Maks. 5 MB
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => inputRef.current?.click()}
|
||||||
|
className="w-full bg-green-600 hover:bg-green-700 text-white font-medium py-2.5 px-4 rounded-lg transition-colors flex items-center justify-center gap-2"
|
||||||
|
>
|
||||||
|
<Upload size={18} /> Pilih Berkas
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ services:
|
|||||||
API_PORT: "3000"
|
API_PORT: "3000"
|
||||||
WEB_APP_URL: https://zeavisedu.asepharyana.my.id
|
WEB_APP_URL: https://zeavisedu.asepharyana.my.id
|
||||||
ML_SERVICE_URL: ${ML_SERVICE_URL:-http://zeavis-ml:8000}
|
ML_SERVICE_URL: ${ML_SERVICE_URL:-http://zeavis-ml:8000}
|
||||||
ports:
|
|
||||||
- "3000:3000"
|
|
||||||
labels:
|
labels:
|
||||||
traefik.enable: "true"
|
traefik.enable: "true"
|
||||||
traefik.http.routers.zeavis-api.rule: Host(`api-zeavisedu.asepharyana.my.id`)
|
traefik.http.routers.zeavis-api.rule: Host(`api-zeavisedu.asepharyana.my.id`)
|
||||||
@@ -53,8 +51,6 @@ services:
|
|||||||
image: prom/node-exporter:v1.8.2
|
image: prom/node-exporter:v1.8.2
|
||||||
container_name: zeavis-node-exporter
|
container_name: zeavis-node-exporter
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
|
||||||
- "9100:9100"
|
|
||||||
command:
|
command:
|
||||||
- "--path.rootfs=/host"
|
- "--path.rootfs=/host"
|
||||||
- "--web.listen-address=:9100"
|
- "--web.listen-address=:9100"
|
||||||
@@ -77,8 +73,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
MODEL_PATH: /app/model/model.onnx
|
MODEL_PATH: /app/model/model.onnx
|
||||||
MODEL_INPUT_SIZE: "224"
|
MODEL_INPUT_SIZE: "224"
|
||||||
ports:
|
|
||||||
- "8000:8000"
|
|
||||||
labels:
|
labels:
|
||||||
traefik.enable: "true"
|
traefik.enable: "true"
|
||||||
traefik.http.routers.zeavis-ml.rule: Host(`ml-zeavisedu.asepharyana.my.id`)
|
traefik.http.routers.zeavis-ml.rule: Host(`ml-zeavisedu.asepharyana.my.id`)
|
||||||
|
|||||||
@@ -66,6 +66,7 @@ export type RegisterRequest = AuthRequest & {
|
|||||||
export type AuthResponse = {
|
export type AuthResponse = {
|
||||||
user: AuthUser;
|
user: AuthUser;
|
||||||
features: AuthFeatures;
|
features: AuthFeatures;
|
||||||
|
token?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type DiagnosisPrediction = {
|
export type DiagnosisPrediction = {
|
||||||
|
|||||||
Reference in New Issue
Block a user