alex/headquarter
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: move git toolbar to top bar with proper styling

Browse Source 
- Move GitToolbar from sidebar to top bar below workspace header
- Remove GitToolbar from sidebar layout
- Add comprehensive CSS styles for git toolbar:
  - Flex layout with proper spacing
  - Styled buttons with hover effects
  - Branch selector styling
  - Badge styling for ahead/behind counts
  - Status badges for modified/added/deleted/untracked
  - Error message styling
  - New branch form styling
- Quality gates: typecheck ✓ lint ✓ build ✓
This commit is contained in:
Fusion
2026-05-19 15:49:06 +02:00
parent 9373d93169
commit 84bf7e4aeb
7 changed files with 184 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openspec/changes/archive/2026-05-19-workspace-visual-overhaul/.openspec.yaml
+2
View File
@@ -0,0 +1,2 @@
schema: spec-driven
created: 2026-05-19
openspec/changes/archive/2026-05-19-workspace-visual-overhaul/design.md
+270
View File
@@ -0,0 +1,270 @@
# Workspace Visual Overhaul - Design
## Layout Architecture
### New Workspace Layout
```
┌──────────────────────────────────────────────────────────────────────┐
│ App Shell (Header + Nav) │
├──────────────────────────────────────────────────────────────────────┤
│ Project Workspace Header │
│ ┌─────────────────────────────────────────────────────────────────┐ │
│ │ 📁 My Project [History] [⚙️ Settings] │ │
│ │ (secondary actions on right) │ │
│ └─────────────────────────────────────────────────────────────────┘ │
├──────────────────────┬───────────────────────────────────────────────┤
│ │ │
│ Sidebar (280px) │ Main Content │
│ ┌────────────────┐ │ ┌─────────────────────────────────────────┐ │
│ │ Branch ▼ │ │ │ Breadcrumbs: src > components │ │
│ ├────────────────┤ │ ├─────────────────────────────────────────┤ │
│ │ 📁 src/ │ │ │ Toolbar: [Edit] [Raw] [Blame] │ │
│ │ 📁 tests/ │ │ ├─────────────────────────────────────────┤ │
│ │ 📄 README.md │ │ │ │ │
│ │ ... │ │ │ function hello() { │ │
│ │ │ │ │ return "world"; │ │
│ └────────────────┘ │ │ } │ │
│ │ │ │ │
│ │ └─────────────────────────────────────────┘ │
│ │ │
└──────────────────────┴───────────────────────────────────────────────┘
```
### Project Settings Page
```
┌──────────────────────────────────────────────────────────────────────┐
│ App Shell (Header + Nav) │
├──────────────────────────────────────────────────────────────────────┤
│ Settings Header │
│ ┌─────────────────────────────────────────────────────────────────┐ │
│ │ ← Back to Project My Project / Settings │ │
│ └─────────────────────────────────────────────────────────────────┘ │
├──────────────────┬───────────────────────────────────────────────────┤
│ │ │
│ Settings Tabs │ Tab Content │
│ ┌──────────────┐│ ┌─────────────────────────────────────────────┐ │
│ │ General ││ │ General Settings │ │
│ ├──────────────┤│ │ │ │
│ │ Repositories ││ │ Project Name: [My Project ] │ │
│ ├──────────────┤│ │ Description: [A test project... ] │ │
│ │ Members ││ │ │ │
│ ├──────────────┤│ │ [Save Changes] │ │
│ │ Danger Zone ││ │ │ │
│ └──────────────┘│ └─────────────────────────────────────────────┘ │
│ │ │
└──────────────────┴───────────────────────────────────────────────────┘
```
## Component Changes
### 1. WorkspaceHeader (New Component)
**Location**: `apps/web/src/components/workspace-header.tsx`
**Props:**
```typescript
interface WorkspaceHeaderProps {
project: Project;
onNavigateToHistory: () => void;
onNavigateToSettings: () => void;
}
```
**Layout:**
- Left: Project icon + Project name (bold)
- Right: Action buttons group
- "History" button (clock icon)
- "Settings" button (gear icon)
- Subtitle (optional): Project description or current repo name
### 2. ProjectSettingsPage (New Page)
**Location**: `apps/web/src/pages/project-settings.tsx`
**Route**: `/projects/:projectId/settings`
**Tabs:**
1. **General**
- Project name input
- Description textarea
- Created date (read-only)
- Save button
2. **Repositories** (moved from separate page)
- List of project repositories
- Add repository button
- Repository cards with actions (delete)
- Same functionality as current repo management
3. **Members** (placeholder for future)
- "Coming soon" message
4. **Danger Zone**
- Delete project button (with confirmation)
### 3. Sidebar Simplification
**Remove from sidebar:**
- "Manage Repositories" link (moved to settings)
- "History" link (moved to header)
**Keep in sidebar:**
- Branch selector
- File tree
### 4. Navigation Updates
**Current routes:**
- `/projects` → Project list (unchanged)
- `/projects/:id` → Workspace (new header)
- `/projects/:id/repositories` → Repository list (REMOVE)
- `/projects/:id/repositories/:repoId/history` → History (keep)
- `/projects/:id/settings` → NEW
**New navigation flow:**
```
Projects List
↓ click
Workspace (with header actions)
↓ click Settings
Project Settings
↓ click Repositories tab
Repository Management (in settings)
↓ click Back
Workspace
```
## CSS Changes
### Workspace Header
```css
.workspace-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1rem 1.5rem;
border-bottom: 1px solid var(--border-color);
background: var(--surface-color);
}
.workspace-header-left {
display: flex;
align-items: center;
gap: 0.75rem;
}
.workspace-header-title {
font-size: 1.25rem;
font-weight: 600;
color: var(--text-primary);
}
.workspace-header-actions {
display: flex;
gap: 0.5rem;
}
.workspace-header-action-btn {
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
border: 1px solid var(--border-color);
border-radius: 6px;
background: var(--surface-color);
color: var(--text-secondary);
font-size: 0.875rem;
cursor: pointer;
transition: all 0.2s;
}
.workspace-header-action-btn:hover {
background: var(--hover-color);
border-color: var(--primary-color);
}
```
### Settings Layout
```css
.settings-container {
display: flex;
min-height: calc(100vh - var(--header-height));
}
.settings-sidebar {
width: 240px;
border-right: 1px solid var(--border-color);
padding: 1.5rem 0;
}
.settings-tab {
display: block;
padding: 0.75rem 1.5rem;
color: var(--text-secondary);
text-decoration: none;
font-size: 0.875rem;
border-left: 3px solid transparent;
}
.settings-tab:hover {
background: var(--hover-color);
}
.settings-tab.active {
color: var(--primary-color);
border-left-color: var(--primary-color);
background: var(--primary-light);
}
.settings-content {
flex: 1;
padding: 2rem;
max-width: 800px;
}
```
## API Changes
No new API endpoints needed. The settings page will use existing APIs:
- `GET /projects/:id` - project details
- `PUT /projects/:id` - update project (already exists? if not, add)
- `DELETE /projects/:id` - delete project (already exists)
## Implementation Order
1. **Create WorkspaceHeader component**
- Extract from current workspace page
- Add action buttons
- Style appropriately
2. **Create ProjectSettingsPage**
- Settings layout with tabs
- General tab with project info
- Danger zone with delete button
3. **Move repository management**
- Move repo list from separate page to settings tab
- Update routes
4. **Update workspace page**
- Remove sidebar links
- Add WorkspaceHeader
- Keep file tree and viewer
5. **Update router**
- Remove `/projects/:id/repositories` route
- Add `/projects/:id/settings` route
- Add tab routes: `/projects/:id/settings/general`, etc.
6. **Polish**
- Ensure responsive design
- Test navigation flow
- Update breadcrumbs if needed
## Migration Notes
- Users currently accessing `/projects/:id/repositories` will need to navigate to Settings > Repositories
- Can add a redirect or show a message on the old route temporarily
- Update any hardcoded links in the codebase
openspec/changes/archive/2026-05-19-workspace-visual-overhaul/proposal.md
+49
View File
@@ -0,0 +1,49 @@
# Workspace Visual Overhaul
## Problem
The current repository workspace layout has usability issues:
1. **Scattered navigation**: Git toolbar buttons, repository management, and project actions are in different places
2. **No centralized project settings**: Managing repositories requires leaving the workspace
3. **Cluttered sidebar**: Too many elements competing for attention
4. **Inconsistent placement**: Actions aren't where users expect them (GitHub-style top-right)
## Solution
Redesign the workspace layout to follow GitHub-style conventions:
1. **Header actions on the right**: All primary actions (History, Settings, etc.) in the top-right
2. **Project settings page**: Centralized location for all project configuration
3. **Repository management in settings**: Move "Manage Repositories" into project settings
4. **Cleaner sidebar**: Focus on file tree and branch switching
5. **Consistent navigation patterns**: Match familiar GitHub/GitLab layouts
## Benefits
- **Familiar interface**: Users already know GitHub's layout
- **Cleaner workspace**: Less clutter in the main view
- **Centralized settings**: All project config in one place
- **Better hierarchy**: Clear separation between workspace and management
## Scope
### What's changing:
- Workspace header layout (buttons moved to right)
- New Project Settings page
- Repository management moved to settings
- Sidebar simplification
- Navigation restructuring
### What's staying:
- File browser functionality
- Git toolbar in workspace
- File viewer/editor
- Branch selector
## Design Goals
1. **GitHub-like header**: Project name left, actions right
2. **Settings as primary action**: Gear icon in header
3. **Streamlined sidebar**: Only file tree + branch selector
4. **Settings tabs**: General, Repositories, Members (future), etc.
openspec/changes/archive/2026-05-19-workspace-visual-overhaul/specs/spec.md
+184
View File
@@ -0,0 +1,184 @@
# Workspace Visual Overhaul Specification
## Requirements
### Functional Requirements
1. **Header Actions**: All primary project actions in workspace header (right-aligned)
2. **Project Settings Page**: Dedicated settings page with tabs
3. **Repository Management in Settings**: Move repo management to settings tab
4. **Sidebar Simplification**: Remove management links from sidebar
5. **Consistent Navigation**: Follow GitHub-style patterns
### Non-Functional Requirements
1. **Responsive**: Works on desktop, tablet, and mobile
2. **Accessible**: Keyboard navigation, screen reader support
3. **Performant**: No layout shifts, smooth transitions
4. **Maintainable**: Clean component separation
## UI Specification
### Workspace Header
**Left Side:**
- Project icon (📁 or custom)
- Project name (bold, 1.25rem)
- Optional: Current repository name (smaller, muted)
**Right Side (Actions):**
- "History" button (clock icon) → navigates to history
- "Settings" button (gear icon) → navigates to settings
**States:**
- Loading: Show skeleton or spinner
- Error: Show error message with retry
### Project Settings Page
**Layout:**
- Two-column layout (sidebar tabs + content)
- Mobile: Tabs at top, content below
**Tabs:**
#### General Tab
- Project name input (required)
- Description textarea (optional)
- Created at (read-only)
- Updated at (read-only)
- Save changes button
- Cancel button (if dirty)
#### Repositories Tab
- Repository list (same as current repo management)
- Add repository button
- Each repo card:
- Name
- Remote URL (truncated)
- Last updated
- Actions: Delete
#### Members Tab (Placeholder)
- "Coming soon" message
- Brief description of future feature
#### Danger Zone
- Red background/warning styling
- Delete project button
- Confirmation dialog on click
### Sidebar Changes
**Current sidebar items:**
- Branch selector
- File tree
- Manage Repositories link
**New sidebar items:**
- Branch selector (keep)
- File tree (keep)
- ~~Manage Repositories~~ (remove)
## Route Changes
### Remove Routes
- `/projects/:projectId/repositories` → Moved to settings
### New Routes
- `/projects/:projectId/settings` → Settings (defaults to General tab)
- `/projects/:projectId/settings/general` → General settings
- `/projects/:projectId/settings/repositories` → Repository management
- `/projects/:projectId/settings/members` → Members (placeholder)
### Keep Routes
- `/projects` → Project list
- `/projects/:projectId` → Workspace
- `/projects/:projectId/repositories/:repoId/history` → History
## Component Specification
### WorkspaceHeader
```typescript
interface WorkspaceHeaderProps {
project: {
id: string;
name: string;
description?: string;
};
currentRepo?: {
id: string;
name: string;
};
onNavigateToHistory: () => void;
onNavigateToSettings: () => void;
}
```
### ProjectSettingsPage
```typescript
interface ProjectSettingsProps {
projectId: string;
}
// Tabs configuration
const TABS = [
{ id: 'general', label: 'General', icon: 'settings' },
{ id: 'repositories', label: 'Repositories', icon: 'repo' },
{ id: 'members', label: 'Members', icon: 'people' },
];
```
### SettingsTabLayout
```typescript
interface SettingsTabLayoutProps {
projectId: string;
activeTab: string;
children: React.ReactNode;
}
```
## API Requirements
### PUT /projects/:id
Update project details.
**Request Body:**
```json
{
"name": "Updated Project Name",
"description": "Updated description"
}
```
**Response 200:**
```json
{
"id": "uuid",
"name": "Updated Project Name",
"description": "Updated description",
"created_at": "2024-01-01T00:00:00Z",
"updated_at": "2024-01-02T00:00:00Z"
}
```
## Error Handling
- **Project not found**: Show 404 page
- **Permission denied**: Show auth error, redirect to login
- **Save failed**: Show toast notification, keep form state
- **Delete failed**: Show error in danger zone
## Testing Strategy
### Frontend Tests
- Test header navigation (History, Settings buttons)
- Test settings tabs switching
- Test form validation (name required)
- Test delete confirmation flow
- Test responsive layout
### Integration Tests
- Test navigation flow: workspace → settings → back
- Test route changes
- Test data persistence (save project changes)
openspec/changes/archive/2026-05-19-workspace-visual-overhaul/tasks.md
+80
View File
@@ -0,0 +1,80 @@
# Workspace Visual Overhaul - Tasks
## Phase 1: Workspace Header
- [x] **Task 1.1**: Create WorkspaceHeader component
- [x] **Task 1.2**: Integrate WorkspaceHeader into RepoWorkspace
## Phase 2: Project Settings Page
- [x] **Task 2.1**: Create SettingsTabLayout component
- [x] **Task 2.2**: Create ProjectSettingsPage
- [x] **Task 2.3**: Add API endpoint for project updates (already existed)
## Phase 3: Move Repository Management
- [x] **Task 3.1**: Create RepositoriesSettingsTab
- [x] **Task 3.2**: Update routes
- [x] **Task 3.3**: Update navigation
## Phase 4: Sidebar Cleanup
- [x] **Task 4.1**: Simplify sidebar
- Remove management links from sidebar
- Keep only: Branch selector, File tree
- Adjust sidebar width if needed
- Update sidebar styles
- [x] **Task 4.2**: Update workspace layout
- Ensure clean separation between header, sidebar, and main content
- Fix any layout issues from header changes
- Ensure consistent spacing
## Phase 5: Members Placeholder
- [x] **Task 5.1**: Create Members tab placeholder
- Create `components/members-settings-tab.tsx`
- "Coming soon" message
- Brief feature description
- Add to settings tabs
## Phase 6: Polish & Integration
- [x] **Task 6.1**: Add breadcrumbs
- Add breadcrumb navigation to settings page
- Format: Projects > My Project > Settings > General
- Make segments clickable
- [x] **Task 6.2**: Add mobile responsiveness
- Settings tabs become horizontal on mobile
- Header actions collapse to icons only
- Sidebar becomes toggleable overlay
- [x] **Task 6.3**: Add transitions
- Tab switching animations
- Page transition animations
- Button hover effects
- [x] **Task 6.4**: Test navigation flow
- Workspace → Settings → back
- Settings tabs switching
- Save changes flow
- Delete project flow
## Phase 7: Quality Gates
- [x] **Task 7.1**: Run backend checks
- ruff check
- mypy
- pytest
- [x] **Task 7.2**: Run frontend checks
- TypeScript typecheck
- ESLint
- Build
- [x] **Task 7.3**: Manual testing
- Test all navigation flows
- Test responsive breakpoints
- Test form validation
- Verify no broken links