86 lines
2.1 KiB
Markdown
86 lines
2.1 KiB
Markdown
# Coding Workflow
|
|
|
|
## Environment
|
|
- **Primary Channel:** Discord #coding (1468627455656067074)
|
|
- **Repository:** whoisfrost/controls-web (Lassite controls internal website)
|
|
- **Model:** kimi-k2.5:cloud (home-assistant), qwen3-coder-next:cloud (coding)
|
|
|
|
---
|
|
|
|
## Git Workflow
|
|
|
|
### Branch Strategy
|
|
| Branch | Purpose |
|
|
|--------|---------|
|
|
| `main` | Stable/production branch |
|
|
| `dev` | Testing/playground branch |
|
|
| `feature/*` | Specific changes (deleted after merge) |
|
|
|
|
### Deployment Process
|
|
```
|
|
Work PC → GitHub (dev) → Dev Server (pulls dev) → Live Server (pulls main)
|
|
```
|
|
|
|
### Workflow Steps
|
|
1. Create feature branch from dev
|
|
2. Work and commit
|
|
3. Push feature branch to GitHub
|
|
4. Merge feature → dev
|
|
5. Test on dev server
|
|
6. Merge dev → main
|
|
7. Deploy to live server
|
|
|
|
### Commands
|
|
```bash
|
|
git checkout -b dev # Create dev branch
|
|
git push origin dev # Push dev branch
|
|
git checkout -b feature-name # Create feature branch
|
|
git push origin feature-name # Push feature
|
|
git checkout dev
|
|
git merge feature-name # Merge into dev
|
|
git push origin dev
|
|
git checkout main
|
|
git merge dev # After testing
|
|
git push origin main
|
|
```
|
|
|
|
---
|
|
|
|
## LAMP Stack
|
|
|
|
### Local Development
|
|
- **Dashboard:** `C:\web\htdocs\dashboard` (active project)
|
|
- **Web Root:** `C:\web\htdocs\`
|
|
- **Old Dashboard:** `/var/www/html/dashboardv2/` (ignore - archived)
|
|
|
|
### Production
|
|
- Dev server pulls from `dev` branch
|
|
- Live server pulls from `main` branch
|
|
|
|
---
|
|
|
|
## Tools & Environment
|
|
- **Shell:** Bash
|
|
- **SSH, curl, jq**
|
|
- **Node.js:** For Next.js/React projects
|
|
- **Python:** For Flask backends
|
|
|
|
---
|
|
|
|
## Model Assignments (Confirmed 2026-02-10)
|
|
|
|
| Channel | Model | Reason |
|
|
|---------|-------|--------|
|
|
| #home-assistant | kimi-k2.5:cloud | General purpose |
|
|
| #coding | qwen3-coder-next:cloud | Optimized for code |
|
|
| #projects | kimi-k2.5:cloud | General purpose |
|
|
|
|
---
|
|
|
|
## Related Projects
|
|
- [[Mission Control Dashboard (Python)]] — Flask dashboard :5050
|
|
- [[Mission Control Dashboard (Next.js)]] — React dashboard :3000 (completed)
|
|
|
|
---
|
|
|
|
*Status: Active | Updated: 2026-02-22* |