diff --git a/ROADMAP.md b/ROADMAP.md index 6fada3d..3efb24a 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -410,10 +410,13 @@ Amac: Mevcut prototipi build edilebilir ve gelistirilebilir hale getirmek. Isler: - Build hatalarini gidermek. -- `Cognis`, `MindSpace` ve yeni urun ismi kararini netlestirmek. +- Urun adini netlestirmek: `Cognis`. - Encoding bozukluklarini temizlemek. - Mock veri kullanan ekranlari isaretlemek. - `user_settings` yerine `app_settings` semasini netlestirmek. +- Supabase SQL dosyalarini sira, dokumantasyon ve calistirma kaydi olan bir sisteme oturtmak. +- Mevcut `supabase/schema.sql` dosyasini ilk database baseline olarak kaydetmek. +- Her yeni SQL ekinde ilgili dokumani ve query log kaydini zorunlu hale getirmek. - MVP disi ekranlari sidebar'dan gecici olarak kaldirmak veya "coming later" durumuna almak. Kabul kriteri: @@ -421,6 +424,9 @@ Kabul kriteri: - `npm run build` basarili. - Ana layout, auth ve dashboard sorunsuz acilir. - MVP kapsamindaki moduller net gorunur. +- Database query sirasi `docs/database/query-order.md` icinde kayitlidir. +- Calistirilan SQL dosyalari `docs/database/query-log.md` icinde takip edilir. +- Ilk baseline olan `supabase/schema.sql` icin aciklayici dokuman vardir. --- diff --git a/app/(dashboard)/chat/page.tsx b/app/(dashboard)/chat/page.tsx index cc75779..a46bc51 100644 --- a/app/(dashboard)/chat/page.tsx +++ b/app/(dashboard)/chat/page.tsx @@ -145,12 +145,15 @@ export default function AIChatPage() { } else return; } + const resolvedSessionId = sessionId; + if (!resolvedSessionId) return; + setIsLoading(true); // 1. Optimistic Update: Add User Message locally const optimisticUserMsg: ChatMessage = { id: uuidv4(), - session_id: sessionId, + session_id: resolvedSessionId, role: "user", content: userMessageContent, created_at: new Date().toISOString() @@ -160,7 +163,7 @@ export default function AIChatPage() { // 2. Save User Message to Supabase await supabase.from("chat_messages").insert({ id: optimisticUserMsg.id, - session_id: sessionId, + session_id: resolvedSessionId, role: "user", content: userMessageContent }); @@ -189,7 +192,7 @@ export default function AIChatPage() { // 5. Optimistic Update: Add Assistant Message locally const assistantMsg: ChatMessage = { id: uuidv4(), - session_id: sessionId, + session_id: resolvedSessionId, role: "assistant", content: data.reply || "Cevap üretilemedi.", created_at: new Date().toISOString() @@ -199,24 +202,24 @@ export default function AIChatPage() { // 6. Save Assistant Message to Supabase await supabase.from("chat_messages").insert({ id: assistantMsg.id, - session_id: sessionId, + session_id: resolvedSessionId, role: "assistant", content: assistantMsg.content }); // 7. Update session title if it was default - const currentSession = sessions.find(s => s.id === sessionId); + const currentSession = sessions.find(s => s.id === resolvedSessionId); if (currentSession?.title === "Yeni Sohbet") { const newTitle = userMessageContent.slice(0, 40); - await supabase.from("chat_sessions").update({ title: newTitle }).eq("id", sessionId); - setSessions(prev => prev.map(s => s.id === sessionId ? { ...s, title: newTitle } : s)); + await supabase.from("chat_sessions").update({ title: newTitle }).eq("id", resolvedSessionId); + setSessions(prev => prev.map(s => s.id === resolvedSessionId ? { ...s, title: newTitle } : s)); } } catch (error) { console.error(error); const errorMsg: ChatMessage = { id: uuidv4(), - session_id: sessionId, + session_id: resolvedSessionId, role: "assistant", content: "Hata oluştu. Lütfen Ayarlar sayfasından API anahtarınızı kontrol edin.", created_at: new Date().toISOString() @@ -224,7 +227,7 @@ export default function AIChatPage() { setMessages(prev => [...prev, errorMsg]); await supabase.from("chat_messages").insert({ id: errorMsg.id, - session_id: sessionId, + session_id: resolvedSessionId, role: "assistant", content: errorMsg.content }); diff --git a/app/(dashboard)/clients/page.tsx b/app/(dashboard)/clients/page.tsx index d11d015..ac7929e 100644 --- a/app/(dashboard)/clients/page.tsx +++ b/app/(dashboard)/clients/page.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { - Plus, Search, User, Mail, Phone, Globe, + Plus, Search, User, Users, Mail, Phone, Globe, MoreHorizontal, MessageSquare, Briefcase, TrendingUp, Star, Clock, X, ChevronRight, ArrowUpRight, DollarSign, Brain, Shield, diff --git a/app/(dashboard)/finance/page.tsx b/app/(dashboard)/finance/page.tsx index cd50ace..145c3a8 100644 --- a/app/(dashboard)/finance/page.tsx +++ b/app/(dashboard)/finance/page.tsx @@ -6,7 +6,7 @@ import { CreditCard, ArrowUpRight, ArrowDownRight, MoreHorizontal, Calendar, FileText, Download, PieChart as PieChartIcon, Wallet, Brain, ArrowRight, X, Check, Activity, - Briefcase, Landmark, Receipt, Percent, Target + Briefcase, Landmark, Receipt, Percent, Target, Filter } from "lucide-react"; import { Area, AreaChart, Bar, BarChart, CartesianGrid, diff --git a/app/(dashboard)/journal/page.tsx b/app/(dashboard)/journal/page.tsx index fa60ba8..29f2b05 100644 --- a/app/(dashboard)/journal/page.tsx +++ b/app/(dashboard)/journal/page.tsx @@ -5,7 +5,7 @@ import { Plus, Search, Calendar, Clock, Brain, MessageSquare, Smile, Frown, Meh, Star, MoreHorizontal, X, Zap, Save, Trash2, Edit3, Image as ImageIcon, Link as LinkIcon, - ChevronLeft, ChevronRight, Activity, Filter, AlignLeft, Hash + ChevronLeft, ChevronRight, Activity, Filter, AlignLeft, Hash, ArrowRight } from "lucide-react"; import { motion, AnimatePresence } from "framer-motion"; diff --git a/app/(dashboard)/time/page.tsx b/app/(dashboard)/time/page.tsx index 7ddc168..9e56f07 100644 --- a/app/(dashboard)/time/page.tsx +++ b/app/(dashboard)/time/page.tsx @@ -5,7 +5,7 @@ import { Play, Pause, Square, Plus, Search, Clock, BarChart3, Calendar, MoreHorizontal, X, CheckCircle2, AlertCircle, Brain, Zap, - TrendingUp, Activity, Briefcase, User + TrendingUp, Activity, Briefcase, User, ArrowRight } from "lucide-react"; import { motion, AnimatePresence } from "framer-motion"; import { diff --git a/components/layout/dashboard-shell.tsx b/components/layout/dashboard-shell.tsx index 5615d07..9105ab0 100644 --- a/components/layout/dashboard-shell.tsx +++ b/components/layout/dashboard-shell.tsx @@ -230,7 +230,7 @@ function SidebarPanel({ className="flex w-full items-center justify-between gap-2 rounded-md p-2 transition-all hover:bg-white/5 outline-none" >
- +
{user.displayName} @@ -341,4 +341,3 @@ function AmbientBackdrop() { ); } - diff --git a/config/sidebar.ts b/config/sidebar.ts index 15b61b1..1d7eb8e 100644 --- a/config/sidebar.ts +++ b/config/sidebar.ts @@ -1,25 +1,20 @@ import { - Activity, BarChart3, BookOpenText, + Building2, Calendar, CheckSquare2, - FileText, FolderKanban, MessageCircleHeart, Sparkles, - Target, - Users, Wallet, - Building2, - Tags, } from "lucide-react"; export type SidebarNavItem = { title: string; href?: string; icon?: any; - items?: SidebarNavItem[]; // For nested (accordion) links later + items?: SidebarNavItem[]; }; export type SidebarNavGroup = { @@ -29,7 +24,7 @@ export type SidebarNavGroup = { export const sidebarData: SidebarNavGroup[] = [ { - title: "GENEL BAKIŞ", + title: "GENEL BAKIS", items: [ { title: "Dashboard", href: "/", icon: Sparkles }, { title: "Takvim", href: "/calendar", icon: Calendar }, @@ -37,34 +32,20 @@ export const sidebarData: SidebarNavGroup[] = [ ], }, { - title: "YÖNETİM", + title: "OPERASYON", items: [ - { title: "Görevler", href: "/tasks", icon: CheckSquare2 }, + { title: "Musteriler", href: "/clients", icon: Building2 }, { title: "Projeler", href: "/projects", icon: FolderKanban }, - { title: "Dökümanlar", href: "/documents", icon: FileText }, + { title: "Gorevler", href: "/tasks", icon: CheckSquare2 }, { title: "Finans", href: "/finance", icon: Wallet }, ], }, { - title: "KİŞİSEL", - items: [ - { title: "Günlük", href: "/journal", icon: BookOpenText }, - { title: "Alışkanlıklar", href: "/habits", icon: Activity }, - { title: "Hedefler", href: "/goals", icon: Target }, - ], + title: "KISISEL", + items: [{ title: "Gunluk", href: "/journal", icon: BookOpenText }], }, { - title: "FREELANCE", - items: [ - { title: "Müşteriler (CRM)", href: "/freelance/clients", icon: Building2 }, - { title: "Teklifler & Sözleşmeler", href: "/freelance/proposals", icon: Tags }, - { title: "Zaman Takibi", href: "/freelance/time-tracking", icon: Activity }, - ], - }, - { - title: "AI ASİSTAN", - items: [ - { title: "Sohbet", href: "/chat", icon: MessageCircleHeart }, - ], + title: "AI ASISTAN", + items: [{ title: "Sohbet", href: "/chat", icon: MessageCircleHeart }], }, ]; diff --git a/docs/database/0001-initial-schema.md b/docs/database/0001-initial-schema.md new file mode 100644 index 0000000..965b7a3 --- /dev/null +++ b/docs/database/0001-initial-schema.md @@ -0,0 +1,51 @@ +# 0001 Initial Schema + +SQL file: `supabase/schema.sql` + +## Purpose + +This is the first registered database query file for the project. It represents the schema that existed before the Freelancer OS MVP planning work started. + +## What It Creates + +- `journals` +- `tasks` +- `chat_sessions` +- `chat_messages` +- `profiles` +- Row Level Security policies for the tables above +- `handle_new_user()` trigger function for profile creation +- `on_auth_user_created` trigger +- `avatars` storage bucket and related storage policies + +## Current Product Fit + +This schema supports the earlier MindSpace/Cognis prototype: + +- mood/energy journals +- basic tasks +- chat history +- user profile storage +- avatar uploads + +It does not yet fully match the Freelancer OS MVP model. + +## Known Gaps For MVP + +The Freelancer OS MVP still needs new schema additions for: + +- `clients` +- `projects` +- `calendar_events` +- `finance_transactions` +- `daily_logs` +- `app_settings` + +The existing `journals` table can either be migrated into `daily_logs` or kept as a legacy table until the UI is moved to the new model. + +## Execution Notes + +This file should be treated as the first baseline. If it has already been run in a Supabase project, do not rerun it blindly because some `create table` and `create policy` statements are not idempotent. + +Future changes should be added as ordered migration files rather than editing this baseline after execution. + diff --git a/docs/database/README.md b/docs/database/README.md new file mode 100644 index 0000000..6044b55 --- /dev/null +++ b/docs/database/README.md @@ -0,0 +1,35 @@ +# Database Change Process + +This directory records every database change that should be run against Supabase/PostgreSQL. + +The project currently starts with `supabase/schema.sql` as the first database query file. Future database changes must be added as separate SQL files and registered here before they are run. + +## Rules + +1. Every SQL change must have a stable order number. +2. Every SQL file must be listed in `query-order.md`. +3. Every executed query must be recorded in `query-log.md`. +4. Every meaningful schema addition must have a short documentation file under this directory. +5. Do not edit an already executed SQL file silently. Add a new ordered SQL file instead. + +## Current Files + +- `supabase/schema.sql`: Initial legacy schema. It creates the current auth/profile, journal, task, chat, and avatar storage structure. +- `docs/database/0001-initial-schema.md`: Explanation for the initial schema. +- `docs/database/query-order.md`: Canonical order of SQL files. +- `docs/database/query-log.md`: Manual execution log for SQL files that were run against an environment. + +## Next Migration Naming + +Use this pattern for future SQL files: + +```text +supabase/migrations/0002_short_description.sql +``` + +Example: + +```text +supabase/migrations/0002_add_freelancer_os_core_tables.sql +``` + diff --git a/docs/database/query-log.md b/docs/database/query-log.md new file mode 100644 index 0000000..c680c29 --- /dev/null +++ b/docs/database/query-log.md @@ -0,0 +1,10 @@ +# Database Query Log + +This file records SQL files that were executed against a database environment. + +Do not mark a query as executed unless it was actually run. + +| Date | Environment | Order | SQL file | Runner | Result | Notes | +| --- | --- | --- | --- | --- | --- | --- | +| Not recorded | Unknown existing environment | 0001 | `supabase/schema.sql` | Unknown | Assumed existing baseline | File existed before this query log was introduced. Confirm manually before rerunning. | + diff --git a/docs/database/query-order.md b/docs/database/query-order.md new file mode 100644 index 0000000..6e518db --- /dev/null +++ b/docs/database/query-order.md @@ -0,0 +1,16 @@ +# Database Query Order + +This file is the canonical order of SQL files for database setup and migration. + +| Order | SQL file | Documentation | Status | +| --- | --- | --- | --- | +| 0001 | `supabase/schema.sql` | `docs/database/0001-initial-schema.md` | Baseline registered | + +## How To Add The Next Query + +1. Create a new SQL file under `supabase/migrations/`. +2. Use the next order number. +3. Add a documentation file under `docs/database/`. +4. Register both files in this table. +5. After running the SQL, add an entry to `query-log.md`. + diff --git a/next-env.d.ts b/next-env.d.ts index c4b7818..9edff1c 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,6 +1,6 @@ /// /// -import "./.next/dev/types/routes.d.ts"; +import "./.next/types/routes.d.ts"; // NOTE: This file should not be edited // see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/supabase/README.md b/supabase/README.md new file mode 100644 index 0000000..516ecda --- /dev/null +++ b/supabase/README.md @@ -0,0 +1,21 @@ +# Supabase Directory + +This directory stores SQL files for the project's Supabase/PostgreSQL database. + +## Current Baseline + +- `schema.sql` is the first registered database SQL file. +- Its documentation is in `docs/database/0001-initial-schema.md`. +- Its order is tracked in `docs/database/query-order.md`. +- Execution history is tracked in `docs/database/query-log.md`. + +## Future Changes + +Future schema changes should be added under: + +```text +supabase/migrations/ +``` + +Do not overwrite already executed SQL without also creating a new ordered migration and documenting why. + diff --git a/supabase/migrations/.gitkeep b/supabase/migrations/.gitkeep new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/supabase/migrations/.gitkeep @@ -0,0 +1 @@ +