142 Commits

Author SHA1 Message Date
Alexyz 27235f6d54 feat(voice): add direct speech recognition, system ROLE_NOTES, voice shortcuts, and change app label to Avtex 2026-09-29 14:55:05 +05:00
Alexyz 34ec8944c1 fix(icon): rename launcher icon resource to ic_launcher_avtex and bump to v1.2 (code 3) to bust OnePlus launcher cache 2026-09-29 14:43:01 +05:00
Alexyz f7021313c6 fix(icon): crop launcher icon safe zone, bump versionCode to 2 (v1.1) to force launcher cache refresh 2026-09-28 21:54:53 +05:00
Alexyz 02de1aaf02 feat(assistant): add full Assistant note-taking pipeline, intent routing, and in-app Assistant Simulator 2026-09-28 21:52:04 +05:00
Alexyz f60ac2a5f3 feat(mobile): add Mindmaps & Canvas interactive screen with server sync and embedded flow viewer 2026-09-28 12:07:15 +05:00
Alexyz 176afcff39 feat(mobile): add automatic background cloud sync to NotesRepository pointing to Coolify server 2026-09-28 12:04:38 +05:00
Alexyz 7b37f6cf70 feat(firebase): embed production Firebase credentials as build-time defaults in nuxt.config, Dockerfile and compose 2026-09-28 12:01:25 +05:00
Alexyz 7d324a6140 fix(pwa,auth): serve manifest and icons from apps/web/public and prevent Firebase uninitialized crash 2026-09-28 11:49:46 +05:00
Alexyz 5c253b169e fix(prisma): remove deprecated url from schema.prisma per Prisma 7 specification (url is managed by prisma.config.ts) 2026-09-28 11:31:24 +05:00
Alexyz 54bfb8edd7 fix(prisma,db): add url to datasource in schema.prisma, copy prisma.config.ts to runner, and set POSTGRES_HOST_AUTH_METHOD=trust 2026-09-28 11:25:06 +05:00
Alexyz 9393cb823d fix(coolify): provide fallback POSTGRES_PASSWORD and remove unknown --skip-generate flag from prisma db push 2026-09-28 11:19:04 +05:00
Alexyz 7e8cae3801 fix(deploy): switch Dockerfile to node:22-slim to resolve esbuild glibc/musl mismatch and add profile fallback 2026-09-28 11:03:06 +05:00
Alexyz bc53c37fe0 chore(docker): expand .dockerignore to exclude mobile, gradle, kotlin, and local build artifacts 2026-09-28 10:48:11 +05:00
Alexyz 008b235ac5 chore(make): add smart fallback to make up for environments without docker 2026-09-28 10:43:41 +05:00
Alexyz dba93dc702 feat(docker): add local docker-compose stack and Makefile for full stack management 2026-09-28 10:41:05 +05:00
Alexyz 96fcf773f2 fix(auth): add resilient local fallback for Google auth when PostgreSQL is offline 2026-09-28 10:39:20 +05:00
Alexyz 94da4dd1cf feat(branding): update XFlow logo with fused Avtex neon crescent and dynamic X-flow waves 2026-09-28 10:39:19 +05:00
Alexyz 65d4d6c052 fix(server): standardize prisma generator and add resilient dev fallback in PrismaListRepository 2026-09-28 10:39:19 +05:00
Alexyz 1cf0e3216b feat(deploy): add Coolify docker-compose, multi-stage Dockerfile, and env template matching XCargo and Signage patterns 2026-09-28 10:39:19 +05:00
Alexyz be68f5e130 feat: restructure into XFlow monorepo with Nuxt 4, Modular Onion Monolith, Android client, and Desktop CLI 2026-09-28 10:39:19 +05:00
XFlow Deploy edcd30c829 fix(ci): trim newline from GIT_TOKEN secret 2026-06-01 17:00:43 +05:00
XFlow Deploy ff8a9c4e53 fix(ci): use env for GIT_TOKEN secret 2026-06-01 16:59:40 +05:00
XFlow Deploy 866ac86665 revert(ci): back to node:22-alpine after network fix 2026-06-01 16:58:42 +05:00
Alexyz fe46f49b67 chore: change job container image to node:22 and update checkout script 2026-06-01 16:02:08 +05:00
Alexyz 2b8b26df3f chore: test empty commit 2026-06-01 15:48:02 +05:00
XFlow Deploy a0bb47b022 fix(ci): use NPB-style checkout (git init + fetch) 2026-06-01 13:02:09 +05:00
XFlow Deploy 64c3928408 fix(ci): force job container to use default docker0 bridge 2026-06-01 12:33:09 +05:00
XFlow Deploy c4401d35ea revert(ci): restore original pipeline — network issue is server-side 2026-06-01 12:05:00 +05:00
XFlow Deploy 8c8c6768bd fix(ci): restore node:22-alpine + fix Alpine DNS for apk/git 2026-06-01 11:49:48 +05:00
XFlow Deploy 190e67eb26 fix(ci): remove container to use runner host directly — no Docker Hub access 2026-06-01 11:39:29 +05:00
XFlow Deploy f740fdd57a fix(ci): use node:22 instead of alpine to fix DNS/apk issues in Gitea Actions 2026-06-01 11:38:39 +05:00
XFlow Deploy cdf064b187 fix(auth): log real Firebase error + add NUXT_FIREBASE_API_KEY to docker-compose 2026-06-01 11:10:53 +05:00
Alexyz 8fe2075b37 feat: set Gemini 3.1 Pro Preview as the default reasoning/thinking model 2026-05-25 09:37:52 +05:00
Alexyz 60d25261c8 fix: update Gemini API models to Gemini 3.5 and 3.1 matching 2026 AI Studio console 2026-05-25 09:36:40 +05:00
Alexyz aeed229184 refactor: clean up top toolbar and integrate direct Gemini API support 2026-05-25 08:56:05 +05:00
Alexyz 74b093b5ad fix: adapt server deployment and compose command execution to mirror NPB bridge container pattern 2026-05-25 08:19:38 +05:00
Alexyz c858b811e9 fix: change git clone URL to use public hostname git.a-crm.controlsystem.kz 2026-05-25 08:16:37 +05:00
Alexyz f7dc1b2f1c fix: run deploy job inside node:22-alpine container to match NPB workflow 2026-05-25 08:15:34 +05:00
Alexyz 33773b373d fix: make workflow package installation environment-agnostic (fix apk command not found) 2026-05-25 08:08:35 +05:00
Alexyz bb971e665f feat: integrate coaching frameworks, Eisenhower matrix, Gantt chart, and Goal Validation test 2026-05-25 07:59:09 +05:00
Alexyz 7161523d01 feat: implement FlowEditor component and add endpoint for user groups retrieval 2026-05-04 04:18:15 +05:00
Alexyz 4ddcaec7c8 1 2026-05-04 04:02:50 +05:00
Alexyz 0c19af34c3 feat: visual access control in FlowEditor (read-only mode for viewers) 2026-05-03 21:27:36 +05:00
Alexyz ace515f18e feat: implement group member role management (Admin, Editor, Viewer) 2026-05-03 21:20:37 +05:00
Alexyz f0b5883084 fix: username sanitization, canvas creation modal fixes, and auth headers for tasks 2026-05-03 21:12:55 +05:00
Alexyz 4a912d972e feat: user search, group members management, and fixed canvases filtering 2026-05-03 20:43:18 +05:00
Alexyz 0598e07823 feat: stabilize admin dashboard, refactor group management, implement PWA, and fix routing 2026-05-03 19:51:18 +05:00
Alexyz 622ca04170 feat: added group management UI 2026-05-03 16:41:17 +05:00
Alexyz 4ed6a832d1 fix: use container env for migrations 2026-05-03 15:41:52 +05:00
Alexyz c979975a47 debug: force dev dependencies for prisma 2026-05-03 15:01:44 +05:00
Alexyz 158f3a738b fix: build order for prisma 7 2026-05-03 14:58:32 +05:00
Alexyz 7dbdbde8aa workflow: remove redundant setup-node step 2026-05-02 17:42:33 +05:00
Alexyz b060153761 trigger: test gitea runner workflow 2026-05-02 17:20:14 +05:00
Alexyz 73c323685f chore: align infrastructure with server 2026-05-02 17:20:14 +05:00
Alexyz e8c924f63a data: add db dump for prod migration 2026-04-29 20:13:28 +05:00
Alexyz bc2f99408d feat: AI context, Webhooks, Kanban drag-drop, and UI fixes 2026-04-29 17:43:18 +05:00
Alexyz 89b3340253 feat: implement cross-canvas linking, enhanced node type selection, and canvas management 2026-04-28 23:16:11 +05:00
Alexyz 1f87f0d6e9 feat: enhance task persistence and implement centralized kanban board 2026-04-28 21:55:37 +05:00
Alexyz 7da3fc8ff4 fix: resolve foreign key constraint by ensuring system user exists in seed script 2026-04-28 18:53:24 +05:00
Alexyz 28bf677a0c fix(db): correct prisma initialization in seed script 2026-04-28 17:58:06 +05:00
Alexyz 699e6bbe9f fix(git): improve error reporting and resolve correct repo in GET endpoint 2026-04-28 16:54:57 +05:00
Alexyz 0c5b58e26b fix(git): correct saveCanvasToGitea payload and use prisma 2026-04-28 16:33:24 +05:00
Alexyz f933c17a90 fix: add seed script and repository check endpoint 2026-04-28 16:10:46 +05:00
Alexyz e8714dd00f fix(config): add COOP headers for firebase auth 2026-04-28 15:24:07 +05:00
Alexyz 68e772d2dd fix(ci): pass firebase secrets to docker compose step 2026-04-28 15:07:25 +05:00
Alexyz 3965b7891f fix: safe logout when firebase is not initialized 2026-04-28 14:59:22 +05:00
Alexyz fad9cacd3e fix: pwa, firebase and auth initial load issues 2026-04-28 14:50:13 +05:00
Alexyz 669d8571ae Fix: Stop and remove container before deploy, add node_modules copy 2026-04-28 14:23:36 +05:00
Alexyz e759e9de0a Fix: Add node_modules volume for Prisma 2026-04-28 14:08:10 +05:00
Alexyz ee6ae24916 fix: mark prisma packages as nitro externals to preserve imports 2026-04-27 00:06:25 +05:00
Alexyz d3eb4b87f2 fix: use PrismaPkg.PrismaClient for Nitro ESM compat 2026-04-26 23:51:30 +05:00
Alexyz 1627faa8df trigger: rebuild with fresh cache 2026-04-26 23:40:32 +05:00
Alexyz 764391dc56 fix: use npm install instead of npm ci for new deps 2026-04-26 20:52:01 +05:00
Alexyz 9dde5c21dd fix: Prisma 7 runtime with PrismaPg adapter + pg driver 2026-04-26 20:49:00 +05:00
Alexyz 275f419a41 fix: use default import for @prisma/client CommonJS compat 2026-04-26 17:59:27 +05:00
Alexyz 65f0e7d374 fix: remove npm init -y to preserve package.json 2026-04-26 17:49:41 +05:00
Alexyz bf910adaa3 fix: Prisma 7 import path .prisma/client -> @prisma/client 2026-04-26 17:49:24 +05:00
Alexyz 42899368ed fix: remove :ro from .output mount for prisma client copy 2026-04-26 17:25:43 +05:00
Alexyz b25efbb135 fix: npm init + install prisma in container for migrate 2026-04-26 16:56:45 +05:00
Alexyz 425d3d1430 fix: install prisma before migrate deploy 2026-04-26 16:41:30 +05:00
Alexyz 472024126d fix: remove dotenv from prisma.config.ts for server compat 2026-04-26 16:36:44 +05:00
Alexyz c29684206d fix: revert to driver bridge, remove depends_on to avoid creating other containers 2026-04-26 15:43:32 +05:00
Alexyz 8ad4388d0b fix: use --no-deps and external network to avoid container conflicts 2026-04-26 15:36:56 +05:00
Alexyz d521f9a6c2 fix: copy server/docker-compose.yml during deploy 2026-04-26 15:29:15 +05:00
Alexyz 2663692fb3 fix: add prisma volumes to docker-compose.yml for migrate 2026-04-26 15:22:14 +05:00
Alexyz d9d6caf78d fix: add --config flag to prisma migrate deploy 2026-04-26 15:14:48 +05:00
Alexyz c0afe4a7a5 fix: Prisma 7 compatibility - remove url from schema, add DATABASE_URL to deploy 2026-04-26 14:48:16 +05:00
Alexyz e040d8cacd feat: migrate Canvas and Groups API to Prisma ORM 2026-04-26 14:37:12 +05:00
Alexyz f9e35cb9e7 fix: add auth headers to loadCanvas, add canvas import 2026-04-24 01:42:35 +05:00
Alexyz ade67c0221 feat: add canvas import from .canvas file 2026-04-24 01:30:17 +05:00
Alexyz eb91d95ec0 feat: support personal user repos for canvas storage 2026-04-24 01:18:27 +05:00
Alexyz 53ae4634b9 add: CI/CD session canvas 2026-04-23 2026-04-24 01:11:44 +05:00
Alexyz ec10fb0efe ci: use docker-compose instead of docker compose 2026-04-23 23:19:18 +05:00
Alexyz e4f02ff1fe ci: deploy via direct file copy, no SSH needed 2026-04-23 23:13:39 +05:00
Alexyz 96e52ba047 ci: fix deploy key secret name 2026-04-23 23:04:02 +05:00
Alexyz 61c4e83a1d ci: install rsync+ssh, fix SSH config 2026-04-23 22:57:09 +05:00
Alexyz 01e88c43df ci: trim newlines from token 2026-04-23 22:48:51 +05:00
Alexyz c9ff1e0a81 ci: fix git clone token interpolation 2026-04-23 22:47:56 +05:00
Alexyz 73f8390a71 ci: use sh shell for Alpine container 2026-04-23 22:44:59 +05:00
Alexyz 8860103557 ci: replace checkout action with direct git clone from Gitea 2026-04-23 22:43:12 +05:00
Alexyz 636687d917 ci: use GIT_TOKEN for checkout 2026-04-23 22:40:38 +05:00
Alexyz 73e23817d7 ci: fix checkout to use Gitea server 2026-04-23 22:38:47 +05:00
Alexyz 54f4a331ed ci: fix workflow branch and deploy config 2026-04-23 22:23:36 +05:00
Alexyz 65cf8ca01f feat: prisma schema, groups API, deploy workflow 2026-04-23 21:41:11 +05:00
Alexyz 4c50036172 Clean up: move docs to Obsidian vault, remove outdated md files 2026-04-21 15:54:20 +05:00
Alexyz 448403d7ee R 2026-04-21 02:01:41 +05:00
Alexyz e75b074d0d Fix Gitea ROOT_URL for subdomain git.a-crm.controlsystem.kz 2026-04-21 01:57:48 +05:00
Alexyz aec030cb61 Fix Gitea ROOT_URL for reverse proxy 2026-04-21 01:43:37 +05:00
Alexyz 91f59eec00 Trigger workflow 2026-04-21 01:28:15 +05:00
Alexyz 55c69f821d Trigger workflow 2026-04-21 01:25:47 +05:00
Alexyz 02c02dd8e7 Fix: remove old workflows, keep only self-hosted deploy 2026-04-20 22:57:59 +05:00
Alexyz 3a557fa77b Add auto-deploy workflow and fix dashboard URLs 2026-04-20 22:44:45 +05:00
Alexyz b281778792 Add auto-deploy workflow and fix dashboard URLs 2026-04-20 22:44:10 +05:00
Alexyz 53bfb305c6 fix: Remove node_modules from git and add to .gitignore 2026-04-20 15:21:01 +05:00
Alexyz 9fce574c50 fix: Update nginx config to use dynamic DNS resolution
- Replace upstream blocks with resolver directive
- Use variables for backend addresses to avoid startup errors
- Simplify configuration with single server block
- Add health check endpoint
2026-04-20 15:20:02 +05:00
Alexyz e436aca25b fix: Add package-lock.json for Docker build 2026-04-20 15:11:46 +05:00
Alexyz 263b0c1b64 fix: Update ports to avoid conflicts with existing Docker projects
- Change Gitea port from 3000 to 3001
- Change API port from 8080 to 8082
- Change Nginx port from 80 to 8083
- Add docker-compose.override.yml for local development
- Add deployment guide for existing servers
2026-04-19 23:00:08 +05:00
Alexyz f1e0f6b5ef feat: Add Nanaxe server with Docker, GitHub Actions CI/CD, and auto-deployment
- Add complete server infrastructure with Gitea, API, PostgreSQL
- Implement Obsidian-compatible markdown mindmap converter
- Add Flutter service for server synchronization
- Configure GitHub Actions for automated build and deploy
- Add production docker-compose with health checks
- Include VPS setup and deployment scripts
- Add comprehensive deployment documentation
2026-04-19 22:18:25 +05:00
Alexyz 52aea9ac87 Fix Hive serialization with toMap() method 2026-03-29 01:44:29 +05:00
Alexyz 9272edda19 Fix Hive Timestamp serialization 2026-03-29 01:41:38 +05:00
Alexyz 15e2e2224a Fix UserRole import 2026-03-28 19:52:27 +05:00
Alexyz 28ef21b2f4 Add alarms to tasks, admin role from DB 2026-03-28 19:39:25 +05:00
Alexyz a2f09de04d Fix auth redirect after login 2026-03-28 12:28:14 +05:00
Alexyz 8e6608f788 Fix MindMapNode import 2026-03-28 12:11:17 +05:00
Alexyz f871d048cd Fix all compilation errors - MindMap, Calendar, Tasks 2026-03-28 11:46:56 +05:00
Alexyz 1b5ab70453 Fix compilation errors 2026-03-27 20:13:03 +05:00
Alexyz f1b887fa8d Add Google Calendar integration with sync 2026-03-27 20:01:20 +05:00
Alexyz 26ef99d194 Add Mind-Maps with AI generation and visual graph 2026-03-27 19:53:20 +05:00
Alexyz 789ecd9d3a Add Local Notifications with deadline reminders 2026-03-27 19:47:27 +05:00
Alexyz 88db5daa6b Add Admin panel for team and projects management 2026-03-27 19:08:43 +05:00
Alexyz 6e428b4ede Add Firestore integration with real-time sync 2026-03-27 19:02:43 +05:00
Alexyz 2336df8e86 Add full CRUD tasks with AI integration 2026-03-27 18:57:56 +05:00
Alexyz c5072a8a84 Add AI test screen with DeepSeek integration 2026-03-27 18:40:01 +05:00
Alexyz bc75dc8de1 Setup DeepSeek API with dotenv 2026-03-27 18:38:12 +05:00
Alexyz 26939984ad Add DeepSeek AI service integration 2026-03-27 17:48:58 +05:00
Alexyz 0ff572548e Fix MainActivity package name to com.nanaxe.nanaxe_crm 2026-03-27 15:52:45 +05:00
Alexyz 80458c6491 Remove workmanager (incompatible with current Flutter version) 2026-03-27 15:30:00 +05:00
Alexyz 63ce850d34 Add google-services.json for Firebase 2026-03-27 15:18:30 +05:00
Alexyz e4a7beae04 Add Java 8 desugaring for flutter_local_notifications 2026-03-27 15:12:25 +05:00
Alexyz 9aa4943b2f Rename project from NANAHUI to NANAXE 2026-03-27 14:47:26 +05:00
Alexyz bc2dc81916 Update README with project description 2026-03-27 14:38:56 +05:00
Alexyz 78d15daa35 Initial commit: NANAHUI CRM - Flutter Firebase CRM assistant 2026-03-27 14:38:10 +05:00
291 changed files with 56891 additions and 193 deletions
+55
View File
@@ -0,0 +1,55 @@
# Version Control
.git
.gitignore
# Dependencies & Cache
node_modules
**/node_modules
.output
.nuxt
dist
.cache
*.log
# Environment variables
.env
.env.*
.env.local
!.env.example
!.env.example.coolify
# Native Mobile (Android)
apps/mobile
app
.gradle
**/.gradle
.kotlin
build
**/build
local.properties
*.apk
*.aab
# Desktop CLI & Contracts build
apps/desktop
packages/shared-contracts/dist
# Legacy configs & DB dumps
docker/legacy-server
*.sql
*.sqlite
*.db
# Notes, Mindmaps & Brainstorming
.obsidian
.qwen
scratch
scripts
*.canvas
# IDE settings
.idea
.vscode
*.iml
*.ipr
*.iws
+47
View File
@@ -0,0 +1,47 @@
# API Keys Configuration
# Copy this file to .env and fill in your actual keys
# DeepSeek API (recommended - cost effective)
# Get from: https://platform.deepseek.com/api_keys
DEEPSEEK_API_KEY=sk_your_deepseek_api_key_here
# OpenAI API (alternative)
# Get from: https://platform.openai.com/api-keys
OPENAI_API_KEY=sk_your_openai_api_key_here
# Anthropic API (alternative)
# Get from: https://console.anthropic.com/
ANTHROPIC_API_KEY=your_anthropic_api_key_here
# Firebase Configuration (for Nuxt runtimeConfig)
# Get from: https://console.firebase.google.com -> Project Settings -> General
NUXT_PUBLIC_FIREBASE_API_KEY=your_firebase_api_key
NUXT_PUBLIC_FIREBASE_AUTH_DOMAIN=your-project.firebaseapp.com
NUXT_PUBLIC_FIREBASE_PROJECT_ID=your_firebase_project_id
NUXT_PUBLIC_FIREBASE_APP_ID=your_firebase_app_id
NUXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=your_firebase_sender_id
# Server-side Firebase API key (same as public, used for token verification)
NUXT_FIREBASE_API_KEY=your_firebase_api_key
# Google Calendar API
# Enable in Google Cloud Console
GOOGLE_CLOUD_CLIENT_ID=your_google_cloud_client_id
GOOGLE_CLOUD_CLIENT_SECRET=your_google_cloud_client_secret
# Database (PostgreSQL)
# Production: postgresql://xflow:password@postgres:5432/xflow
# Dev via SSH tunnel: postgresql://xflow:password@localhost:5432/xflow
DATABASE_URL=postgresql://xflow:xflow_pass@localhost:5432/xflow
# Gitea Integration
GITEA_URL=http://git.a-crm.controlsystem.kz
GITEA_TOKEN=your_gitea_token
GITEA_ORG=AVTEX
GITEA_MINDMAP_REPO=MMAVTEX
GITEA_PROJECT_REPO=Projects
# JWT Secret for session tokens
NUXT_JWT_SECRET=your_random_secret_here
+38
View File
@@ -0,0 +1,38 @@
# ========================================================
# XFlow — Coolify Environment Variables Template
# ========================================================
# В Coolify UI:
# 1. Set Compose file = docker-compose.coolify.yml
# 2. Set Dockerfile = Dockerfile.coolify
# 3. Скопируйте эти переменные в раздел Environment Variables проекта.
APP_NAME=xflow
NODE_ENV=production
SITE_URL=https://xflow.yourdomain.com
TZ=Asia/Almaty
# База данных PostgreSQL
POSTGRES_USER=xflow
POSTGRES_PASSWORD=generate-secure-password
POSTGRES_DB=xflow
DATABASE_URL=postgresql://xflow:${POSTGRES_PASSWORD}@db:5432/xflow
# Redis (кеширование и фоновые задачи)
REDIS_URL=redis://redis:6379
# Безопасность и JWT
JWT_SECRET=generate-super-secret-jwt-key-minimum-32-chars
# ИИ провайдеры (OpenRouter / Qwen / DeepSeek)
OPEN_ROUTER_API_KEY=
NUXT_OPEN_ROUTER_API_KEY=
NUXT_QWEN_API_KEY=
DEEPSEEK_API_KEY=
# Firebase Push Notifications (Web Push PWA)
FIREBASE_API_KEY=
FIREBASE_AUTH_DOMAIN=
FIREBASE_PROJECT_ID=
FIREBASE_STORAGE_BUCKET=
FIREBASE_MESSAGING_SENDER_ID=
FIREBASE_APP_ID=
+104
View File
@@ -0,0 +1,104 @@
name: Deploy XFlow (AVTEX/Projects)
on:
push:
branches:
- master
workflow_dispatch:
jobs:
deploy:
runs-on: ubuntu-latest
container:
image: node:22-alpine
defaults:
run:
shell: sh
steps:
- name: Checkout
env:
GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
run: |
apk add --no-cache git
CLEAN_TOKEN=$(printf '%s' "${GIT_TOKEN}" | tr -d '\r\n')
if [ ! -d ".git" ]; then
git init
git remote add origin "http://oauth2:${CLEAN_TOKEN}@git.a-crm.controlsystem.kz/AVTEX/XFlow.git"
fi
git fetch origin master
git reset --hard origin/master
- name: Install dependencies
run: |
npm install --include=dev
ls -la node_modules/prisma || echo "Prisma not found in node_modules"
- name: Build Nuxt
run: |
npx prisma generate
npm run build
mkdir -p .output/server/node_modules/@prisma
cp -r node_modules/.prisma .output/server/node_modules/
cp -r node_modules/@prisma/* .output/server/node_modules/@prisma/
cp -r node_modules/pg .output/server/node_modules/
env:
DATABASE_URL: "postgresql://admin:dummy@dummy:5432/dummy" # Нужна заглушка для билда призмы
NUXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
NUXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{ secrets.FIREBASE_AUTH_DOMAIN }}
NUXT_PUBLIC_FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
NUXT_PUBLIC_FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
NUXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.FIREBASE_MESSAGING_SENDER_ID }}
- name: Deploy to server
run: |
if ! command -v docker >/dev/null 2>&1; then
if command -v apk >/dev/null 2>&1; then
apk add --no-cache docker-cli
elif command -v apt-get >/dev/null 2>&1; then
apt-get update && apt-get install -y docker.io
else
echo "Docker not found and no package manager detected"
exit 1
fi
fi
echo "🌉 Создаем мост к серверу через временный контейнер..."
docker stop bridge 2>/dev/null || true
docker rm bridge 2>/dev/null || true
docker run -d --name bridge -v /root/projects:/server alpine sleep 300
echo "🧹 Очистка старых файлов на сервере..."
docker exec bridge sh -c "rm -rf /server/xflow/.output/*"
docker exec bridge sh -c "rm -rf /server/xflow/prisma/*"
echo "🚀 Копирование билда и файлов на сервер..."
docker exec bridge mkdir -p /server/xflow/.output
docker exec bridge mkdir -p /server/xflow/prisma
docker exec bridge mkdir -p /server/xflow/node_modules
docker cp .output/. bridge:/server/xflow/.output/
docker cp prisma/. bridge:/server/xflow/prisma/
docker cp node_modules/. bridge:/server/xflow/node_modules/
docker cp package.json bridge:/server/xflow/package.json
docker cp prisma.config.ts bridge:/server/xflow/prisma.config.ts
docker rm -f bridge
echo "🔄 Перезапуск приложения через единый docker-compose.yml на хосте..."
docker run --rm \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /root/projects:/root/projects \
-w /root/projects \
docker:cli \
sh -c "docker compose stop xflow_crm 2>/dev/null || true; docker compose rm -f xflow_crm 2>/dev/null || true; docker compose up -d --force-recreate --no-deps xflow_crm"
echo "⏳ Waiting for container to start..."
sleep 5
# Миграции с использованием новой БД xflow_crm_db
docker exec xflow_crm npx prisma migrate deploy
docker exec xflow_crm npx prisma db seed
echo "✅ XFlow CRM deployed at $(date)"
+43 -11
View File
@@ -1,13 +1,45 @@
*.iml # Environment variables
.gradle .env
/local.properties .env.local
local.properties .env.*.local
/.idea/ !/.env.example
# Nuxt
.nuxt
.nitro
.cache
.output
dist
# IDE
.vscode/
.idea/ .idea/
*.iml
*.ipr
*.iws
# Dependencies
node_modules/
# Logs
*.log
logs/
# OS
.DS_Store .DS_Store
/build Thumbs.db
build/
app/build/ # Coverage
/captures coverage/
.externalNativeBuild
.cxx # Temporary files
*.tmp
*.temp
server/api/node_modules/
obsidian-git/
/app/generated/prisma
*.apk
local.properties
.gradle/
+1
View File
@@ -0,0 +1 @@
{}
+1
View File
@@ -0,0 +1 @@
{}
+33
View File
@@ -0,0 +1,33 @@
{
"file-explorer": true,
"global-search": true,
"switcher": true,
"graph": true,
"backlink": true,
"canvas": true,
"outgoing-link": true,
"tag-pane": true,
"footnotes": false,
"properties": true,
"page-preview": true,
"daily-notes": true,
"templates": true,
"note-composer": true,
"command-palette": true,
"slash-command": false,
"editor-status": true,
"bookmarks": true,
"markdown-importer": false,
"zk-prefixer": false,
"random-note": false,
"outline": true,
"word-count": true,
"slides": false,
"audio-recorder": false,
"workspaces": false,
"file-recovery": true,
"publish": false,
"sync": true,
"bases": true,
"webviewer": false
}
+232
View File
@@ -0,0 +1,232 @@
{
"main": {
"id": "5578cc3a84253281",
"type": "split",
"children": [
{
"id": "08c5d1d78034a917",
"type": "tabs",
"children": [
{
"id": "3f38aefa8626b1f8",
"type": "leaf",
"state": {
"type": "canvas",
"state": {
"file": "session-2026-04-23.canvas",
"viewState": {
"x": -30,
"y": 220,
"zoom": -1.3211285963682102
}
},
"icon": "lucide-layout-dashboard",
"title": "session-2026-04-23"
}
}
]
}
],
"direction": "vertical"
},
"left": {
"id": "51c2518351e40de9",
"type": "split",
"children": [
{
"id": "e549873bfb898273",
"type": "tabs",
"children": [
{
"id": "593bb9c31fd772d7",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical",
"autoReveal": false
},
"icon": "lucide-folder-closed",
"title": "Файловый менеджер"
}
},
{
"id": "62546ac7efa0da90",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
},
"icon": "lucide-search",
"title": "Поиск"
}
},
{
"id": "1d80fa437f26e9ac",
"type": "leaf",
"state": {
"type": "bookmarks",
"state": {},
"icon": "lucide-bookmark",
"title": "Закладки"
}
}
]
}
],
"direction": "horizontal",
"width": 300
},
"right": {
"id": "852b2aecff829521",
"type": "split",
"children": [
{
"id": "e7d70e8889ccb870",
"type": "tabs",
"children": [
{
"id": "5746c4634649e54f",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "xflow-project-ru.canvas",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
"title": "Обратные ссылки для xflow-project-ru"
}
},
{
"id": "75023e9b8d4fc317",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"file": "xflow-project-ru.canvas",
"linksCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-going-out",
"title": "Исходящие ссылки из xflow-project-ru"
}
},
{
"id": "c8b2ad057ffcc230",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-tags",
"title": "Теги"
}
},
{
"id": "c551c9749ed1b9fd",
"type": "leaf",
"state": {
"type": "all-properties",
"state": {
"sortOrder": "frequency",
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-archive",
"title": "Все свойства"
}
},
{
"id": "b81e950116c8095d",
"type": "leaf",
"state": {
"type": "outline",
"state": {
"file": "xflow-project-ru.canvas",
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
"title": "Структура xflow-project-ru"
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
"left-ribbon": {
"hiddenItems": {
"switcher:Меню быстрого перехода": false,
"graph:Граф": false,
"canvas:Создать новый холст": false,
"daily-notes:Сегодняшняя заметка": false,
"templates:Вставить шаблон": false,
"command-palette:Открыть палитру команд": false,
"bases:Создать новую базу": false
}
},
"active": "3f38aefa8626b1f8",
"lastOpenFiles": [
"docker-compose.dev.yml",
"xflow-project-ru.canvas",
"session-2026-04-23.canvas",
"app/server/utils/prisma.ts",
"prisma.config.ts",
"prisma/schema.prisma",
"prisma",
"node_modules/mysql2/typings/mysql/lib/protocol/sequences/promise/QueryableBase.d.ts",
"node_modules/mysql2/typings/mysql/lib/protocol/sequences/promise/ExecutableBase.d.ts",
"node_modules/mysql2/typings/mysql/lib/protocol/packets/params/OkPacketParams.d.ts",
"node_modules/mysql2/typings/mysql/lib/protocol/packets/params/ErrorPacketParams.d.ts",
"node_modules/mysql2/typings/mysql/lib/protocol/sequences/Sequence.d.ts",
"node_modules/mysql2/typings/mysql/lib/protocol/sequences/QueryableBase.d.ts",
"node_modules/mysql2/lib/auth_plugins/caching_sha2_password.md",
"node_modules/mysql2/README.md",
"node_modules/remeda/README.md",
"node_modules/valibot/README.md",
"node_modules/valibot/LICENSE.md",
"node_modules/zeptomatch/readme.md",
"node_modules/better-result/README.md",
"node_modules/env-paths/readme.md",
"node_modules/chart.js/README.md",
"node_modules/chart.js/LICENSE.md",
"node_modules/@standard-schema/spec/README.md",
"node_modules/fast-check/README.md",
"node_modules/fast-check/CHANGELOG.md",
"node_modules/aws-ssl-profiles/README.md",
"node_modules/lru.min/README.md",
"node_modules/@radix-ui/react-use-layout-effect/README.md",
"node_modules/@radix-ui/react-use-effect-event/README.md",
"node_modules/@radix-ui/react-use-controllable-state/README.md",
"node_modules/@radix-ui/react-toggle/README.md",
"node_modules/@radix-ui/react-slot/README.md",
"node_modules/@radix-ui/react-primitive/README.md",
"node_modules/@radix-ui/react-compose-refs/README.md",
"node_modules/@radix-ui/primitive/README.md",
"node_modules/svgo/node_modules/commander/Readme.md",
"node_modules/@prisma/streams-local/dist/touch/hash_vendor/NOTICE.md",
"node_modules/proper-lockfile/node_modules/retry/equation.gif",
"xflow-project.canvas"
]
}
+15
View File
@@ -0,0 +1,15 @@
{
"permissions": {
"allow": [
"Bash(flutter *)",
"Bash(dart *)",
"Bash(taskkill *)",
"Bash(select-object *)",
"Bash(findstr *)",
"Bash(dir *)",
"Bash(select-string *)",
"Bash(timeout *)"
]
},
"$version": 3
}
+7
View File
@@ -0,0 +1,7 @@
{
"permissions": {
"allow": [
"Bash(flutter *)"
]
}
}
+156
View File
@@ -0,0 +1,156 @@
{
"nodes": [
{
"id": "center",
"type": "text",
"x": 100,
"y": 300,
"width": 350,
"height": 220,
"label": "📅 Отчет за сессию 25 мая 2026",
"text": "# 📅 Сессия: 25 мая 2026 г.\n\nСегодня мы провели масштабное обновление XFlow, интегрировав новые инструменты планирования, приоритезации, а также готовую интерактивную среду для вашего практического задания!\n\n**Ключевые блоки изменений:**\n1. 📋 Шаблон «Мои цели на год»\n2. ⚖️ Тест на истинность цели\n3. 📅 Диаграмма Ганта\n4. 📊 Матрица Эйзенхауэра\n5. 🧪 Сборка проекта Nuxt\n\n*Изучите подключенные узлы для деталей.*",
"style": {
"background": "#1e1b4b",
"border": "#fbbf24"
}
},
{
"id": "block-goals",
"type": "task",
"x": 550,
"y": 50,
"width": 320,
"height": 180,
"label": "📋 Шаблон целей на год",
"state": "completed",
"priority": "high",
"text": "## 📋 Шаблон «Мои цели на год»\n\n* **Тулбар:** Добавлена кнопка `📋 +Цели на Год` для автоматического развертывания карты из 5 целей.\n* **Структура:** Каждая цель пре-генерируется с шаблонами для ввода по методикам SMART и GROW (с полем для шагов и ресурсов).\n* **Связь с Гантом:** Все цели являются задачами и отображаются в таймлайне при заполнении дат.",
"style": {
"background": "#064e3b",
"border": "#10b981"
}
},
{
"id": "block-test",
"type": "task",
"x": 550,
"y": 250,
"width": 320,
"height": 180,
"label": "⚖️ Тест на истинность цели",
"state": "completed",
"priority": "high",
"text": "## ⚖️ Тест на истинность цели\n\n* **Сайдбар:** В свойства узла добавлен интерактивный опросник с 8 вопросами (шкала 1-10) для проверки мотивации по Заданию №2.\n* **Авторасчет:** Автоматически вычисляется сумма.\n* **Запись в узел:** Результат с подробными баллами записывается прямо в Markdown-текст узла по нажатию одной кнопки.",
"style": {
"background": "#0f172a",
"border": "#10b981"
}
},
{
"id": "block-gantt",
"type": "task",
"x": 550,
"y": 450,
"width": 320,
"height": 180,
"label": "📅 Диаграмма Ганта",
"state": "completed",
"priority": "high",
"text": "## 📅 Диаграмма Ганта\n\n* **Компонент:** Создан `GanttChartDrawer.vue` — выдвижной таймлайн снизу.\n* **Узлы задач:** Отслеживает все узлы типа `task` с заполненными датами.\n* **Фокус камеры:** Клик по задаче в списке Ганта плавно центрирует и приближает камеру Vue Flow на этот узел.",
"style": {
"background": "#1e293b",
"border": "#3b82f6"
}
},
{
"id": "block-eisen",
"type": "task",
"x": 550,
"y": 650,
"width": 320,
"height": 180,
"label": "📊 Матрица Эйзенхауэра",
"state": "completed",
"priority": "high",
"text": "## 📊 Матрица Эйзенхауэра\n\n* **2x2 Сетка:** Размещает четыре квадранта (Важно/Срочно, Важно/Несрочно, Неважно/Срочно, Неважно/Несрочно).\n* **ИИ коучинг:** Подключен бэкенд OpenRouter AI для автоматической сортировки списка задач пользователя по 4 квадрантам.",
"style": {
"background": "#451a03",
"border": "#f59e0b"
}
},
{
"id": "block-build",
"type": "task",
"x": 950,
"y": 350,
"width": 320,
"height": 180,
"label": "🧪 Сборка проекта",
"state": "completed",
"priority": "high",
"text": "## 🧪 Валидация сборки\n\n* **Команда:** `npm run build`\n* **Результат:** Успешно пройдено! Ошибок нет.\n* **Готовность:** 100% готовность к завтрашнему использованию на занятии.",
"style": {
"background": "#312e81",
"border": "#6366f1"
}
}
],
"edges": [
{
"id": "edge-goals",
"fromNode": "center",
"fromSide": "right",
"toNode": "block-goals",
"toSide": "left"
},
{
"id": "edge-test",
"fromNode": "center",
"fromSide": "right",
"toNode": "block-test",
"toSide": "left"
},
{
"id": "edge-gantt",
"fromNode": "center",
"fromSide": "right",
"toNode": "block-gantt",
"toSide": "left"
},
{
"id": "edge-eisen",
"fromNode": "center",
"fromSide": "right",
"toNode": "block-eisen",
"toSide": "left"
},
{
"id": "edge-goals-build",
"fromNode": "block-goals",
"fromSide": "right",
"toNode": "block-build",
"toSide": "left"
},
{
"id": "edge-test-build",
"fromNode": "block-test",
"fromSide": "right",
"toNode": "block-build",
"toSide": "left"
},
{
"id": "edge-gantt-build",
"fromNode": "block-gantt",
"fromSide": "right",
"toNode": "block-build",
"toSide": "left"
},
{
"id": "edge-eisen-build",
"fromNode": "block-eisen",
"fromSide": "right",
"toNode": "block-build",
"toSide": "left"
}
]
}
+112
View File
@@ -0,0 +1,112 @@
# Системный промпт для AI-ассистента проекта XFlow
## Текущая архитектура
Проект реализован на **Nuxt 3 PWA**.
### Стек
- **Frontend/Backend:** Nuxt 3 (Vue 3 + Nitro SSR)
- **Стили:** Tailwind CSS
- **PWA:** `@vite-pwa/nuxt` (Service Worker, манифест, оффлайн-кэш)
- **Аутентификация:** Firebase Auth (Google Sign-In), JWT на Nitro
- **Визуализация:** `@vue-flow/core` + `@vue-flow/background` + `@vue-flow/controls` + `@vue-flow/minimap`
- **Markdown:** `markdown-it` (рендеринг нод)
- **Push:** Web Push API + Notification API + вибро
- **База данных:** In-memory (заглушка на Nitro utils/db.ts), миграция на Postgres в планах
### Файловая структура
```
app/
app.vue # Корневой компонент
assets/css/main.css # Tailwind + кастомные стили для Vue Flow
components/
CanvasViewer.vue # Основной канвас (Vue Flow)
MarkdownNode.vue # Рендеринг markdown в нодах
AchievementOverlay.vue # Всплывающие ачивки
composables/
useAuth.ts # Firebase Google Sign-In + JWT decode
useCanvas.ts # Загрузка .canvas JSON, парсинг frontmatter
usePush.ts # Подписка/отправка Web Push
useAchievements.ts # Управление ачивками
layouts/
default.vue # Навигация + AchievementOverlay
middleware/
auth.ts # Проверка JWT (cookie xflow_token)
admin.ts # Проверка role === 'admin'
pages/
index.vue # Дашборд (статы задач и ачивок)
login.vue # Только Google Sign-In (Firebase)
canvas.vue # CanvasViewer страница
admin.vue # Панель админа (пуши, скрипты)
settings.vue # Настройки пушей и ачивок
plugins/
firebase.client.ts # Инициализация Firebase SDK (только клиент)
push-notifications.client.ts # Обработка пуш-событий
server/
api/auth/google.post.ts # Верификация Firebase ID token + выдача JWT
api/auth/validate.get.ts # Проверка JWT
api/canvas/[id].get.ts # Мок .canvas JSON
api/nodes/[id].put.ts # Обновление статуса ноды + автовыдача ачивок
api/nodes/index.get.ts # Список нод с RBAC (фильтр по assigned_to)
api/achievements/index.get.ts # Список ачивок пользователя
api/push/subscribe.post.ts # Сохранение подписки
api/push/send.post.ts # Отправка пуша (admin only)
utils/auth.ts # Генерация/верификация JWT (jose)
utils/db.ts # In-memory store (users, nodes, achievements, pushSubs)
public/
favicon.svg
pwa-*.svg # Иконки PWA (SVG заглушки)
```
### Ключевые бизнес-правила
1. **Авторизация:** Только Firebase Google Sign-In. Email/password удален. Cookie `xflow_token`.
2. **RBAC:** `role: 'admin'` дает доступ к `/admin`. Обычные пользователи видят только ноды с `assigned_to == свой email`.
3. **Canvas ноды:** Double-click переключает статус `pending -> in_progress -> completed`. При `completed` сервер автоматически выдает ачивку.
4. **Frontmatter:** Ноды могут содержать YAML frontmatter с полями `alarm`, `script_id`, `assigned_to`.
5. **Push:** Админ отправляет пуши через `/api/push/send`. Клиентский плагин слушает `PUSH_RECEIVED` и вибрирует.
6. **Gamification:** Ачивки выдаются автоматически при завершении нод. Отображаются через AchievementOverlay.
### Конфигурация (.env)
Обязательные переменные для Firebase:
```
NUXT_PUBLIC_FIREBASE_API_KEY=
NUXT_PUBLIC_FIREBASE_AUTH_DOMAIN=
NUXT_PUBLIC_FIREBASE_PROJECT_ID=
NUXT_PUBLIC_FIREBASE_APP_ID=
NUXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=
NUXT_FIREBASE_API_KEY= # Серверная верификация (тот же ключ)
NUXT_JWT_SECRET= # Секрет для подписи JWT
```
## Критически важное правило: документация в .md
**При ЛЮБЫХ изменениях архитектуры, API, бизнес-логики или структуры данных — обновляй соответствующие .md файлы.**
### Структура документации в проекте
- `docs/architecture/` — архитектурные решения, ADR
- `docs/api/` — контракты API, форматы данных
- `docs/features/` — описание функционала
- `README.md` — общее описание, setup, структура
### Правила обновления .md
1. **Если добавляешь новый composable/component/API route** — создай или обнови `.md`:
- Назначение
- Зависимости
- Публичный API (методы, параметры, типы)
- Пример использования
2. **Если меняешь формат данных** (.canvas JSON, frontmatter схема):
- Обнови документацию формата
- Укажи версию схемы
- Опиши миграцию если нужна
3. **Если добавляешь фичу**:
- Создай `docs/features/feature-name.md`
- Опиши user flow, edge cases
## Инструкция для сессии
1. Перед изменениями — прочитай соответствующий `.md` файл и код
2. После изменений — обнови `.md` или создай новый
3. Не ломай существующие форматы данных без явного запроса
4. При добавлении зависимостей — проверяй совместимость с Nuxt 3 / Vue 3 / TypeScript
5. Все Dart/Flutter файлы удалены — не возвращай их
6. Cookie называется `xflow_token`
7. Проект называется **XFlow**
+115
View File
@@ -0,0 +1,115 @@
# ==========================================
# Stage 1: builder
# ==========================================
FROM node:22-slim AS builder
ENV HUSKY=0
ENV NODE_ENV=development
ENV NODE_OPTIONS="--max-old-space-size=4096"
WORKDIR /src
RUN apt-get update && apt-get install -y --no-install-recommends openssl git ca-certificates \
&& rm -rf /var/lib/apt/lists/*
ARG SITE_URL=""
ARG DATABASE_URL="postgresql://xflow:xflow@db:5432/xflow"
ARG REDIS_URL="redis://redis:6379"
ARG JWT_SECRET="super-secret-jwt-key"
ARG OPEN_ROUTER_API_KEY=""
ARG NUXT_OPEN_ROUTER_API_KEY=""
ARG NUXT_QWEN_API_KEY=""
ARG DEEPSEEK_API_KEY=""
ARG FIREBASE_API_KEY="AIzaSyDP1IxP7ntZ5k3agzulPjW_dDsQMKsMPck"
ARG FIREBASE_AUTH_DOMAIN="xflow-d8dd5.firebaseapp.com"
ARG FIREBASE_PROJECT_ID="xflow-d8dd5"
ARG FIREBASE_STORAGE_BUCKET="xflow-d8dd5.firebasestorage.app"
ARG FIREBASE_MESSAGING_SENDER_ID="944408960366"
ARG FIREBASE_APP_ID="1:944408960366:web:4d2cd393e85a0ca9b4357f"
ARG TZ="Asia/Almaty"
ENV SITE_URL=${SITE_URL} \
DATABASE_URL=${DATABASE_URL} \
NUXT_DATABASE_URL=${DATABASE_URL} \
REDIS_URL=${REDIS_URL} \
NUXT_REDIS_URL=${REDIS_URL} \
JWT_SECRET=${JWT_SECRET} \
NUXT_JWT_SECRET=${JWT_SECRET} \
OPEN_ROUTER_API_KEY=${OPEN_ROUTER_API_KEY} \
NUXT_OPEN_ROUTER_API_KEY=${NUXT_OPEN_ROUTER_API_KEY} \
NUXT_QWEN_API_KEY=${NUXT_QWEN_API_KEY} \
DEEPSEEK_API_KEY=${DEEPSEEK_API_KEY} \
FIREBASE_API_KEY=${FIREBASE_API_KEY} \
NUXT_FIREBASE_API_KEY=${FIREBASE_API_KEY} \
NUXT_PUBLIC_FIREBASE_API_KEY=${FIREBASE_API_KEY} \
FIREBASE_AUTH_DOMAIN=${FIREBASE_AUTH_DOMAIN} \
NUXT_FIREBASE_AUTH_DOMAIN=${FIREBASE_AUTH_DOMAIN} \
NUXT_PUBLIC_FIREBASE_AUTH_DOMAIN=${FIREBASE_AUTH_DOMAIN} \
FIREBASE_PROJECT_ID=${FIREBASE_PROJECT_ID} \
NUXT_FIREBASE_PROJECT_ID=${FIREBASE_PROJECT_ID} \
NUXT_PUBLIC_FIREBASE_PROJECT_ID=${FIREBASE_PROJECT_ID} \
FIREBASE_STORAGE_BUCKET=${FIREBASE_STORAGE_BUCKET} \
NUXT_FIREBASE_STORAGE_BUCKET=${FIREBASE_STORAGE_BUCKET} \
NUXT_PUBLIC_FIREBASE_STORAGE_BUCKET=${FIREBASE_STORAGE_BUCKET} \
FIREBASE_MESSAGING_SENDER_ID=${FIREBASE_MESSAGING_SENDER_ID} \
NUXT_FIREBASE_MESSAGING_SENDER_ID=${FIREBASE_MESSAGING_SENDER_ID} \
NUXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID=${FIREBASE_MESSAGING_SENDER_ID} \
FIREBASE_APP_ID=${FIREBASE_APP_ID} \
NUXT_FIREBASE_APP_ID=${FIREBASE_APP_ID} \
NUXT_PUBLIC_FIREBASE_APP_ID=${FIREBASE_APP_ID} \
TZ=${TZ}
# Копируем package.json, prisma схемы и конфиг
COPY apps/web/package*.json ./
COPY apps/web/prisma ./prisma
COPY apps/web/prisma.config.ts ./
RUN npm ci --include=optional && npx prisma generate
# Копируем исходный код apps/web
COPY apps/web ./
RUN HUSKY=0 NODE_ENV=development npx nuxi prepare && HUSKY=0 NODE_ENV=development npm run build
# ==========================================
# Stage 2: runner
# ==========================================
FROM node:22-slim AS runner
ENV HUSKY=0
ENV NODE_ENV=production
WORKDIR /src
RUN apt-get update && apt-get install -y --no-install-recommends openssl tzdata ca-certificates \
&& rm -rf /var/lib/apt/lists/*
ARG SITE_URL=""
ARG DATABASE_URL="postgresql://xflow:xflow@db:5432/xflow"
ARG REDIS_URL="redis://redis:6379"
ARG JWT_SECRET="super-secret-jwt-key"
ARG TZ="Asia/Almaty"
ENV SITE_URL=${SITE_URL} \
DATABASE_URL=${DATABASE_URL} \
NUXT_DATABASE_URL=${DATABASE_URL} \
REDIS_URL=${REDIS_URL} \
NUXT_REDIS_URL=${REDIS_URL} \
JWT_SECRET=${JWT_SECRET} \
NUXT_JWT_SECRET=${JWT_SECRET} \
TZ=${TZ}
COPY --from=builder /src/.output ./.output
COPY --from=builder /src/prisma ./prisma
COPY --from=builder /src/prisma.config.ts ./
COPY --from=builder /src/package.json ./
COPY --from=builder /src/node_modules ./node_modules
ENV HOST=0.0.0.0
ENV PORT=3000
ENV NUXT_HOST=0.0.0.0
ENV NUXT_PORT=3000
ENV NITRO_HOST=0.0.0.0
ENV NITRO_PORT=3000
EXPOSE 3000
CMD ["sh", "-c", "npx prisma db push --accept-data-loss && exec node .output/server/index.mjs"]
+71
View File
@@ -0,0 +1,71 @@
.PHONY: help up start dev-node db dev down restart logs logs-app logs-db ps db-push db-shell clean install-docker
CYAN := \033[36m
GREEN := \033[32m
YELLOW:= \033[33m
RESET := \033[0m
help:
@echo "$(CYAN)XFlow Stack Management:$(RESET)"
@echo " $(GREEN)make up$(RESET) - Запустить стек (в Docker если установлен, иначе локально через Node)"
@echo " $(GREEN)make start$(RESET) - Запустить собранный Nuxt-сервер на Node (порт 3000)"
@echo " $(GREEN)make db$(RESET) - Запустить базы (PostgreSQL + Redis) в Docker"
@echo " $(GREEN)make dev$(RESET) - Поднять DB в Docker + запустить локальный Nuxt"
@echo " $(GREEN)make down$(RESET) - Остановить контейнеры Docker"
@echo " $(GREEN)make logs$(RESET) - Логи Docker-контейнеров"
@echo " $(GREEN)make install-docker$(RESET) - Инструкция по установке Docker на Ubuntu"
up:
@if command -v docker >/dev/null 2>&1; then \
echo "$(GREEN)Запуск контейнеров через Docker Compose...$(RESET)"; \
docker compose up -d --build; \
else \
echo "$(YELLOW)Docker не установлен в системе.$(RESET)"; \
echo "$(CYAN)Чтобы установить Docker: sudo apt-get update && sudo apt-get install -y docker.io docker-compose-v2 && sudo usermod -aG docker \$$USER$(RESET)"; \
echo "$(GREEN)Запускаем XFlow через Node.js на порту 3000...$(RESET)"; \
$(MAKE) start; \
fi
start:
@PORT=3000 node /home/alexives/Desktop/StudioProjects/XFlow/apps/web/.output/server/index.mjs
db:
docker compose up -d db redis
@echo "$(GREEN)PostgreSQL (5432) и Redis (6379) запущены!$(RESET)"
dev: db
DATABASE_URL="postgresql://xflow:xflow_pass@localhost:5432/xflow" npm --prefix apps/web run prisma db push || true
DATABASE_URL="postgresql://xflow:xflow_pass@localhost:5432/xflow" npm --prefix apps/web run dev
down:
@if command -v docker >/dev/null 2>&1; then docker compose down; fi
restart:
@if command -v docker >/dev/null 2>&1; then docker compose restart; else $(MAKE) start; fi
logs:
docker compose logs -f
logs-app:
docker compose logs -f app
logs-db:
docker compose logs -f db
ps:
docker compose ps
db-push:
DATABASE_URL="postgresql://xflow:xflow_pass@localhost:5432/xflow" npx --prefix apps/web prisma db push
db-shell:
docker compose exec db psql -U xflow -d xflow
clean:
docker compose down -v --remove-orphans
install-docker:
@echo "$(CYAN)Для установки Docker выполните:$(RESET)"
@echo "sudo apt-get update && sudo apt-get install -y docker.io docker-compose-v2"
@echo "sudo usermod -aG docker \$$USER"
@echo "$(CYAN)Затем обновите сессию: newgrp docker$(RESET)"
+60 -72
View File
@@ -1,91 +1,79 @@
# Avtex — Smart Sleep & Motion Engine for Home Assistant # 🚀 XFlow — Nuxt 3 PWA
<p align="center"> Визуальный менеджер задач на базе Obsidian Canvas. Работает офлайн, поддерживает уведомления и геймификацию.
<img src="app/src/main/res/drawable/app_logo.png" width="160" alt="Avtex Logo" style="border-radius: 28px;" />
</p>
<p align="center"> ## 📱 Возможности
<b>Легковесное Android-приложение для мгновенной фиксации сна и пробуждения с интеграцией в Home Assistant (HAC)</b><br>
<i>Оптимизировано для OnePlus (OxygenOS / ColorOS) и устройств с ненормированным рабочим графиком.</i>
</p>
--- - ✅ **Obsidian Canvas** — визуальное управление задачами через граф
- ✅ **Markdown ноды** — рендеринг содержимого с подсветкой синтаксиса
- ✅ **PWA + Офлайн** — Service Worker, кэширование, установка на homescreen
- ✅ **JWT Auth** — регистрация, вход, ролевая модель (RBAC)
- ✅ **Web Push** — пуш-уведомления даже при закрытом приложении
- ✅ **Будильники** — локальные вибро-уведомления
- ✅ **Ачивки** — геймификация выполнения задач
- ✅ **Админка** — управление скриптами и рассылкой пушей
## 🌟 Ключевые возможности ## 🛠 Технологический стек
* **Мгновенная фиксация пробуждения (0% расхода батареи)**: | Компонент | Технология |
Использует аппаратный сопроцессор `Sensor.TYPE_SIGNIFICANT_MOTION`. Как только вы берете телефон в руки после сна, сигнал пробуждения моментально передается в умный дом. |-----------|------------|
* **Детекция сна при ненормированном графике**: | Framework | Nuxt 3 (Vue 3) |
Связка таймера покоя (по умолчанию 20 мин при выключенном экране) и нейросетевых классификаций **Google Play Services Sleep API** (`SleepClassifyEvent`). Никаких жестких привязок к часам (23:00–07:00). | Styling | Tailwind CSS |
* **Полная совместимость с Home Assistant (HAC)**: | Canvas | Vue Flow |
* **Webhook URL**: отправка JSON-событий `{"event": "sleep_started" | "sleep_ended", "state": "asleep" | "awake", ...}`. | Markdown | markdown-it |
* **REST State API**: прямое обновление сенсора `binary_sensor.phone_sleep` через Long-Lived Access Token. | PWA | @vite-pwa/nuxt |
* **Local Broadcast Intent**: `com.example.avtex.SLEEP_STATE_CHANGED` для Tasker / Home Assistant Companion App прямо на телефоне. | Backend API | Nitro (встроен в Nuxt) |
* **Устойчивость к убийцам процессов OnePlus**: | Auth | JWT |
* Реализован как Foreground Service с типом `specialUse`.
* Интерактивный экран со вспомогательными кнопками перехода в системные настройки OxygenOS (отключение оптимизации батареи, включение автозапуска).
* **Премиальный дизайн в стиле Cyber Obsidian / Glassmorphism**:
* Jetpack Compose & Material 3.
* Тонкие неоновые контуры, стеклянные карточки, динамический пульсирующий баннер состояния.
* Интерактивная лента аудита событий сенсоров в реальном времени.
---
## 🚀 Быстрый старт ## 🚀 Быстрый старт
### 1. Сборка APK ### 1. Установка зависимостей
Для сборки отладочной версии:
```bash ```bash
./gradlew assembleDebug npm install
``` ```
Для сборки оптимизированного подписанного Release APK: ### 2. Настройка окружения
```bash ```bash
./gradlew assembleRelease cp .env.example .env
# Отредактируй .env (JWT_SECRET, Postgres и т.д.)
``` ```
Файл будет создан в `app/build/outputs/apk/release/app-release.apk`.
### 2. Установка через ADB ### 3. Запуск dev-сервера
```bash ```bash
adb install -r app/build/outputs/apk/release/app-release.apk npm run dev
``` ```
### 4. Сборка для production
```bash
npm run build
npm run preview
```
## 📁 Структура проекта
```
app/
├── components/ # Vue компоненты (CanvasViewer, MarkdownNode, ...)
├── composables/ # Логика (useAuth, useCanvas, usePush, ...)
├── layouts/ # Layout'ы страниц
├── middleware/ # Route guards (auth, admin)
├── pages/ # Страницы (index, login, canvas, admin)
├── plugins/ # Client plugins (push notifications)
├── public/ # Статические ассеты (иконки PWA)
└── server/ # Nitro API routes
server/ # Legacy Express API (сохранён)
```
## � Доступ
- **Админ** — `admin@xflow.local` / `admin123`
- **Регистрация** — доступна на `/login`
## 📄 Лицензия
Internal use only
--- ---
## ⚙️ Настройка Home Assistant (Пример Webhook автоматизации) **XFlow Team** 🚀
В файле `automations.yaml` или в визуальном редакторе Home Assistant:
```yaml
alias: "Avtex: Автоматизация сна и пробуждения"
trigger:
- platform: webhook
webhook_id: avtex_sleep
action:
- choose:
- conditions: "{{ trigger.json.state == 'asleep' }}"
sequence:
- service: light.turn_off
target:
entity_id: all
- service: climate.set_preset_mode
data:
preset_mode: sleep
target:
entity_id: climate.bedroom
- conditions: "{{ trigger.json.state == 'awake' }}"
sequence:
- service: scene.turn_on
target:
entity_id: scene.morning_lights
```
---
## 🛠 Стек технологий
* **Язык**: Kotlin 2.3+
* **UI**: Jetpack Compose, Material 3, Navigation
* **Сенсоры**: Android Sensor Hub (`TYPE_SIGNIFICANT_MOTION`), Google Play Services Location / Sleep API
* **Сеть**: OkHttp 4.12
* **Хранилище настроек**: Jetpack DataStore Preferences
-63
View File
@@ -1,63 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<application
android:name=".AvtexApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:windowSoftInputMode="adjustResize"
android:theme="@style/Theme.Avtex">
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<service
android:name=".engine.SleepTrackingService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="specialUse">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="Detects sleep and wake states using motion sensors and Sleep API for Home Assistant smart home automations." />
</service>
<receiver
android:name=".engine.SleepReceiver"
android:exported="true"
android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
<intent-filter>
<action android:name="com.example.avtex.ACTION_SLEEP_API_EVENT" />
</intent-filter>
</receiver>
<receiver
android:name=".engine.BootReceiver"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
</application>
</manifest>
@@ -1,22 +0,0 @@
package com.example.avtex
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.ui.Modifier
import com.example.avtex.theme.AvtexTheme
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
AvtexTheme { Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { MainNavigation() } }
}
}
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

-3
View File
@@ -1,3 +0,0 @@
<resources>
<string name="app_name">Avtex</string>
</resources>
+158
View File
@@ -0,0 +1,158 @@
#!/usr/bin/env node
import fs from 'node:fs';
import path from 'node:path';
import os from 'node:os';
const CONFIG_FILE = path.join(os.homedir(), '.xflow.json');
function loadConfig() {
if (fs.existsSync(CONFIG_FILE)) {
try {
return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
} catch {
// fallback
}
}
return {
serverUrl: process.env.XFLOW_SERVER_URL || 'http://localhost:3000',
userId: process.env.XFLOW_USER_ID || 'default-user'
};
}
function saveConfig(config) {
fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), 'utf-8');
console.log(`[XFlow] Настройки сохранены в ${CONFIG_FILE}`);
}
async function addNote(title, listTitle = 'Фильмы на просмотр', category = 'movies') {
const config = loadConfig();
const url = `${config.serverUrl.replace(/\/$/, '')}/api/v1/lists/items`;
console.log(`[XFlow Desktop] Отправка заметки: "${title}" в список "${listTitle}"...`);
try {
const res = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
title,
listTitle,
category,
ownerId: config.userId
})
});
const data = await res.json();
if (res.ok && data.success) {
console.log(`\x1b[32m✔ Успешно добавлено!\x1b[0m ID: ${data.item.id}, Статус: ${data.item.status}`);
console.log(` Синхронизировано с сервером и отправлено на мобильный клиент.`);
} else {
console.error(`\x1b[31m✖ Ошибка сервера:\x1b[0m`, data.message || data);
}
} catch (err) {
console.error(`\x1b[31m✖ Не удалось связаться с сервером XFlow (${config.serverUrl}):\x1b[0m ${err.message}`);
console.log(` Убедитесь, что сервер XFlow запущен на ${config.serverUrl}`);
}
}
async function listNotes(category) {
const config = loadConfig();
const query = category ? `?category=${encodeURIComponent(category)}` : '';
const url = `${config.serverUrl.replace(/\/$/, '')}/api/v1/lists${query}`;
try {
const res = await fetch(url);
const data = await res.json();
if (res.ok && data.success) {
console.log(`\n\x1b[1m=== Списки XFlow ===\x1b[0m`);
for (const list of data.lists) {
console.log(`\n📂 \x1b[36m${list.title}\x1b[0m (${list.category}) [${list.items?.length || 0} элементов]:`);
for (const item of list.items || []) {
const check = item.isCompleted ? '☑' : '☐';
console.log(` ${check} ${item.title} \x1b[90m(статус: ${item.status})\x1b[0m`);
}
}
console.log('');
} else {
console.error(`Ошибка:`, data.message);
}
} catch (err) {
console.error(`Ошибка связи с сервером: ${err.message}`);
}
}
async function main() {
const args = process.argv.slice(2);
const command = args[0];
if (!command || command === '--help' || command === '-h') {
console.log(`
\x1b[1m🚀 XFlow CLI — Native Desktop & Terminal Agent Bridge\x1b[0m
Использование:
xflow movie "<название фильма>" Быстро добавить фильм в список на просмотр
xflow add "<заметка>" [--list <список>] Добавить элемент в указанный список
xflow list [категория] Показать списки и элементы
xflow config --url <url> --user <id> Настроить подключение к серверу XFlow
Примеры:
xflow movie "Интерстеллар"
xflow add "Купить молоко" --list "Покупки"
xflow list
`);
return;
}
if (command === 'movie') {
const title = args.slice(1).join(' ');
if (!title) {
console.error('Укажите название фильма: xflow movie "Интерстеллар"');
return;
}
await addNote(title, 'Фильмы на просмотр', 'movies');
return;
}
if (command === 'add') {
const title = args[1];
let listTitle = 'Общий список';
let category = 'general';
for (let i = 2; i < args.length; i++) {
if (args[i] === '--list' && args[i + 1]) {
listTitle = args[i + 1];
if (listTitle.toLowerCase().includes('фильм')) category = 'movies';
if (listTitle.toLowerCase().includes('покупк')) category = 'shopping';
}
}
if (!title) {
console.error('Укажите текст заметки: xflow add "Заметка"');
return;
}
await addNote(title, listTitle, category);
return;
}
if (command === 'list') {
const category = args[1];
await listNotes(category);
return;
}
if (command === 'config') {
const config = loadConfig();
for (let i = 1; i < args.length; i++) {
if (args[i] === '--url' && args[i + 1]) config.serverUrl = args[i + 1];
if (args[i] === '--user' && args[i + 1]) config.userId = args[i + 1];
}
saveConfig(config);
return;
}
console.error(`Неизвестная команда: ${command}. Используйте --help`);
}
main().catch(console.error);
+22
View File
@@ -0,0 +1,22 @@
{
"name": "@xflow/desktop-cli",
"version": "1.0.0",
"description": "XFlow Windows/Linux Native CLI and Agent Bridge",
"type": "module",
"bin": {
"xflow": "./dist/index.js"
},
"scripts": {
"build": "tsc",
"start": "node dist/index.js",
"dev": "tsx src/index.ts"
},
"dependencies": {
"commander": "^12.0.0"
},
"devDependencies": {
"@types/node": "^20.11.0",
"tsx": "^4.7.0",
"typescript": "^5.3.3"
}
}
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env node
import fs from 'node:fs';
import path from 'node:path';
import os from 'node:os';
const CONFIG_FILE = path.join(os.homedir(), '.xflow.json');
interface XFlowConfig {
serverUrl: string;
userId: string;
apiKey?: string;
}
function loadConfig(): XFlowConfig {
if (fs.existsSync(CONFIG_FILE)) {
try {
return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
} catch {
// fallback
}
}
return {
serverUrl: process.env.XFLOW_SERVER_URL || 'http://localhost:3000',
userId: process.env.XFLOW_USER_ID || 'default-user'
};
}
function saveConfig(config: XFlowConfig) {
fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2), 'utf-8');
console.log(`[XFlow] Настройки сохранены в ${CONFIG_FILE}`);
}
async function addNote(title: string, listTitle: string = 'Фильмы', category: string = 'movies') {
const config = loadConfig();
const url = `${config.serverUrl.replace(/\/$/, '')}/api/v1/lists/items`;
console.log(`[XFlow Desktop] Отправка заметки: "${title}" в список "${listTitle}"...`);
try {
const res = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
title,
listTitle,
category,
ownerId: config.userId
})
});
const data = await res.json() as any;
if (res.ok && data.success) {
console.log(`\x1b[32m✔ Успешно добавлено!\x1b[0m ID: ${data.item.id}, Статус: ${data.item.status}`);
console.log(` Синхронизировано с сервером и отправлено на мобильный клиент.`);
} else {
console.error(`\x1b[31m✖ Ошибка сервера:\x1b[0m`, data.message || data);
}
} catch (err: any) {
console.error(`\x1b[31m✖ Не удалось связаться с сервером XFlow (${config.serverUrl}):\x1b[0m ${err.message}`);
console.log(` Убедитесь, что сервер XFlow запущен на ${config.serverUrl}`);
}
}
async function listNotes(category?: string) {
const config = loadConfig();
const query = category ? `?category=${encodeURIComponent(category)}` : '';
const url = `${config.serverUrl.replace(/\/$/, '')}/api/v1/lists${query}`;
try {
const res = await fetch(url);
const data = await res.json() as any;
if (res.ok && data.success) {
console.log(`\n\x1b[1m=== Списки XFlow ===\x1b[0m`);
for (const list of data.lists) {
console.log(`\n📂 \x1b[36m${list.title}\x1b[0m (${list.category}) [${list.items?.length || 0} элементов]:`);
for (const item of list.items || []) {
const check = item.isCompleted ? '☑' : '☐';
console.log(` ${check} ${item.title} \x1b[90m(статус: ${item.status})\x1b[0m`);
}
}
console.log('');
} else {
console.error(`Ошибка:`, data.message);
}
} catch (err: any) {
console.error(`Ошибка связи с сервером: ${err.message}`);
}
}
async function main() {
const args = process.argv.slice(2);
const command = args[0];
if (!command || command === '--help' || command === '-h') {
console.log(`
\x1b[1m🚀 XFlow CLI — Native Desktop & Terminal Agent Bridge\x1b[0m
Использование:
xflow movie "<название фильма>" Быстро добавить фильм в список на просмотр
xflow add "<заметка>" [--list <список>] Добавить элемент в указанный список
xflow list [категория] Показать списки и элементы
xflow config --url <url> --user <id> Настроить подключение к серверу XFlow
Примеры:
xflow movie "Интерстеллар"
xflow add "Купить молоко" --list "Покупки"
xflow list
`);
return;
}
if (command === 'movie') {
const title = args.slice(1).join(' ');
if (!title) {
console.error('Укажите название фильма: xflow movie "Интерстеллар"');
return;
}
await addNote(title, 'Фильмы на просмотр', 'movies');
return;
}
if (command === 'add') {
const title = args[1];
let listTitle = 'Общий список';
let category = 'general';
for (let i = 2; i < args.length; i++) {
if (args[i] === '--list' && args[i + 1]) {
listTitle = args[i + 1];
if (listTitle.toLowerCase().includes('фильм')) category = 'movies';
if (listTitle.toLowerCase().includes('покупк')) category = 'shopping';
}
}
if (!title) {
console.error('Укажите текст заметки: xflow add "Заметка"');
return;
}
await addNote(title, listTitle, category);
return;
}
if (command === 'list') {
const category = args[1];
await listNotes(category);
return;
}
if (command === 'config') {
const config = loadConfig();
for (let i = 1; i < args.length; i++) {
if (args[i] === '--url' && args[i + 1]) config.serverUrl = args[i + 1];
if (args[i] === '--user' && args[i + 1]) config.userId = args[i + 1];
}
saveConfig(config);
return;
}
console.error(`Неизвестная команда: ${command}. Используйте --help`);
}
main().catch(console.error);
+13
View File
@@ -0,0 +1,13 @@
*.iml
.gradle
/local.properties
local.properties
/.idea/
.idea/
.DS_Store
/build
build/
app/build/
/captures
.externalNativeBuild
.cxx
+91
View File
@@ -0,0 +1,91 @@
# Avtex — Smart Sleep & Motion Engine for Home Assistant
<p align="center">
<img src="app/src/main/res/drawable/app_logo.png" width="160" alt="Avtex Logo" style="border-radius: 28px;" />
</p>
<p align="center">
<b>Легковесное Android-приложение для мгновенной фиксации сна и пробуждения с интеграцией в Home Assistant (HAC)</b><br>
<i>Оптимизировано для OnePlus (OxygenOS / ColorOS) и устройств с ненормированным рабочим графиком.</i>
</p>
---
## 🌟 Ключевые возможности
* **Мгновенная фиксация пробуждения (0% расхода батареи)**:
Использует аппаратный сопроцессор `Sensor.TYPE_SIGNIFICANT_MOTION`. Как только вы берете телефон в руки после сна, сигнал пробуждения моментально передается в умный дом.
* **Детекция сна при ненормированном графике**:
Связка таймера покоя (по умолчанию 20 мин при выключенном экране) и нейросетевых классификаций **Google Play Services Sleep API** (`SleepClassifyEvent`). Никаких жестких привязок к часам (23:00–07:00).
* **Полная совместимость с Home Assistant (HAC)**:
* **Webhook URL**: отправка JSON-событий `{"event": "sleep_started" | "sleep_ended", "state": "asleep" | "awake", ...}`.
* **REST State API**: прямое обновление сенсора `binary_sensor.phone_sleep` через Long-Lived Access Token.
* **Local Broadcast Intent**: `com.example.avtex.SLEEP_STATE_CHANGED` для Tasker / Home Assistant Companion App прямо на телефоне.
* **Устойчивость к убийцам процессов OnePlus**:
* Реализован как Foreground Service с типом `specialUse`.
* Интерактивный экран со вспомогательными кнопками перехода в системные настройки OxygenOS (отключение оптимизации батареи, включение автозапуска).
* **Премиальный дизайн в стиле Cyber Obsidian / Glassmorphism**:
* Jetpack Compose & Material 3.
* Тонкие неоновые контуры, стеклянные карточки, динамический пульсирующий баннер состояния.
* Интерактивная лента аудита событий сенсоров в реальном времени.
---
## 🚀 Быстрый старт
### 1. Сборка APK
Для сборки отладочной версии:
```bash
./gradlew assembleDebug
```
Для сборки оптимизированного подписанного Release APK:
```bash
./gradlew assembleRelease
```
Файл будет создан в `app/build/outputs/apk/release/app-release.apk`.
### 2. Установка через ADB
```bash
adb install -r app/build/outputs/apk/release/app-release.apk
```
---
## ⚙️ Настройка Home Assistant (Пример Webhook автоматизации)
В файле `automations.yaml` или в визуальном редакторе Home Assistant:
```yaml
alias: "Avtex: Автоматизация сна и пробуждения"
trigger:
- platform: webhook
webhook_id: avtex_sleep
action:
- choose:
- conditions: "{{ trigger.json.state == 'asleep' }}"
sequence:
- service: light.turn_off
target:
entity_id: all
- service: climate.set_preset_mode
data:
preset_mode: sleep
target:
entity_id: climate.bedroom
- conditions: "{{ trigger.json.state == 'awake' }}"
sequence:
- service: scene.turn_on
target:
entity_id: scene.morning_lights
```
---
## 🛠 Стек технологий
* **Язык**: Kotlin 2.3+
* **UI**: Jetpack Compose, Material 3, Navigation
* **Сенсоры**: Android Sensor Hub (`TYPE_SIGNIFICANT_MOTION`), Google Play Services Location / Sleep API
* **Сеть**: OkHttp 4.12
* **Хранилище настроек**: Jetpack DataStore Preferences
@@ -11,8 +11,8 @@ android {
applicationId = "com.example.avtex" applicationId = "com.example.avtex"
minSdk = 26 minSdk = 26
targetSdk = 36 targetSdk = 36
versionCode = 1 versionCode = 4
versionName = "1.0" versionName = "1.3"
} }
signingConfigs { signingConfigs {
@@ -49,6 +49,11 @@ android {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"
} }
} }
lint {
abortOnError = false
checkReleaseBuilds = false
}
} }
kotlin { kotlin {
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<application
android:name=".AvtexApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher_avtex"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_avtex_round"
android:supportsRtl="true"
android:windowSoftInputMode="adjustResize"
android:theme="@style/Theme.Avtex">
<activity
android:name=".MainActivity"
android:exported="true"
android:showWhenLocked="true"
android:turnScreenOn="true"
android:icon="@mipmap/ic_launcher_avtex"
android:roundIcon="@mipmap/ic_launcher_avtex_round">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<!-- Deep link intent-filter for Gemini / Assistant App Actions & XFlow links -->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="xflow" />
</intent-filter>
<!-- Google Assistant Native Note-Taking Action ("Сделай заметку...") -->
<intent-filter>
<action android:name="android.intent.action.CREATE_NOTE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<!-- Android System Share Action (Поделиться текстом из любого приложения или ассистента) -->
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" />
</intent-filter>
<!-- Google Voice Actions Note Creation -->
<intent-filter>
<action android:name="com.google.android.gms.actions.CREATE_NOTE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" />
</intent-filter>
<intent-filter>
<action android:name="com.google.android.gms.actions.CREATE_NOTE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<!-- Android Text Selection Process Action (выделение текста в любом месте -> отправить в Avtex) -->
<intent-filter>
<action android:name="android.intent.action.PROCESS_TEXT" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" />
</intent-filter>
</activity>
<meta-data
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
<service
android:name=".engine.SleepTrackingService"
android:enabled="true"
android:exported="false"
android:foregroundServiceType="specialUse">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="Detects sleep and wake states using motion sensors and Sleep API for Home Assistant smart home automations." />
</service>
<receiver
android:name=".engine.SleepReceiver"
android:exported="true"
android:permission="com.google.android.gms.permission.ACTIVITY_RECOGNITION">
<intent-filter>
<action android:name="com.example.avtex.ACTION_SLEEP_API_EVENT" />
</intent-filter>
</receiver>
<receiver
android:name=".engine.BootReceiver"
android:exported="true"
android:icon="@mipmap/ic_launcher_avtex"
android:roundIcon="@mipmap/ic_launcher_avtex_round">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
</application>
</manifest>
@@ -6,16 +6,26 @@ import android.app.NotificationManager
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import com.example.avtex.data.SettingsRepository import com.example.avtex.data.SettingsRepository
import com.example.avtex.notes.NotesRepository
import com.example.avtex.notes.XFlowSyncClient
class AvtexApplication : Application() { class AvtexApplication : Application() {
lateinit var settingsRepository: SettingsRepository lateinit var settingsRepository: SettingsRepository
private set private set
lateinit var notesRepository: NotesRepository
private set
lateinit var xflowSyncClient: XFlowSyncClient
private set
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
instance = this instance = this
settingsRepository = SettingsRepository(this) settingsRepository = SettingsRepository(this)
notesRepository = NotesRepository(this)
xflowSyncClient = XFlowSyncClient(this)
createNotificationChannels() createNotificationChannels()
} }
@@ -23,10 +33,10 @@ class AvtexApplication : Application() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel( val channel = NotificationChannel(
CHANNEL_ID_TRACKING, CHANNEL_ID_TRACKING,
"Мониторинг сна Avtex", "Мониторинг XFlow",
NotificationManager.IMPORTANCE_LOW NotificationManager.IMPORTANCE_LOW
).apply { ).apply {
description = "Отображает текущий статус отслеживания сна и активности" description = "Отображает текущий статус мониторинга и синхронизации"
setShowBadge(false) setShowBadge(false)
} }
val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -35,7 +45,7 @@ class AvtexApplication : Application() {
} }
companion object { companion object {
const val CHANNEL_ID_TRACKING = "avtex_sleep_tracking_channel" const val CHANNEL_ID_TRACKING = "xflow_tracking_channel"
lateinit var instance: AvtexApplication lateinit var instance: AvtexApplication
private set private set
} }
@@ -0,0 +1,290 @@
package com.example.avtex
import android.app.Activity
import android.app.role.RoleManager
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.speech.RecognizerIntent
import android.util.Log
import android.widget.Toast
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.Modifier
import androidx.lifecycle.lifecycleScope
import com.example.avtex.theme.AvtexTheme
import kotlinx.coroutines.launch
val LocalVoiceInputLauncher = compositionLocalOf<(() -> Unit)?> { null }
val LocalRoleNotesRequester = compositionLocalOf<(() -> Unit)?> { null }
class MainActivity : ComponentActivity() {
private val speechRecognizerLauncher = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { result ->
if (result.resultCode == Activity.RESULT_OK && result.data != null) {
val matches = result.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
val spokenText = matches?.firstOrNull()
if (!spokenText.isNullOrBlank()) {
routeAndSaveNote(spokenText, preferredList = null)
}
}
}
private val roleRequestLauncher = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { result ->
if (result.resultCode == Activity.RESULT_OK) {
Toast.makeText(this, "Avtex назначен приложением заметок по умолчанию!", Toast.LENGTH_LONG).show()
}
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
handleIncomingIntent(intent)
enableEdgeToEdge()
setContent {
AvtexTheme {
CompositionLocalProvider(
LocalVoiceInputLauncher provides { launchVoiceInput() },
LocalRoleNotesRequester provides { requestDefaultNotesRole() }
) {
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
MainNavigation()
}
}
}
}
}
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
handleIncomingIntent(intent)
}
fun launchVoiceInput() {
val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
putExtra(RecognizerIntent.EXTRA_LANGUAGE, "ru-RU")
putExtra(RecognizerIntent.EXTRA_PROMPT, "Скажите заметку, задачу или фильм...")
}
try {
speechRecognizerLauncher.launch(intent)
} catch (e: Exception) {
Log.e(TAG, "Speech recognizer not available", e)
Toast.makeText(this, "Голосовой ввод недоступен на этом устройстве", Toast.LENGTH_SHORT).show()
}
}
fun requestDefaultNotesRole() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
try {
val roleManager = getSystemService(RoleManager::class.java)
if (roleManager != null && roleManager.isRoleAvailable(RoleManager.ROLE_NOTES)) {
val roleIntent = roleManager.createRequestRoleIntent(RoleManager.ROLE_NOTES)
roleRequestLauncher.launch(roleIntent)
return
}
} catch (e: Exception) {
Log.e(TAG, "Failed to request ROLE_NOTES", e)
}
}
try {
val settingsIntent = Intent(android.provider.Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
startActivity(settingsIntent)
} catch (e: Exception) {
Toast.makeText(this, "Откройте: Настройки -> Приложения -> Приложения по умолчанию", Toast.LENGTH_LONG).show()
}
}
private fun handleIncomingIntent(intent: Intent?) {
if (intent == null) return
val action = intent.action
Log.d(TAG, "Incoming intent action: $action, data: ${intent.data}")
// 1. Google Assistant / Android System Note Action (android.intent.action.CREATE_NOTE)
if (action == Intent.ACTION_CREATE_NOTE) {
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
?: intent.getStringExtra("android.intent.extra.TEXT")
?: intent.getStringExtra(Intent.EXTRA_TITLE)
val title = intent.getStringExtra(Intent.EXTRA_TITLE)
if (!text.isNullOrBlank()) {
val fullText = if (!title.isNullOrBlank() && title != text) "$title: $text" else text
routeAndSaveNote(fullText, preferredList = null)
return
} else {
launchVoiceInput()
return
}
}
// 2. Google Voice Actions (com.google.android.gms.actions.CREATE_NOTE)
if (action == "com.google.android.gms.actions.CREATE_NOTE") {
val text = intent.getStringExtra("com.google.android.gms.actions.extra.TEXT")
?: intent.getStringExtra(Intent.EXTRA_TEXT)
val name = intent.getStringExtra("com.google.android.gms.actions.extra.NAME")
if (!text.isNullOrBlank()) {
val fullText = if (!name.isNullOrBlank() && name != text) "$name: $text" else text
routeAndSaveNote(fullText, preferredList = null)
return
} else {
launchVoiceInput()
return
}
}
// 3. Android Text Selection (ACTION_PROCESS_TEXT)
if (action == Intent.ACTION_PROCESS_TEXT) {
val text = intent.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT)?.toString()
if (!text.isNullOrBlank()) {
routeAndSaveNote(text, preferredList = null)
return
}
}
// 4. Android Share Sheet Action (android.intent.action.SEND with text/plain)
if (action == Intent.ACTION_SEND && intent.type?.startsWith("text/") == true) {
val sharedText = intent.getStringExtra(Intent.EXTRA_TEXT)
val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)
if (!sharedText.isNullOrBlank()) {
val fullText = if (!subject.isNullOrBlank()) "$subject — $sharedText" else sharedText
routeAndSaveNote(fullText, preferredList = null)
return
}
}
// 5. Deep Link Action (xflow://...)
val data = intent.data
if (data != null && data.scheme == "xflow") {
val host = data.host ?: ""
val path = data.path ?: ""
if (host == "voice" || path.contains("record")) {
launchVoiceInput()
return
}
val listName = data.getQueryParameter("list_name")
?: data.getQueryParameter("name")
?: data.getQueryParameter("list")
val itemName = data.getQueryParameter("item_name")
?: data.getQueryParameter("item")
?: data.getQueryParameter("note_text")
?: data.getQueryParameter("text")
?: data.getQueryParameter("note_title")
if (!itemName.isNullOrBlank()) {
routeAndSaveNote(itemName, preferredList = listName)
return
}
}
// 6. Google Assistant / Gemini Built-in Intent Extras
val extras = intent.extras
if (extras != null) {
val itemName = extras.getString("itemListElement.name")
?: extras.getString("item_name")
?: extras.getString("note.text")
?: extras.getString("note_text")
?: extras.getString("text")
val listName = extras.getString("itemList.name")
?: extras.getString("list_name")
?: extras.getString("category")
if (!itemName.isNullOrBlank()) {
routeAndSaveNote(itemName, preferredList = listName)
}
}
}
private fun routeAndSaveNote(rawText: String, preferredList: String?) {
val cleanText = rawText.trim()
if (cleanText.isBlank()) return
val (targetList, category) = resolveListAndCategory(cleanText, preferredList)
lifecycleScope.launch {
try {
val repo = AvtexApplication.instance.notesRepository
repo.addNoteItem(
title = cleanText,
listTitle = targetList,
category = category
)
Toast.makeText(
this@MainActivity,
"✅ Avtex: Записано в «$targetList»:\n$cleanText",
Toast.LENGTH_LONG
).show()
AvtexApplication.instance.settingsRepository.addLog(
tag = "Assistant",
message = "Голосовая заметка: \"$cleanText\" в список \"$targetList\"",
isImportant = true
)
} catch (e: Exception) {
Log.e(TAG, "Failed to save note from assistant", e)
Toast.makeText(
this@MainActivity,
"Ошибка сохранения: ${e.localizedMessage}",
Toast.LENGTH_SHORT
).show()
}
}
}
private fun resolveListAndCategory(text: String, preferredList: String?): Pair<String, String> {
val lower = text.lowercase()
// Если список был явно передан в интенте
if (!preferredList.isNullOrBlank()) {
val prefLower = preferredList.lowercase()
return when {
prefLower.contains("фильм") || prefLower.contains("кино") || prefLower.contains("сериал") || prefLower.contains("movie") ->
Pair(preferredList, "movies")
prefLower.contains("покупк") || prefLower.contains("магаз") || prefLower.contains("купить") || prefLower.contains("shop") ->
Pair(preferredList, "shopping")
prefLower.contains("задач") || prefLower.contains("дело") || prefLower.contains("task") || prefLower.contains("todo") ->
Pair(preferredList, "tasks")
else -> Pair(preferredList, "general")
}
}
// Авто-маршрутизация по содержанию текста
return when {
lower.contains("фильм") || lower.contains("сериал") || lower.contains("кино") ||
lower.contains("посмотреть") || lower.contains("сезон") || lower.contains("актер") ||
lower.contains("режиссер") || lower.contains("movie") || lower.contains("cinema") ->
Pair("Фильмы на просмотр", "movies")
lower.contains("купить") || lower.contains("покупки") || lower.contains("магазин") ||
lower.contains("взять") || lower.contains("продукты") || lower.contains("цена") ||
lower.contains("аптек") || lower.contains("buy") || lower.contains("shop") ->
Pair("Покупки", "shopping")
lower.contains("задача") || lower.contains("сделать") || lower.contains("напомни") ||
lower.contains("позвонить") || lower.contains("отправить") || lower.contains("todo") ->
Pair("Задачи", "tasks")
else -> Pair("Быстрые заметки", "general")
}
}
companion object {
private const val TAG = "AvtexMainActivity"
}
}
@@ -5,7 +5,8 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Bedtime import androidx.compose.material.icons.filled.Bedtime
import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.automirrored.filled.FormatListBulleted
import androidx.compose.material.icons.filled.Hub
import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar import androidx.compose.material3.NavigationBar
@@ -28,9 +29,9 @@ import com.example.avtex.theme.NeonViolet
import com.example.avtex.theme.ObsidianBg import com.example.avtex.theme.ObsidianBg
import com.example.avtex.theme.ObsidianSurfaceElevated import com.example.avtex.theme.ObsidianSurfaceElevated
import com.example.avtex.theme.TextMuted import com.example.avtex.theme.TextMuted
import com.example.avtex.theme.TextPrimary
import com.example.avtex.ui.DashboardScreen import com.example.avtex.ui.DashboardScreen
import com.example.avtex.ui.OnePlusGuideScreen import com.example.avtex.ui.ListsScreen
import com.example.avtex.ui.MindmapsScreen
import com.example.avtex.ui.SettingsScreen import com.example.avtex.ui.SettingsScreen
@Composable @Composable
@@ -57,10 +58,10 @@ fun MainNavigation() {
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 0, selected = selectedTab == 0,
onClick = { selectedTab = 0 }, onClick = { selectedTab = 0 },
icon = { Icon(Icons.Default.Bedtime, contentDescription = "Статус") }, icon = { Icon(Icons.Default.Hub, contentDescription = "Майндкарты") },
label = { label = {
Text( Text(
"Статус", "Карты",
fontSize = 11.sp, fontSize = 11.sp,
fontWeight = if (selectedTab == 0) FontWeight.Bold else FontWeight.Normal fontWeight = if (selectedTab == 0) FontWeight.Bold else FontWeight.Normal
) )
@@ -70,10 +71,10 @@ fun MainNavigation() {
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 1, selected = selectedTab == 1,
onClick = { selectedTab = 1 }, onClick = { selectedTab = 1 },
icon = { Icon(Icons.Default.Settings, contentDescription = "Настройки") }, icon = { Icon(Icons.AutoMirrored.Filled.FormatListBulleted, contentDescription = "Списки") },
label = { label = {
Text( Text(
"Настройки", "Списки",
fontSize = 11.sp, fontSize = 11.sp,
fontWeight = if (selectedTab == 1) FontWeight.Bold else FontWeight.Normal fontWeight = if (selectedTab == 1) FontWeight.Bold else FontWeight.Normal
) )
@@ -83,23 +84,37 @@ fun MainNavigation() {
NavigationBarItem( NavigationBarItem(
selected = selectedTab == 2, selected = selectedTab == 2,
onClick = { selectedTab = 2 }, onClick = { selectedTab = 2 },
icon = { Icon(Icons.Default.Info, contentDescription = "OnePlus") }, icon = { Icon(Icons.Default.Bedtime, contentDescription = "Сон") },
label = { label = {
Text( Text(
"OnePlus", "Сон",
fontSize = 11.sp, fontSize = 11.sp,
fontWeight = if (selectedTab == 2) FontWeight.Bold else FontWeight.Normal fontWeight = if (selectedTab == 2) FontWeight.Bold else FontWeight.Normal
) )
}, },
colors = navColors colors = navColors
) )
NavigationBarItem(
selected = selectedTab == 3,
onClick = { selectedTab = 3 },
icon = { Icon(Icons.Default.Settings, contentDescription = "Настройки") },
label = {
Text(
"Настройки",
fontSize = 11.sp,
fontWeight = if (selectedTab == 3) FontWeight.Bold else FontWeight.Normal
)
},
colors = navColors
)
} }
} }
) { innerPadding -> ) { innerPadding ->
when (selectedTab) { when (selectedTab) {
0 -> DashboardScreen(modifier = Modifier.padding(innerPadding)) 0 -> MindmapsScreen(modifier = Modifier.padding(innerPadding))
1 -> SettingsScreen(modifier = Modifier.padding(innerPadding)) 1 -> ListsScreen(modifier = Modifier.padding(innerPadding))
2 -> OnePlusGuideScreen(modifier = Modifier.padding(innerPadding)) 2 -> DashboardScreen(modifier = Modifier.padding(innerPadding))
3 -> SettingsScreen(modifier = Modifier.padding(innerPadding))
} }
} }
} }
@@ -18,10 +18,14 @@ class SleepReceiver : BroadcastReceiver() {
val motion = event.motion val motion = event.motion
val light = event.light val light = event.light
Log.d(TAG, "SleepClassifyEvent: confidence=$confidence, motion=$motion, light=$light") Log.d(TAG, "SleepClassifyEvent: confidence=$confidence, motion=$motion, light=$light")
AvtexApplication.instance.settingsRepository.addLog( val now = System.currentTimeMillis()
tag = "SleepAPI", if (now - lastClassifyLogTimestamp >= MIN_CLASSIFY_LOG_INTERVAL_MS) {
message = "Классификация: уверенность $confidence%, движение $motion/6, свет $light/6" lastClassifyLogTimestamp = now
) AvtexApplication.instance.settingsRepository.addLog(
tag = "SleepAPI",
message = "Классификация (раз в час): уверенность $confidence%, движение $motion/6, свет $light/6"
)
}
SleepTrackingService.onSleepClassifyReceived(context, confidence, motion, light) SleepTrackingService.onSleepClassifyReceived(context, confidence, motion, light)
} }
} }
@@ -43,5 +47,8 @@ class SleepReceiver : BroadcastReceiver() {
companion object { companion object {
private const val TAG = "SleepReceiver" private const val TAG = "SleepReceiver"
const val ACTION_SLEEP_API_EVENT = "com.example.avtex.ACTION_SLEEP_API_EVENT" const val ACTION_SLEEP_API_EVENT = "com.example.avtex.ACTION_SLEEP_API_EVENT"
private const val MIN_CLASSIFY_LOG_INTERVAL_MS = 60 * 60 * 1000L // Минимум 1 раз в час
@Volatile
private var lastClassifyLogTimestamp: Long = 0L
} }
} }
@@ -0,0 +1,24 @@
package com.example.avtex.notes
data class NoteItem(
val id: String,
val listId: String,
val title: String,
val description: String = "",
val isCompleted: Boolean = false,
val status: String = "todo", // "want_to_watch", "watched", "todo", "completed"
val priority: String = "normal",
val metadata: String = "{}",
val createdAt: Long = System.currentTimeMillis()
)
data class NoteList(
val id: String,
val title: String,
val category: String = "general", // "movies", "shopping", "tasks", "general"
val description: String = "",
val color: String? = null,
val icon: String? = null,
val items: List<NoteItem> = emptyList(),
val createdAt: Long = System.currentTimeMillis()
)
@@ -0,0 +1,211 @@
package com.example.avtex.notes
import android.content.ContentValues
import android.content.Context
import android.util.Log
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.UUID
class NotesRepository(private val context: Context) {
private val dbHelper = XFlowDatabaseHelper(context)
private val syncClient = XFlowSyncClient(context)
private val scope = CoroutineScope(Dispatchers.IO)
private val _listsFlow = MutableStateFlow<List<NoteList>>(emptyList())
val listsFlow: StateFlow<List<NoteList>> = _listsFlow.asStateFlow()
init {
reload()
}
fun reload() {
scope.launch {
val lists = loadListsFromDb()
_listsFlow.value = lists
}
}
private suspend fun loadListsFromDb(): List<NoteList> = withContext(Dispatchers.IO) {
val db = dbHelper.readableDatabase
val lists = mutableListOf<NoteList>()
val cursorLists = db.query(
XFlowDatabaseHelper.TABLE_LISTS,
null, null, null, null, null, "created_at DESC"
)
cursorLists.use { cLists ->
while (cLists.moveToNext()) {
val listId = cLists.getString(cLists.getColumnIndexOrThrow("id"))
val title = cLists.getString(cLists.getColumnIndexOrThrow("title"))
val category = cLists.getString(cLists.getColumnIndexOrThrow("category"))
val description = cLists.getString(cLists.getColumnIndexOrThrow("description")) ?: ""
val color = cLists.getString(cLists.getColumnIndexOrThrow("color"))
val icon = cLists.getString(cLists.getColumnIndexOrThrow("icon"))
val createdAt = cLists.getLong(cLists.getColumnIndexOrThrow("created_at"))
// Загружаем элементы списка
val items = mutableListOf<NoteItem>()
val cursorItems = db.query(
XFlowDatabaseHelper.TABLE_ITEMS,
null, "list_id = ?", arrayOf(listId), null, null, "created_at DESC"
)
cursorItems.use { cItems ->
while (cItems.moveToNext()) {
val itemId = cItems.getString(cItems.getColumnIndexOrThrow("id"))
val itemTitle = cItems.getString(cItems.getColumnIndexOrThrow("title"))
val itemDesc = cItems.getString(cItems.getColumnIndexOrThrow("description")) ?: ""
val isCompleted = cItems.getInt(cItems.getColumnIndexOrThrow("is_completed")) == 1
val status = cItems.getString(cItems.getColumnIndexOrThrow("status"))
val priority = cItems.getString(cItems.getColumnIndexOrThrow("priority"))
val metadata = cItems.getString(cItems.getColumnIndexOrThrow("metadata")) ?: "{}"
val itemCreatedAt = cItems.getLong(cItems.getColumnIndexOrThrow("created_at"))
items.add(
NoteItem(
id = itemId,
listId = listId,
title = itemTitle,
description = itemDesc,
isCompleted = isCompleted,
status = status,
priority = priority,
metadata = metadata,
createdAt = itemCreatedAt
)
)
}
}
lists.add(
NoteList(
id = listId,
title = title,
category = category,
description = description,
color = color,
icon = icon,
items = items,
createdAt = createdAt
)
)
}
}
lists
}
suspend fun addNoteItem(
title: String,
listTitle: String = "Фильмы на просмотр",
category: String = "movies",
description: String = ""
): NoteItem = withContext(Dispatchers.IO) {
val db = dbHelper.writableDatabase
// Ищем список по названию
var targetListId: String? = null
val c = db.query(
XFlowDatabaseHelper.TABLE_LISTS,
arrayOf("id"), "LOWER(title) = LOWER(?)", arrayOf(listTitle.trim()),
null, null, null
)
c.use {
if (it.moveToFirst()) {
targetListId = it.getString(0)
}
}
// Если список не найден, создаем его
if (targetListId == null) {
val newListId = "list-" + UUID.randomUUID().toString()
val cvList = ContentValues().apply {
put("id", newListId)
put("title", listTitle.trim())
put("category", category)
put("description", "Список $listTitle")
put("created_at", System.currentTimeMillis())
}
db.insert(XFlowDatabaseHelper.TABLE_LISTS, null, cvList)
targetListId = newListId
}
val newItemId = "item-" + UUID.randomUUID().toString()
val now = System.currentTimeMillis()
val cvItem = ContentValues().apply {
put("id", newItemId)
put("list_id", targetListId)
put("title", title.trim())
put("description", description)
put("is_completed", 0)
put("status", if (category == "movies") "want_to_watch" else "todo")
put("priority", "normal")
put("metadata", "{}")
put("created_at", now)
}
db.insert(XFlowDatabaseHelper.TABLE_ITEMS, null, cvItem)
reload()
// Фоновая отправка в XFlow Cloud (Coolify)
scope.launch {
try {
val prefs = context.getSharedPreferences("xflow_prefs", Context.MODE_PRIVATE)
val serverUrl = prefs.getString("xflow_server_url", "https://xflow.controlsystem.kz")
?: "https://xflow.controlsystem.kz"
if (serverUrl.isNotBlank()) {
syncClient.syncItemToServer(
serverUrl = serverUrl,
title = title.trim(),
listTitle = listTitle.trim(),
category = category
)
}
} catch (e: Exception) {
Log.w("NotesRepository", "Background cloud sync failed: ${e.message}")
}
}
NoteItem(
id = newItemId,
listId = targetListId,
title = title.trim(),
description = description,
isCompleted = false,
status = if (category == "movies") "want_to_watch" else "todo",
createdAt = now
)
}
suspend fun toggleItem(item: NoteItem) = withContext(Dispatchers.IO) {
val db = dbHelper.writableDatabase
val newCompleted = !item.isCompleted
val newStatus = if (newCompleted) {
if (item.status == "want_to_watch") "watched" else "completed"
} else {
if (item.status == "watched") "want_to_watch" else "todo"
}
val cv = ContentValues().apply {
put("is_completed", if (newCompleted) 1 else 0)
put("status", newStatus)
}
db.update(XFlowDatabaseHelper.TABLE_ITEMS, cv, "id = ?", arrayOf(item.id))
reload()
}
suspend fun deleteItem(itemId: String) = withContext(Dispatchers.IO) {
val db = dbHelper.writableDatabase
db.delete(XFlowDatabaseHelper.TABLE_ITEMS, "id = ?", arrayOf(itemId))
reload()
}
}
@@ -0,0 +1,72 @@
package com.example.avtex.notes
import android.content.ContentValues
import android.content.Context
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
class XFlowDatabaseHelper(context: Context) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) {
override fun onCreate(db: SQLiteDatabase) {
db.execSQL("""
CREATE TABLE $TABLE_LISTS (
id TEXT PRIMARY KEY,
title TEXT NOT NULL,
category TEXT NOT NULL,
description TEXT,
color TEXT,
icon TEXT,
created_at INTEGER NOT NULL
)
""".trimIndent())
db.execSQL("""
CREATE TABLE $TABLE_ITEMS (
id TEXT PRIMARY KEY,
list_id TEXT NOT NULL,
title TEXT NOT NULL,
description TEXT,
is_completed INTEGER NOT NULL DEFAULT 0,
status TEXT NOT NULL,
priority TEXT NOT NULL,
metadata TEXT,
created_at INTEGER NOT NULL,
FOREIGN KEY(list_id) REFERENCES $TABLE_LISTS(id) ON DELETE CASCADE
)
""".trimIndent())
// Создаем дефолтные списки для удобства пользователя
val now = System.currentTimeMillis()
val cvMovies = ContentValues().apply {
put("id", "list-movies-default")
put("title", "Фильмы на просмотр")
put("category", "movies")
put("description", "Список фильмов и сериалов")
put("created_at", now)
}
db.insert(TABLE_LISTS, null, cvMovies)
val cvShopping = ContentValues().apply {
put("id", "list-shopping-default")
put("title", "Покупки")
put("category", "shopping")
put("description", "Список покупок")
put("created_at", now)
}
db.insert(TABLE_LISTS, null, cvShopping)
}
override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
db.execSQL("DROP TABLE IF EXISTS $TABLE_ITEMS")
db.execSQL("DROP TABLE IF EXISTS $TABLE_LISTS")
onCreate(db)
}
companion object {
private const val DATABASE_NAME = "xflow_notes.db"
private const val DATABASE_VERSION = 1
const val TABLE_LISTS = "lists"
const val TABLE_ITEMS = "items"
}
}
@@ -0,0 +1,65 @@
package com.example.avtex.notes
import android.content.Context
import android.util.Log
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import org.json.JSONObject
import java.util.concurrent.TimeUnit
class XFlowSyncClient(private val context: Context) {
private val httpClient = OkHttpClient.Builder()
.connectTimeout(10, TimeUnit.SECONDS)
.readTimeout(10, TimeUnit.SECONDS)
.build()
private val jsonMediaType = "application/json; charset=utf-8".toMediaType()
suspend fun syncItemToServer(
serverUrl: String,
title: String,
listTitle: String,
category: String,
ownerId: String = "default-user"
): Result<String> = withContext(Dispatchers.IO) {
if (serverUrl.isBlank()) {
return@withContext Result.failure(IllegalArgumentException("URL сервера XFlow не указан"))
}
try {
val endpoint = "${serverUrl.trimEnd('/')}/api/v1/lists/items"
val json = JSONObject().apply {
put("title", title)
put("listTitle", listTitle)
put("category", category)
put("ownerId", ownerId)
}
val request = Request.Builder()
.url(endpoint)
.post(json.toString().toRequestBody(jsonMediaType))
.build()
val response = httpClient.newCall(request).execute()
response.use {
if (it.isSuccessful) {
Result.success("Синхронизировано с XFlow")
} else {
Result.failure(Exception("HTTP ${it.code}: ${it.message}"))
}
}
} catch (e: Exception) {
Log.e(TAG, "Sync to XFlow server failed", e)
Result.failure(e)
}
}
companion object {
private const val TAG = "XFlowSyncClient"
}
}
@@ -0,0 +1,780 @@
package com.example.avtex.ui
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
import android.widget.Toast
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Check
import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material.icons.filled.Delete
import androidx.compose.material.icons.filled.ExpandLess
import androidx.compose.material.icons.filled.ExpandMore
import androidx.compose.material.icons.filled.Mic
import androidx.compose.material.icons.filled.PlayArrow
import androidx.compose.material.icons.filled.Terminal
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Info
import com.example.avtex.LocalVoiceInputLauncher
import com.example.avtex.LocalRoleNotesRequester
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.CheckboxDefaults
import androidx.compose.material3.FilterChip
import androidx.compose.material3.FilterChipDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.OutlinedTextFieldDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.example.avtex.AvtexApplication
import com.example.avtex.MainActivity
import com.example.avtex.notes.NoteItem
import com.example.avtex.notes.NoteList
import com.example.avtex.theme.CyanAccent
import com.example.avtex.theme.EmeraldMint
import com.example.avtex.theme.GlassBorder
import com.example.avtex.theme.NeonViolet
import com.example.avtex.theme.ObsidianBg
import com.example.avtex.theme.ObsidianSurface
import com.example.avtex.theme.ObsidianSurfaceElevated
import com.example.avtex.theme.ObsidianSurfaceHigh
import com.example.avtex.theme.SolarAmber
import com.example.avtex.theme.TextMuted
import com.example.avtex.theme.TextPrimary
import com.example.avtex.theme.TextSecondary
import kotlinx.coroutines.launch
@Composable
fun ListsScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current
val repository = remember { AvtexApplication.instance.notesRepository }
val lists by repository.listsFlow.collectAsState()
val coroutineScope = rememberCoroutineScope()
var selectedCategory by remember { mutableStateOf("all") }
var newItemText by remember { mutableStateOf("") }
var showAssistantTester by remember { mutableStateOf(false) }
val voiceLauncher = LocalVoiceInputLauncher.current
val filteredLists = remember(lists, selectedCategory) {
if (selectedCategory == "all") lists
else lists.filter { it.category == selectedCategory }
}
LazyColumn(
modifier = modifier
.fillMaxSize()
.background(ObsidianBg),
contentPadding = PaddingValues(16.dp),
verticalArrangement = Arrangement.spacedBy(14.dp)
) {
// 1. Header
item {
Column(modifier = Modifier.padding(vertical = 4.dp)) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Column {
Text(
text = "Списки и Заметки",
fontSize = 24.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary
)
Text(
text = "XFlow синхронизация • Голосовой ввод Ассистента",
fontSize = 12.sp,
color = TextMuted
)
}
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
// Direct Voice Button
Button(
onClick = { voiceLauncher?.invoke() },
shape = RoundedCornerShape(12.dp),
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet),
contentPadding = PaddingValues(horizontal = 10.dp, vertical = 6.dp)
) {
Icon(
imageVector = Icons.Default.Mic,
contentDescription = null,
tint = Color.White,
modifier = Modifier.size(16.dp)
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = "Голос",
fontSize = 11.sp,
fontWeight = FontWeight.Bold,
color = Color.White
)
}
// Button to toggle Assistant Tester
OutlinedButton(
onClick = { showAssistantTester = !showAssistantTester },
shape = RoundedCornerShape(12.dp),
border = androidx.compose.foundation.BorderStroke(1.dp, NeonViolet.copy(alpha = 0.5f)),
colors = ButtonDefaults.outlinedButtonColors(
containerColor = if (showAssistantTester) NeonViolet.copy(alpha = 0.2f) else ObsidianSurface
),
contentPadding = PaddingValues(horizontal = 10.dp, vertical = 6.dp)
) {
Icon(
imageVector = Icons.Default.Mic,
contentDescription = null,
tint = NeonViolet,
modifier = Modifier.size(16.dp)
)
Spacer(modifier = Modifier.width(6.dp))
Text(
text = if (showAssistantTester) "Скрыть тест" else "Тест Ассистента",
fontSize = 11.sp,
fontWeight = FontWeight.Bold,
color = NeonViolet
)
}
}
}
}
}
// 2. Interactive Assistant Simulator Card
item {
AnimatedVisibility(visible = showAssistantTester) {
AssistantTesterCard(context = context)
}
}
// 3. Category Filter Chips
item {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
CategoryChip(
label = "Все",
selected = selectedCategory == "all",
onClick = { selectedCategory = "all" }
)
CategoryChip(
label = "Фильмы 🎬",
selected = selectedCategory == "movies",
onClick = { selectedCategory = "movies" }
)
CategoryChip(
label = "Покупки 🛒",
selected = selectedCategory == "shopping",
onClick = { selectedCategory = "shopping" }
)
CategoryChip(
label = "Задачи 📋",
selected = selectedCategory == "tasks",
onClick = { selectedCategory = "tasks" }
)
}
}
// 4. Manual Quick Add Box
item {
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(16.dp))
.background(ObsidianSurfaceElevated)
.border(1.dp, GlassBorder, RoundedCornerShape(16.dp))
.padding(12.dp)
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
OutlinedTextField(
value = newItemText,
onValueChange = { newItemText = it },
placeholder = {
Text(
if (selectedCategory == "movies") "Название фильма на просмотр..."
else if (selectedCategory == "shopping") "Купить..."
else "Новая запись или заметка...",
fontSize = 13.sp,
color = TextMuted
)
},
colors = OutlinedTextFieldDefaults.colors(
focusedBorderColor = NeonViolet,
unfocusedBorderColor = GlassBorder,
focusedTextColor = TextPrimary,
unfocusedTextColor = TextPrimary,
cursorColor = NeonViolet
),
singleLine = true,
modifier = Modifier.weight(1f),
shape = RoundedCornerShape(12.dp)
)
Button(
onClick = {
if (newItemText.isNotBlank()) {
coroutineScope.launch {
val targetCategory = if (selectedCategory == "all") "movies" else selectedCategory
val listTitle = when (targetCategory) {
"movies" -> "Фильмы на просмотр"
"shopping" -> "Покупки"
"tasks" -> "Задачи"
else -> "Быстрые заметки"
}
repository.addNoteItem(
title = newItemText.trim(),
listTitle = listTitle,
category = targetCategory
)
newItemText = ""
}
}
},
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet),
shape = RoundedCornerShape(12.dp),
modifier = Modifier.height(52.dp)
) {
Icon(Icons.Default.Add, contentDescription = "Добавить", tint = Color.White)
}
}
}
}
// 5. Lists and Items
if (filteredLists.isEmpty()) {
item {
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(16.dp))
.background(ObsidianSurface)
.padding(vertical = 40.dp, horizontal = 20.dp),
contentAlignment = Alignment.Center
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Text(
text = "Нет записей в выбранной категории",
fontSize = 14.sp,
fontWeight = FontWeight.Medium,
color = TextSecondary
)
Spacer(modifier = Modifier.height(6.dp))
Text(
text = "Добавьте запись вручную или нажмите «Тест Ассистента» выше!",
fontSize = 12.sp,
color = TextMuted
)
}
}
}
} else {
items(filteredLists, key = { it.id }) { list ->
ListCard(
list = list,
onToggleItem = { item ->
coroutineScope.launch { repository.toggleItem(item) }
},
onDeleteItem = { item ->
coroutineScope.launch { repository.deleteItem(item.id) }
}
)
}
}
}
}
@Composable
private fun AssistantTesterCard(context: Context) {
val voiceLauncher = LocalVoiceInputLauncher.current
val roleRequester = LocalRoleNotesRequester.current
var customVoiceQuery by remember { mutableStateOf("") }
var selectedPreset by remember { mutableStateOf("") }
val clipboard = remember { context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager }
val adbCommand = remember(customVoiceQuery) {
val query = if (customVoiceQuery.isNotBlank()) customVoiceQuery else "Интерстеллар"
"adb shell am start -a android.intent.action.CREATE_NOTE -e android.intent.extra.TEXT \"$query\" com.example.avtex"
}
fun simulateVoiceCommand(text: String) {
val intent = Intent(context, MainActivity::class.java).apply {
action = Intent.ACTION_CREATE_NOTE
putExtra(Intent.EXTRA_TEXT, text)
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP
}
context.startActivity(intent)
}
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(20.dp))
.background(ObsidianSurfaceElevated)
.border(1.dp, NeonViolet.copy(alpha = 0.4f), RoundedCornerShape(20.dp))
.padding(16.dp)
) {
Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
modifier = Modifier
.clip(CircleShape)
.background(NeonViolet.copy(alpha = 0.2f))
.padding(8.dp)
) {
Icon(
imageVector = Icons.Default.Mic,
contentDescription = null,
tint = NeonViolet,
modifier = Modifier.size(18.dp)
)
}
Spacer(modifier = Modifier.width(10.dp))
Column {
Text(
text = "Симулятор голосового Ассистента",
fontSize = 15.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary
)
Text(
text = "Проверка распознавания и авто-сортировки заметок",
fontSize = 11.sp,
color = TextMuted
)
}
}
}
// Direct Voice Action & System Role
Button(
onClick = { voiceLauncher?.invoke() },
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(12.dp),
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet)
) {
Icon(Icons.Default.Mic, contentDescription = null, tint = Color.White)
Spacer(modifier = Modifier.width(8.dp))
Text("🎤 Сказать голосом прямо сейчас", fontWeight = FontWeight.Bold, color = Color.White)
}
OutlinedButton(
onClick = { roleRequester?.invoke() },
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(12.dp),
border = androidx.compose.foundation.BorderStroke(1.dp, NeonViolet.copy(alpha = 0.5f))
) {
Icon(Icons.Default.Settings, contentDescription = null, tint = NeonViolet, modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.width(6.dp))
Text("⚙️ Сделать Avtex заметками по умолчанию", fontSize = 12.sp, color = NeonViolet)
}
// Explanatory note about Google Keep
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(10.dp))
.background(ObsidianSurface)
.border(1.dp, GlassBorder, RoundedCornerShape(10.dp))
.padding(10.dp)
) {
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.Info, contentDescription = null, tint = SolarAmber, modifier = Modifier.size(14.dp))
Spacer(modifier = Modifier.width(6.dp))
Text("Почему Ассистент отправляет в Google Keep?", fontSize = 11.sp, fontWeight = FontWeight.Bold, color = SolarAmber)
}
Text(
text = "Google зафиксировал Keep как облачного провайдера заметок. Чтобы переключить:\n• Откройте: Настройки -> Google -> Google Ассистент -> «Заметки и списки» -> выберите «Не синхронизировать».\n• Либо произносите явно: «Окей Google, открой Avtex и запиши...».\n• Либо нажмите кнопку «Сказать голосом» выше или зажмите иконку Avtex на рабочем столе!",
fontSize = 10.sp,
color = TextSecondary,
lineHeight = 14.sp
)
}
}
Text(
text = "Быстрые сценарии тестирования (нажмите для проверки):",
fontSize = 12.sp,
fontWeight = FontWeight.Medium,
color = TextSecondary
)
// Preset Buttons Grid
Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
AssistantPresetButton(
label = "🎬 Фильм: «Запиши фильм Начало на вечер»",
onClick = { simulateVoiceCommand("фильм Начало на вечер") }
)
AssistantPresetButton(
label = "🛒 Покупки: «Купить молоко, кофе и сыр»",
onClick = { simulateVoiceCommand("купить молоко, кофе и сыр") }
)
AssistantPresetButton(
label = "📋 Задача: «Позвонить автомеханику в 11»",
onClick = { simulateVoiceCommand("задача позвонить автомеханику в 11") }
)
AssistantPresetButton(
label = "💡 Заметка: «Идея для нового проекта XFlow»",
onClick = { simulateVoiceCommand("Идея для нового проекта XFlow") }
)
}
Spacer(modifier = Modifier.height(4.dp))
// Custom text input
Text(
text = "Своя фраза для проверки:",
fontSize = 12.sp,
fontWeight = FontWeight.Medium,
color = TextSecondary
)
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalAlignment = Alignment.CenterVertically
) {
OutlinedTextField(
value = customVoiceQuery,
onValueChange = { customVoiceQuery = it },
placeholder = { Text("Например: сериал Локи 2 сезон", fontSize = 12.sp, color = TextMuted) },
modifier = Modifier.weight(1f),
shape = RoundedCornerShape(10.dp),
singleLine = true,
colors = OutlinedTextFieldDefaults.colors(
focusedBorderColor = NeonViolet,
unfocusedBorderColor = GlassBorder,
focusedTextColor = TextPrimary,
unfocusedTextColor = TextPrimary
)
)
Button(
onClick = {
if (customVoiceQuery.isNotBlank()) {
simulateVoiceCommand(customVoiceQuery.trim())
customVoiceQuery = ""
}
},
shape = RoundedCornerShape(10.dp),
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet)
) {
Icon(Icons.Default.PlayArrow, contentDescription = "Запуск", tint = Color.White)
}
}
// ADB command helper
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(10.dp))
.background(ObsidianSurface)
.border(1.dp, GlassBorder, RoundedCornerShape(10.dp))
.padding(10.dp)
) {
Column {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(Icons.Default.Terminal, contentDescription = null, tint = CyanAccent, modifier = Modifier.size(14.dp))
Spacer(modifier = Modifier.width(6.dp))
Text(
text = "Команда для теста через ADB с ПК:",
fontSize = 11.sp,
fontWeight = FontWeight.Bold,
color = CyanAccent
)
}
IconButton(
onClick = {
clipboard.setPrimaryClip(ClipData.newPlainText("adb command", adbCommand))
Toast.makeText(context, "Команда скопирована в буфер", Toast.LENGTH_SHORT).show()
},
modifier = Modifier.size(24.dp)
) {
Icon(Icons.Default.ContentCopy, contentDescription = "Копировать", tint = TextMuted, modifier = Modifier.size(14.dp))
}
}
Spacer(modifier = Modifier.height(4.dp))
Text(
text = adbCommand,
fontSize = 10.sp,
fontFamily = FontFamily.Monospace,
color = TextSecondary,
lineHeight = 13.sp
)
}
}
}
}
}
@Composable
private fun AssistantPresetButton(
label: String,
onClick: () -> Unit
) {
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(8.dp))
.background(ObsidianSurface)
.border(1.dp, GlassBorder, RoundedCornerShape(8.dp))
.clickable { onClick() }
.padding(horizontal = 12.dp, vertical = 8.dp)
) {
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = label,
fontSize = 12.sp,
fontWeight = FontWeight.Medium,
color = TextPrimary
)
Text(
text = "ТЕСТ ▶",
fontSize = 10.sp,
fontWeight = FontWeight.Bold,
color = NeonViolet
)
}
}
}
@Composable
private fun CategoryChip(
label: String,
selected: Boolean,
onClick: () -> Unit
) {
FilterChip(
selected = selected,
onClick = onClick,
label = { Text(label, fontSize = 12.sp) },
shape = RoundedCornerShape(10.dp),
colors = FilterChipDefaults.filterChipColors(
selectedContainerColor = NeonViolet.copy(alpha = 0.25f),
selectedLabelColor = Color.White,
containerColor = ObsidianSurfaceElevated,
labelColor = TextMuted
),
border = FilterChipDefaults.filterChipBorder(
enabled = true,
selected = selected,
borderColor = GlassBorder,
selectedBorderColor = NeonViolet.copy(alpha = 0.6f)
)
)
}
@Composable
private fun ListCard(
list: NoteList,
onToggleItem: (NoteItem) -> Unit,
onDeleteItem: (NoteItem) -> Unit
) {
val accentColor = when (list.category) {
"movies" -> CyanAccent
"shopping" -> EmeraldMint
"tasks" -> SolarAmber
else -> NeonViolet
}
Column(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(18.dp))
.background(ObsidianSurfaceElevated)
.border(1.dp, GlassBorder, RoundedCornerShape(18.dp))
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(10.dp)
) {
// List Title Header
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp)
) {
Box(
modifier = Modifier
.size(8.dp)
.clip(CircleShape)
.background(accentColor)
)
Text(
text = list.title,
fontSize = 16.sp,
fontWeight = FontWeight.Bold,
color = TextPrimary
)
}
Box(
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.background(accentColor.copy(alpha = 0.15f))
.padding(horizontal = 8.dp, vertical = 2.dp)
) {
Text(
text = "${list.items.count { !it.isCompleted }} активных",
fontSize = 11.sp,
fontWeight = FontWeight.Bold,
color = accentColor
)
}
}
// Items list
if (list.items.isEmpty()) {
Text(
text = "Список пуст",
fontSize = 12.sp,
color = TextMuted,
modifier = Modifier.padding(start = 16.dp, top = 4.dp, bottom = 4.dp)
)
} else {
list.items.forEach { item ->
ItemRow(
item = item,
accentColor = accentColor,
onToggle = { onToggleItem(item) },
onDelete = { onDeleteItem(item) }
)
}
}
}
}
@Composable
private fun ItemRow(
item: NoteItem,
accentColor: Color,
onToggle: () -> Unit,
onDelete: () -> Unit
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(10.dp))
.background(ObsidianSurface)
.border(1.dp, GlassBorder.copy(alpha = 0.5f), RoundedCornerShape(10.dp))
.clickable { onToggle() }
.padding(horizontal = 10.dp, vertical = 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Checkbox(
checked = item.isCompleted,
onCheckedChange = { onToggle() },
colors = CheckboxDefaults.colors(
checkedColor = accentColor,
uncheckedColor = TextMuted,
checkmarkColor = ObsidianBg
),
modifier = Modifier.size(24.dp)
)
Spacer(modifier = Modifier.width(8.dp))
Column(modifier = Modifier.weight(1f)) {
Text(
text = item.title,
fontSize = 14.sp,
color = if (item.isCompleted) TextMuted else TextPrimary,
textDecoration = if (item.isCompleted) TextDecoration.LineThrough else TextDecoration.None
)
if (item.status == "want_to_watch") {
Text(
text = "🎬 Буду смотреть",
fontSize = 10.sp,
color = CyanAccent,
fontWeight = FontWeight.Medium
)
} else if (item.status == "watched") {
Text(
text = "✔ Просмотрено",
fontSize = 10.sp,
color = EmeraldMint,
fontWeight = FontWeight.Medium
)
}
}
IconButton(
onClick = onDelete,
modifier = Modifier.size(28.dp)
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = "Удалить",
tint = TextMuted,
modifier = Modifier.size(15.dp)
)
}
}
}
@@ -0,0 +1,507 @@
package com.example.avtex.ui
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.Bitmap
import android.view.ViewGroup
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebView
import android.webkit.WebViewClient
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.viewinterop.AndroidView
import com.example.avtex.theme.*
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
import okhttp3.Request
import org.json.JSONArray
import org.json.JSONObject
import java.util.concurrent.TimeUnit
data class CanvasItem(
val id: String,
val name: String,
val description: String = "",
val nodeCount: Int = 0,
val isPublic: Boolean = false,
val updatedAt: String = ""
)
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun MindmapsScreen(modifier: Modifier = Modifier) {
val context = LocalContext.current
val scope = rememberCoroutineScope()
val prefs = remember { context.getSharedPreferences("xflow_prefs", Context.MODE_PRIVATE) }
val serverUrl = remember {
mutableStateOf(prefs.getString("xflow_server_url", "https://xflow.controlsystem.kz") ?: "https://xflow.controlsystem.kz")
}
var canvases by remember {
mutableStateOf(
listOf(
CanvasItem("c-1", "Архитектура XFlow (Monorepo & Onion)", "Ядро системы, Nuxt 4 и модули", 14, true, "Сегодня"),
CanvasItem("c-2", "План развития 2026", "AI ассистент, списки, трекер сна", 9, false, "Вчера"),
CanvasItem("c-3", "Идеи и проекты (Brainstorm)", "Синхронизация Obsidian и Mobile", 6, false, "25 сен")
)
)
}
var isLoading by remember { mutableStateOf(false) }
var selectedCanvasId by remember { mutableStateOf<String?>(null) }
var showCreateDialog by remember { mutableStateOf(false) }
var newCanvasName by remember { mutableStateOf("") }
// Если открыт конкретный канвас — отображаем интерактивный редактор Flow через WebView
if (selectedCanvasId != null) {
BackHandler {
selectedCanvasId = null
}
CanvasEditorView(
canvasId = selectedCanvasId!!,
serverUrl = serverUrl.value,
onClose = { selectedCanvasId = null }
)
return
}
Scaffold(
modifier = modifier.fillMaxSize(),
containerColor = ObsidianBg,
topBar = {
TopAppBar(
title = {
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = "Майндкарты",
fontWeight = FontWeight.Bold,
color = Color.White
)
Spacer(modifier = Modifier.width(8.dp))
Box(
modifier = Modifier
.clip(RoundedCornerShape(8.dp))
.background(NeonViolet.copy(alpha = 0.2f))
.padding(horizontal = 6.dp, vertical = 2.dp)
) {
Text("XFlow Canvas", fontSize = 10.sp, color = NeonViolet, fontWeight = FontWeight.Bold)
}
}
},
actions = {
IconButton(onClick = {
isLoading = true
scope.launch {
canvases = fetchCanvases(serverUrl.value, canvases)
isLoading = false
}
}) {
Icon(Icons.Default.Refresh, contentDescription = "Обновить", tint = Color.White)
}
},
colors = TopAppBarDefaults.topAppBarColors(containerColor = ObsidianSurface)
)
},
floatingActionButton = {
FloatingActionButton(
onClick = { showCreateDialog = true },
containerColor = NeonViolet,
contentColor = Color.White,
shape = CircleShape
) {
Icon(Icons.Default.Add, contentDescription = "Создать майндкарту")
}
}
) { innerPadding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(innerPadding)
.padding(horizontal = 16.dp)
) {
Spacer(modifier = Modifier.height(12.dp))
// Баннер интеграции
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(16.dp))
.background(
Brush.horizontalGradient(
listOf(
NeonViolet.copy(alpha = 0.2f),
ElectricIndigo.copy(alpha = 0.15f),
Color.Transparent
)
)
)
.border(1.dp, GlassBorder, RoundedCornerShape(16.dp))
.padding(16.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
modifier = Modifier
.size(44.dp)
.clip(CircleShape)
.background(NeonViolet.copy(alpha = 0.25f)),
contentAlignment = Alignment.Center
) {
Icon(Icons.Default.Hub, contentDescription = null, tint = NeonViolet, modifier = Modifier.size(24.dp))
}
Spacer(modifier = Modifier.width(12.dp))
Column(modifier = Modifier.weight(1f)) {
Text("Интерактивный граф узлов", color = Color.White, fontWeight = FontWeight.SemiBold, fontSize = 15.sp)
Text(
"Полная совместимость с Obsidian Canvas и веб-сервером XFlow",
color = TextMuted,
fontSize = 12.sp,
maxLines = 2
)
}
}
}
Spacer(modifier = Modifier.height(16.dp))
if (isLoading) {
Box(modifier = Modifier.fillMaxWidth().padding(32.dp), contentAlignment = Alignment.Center) {
CircularProgressIndicator(color = NeonViolet)
}
} else {
LazyColumn(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.spacedBy(12.dp),
contentPadding = PaddingValues(bottom = 80.dp)
) {
items(canvases, key = { it.id }) { canvas ->
CanvasCard(
canvas = canvas,
onClick = { selectedCanvasId = canvas.id }
)
}
}
}
}
}
if (showCreateDialog) {
AlertDialog(
onDismissRequest = { showCreateDialog = false },
containerColor = ObsidianSurfaceElevated,
title = { Text("Новая майндкарта", color = Color.White, fontWeight = FontWeight.Bold) },
text = {
OutlinedTextField(
value = newCanvasName,
onValueChange = { newCanvasName = it },
placeholder = { Text("Название майндкарты (напр. Проект X)") },
singleLine = true,
colors = OutlinedTextFieldDefaults.colors(
focusedTextColor = Color.White,
unfocusedTextColor = Color.White,
focusedBorderColor = NeonViolet,
unfocusedBorderColor = GlassBorder
),
modifier = Modifier.fillMaxWidth()
)
},
confirmButton = {
Button(
onClick = {
if (newCanvasName.isNotBlank()) {
val newItem = CanvasItem(
id = "c-" + System.currentTimeMillis(),
name = newCanvasName.trim(),
description = "Создано с мобильного XFlow",
nodeCount = 1,
updatedAt = "Только что"
)
canvases = listOf(newItem) + canvases
newCanvasName = ""
showCreateDialog = false
selectedCanvasId = newItem.id
}
},
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet)
) {
Text("Создать")
}
},
dismissButton = {
TextButton(onClick = { showCreateDialog = false }) {
Text("Отмена", color = TextMuted)
}
}
)
}
}
@Composable
fun CanvasCard(
canvas: CanvasItem,
onClick: () -> Unit
) {
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(16.dp))
.background(ObsidianSurface)
.border(1.dp, GlassBorder, RoundedCornerShape(16.dp))
.clickable(onClick = onClick)
.padding(16.dp)
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
modifier = Modifier
.size(40.dp)
.clip(RoundedCornerShape(10.dp))
.background(ObsidianSurfaceElevated),
contentAlignment = Alignment.Center
) {
Icon(Icons.Default.AccountTree, contentDescription = null, tint = CyanAccent, modifier = Modifier.size(20.dp))
}
Spacer(modifier = Modifier.width(14.dp))
Column(modifier = Modifier.weight(1f)) {
Text(
text = canvas.name,
color = Color.White,
fontWeight = FontWeight.SemiBold,
fontSize = 15.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
if (canvas.description.isNotBlank()) {
Text(
text = canvas.description,
color = TextMuted,
fontSize = 12.sp,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}
Spacer(modifier = Modifier.height(4.dp))
Row(verticalAlignment = Alignment.CenterVertically) {
Text(
text = "${canvas.nodeCount} узлов",
color = CyanAccent,
fontSize = 11.sp,
fontWeight = FontWeight.Medium
)
Spacer(modifier = Modifier.width(10.dp))
Text(
text = canvas.updatedAt,
color = TextMuted,
fontSize = 11.sp
)
}
}
Icon(
Icons.Default.ChevronRight,
contentDescription = null,
tint = TextMuted,
modifier = Modifier.size(20.dp)
)
}
}
}
@SuppressLint("SetJavaScriptEnabled")
@Composable
fun CanvasEditorView(
canvasId: String,
serverUrl: String,
onClose: () -> Unit
) {
var webViewLoading by remember { mutableStateOf(true) }
var hasError by remember { mutableStateOf(false) }
val editorUrl = remember(canvasId, serverUrl) {
val base = serverUrl.trimEnd('/')
if (canvasId.startsWith("c-")) {
"$base/canvas"
} else {
"$base/canvas/$canvasId"
}
}
Box(modifier = Modifier.fillMaxSize().background(ObsidianBg)) {
AndroidView(
factory = { context ->
WebView(context).apply {
layoutParams = ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
)
settings.javaScriptEnabled = true
settings.domStorageEnabled = true
settings.useWideViewPort = true
settings.loadWithOverviewMode = true
webViewClient = object : WebViewClient() {
override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
webViewLoading = true
hasError = false
}
override fun onPageFinished(view: WebView?, url: String?) {
webViewLoading = false
}
override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
webViewLoading = false
hasError = true
}
}
loadUrl(editorUrl)
}
},
modifier = Modifier.fillMaxSize()
)
// Верхняя панель закрытия редактора
Row(
modifier = Modifier
.fillMaxWidth()
.statusBarsPadding()
.padding(12.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
IconButton(
onClick = onClose,
modifier = Modifier
.clip(CircleShape)
.background(ObsidianSurfaceElevated.copy(alpha = 0.85f))
.border(1.dp, GlassBorder, CircleShape)
) {
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Назад", tint = Color.White)
}
Text(
"XFlow Canvas Viewer",
color = Color.White,
fontWeight = FontWeight.Bold,
fontSize = 14.sp,
modifier = Modifier
.clip(RoundedCornerShape(20.dp))
.background(ObsidianSurfaceElevated.copy(alpha = 0.85f))
.border(1.dp, GlassBorder, RoundedCornerShape(20.dp))
.padding(horizontal = 14.dp, vertical = 6.dp)
)
}
if (webViewLoading) {
Box(
modifier = Modifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
CircularProgressIndicator(color = NeonViolet)
}
}
if (hasError) {
Box(
modifier = Modifier
.fillMaxSize()
.background(ObsidianBg.copy(alpha = 0.95f))
.padding(24.dp),
contentAlignment = Alignment.Center
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(Icons.Default.CloudOff, contentDescription = null, tint = TextMuted, modifier = Modifier.size(54.dp))
Spacer(modifier = Modifier.height(16.dp))
Text("Редактор оффлайн", color = Color.White, fontWeight = FontWeight.Bold, fontSize = 18.sp)
Spacer(modifier = Modifier.height(8.dp))
Text(
"Не удалось подключиться к $editorUrl.\nПроверьте подключение к серверу XFlow в Настройках.",
color = TextMuted,
fontSize = 13.sp,
textAlign = androidx.compose.ui.text.style.TextAlign.Center
)
Spacer(modifier = Modifier.height(20.dp))
Button(
onClick = onClose,
colors = ButtonDefaults.buttonColors(containerColor = NeonViolet)
) {
Text("Вернуться к списку")
}
}
}
}
}
}
suspend fun fetchCanvases(serverUrl: String, fallback: List<CanvasItem>): List<CanvasItem> = withContext(Dispatchers.IO) {
val client = OkHttpClient.Builder()
.connectTimeout(5, TimeUnit.SECONDS)
.readTimeout(5, TimeUnit.SECONDS)
.build()
try {
val request = Request.Builder()
.url("${serverUrl.trimEnd('/')}/api/canvas")
.get()
.build()
val response = client.newCall(request).execute()
response.use {
if (it.isSuccessful) {
val bodyStr = it.body?.string() ?: return@withContext fallback
val json = JSONObject(bodyStr)
val list = mutableListOf<CanvasItem>()
val arr = json.optJSONArray("canvases") ?: JSONArray()
for (i in 0 until arr.length()) {
val obj = arr.getJSONObject(i)
list.add(
CanvasItem(
id = obj.optString("id", "c-$i"),
name = obj.optString("name", "Майндкарта"),
description = obj.optString("description", ""),
nodeCount = obj.optJSONArray("nodes")?.length() ?: 0,
isPublic = obj.optBoolean("isPublic", false),
updatedAt = obj.optString("updatedAt", "Недавно")
)
)
}
if (list.isNotEmpty()) list else fallback
} else {
fallback
}
}
} catch (e: Exception) {
fallback
}
}
@@ -1,5 +1,7 @@
package com.example.avtex.ui package com.example.avtex.ui
import android.content.Context
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.border import androidx.compose.foundation.border
@@ -80,6 +82,12 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
var token by remember(settings.hacToken) { mutableStateOf(settings.hacToken) } var token by remember(settings.hacToken) { mutableStateOf(settings.hacToken) }
var inactivityMinutes by remember(settings.inactivityMinutes) { mutableFloatStateOf(settings.inactivityMinutes.toFloat()) } var inactivityMinutes by remember(settings.inactivityMinutes) { mutableFloatStateOf(settings.inactivityMinutes.toFloat()) }
var confidenceThreshold by remember(settings.confidenceThreshold) { mutableFloatStateOf(settings.confidenceThreshold.toFloat()) } var confidenceThreshold by remember(settings.confidenceThreshold) { mutableFloatStateOf(settings.confidenceThreshold.toFloat()) }
val context = androidx.compose.ui.platform.LocalContext.current
val xflowPrefs = remember { context.getSharedPreferences("xflow_prefs", Context.MODE_PRIVATE) }
var xflowServerUrl by remember {
mutableStateOf(xflowPrefs.getString("xflow_server_url", "https://xflow.controlsystem.kz") ?: "https://xflow.controlsystem.kz")
}
var xflowTestStatus by remember { mutableStateOf<String?>(null) }
var broadcastIntents by remember(settings.broadcastIntents) { mutableStateOf(settings.broadcastIntents) } var broadcastIntents by remember(settings.broadcastIntents) { mutableStateOf(settings.broadcastIntents) }
var isSaved by remember { mutableStateOf(false) } var isSaved by remember { mutableStateOf(false) }
@@ -382,6 +390,107 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
} }
} }
// XFlow Cloud Server Card
item {
Box(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(22.dp))
.background(ObsidianSurfaceElevated)
.border(1.dp, GlassBorder, RoundedCornerShape(22.dp))
.padding(18.dp)
) {
Column {
Row(verticalAlignment = Alignment.CenterVertically) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(10.dp))
.background(CyanAccent.copy(alpha = 0.15f))
.padding(8.dp)
) {
Icon(
imageVector = Icons.Default.Link,
contentDescription = null,
tint = CyanAccent,
modifier = Modifier.size(20.dp)
)
}
Spacer(modifier = Modifier.width(10.dp))
Column {
Text(
text = "Сервер XFlow (Coolify / Cloud)",
fontWeight = FontWeight.Bold,
fontSize = 16.sp,
color = TextPrimary
)
Text(
text = "Синхронизация Canvas майндкарт и заметок",
fontSize = 11.sp,
color = TextMuted
)
}
}
Spacer(modifier = Modifier.height(14.dp))
OutlinedTextField(
value = xflowServerUrl,
onValueChange = { xflowServerUrl = it; isSaved = false },
label = { Text("URL сервера XFlow") },
placeholder = { Text("https://xflow.controlsystem.kz") },
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(14.dp),
singleLine = true,
colors = customTextFieldColors()
)
Spacer(modifier = Modifier.height(10.dp))
Row(
modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = xflowTestStatus ?: "Статус: https://xflow.controlsystem.kz",
fontSize = 12.sp,
color = if (xflowTestStatus?.contains("OK") == true) EmeraldMint else TextMuted,
modifier = Modifier.weight(1f)
)
androidx.compose.material3.TextButton(
onClick = {
coroutineScope.launch {
xflowTestStatus = "Проверка..."
try {
val client = okhttp3.OkHttpClient.Builder()
.connectTimeout(5, java.util.concurrent.TimeUnit.SECONDS)
.build()
val req = okhttp3.Request.Builder()
.url("${xflowServerUrl.trimEnd('/')}/api/canvas")
.build()
val resp = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) {
client.newCall(req).execute()
}
resp.use {
if (it.isSuccessful) {
xflowTestStatus = "Подключено: HTTP ${it.code} OK"
} else {
xflowTestStatus = "Ответ: HTTP ${it.code}"
}
}
} catch (e: Exception) {
xflowTestStatus = "Ошибка: ${e.localizedMessage}"
}
}
}
) {
Text("Проверить", color = CyanAccent, fontSize = 13.sp)
}
}
}
}
}
// 4. Save Button // 4. Save Button
item { item {
Button( Button(
@@ -398,6 +507,7 @@ fun SettingsScreen(modifier: Modifier = Modifier) {
confidenceThreshold = confidenceThreshold.roundToInt(), confidenceThreshold = confidenceThreshold.roundToInt(),
broadcastIntents = broadcastIntents broadcastIntents = broadcastIntents
) )
xflowPrefs.edit().putString("xflow_server_url", xflowServerUrl.trim()).apply()
isSaved = true isSaved = true
} }
}, },
Binary file not shown.

After

Width:  |  Height:  |  Size: 322 KiB

@@ -5,6 +5,6 @@
android:viewportWidth="108" android:viewportWidth="108"
android:viewportHeight="108"> android:viewportHeight="108">
<path <path
android:fillColor="#0D0E1A" android:fillColor="#131929"
android:pathData="M0,0h108v108h-108z" /> android:pathData="M0,0h108v108h-108z" />
</vector> </vector>
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 668 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

@@ -0,0 +1,5 @@
<resources>
<string name="app_name">Avtex</string>
<string name="shortcut_voice_note">Голосовая заметка</string>
<string name="shortcut_voice_note_desc">Быстрая запись заметки голосом в Avtex</string>
</resources>
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Шорткат по долгому нажатию на иконку: Голосовая заметка -->
<shortcut
android:shortcutId="voice_note"
android:enabled="true"
android:icon="@mipmap/ic_launcher_avtex"
android:shortcutShortLabel="@string/shortcut_voice_note"
android:shortcutLongLabel="@string/shortcut_voice_note_desc">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.example.avtex"
android:targetClass="com.example.avtex.MainActivity"
android:data="xflow://voice/record" />
<categories android:name="android.shortcut.conversation" />
</shortcut>
<!-- Создание заметки через Gemini / Google Assistant ("Сделай заметку...") -->
<capability android:name="actions.intent.CREATE_NOTE">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.example.avtex"
android:targetClass="com.example.avtex.MainActivity"
android:data="xflow://notes/create">
<parameter
android:name="note.text"
android:key="note_text" />
<parameter
android:name="note.name"
android:key="note_title" />
</intent>
</capability>
<!-- Добавление элемента в список через Gemini / Google Assistant ("Добавь фильм в Avtex...") -->
<capability android:name="actions.intent.ADD_ITEM_TO_LIST">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.example.avtex"
android:targetClass="com.example.avtex.MainActivity"
android:data="xflow://lists/add">
<parameter
android:name="itemList.name"
android:key="list_name" />
<parameter
android:name="itemListElement.name"
android:key="item_name" />
</intent>
</capability>
<!-- Создание списка через Gemini / Google Assistant -->
<capability android:name="actions.intent.CREATE_ITEM_LIST">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.example.avtex"
android:targetClass="com.example.avtex.MainActivity"
android:data="xflow://lists/create">
<parameter
android:name="itemList.name"
android:key="list_name" />
</intent>
</capability>
<!-- Просмотр списка -->
<capability android:name="actions.intent.GET_ITEM_LIST">
<intent
android:action="android.intent.action.VIEW"
android:targetPackage="com.example.avtex"
android:targetClass="com.example.avtex.MainActivity"
android:data="xflow://lists/view">
<parameter
android:name="itemList.name"
android:key="list_name" />
</intent>
</capability>
</shortcuts>

Some files were not shown because too many files have changed in this diff Show More