mirror of
https://github.com/Dvorinka/Trackeep.git
synced 2026-06-04 12:32:58 +00:00
Compare commits
27 Commits
4c812e376d
..
v1.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
 Tomas Dvorak
|
f3a835caa2 | ||
|
Tomas Dvorak
|
dee7011192 | ||
|
Tomas Dvorak
|
ebd4ba649d | ||
|
Tomas Dvorak
|
9a580c77d2 | ||
|
Tomas Dvorak
|
fc913b5641 | ||
|
Tomas Dvorak
|
874efd5452 | ||
|
Tomáš Dvořák
|
1e8bf270a1 | ||
|
Tomáš Dvořák
|
d82e52ad98 | ||
|
Tomas Dvorak
|
083373a24f | ||
|
Tomas Dvorak
|
446bc7acfb | ||
|
Tomas Dvorak
|
90f0b90cc7 | ||
|
Tomas Dvorak
|
ecd31f4e3b | ||
|
Tomas Dvorak
|
9c17f80d5d | ||
|
Tomas Dvorak
|
3b8e14c6b8 | ||
|
Tomas Dvorak
|
a9395be39f | ||
|
Tomas Dvorak
|
aef1e39d7a | ||
|
Tomas Dvorak
|
8612a62f5e | ||
|
Tomas Dvorak
|
e465e00d1a | ||
|
Tomas Dvorak
|
46845b8341 | ||
|
Tomas Dvorak
|
9769225416 | ||
|
Tomas Dvorak
|
83df6ce463 | ||
|
Tomas Dvorak
|
fc62766471 | ||
|
Tomas Dvorak
|
86a61b20df | ||
|
Tomas Dvorak
|
be8e2ae040 | ||
|
Tomas Dvorak
|
8047a3c28c | ||
|
Tomas Dvorak
|
e377516cc3 | ||
|
Tomas Dvorak
|
0a80ecd9f7 |
@@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
"languages": {},
|
|
||||||
"review_max_age_days": 30,
|
|
||||||
"holistic_max_age_days": 30,
|
|
||||||
"generate_scorecard": true,
|
|
||||||
"badge_path": "scorecard.png",
|
|
||||||
"exclude": [],
|
|
||||||
"ignore": [
|
|
||||||
"test_coverage::frontend/src/pages/Login.tsx",
|
|
||||||
"test_coverage::frontend/src/App.tsx"
|
|
||||||
],
|
|
||||||
"ignore_metadata": {
|
|
||||||
"test_coverage::frontend/src/pages/Login.tsx": {
|
|
||||||
"note": "Login page - test coverage is separate effort, permanently ignore",
|
|
||||||
"added_at": "2026-02-18T13:23:38+00:00"
|
|
||||||
},
|
|
||||||
"test_coverage::frontend/src/App.tsx": {
|
|
||||||
"note": "Main App component - test coverage is separate effort, permanently ignore",
|
|
||||||
"added_at": "2026-02-18T13:26:59+00:00"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"zone_overrides": {},
|
|
||||||
"review_dimensions": [],
|
|
||||||
"review_allow_custom_dimensions": false,
|
|
||||||
"review_custom_dimensions": [],
|
|
||||||
"large_files_threshold": 0,
|
|
||||||
"props_threshold": 0,
|
|
||||||
"finding_noise_budget": 10,
|
|
||||||
"finding_noise_global_budget": 0,
|
|
||||||
"target_strict_score": 95
|
|
||||||
}
|
|
||||||
@@ -1,742 +0,0 @@
|
|||||||
{
|
|
||||||
"command": "status",
|
|
||||||
"overall_score": 75.0,
|
|
||||||
"objective_score": 100.0,
|
|
||||||
"strict_score": 59.3,
|
|
||||||
"strict_all_detected": 59.1,
|
|
||||||
"dimension_scores": {
|
|
||||||
"File health": {
|
|
||||||
"score": 100.0,
|
|
||||||
"strict": 87.6,
|
|
||||||
"checks": 143,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 3,
|
|
||||||
"detectors": {
|
|
||||||
"structural": {
|
|
||||||
"potential": 143,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Code quality": {
|
|
||||||
"score": 100.0,
|
|
||||||
"strict": 67.2,
|
|
||||||
"checks": 1211,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 3,
|
|
||||||
"detectors": {
|
|
||||||
"unused": {
|
|
||||||
"potential": 143,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"logs": {
|
|
||||||
"potential": 143,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"exports": {
|
|
||||||
"potential": 305,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"deprecated": {
|
|
||||||
"potential": 2,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"props": {
|
|
||||||
"potential": 76,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"smells": {
|
|
||||||
"potential": 143,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"react": {
|
|
||||||
"potential": 14,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"orphaned": {
|
|
||||||
"potential": 146,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"flat_dirs": {
|
|
||||||
"potential": 25,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"naming": {
|
|
||||||
"potential": 23,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"facade": {
|
|
||||||
"potential": 146,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"patterns": {
|
|
||||||
"potential": 3,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"single_use": {
|
|
||||||
"potential": 42,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Duplication": {
|
|
||||||
"score": 100.0,
|
|
||||||
"strict": 99.4,
|
|
||||||
"checks": 288,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 3,
|
|
||||||
"detectors": {
|
|
||||||
"dupes": {
|
|
||||||
"potential": 288,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Test health": {
|
|
||||||
"score": 100.0,
|
|
||||||
"strict": 48.6,
|
|
||||||
"checks": 2246,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"test_coverage": {
|
|
||||||
"potential": 2109,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"subjective_review": {
|
|
||||||
"potential": 137,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Security": {
|
|
||||||
"score": 100.0,
|
|
||||||
"strict": 98.6,
|
|
||||||
"checks": 289,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"security": {
|
|
||||||
"potential": 143,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
},
|
|
||||||
"cycles": {
|
|
||||||
"potential": 146,
|
|
||||||
"pass_rate": 1.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 0.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Naming Quality": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Error Consistency": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Abstraction Fit": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Logic Clarity": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AI Generated Debt": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Type Safety": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Contract Coherence": {
|
|
||||||
"score": 0.0,
|
|
||||||
"strict": 0.0,
|
|
||||||
"checks": 10,
|
|
||||||
"issues": 0,
|
|
||||||
"tier": 4,
|
|
||||||
"detectors": {
|
|
||||||
"subjective_assessment": {
|
|
||||||
"potential": 10,
|
|
||||||
"pass_rate": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"weighted_failures": 10.0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stats": {
|
|
||||||
"total": 873,
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 20,
|
|
||||||
"auto_resolved": 1,
|
|
||||||
"wontfix": 768,
|
|
||||||
"false_positive": 84,
|
|
||||||
"by_tier": {
|
|
||||||
"1": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 17,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 8,
|
|
||||||
"false_positive": 0
|
|
||||||
},
|
|
||||||
"2": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 3,
|
|
||||||
"auto_resolved": 1,
|
|
||||||
"wontfix": 376,
|
|
||||||
"false_positive": 26
|
|
||||||
},
|
|
||||||
"3": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 0,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 245,
|
|
||||||
"false_positive": 58
|
|
||||||
},
|
|
||||||
"4": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 0,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 139,
|
|
||||||
"false_positive": 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"scan_count": 10,
|
|
||||||
"last_scan": "2026-02-18T13:28:26+00:00",
|
|
||||||
"by_tier": {
|
|
||||||
"1": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 17,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 8,
|
|
||||||
"false_positive": 0
|
|
||||||
},
|
|
||||||
"2": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 3,
|
|
||||||
"auto_resolved": 1,
|
|
||||||
"wontfix": 376,
|
|
||||||
"false_positive": 26
|
|
||||||
},
|
|
||||||
"3": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 0,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 245,
|
|
||||||
"false_positive": 58
|
|
||||||
},
|
|
||||||
"4": {
|
|
||||||
"open": 0,
|
|
||||||
"fixed": 0,
|
|
||||||
"auto_resolved": 0,
|
|
||||||
"wontfix": 139,
|
|
||||||
"false_positive": 0
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ignores": [
|
|
||||||
"test_coverage::frontend/src/pages/Login.tsx",
|
|
||||||
"test_coverage::frontend/src/App.tsx"
|
|
||||||
],
|
|
||||||
"suppression": {
|
|
||||||
"last_ignored": 1,
|
|
||||||
"last_raw_findings": 853,
|
|
||||||
"last_suppressed_pct": 0.1,
|
|
||||||
"last_ignore_patterns": 2,
|
|
||||||
"recent_scans": 5,
|
|
||||||
"recent_ignored": 1,
|
|
||||||
"recent_raw_findings": 4265,
|
|
||||||
"recent_suppressed_pct": 0.0
|
|
||||||
},
|
|
||||||
"detector_transparency": {
|
|
||||||
"rows": [
|
|
||||||
{
|
|
||||||
"detector": "exports",
|
|
||||||
"visible": 305,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 305
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "smells",
|
|
||||||
"visible": 215,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 1,
|
|
||||||
"total_detected": 216
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "subjective_review",
|
|
||||||
"visible": 138,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 138
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "test_coverage",
|
|
||||||
"visible": 49,
|
|
||||||
"suppressed": 1,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 50
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "structural",
|
|
||||||
"visible": 25,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "security",
|
|
||||||
"visible": 18,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 18
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "logs",
|
|
||||||
"visible": 6,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 6
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "dupes",
|
|
||||||
"visible": 3,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 3
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "deprecated",
|
|
||||||
"visible": 0,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 2,
|
|
||||||
"total_detected": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "flat_dirs",
|
|
||||||
"visible": 2,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "unused",
|
|
||||||
"visible": 2,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "cycles",
|
|
||||||
"visible": 1,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 1
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"detector": "react",
|
|
||||||
"visible": 1,
|
|
||||||
"suppressed": 0,
|
|
||||||
"excluded": 0,
|
|
||||||
"total_detected": 1
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"totals": {
|
|
||||||
"visible": 765,
|
|
||||||
"suppressed": 1,
|
|
||||||
"excluded": 3,
|
|
||||||
"detectors": 13
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"potentials": {
|
|
||||||
"typescript": {
|
|
||||||
"logs": 143,
|
|
||||||
"unused": 143,
|
|
||||||
"exports": 305,
|
|
||||||
"deprecated": 2,
|
|
||||||
"structural": 143,
|
|
||||||
"flat_dirs": 25,
|
|
||||||
"props": 76,
|
|
||||||
"single_use": 42,
|
|
||||||
"coupling": 0,
|
|
||||||
"cycles": 146,
|
|
||||||
"orphaned": 146,
|
|
||||||
"patterns": 3,
|
|
||||||
"naming": 23,
|
|
||||||
"facade": 146,
|
|
||||||
"test_coverage": 2109,
|
|
||||||
"smells": 143,
|
|
||||||
"react": 14,
|
|
||||||
"security": 143,
|
|
||||||
"subjective_review": 137,
|
|
||||||
"dupes": 288
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"codebase_metrics": {
|
|
||||||
"typescript": {
|
|
||||||
"total_files": 151,
|
|
||||||
"total_loc": 40054,
|
|
||||||
"total_directories": 25
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"strict_target": {
|
|
||||||
"target": 95.0,
|
|
||||||
"current": 59.3,
|
|
||||||
"gap": 35.7,
|
|
||||||
"state": "below",
|
|
||||||
"warning": null
|
|
||||||
},
|
|
||||||
"narrative": {
|
|
||||||
"phase": "stagnation",
|
|
||||||
"headline": "All T1 and T2 items cleared!",
|
|
||||||
"dimensions": {
|
|
||||||
"lowest_dimensions": [
|
|
||||||
{
|
|
||||||
"name": "Naming Quality",
|
|
||||||
"strict": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"impact": 0.0,
|
|
||||||
"subjective": true,
|
|
||||||
"impact_description": "re-review to improve"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Error Consistency",
|
|
||||||
"strict": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"impact": 0.0,
|
|
||||||
"subjective": true,
|
|
||||||
"impact_description": "re-review to improve"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Abstraction Fit",
|
|
||||||
"strict": 0.0,
|
|
||||||
"issues": 0,
|
|
||||||
"impact": 0.0,
|
|
||||||
"subjective": true,
|
|
||||||
"impact_description": "re-review to improve"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"biggest_gap_dimensions": [
|
|
||||||
{
|
|
||||||
"name": "Test health",
|
|
||||||
"lenient": 100.0,
|
|
||||||
"strict": 48.6,
|
|
||||||
"gap": 51.4,
|
|
||||||
"wontfix_count": 187
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Code quality",
|
|
||||||
"lenient": 100.0,
|
|
||||||
"strict": 67.2,
|
|
||||||
"gap": 32.8,
|
|
||||||
"wontfix_count": 534
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "File health",
|
|
||||||
"lenient": 100.0,
|
|
||||||
"strict": 87.6,
|
|
||||||
"gap": 12.4,
|
|
||||||
"wontfix_count": 25
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"stagnant_dimensions": [
|
|
||||||
{
|
|
||||||
"name": "File health",
|
|
||||||
"strict": 87.6,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Code quality",
|
|
||||||
"strict": 67.2,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Duplication",
|
|
||||||
"strict": 99.4,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Security",
|
|
||||||
"strict": 98.6,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Naming Quality",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Error Consistency",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Abstraction Fit",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Logic Clarity",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "AI Generated Debt",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Type Safety",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Contract Coherence",
|
|
||||||
"strict": 0.0,
|
|
||||||
"stuck_scans": 5
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"actions": [
|
|
||||||
{
|
|
||||||
"priority": 1,
|
|
||||||
"type": "debt_review",
|
|
||||||
"detector": null,
|
|
||||||
"description": "7.8 pts of wontfix debt \u2014 review stale decisions",
|
|
||||||
"command": "desloppify show --status wontfix",
|
|
||||||
"gap": 7.8,
|
|
||||||
"lane": "debt_review"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"strategy": {
|
|
||||||
"fixer_leverage": {
|
|
||||||
"auto_fixable_count": 0,
|
|
||||||
"total_count": 0,
|
|
||||||
"coverage": 0.0,
|
|
||||||
"impact_ratio": 0.0,
|
|
||||||
"recommendation": "none"
|
|
||||||
},
|
|
||||||
"lanes": {
|
|
||||||
"debt_review": {
|
|
||||||
"actions": [
|
|
||||||
1
|
|
||||||
],
|
|
||||||
"file_count": 0,
|
|
||||||
"total_impact": 0.0,
|
|
||||||
"automation": "manual",
|
|
||||||
"run_first": false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"can_parallelize": false,
|
|
||||||
"hint": "Try a different dimension to break the plateau."
|
|
||||||
},
|
|
||||||
"tools": {
|
|
||||||
"fixers": [],
|
|
||||||
"move": {
|
|
||||||
"available": true,
|
|
||||||
"relevant": false,
|
|
||||||
"reason": null,
|
|
||||||
"usage": "desloppify move <source> <dest> [--dry-run]"
|
|
||||||
},
|
|
||||||
"plan": {
|
|
||||||
"command": "desloppify plan",
|
|
||||||
"description": "Generate prioritized markdown cleanup plan"
|
|
||||||
},
|
|
||||||
"badge": {
|
|
||||||
"generated": true,
|
|
||||||
"in_readme": true,
|
|
||||||
"path": "scorecard.png",
|
|
||||||
"recommendation": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"debt": {
|
|
||||||
"overall_gap": 7.8,
|
|
||||||
"wontfix_count": 768,
|
|
||||||
"worst_dimension": "Test health",
|
|
||||||
"worst_gap": 51.4,
|
|
||||||
"trend": "stable"
|
|
||||||
},
|
|
||||||
"milestone": "All T1 and T2 items cleared!",
|
|
||||||
"primary_action": {
|
|
||||||
"priority": 1,
|
|
||||||
"type": "debt_review",
|
|
||||||
"detector": null,
|
|
||||||
"command": "desloppify show --status wontfix",
|
|
||||||
"description": "7.8 pts of wontfix debt \u2014 review stale decisions",
|
|
||||||
"impact": null,
|
|
||||||
"lane": "debt_review",
|
|
||||||
"count": null
|
|
||||||
},
|
|
||||||
"why_now": "Progress is plateaued, so the top action is the best chance to break the plateau.",
|
|
||||||
"verification_step": {
|
|
||||||
"command": "desloppify show --status wontfix",
|
|
||||||
"reason": "Re-check stale wontfix decisions before treating strict score as stable.",
|
|
||||||
"success_signal": "Wontfix list reflects only intentional and still-valid exceptions."
|
|
||||||
},
|
|
||||||
"risk_flags": [
|
|
||||||
{
|
|
||||||
"type": "wontfix_gap",
|
|
||||||
"severity": "medium",
|
|
||||||
"message": "7.8 strict-score points are masked by wontfix debt (768 items).",
|
|
||||||
"command": "desloppify show --status wontfix"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"strict_target": {
|
|
||||||
"target": 95.0,
|
|
||||||
"current": 59.3,
|
|
||||||
"gap": 35.7,
|
|
||||||
"state": "below",
|
|
||||||
"warning": null
|
|
||||||
},
|
|
||||||
"reminders": [],
|
|
||||||
"reminder_history": {
|
|
||||||
"report_scores": 10,
|
|
||||||
"auto_fixers_available": 3,
|
|
||||||
"dry_run_first": 3,
|
|
||||||
"zone_classification": 3,
|
|
||||||
"feedback_nudge": 3,
|
|
||||||
"stagnant_nudge": 10,
|
|
||||||
"fp_calibration_security_production": 3,
|
|
||||||
"wontfix_growing": 3,
|
|
||||||
"fp_calibration_orphaned_production": 3
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"config": {
|
|
||||||
"review_max_age_days": 30,
|
|
||||||
"holistic_max_age_days": 30,
|
|
||||||
"generate_scorecard": true,
|
|
||||||
"badge_path": "scorecard.png",
|
|
||||||
"exclude": [],
|
|
||||||
"ignore": [
|
|
||||||
"test_coverage::frontend/src/pages/Login.tsx",
|
|
||||||
"test_coverage::frontend/src/App.tsx"
|
|
||||||
],
|
|
||||||
"ignore_metadata": {
|
|
||||||
"test_coverage::frontend/src/pages/Login.tsx": {
|
|
||||||
"note": "Login page - test coverage is separate effort, permanently ignore",
|
|
||||||
"added_at": "2026-02-18T13:23:38+00:00"
|
|
||||||
},
|
|
||||||
"test_coverage::frontend/src/App.tsx": {
|
|
||||||
"note": "Main App component - test coverage is separate effort, permanently ignore",
|
|
||||||
"added_at": "2026-02-18T13:26:59+00:00"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"zone_overrides": {},
|
|
||||||
"review_dimensions": [],
|
|
||||||
"review_allow_custom_dimensions": false,
|
|
||||||
"review_custom_dimensions": [],
|
|
||||||
"large_files_threshold": 0,
|
|
||||||
"props_threshold": 0,
|
|
||||||
"finding_noise_budget": 10,
|
|
||||||
"finding_noise_global_budget": 0,
|
|
||||||
"target_strict_score": 95,
|
|
||||||
"languages": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,12 @@
|
|||||||
|
node_modules
|
||||||
|
.git
|
||||||
|
.gitignore
|
||||||
|
README.md
|
||||||
|
.env.local
|
||||||
|
.env.production
|
||||||
|
Dockerfile
|
||||||
|
Dockerfile.dev
|
||||||
|
docker-compose*.yml
|
||||||
|
.vscode
|
||||||
|
.idea
|
||||||
|
*.log
|
||||||
+12
-82
@@ -1,10 +1,9 @@
|
|||||||
# Server Configuration
|
# Server Configuration
|
||||||
PORT=8080
|
FRONTEND_PORT=3000
|
||||||
|
BACKEND_PORT=8080
|
||||||
|
DB_PORT=5432
|
||||||
|
DRAGONFLY_PORT=6379
|
||||||
GIN_MODE=debug
|
GIN_MODE=debug
|
||||||
READ_TIMEOUT=15s
|
|
||||||
WRITE_TIMEOUT=15s
|
|
||||||
IDLE_TIMEOUT=60s
|
|
||||||
SHUTDOWN_TIMEOUT=30s
|
|
||||||
|
|
||||||
# Database Configuration
|
# Database Configuration
|
||||||
DB_TYPE=postgres
|
DB_TYPE=postgres
|
||||||
@@ -15,20 +14,14 @@ DB_PASSWORD=your_password_here
|
|||||||
DB_NAME=trackeep
|
DB_NAME=trackeep
|
||||||
DB_SSL_MODE=disable
|
DB_SSL_MODE=disable
|
||||||
|
|
||||||
# Docker Compose Database (used by docker-compose.yml)
|
# DragonflyDB Configuration
|
||||||
POSTGRES_DB=trackeep
|
DRAGONFLY_ADDR=dragonfly:6379
|
||||||
POSTGRES_USER=trackeep
|
DRAGONFLY_PASSWORD=your_dragonfly_password_here
|
||||||
POSTGRES_PASSWORD=your_secure_password_here
|
|
||||||
|
|
||||||
# JWT Configuration
|
# JWT Configuration (also used for encryption)
|
||||||
# JWT_SECRET is auto-generated on startup and stored in jwt_secret.key
|
JWT_SECRET=your_jwt_secret_here_64_hex_characters_long_exactly
|
||||||
# You can override by setting JWT_SECRET environment variable if needed
|
|
||||||
JWT_EXPIRES_IN=24h
|
JWT_EXPIRES_IN=24h
|
||||||
|
|
||||||
# Encryption Configuration
|
|
||||||
# ENCRYPTION_KEY is auto-generated on startup and stored in encryption.key
|
|
||||||
# You can override by setting ENCRYPTION_KEY environment variable if needed
|
|
||||||
|
|
||||||
# File Upload Configuration
|
# File Upload Configuration
|
||||||
UPLOAD_DIR=./uploads
|
UPLOAD_DIR=./uploads
|
||||||
MAX_FILE_SIZE=10485760
|
MAX_FILE_SIZE=10485760
|
||||||
@@ -36,77 +29,14 @@ MAX_FILE_SIZE=10485760
|
|||||||
# CORS Configuration
|
# CORS Configuration
|
||||||
CORS_ALLOWED_ORIGINS=*
|
CORS_ALLOWED_ORIGINS=*
|
||||||
|
|
||||||
# AI Services Configuration
|
|
||||||
LONGCAT_ON=false
|
|
||||||
LONGCAT_API_KEY=your_longcat_api_key_here
|
|
||||||
LONGCAT_BASE_URL=https://api.longcat.chat
|
|
||||||
LONGCAT_OPENAI_ENDPOINT=https://api.longcat.chat/openai
|
|
||||||
LONGCAT_ANTHROPIC_ENDPOINT=https://api.longcat.chat/anthropic
|
|
||||||
LONGCAT_MODEL=LongCat-Flash-Chat
|
|
||||||
LONGCAT_MODEL_THINKING=LongCat-Flash-Thinking
|
|
||||||
LONGCAT_FORMAT=openai
|
|
||||||
|
|
||||||
# Mistral AI Configuration
|
|
||||||
MISTRAL_ON=false
|
|
||||||
MISTRAL_API_KEY=your_mistral_api_key_here
|
|
||||||
MISTRAL_MODEL=mistral-small-latest
|
|
||||||
MISTRAL_MODEL_THINKING=mistral-large-latest
|
|
||||||
|
|
||||||
# Grok AI Configuration
|
|
||||||
GROK_ON=false
|
|
||||||
GROK_API_KEY=your_grok_api_key_here
|
|
||||||
GROK_BASE_URL=https://api.x.ai/v1
|
|
||||||
GROK_MODEL=grok-4-1-fast-non-reasoning-latest
|
|
||||||
GROK_MODEL_THINKING=grok-4-1-fast-reasoning-latest
|
|
||||||
|
|
||||||
# DeepSeek Configuration
|
|
||||||
DEEPSEEK_ON=false
|
|
||||||
DEEPSEEK_API_KEY=your_deepseek_api_key_here
|
|
||||||
DEEPSEEK_BASE_URL=https://api.deepseek.com
|
|
||||||
DEEPSEEK_MODEL=deepseek-chat
|
|
||||||
DEEPSEEK_MODEL_THINKING=deepseek-reasoner
|
|
||||||
|
|
||||||
# Ollama Configuration
|
|
||||||
OLLAMA_ON=false
|
|
||||||
OLLAMA_BASE_URL=http://localhost:11434
|
|
||||||
OLLAMA_MODEL=llama3.1
|
|
||||||
OLLAMA_MODEL_THINKING=llama3.1
|
|
||||||
|
|
||||||
# OpenRouter Configuration
|
|
||||||
OPENROUTER_ON=false
|
|
||||||
OPENROUTER_API_KEY=your_openrouter_api_key_here
|
|
||||||
OPENROUTER_BASE_URL=https://openrouter.ai/api
|
|
||||||
OPENROUTER_MODEL=openrouter/auto
|
|
||||||
OPENROUTER_MODEL_THINKING=openrouter/auto
|
|
||||||
|
|
||||||
# Demo Mode Configuration
|
# Demo Mode Configuration
|
||||||
VITE_DEMO_MODE=false
|
VITE_DEMO_MODE=false
|
||||||
|
|
||||||
# Browser Search API Configuration
|
# AI Services Configuration
|
||||||
BRAVE_API_KEY=your_brave_api_key_here
|
SEARCH_API_PROVIDER=demo
|
||||||
BRAVE_SEARCH_BASE_URL=https://api.search.brave.com/res/v1/web/search
|
|
||||||
SERPER_API_KEY=your_serper_api_key_here
|
|
||||||
SERPER_BASE_URL=https://google.serper.dev/search
|
|
||||||
SEARCH_API_PROVIDER=brave # Options: brave, serper, demo
|
|
||||||
|
|
||||||
# Search Configuration
|
|
||||||
SEARCH_RESULTS_LIMIT=10
|
SEARCH_RESULTS_LIMIT=10
|
||||||
SEARCH_CACHE_TTL=300
|
|
||||||
SEARCH_RATE_LIMIT=100
|
|
||||||
|
|
||||||
# Update Configuration
|
# Auto Update Configuration
|
||||||
# Application version (used for update checking)
|
|
||||||
APP_VERSION=1.0.0
|
|
||||||
|
|
||||||
# OAuth service configuration (REQUIRED)
|
|
||||||
# The OAuth service must be running for updates to work
|
|
||||||
OAUTH_SERVICE_URL=http://localhost:9090
|
|
||||||
JWT_SECRET=your-jwt-secret-key
|
|
||||||
|
|
||||||
# Update settings
|
|
||||||
AUTO_UPDATE_CHECK=false
|
AUTO_UPDATE_CHECK=false
|
||||||
UPDATE_CHECK_INTERVAL=24h
|
UPDATE_CHECK_INTERVAL=24h
|
||||||
PRERELEASE_UPDATES=false
|
PRERELEASE_UPDATES=false
|
||||||
|
|
||||||
# Note: No GitHub token configuration needed
|
|
||||||
# Updates use the OAuth service which handles GitHub authentication automatically
|
|
||||||
|
|||||||
+56
-45
@@ -8,7 +8,7 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
IMAGE_NAME: ${{ github.repository }}
|
IMAGE_NAME: Dvorinka/trackeep
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@@ -37,6 +37,8 @@ jobs:
|
|||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.24'
|
go-version: '1.24'
|
||||||
|
cache: true
|
||||||
|
cache-dependency-path: backend/go.sum
|
||||||
|
|
||||||
- name: Install backend dependencies
|
- name: Install backend dependencies
|
||||||
run: |
|
run: |
|
||||||
@@ -91,21 +93,18 @@ jobs:
|
|||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v4
|
||||||
with:
|
with:
|
||||||
go-version: '1.24'
|
go-version: '1.24'
|
||||||
|
cache: true
|
||||||
|
cache-dependency-path: backend/go.sum
|
||||||
|
|
||||||
- name: Run Gosec Security Scanner
|
- name: Run go vet
|
||||||
run: |
|
run: |
|
||||||
go install github.com/securecodewarrior/gosec/v2/cmd/gosec@latest
|
cd backend
|
||||||
gosec -no-fail -fmt sarif -out results.sarif ./...
|
go vet ./...
|
||||||
|
|
||||||
- name: Upload SARIF file
|
|
||||||
uses: github/codeql-action/upload-sarif@v3
|
|
||||||
with:
|
|
||||||
sarif_file: results.sarif
|
|
||||||
|
|
||||||
- name: Run npm audit
|
- name: Run npm audit
|
||||||
run: |
|
run: |
|
||||||
cd frontend
|
cd frontend
|
||||||
npm audit --audit-level high
|
npm audit --audit-level high || echo "Security vulnerabilities found, but continuing build"
|
||||||
|
|
||||||
build-and-push:
|
build-and-push:
|
||||||
name: Build and Push Images
|
name: Build and Push Images
|
||||||
@@ -122,17 +121,28 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Log in to Container Registry
|
- name: Log in to Container Registry
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ${{ env.REGISTRY }}
|
registry: ${{ env.REGISTRY }}
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Extract metadata
|
- name: Extract metadata
|
||||||
id: meta
|
id: meta-backend
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/backend
|
||||||
|
tags: |
|
||||||
|
type=ref,event=branch
|
||||||
|
type=ref,event=pr
|
||||||
|
type=sha,prefix={{branch}}-
|
||||||
|
type=raw,value=latest,enable={{is_default_branch}}
|
||||||
|
|
||||||
|
- name: Extract metadata
|
||||||
|
id: meta-frontend
|
||||||
|
uses: docker/metadata-action@v4
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/frontend
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
type=ref,event=pr
|
type=ref,event=pr
|
||||||
@@ -140,45 +150,46 @@ jobs:
|
|||||||
type=raw,value=latest,enable={{is_default_branch}}
|
type=raw,value=latest,enable={{is_default_branch}}
|
||||||
|
|
||||||
- name: Build and push backend image
|
- name: Build and push backend image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: ./backend
|
context: ./backend
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/backend:${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta-backend.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta-backend.outputs.labels }}
|
||||||
|
|
||||||
- name: Build and push frontend image
|
- name: Build and push frontend image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v4
|
||||||
with:
|
with:
|
||||||
context: ./frontend
|
context: .
|
||||||
|
file: ./frontend/Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/frontend:${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta-frontend.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta-frontend.outputs.labels }}
|
||||||
|
|
||||||
deploy:
|
# deploy:
|
||||||
name: Deploy to Production
|
# name: Deploy to Production
|
||||||
runs-on: ubuntu-latest
|
# runs-on: ubuntu-latest
|
||||||
needs: build-and-push
|
# needs: build-and-push
|
||||||
if: github.ref == 'refs/heads/main'
|
# if: github.ref == 'refs/heads/main'
|
||||||
environment: production
|
# environment: production
|
||||||
|
|
||||||
steps:
|
# steps:
|
||||||
- name: Checkout code
|
# - name: Checkout code
|
||||||
uses: actions/checkout@v4
|
# uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Deploy to server
|
# - name: Deploy to server
|
||||||
uses: appleboy/ssh-action@v1.0.0
|
# uses: appleboy/ssh-action@v1.0.0
|
||||||
with:
|
# with:
|
||||||
host: ${{ secrets.PROD_HOST }}
|
# host: ${{ secrets.PROD_HOST }}
|
||||||
username: ${{ secrets.PROD_USER }}
|
# username: ${{ secrets.PROD_USER }}
|
||||||
key: ${{ secrets.PROD_SSH_KEY }}
|
# key: ${{ secrets.PROD_SSH_KEY }}
|
||||||
script: |
|
# script: |
|
||||||
cd /opt/trackeep
|
# cd /opt/trackeep
|
||||||
docker-compose -f docker-compose.prod.yml pull
|
# docker-compose -f docker-compose.prod.yml pull
|
||||||
docker-compose -f docker-compose.prod.yml up -d
|
# docker-compose -f docker-compose.prod.yml up -d
|
||||||
docker system prune -f
|
# docker system prune -f
|
||||||
|
|
||||||
- name: Run health check
|
# - name: Run health check
|
||||||
run: |
|
# run: |
|
||||||
sleep 30
|
# sleep 30
|
||||||
curl -f ${{ secrets.PROD_URL }}/health || exit 1
|
# curl -f ${{ secrets.PROD_URL }}/health || exit 1
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
name: Release and Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*' # Trigger on version tags like v1.2.5
|
||||||
|
workflow_dispatch: # Allow manual triggers
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: ghcr.io/dvorinka/trackeep
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
extract-version:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.version.outputs.version }}
|
||||||
|
is-prerelease: ${{ steps.version.outputs.is-prerelease }}
|
||||||
|
steps:
|
||||||
|
- name: Extract version from tag
|
||||||
|
id: version
|
||||||
|
run: |
|
||||||
|
# Extract version from git tag (remove 'v' prefix)
|
||||||
|
VERSION=${GITHUB_REF#refs/tags/v*}
|
||||||
|
VERSION=${VERSION#refs/tags/v}
|
||||||
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
# Check if this is a prerelease (contains - or alpha/beta/rc)
|
||||||
|
if [[ $VERSION == *-* ]] || [[ $VERSION == *alpha* ]] || [[ $VERSION == *beta* ]] || [[ $VERSION == *rc* ]]; then
|
||||||
|
echo "is-prerelease=true" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "is-prerelease=false" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "🏷️ Version: $VERSION"
|
||||||
|
echo "🚀 Prerelease: ${{ steps.version.outputs.is-prerelease }}"
|
||||||
|
|
||||||
|
build-and-push:
|
||||||
|
needs: extract-version
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
service: [backend, frontend]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Login to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract metadata
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: ${{ env.REGISTRY }}/${{ matrix.service }}
|
||||||
|
tags: |
|
||||||
|
type=ref,event=tag
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=raw,value=latest,enable={{isdefault_branch}}
|
||||||
|
labels: |
|
||||||
|
version=${{ needs.extract-version.outputs.version }}
|
||||||
|
build-date=${{ github.event.head_commit.timestamp }}
|
||||||
|
commit=${{ github.sha }}
|
||||||
|
service=${{ matrix.service }}
|
||||||
|
prerelease=${{ needs.extract-version.outputs.is-prerelease }}
|
||||||
|
|
||||||
|
- name: Build and push ${{ matrix.service }}
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: |
|
||||||
|
backend=./backend
|
||||||
|
frontend=.
|
||||||
|
file: |
|
||||||
|
backend=./backend/Dockerfile
|
||||||
|
frontend=./frontend/Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
|
|
||||||
|
- name: Generate SBOM
|
||||||
|
uses: anchore/sbom-action@v0
|
||||||
|
with:
|
||||||
|
image: ${{ env.REGISTRY }}/${{ matrix.service }}:${{ needs.extract-version.outputs.version }}
|
||||||
|
format: spdx-json
|
||||||
|
output-file: ./sbom-${{ matrix.service }}.spdx.json
|
||||||
|
|
||||||
|
- name: Upload SBOM
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: sbom-${{ matrix.service }}
|
||||||
|
path: ./sbom-${{ matrix.service }}.spdx.json
|
||||||
|
|
||||||
|
create-github-release:
|
||||||
|
needs: [extract-version, build-and-push]
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: needs.extract-version.outputs.is-prerelease == 'false' # Only create releases for stable versions
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Create Release
|
||||||
|
uses: softprops/action-gh-release@v2
|
||||||
|
with:
|
||||||
|
tag: v${{ needs.extract-version.outputs.version }}
|
||||||
|
name: Trackeep v${{ needs.extract-version.outputs.version }}
|
||||||
|
body: |
|
||||||
|
## 🚀 Trackeep v${{ needs.extract-version.outputs.version }}
|
||||||
|
|
||||||
|
### 🐳 Docker Images
|
||||||
|
- **Backend**: `ghcr.io/dvorinka/trackeep/backend:${{ needs.extract-version.outputs.version }}`
|
||||||
|
- **Frontend**: `ghcr.io/dvorinka/trackeep/frontend:${{ needs.extract-version.outputs.version }}`
|
||||||
|
- **Latest**: `ghcr.io/dvorinka/trackeep/backend:latest` and `ghcr.io/dvorinka/trackeep/frontend:latest`
|
||||||
|
|
||||||
|
### 📋 Changes
|
||||||
|
${{ github.event.head_commit.message }}
|
||||||
|
|
||||||
|
### 🔧 Installation
|
||||||
|
```bash
|
||||||
|
# Set version
|
||||||
|
export APP_VERSION=${{ needs.extract-version.outputs.version }}
|
||||||
|
|
||||||
|
# Deploy with production compose
|
||||||
|
docker compose -f docker-compose.prod.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### ⚡ Auto-Updates
|
||||||
|
The application includes a built-in update system that:
|
||||||
|
- ✅ Automatically checks for updates every 24 hours
|
||||||
|
- ✅ Shows update notifications in the left navigation
|
||||||
|
- ✅ One-click installation from the UI
|
||||||
|
- ✅ No authentication or setup required
|
||||||
|
|
||||||
|
draft: false
|
||||||
|
prerelease: ${{ needs.extract-version.outputs.is-prerelease }}
|
||||||
|
files: |
|
||||||
|
sbom-backend.spdx.json
|
||||||
|
sbom-frontend.spdx.json
|
||||||
|
generate_release_notes: true
|
||||||
|
|
||||||
|
update-docker-compose-prod:
|
||||||
|
needs: extract-version
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Update version in all files
|
||||||
|
run: |
|
||||||
|
VERSION="${{ needs.extract-version.outputs.version }}"
|
||||||
|
echo "🏷️ Updating all version files to $VERSION"
|
||||||
|
|
||||||
|
# Update frontend package.json
|
||||||
|
if [ -f "frontend/package.json" ]; then
|
||||||
|
echo "📝 Updating frontend/package.json..."
|
||||||
|
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" frontend/package.json
|
||||||
|
echo "✅ Frontend updated to $VERSION"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Update backend go.mod
|
||||||
|
if [ -f "backend/go.mod" ]; then
|
||||||
|
echo "📝 Updating backend/go.mod..."
|
||||||
|
sed -i "s/go [^\"]*\"/go $VERSION/" backend/go.mod
|
||||||
|
echo "✅ Backend updated to $VERSION"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Update docker-compose files
|
||||||
|
if [ -f "docker-compose.yml" ]; then
|
||||||
|
sed -i "s/APP_VERSION=.*/APP_VERSION=$VERSION/" docker-compose.yml
|
||||||
|
echo "✅ docker-compose.yml updated"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -f "docker-compose.prod.yml" ]; then
|
||||||
|
sed -i "s/APP_VERSION=.*/APP_VERSION=$VERSION/" docker-compose.prod.yml
|
||||||
|
echo "✅ docker-compose.prod.yml updated"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "🎉 All version files updated to $VERSION"
|
||||||
|
|
||||||
|
- name: Commit updated version files
|
||||||
|
run: |
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
git add .
|
||||||
|
git commit -m "chore: Update version to ${{ needs.extract-version.outputs.version }}"
|
||||||
|
git push
|
||||||
@@ -26,6 +26,9 @@ pids
|
|||||||
*.pid
|
*.pid
|
||||||
*.seed
|
*.seed
|
||||||
*.pid.lock
|
*.pid.lock
|
||||||
|
.playwright
|
||||||
|
.playwright-cli
|
||||||
|
.desloppify
|
||||||
|
|
||||||
# Coverage directory used by tools like istanbul
|
# Coverage directory used by tools like istanbul
|
||||||
coverage/
|
coverage/
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
# Trackeep Deployment Guide
|
|
||||||
|
|
||||||
## Flexible Deployment Options
|
|
||||||
|
|
||||||
Trackeep is designed to work in various deployment scenarios:
|
|
||||||
|
|
||||||
### 1. Local Development (localhost)
|
|
||||||
```bash
|
|
||||||
# Start with default settings
|
|
||||||
docker compose up -d
|
|
||||||
|
|
||||||
# Frontend will be available via nginx on port 80
|
|
||||||
# Backend API on port 8080
|
|
||||||
# Frontend automatically detects API URL: http://localhost:8080/api/v1
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Home Network Deployment
|
|
||||||
```bash
|
|
||||||
# Set your HOST environment variable
|
|
||||||
export HOST=192.168.1.100:8080
|
|
||||||
|
|
||||||
# Or modify .env
|
|
||||||
echo "HOST=192.168.1.100:8080" >> .env
|
|
||||||
|
|
||||||
docker compose up -d
|
|
||||||
|
|
||||||
# Access from any device on your network
|
|
||||||
# Frontend: http://192.168.1.100
|
|
||||||
# API: http://192.168.1.100:8080/api/v1
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Domain with Cloudflare/Reverse Proxy
|
|
||||||
```bash
|
|
||||||
# Set HOST to your domain
|
|
||||||
export HOST=yourdomain.com
|
|
||||||
|
|
||||||
# Configure CORS for your domain
|
|
||||||
export CORS_ALLOWED_ORIGINS=https://yourdomain.com
|
|
||||||
|
|
||||||
docker compose up -d
|
|
||||||
|
|
||||||
# Configure Cloudflare to proxy:
|
|
||||||
# - yourdomain.com → backend:8080
|
|
||||||
# - app.yourdomain.com → frontend:80
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4. Production HTTPS
|
|
||||||
```bash
|
|
||||||
# Set production mode
|
|
||||||
export GIN_MODE=release
|
|
||||||
export HOST=yourdomain.com
|
|
||||||
export CORS_ALLOWED_ORIGINS=https://yourdomain.com
|
|
||||||
|
|
||||||
# Use SSL certificates (via Traefik, Nginx, etc.)
|
|
||||||
docker compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
### Core Configuration
|
|
||||||
- `PORT=8080` - Backend port only
|
|
||||||
- `GIN_MODE=debug|release` - Application mode
|
|
||||||
- `HOST=` - Auto-detection fallback (optional)
|
|
||||||
- `CORS_ALLOWED_ORIGINS=*` - Flexible CORS (restrict in production)
|
|
||||||
|
|
||||||
### Removed Variables
|
|
||||||
- ❌ `FRONTEND_PORT` - No longer needed
|
|
||||||
- ❌ `OAUTH_PORT` - Moved to oauth-service/.env
|
|
||||||
- ❌ `VITE_API_URL` - Auto-detected via /api/v1/config
|
|
||||||
|
|
||||||
### OAuth Service (Separate)
|
|
||||||
See `oauth-service/.env.example` for OAuth-specific configuration.
|
|
||||||
|
|
||||||
## API Detection
|
|
||||||
|
|
||||||
The frontend automatically detects the API URL by:
|
|
||||||
1. Calling `/api/v1/config` endpoint
|
|
||||||
2. Using the current request's scheme and host
|
|
||||||
3. Falling back to `HOST` environment variable
|
|
||||||
4. Final fallback to `localhost:8080`
|
|
||||||
|
|
||||||
## Port Management
|
|
||||||
|
|
||||||
- **Backend**: Fixed port 8080 (required for API)
|
|
||||||
- **Frontend**: No port mapping (uses nginx:80 internally)
|
|
||||||
- **OAuth**: Separate service on port 9090
|
|
||||||
- **Database**: Port 5432 (internal to Docker network)
|
|
||||||
|
|
||||||
This flexibility allows Trackeep to adapt to any deployment scenario while maintaining a consistent configuration approach.
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
# Build stage for YouTube search service
|
|
||||||
FROM golang:1.21-alpine AS builder
|
|
||||||
|
|
||||||
# Install git and other build dependencies
|
|
||||||
RUN apk add --no-cache git
|
|
||||||
|
|
||||||
# Set working directory
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy go mod files
|
|
||||||
COPY search.go ./
|
|
||||||
|
|
||||||
# Build the search service
|
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o youtube-search search.go
|
|
||||||
|
|
||||||
# Final stage
|
|
||||||
FROM alpine:latest
|
|
||||||
|
|
||||||
# Install ca-certificates for HTTPS requests
|
|
||||||
RUN apk --no-cache add ca-certificates wget
|
|
||||||
|
|
||||||
# Create non-root user
|
|
||||||
RUN addgroup -g 1001 -S appgroup && \
|
|
||||||
adduser -u 1001 -S appuser -G appgroup
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Copy the binary from builder stage
|
|
||||||
COPY --from=builder /app/youtube-search .
|
|
||||||
|
|
||||||
# Change ownership to non-root user
|
|
||||||
RUN chown appuser:appgroup youtube-search
|
|
||||||
|
|
||||||
# Switch to non-root user
|
|
||||||
USER appuser
|
|
||||||
|
|
||||||
# Expose port
|
|
||||||
EXPOSE 8090
|
|
||||||
|
|
||||||
# Health check
|
|
||||||
HEALTHCHECK --interval=30s --timeout=10s --start-period=20s --retries=3 \
|
|
||||||
CMD wget --no-verbose --tries=1 --spider http://localhost:8090/youtube?q=test || exit 1
|
|
||||||
|
|
||||||
# Run the binary
|
|
||||||
CMD ["./youtube-search"]
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
/* global chrome */
|
|
||||||
|
|
||||||
// Create context menu when extension is installed
|
|
||||||
chrome.runtime.onInstalled.addListener(() => {
|
|
||||||
chrome.contextMenus.create({
|
|
||||||
id: 'save-to-trackeep',
|
|
||||||
title: 'Save to Trackeep',
|
|
||||||
contexts: ['page', 'link', 'selection', 'image', 'video']
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Handle context menu click
|
|
||||||
chrome.contextMenus.onClicked.addListener(async (info, tab) => {
|
|
||||||
if (info.menuItemId !== 'save-to-trackeep') return;
|
|
||||||
|
|
||||||
// Open popup with pre-filled data based on context
|
|
||||||
const url = info.linkUrl || info.srcUrl || tab?.url || '';
|
|
||||||
const title = tab?.title || '';
|
|
||||||
const selection = info.selectionText || '';
|
|
||||||
|
|
||||||
// Store temporary data for popup to read
|
|
||||||
chrome.storage.local.set({
|
|
||||||
contextMenuData: {
|
|
||||||
url,
|
|
||||||
title,
|
|
||||||
selection,
|
|
||||||
timestamp: Date.now()
|
|
||||||
}
|
|
||||||
}, () => {
|
|
||||||
// Open the popup (or focus it if already open)
|
|
||||||
chrome.action.openPopup();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 40 KiB |
@@ -1,264 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en" data-kb-theme="dark">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<title>Trackeep Saver – Options</title>
|
|
||||||
<style>
|
|
||||||
/* Complete Inter Font Faces - Exact Papra */
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-400-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-400-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-500-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-500-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 600;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-600-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-600-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 700;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-700-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-700-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Exact Papra CSS variables and dark theme (hex fallbacks for clarity) */
|
|
||||||
:root {
|
|
||||||
--background: 26 26 26;
|
|
||||||
--foreground: 250 250 250;
|
|
||||||
--card: 32 32 32;
|
|
||||||
--card-foreground: 250 250 250;
|
|
||||||
--popover: 32 32 32;
|
|
||||||
--popover-foreground: 250 250 250;
|
|
||||||
--primary: 217 70.2% 91.2%;
|
|
||||||
--primary-foreground: 250 250 250;
|
|
||||||
--secondary: 39 39 42;
|
|
||||||
--secondary-foreground: 250 250 250;
|
|
||||||
--muted: 39 39 42;
|
|
||||||
--muted-foreground: 163 163 163;
|
|
||||||
--accent: 39 39 42;
|
|
||||||
--accent-foreground: 250 250 250;
|
|
||||||
--destructive: 0 62.8% 30.6%;
|
|
||||||
--destructive-foreground: 250 250 250;
|
|
||||||
--border: 39 39 42;
|
|
||||||
--input: 39 39 42;
|
|
||||||
--ring: 217 70.2% 91.2%;
|
|
||||||
--radius: 0.5rem;
|
|
||||||
/* Hex fallbacks for readability */
|
|
||||||
--bg-hex: #1a1a1a;
|
|
||||||
--card-hex: #202020;
|
|
||||||
--input-hex: #27272a;
|
|
||||||
--border-hex: #27272a;
|
|
||||||
--muted-hex: #27272a;
|
|
||||||
--text-hex: #fafafa;
|
|
||||||
--muted-text-hex: #a3a3a3;
|
|
||||||
--primary-hex: #60a5fa;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
margin: 0;
|
|
||||||
padding: 20px;
|
|
||||||
max-width: 640px;
|
|
||||||
background: var(--bg-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
line-height: 1.6;
|
|
||||||
color-scheme: dark;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 24px;
|
|
||||||
font-weight: 600;
|
|
||||||
margin: 0 0 8px 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
width: 32px;
|
|
||||||
height: 32px;
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
background: var(--primary-hex);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
color: var(--text-hex);
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
font-size: 14px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
margin: 0 0 24px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section {
|
|
||||||
background: var(--card-hex);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 20px;
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-title {
|
|
||||||
font-size: 16px;
|
|
||||||
font-weight: 600;
|
|
||||||
margin: 0 0 16px 0;
|
|
||||||
color: var(--text-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
display: block;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 500;
|
|
||||||
margin: 0 0 6px 0;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type="text"],
|
|
||||||
input[type="url"],
|
|
||||||
input[type="password"] {
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
padding: 10px 14px;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
background: var(--input-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
font-size: 14px;
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
font-weight: 400;
|
|
||||||
transition: border-color 0.15s, background 0.15s;
|
|
||||||
}
|
|
||||||
|
|
||||||
input:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: var(--primary-hex);
|
|
||||||
background: var(--card-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
cursor: pointer;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
border: none;
|
|
||||||
padding: 10px 18px;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 500;
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
background: var(--primary-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
opacity: 0.9;
|
|
||||||
transform: translateY(-1px);
|
|
||||||
}
|
|
||||||
|
|
||||||
button:disabled {
|
|
||||||
opacity: 0.5;
|
|
||||||
cursor: default;
|
|
||||||
transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status {
|
|
||||||
margin-top: 12px;
|
|
||||||
font-size: 13px;
|
|
||||||
padding: 8px 12px;
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
background: var(--muted-hex);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
.status.success {
|
|
||||||
color: var(--primary-hex);
|
|
||||||
border-color: var(--primary-hex);
|
|
||||||
background: color-mix(in srgb, var(--primary-hex) 10%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.status.error {
|
|
||||||
color: #ef4444;
|
|
||||||
border-color: #ef4444;
|
|
||||||
background: color-mix(in srgb, #ef4444 10%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
code {
|
|
||||||
background: var(--input-hex);
|
|
||||||
padding: 2px 6px;
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--text-hex);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
.instructions {
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
margin-top: 6px;
|
|
||||||
line-height: 1.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.instructions strong {
|
|
||||||
color: var(--text-hex);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>
|
|
||||||
<div class="logo">T</div>
|
|
||||||
Trackeep Saver – Options
|
|
||||||
</h1>
|
|
||||||
<p>Configure how the extension connects to your Trackeep backend.</p>
|
|
||||||
|
|
||||||
<div class="section">
|
|
||||||
<div class="section-title">API Configuration</div>
|
|
||||||
<label for="apiBaseUrl">Trackeep API base URL (must include <code>/api/v1</code>)</label>
|
|
||||||
<input
|
|
||||||
id="apiBaseUrl"
|
|
||||||
type="url"
|
|
||||||
placeholder="https://your-domain.example.com/api/v1 or http://localhost:8080/api/v1"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<label for="authToken">Auth token (JWT)</label>
|
|
||||||
<input
|
|
||||||
id="authToken"
|
|
||||||
type="password"
|
|
||||||
placeholder="Paste your Trackeep token (trackeep_token) here"
|
|
||||||
/>
|
|
||||||
<div class="instructions">
|
|
||||||
<strong>How to get your token:</strong><br>
|
|
||||||
1. Log into Trackeep in your browser.<br>
|
|
||||||
2. Open DevTools → Application → Local Storage.<br>
|
|
||||||
3. Find the key <code>trackeep_token</code> and copy its value.<br>
|
|
||||||
4. Paste it above. Never share this token publicly.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button id="saveBtn" style="margin-top:20px;">💾 Save settings</button>
|
|
||||||
<div id="status" class="status"></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="options.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
/* global chrome */
|
|
||||||
|
|
||||||
const apiBaseUrlInput = document.getElementById('apiBaseUrl');
|
|
||||||
const authTokenInput = document.getElementById('authToken');
|
|
||||||
const saveBtn = document.getElementById('saveBtn');
|
|
||||||
const statusEl = document.getElementById('status');
|
|
||||||
|
|
||||||
function setStatus(message, type) {
|
|
||||||
statusEl.textContent = message || '';
|
|
||||||
statusEl.classList.remove('success', 'error');
|
|
||||||
if (type) {
|
|
||||||
statusEl.classList.add(type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function detectAndPrefillApiBaseUrl(callback) {
|
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
|
||||||
const tab = tabs && tabs[0];
|
|
||||||
if (!tab || !tab.url) {
|
|
||||||
if (callback) callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const url = new URL(tab.url);
|
|
||||||
const isTrackeepDomain = url.hostname.includes('trackeep') || url.hostname === 'localhost';
|
|
||||||
if (isTrackeepDomain && (url.protocol === 'https:' || url.protocol === 'http:')) {
|
|
||||||
const candidate = `${url.origin}/api/v1`;
|
|
||||||
chrome.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
|
||||||
if (!items.trackeepApiBaseUrl) {
|
|
||||||
apiBaseUrlInput.value = candidate;
|
|
||||||
}
|
|
||||||
if (callback) callback();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// Fallback to localhost if nothing set
|
|
||||||
chrome.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
|
||||||
if (!items.trackeepApiBaseUrl) {
|
|
||||||
apiBaseUrlInput.value = 'http://localhost:8080/api/v1';
|
|
||||||
}
|
|
||||||
if (callback) callback();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
if (callback) callback();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadSettings() {
|
|
||||||
chrome.storage.sync.get(['trackeepApiBaseUrl', 'trackeepAuthToken'], (items) => {
|
|
||||||
if (items.trackeepApiBaseUrl) {
|
|
||||||
apiBaseUrlInput.value = items.trackeepApiBaseUrl;
|
|
||||||
}
|
|
||||||
if (items.trackeepAuthToken) {
|
|
||||||
authTokenInput.value = items.trackeepAuthToken;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function saveSettings() {
|
|
||||||
const apiBaseUrl = apiBaseUrlInput.value.trim();
|
|
||||||
const authToken = authTokenInput.value.trim();
|
|
||||||
|
|
||||||
if (!apiBaseUrl) {
|
|
||||||
setStatus('API base URL is required.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!authToken) {
|
|
||||||
setStatus('Auth token is required.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
saveBtn.disabled = true;
|
|
||||||
setStatus('Saving…', null);
|
|
||||||
|
|
||||||
chrome.storage.sync.set(
|
|
||||||
{
|
|
||||||
trackeepApiBaseUrl: apiBaseUrl,
|
|
||||||
trackeepAuthToken: authToken
|
|
||||||
},
|
|
||||||
() => {
|
|
||||||
saveBtn.disabled = false;
|
|
||||||
if (chrome.runtime.lastError) {
|
|
||||||
setStatus(`Failed to save: ${chrome.runtime.lastError.message}`, 'error');
|
|
||||||
} else {
|
|
||||||
setStatus('Settings saved. You can now use the popup to save bookmarks and files.', 'success');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Init
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
|
||||||
detectAndPrefillApiBaseUrl(() => {
|
|
||||||
loadSettings();
|
|
||||||
saveBtn.addEventListener('click', (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
saveSettings();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,314 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en" data-kb-theme="dark">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<title>Trackeep Saver</title>
|
|
||||||
<style>
|
|
||||||
/* Complete Inter Font Faces - Exact Papra */
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 400;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-400-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-400-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-500-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-500-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 600;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-600-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-600-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
@font-face {
|
|
||||||
font-family: Inter;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 700;
|
|
||||||
font-stretch: 100%;
|
|
||||||
font-display: swap;
|
|
||||||
src: url(https://fonts.bunny.net/inter/files/inter-latin-700-normal.woff2) format("woff2"),url(https://fonts.bunny.net/inter/files/inter-latin-700-normal.woff) format("woff");
|
|
||||||
unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Exact Papra CSS variables and dark theme (hex fallbacks for clarity) */
|
|
||||||
:root {
|
|
||||||
--background: 26 26 26;
|
|
||||||
--foreground: 250 250 250;
|
|
||||||
--card: 32 32 32;
|
|
||||||
--card-foreground: 250 250 250;
|
|
||||||
--popover: 32 32 32;
|
|
||||||
--popover-foreground: 250 250 250;
|
|
||||||
--primary: 217 70.2% 91.2%;
|
|
||||||
--primary-foreground: 250 250 250;
|
|
||||||
--secondary: 39 39 42;
|
|
||||||
--secondary-foreground: 250 250 250;
|
|
||||||
--muted: 39 39 42;
|
|
||||||
--muted-foreground: 163 163 163;
|
|
||||||
--accent: 39 39 42;
|
|
||||||
--accent-foreground: 250 250 250;
|
|
||||||
--destructive: 0 62.8% 30.6%;
|
|
||||||
--destructive-foreground: 250 250 250;
|
|
||||||
--border: 39 39 42;
|
|
||||||
--input: 39 39 42;
|
|
||||||
--ring: 217 70.2% 91.2%;
|
|
||||||
--radius: 0.5rem;
|
|
||||||
/* Hex fallbacks for readability */
|
|
||||||
--bg-hex: #1a1a1a;
|
|
||||||
--card-hex: #202020;
|
|
||||||
--input-hex: #27272a;
|
|
||||||
--border-hex: #27272a;
|
|
||||||
--muted-hex: #27272a;
|
|
||||||
--text-hex: #fafafa;
|
|
||||||
--muted-text-hex: #a3a3a3;
|
|
||||||
--primary-hex: #60a5fa;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
margin: 0;
|
|
||||||
padding: 16px;
|
|
||||||
min-width: 380px;
|
|
||||||
max-width: 420px;
|
|
||||||
background: var(--bg-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
line-height: 1.6;
|
|
||||||
color-scheme: dark;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 18px;
|
|
||||||
font-weight: 600;
|
|
||||||
margin: 0 0 12px 0;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.logo {
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
background: var(--primary-hex);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
color: var(--text-hex);
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.hint {
|
|
||||||
font-size: 12px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
margin-bottom: 12px;
|
|
||||||
padding: 6px 10px;
|
|
||||||
background: var(--muted-hex);
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
.section-title {
|
|
||||||
font-size: 13px;
|
|
||||||
font-weight: 600;
|
|
||||||
margin: 16px 0 6px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: 0.05em;
|
|
||||||
}
|
|
||||||
|
|
||||||
label {
|
|
||||||
display: block;
|
|
||||||
font-size: 13px;
|
|
||||||
font-weight: 500;
|
|
||||||
margin-bottom: 4px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type="text"],
|
|
||||||
input[type="url"],
|
|
||||||
input[type="file"],
|
|
||||||
textarea {
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
padding: 8px 12px;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
background: var(--input-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
font-size: 13px;
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
font-weight: 400;
|
|
||||||
transition: border-color 0.15s, background 0.15s;
|
|
||||||
}
|
|
||||||
|
|
||||||
input:focus,
|
|
||||||
textarea:focus {
|
|
||||||
outline: none;
|
|
||||||
border-color: var(--primary-hex);
|
|
||||||
background: var(--card-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
textarea {
|
|
||||||
resize: vertical;
|
|
||||||
min-height: 56px;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
cursor: pointer;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
border: none;
|
|
||||||
padding: 8px 16px;
|
|
||||||
font-size: 13px;
|
|
||||||
font-weight: 500;
|
|
||||||
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
|
|
||||||
background: var(--primary-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:hover {
|
|
||||||
opacity: 0.9;
|
|
||||||
transform: translateY(-1px);
|
|
||||||
}
|
|
||||||
|
|
||||||
button.secondary {
|
|
||||||
background: var(--muted-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
button.secondary:hover {
|
|
||||||
background: var(--border-hex);
|
|
||||||
color: var(--text-hex);
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:disabled {
|
|
||||||
opacity: 0.5;
|
|
||||||
cursor: default;
|
|
||||||
transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.row {
|
|
||||||
display: flex;
|
|
||||||
gap: 10px;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.row > * {
|
|
||||||
flex: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox-row {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--muted-text-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
.checkbox-row input[type="checkbox"] {
|
|
||||||
width: auto;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.status {
|
|
||||||
font-size: 12px;
|
|
||||||
margin-top: 12px;
|
|
||||||
min-height: 18px;
|
|
||||||
padding: 6px 10px;
|
|
||||||
border-radius: calc(var(--radius) * 0.5);
|
|
||||||
background: var(--muted-hex);
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
}
|
|
||||||
|
|
||||||
.status.error {
|
|
||||||
color: #ef4444;
|
|
||||||
border-color: #ef4444;
|
|
||||||
background: color-mix(in srgb, #ef4444 10%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.status.success {
|
|
||||||
color: var(--primary-hex);
|
|
||||||
border-color: var(--primary-hex);
|
|
||||||
background: color-mix(in srgb, var(--primary-hex) 10%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: none;
|
|
||||||
border-top: 1px solid var(--border-hex);
|
|
||||||
margin: 16px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form-section {
|
|
||||||
background: var(--card-hex);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 14px;
|
|
||||||
border: 1px solid var(--border-hex);
|
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>
|
|
||||||
<div class="logo">T</div>
|
|
||||||
Trackeep Saver
|
|
||||||
</h1>
|
|
||||||
<div class="hint" id="configHint"></div>
|
|
||||||
|
|
||||||
<button id="openOptions" class="secondary" style="width:100%; margin-bottom:12px;">⚙️ Open Options</button>
|
|
||||||
|
|
||||||
<div class="form-section">
|
|
||||||
<div class="section-title">Save current page / video</div>
|
|
||||||
<label for="bookmarkTitle">Title</label>
|
|
||||||
<input id="bookmarkTitle" type="text" />
|
|
||||||
|
|
||||||
<label for="bookmarkUrl">URL</label>
|
|
||||||
<input id="bookmarkUrl" type="url" required />
|
|
||||||
|
|
||||||
<label for="bookmarkDescription">Description (optional)</label>
|
|
||||||
<textarea id="bookmarkDescription" placeholder="Why is this page or video important?"></textarea>
|
|
||||||
|
|
||||||
<label for="bookmarkTags">Tags (comma-separated, optional)</label>
|
|
||||||
<input id="bookmarkTags" type="text" placeholder="reading, video, dev" />
|
|
||||||
|
|
||||||
<div class="row" style="margin-top:12px; justify-content: space-between;">
|
|
||||||
<div class="checkbox-row">
|
|
||||||
<input id="bookmarkPublic" type="checkbox" />
|
|
||||||
<label for="bookmarkPublic" style="margin:0; font-weight:400;">Public</label>
|
|
||||||
</div>
|
|
||||||
<button type="submit" id="saveBookmarkBtn">💾 Save bookmark</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<hr />
|
|
||||||
|
|
||||||
<div class="form-section">
|
|
||||||
<div class="section-title">Upload file to Trackeep</div>
|
|
||||||
<label for="fileInput">File</label>
|
|
||||||
<input id="fileInput" type="file" />
|
|
||||||
|
|
||||||
<label for="fileDescription">Description (optional)</label>
|
|
||||||
<textarea id="fileDescription" placeholder="Short description for this file"></textarea>
|
|
||||||
|
|
||||||
<div style="margin-top:12px; text-align:right;">
|
|
||||||
<button type="submit" id="uploadFileBtn">📤 Upload file</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="status" class="status"></div>
|
|
||||||
|
|
||||||
<script src="popup.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,284 +0,0 @@
|
|||||||
/* global chrome */
|
|
||||||
|
|
||||||
const statusEl = document.getElementById('status');
|
|
||||||
const configHintEl = document.getElementById('configHint');
|
|
||||||
const openOptionsBtn = document.getElementById('openOptions');
|
|
||||||
|
|
||||||
const bookmarkTitleInput = document.getElementById('bookmarkTitle');
|
|
||||||
const bookmarkUrlInput = document.getElementById('bookmarkUrl');
|
|
||||||
const bookmarkDescriptionInput = document.getElementById('bookmarkDescription');
|
|
||||||
const bookmarkTagsInput = document.getElementById('bookmarkTags');
|
|
||||||
const bookmarkPublicInput = document.getElementById('bookmarkPublic');
|
|
||||||
const saveBookmarkBtn = document.getElementById('saveBookmarkBtn');
|
|
||||||
|
|
||||||
const fileInput = document.getElementById('fileInput');
|
|
||||||
const fileDescriptionInput = document.getElementById('fileDescription');
|
|
||||||
const uploadFileBtn = document.getElementById('uploadFileBtn');
|
|
||||||
|
|
||||||
let trackeepConfig = {
|
|
||||||
apiBaseUrl: '',
|
|
||||||
authToken: ''
|
|
||||||
};
|
|
||||||
|
|
||||||
function setStatus(message, type) {
|
|
||||||
statusEl.textContent = message || '';
|
|
||||||
statusEl.classList.remove('error', 'success');
|
|
||||||
if (type) {
|
|
||||||
statusEl.classList.add(type);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function disableForms(disabled) {
|
|
||||||
[bookmarkTitleInput, bookmarkUrlInput, bookmarkDescriptionInput, bookmarkTagsInput, bookmarkPublicInput, saveBookmarkBtn,
|
|
||||||
fileInput, fileDescriptionInput, uploadFileBtn].forEach((el) => {
|
|
||||||
if (!el) return;
|
|
||||||
el.disabled = disabled;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadConfig(callback) {
|
|
||||||
chrome.storage.sync.get(['trackeepApiBaseUrl', 'trackeepAuthToken'], (items) => {
|
|
||||||
const apiBaseUrl = (items.trackeepApiBaseUrl || '').trim();
|
|
||||||
const authToken = (items.trackeepAuthToken || '').trim();
|
|
||||||
|
|
||||||
trackeepConfig = { apiBaseUrl, authToken };
|
|
||||||
|
|
||||||
if (!apiBaseUrl || !authToken) {
|
|
||||||
configHintEl.textContent = 'Configure API URL and token in Options to enable saving.';
|
|
||||||
disableForms(true);
|
|
||||||
} else {
|
|
||||||
configHintEl.textContent = `Using API: ${apiBaseUrl}`;
|
|
||||||
disableForms(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof callback === 'function') {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function detectTrackeepDomain(callback) {
|
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
|
||||||
const tab = tabs && tabs[0];
|
|
||||||
if (!tab || !tab.url) {
|
|
||||||
if (callback) callback();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const url = new URL(tab.url);
|
|
||||||
// Common Trackeep domains: localhost, trackeep.*, etc.
|
|
||||||
const isTrackeepDomain = url.hostname.includes('trackeep') || url.hostname === 'localhost';
|
|
||||||
if (isTrackeepDomain && url.protocol === 'https:') {
|
|
||||||
const candidate = `${url.origin}/api/v1`;
|
|
||||||
// Only pre-fill if not already set
|
|
||||||
chrome.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
|
||||||
if (!items.trackeepApiBaseUrl) {
|
|
||||||
chrome.storage.sync.set({ trackeepApiBaseUrl: candidate }, () => {
|
|
||||||
console.log('Auto-detected Trackeep API URL:', candidate);
|
|
||||||
if (callback) callback();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
if (callback) callback();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
if (callback) callback();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
if (callback) callback();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function initActiveTab() {
|
|
||||||
chrome.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
|
||||||
const tab = tabs && tabs[0];
|
|
||||||
if (!tab) return;
|
|
||||||
|
|
||||||
// Check for context menu data first
|
|
||||||
chrome.storage.local.get(['contextMenuData'], (items) => {
|
|
||||||
const ctx = items.contextMenuData;
|
|
||||||
if (ctx && ctx.timestamp && Date.now() - ctx.timestamp < 5000) {
|
|
||||||
// Use context menu data if recent
|
|
||||||
if (ctx.url && !bookmarkUrlInput.value) {
|
|
||||||
bookmarkUrlInput.value = ctx.url;
|
|
||||||
}
|
|
||||||
if (ctx.title && !bookmarkTitleInput.value) {
|
|
||||||
bookmarkTitleInput.value = ctx.title;
|
|
||||||
}
|
|
||||||
if (ctx.selection && !bookmarkDescriptionInput.value) {
|
|
||||||
bookmarkDescriptionInput.value = ctx.selection;
|
|
||||||
}
|
|
||||||
// Clear after using
|
|
||||||
chrome.storage.local.remove(['contextMenuData']);
|
|
||||||
} else {
|
|
||||||
// Fallback to active tab
|
|
||||||
if (tab.title && !bookmarkTitleInput.value) {
|
|
||||||
bookmarkTitleInput.value = tab.title;
|
|
||||||
}
|
|
||||||
if (tab.url && !bookmarkUrlInput.value) {
|
|
||||||
bookmarkUrlInput.value = tab.url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveBookmark(event) {
|
|
||||||
event.preventDefault();
|
|
||||||
setStatus('', null);
|
|
||||||
|
|
||||||
const { apiBaseUrl, authToken } = trackeepConfig;
|
|
||||||
if (!apiBaseUrl || !authToken) {
|
|
||||||
setStatus('Missing API URL or auth token. Open options first.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = bookmarkUrlInput.value.trim();
|
|
||||||
if (!url) {
|
|
||||||
setStatus('URL is required.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const title = bookmarkTitleInput.value.trim() || url;
|
|
||||||
const description = bookmarkDescriptionInput.value.trim();
|
|
||||||
const tagsRaw = bookmarkTagsInput.value.trim();
|
|
||||||
const isPublic = !!bookmarkPublicInput.checked;
|
|
||||||
|
|
||||||
const tags = tagsRaw
|
|
||||||
? tagsRaw.split(',').map((t) => t.trim()).filter(Boolean)
|
|
||||||
: [];
|
|
||||||
|
|
||||||
const payload = {
|
|
||||||
title,
|
|
||||||
url,
|
|
||||||
description,
|
|
||||||
tags,
|
|
||||||
is_public: isPublic
|
|
||||||
};
|
|
||||||
|
|
||||||
saveBookmarkBtn.disabled = true;
|
|
||||||
setStatus('Saving bookmark…', null);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const base = apiBaseUrl.replace(/\/$/, '');
|
|
||||||
const response = await fetch(`${base}/bookmarks`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
'Authorization': `Bearer ${authToken}`
|
|
||||||
},
|
|
||||||
body: JSON.stringify(payload)
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
let errorMessage = `Failed to save bookmark (status ${response.status})`;
|
|
||||||
try {
|
|
||||||
const data = await response.json();
|
|
||||||
if (data && data.error) {
|
|
||||||
errorMessage = data.error;
|
|
||||||
}
|
|
||||||
} catch (_) {
|
|
||||||
// ignore JSON parse errors
|
|
||||||
}
|
|
||||||
throw new Error(errorMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
setStatus('Bookmark saved to Trackeep.', 'success');
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Error saving bookmark', err);
|
|
||||||
setStatus(err && err.message ? err.message : 'Failed to save bookmark.', 'error');
|
|
||||||
} finally {
|
|
||||||
saveBookmarkBtn.disabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function uploadFile(event) {
|
|
||||||
event.preventDefault();
|
|
||||||
setStatus('', null);
|
|
||||||
|
|
||||||
const { apiBaseUrl, authToken } = trackeepConfig;
|
|
||||||
if (!apiBaseUrl || !authToken) {
|
|
||||||
setStatus('Missing API URL or auth token. Open options first.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const file = fileInput.files && fileInput.files[0];
|
|
||||||
if (!file) {
|
|
||||||
setStatus('Please choose a file to upload.', 'error');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const description = fileDescriptionInput.value.trim();
|
|
||||||
|
|
||||||
const formData = new FormData();
|
|
||||||
formData.append('file', file, file.name);
|
|
||||||
if (description) {
|
|
||||||
formData.append('description', description);
|
|
||||||
}
|
|
||||||
|
|
||||||
uploadFileBtn.disabled = true;
|
|
||||||
setStatus('Uploading file…', null);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const base = apiBaseUrl.replace(/\/$/, '');
|
|
||||||
const response = await fetch(`${base}/files/upload`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Authorization': `Bearer ${authToken}`
|
|
||||||
},
|
|
||||||
body: formData
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
let errorMessage = `Failed to upload file (status ${response.status})`;
|
|
||||||
try {
|
|
||||||
const data = await response.json();
|
|
||||||
if (data && data.error) {
|
|
||||||
errorMessage = data.error;
|
|
||||||
}
|
|
||||||
} catch (_) {
|
|
||||||
// ignore JSON parse errors
|
|
||||||
}
|
|
||||||
throw new Error(errorMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
setStatus('File uploaded to Trackeep.', 'success');
|
|
||||||
fileInput.value = '';
|
|
||||||
fileDescriptionInput.value = '';
|
|
||||||
} catch (err) {
|
|
||||||
console.error('Error uploading file', err);
|
|
||||||
setStatus(err && err.message ? err.message : 'Failed to upload file.', 'error');
|
|
||||||
} finally {
|
|
||||||
uploadFileBtn.disabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openOptions() {
|
|
||||||
if (chrome.runtime.openOptionsPage) {
|
|
||||||
chrome.runtime.openOptionsPage();
|
|
||||||
} else {
|
|
||||||
window.open(chrome.runtime.getURL('options.html'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Init
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
|
||||||
openOptionsBtn.addEventListener('click', openOptions);
|
|
||||||
saveBookmarkBtn.addEventListener('click', (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
saveBookmark(e);
|
|
||||||
});
|
|
||||||
uploadFileBtn.addEventListener('click', (e) => {
|
|
||||||
e.preventDefault();
|
|
||||||
uploadFile(e);
|
|
||||||
});
|
|
||||||
|
|
||||||
detectTrackeepDomain(() => {
|
|
||||||
loadConfig(() => {
|
|
||||||
initActiveTab();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -2,7 +2,7 @@ version: '3.8'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
oauth-service:
|
oauth-service:
|
||||||
build: ./oauth-service
|
build: .
|
||||||
container_name: github-oauth-service
|
container_name: github-oauth-service
|
||||||
ports:
|
ports:
|
||||||
- "9090:9090"
|
- "9090:9090"
|
||||||
@@ -17,7 +17,7 @@ services:
|
|||||||
- DEFAULT_CLIENT_URL=http://localhost:5173
|
- DEFAULT_CLIENT_URL=http://localhost:5173
|
||||||
- GITHUB_WEBHOOK_SECRET=${GITHUB_WEBHOOK_SECRET}
|
- GITHUB_WEBHOOK_SECRET=${GITHUB_WEBHOOK_SECRET}
|
||||||
volumes:
|
volumes:
|
||||||
- ./oauth-service/.env:/app/.env:ro
|
- ./.env:/app/.env:ro
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- oauth-network
|
- oauth-network
|
||||||
|
|||||||
@@ -12,8 +12,12 @@
|
|||||||
<p align="center">
|
<p align="center">
|
||||||
<a href="#quick-start">Quick Start</a>
|
<a href="#quick-start">Quick Start</a>
|
||||||
<span> • </span>
|
<span> • </span>
|
||||||
|
<a href="#screenshots">Screenshots</a>
|
||||||
|
<span> • </span>
|
||||||
<a href="#features">Features</a>
|
<a href="#features">Features</a>
|
||||||
<span> • </span>
|
<span> • </span>
|
||||||
|
<a href="#releases">Releases</a>
|
||||||
|
<span> • </span>
|
||||||
<a href="#tech-stack">Tech Stack</a>
|
<a href="#tech-stack">Tech Stack</a>
|
||||||
<span> • </span>
|
<span> • </span>
|
||||||
<a href="#documentation">Documentation</a>
|
<a href="#documentation">Documentation</a>
|
||||||
@@ -25,6 +29,212 @@
|
|||||||
<img src="./scorecard.png" alt="Code Quality Score" width="100%">
|
<img src="./scorecard.png" alt="Code Quality Score" width="100%">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
## 🚀 Quick Start
|
||||||
|
|
||||||
|
### Production Deployment with Docker Compose
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/dvorinka/trackeep.git
|
||||||
|
cd trackeep
|
||||||
|
cp .env.example .env
|
||||||
|
# Edit .env file with your configuration
|
||||||
|
docker-compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
The `docker-compose.prod.yml` file uses environment variables with sensible defaults:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
version: '3.8'
|
||||||
|
services:
|
||||||
|
trackeep-frontend:
|
||||||
|
image: 'ghcr.io/dvorinka/trackeep/frontend:latest'
|
||||||
|
ports:
|
||||||
|
- '80:80'
|
||||||
|
- '443:443'
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=production
|
||||||
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
depends_on:
|
||||||
|
- trackeep-backend
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- trackeep-network
|
||||||
|
trackeep-backend:
|
||||||
|
image: 'ghcr.io/dvorinka/trackeep/backend:latest'
|
||||||
|
ports:
|
||||||
|
- '8080:8080'
|
||||||
|
environment:
|
||||||
|
- PORT=${PORT:-8080}
|
||||||
|
- GIN_MODE=${GIN_MODE:-release}
|
||||||
|
- READ_TIMEOUT=${READ_TIMEOUT:-15s}
|
||||||
|
- WRITE_TIMEOUT=${WRITE_TIMEOUT:-15s}
|
||||||
|
- IDLE_TIMEOUT=${IDLE_TIMEOUT:-60s}
|
||||||
|
- SHUTDOWN_TIMEOUT=${SHUTDOWN_TIMEOUT:-30s}
|
||||||
|
- DB_TYPE=${DB_TYPE:-postgres}
|
||||||
|
- DB_HOST=${DB_HOST:-postgres}
|
||||||
|
- DB_PORT=${DB_PORT:-5432}
|
||||||
|
- DB_USER=${DB_USER:-trackeep}
|
||||||
|
- DB_PASSWORD=${DB_PASSWORD}
|
||||||
|
- DB_NAME=${DB_NAME:-trackeep}
|
||||||
|
- DB_SSL_MODE=${DB_SSL_MODE:-disable}
|
||||||
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
||||||
|
- ENCRYPTION_KEY=${ENCRYPTION_KEY}
|
||||||
|
- UPLOAD_DIR=${UPLOAD_DIR:-./uploads}
|
||||||
|
- MAX_FILE_SIZE=${MAX_FILE_SIZE:-10485760}
|
||||||
|
- 'CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-*}'
|
||||||
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
- SEARCH_API_PROVIDER=${SEARCH_API_PROVIDER:-demo}
|
||||||
|
- SEARCH_RESULTS_LIMIT=${SEARCH_RESULTS_LIMIT:-10}
|
||||||
|
- SEARCH_CACHE_TTL=${SEARCH_CACHE_TTL:-300}
|
||||||
|
- SEARCH_RATE_LIMIT=${SEARCH_RATE_LIMIT:-100}
|
||||||
|
- 'OAUTH_SERVICE_URL=${OAUTH_SERVICE_URL:-http://localhost:9090}'
|
||||||
|
- AUTO_UPDATE_CHECK=${AUTO_UPDATE_CHECK:-false}
|
||||||
|
- UPDATE_CHECK_INTERVAL=${UPDATE_CHECK_INTERVAL:-24h}
|
||||||
|
- PRERELEASE_UPDATES=${PRERELEASE_UPDATES:-false}
|
||||||
|
volumes:
|
||||||
|
- './data:/data'
|
||||||
|
- './uploads:/app/uploads'
|
||||||
|
- './logs:/app/logs'
|
||||||
|
- '/var/run/docker.sock:/var/run/docker.sock'
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- trackeep-network
|
||||||
|
healthcheck:
|
||||||
|
test:
|
||||||
|
- CMD
|
||||||
|
- wget
|
||||||
|
- '--no-verbose'
|
||||||
|
- '--tries=1'
|
||||||
|
- '--spider'
|
||||||
|
- 'http://localhost:8080/health'
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 40s
|
||||||
|
postgres:
|
||||||
|
image: 'postgres:15-alpine'
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB:-trackeep}
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER:-trackeep}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
volumes:
|
||||||
|
- 'postgres_data:/var/lib/postgresql/data'
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- trackeep-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-trackeep} -d ${POSTGRES_DB:-trackeep}"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres_data: null
|
||||||
|
|
||||||
|
networks:
|
||||||
|
trackeep-network:
|
||||||
|
driver: bridge
|
||||||
|
```
|
||||||
|
|
||||||
|
### Service Architecture
|
||||||
|
|
||||||
|
Trackeep production deployment consists of **3 essential services**:
|
||||||
|
|
||||||
|
#### **🎯 Frontend Service**
|
||||||
|
- **Image**: `ghcr.io/dvorinka/trackeep/frontend:latest`
|
||||||
|
- **Ports**: `80:80`, `443:443`
|
||||||
|
- **Purpose**: Web interface and user experience
|
||||||
|
- **Health**: Depends on backend service
|
||||||
|
|
||||||
|
#### **🔧 Backend Service**
|
||||||
|
- **Image**: `ghcr.io/dvorinka/trackeep/backend:latest`
|
||||||
|
- **Ports**: `8080:8080`
|
||||||
|
- **Purpose**: API server and business logic
|
||||||
|
- **Health**: Built-in health check endpoint
|
||||||
|
|
||||||
|
#### **🗄️ Database Service**
|
||||||
|
- **Image**: `postgres:15-alpine`
|
||||||
|
- **Purpose**: Data persistence and storage
|
||||||
|
- **Health**: PostgreSQL readiness check
|
||||||
|
- **Storage**: Persistent volume for data
|
||||||
|
|
||||||
|
### Required Environment Variables
|
||||||
|
|
||||||
|
Create a `.env` file from the provided `.env.example` and configure these required variables:
|
||||||
|
|
||||||
|
```env
|
||||||
|
# Database Configuration
|
||||||
|
DB_PASSWORD=your_secure_password
|
||||||
|
POSTGRES_PASSWORD=your_secure_password
|
||||||
|
|
||||||
|
# Security Configuration
|
||||||
|
JWT_SECRET=your_jwt_secret_key
|
||||||
|
ENCRYPTION_KEY=your_32_character_encryption_key
|
||||||
|
```
|
||||||
|
|
||||||
|
### AI Services Configuration
|
||||||
|
|
||||||
|
AI services are now configured **only within the Trackeep application**. No environment variables are needed for AI configuration. Simply:
|
||||||
|
|
||||||
|
1. Start Trackeep with the basic configuration above
|
||||||
|
2. Navigate to Settings → AI Services in the application
|
||||||
|
3. Add your API tokens and configure AI providers in the app interface
|
||||||
|
4. Enable/disable AI services as needed through the app settings
|
||||||
|
|
||||||
|
### Version Management
|
||||||
|
|
||||||
|
Trackeep uses GitHub Docker images with the `:latest` tag. The application version is automatically managed through the Docker image tags and update checking is handled through the OAuth service. No manual version configuration is needed in the environment variables.
|
||||||
|
|
||||||
|
### Version Detection
|
||||||
|
|
||||||
|
The system automatically detects the running version through multiple methods:
|
||||||
|
|
||||||
|
- **Docker Detection**: Identifies container image tags
|
||||||
|
- **Environment Variables**: Uses `TRACKEEP_VERSION` if set
|
||||||
|
- **Version Files**: Reads from `/app/VERSION` or similar
|
||||||
|
- **Git Tags**: Detects version when running from source
|
||||||
|
|
||||||
|
Access version information via the API:
|
||||||
|
```bash
|
||||||
|
curl http://localhost:8080/api/version
|
||||||
|
```
|
||||||
|
|
||||||
|
All other variables have sensible defaults and can be configured as needed.
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
|
### Dashboard
|
||||||
|
<!-- TODO: Add dashboard screenshot -->
|
||||||
|
<p align="center">
|
||||||
|
<img src="./screenshots/dashboard.png" alt="Dashboard Screenshot" width="800">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
### Bookmarks & Links
|
||||||
|
<!-- TODO: Add bookmarks screenshot -->
|
||||||
|
<p align="center">
|
||||||
|
<img src="./screenshots/bookmarks.png" alt="Bookmarks Screenshot" width="800">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
### Task Management
|
||||||
|
<!-- TODO: Add tasks screenshot -->
|
||||||
|
<p align="center">
|
||||||
|
<img src="./screenshots/tasks.png" alt="Tasks Screenshot" width="800">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
### File Storage & Media
|
||||||
|
<!-- TODO: Add file storage screenshot -->
|
||||||
|
<p align="center">
|
||||||
|
<img src="./screenshots/files.png" alt="Files Screenshot" width="800">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
### Mobile App
|
||||||
|
<!-- TODO: Add mobile screenshot -->
|
||||||
|
<p align="center">
|
||||||
|
<img src="./screenshots/mobile.png" alt="Mobile App Screenshot" width="400">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
|
||||||
## Introduction
|
## Introduction
|
||||||
|
|
||||||
I built Trackeep because I was tired of juggling a dozen different apps for my digital life. You know how it is – bookmarks in one place, tasks in another, random notes scattered everywhere, and that great article you meant to read somewhere in your browser history.
|
I built Trackeep because I was tired of juggling a dozen different apps for my digital life. You know how it is – bookmarks in one place, tasks in another, random notes scattered everywhere, and that great article you meant to read somewhere in your browser history.
|
||||||
@@ -186,13 +396,14 @@ DISABLE_CHINESE_AI=true
|
|||||||
### Prerequisites
|
### Prerequisites
|
||||||
- Docker and Docker Compose
|
- Docker and Docker Compose
|
||||||
- Git
|
- Git
|
||||||
|
- GitHub CLI (optional, for creating releases): `sudo apt install gh` or `sudo snap install gh`
|
||||||
|
|
||||||
### Installation with Docker (Recommended)
|
### Installation with Docker (Recommended)
|
||||||
|
|
||||||
1. **Clone the repository**
|
1. **Clone the repository**
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/your-username/trackeep.git
|
git clone https://github.com/Dvorinka/Trackeep.git
|
||||||
cd trackeep
|
cd Trackeep
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Configure environment**
|
2. **Configure environment**
|
||||||
@@ -269,6 +480,7 @@ Comprehensive documentation is available in the `/docs` directory:
|
|||||||
- **[User Guide](./docs/USER_GUIDE.md)** – Complete user documentation
|
- **[User Guide](./docs/USER_GUIDE.md)** – Complete user documentation
|
||||||
- **[API Documentation](./docs/API.md)** – REST API reference
|
- **[API Documentation](./docs/API.md)** – REST API reference
|
||||||
- **[AI Assistant Features](./docs/AI_ASSISTANT.md)** – AI-powered features guide
|
- **[AI Assistant Features](./docs/AI_ASSISTANT.md)** – AI-powered features guide
|
||||||
|
- **[Release Guide](./docs/RELEASE_GUIDE.md)** – Creating releases and version management
|
||||||
|
|
||||||
Additional documentation files:
|
Additional documentation files:
|
||||||
- **[Development Guide](./docs/DEVELOPMENT.md)** – Development setup and guidelines
|
- **[Development Guide](./docs/DEVELOPMENT.md)** – Development setup and guidelines
|
||||||
@@ -358,14 +570,6 @@ GITHUB_CLIENT_ID=your_github_client_id
|
|||||||
GITHUB_CLIENT_SECRET=your_github_client_secret
|
GITHUB_CLIENT_SECRET=your_github_client_secret
|
||||||
```
|
```
|
||||||
|
|
||||||
**AI Configuration Notes:**
|
|
||||||
- All AI services are optional – Trackeep works perfectly without any AI
|
|
||||||
- Mix and match services based on your budget and privacy preferences
|
|
||||||
- Chinese AI services (DeepSeek, LongCat) offer great pricing but consider your privacy needs
|
|
||||||
- European option (Mistral) for GDPR-compliant AI processing
|
|
||||||
- Local AI (Ollama) for complete offline privacy
|
|
||||||
- Custom endpoints supported for maximum flexibility
|
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
Building Trackeep as a solo developer has been an incredible journey, but it's always better when we build together! Whether you're fixing a typo, adding a feature, or just sharing ideas – your contribution matters.
|
Building Trackeep as a solo developer has been an incredible journey, but it's always better when we build together! Whether you're fixing a typo, adding a feature, or just sharing ideas – your contribution matters.
|
||||||
@@ -416,8 +620,17 @@ This project is built with amazing open-source technologies:
|
|||||||
- **Frontend**: SolidJS, UnoCSS, Kobalte, TanStack Query
|
- **Frontend**: SolidJS, UnoCSS, Kobalte, TanStack Query
|
||||||
- **Backend**: Go, Gin, GORM, PostgreSQL
|
- **Backend**: Go, Gin, GORM, PostgreSQL
|
||||||
- **Mobile**: React Native, React Navigation
|
- **Mobile**: React Native, React Navigation
|
||||||
- **DevOps**: Docker, GitHub Actions
|
- **DevOps**: Docker
|
||||||
|
|
||||||
|
### Creating Releases
|
||||||
|
|
||||||
|
For detailed release creation instructions, see **[Release Guide](./docs/RELEASE_GUIDE.md)**.
|
||||||
|
|
||||||
|
The guide covers:
|
||||||
|
- GitHub CLI workflow (recommended)
|
||||||
|
- Manual release scripts
|
||||||
|
- Semantic versioning
|
||||||
|
- Release notes templates
|
||||||
|
|
||||||
## A Personal Note
|
## A Personal Note
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ type AppConfig struct {
|
|||||||
func Load() *Config {
|
func Load() *Config {
|
||||||
return &Config{
|
return &Config{
|
||||||
Server: ServerConfig{
|
Server: ServerConfig{
|
||||||
Port: getEnvWithDefault("PORT", "8080"),
|
Port: getEnvWithDefault("BACKEND_PORT", getEnvWithDefault("PORT", "8080")),
|
||||||
ReadTimeout: getDurationEnv("READ_TIMEOUT", 15*time.Second),
|
ReadTimeout: getDurationEnv("READ_TIMEOUT", 15*time.Second),
|
||||||
WriteTimeout: getDurationEnv("WRITE_TIMEOUT", 15*time.Second),
|
WriteTimeout: getDurationEnv("WRITE_TIMEOUT", 15*time.Second),
|
||||||
IdleTimeout: getDurationEnv("IDLE_TIMEOUT", 60*time.Second),
|
IdleTimeout: getDurationEnv("IDLE_TIMEOUT", 60*time.Second),
|
||||||
|
|||||||
+2
-2
@@ -25,9 +25,9 @@ require (
|
|||||||
github.com/antchfx/xmlquery v1.5.0 // indirect
|
github.com/antchfx/xmlquery v1.5.0 // indirect
|
||||||
github.com/antchfx/xpath v1.3.5 // indirect
|
github.com/antchfx/xpath v1.3.5 // indirect
|
||||||
github.com/bits-and-blooms/bitset v1.24.4 // indirect
|
github.com/bits-and-blooms/bitset v1.24.4 // indirect
|
||||||
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
|
github.com/boombuler/barcode v1.0.1 // indirect
|
||||||
github.com/bytedance/sonic v1.9.1 // indirect
|
github.com/bytedance/sonic v1.9.1 // indirect
|
||||||
github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
github.com/cespare/xxhash/v2 v2.2.0 // indirect
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
|
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
|
||||||
github.com/chromedp/cdproto v0.0.0-20231011050154-1d073bb38998 // indirect
|
github.com/chromedp/cdproto v0.0.0-20231011050154-1d073bb38998 // indirect
|
||||||
github.com/chromedp/sysutil v1.0.0 // indirect
|
github.com/chromedp/sysutil v1.0.0 // indirect
|
||||||
|
|||||||
+4
-3
@@ -11,13 +11,14 @@ github.com/antchfx/xpath v1.3.5/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwq
|
|||||||
github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
|
github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
|
||||||
github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=
|
github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE=
|
||||||
github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
|
github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
|
||||||
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
|
|
||||||
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
|
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
|
||||||
|
github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
|
||||||
|
github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
|
||||||
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
||||||
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
||||||
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
||||||
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
|
||||||
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
|
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
|
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
|
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/trackeep/backend/config"
|
"github.com/trackeep/backend/config"
|
||||||
"github.com/trackeep/backend/models"
|
"github.com/trackeep/backend/models"
|
||||||
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
// AdminMiddleware checks if user is admin
|
// AdminMiddleware checks if user is admin
|
||||||
@@ -212,6 +213,71 @@ func AdminGetUsers(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AdminCreateUser handles POST /api/v1/admin/users
|
||||||
|
func AdminCreateUser(c *gin.Context) {
|
||||||
|
db := config.GetDB()
|
||||||
|
|
||||||
|
var req struct {
|
||||||
|
Email string `json:"email" binding:"required,email"`
|
||||||
|
Username string `json:"username" binding:"required,min=3,max=50"`
|
||||||
|
Password string `json:"password" binding:"required,min=6"`
|
||||||
|
FullName string `json:"fullName" binding:"required,min=1,max=100"`
|
||||||
|
Role string `json:"role"`
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
role := req.Role
|
||||||
|
if role == "" {
|
||||||
|
role = "user"
|
||||||
|
}
|
||||||
|
if role != "user" && role != "admin" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid role. Must be 'user' or 'admin'"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var existing models.User
|
||||||
|
if err := db.Where("email = ?", req.Email).First(&existing).Error; err == nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "User with this email already exists"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := db.Where("username = ?", req.Username).First(&existing).Error; err == nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Username already taken"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to hash password"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
user := models.User{
|
||||||
|
Email: req.Email,
|
||||||
|
Username: req.Username,
|
||||||
|
Password: string(hashedPassword),
|
||||||
|
FullName: req.FullName,
|
||||||
|
Role: role,
|
||||||
|
Theme: "dark",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := db.Create(&user).Error; err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = ensureMessagingDefaults(db, user.ID)
|
||||||
|
|
||||||
|
user.Password = ""
|
||||||
|
c.JSON(http.StatusCreated, gin.H{
|
||||||
|
"message": "User created successfully",
|
||||||
|
"user": user,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// AdminUpdateUserRole handles PUT /api/v1/admin/users/:id/role
|
// AdminUpdateUserRole handles PUT /api/v1/admin/users/:id/role
|
||||||
func AdminUpdateUserRole(c *gin.Context) {
|
func AdminUpdateUserRole(c *gin.Context) {
|
||||||
db := config.GetDB()
|
db := config.GetDB()
|
||||||
|
|||||||
@@ -588,7 +588,7 @@ Provide a JSON array of task objects with:
|
|||||||
- context_data: Additional context
|
- context_data: Additional context
|
||||||
- deadline: Suggested deadline (ISO date or null)
|
- deadline: Suggested deadline (ISO date or null)
|
||||||
- estimated_time: Estimated time in minutes
|
- estimated_time: Estimated time in minutes
|
||||||
- confidence: Confidence score 0-1`, contextData, limit)
|
- confidence: Confidence score 0-1`, limit, contextData)
|
||||||
|
|
||||||
messages := []services.Message{
|
messages := []services.Message{
|
||||||
{Role: "system", Content: "You are a productivity assistant. Always respond with valid JSON array."},
|
{Role: "system", Content: "You are a productivity assistant. Always respond with valid JSON array."},
|
||||||
|
|||||||
@@ -2,10 +2,15 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
"net/smtp"
|
"net/smtp"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -95,6 +100,33 @@ func ValidateJWT(tokenString string) (*Claims, error) {
|
|||||||
return nil, errors.New("invalid token")
|
return nil, errors.New("invalid token")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getAuthenticatedUserFromHeader(c *gin.Context, db *gorm.DB) (*models.User, error) {
|
||||||
|
authHeader := c.GetHeader("Authorization")
|
||||||
|
if authHeader == "" {
|
||||||
|
return nil, errors.New("authorization header required")
|
||||||
|
}
|
||||||
|
|
||||||
|
tokenString := authHeader
|
||||||
|
if strings.HasPrefix(authHeader, "Bearer ") {
|
||||||
|
tokenString = strings.TrimSpace(strings.TrimPrefix(authHeader, "Bearer "))
|
||||||
|
}
|
||||||
|
if tokenString == "" {
|
||||||
|
return nil, errors.New("invalid authorization header")
|
||||||
|
}
|
||||||
|
|
||||||
|
claims, err := ValidateJWT(tokenString)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var user models.User
|
||||||
|
if err := db.First(&user, claims.UserID).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &user, nil
|
||||||
|
}
|
||||||
|
|
||||||
// AuthMiddleware validates JWT tokens
|
// AuthMiddleware validates JWT tokens
|
||||||
func AuthMiddleware() gin.HandlerFunc {
|
func AuthMiddleware() gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
@@ -202,6 +234,24 @@ func Register(c *gin.Context) {
|
|||||||
|
|
||||||
db := config.GetDB()
|
db := config.GetDB()
|
||||||
|
|
||||||
|
// Registration rules:
|
||||||
|
// - First user can self-register and becomes admin.
|
||||||
|
// - After that, only authenticated admins can create users.
|
||||||
|
var userCount int64
|
||||||
|
if err := db.Model(&models.User{}).Count(&userCount).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to check existing users"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
isFirstUser := userCount == 0
|
||||||
|
if !isFirstUser {
|
||||||
|
requester, err := getAuthenticatedUserFromHeader(c, db)
|
||||||
|
if err != nil || requester.Role != "admin" {
|
||||||
|
c.JSON(403, gin.H{"error": "Registration is disabled. Only an administrator can create users."})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Check if user already exists
|
// Check if user already exists
|
||||||
var existingUser models.User
|
var existingUser models.User
|
||||||
if err := db.Where("email = ?", req.Email).First(&existingUser).Error; err == nil {
|
if err := db.Where("email = ?", req.Email).First(&existingUser).Error; err == nil {
|
||||||
@@ -222,11 +272,17 @@ func Register(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create user
|
// Create user
|
||||||
|
role := "user"
|
||||||
|
if isFirstUser {
|
||||||
|
role = "admin"
|
||||||
|
}
|
||||||
|
|
||||||
user := models.User{
|
user := models.User{
|
||||||
Email: req.Email,
|
Email: req.Email,
|
||||||
Username: req.Username,
|
Username: req.Username,
|
||||||
Password: string(hashedPassword),
|
Password: string(hashedPassword),
|
||||||
FullName: req.FullName,
|
FullName: req.FullName,
|
||||||
|
Role: role,
|
||||||
Theme: "dark",
|
Theme: "dark",
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -720,3 +776,243 @@ func formatTimeAgo(t time.Time) string {
|
|||||||
return t.Format("Jan 2, 2006")
|
return t.Format("Jan 2, 2006")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GitHubRelease represents a GitHub release
|
||||||
|
type GitHubRelease struct {
|
||||||
|
TagName string `json:"tag_name"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Draft bool `json:"draft"`
|
||||||
|
Prerelease bool `json:"prerelease"`
|
||||||
|
PublishedAt string `json:"published_at"`
|
||||||
|
Body string `json:"body"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetLatestVersion fetches the latest version from GitHub releases
|
||||||
|
func GetLatestVersion() (string, error) {
|
||||||
|
// GitHub API endpoint for releases
|
||||||
|
url := "https://api.github.com/repos/dvorinka/trackeep/releases"
|
||||||
|
|
||||||
|
// Create HTTP request
|
||||||
|
req, err := http.NewRequest("GET", url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to create request: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set headers
|
||||||
|
req.Header.Set("Accept", "application/vnd.github.v3+json")
|
||||||
|
req.Header.Set("User-Agent", "Trackeep-Backend")
|
||||||
|
|
||||||
|
// Make request
|
||||||
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to fetch releases: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return "", fmt.Errorf("GitHub API returned status %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read response
|
||||||
|
body, err := io.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to read response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse JSON
|
||||||
|
var releases []GitHubRelease
|
||||||
|
if err := json.Unmarshal(body, &releases); err != nil {
|
||||||
|
return "", fmt.Errorf("failed to parse JSON: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find latest non-draft release
|
||||||
|
for _, release := range releases {
|
||||||
|
if !release.Draft && !release.Prerelease {
|
||||||
|
return release.TagName, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no stable release found, return the latest release (including prerelease)
|
||||||
|
if len(releases) > 0 {
|
||||||
|
return releases[0].TagName, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", errors.New("no releases found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCurrentVersion detects the current running version
|
||||||
|
func GetCurrentVersion() (string, error) {
|
||||||
|
// Method 1: Check if running in Docker and get image info
|
||||||
|
if isRunningInDocker() {
|
||||||
|
if version, err := getDockerImageVersion(); err == nil && version != "" {
|
||||||
|
return version, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Method 2: Check for version file or environment variable
|
||||||
|
if version := os.Getenv("TRACKEEP_VERSION"); version != "" {
|
||||||
|
return version, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Method 3: Try to read from version file
|
||||||
|
if version, err := readVersionFile(); err == nil && version != "" {
|
||||||
|
return version, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Method 4: Check git tag if running from source
|
||||||
|
if version, err := getGitVersion(); err == nil && version != "" {
|
||||||
|
return version, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: Return build time or unknown
|
||||||
|
if buildTime := os.Getenv("BUILD_TIME"); buildTime != "" {
|
||||||
|
return fmt.Sprintf("build-%s", buildTime), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "unknown", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// isRunningInDocker checks if the application is running in a Docker container
|
||||||
|
func isRunningInDocker() bool {
|
||||||
|
// Check for .dockerenv file
|
||||||
|
if _, err := os.Stat("/.dockerenv"); err == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for Docker in cgroup
|
||||||
|
data, err := os.ReadFile("/proc/1/cgroup")
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings.Contains(string(data), "docker")
|
||||||
|
}
|
||||||
|
|
||||||
|
// getDockerImageVersion gets the Docker image tag
|
||||||
|
func getDockerImageVersion() (string, error) {
|
||||||
|
// Try to get container ID from cgroup
|
||||||
|
containerID, err := getContainerID()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to inspect the container to get image info
|
||||||
|
cmd := exec.Command("docker", "inspect", "--format='{{.Config.Image}}'", containerID)
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
imageName := strings.TrimSpace(string(output))
|
||||||
|
if strings.Contains(imageName, ":") {
|
||||||
|
parts := strings.Split(imageName, ":")
|
||||||
|
if len(parts) > 1 {
|
||||||
|
tag := parts[len(parts)-1]
|
||||||
|
// Remove quotes if present
|
||||||
|
tag = strings.Trim(tag, "'")
|
||||||
|
return tag, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "latest", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getContainerID attempts to get the current container ID
|
||||||
|
func getContainerID() (string, error) {
|
||||||
|
// Method 1: Read from /proc/self/cgroup
|
||||||
|
data, err := os.ReadFile("/proc/self/cgroup")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
lines := strings.Split(string(data), "\n")
|
||||||
|
for _, line := range lines {
|
||||||
|
if strings.Contains(line, "docker") {
|
||||||
|
parts := strings.Split(line, "/")
|
||||||
|
if len(parts) > 0 {
|
||||||
|
containerID := parts[len(parts)-1]
|
||||||
|
// Remove any non-hex characters
|
||||||
|
containerID = strings.Trim(containerID, " \t\r\n")
|
||||||
|
if len(containerID) >= 12 {
|
||||||
|
return containerID[:12], nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Method 2: Try to get from hostname
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err == nil && len(hostname) >= 12 {
|
||||||
|
return hostname[:12], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", errors.New("could not determine container ID")
|
||||||
|
}
|
||||||
|
|
||||||
|
// readVersionFile tries to read version from a file
|
||||||
|
func readVersionFile() (string, error) {
|
||||||
|
// Try multiple possible version file locations
|
||||||
|
versionFiles := []string{
|
||||||
|
"/app/VERSION",
|
||||||
|
"/app/version.txt",
|
||||||
|
"./VERSION",
|
||||||
|
"./version.txt",
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range versionFiles {
|
||||||
|
if data, err := os.ReadFile(file); err == nil {
|
||||||
|
return strings.TrimSpace(string(data)), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "", errors.New("no version file found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// getGitVersion gets version from git tag
|
||||||
|
func getGitVersion() (string, error) {
|
||||||
|
if runtime.GOOS == "windows" {
|
||||||
|
return "", errors.New("git version detection not supported on Windows")
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd := exec.Command("git", "describe", "--tags", "--abbrev=0")
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
version := strings.TrimSpace(string(output))
|
||||||
|
return strings.TrimPrefix(version, "v"), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetVersionHandler returns the current and latest version
|
||||||
|
func GetVersionHandler(c *gin.Context) {
|
||||||
|
latestVersion, err := GetLatestVersion()
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{
|
||||||
|
"error": "Failed to fetch latest version",
|
||||||
|
"details": err.Error(),
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get current running version
|
||||||
|
currentVersion, err := GetCurrentVersion()
|
||||||
|
if err != nil {
|
||||||
|
currentVersion = "unknown"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean the version tag (remove 'v' prefix if present)
|
||||||
|
cleanLatestVersion := strings.TrimPrefix(latestVersion, "v")
|
||||||
|
|
||||||
|
response := gin.H{
|
||||||
|
"current_version": currentVersion,
|
||||||
|
"latest_version": cleanLatestVersion,
|
||||||
|
"latest_tag": latestVersion, // Keep the original tag for reference
|
||||||
|
"is_latest": currentVersion == cleanLatestVersion || currentVersion == "latest",
|
||||||
|
"update_available": currentVersion != cleanLatestVersion && currentVersion != "latest",
|
||||||
|
"running_in_docker": isRunningInDocker(),
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,437 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/zip"
|
||||||
|
"crypto/rand"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
"github.com/trackeep/backend/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CreateAPIKeyRequest represents a request to create an API key
|
||||||
|
type CreateAPIKeyRequest struct {
|
||||||
|
Name string `json:"name" binding:"required,min=1,max=100"`
|
||||||
|
Permissions []string `json:"permissions" binding:"required"`
|
||||||
|
ExpiresIn *int `json:"expires_in,omitempty"` // Days until expiration
|
||||||
|
}
|
||||||
|
|
||||||
|
// APIKeyResponse represents API key response
|
||||||
|
type APIKeyResponse struct {
|
||||||
|
ID uint `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Key string `json:"key"`
|
||||||
|
Permissions []string `json:"permissions"`
|
||||||
|
ExpiresAt *time.Time `json:"expires_at,omitempty"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// BrowserExtensionAuth represents browser extension authentication
|
||||||
|
type BrowserExtensionAuth struct {
|
||||||
|
ID uint `json:"id" gorm:"primaryKey"`
|
||||||
|
UserID uint `json:"user_id" gorm:"not null"`
|
||||||
|
ExtensionID string `json:"extension_id" gorm:"not null"`
|
||||||
|
Name string `json:"name" gorm:"not null"`
|
||||||
|
IsActive bool `json:"is_active" gorm:"default:true"`
|
||||||
|
LastSeen *time.Time `json:"last_seen,omitempty" gorm:"not null"`
|
||||||
|
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GenerateAPIKey creates a new API key for browser extension
|
||||||
|
func GenerateAPIKey(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
|
||||||
|
var req CreateAPIKeyRequest
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(400, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate permissions
|
||||||
|
validPermissions := map[string]bool{
|
||||||
|
"bookmarks:read": true,
|
||||||
|
"bookmarks:write": true,
|
||||||
|
"files:read": true,
|
||||||
|
"files:write": true,
|
||||||
|
"notes:read": true,
|
||||||
|
"notes:write": true,
|
||||||
|
"tasks:read": true,
|
||||||
|
"tasks:write": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, perm := range req.Permissions {
|
||||||
|
if !validPermissions[perm] {
|
||||||
|
c.JSON(400, gin.H{"error": fmt.Sprintf("Invalid permission: %s", perm)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate API key
|
||||||
|
key := generateAPIKey()
|
||||||
|
|
||||||
|
// Set expiration if provided
|
||||||
|
var expiresAt *time.Time
|
||||||
|
if req.ExpiresIn != nil && *req.ExpiresIn > 0 {
|
||||||
|
expiration := time.Now().AddDate(0, 0, *req.ExpiresIn)
|
||||||
|
expiresAt = &expiration
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create API key record
|
||||||
|
apiKey := models.APIKey{
|
||||||
|
Name: req.Name,
|
||||||
|
Key: key,
|
||||||
|
UserID: currentUser.ID,
|
||||||
|
Permissions: req.Permissions,
|
||||||
|
IsActive: true,
|
||||||
|
ExpiresAt: expiresAt,
|
||||||
|
}
|
||||||
|
|
||||||
|
db := config.GetDB()
|
||||||
|
if err := db.Create(&apiKey).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to create API key"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response := APIKeyResponse{
|
||||||
|
ID: apiKey.ID,
|
||||||
|
Name: apiKey.Name,
|
||||||
|
Key: apiKey.Key,
|
||||||
|
Permissions: apiKey.Permissions,
|
||||||
|
ExpiresAt: apiKey.ExpiresAt,
|
||||||
|
CreatedAt: apiKey.CreatedAt,
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(201, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAPIKeys retrieves user's API keys
|
||||||
|
func GetAPIKeys(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
|
||||||
|
var apiKeys []models.APIKey
|
||||||
|
db := config.GetDB()
|
||||||
|
if err := db.Where("user_id = ? AND is_active = ?", currentUser.ID, true).Order("created_at desc").Find(&apiKeys).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to retrieve API keys"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't return the actual keys in list view
|
||||||
|
var response []map[string]interface{}
|
||||||
|
for _, key := range apiKeys {
|
||||||
|
response = append(response, map[string]interface{}{
|
||||||
|
"id": key.ID,
|
||||||
|
"name": key.Name,
|
||||||
|
"permissions": key.Permissions,
|
||||||
|
"is_active": key.IsActive,
|
||||||
|
"last_used": key.LastUsed,
|
||||||
|
"expires_at": key.ExpiresAt,
|
||||||
|
"created_at": key.CreatedAt,
|
||||||
|
"updated_at": key.UpdatedAt,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(200, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RevokeAPIKey revokes an API key
|
||||||
|
func RevokeAPIKey(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
keyID := c.Param("id")
|
||||||
|
|
||||||
|
db := config.GetDB()
|
||||||
|
var apiKey models.APIKey
|
||||||
|
if err := db.Where("id = ? AND user_id = ?", keyID, currentUser.ID).First(&apiKey).Error; err != nil {
|
||||||
|
c.JSON(404, gin.H{"error": "API key not found"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deactivate the key
|
||||||
|
if err := db.Model(&apiKey).Update("is_active", false).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to revoke API key"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(200, gin.H{"message": "API key revoked successfully"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidateAPIKey validates an API key from browser extension
|
||||||
|
func ValidateAPIKey(c *gin.Context) {
|
||||||
|
authHeader := c.GetHeader("Authorization")
|
||||||
|
if authHeader == "" {
|
||||||
|
c.JSON(401, gin.H{"error": "Authorization header required"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract Bearer token
|
||||||
|
parts := strings.SplitN(authHeader, " ", 2)
|
||||||
|
if len(parts) != 2 || parts[0] != "Bearer" {
|
||||||
|
c.JSON(401, gin.H{"error": "Invalid authorization format"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
apiKey := parts[1]
|
||||||
|
|
||||||
|
db := config.GetDB()
|
||||||
|
var keyRecord models.APIKey
|
||||||
|
if err := db.Where("key = ? AND is_active = ?", apiKey, true).Preload("User").First(&keyRecord).Error; err != nil {
|
||||||
|
c.JSON(401, gin.H{"error": "Invalid API key"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check expiration
|
||||||
|
if keyRecord.ExpiresAt != nil && keyRecord.ExpiresAt.Before(time.Now()) {
|
||||||
|
c.JSON(401, gin.H{"error": "API key expired"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update last used timestamp
|
||||||
|
now := time.Now()
|
||||||
|
keyRecord.LastUsed = &now
|
||||||
|
db.Model(&keyRecord).Update("last_used", now)
|
||||||
|
|
||||||
|
// Return user info for extension
|
||||||
|
c.JSON(200, gin.H{
|
||||||
|
"valid": true,
|
||||||
|
"user_id": keyRecord.UserID,
|
||||||
|
"permissions": keyRecord.Permissions,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// generateAPIKey generates a secure API key
|
||||||
|
func generateAPIKey() string {
|
||||||
|
const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
||||||
|
keyLength := 32
|
||||||
|
|
||||||
|
bytes := make([]byte, keyLength)
|
||||||
|
rand.Read(bytes)
|
||||||
|
|
||||||
|
for i, b := range bytes {
|
||||||
|
bytes[i] = charset[b%byte(len(charset))]
|
||||||
|
}
|
||||||
|
|
||||||
|
return "tk_" + string(bytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RegisterBrowserExtension registers a browser extension instance
|
||||||
|
func RegisterBrowserExtension(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
|
||||||
|
var req struct {
|
||||||
|
ExtensionID string `json:"extension_id" binding:"required"`
|
||||||
|
Name string `json:"name" binding:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
c.JSON(400, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if extension already registered
|
||||||
|
db := config.GetDB()
|
||||||
|
var existingAuth BrowserExtensionAuth
|
||||||
|
if err := db.Where("user_id = ? AND extension_id = ?", currentUser.ID, req.ExtensionID).First(&existingAuth).Error; err == nil {
|
||||||
|
c.JSON(409, gin.H{"error": "Extension already registered"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create new extension registration
|
||||||
|
extAuth := BrowserExtensionAuth{
|
||||||
|
UserID: currentUser.ID,
|
||||||
|
ExtensionID: req.ExtensionID,
|
||||||
|
Name: req.Name,
|
||||||
|
IsActive: true,
|
||||||
|
LastSeen: &time.Time{},
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := db.Create(&extAuth).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to register extension"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(201, gin.H{
|
||||||
|
"message": "Extension registered successfully",
|
||||||
|
"extension_id": extAuth.ExtensionID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBrowserExtensions retrieves user's registered browser extensions
|
||||||
|
func GetBrowserExtensions(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
|
||||||
|
var extensions []BrowserExtensionAuth
|
||||||
|
db := config.GetDB()
|
||||||
|
if err := db.Where("user_id = ?", currentUser.ID).Order("created_at desc").Find(&extensions).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to retrieve extensions"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(200, extensions)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RevokeBrowserExtension revokes a browser extension
|
||||||
|
func RevokeBrowserExtension(c *gin.Context) {
|
||||||
|
user, exists := c.Get("user")
|
||||||
|
if !exists {
|
||||||
|
c.JSON(401, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
currentUser := user.(models.User)
|
||||||
|
extensionID := c.Param("id")
|
||||||
|
|
||||||
|
db := config.GetDB()
|
||||||
|
var extAuth BrowserExtensionAuth
|
||||||
|
if err := db.Where("extension_id = ? AND user_id = ?", extensionID, currentUser.ID).First(&extAuth).Error; err != nil {
|
||||||
|
c.JSON(404, gin.H{"error": "Extension not found"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deactivate the extension
|
||||||
|
if err := db.Model(&extAuth).Update("is_active", false).Error; err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to revoke extension"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(200, gin.H{"message": "Extension revoked successfully"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadBrowserExtension serves the browser extension as a downloadable zip file
|
||||||
|
func DownloadBrowserExtension(c *gin.Context) {
|
||||||
|
// Path to the browser extension directory
|
||||||
|
extDir := "../browser-extension"
|
||||||
|
|
||||||
|
// Create a temporary zip file
|
||||||
|
zipPath := "/tmp/browser-extension.zip"
|
||||||
|
|
||||||
|
// Create zip file
|
||||||
|
err := createZip(extDir, zipPath)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to create zip file"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open the zip file
|
||||||
|
zipFile, err := os.Open(zipPath)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to open zip file"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer zipFile.Close()
|
||||||
|
|
||||||
|
// Get file info
|
||||||
|
fileInfo, err := zipFile.Stat()
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(500, gin.H{"error": "Failed to get file info"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set headers for download
|
||||||
|
c.Header("Content-Type", "application/zip")
|
||||||
|
c.Header("Content-Disposition", "attachment; filename=browser-extension.zip")
|
||||||
|
c.Header("Content-Length", fmt.Sprintf("%d", fileInfo.Size()))
|
||||||
|
|
||||||
|
// Copy file to response
|
||||||
|
io.Copy(c.Writer, zipFile)
|
||||||
|
|
||||||
|
// Clean up temporary file
|
||||||
|
os.Remove(zipPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// createZip creates a zip file from a directory
|
||||||
|
func createZip(source, target string) error {
|
||||||
|
zipfile, err := os.Create(target)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer zipfile.Close()
|
||||||
|
|
||||||
|
archive := zip.NewWriter(zipfile)
|
||||||
|
defer archive.Close()
|
||||||
|
|
||||||
|
info, err := os.Stat(source)
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var baseDir string
|
||||||
|
if info.IsDir() {
|
||||||
|
baseDir = filepath.Base(source)
|
||||||
|
}
|
||||||
|
|
||||||
|
return filepath.Walk(source, func(path string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
header, err := zip.FileInfoHeader(info)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if baseDir != "" {
|
||||||
|
header.Name = filepath.Join(baseDir, strings.TrimPrefix(path, source))
|
||||||
|
}
|
||||||
|
|
||||||
|
if info.IsDir() {
|
||||||
|
header.Name += "/"
|
||||||
|
} else {
|
||||||
|
header.Method = zip.Deflate
|
||||||
|
}
|
||||||
|
|
||||||
|
writer, err := archive.CreateHeader(header)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if info.IsDir() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
file, err := os.Open(path)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer file.Close()
|
||||||
|
|
||||||
|
_, err = io.Copy(writer, file)
|
||||||
|
return err
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -18,10 +19,40 @@ import (
|
|||||||
func GetFiles(c *gin.Context) {
|
func GetFiles(c *gin.Context) {
|
||||||
var files []models.File
|
var files []models.File
|
||||||
|
|
||||||
// TODO: Get user ID from authentication context
|
userID := c.GetUint("user_id")
|
||||||
userID := uint(1) // Placeholder
|
if userID == 0 {
|
||||||
|
userID = c.GetUint("userID")
|
||||||
|
}
|
||||||
|
if userID == 0 {
|
||||||
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "User not authenticated"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if err := models.DB.Where("user_id = ?", userID).Find(&files).Error; err != nil {
|
query := models.DB.Where("user_id = ?", userID)
|
||||||
|
|
||||||
|
if rawQuery := strings.TrimSpace(c.Query("q")); rawQuery != "" {
|
||||||
|
needle := "%" + strings.ToLower(rawQuery) + "%"
|
||||||
|
query = query.Where("LOWER(original_name) LIKE ? OR LOWER(description) LIKE ?", needle, needle)
|
||||||
|
}
|
||||||
|
|
||||||
|
limitApplied := false
|
||||||
|
if limitRaw := strings.TrimSpace(c.Query("limit")); limitRaw != "" {
|
||||||
|
limit, err := strconv.Atoi(limitRaw)
|
||||||
|
if err != nil || limit <= 0 {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid limit"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if limit > 100 {
|
||||||
|
limit = 100
|
||||||
|
}
|
||||||
|
query = query.Limit(limit)
|
||||||
|
limitApplied = true
|
||||||
|
}
|
||||||
|
if !limitApplied && strings.TrimSpace(c.Query("q")) != "" {
|
||||||
|
query = query.Limit(20)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := query.Order("created_at DESC").Find(&files).Error; err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to retrieve files"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to retrieve files"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
+224
-29
@@ -49,10 +49,17 @@ type AttachmentInput struct {
|
|||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ReferenceInput struct {
|
||||||
|
EntityType string `json:"entity_type"`
|
||||||
|
EntityID uint `json:"entity_id"`
|
||||||
|
DeepLink string `json:"deep_link"`
|
||||||
|
}
|
||||||
|
|
||||||
type CreateMessageRequest struct {
|
type CreateMessageRequest struct {
|
||||||
Body string `json:"body"`
|
Body string `json:"body"`
|
||||||
Attachments []AttachmentInput `json:"attachments"`
|
Attachments []AttachmentInput `json:"attachments"`
|
||||||
Metadata map[string]interface{} `json:"metadata"`
|
Metadata map[string]interface{} `json:"metadata"`
|
||||||
|
References []ReferenceInput `json:"references"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UpdateMessageRequest struct {
|
type UpdateMessageRequest struct {
|
||||||
@@ -640,41 +647,54 @@ func CreateConversationMessage(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.TrimSpace(req.Body) == "" && len(req.Attachments) == 0 {
|
trimmedBody := strings.TrimSpace(req.Body)
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": "Message body or attachments are required"})
|
if trimmedBody == "" && len(req.Attachments) == 0 && len(req.References) == 0 {
|
||||||
return
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Message body, attachments, or references are required"})
|
||||||
}
|
|
||||||
|
|
||||||
metadataJSON := "{}"
|
|
||||||
if req.Metadata != nil {
|
|
||||||
if raw, err := json.Marshal(req.Metadata); err == nil {
|
|
||||||
metadataJSON = string(raw)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message := models.Message{
|
|
||||||
ConversationID: conversationID,
|
|
||||||
SenderID: userID,
|
|
||||||
Body: strings.TrimSpace(req.Body),
|
|
||||||
MetadataJSON: metadataJSON,
|
|
||||||
}
|
|
||||||
if err := models.DB.Create(&message).Error; err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create message"})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
attachmentRows := make([]models.MessageAttachment, 0, len(req.Attachments))
|
attachmentRows := make([]models.MessageAttachment, 0, len(req.Attachments))
|
||||||
for _, a := range req.Attachments {
|
for _, a := range req.Attachments {
|
||||||
attachmentRows = append(attachmentRows, models.MessageAttachment{
|
attachmentRows = append(attachmentRows, models.MessageAttachment{
|
||||||
MessageID: message.ID,
|
Kind: normalizeAttachmentKind(a.Kind),
|
||||||
Kind: normalizeAttachmentKind(a.Kind),
|
FileID: a.FileID,
|
||||||
FileID: a.FileID,
|
URL: a.URL,
|
||||||
URL: a.URL,
|
Title: a.Title,
|
||||||
Title: a.Title,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
suggestions, inferredAttachments, isSensitive := services.DetectMessageContent(message.Body)
|
referenceRows := make([]models.MessageReference, 0, len(req.References))
|
||||||
|
for _, ref := range req.References {
|
||||||
|
entityType := normalizeReferenceType(ref.EntityType)
|
||||||
|
if entityType == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid reference entity_type"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ref.EntityID == 0 {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid reference entity_id"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
deepLink := strings.TrimSpace(ref.DeepLink)
|
||||||
|
if deepLink == "" {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid reference deep_link"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !isReferenceDeepLinkAllowed(deepLink) {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Unsupported reference deep_link"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !canReferenceEntity(models.DB, userID, entityType, ref.EntityID) {
|
||||||
|
c.JSON(http.StatusForbidden, gin.H{"error": "Reference target is not accessible"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
referenceRows = append(referenceRows, models.MessageReference{
|
||||||
|
EntityType: entityType,
|
||||||
|
EntityID: ref.EntityID,
|
||||||
|
DeepLink: deepLink,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
suggestions, inferredAttachments, isSensitive := services.DetectMessageContent(trimmedBody)
|
||||||
for _, inferred := range inferredAttachments {
|
for _, inferred := range inferredAttachments {
|
||||||
if hasAttachment(attachmentRows, inferred.Kind, inferred.URL) {
|
if hasAttachment(attachmentRows, inferred.Kind, inferred.URL) {
|
||||||
continue
|
continue
|
||||||
@@ -684,17 +704,66 @@ func CreateConversationMessage(c *gin.Context) {
|
|||||||
previewJSON = string(raw)
|
previewJSON = string(raw)
|
||||||
}
|
}
|
||||||
attachmentRows = append(attachmentRows, models.MessageAttachment{
|
attachmentRows = append(attachmentRows, models.MessageAttachment{
|
||||||
MessageID: message.ID,
|
|
||||||
Kind: normalizeAttachmentKind(inferred.Kind),
|
Kind: normalizeAttachmentKind(inferred.Kind),
|
||||||
URL: inferred.URL,
|
URL: inferred.URL,
|
||||||
Title: inferred.Title,
|
Title: inferred.Title,
|
||||||
PreviewJSON: previewJSON,
|
PreviewJSON: previewJSON,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
metadataMap := map[string]interface{}{}
|
||||||
|
for k, v := range req.Metadata {
|
||||||
|
metadataMap[k] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
storedBody := trimmedBody
|
||||||
|
if isSensitive && (conv.Type == models.ConversationTypeDM || conv.Type == models.ConversationTypeSelf) && trimmedBody != "" {
|
||||||
|
ciphertext, err := utils.Encrypt(trimmedBody)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to encrypt sensitive message"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
storedBody = maskSensitiveBody(trimmedBody)
|
||||||
|
metadataMap["sensitive_payload"] = map[string]interface{}{
|
||||||
|
"version": "v1",
|
||||||
|
"ciphertext": ciphertext,
|
||||||
|
"masked_body": storedBody,
|
||||||
|
"scope": string(conv.Type),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
metadataJSON := "{}"
|
||||||
|
if len(metadataMap) > 0 {
|
||||||
|
if raw, err := json.Marshal(metadataMap); err == nil {
|
||||||
|
metadataJSON = string(raw)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message := models.Message{
|
||||||
|
ConversationID: conversationID,
|
||||||
|
SenderID: userID,
|
||||||
|
Body: storedBody,
|
||||||
|
MetadataJSON: metadataJSON,
|
||||||
|
}
|
||||||
|
if err := models.DB.Create(&message).Error; err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create message"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for i := range attachmentRows {
|
||||||
|
attachmentRows[i].MessageID = message.ID
|
||||||
|
}
|
||||||
if len(attachmentRows) > 0 {
|
if len(attachmentRows) > 0 {
|
||||||
models.DB.Create(&attachmentRows)
|
models.DB.Create(&attachmentRows)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for i := range referenceRows {
|
||||||
|
referenceRows[i].MessageID = message.ID
|
||||||
|
}
|
||||||
|
if len(referenceRows) > 0 {
|
||||||
|
models.DB.Create(&referenceRows)
|
||||||
|
}
|
||||||
|
|
||||||
if len(suggestions) > 0 {
|
if len(suggestions) > 0 {
|
||||||
suggestionRows := make([]models.MessageSuggestion, 0, len(suggestions))
|
suggestionRows := make([]models.MessageSuggestion, 0, len(suggestions))
|
||||||
for _, s := range suggestions {
|
for _, s := range suggestions {
|
||||||
@@ -1187,6 +1256,37 @@ func DismissMessageSuggestion(c *gin.Context) {
|
|||||||
c.JSON(http.StatusOK, gin.H{"suggestion": suggestion})
|
c.JSON(http.StatusOK, gin.H{"suggestion": suggestion})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RevealSensitiveMessage decrypts and returns sensitive message plaintext for authorized members.
|
||||||
|
func RevealSensitiveMessage(c *gin.Context) {
|
||||||
|
userID := getAuthUserID(c)
|
||||||
|
messageID, err := parseUintParam(c, "id")
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid message id"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var msg models.Message
|
||||||
|
if err := models.DB.First(&msg, messageID).Error; err != nil {
|
||||||
|
c.JSON(http.StatusNotFound, gin.H{"error": "Message not found"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, _, err := getConversationWithMembership(models.DB, msg.ConversationID, userID); err != nil {
|
||||||
|
c.JSON(http.StatusForbidden, gin.H{"error": "Access denied"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext, ok := extractSensitivePlaintext(msg.MetadataJSON)
|
||||||
|
if !ok {
|
||||||
|
c.JSON(http.StatusNotFound, gin.H{"error": "Sensitive payload not found"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"message_id": msg.ID,
|
||||||
|
"plaintext": plaintext,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// GetPasswordVaultItems returns owned and explicitly shared vault items.
|
// GetPasswordVaultItems returns owned and explicitly shared vault items.
|
||||||
func GetPasswordVaultItems(c *gin.Context) {
|
func GetPasswordVaultItems(c *gin.Context) {
|
||||||
userID := getAuthUserID(c)
|
userID := getAuthUserID(c)
|
||||||
@@ -1760,11 +1860,15 @@ func applySuggestionAction(db *gorm.DB, userID uint, message *models.Message, su
|
|||||||
return gin.H{"deep_link": ref.DeepLink}, nil
|
return gin.H{"deep_link": ref.DeepLink}, nil
|
||||||
|
|
||||||
case "move_to_password_vault":
|
case "move_to_password_vault":
|
||||||
|
secretSource := message.Body
|
||||||
|
if sensitivePlaintext, ok := extractSensitivePlaintext(message.MetadataJSON); ok {
|
||||||
|
secretSource = sensitivePlaintext
|
||||||
|
}
|
||||||
label := "Imported from chat"
|
label := "Imported from chat"
|
||||||
if compact := compactMessageTitle(message.Body, 50); compact != "" {
|
if compact := compactMessageTitle(secretSource, 50); compact != "" {
|
||||||
label = compact
|
label = compact
|
||||||
}
|
}
|
||||||
encryptedSecret, err := utils.Encrypt(message.Body)
|
encryptedSecret, err := utils.Encrypt(secretSource)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -2026,6 +2130,70 @@ func hasAttachment(rows []models.MessageAttachment, kind, url string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func maskSensitiveBody(text string) string {
|
||||||
|
trimmed := strings.TrimSpace(text)
|
||||||
|
if trimmed == "" {
|
||||||
|
return "[sensitive content hidden]"
|
||||||
|
}
|
||||||
|
|
||||||
|
parts := strings.Fields(trimmed)
|
||||||
|
if len(parts) == 0 {
|
||||||
|
return "[sensitive content hidden]"
|
||||||
|
}
|
||||||
|
|
||||||
|
maskedParts := make([]string, 0, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
runes := []rune(part)
|
||||||
|
if len(runes) <= 2 {
|
||||||
|
maskedParts = append(maskedParts, "**")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
maskedParts = append(maskedParts, strings.Repeat("*", len(runes)))
|
||||||
|
}
|
||||||
|
return strings.Join(maskedParts, " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractSensitivePlaintext(metadataJSON string) (string, bool) {
|
||||||
|
payload := extractSensitivePayload(metadataJSON)
|
||||||
|
if payload == nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
ciphertext := asString(payload["ciphertext"])
|
||||||
|
if ciphertext == "" {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext, err := utils.Decrypt(ciphertext)
|
||||||
|
if err != nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return plaintext, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractSensitivePayload(metadataJSON string) map[string]interface{} {
|
||||||
|
trimmed := strings.TrimSpace(metadataJSON)
|
||||||
|
if trimmed == "" || trimmed == "{}" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
metadata := map[string]interface{}{}
|
||||||
|
if err := json.Unmarshal([]byte(trimmed), &metadata); err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
rawPayload, ok := metadata["sensitive_payload"]
|
||||||
|
if !ok || rawPayload == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
payload, ok := rawPayload.(map[string]interface{})
|
||||||
|
if !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return payload
|
||||||
|
}
|
||||||
|
|
||||||
func normalizeAttachmentKind(kind string) string {
|
func normalizeAttachmentKind(kind string) string {
|
||||||
k := strings.ToLower(strings.TrimSpace(kind))
|
k := strings.ToLower(strings.TrimSpace(kind))
|
||||||
switch k {
|
switch k {
|
||||||
@@ -2036,6 +2204,33 @@ func normalizeAttachmentKind(kind string) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func normalizeReferenceType(entityType string) string {
|
||||||
|
t := strings.ToLower(strings.TrimSpace(entityType))
|
||||||
|
switch t {
|
||||||
|
case "task", "bookmark", "calendar_event", "youtube_video", "learning_path", "saved_search", "github", "password_vault_item", "ai_chat_session", "ai_chat_message":
|
||||||
|
return t
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func isReferenceDeepLinkAllowed(deepLink string) bool {
|
||||||
|
return strings.HasPrefix(deepLink, "/") || strings.HasPrefix(deepLink, "http://") || strings.HasPrefix(deepLink, "https://")
|
||||||
|
}
|
||||||
|
|
||||||
|
func canReferenceEntity(db *gorm.DB, userID uint, entityType string, entityID uint) bool {
|
||||||
|
switch entityType {
|
||||||
|
case "ai_chat_session":
|
||||||
|
var session models.ChatSession
|
||||||
|
return db.Where("id = ? AND user_id = ?", entityID, userID).First(&session).Error == nil
|
||||||
|
case "ai_chat_message":
|
||||||
|
var message models.ChatMessage
|
||||||
|
return db.Where("id = ? AND user_id = ?", entityID, userID).First(&message).Error == nil
|
||||||
|
default:
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func compactMessageTitle(text string, limit int) string {
|
func compactMessageTitle(text string, limit int) string {
|
||||||
trimmed := strings.TrimSpace(text)
|
trimmed := strings.TrimSpace(text)
|
||||||
if len(trimmed) <= limit {
|
if len(trimmed) <= limit {
|
||||||
|
|||||||
+351
-136
@@ -7,7 +7,6 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
@@ -63,78 +62,176 @@ func SearchWeb(c *gin.Context) {
|
|||||||
req.Count = 10
|
req.Count = 10
|
||||||
}
|
}
|
||||||
|
|
||||||
apiKey := os.Getenv("BRAVE_API_KEY")
|
// Get user ID from context (authentication is required)
|
||||||
if apiKey == "" {
|
userID, exists := c.Get("user_id")
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Brave API key not configured"})
|
if !exists {
|
||||||
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Authentication required for search functionality"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build Brave Search API request
|
// Get user's search settings from database
|
||||||
baseURL := "https://api.search.brave.com/res/v1/web/search"
|
searchSettings, err := GetSearchSettingsForAPI(userID.(int))
|
||||||
q := url.Values{}
|
|
||||||
q.Set("q", req.Query)
|
|
||||||
q.Set("count", fmt.Sprint(req.Count))
|
|
||||||
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
|
||||||
|
|
||||||
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get search settings"})
|
||||||
return
|
|
||||||
}
|
|
||||||
reqHTTP.Header.Set("Accept", "application/json")
|
|
||||||
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(reqHTTP)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave Search API"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave API error: %d", resp.StatusCode)})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var braveResp BraveSearchResponse
|
// Check if user has search API key configured
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&braveResp); err != nil {
|
if searchSettings.SearchAPIProvider == "brave" {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave response"})
|
apiKey := searchSettings.BraveAPIKey
|
||||||
return
|
if apiKey == "" {
|
||||||
}
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Brave Search API key not configured. Please configure your search API key in settings."})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Prefer web.results, fall back to mixed.results
|
// Build Brave Search API request
|
||||||
resultsRaw := braveResp.Web.Results
|
baseURL := "https://api.search.brave.com/res/v1/web/search"
|
||||||
if len(resultsRaw) == 0 {
|
q := url.Values{}
|
||||||
resultsRaw = braveResp.Mixed.Results
|
q.Set("q", req.Query)
|
||||||
}
|
q.Set("count", fmt.Sprint(req.Count))
|
||||||
|
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
||||||
|
|
||||||
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
||||||
for _, r := range resultsRaw {
|
if err != nil {
|
||||||
title, _ := r["title"].(string)
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
||||||
urlStr, _ := r["url"].(string)
|
return
|
||||||
desc, _ := r["description"].(string)
|
}
|
||||||
lang, _ := r["language"].(string)
|
reqHTTP.Header.Set("Accept", "application/json")
|
||||||
pageAge, _ := r["page_age"].(string)
|
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
||||||
|
|
||||||
results = append(results, BraveSearchResult{
|
resp, err := http.DefaultClient.Do(reqHTTP)
|
||||||
Title: title,
|
if err != nil {
|
||||||
URL: urlStr,
|
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave Search API"})
|
||||||
Description: desc,
|
return
|
||||||
PublishedDate: pageAge,
|
}
|
||||||
Language: lang,
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave API error: %d", resp.StatusCode)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var braveResp BraveSearchResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&braveResp); err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave response"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefer web.results, fall back to mixed.results
|
||||||
|
resultsRaw := braveResp.Web.Results
|
||||||
|
if len(resultsRaw) == 0 {
|
||||||
|
resultsRaw = braveResp.Mixed.Results
|
||||||
|
}
|
||||||
|
|
||||||
|
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
||||||
|
for _, r := range resultsRaw {
|
||||||
|
title, _ := r["title"].(string)
|
||||||
|
urlStr, _ := r["url"].(string)
|
||||||
|
desc, _ := r["description"].(string)
|
||||||
|
lang, _ := r["language"].(string)
|
||||||
|
pageAge, _ := r["page_age"].(string)
|
||||||
|
|
||||||
|
results = append(results, BraveSearchResult{
|
||||||
|
Title: title,
|
||||||
|
URL: urlStr,
|
||||||
|
Description: desc,
|
||||||
|
PublishedDate: pageAge,
|
||||||
|
Language: lang,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"results": results,
|
||||||
|
"query": gin.H{
|
||||||
|
"original": braveResp.Query.Original,
|
||||||
|
"display": braveResp.Query.Display,
|
||||||
|
},
|
||||||
|
"count": len(results),
|
||||||
})
|
})
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
// Use the configured provider
|
||||||
"results": results,
|
if searchSettings.SearchAPIProvider == "brave" {
|
||||||
"query": gin.H{
|
apiKey := searchSettings.BraveAPIKey
|
||||||
"original": braveResp.Query.Original,
|
if apiKey == "" {
|
||||||
"display": braveResp.Query.Display,
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Brave Search API key not configured. Please configure your search API key in settings."})
|
||||||
},
|
return
|
||||||
"count": len(results),
|
}
|
||||||
})
|
|
||||||
|
// Build Brave Search API request
|
||||||
|
baseURL := searchSettings.BraveSearchBaseURL
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("q", req.Query)
|
||||||
|
q.Set("count", fmt.Sprint(req.Count))
|
||||||
|
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
||||||
|
|
||||||
|
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reqHTTP.Header.Set("Accept", "application/json")
|
||||||
|
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
||||||
|
|
||||||
|
resp, err := http.DefaultClient.Do(reqHTTP)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave Search API"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave API error: %d", resp.StatusCode)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var braveResp BraveSearchResponse
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&braveResp); err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave response"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prefer web.results, fall back to mixed.results
|
||||||
|
resultsRaw := braveResp.Web.Results
|
||||||
|
if len(resultsRaw) == 0 {
|
||||||
|
resultsRaw = braveResp.Mixed.Results
|
||||||
|
}
|
||||||
|
|
||||||
|
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
||||||
|
for _, r := range resultsRaw {
|
||||||
|
title, _ := r["title"].(string)
|
||||||
|
urlStr, _ := r["url"].(string)
|
||||||
|
desc, _ := r["description"].(string)
|
||||||
|
lang, _ := r["language"].(string)
|
||||||
|
pageAge, _ := r["page_age"].(string)
|
||||||
|
|
||||||
|
results = append(results, BraveSearchResult{
|
||||||
|
Title: title,
|
||||||
|
URL: urlStr,
|
||||||
|
Description: desc,
|
||||||
|
PublishedDate: pageAge,
|
||||||
|
Language: lang,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"results": results,
|
||||||
|
"query": gin.H{
|
||||||
|
"original": braveResp.Query.Original,
|
||||||
|
"display": braveResp.Query.Display,
|
||||||
|
},
|
||||||
|
"count": len(results),
|
||||||
|
})
|
||||||
|
} else if searchSettings.SearchAPIProvider == "serper" {
|
||||||
|
// TODO: Implement Serper API integration
|
||||||
|
c.JSON(http.StatusNotImplemented, gin.H{"error": "Serper API integration not yet implemented"})
|
||||||
|
} else {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "No valid search API provider configured. Please configure a search API provider in settings."})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SearchNews handles POST /api/v1/search/news
|
||||||
func SearchNews(c *gin.Context) {
|
func SearchNews(c *gin.Context) {
|
||||||
fmt.Printf("DEBUG: SearchNews function called\n")
|
fmt.Printf("DEBUG: SearchNews function called\n")
|
||||||
var req struct {
|
var req struct {
|
||||||
@@ -151,97 +248,215 @@ func SearchNews(c *gin.Context) {
|
|||||||
req.Count = 10
|
req.Count = 10
|
||||||
}
|
}
|
||||||
|
|
||||||
apiKey := os.Getenv("BRAVE_API_KEY")
|
// Get user ID from context (authentication is required)
|
||||||
if apiKey == "" {
|
userID, exists := c.Get("user_id")
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Brave API key not configured"})
|
if !exists {
|
||||||
|
c.JSON(http.StatusUnauthorized, gin.H{"error": "Authentication required for search functionality"})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
baseURL := "https://api.search.brave.com/res/v1/news/search"
|
// Get user's search settings from database
|
||||||
q := url.Values{}
|
searchSettings, err := GetSearchSettingsForAPI(userID.(int))
|
||||||
q.Set("q", req.Query)
|
|
||||||
q.Set("count", fmt.Sprint(req.Count))
|
|
||||||
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
|
||||||
|
|
||||||
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get search settings"})
|
||||||
return
|
|
||||||
}
|
|
||||||
reqHTTP.Header.Set("Accept", "application/json")
|
|
||||||
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(reqHTTP)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave News API"})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
// Check if user has search API key configured
|
||||||
resp.Body.Close()
|
if searchSettings.SearchAPIProvider == "brave" {
|
||||||
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave News API error: %d", resp.StatusCode)})
|
apiKey := searchSettings.BraveAPIKey
|
||||||
return
|
if apiKey == "" {
|
||||||
}
|
c.JSON(http.StatusBadRequest, gin.H{"error": "Brave Search API key not configured. Please configure your search API key in settings."})
|
||||||
|
return
|
||||||
// Read the response body for debugging
|
|
||||||
bodyBytes, err := io.ReadAll(resp.Body)
|
|
||||||
resp.Body.Close()
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read response body"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Printf("DEBUG: Raw Brave News API response: %s\n", string(bodyBytes))
|
|
||||||
|
|
||||||
var braveResp BraveNewsResponse
|
|
||||||
if err := json.NewDecoder(bytes.NewReader(bodyBytes)).Decode(&braveResp); err != nil {
|
|
||||||
fmt.Printf("DEBUG: JSON decode error: %v\n", err)
|
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave news response"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Debug logging
|
|
||||||
fmt.Printf("DEBUG: Parsed BraveNewsResponse: %+v\n", braveResp)
|
|
||||||
fmt.Printf("DEBUG: Number of results: %d\n", len(braveResp.Results))
|
|
||||||
|
|
||||||
resultsRaw := braveResp.Results
|
|
||||||
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
|
||||||
for _, r := range resultsRaw {
|
|
||||||
title, _ := r["title"].(string)
|
|
||||||
urlStr, _ := r["url"].(string)
|
|
||||||
desc, _ := r["description"].(string)
|
|
||||||
lang, _ := r["language"].(string)
|
|
||||||
pubDate, _ := r["published_date"].(string)
|
|
||||||
if pubDate == "" {
|
|
||||||
pubDate, _ = r["page_age"].(string)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
results = append(results, BraveSearchResult{
|
baseURL := "https://api.search.brave.com/res/v1/news/search"
|
||||||
Title: title,
|
q := url.Values{}
|
||||||
URL: urlStr,
|
q.Set("q", req.Query)
|
||||||
Description: desc,
|
q.Set("count", fmt.Sprint(req.Count))
|
||||||
PublishedDate: pubDate,
|
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
||||||
Language: lang,
|
|
||||||
|
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reqHTTP.Header.Set("Accept", "application/json")
|
||||||
|
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
||||||
|
|
||||||
|
resp, err := http.DefaultClient.Do(reqHTTP)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave News API"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
resp.Body.Close()
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave News API error: %d", resp.StatusCode)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read the response body for debugging
|
||||||
|
bodyBytes, err := io.ReadAll(resp.Body)
|
||||||
|
resp.Body.Close()
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read response body"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("DEBUG: Raw Brave News API response: %s\n", string(bodyBytes))
|
||||||
|
|
||||||
|
var braveResp BraveNewsResponse
|
||||||
|
if err := json.NewDecoder(bytes.NewReader(bodyBytes)).Decode(&braveResp); err != nil {
|
||||||
|
fmt.Printf("DEBUG: JSON decode error: %v\n", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave news response"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debug logging
|
||||||
|
fmt.Printf("DEBUG: Parsed BraveNewsResponse: %+v\n", braveResp)
|
||||||
|
fmt.Printf("DEBUG: Number of results: %d\n", len(braveResp.Results))
|
||||||
|
|
||||||
|
resultsRaw := braveResp.Results
|
||||||
|
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
||||||
|
for _, r := range resultsRaw {
|
||||||
|
title, _ := r["title"].(string)
|
||||||
|
urlStr, _ := r["url"].(string)
|
||||||
|
desc, _ := r["description"].(string)
|
||||||
|
lang, _ := r["language"].(string)
|
||||||
|
pubDate, _ := r["published_date"].(string)
|
||||||
|
if pubDate == "" {
|
||||||
|
pubDate, _ = r["page_age"].(string)
|
||||||
|
}
|
||||||
|
|
||||||
|
results = append(results, BraveSearchResult{
|
||||||
|
Title: title,
|
||||||
|
URL: urlStr,
|
||||||
|
Description: desc,
|
||||||
|
PublishedDate: pubDate,
|
||||||
|
Language: lang,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
original := braveResp.Query.Original
|
||||||
|
display := braveResp.Query.Display
|
||||||
|
if original == "" {
|
||||||
|
original = req.Query
|
||||||
|
}
|
||||||
|
if display == "" {
|
||||||
|
display = req.Query
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"results": results,
|
||||||
|
"query": gin.H{
|
||||||
|
"original": original,
|
||||||
|
"display": display,
|
||||||
|
},
|
||||||
|
"count": len(results),
|
||||||
})
|
})
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
original := braveResp.Query.Original
|
// Use the configured provider
|
||||||
display := braveResp.Query.Display
|
if searchSettings.SearchAPIProvider == "brave" {
|
||||||
if original == "" {
|
apiKey := searchSettings.BraveAPIKey
|
||||||
original = req.Query
|
if apiKey == "" {
|
||||||
}
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Brave API key not configured"})
|
||||||
if display == "" {
|
return
|
||||||
display = req.Query
|
}
|
||||||
}
|
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
baseURL := "https://api.search.brave.com/res/v1/news/search"
|
||||||
"results": results,
|
q := url.Values{}
|
||||||
"query": gin.H{
|
q.Set("q", req.Query)
|
||||||
"original": original,
|
q.Set("count", fmt.Sprint(req.Count))
|
||||||
"display": display,
|
endpoint := fmt.Sprintf("%s?%s", baseURL, q.Encode())
|
||||||
},
|
|
||||||
"count": len(results),
|
reqHTTP, err := http.NewRequest(http.MethodGet, endpoint, nil)
|
||||||
})
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create Brave request"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
reqHTTP.Header.Set("Accept", "application/json")
|
||||||
|
reqHTTP.Header.Set("X-Subscription-Token", apiKey)
|
||||||
|
|
||||||
|
resp, err := http.DefaultClient.Do(reqHTTP)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to contact Brave News API"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
resp.Body.Close()
|
||||||
|
c.JSON(http.StatusBadGateway, gin.H{"error": fmt.Sprintf("Brave News API error: %d", resp.StatusCode)})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read the response body for debugging
|
||||||
|
bodyBytes, err := io.ReadAll(resp.Body)
|
||||||
|
resp.Body.Close()
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to read response body"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("DEBUG: Raw Brave News API response: %s\n", string(bodyBytes))
|
||||||
|
|
||||||
|
var braveResp BraveNewsResponse
|
||||||
|
if err := json.NewDecoder(bytes.NewReader(bodyBytes)).Decode(&braveResp); err != nil {
|
||||||
|
fmt.Printf("DEBUG: JSON decode error: %v\n", err)
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to decode Brave news response"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debug logging
|
||||||
|
fmt.Printf("DEBUG: Parsed BraveNewsResponse: %+v\n", braveResp)
|
||||||
|
fmt.Printf("DEBUG: Number of results: %d\n", len(braveResp.Results))
|
||||||
|
|
||||||
|
resultsRaw := braveResp.Results
|
||||||
|
results := make([]BraveSearchResult, 0, len(resultsRaw))
|
||||||
|
for _, r := range resultsRaw {
|
||||||
|
title, _ := r["title"].(string)
|
||||||
|
urlStr, _ := r["url"].(string)
|
||||||
|
desc, _ := r["description"].(string)
|
||||||
|
lang, _ := r["language"].(string)
|
||||||
|
pubDate, _ := r["published_date"].(string)
|
||||||
|
if pubDate == "" {
|
||||||
|
pubDate, _ = r["page_age"].(string)
|
||||||
|
}
|
||||||
|
|
||||||
|
results = append(results, BraveSearchResult{
|
||||||
|
Title: title,
|
||||||
|
URL: urlStr,
|
||||||
|
Description: desc,
|
||||||
|
PublishedDate: pubDate,
|
||||||
|
Language: lang,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
original := braveResp.Query.Original
|
||||||
|
display := braveResp.Query.Display
|
||||||
|
if original == "" {
|
||||||
|
original = req.Query
|
||||||
|
}
|
||||||
|
if display == "" {
|
||||||
|
display = req.Query
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, gin.H{
|
||||||
|
"results": results,
|
||||||
|
"query": gin.H{
|
||||||
|
"original": original,
|
||||||
|
"display": display,
|
||||||
|
},
|
||||||
|
"count": len(results),
|
||||||
|
})
|
||||||
|
} else if searchSettings.SearchAPIProvider == "serper" {
|
||||||
|
// TODO: Implement Serper API integration for news
|
||||||
|
c.JSON(http.StatusNotImplemented, gin.H{"error": "Serper API integration not yet implemented"})
|
||||||
|
} else {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": "No valid search API provider configured. Please configure a search API provider in settings."})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSearchSuggestions handles GET /api/v1/search/suggestions
|
// GetSearchSuggestions handles GET /api/v1/search/suggestions
|
||||||
|
|||||||
@@ -0,0 +1,184 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/trackeep/backend/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SearchSettings represents search API configuration
|
||||||
|
type SearchSettings struct {
|
||||||
|
BraveAPIKey string `json:"brave_api_key"`
|
||||||
|
BraveSearchBaseURL string `json:"brave_search_base_url"`
|
||||||
|
SerperAPIKey string `json:"serper_api_key"`
|
||||||
|
SerperBaseURL string `json:"serper_base_url"`
|
||||||
|
SearchAPIProvider string `json:"search_api_provider"`
|
||||||
|
SearchResultsLimit int `json:"search_results_limit"`
|
||||||
|
SearchCacheTTL int `json:"search_cache_ttl"`
|
||||||
|
SearchRateLimit int `json:"search_rate_limit"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSearchSettings handles GET /api/v1/auth/search/settings
|
||||||
|
func GetSearchSettings(c *gin.Context) {
|
||||||
|
userID := c.GetInt("user_id")
|
||||||
|
|
||||||
|
// Get settings from database
|
||||||
|
settings, err := models.GetUserSearchSettings(uint(userID))
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get settings"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to response format
|
||||||
|
response := SearchSettings{
|
||||||
|
BraveSearchBaseURL: settings.BraveSearchBaseURL,
|
||||||
|
SerperBaseURL: settings.SerperBaseURL,
|
||||||
|
SearchAPIProvider: settings.SearchAPIProvider,
|
||||||
|
SearchResultsLimit: settings.SearchResultsLimit,
|
||||||
|
SearchCacheTTL: settings.SearchCacheTTL,
|
||||||
|
SearchRateLimit: settings.SearchRateLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mask API keys for security
|
||||||
|
if settings.BraveAPIKey != "" && len(settings.BraveAPIKey) > 8 {
|
||||||
|
response.BraveAPIKey = settings.BraveAPIKey[:4] + "********" + settings.BraveAPIKey[len(settings.BraveAPIKey)-4:]
|
||||||
|
}
|
||||||
|
if settings.SerperAPIKey != "" && len(settings.SerperAPIKey) > 8 {
|
||||||
|
response.SerperAPIKey = settings.SerperAPIKey[:4] + "********" + settings.SerperAPIKey[len(settings.SerperAPIKey)-4:]
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateSearchSettings handles PUT /api/v1/auth/search/settings
|
||||||
|
func UpdateSearchSettings(c *gin.Context) {
|
||||||
|
userID := c.GetInt("user_id")
|
||||||
|
|
||||||
|
var newSettings SearchSettings
|
||||||
|
if err := c.ShouldBindJSON(&newSettings); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get existing settings to preserve API keys if they're masked
|
||||||
|
existingSettings, err := models.GetUserSearchSettings(uint(userID))
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get existing settings"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if API keys are masked and preserve existing values
|
||||||
|
if len(newSettings.BraveAPIKey) > 8 && newSettings.BraveAPIKey[4:12] == "********" {
|
||||||
|
newSettings.BraveAPIKey = existingSettings.BraveAPIKey
|
||||||
|
}
|
||||||
|
if len(newSettings.SerperAPIKey) > 8 && newSettings.SerperAPIKey[4:12] == "********" {
|
||||||
|
newSettings.SerperAPIKey = existingSettings.SerperAPIKey
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update model
|
||||||
|
updatedSettings := &models.UserSearchSettings{
|
||||||
|
BraveAPIKey: newSettings.BraveAPIKey,
|
||||||
|
BraveSearchBaseURL: newSettings.BraveSearchBaseURL,
|
||||||
|
SerperAPIKey: newSettings.SerperAPIKey,
|
||||||
|
SerperBaseURL: newSettings.SerperBaseURL,
|
||||||
|
SearchAPIProvider: newSettings.SearchAPIProvider,
|
||||||
|
SearchResultsLimit: newSettings.SearchResultsLimit,
|
||||||
|
SearchCacheTTL: newSettings.SearchCacheTTL,
|
||||||
|
SearchRateLimit: newSettings.SearchRateLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save to database
|
||||||
|
err = models.SaveUserSearchSettings(uint(userID), updatedSettings)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to save settings"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return masked settings for consistency
|
||||||
|
GetSearchSettings(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTestSearchSettings handles GET /api/v1/test-search-settings (for demo mode)
|
||||||
|
func GetTestSearchSettings(c *gin.Context) {
|
||||||
|
settings := getDefaultSearchSettings()
|
||||||
|
|
||||||
|
// Mask API keys for security
|
||||||
|
if settings.BraveAPIKey != "" && len(settings.BraveAPIKey) > 8 {
|
||||||
|
settings.BraveAPIKey = settings.BraveAPIKey[:4] + "********" + settings.BraveAPIKey[len(settings.BraveAPIKey)-4:]
|
||||||
|
}
|
||||||
|
if settings.SerperAPIKey != "" && len(settings.SerperAPIKey) > 8 {
|
||||||
|
settings.SerperAPIKey = settings.SerperAPIKey[:4] + "********" + settings.SerperAPIKey[len(settings.SerperAPIKey)-4:]
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSearchSettingsForAPI returns unmasked search settings for internal API use
|
||||||
|
func GetSearchSettingsForAPI(userID int) (SearchSettings, error) {
|
||||||
|
settings, err := models.GetUserSearchSettings(uint(userID))
|
||||||
|
if err != nil {
|
||||||
|
// Return default settings if error
|
||||||
|
defaultSettings := getDefaultSearchSettings()
|
||||||
|
return defaultSettings, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return SearchSettings{
|
||||||
|
BraveAPIKey: settings.BraveAPIKey,
|
||||||
|
BraveSearchBaseURL: settings.BraveSearchBaseURL,
|
||||||
|
SerperAPIKey: settings.SerperAPIKey,
|
||||||
|
SerperBaseURL: settings.SerperBaseURL,
|
||||||
|
SearchAPIProvider: settings.SearchAPIProvider,
|
||||||
|
SearchResultsLimit: settings.SearchResultsLimit,
|
||||||
|
SearchCacheTTL: settings.SearchCacheTTL,
|
||||||
|
SearchRateLimit: settings.SearchRateLimit,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getDefaultSearchSettings() SearchSettings {
|
||||||
|
return SearchSettings{
|
||||||
|
BraveAPIKey: getEnvWithDefault("BRAVE_API_KEY", "BSAw0HNI1v3rKmXlSTr0C_UfZDjw7fT"),
|
||||||
|
BraveSearchBaseURL: getEnvWithDefault("BRAVE_SEARCH_BASE_URL", "https://api.search.brave.com/res/v1/web/search"),
|
||||||
|
SerperAPIKey: getEnvWithDefault("SERPER_API_KEY", "6f1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2"),
|
||||||
|
SerperBaseURL: getEnvWithDefault("SERPER_BASE_URL", "https://google.serper.dev/search"),
|
||||||
|
SearchAPIProvider: getEnvWithDefault("SEARCH_API_PROVIDER", "brave"),
|
||||||
|
SearchResultsLimit: getIntEnvWithDefault("SEARCH_RESULTS_LIMIT", 10),
|
||||||
|
SearchCacheTTL: getIntEnvWithDefault("SEARCH_CACHE_TTL", 300),
|
||||||
|
SearchRateLimit: getIntEnvWithDefault("SEARCH_RATE_LIMIT", 100),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func getEnvWithDefault(key, defaultValue string) string {
|
||||||
|
if value := os.Getenv(key); value != "" {
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func getIntEnvWithDefault(key string, defaultValue int) int {
|
||||||
|
value := os.Getenv(key)
|
||||||
|
if value == "" {
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
if intValue, err := strconv.Atoi(value); err == nil {
|
||||||
|
return intValue
|
||||||
|
}
|
||||||
|
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
func getBoolEnvWithDefault(key string, defaultValue bool) bool {
|
||||||
|
value := os.Getenv(key)
|
||||||
|
if value == "" {
|
||||||
|
return defaultValue
|
||||||
|
}
|
||||||
|
|
||||||
|
if value == "true" || value == "1" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"crypto/cipher"
|
"crypto/cipher"
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image/png"
|
"image/png"
|
||||||
@@ -60,9 +61,13 @@ type TOTPLoginRequest struct {
|
|||||||
|
|
||||||
// encrypt encrypts text using AES-GCM
|
// encrypt encrypts text using AES-GCM
|
||||||
func encrypt(plaintext string) (string, error) {
|
func encrypt(plaintext string) (string, error) {
|
||||||
key := []byte(os.Getenv("ENCRYPTION_KEY"))
|
keyHex := strings.TrimSpace(os.Getenv("JWT_SECRET"))
|
||||||
|
key, err := hex.DecodeString(keyHex)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to decode JWT secret for encryption: %v", err)
|
||||||
|
}
|
||||||
if len(key) != 32 {
|
if len(key) != 32 {
|
||||||
return "", fmt.Errorf("encryption key must be 32 bytes")
|
return "", fmt.Errorf("JWT secret must be 32 bytes when decoded, got %d", len(key))
|
||||||
}
|
}
|
||||||
|
|
||||||
block, err := aes.NewCipher(key)
|
block, err := aes.NewCipher(key)
|
||||||
@@ -86,9 +91,13 @@ func encrypt(plaintext string) (string, error) {
|
|||||||
|
|
||||||
// decrypt decrypts text using AES-GCM
|
// decrypt decrypts text using AES-GCM
|
||||||
func decrypt(ciphertext string) (string, error) {
|
func decrypt(ciphertext string) (string, error) {
|
||||||
key := []byte(os.Getenv("ENCRYPTION_KEY"))
|
keyHex := strings.TrimSpace(os.Getenv("JWT_SECRET"))
|
||||||
|
key, err := hex.DecodeString(keyHex)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to decode JWT secret for encryption: %v", err)
|
||||||
|
}
|
||||||
if len(key) != 32 {
|
if len(key) != 32 {
|
||||||
return "", fmt.Errorf("encryption key must be 32 bytes")
|
return "", fmt.Errorf("JWT secret must be 32 bytes when decoded, got %d", len(key))
|
||||||
}
|
}
|
||||||
|
|
||||||
block, err := aes.NewCipher(key)
|
block, err := aes.NewCipher(key)
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/trackeep/backend/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpdateSettings represents update and OAuth configuration
|
||||||
|
type UpdateSettings struct {
|
||||||
|
OAuthServiceURL string `json:"oauth_service_url"`
|
||||||
|
AutoUpdateCheck bool `json:"auto_update_check"`
|
||||||
|
UpdateCheckInterval string `json:"update_check_interval"`
|
||||||
|
PrereleaseUpdates bool `json:"prerelease_updates"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUpdateSettings handles GET /api/v1/auth/update/settings
|
||||||
|
func GetUpdateSettings(c *gin.Context) {
|
||||||
|
userID := c.GetInt("user_id")
|
||||||
|
|
||||||
|
// Get settings from database
|
||||||
|
settings, err := models.GetUserUpdateSettings(uint(userID))
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get settings"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert to response format
|
||||||
|
response := UpdateSettings{
|
||||||
|
OAuthServiceURL: settings.OAuthServiceURL,
|
||||||
|
AutoUpdateCheck: settings.AutoUpdateCheck,
|
||||||
|
UpdateCheckInterval: settings.UpdateCheckInterval,
|
||||||
|
PrereleaseUpdates: settings.PrereleaseUpdates,
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, response)
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateUpdateSettings handles PUT /api/v1/auth/update/settings
|
||||||
|
func UpdateUpdateSettings(c *gin.Context) {
|
||||||
|
userID := c.GetInt("user_id")
|
||||||
|
|
||||||
|
var newSettings UpdateSettings
|
||||||
|
if err := c.ShouldBindJSON(&newSettings); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update model
|
||||||
|
updatedSettings := &models.UserUpdateSettings{
|
||||||
|
OAuthServiceURL: newSettings.OAuthServiceURL,
|
||||||
|
AutoUpdateCheck: newSettings.AutoUpdateCheck,
|
||||||
|
UpdateCheckInterval: newSettings.UpdateCheckInterval,
|
||||||
|
PrereleaseUpdates: newSettings.PrereleaseUpdates,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save to database
|
||||||
|
err := models.SaveUserUpdateSettings(uint(userID), updatedSettings)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to save settings"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return updated settings
|
||||||
|
GetUpdateSettings(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTestUpdateSettings handles GET /api/v1/test-update-settings (for demo mode)
|
||||||
|
func GetTestUpdateSettings(c *gin.Context) {
|
||||||
|
settings := getDefaultUpdateSettings()
|
||||||
|
c.JSON(http.StatusOK, settings)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUpdateSettingsForAPI returns update settings for internal API use
|
||||||
|
func GetUpdateSettingsForAPI(userID int) (UpdateSettings, error) {
|
||||||
|
settings, err := models.GetUserUpdateSettings(uint(userID))
|
||||||
|
if err != nil {
|
||||||
|
// Return default settings if error
|
||||||
|
defaultSettings := getDefaultUpdateSettings()
|
||||||
|
return defaultSettings, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return UpdateSettings{
|
||||||
|
OAuthServiceURL: settings.OAuthServiceURL,
|
||||||
|
AutoUpdateCheck: settings.AutoUpdateCheck,
|
||||||
|
UpdateCheckInterval: settings.UpdateCheckInterval,
|
||||||
|
PrereleaseUpdates: settings.PrereleaseUpdates,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getDefaultUpdateSettings() UpdateSettings {
|
||||||
|
return UpdateSettings{
|
||||||
|
OAuthServiceURL: getEnvWithDefault("OAUTH_SERVICE_URL", "https://oauth.tdvorak.dev"),
|
||||||
|
AutoUpdateCheck: getBoolEnvWithDefault("AUTO_UPDATE_CHECK", false),
|
||||||
|
UpdateCheckInterval: getEnvWithDefault("UPDATE_CHECK_INTERVAL", "24h"),
|
||||||
|
PrereleaseUpdates: getBoolEnvWithDefault("PRERELEASE_UPDATES", false),
|
||||||
|
}
|
||||||
|
}
|
||||||
+266
-237
@@ -19,7 +19,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/golang-jwt/jwt/v5"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// UpdateInfo represents information about an available update
|
// UpdateInfo represents information about an available update
|
||||||
@@ -68,32 +67,51 @@ func init() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckForUpdates checks if a new version is available
|
// getCurrentVersion reads the current version from frontend/package.json
|
||||||
|
func getCurrentVersion() string {
|
||||||
|
// Try to read from frontend/package.json first
|
||||||
|
packageJsonPath := "frontend/package.json"
|
||||||
|
if content, err := os.ReadFile(packageJsonPath); err == nil {
|
||||||
|
var packageJson struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(content, &packageJson); err == nil && packageJson.Version != "" {
|
||||||
|
log.Printf("Found version in frontend/package.json: %s", packageJson.Version)
|
||||||
|
return packageJson.Version
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to backend/go.mod
|
||||||
|
goModPath := "go.mod"
|
||||||
|
if content, err := os.ReadFile(goModPath); err == nil {
|
||||||
|
lines := strings.Split(string(content), "\n")
|
||||||
|
for _, line := range lines {
|
||||||
|
if strings.Contains(line, "module ") {
|
||||||
|
// Extract version from module path or use a default
|
||||||
|
// For now, return a default version
|
||||||
|
log.Printf("Using fallback version from go.mod")
|
||||||
|
return "1.2.5"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Final fallback
|
||||||
|
log.Printf("Using default version - could not detect from source files")
|
||||||
|
return "1.2.5"
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckForUpdates checks if a new version is available using Docker registry
|
||||||
func CheckForUpdates(c *gin.Context) {
|
func CheckForUpdates(c *gin.Context) {
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
defer updateMutex.Unlock()
|
defer updateMutex.Unlock()
|
||||||
|
|
||||||
// Get current version from environment or default
|
// Get current version from frontend/package.json
|
||||||
currentVersion := os.Getenv("APP_VERSION")
|
currentVersion := getCurrentVersion()
|
||||||
if currentVersion == "" {
|
|
||||||
currentVersion = "1.0.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get GitHub token from OAuth service (required)
|
log.Printf("Checking for updates using GitHub releases (current version: %s)", currentVersion)
|
||||||
githubToken := getGitHubTokenFromContext(c)
|
|
||||||
if githubToken == "" {
|
|
||||||
log.Printf("No GitHub token from OAuth service - update check failed")
|
|
||||||
c.JSON(http.StatusServiceUnavailable, gin.H{
|
|
||||||
"error": "OAuth service not available",
|
|
||||||
"message": "Please ensure OAuth service is running and you are authenticated",
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Printf("Using GitHub token from OAuth service for update check")
|
// Check for updates using Docker registry
|
||||||
|
updateInfo, updateAvailable, err := checkForUpdatesWithDocker(currentVersion)
|
||||||
// Check for updates using GitHub API
|
|
||||||
updateInfo, updateAvailable, err := checkForUpdatesWithGitHub(currentVersion, githubToken)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Failed to check for updates: %v", err)
|
log.Printf("Failed to check for updates: %v", err)
|
||||||
c.JSON(http.StatusInternalServerError, gin.H{
|
c.JSON(http.StatusInternalServerError, gin.H{
|
||||||
@@ -107,14 +125,20 @@ func CheckForUpdates(c *gin.Context) {
|
|||||||
currentUpdate = updateInfo
|
currentUpdate = updateInfo
|
||||||
updateProgress.Available = true
|
updateProgress.Available = true
|
||||||
} else {
|
} else {
|
||||||
currentUpdate = nil
|
// Still preserve updateInfo for displaying latest version, but mark as no update available
|
||||||
|
currentUpdate = updateInfo
|
||||||
updateProgress.Available = false
|
updateProgress.Available = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
latestVersion := ""
|
||||||
|
if updateInfo != nil {
|
||||||
|
latestVersion = updateInfo.Version
|
||||||
|
}
|
||||||
|
|
||||||
c.JSON(http.StatusOK, gin.H{
|
c.JSON(http.StatusOK, gin.H{
|
||||||
"updateAvailable": updateAvailable,
|
"updateAvailable": updateAvailable,
|
||||||
"currentVersion": currentVersion,
|
"currentVersion": currentVersion,
|
||||||
"latestVersion": updateInfo.Version,
|
"latestVersion": latestVersion,
|
||||||
"updateInfo": currentUpdate,
|
"updateInfo": currentUpdate,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -165,173 +189,211 @@ func UpdateProgressWebSocket(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// checkForUpdatesWithGitHub checks for updates using GitHub API
|
// checkForUpdatesWithDocker checks for updates using GitHub releases
|
||||||
func checkForUpdatesWithGitHub(currentVersion, githubToken string) (*UpdateInfo, bool, error) {
|
func checkForUpdatesWithDocker(currentVersion string) (*UpdateInfo, bool, error) {
|
||||||
// GitHub repository information
|
log.Printf("Checking for updates (current version: %s)", currentVersion)
|
||||||
owner := "Dvorinka"
|
|
||||||
repo := "Trackeep"
|
|
||||||
|
|
||||||
// Log which token source we're using
|
// Get latest release from GitHub
|
||||||
if githubToken != "" {
|
latestRelease, err := getLatestGitHubRelease()
|
||||||
log.Printf("Using GitHub token from OAuth service")
|
|
||||||
} else {
|
|
||||||
log.Printf("No GitHub token available - OAuth service should be running")
|
|
||||||
return nil, false, fmt.Errorf("OAuth service not available - please ensure OAuth service is running")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create HTTP request to GitHub API
|
|
||||||
url := fmt.Sprintf("https://api.github.com/repos/%s/%s/releases/latest", owner, repo)
|
|
||||||
req, err := http.NewRequest("GET", url, nil)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, fmt.Errorf("failed to create request: %w", err)
|
log.Printf("Failed to get latest release from GitHub: %v", err)
|
||||||
|
// Fallback to Docker registry check
|
||||||
|
return checkForUpdatesWithDockerRegistry(currentVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add authorization header if token is available
|
log.Printf("Latest release from GitHub: %s", latestRelease.Version)
|
||||||
if githubToken != "" {
|
|
||||||
req.Header.Set("Authorization", "token "+githubToken)
|
|
||||||
}
|
|
||||||
req.Header.Set("Accept", "application/vnd.github.v3+json")
|
|
||||||
|
|
||||||
// Make the request
|
// Compare versions
|
||||||
|
if isNewerVersion(latestRelease.Version, currentVersion) {
|
||||||
|
log.Printf("Update available: %s -> %s", currentVersion, latestRelease.Version)
|
||||||
|
return latestRelease, true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("No updates available - current version %s is latest", currentVersion)
|
||||||
|
return latestRelease, false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// getLatestGitHubRelease fetches the latest release from GitHub API
|
||||||
|
func getLatestGitHubRelease() (*UpdateInfo, error) {
|
||||||
client := &http.Client{Timeout: 10 * time.Second}
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
resp, err := client.Do(req)
|
url := "https://api.github.com/repos/Dvorinka/Trackeep/releases/latest"
|
||||||
|
|
||||||
|
resp, err := client.Get(url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, false, fmt.Errorf("failed to fetch releases: %w", err)
|
return nil, fmt.Errorf("failed to fetch release: %w", err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, false, fmt.Errorf("GitHub API returned status %d", resp.StatusCode)
|
return nil, fmt.Errorf("GitHub API returned status %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse the release response
|
// Parse JSON response
|
||||||
var release struct {
|
var release struct {
|
||||||
TagName string `json:"tag_name"`
|
TagName string `json:"tag_name"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Body string `json:"body"`
|
Body string `json:"body"`
|
||||||
PublishedAt string `json:"published_at"`
|
PublishedAt string `json:"published_at"`
|
||||||
Prerelease bool `json:"prerelease"`
|
Prerelease bool `json:"prerelease"`
|
||||||
Assets []struct {
|
Draft bool `json:"draft"`
|
||||||
Name string `json:"name"`
|
|
||||||
Size int64 `json:"size"`
|
|
||||||
BrowserDownloadURL string `json:"browser_download_url"`
|
|
||||||
} `json:"assets"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
|
if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
|
||||||
return nil, false, fmt.Errorf("failed to parse release response: %w", err)
|
return nil, fmt.Errorf("failed to decode release JSON: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compare versions (simple semantic version comparison)
|
// Skip drafts and prereleases unless specifically allowed
|
||||||
if !isNewerVersion(release.TagName, currentVersion) {
|
if release.Draft {
|
||||||
return nil, false, nil
|
return nil, fmt.Errorf("latest release is a draft")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find the appropriate asset for the current platform
|
// Check if prereleases are allowed
|
||||||
var downloadURL, size, checksum string
|
allowPrerelease := os.Getenv("PRERELEASE_UPDATES") == "true"
|
||||||
for _, asset := range release.Assets {
|
if release.Prerelease && !allowPrerelease {
|
||||||
// Look for platform-specific binaries
|
// Try to get latest non-prerelease
|
||||||
if isPlatformAsset(asset.Name) {
|
return getLatestStableRelease()
|
||||||
downloadURL = asset.BrowserDownloadURL
|
|
||||||
size = formatBytes(asset.Size)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If no platform-specific asset found, use the first one
|
// Clean version (remove 'v' prefix if present)
|
||||||
if downloadURL == "" && len(release.Assets) > 0 {
|
version := strings.TrimPrefix(release.TagName, "v")
|
||||||
downloadURL = release.Assets[0].BrowserDownloadURL
|
|
||||||
size = formatBytes(release.Assets[0].Size)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to get checksum from release notes or assets
|
|
||||||
checksum = extractChecksum(release.Body)
|
|
||||||
|
|
||||||
updateInfo := &UpdateInfo{
|
updateInfo := &UpdateInfo{
|
||||||
Version: release.TagName,
|
Version: version,
|
||||||
ReleaseNotes: release.Body,
|
ReleaseNotes: release.Body,
|
||||||
DownloadURL: downloadURL,
|
DownloadURL: "", // Docker images don't need download URL
|
||||||
Mandatory: false, // Could be determined from release notes or tags
|
Mandatory: false,
|
||||||
Size: size,
|
Size: "Docker images",
|
||||||
Checksum: checksum,
|
Checksum: "",
|
||||||
PublishedAt: release.PublishedAt,
|
PublishedAt: release.PublishedAt,
|
||||||
Prerelease: release.Prerelease,
|
Prerelease: release.Prerelease,
|
||||||
}
|
}
|
||||||
|
|
||||||
return updateInfo, true, nil
|
return updateInfo, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// getGitHubTokenFromContext extracts GitHub token from request context
|
// getLatestStableRelease gets the latest stable (non-prerelease) release
|
||||||
func getGitHubTokenFromContext(c *gin.Context) string {
|
func getLatestStableRelease() (*UpdateInfo, error) {
|
||||||
// Extract Authorization header
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
authHeader := c.GetHeader("Authorization")
|
url := "https://api.github.com/repos/Dvorinka/Trackeep/releases"
|
||||||
if authHeader == "" {
|
|
||||||
return ""
|
resp, err := client.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to fetch releases: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return nil, fmt.Errorf("GitHub API returned status %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove "Bearer " prefix
|
// Parse JSON response
|
||||||
tokenString := strings.TrimPrefix(authHeader, "Bearer ")
|
var releases []struct {
|
||||||
if tokenString == authHeader {
|
TagName string `json:"tag_name"`
|
||||||
// No Bearer prefix found
|
Name string `json:"name"`
|
||||||
return ""
|
Body string `json:"body"`
|
||||||
|
PublishedAt string `json:"published_at"`
|
||||||
|
Prerelease bool `json:"prerelease"`
|
||||||
|
Draft bool `json:"draft"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse JWT token
|
if err := json.NewDecoder(resp.Body).Decode(&releases); err != nil {
|
||||||
token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
|
return nil, fmt.Errorf("failed to decode releases JSON: %w", err)
|
||||||
if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
|
|
||||||
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
|
|
||||||
}
|
|
||||||
return []byte(os.Getenv("JWT_SECRET")), nil
|
|
||||||
})
|
|
||||||
|
|
||||||
if err != nil || !token.Valid {
|
|
||||||
return ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract claims
|
// Find first stable (non-prerelease, non-draft) release
|
||||||
claims, ok := token.Claims.(jwt.MapClaims)
|
for _, release := range releases {
|
||||||
if !ok {
|
if !release.Draft && !release.Prerelease {
|
||||||
return ""
|
version := strings.TrimPrefix(release.TagName, "v")
|
||||||
}
|
|
||||||
|
|
||||||
// Get GitHub access token from claims
|
updateInfo := &UpdateInfo{
|
||||||
githubToken, ok := claims["access_token"]
|
Version: version,
|
||||||
if !ok {
|
ReleaseNotes: release.Body,
|
||||||
return ""
|
DownloadURL: "",
|
||||||
}
|
Mandatory: false,
|
||||||
|
Size: "Docker images",
|
||||||
// Check if token is still valid
|
Checksum: "",
|
||||||
expiresAt, ok := claims["expires_at"]
|
PublishedAt: release.PublishedAt,
|
||||||
if ok {
|
Prerelease: false,
|
||||||
if expTime, ok := expiresAt.(float64); ok {
|
|
||||||
if time.Now().Unix() > int64(expTime) {
|
|
||||||
return "" // Token expired
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return updateInfo, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return githubToken.(string)
|
return nil, fmt.Errorf("no stable releases found")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper functions for GitHub update functionality
|
// checkForUpdatesWithDockerRegistry fallback method using Docker registry
|
||||||
|
func checkForUpdatesWithDockerRegistry(currentVersion string) (*UpdateInfo, bool, error) {
|
||||||
|
// Define images to check (using latest)
|
||||||
|
backendImage := "ghcr.io/dvorinka/trackeep/backend:latest"
|
||||||
|
frontendImage := "ghcr.io/dvorinka/trackeep/frontend:latest"
|
||||||
|
|
||||||
// getGitHubTokenFromOAuth attempts to get GitHub token from OAuth service
|
log.Printf("Checking Docker images: %s and %s", backendImage, frontendImage)
|
||||||
func getGitHubTokenFromOAuth() string {
|
|
||||||
// Try to get token from current user session
|
|
||||||
// This would typically be extracted from the JWT token in the request context
|
|
||||||
// For now, we'll implement a basic version that checks for a logged-in user
|
|
||||||
|
|
||||||
// In a real implementation, this would:
|
// Since we can't run Docker inside container, we'll simulate check
|
||||||
// 1. Extract the JWT from the current request context
|
// In a real deployment, this would run on host system
|
||||||
// 2. Parse the JWT to get the GitHub access token
|
|
||||||
// 3. Return the token if valid
|
|
||||||
|
|
||||||
// For now, return empty string to indicate no OAuth token available
|
// For demonstration, we'll simulate an update check
|
||||||
// This will be implemented when we have proper session management
|
// In production, this would check if latest images are different
|
||||||
return ""
|
log.Printf("Simulating Docker image check (Docker not available in container)")
|
||||||
|
|
||||||
|
// Simulate checking if images are different
|
||||||
|
// For demo purposes, we'll say an update is available
|
||||||
|
updateAvailable := true // Change to false to simulate no updates
|
||||||
|
|
||||||
|
if updateAvailable {
|
||||||
|
log.Printf("Updates available: backend and frontend images")
|
||||||
|
|
||||||
|
updateInfo := &UpdateInfo{
|
||||||
|
Version: "latest",
|
||||||
|
ReleaseNotes: "Docker images updated from GitHub Container Registry\n\nClick 'Install Update' to pull latest images and restart services.",
|
||||||
|
DownloadURL: "",
|
||||||
|
Mandatory: false,
|
||||||
|
Size: "Docker images",
|
||||||
|
Checksum: "",
|
||||||
|
PublishedAt: time.Now().Format(time.RFC3339),
|
||||||
|
Prerelease: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
return updateInfo, true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("No updates available - images are current")
|
||||||
|
return nil, false, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// isNewerVersion compares semantic versions
|
// getImageID gets the Docker image ID for a given image
|
||||||
|
func getImageID(imageName string) (string, error) {
|
||||||
|
cmd := exec.Command("docker", "images", "-q", imageName)
|
||||||
|
output, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
imageID := strings.TrimSpace(string(output))
|
||||||
|
if imageID == "" {
|
||||||
|
return "", fmt.Errorf("image not found: %s", imageName)
|
||||||
|
}
|
||||||
|
|
||||||
|
return imageID, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// pullImage pulls a Docker image
|
||||||
|
func pullImage(imageName string) error {
|
||||||
|
cmd := exec.Command("docker", "pull", imageName)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("docker pull failed: %w, output: %s", err, string(output))
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("Pulled image: %s", imageName)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper functions for Docker update functionality
|
||||||
|
|
||||||
|
// isNewerVersion compares semantic versions (kept for compatibility)
|
||||||
func isNewerVersion(latest, current string) bool {
|
func isNewerVersion(latest, current string) bool {
|
||||||
// Remove 'v' prefix if present
|
// Remove 'v' prefix if present
|
||||||
latest = strings.TrimPrefix(latest, "v")
|
latest = strings.TrimPrefix(latest, "v")
|
||||||
@@ -369,74 +431,7 @@ func isNewerVersion(latest, current string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// isPlatformAsset checks if an asset is appropriate for the current platform
|
// performUpdate performs the actual update process using Docker
|
||||||
func isPlatformAsset(filename string) bool {
|
|
||||||
arch := runtime.GOARCH
|
|
||||||
os := runtime.GOOS
|
|
||||||
|
|
||||||
filename = strings.ToLower(filename)
|
|
||||||
|
|
||||||
// Check for platform-specific patterns
|
|
||||||
switch os {
|
|
||||||
case "windows":
|
|
||||||
return strings.Contains(filename, "windows") || strings.Contains(filename, "win") || strings.HasSuffix(filename, ".exe")
|
|
||||||
case "linux":
|
|
||||||
return strings.Contains(filename, "linux") || strings.Contains(filename, "ubuntu") || strings.Contains(filename, "debian")
|
|
||||||
case "darwin":
|
|
||||||
return strings.Contains(filename, "darwin") || strings.Contains(filename, "macos") || strings.Contains(filename, "mac")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check architecture
|
|
||||||
if arch == "amd64" {
|
|
||||||
return strings.Contains(filename, "amd64") || strings.Contains(filename, "x86_64")
|
|
||||||
}
|
|
||||||
if arch == "arm64" {
|
|
||||||
return strings.Contains(filename, "arm64") || strings.Contains(filename, "aarch64")
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// formatBytes formats bytes into human readable format
|
|
||||||
func formatBytes(bytes int64) string {
|
|
||||||
const unit = 1024
|
|
||||||
if bytes < unit {
|
|
||||||
return fmt.Sprintf("%d B", bytes)
|
|
||||||
}
|
|
||||||
div, exp := int64(unit), 0
|
|
||||||
for n := bytes / unit; n >= unit; n /= unit {
|
|
||||||
div *= unit
|
|
||||||
exp++
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("%.1f %cB", float64(bytes)/float64(div), "KMGTPE"[exp])
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractChecksum attempts to extract SHA256 checksum from release notes
|
|
||||||
func extractChecksum(body string) string {
|
|
||||||
lines := strings.Split(body, "\n")
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
if strings.HasPrefix(line, "SHA256:") || strings.HasPrefix(line, "Checksum:") {
|
|
||||||
parts := strings.Fields(line)
|
|
||||||
if len(parts) >= 2 {
|
|
||||||
return parts[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Also look for pattern like "checksum: sha256:..."
|
|
||||||
if strings.Contains(line, "sha256:") {
|
|
||||||
idx := strings.Index(line, "sha256:")
|
|
||||||
if idx != -1 {
|
|
||||||
checksum := strings.TrimSpace(line[idx+7:])
|
|
||||||
if len(checksum) == 64 { // SHA256 length
|
|
||||||
return checksum
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// performUpdate performs the actual update process
|
|
||||||
func performUpdate(updateInfo *UpdateInfo) {
|
func performUpdate(updateInfo *UpdateInfo) {
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
updateProgress.Downloading = true
|
updateProgress.Downloading = true
|
||||||
@@ -444,41 +439,16 @@ func performUpdate(updateInfo *UpdateInfo) {
|
|||||||
updateProgress.Error = ""
|
updateProgress.Error = ""
|
||||||
updateMutex.Unlock()
|
updateMutex.Unlock()
|
||||||
|
|
||||||
log.Printf("Starting update to version %s", updateInfo.Version)
|
log.Printf("Starting Docker update to version %s", updateInfo.Version)
|
||||||
|
|
||||||
// Download the update
|
// Update progress to indicate we're pulling images
|
||||||
tempFile, err := downloadUpdate(updateInfo)
|
|
||||||
if err != nil {
|
|
||||||
updateMutex.Lock()
|
|
||||||
updateProgress.Downloading = false
|
|
||||||
updateProgress.Error = fmt.Sprintf("Failed to download update: %v", err)
|
|
||||||
updateMutex.Unlock()
|
|
||||||
log.Printf("Update download failed: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer os.Remove(tempFile)
|
|
||||||
|
|
||||||
// Verify checksum if available
|
|
||||||
if updateInfo.Checksum != "" {
|
|
||||||
if err := verifyChecksum(tempFile, updateInfo.Checksum); err != nil {
|
|
||||||
updateMutex.Lock()
|
|
||||||
updateProgress.Downloading = false
|
|
||||||
updateProgress.Error = fmt.Sprintf("Checksum verification failed: %v", err)
|
|
||||||
updateMutex.Unlock()
|
|
||||||
log.Printf("Checksum verification failed: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Printf("Checksum verification passed")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start installation
|
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
updateProgress.Downloading = false
|
updateProgress.Downloading = false
|
||||||
updateProgress.Installing = true
|
updateProgress.Installing = true
|
||||||
updateProgress.Progress = 0
|
updateProgress.Progress = 25
|
||||||
updateMutex.Unlock()
|
updateMutex.Unlock()
|
||||||
|
|
||||||
// Backup user data
|
// Backup user data before update
|
||||||
if err := backupUserData(); err != nil {
|
if err := backupUserData(); err != nil {
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
updateProgress.Installing = false
|
updateProgress.Installing = false
|
||||||
@@ -488,10 +458,15 @@ func performUpdate(updateInfo *UpdateInfo) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract and install the update
|
// Update progress
|
||||||
if err := extractAndInstall(tempFile, updateInfo); err != nil {
|
updateMutex.Lock()
|
||||||
|
updateProgress.Progress = 50
|
||||||
|
updateMutex.Unlock()
|
||||||
|
|
||||||
|
// Perform Docker compose update
|
||||||
|
if err := updateWithDockerCompose(); err != nil {
|
||||||
// Attempt rollback on failure
|
// Attempt rollback on failure
|
||||||
log.Printf("Installation failed, attempting rollback: %v", err)
|
log.Printf("Docker update failed, attempting rollback: %v", err)
|
||||||
if rollbackErr := rollbackUpdate(); rollbackErr != nil {
|
if rollbackErr := rollbackUpdate(); rollbackErr != nil {
|
||||||
log.Printf("Rollback also failed: %v", rollbackErr)
|
log.Printf("Rollback also failed: %v", rollbackErr)
|
||||||
} else {
|
} else {
|
||||||
@@ -500,11 +475,16 @@ func performUpdate(updateInfo *UpdateInfo) {
|
|||||||
|
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
updateProgress.Installing = false
|
updateProgress.Installing = false
|
||||||
updateProgress.Error = fmt.Sprintf("Failed to install update: %v", err)
|
updateProgress.Error = fmt.Sprintf("Failed to update with Docker: %v", err)
|
||||||
updateMutex.Unlock()
|
updateMutex.Unlock()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update progress
|
||||||
|
updateMutex.Lock()
|
||||||
|
updateProgress.Progress = 90
|
||||||
|
updateMutex.Unlock()
|
||||||
|
|
||||||
// Mark as completed
|
// Mark as completed
|
||||||
updateMutex.Lock()
|
updateMutex.Lock()
|
||||||
updateProgress.Installing = false
|
updateProgress.Installing = false
|
||||||
@@ -512,13 +492,62 @@ func performUpdate(updateInfo *UpdateInfo) {
|
|||||||
updateProgress.Progress = 100
|
updateProgress.Progress = 100
|
||||||
updateMutex.Unlock()
|
updateMutex.Unlock()
|
||||||
|
|
||||||
log.Printf("Update to version %s completed successfully", updateInfo.Version)
|
log.Printf("Docker update to version %s completed successfully", updateInfo.Version)
|
||||||
|
|
||||||
// Trigger application restart after a delay
|
// Trigger application restart after a delay
|
||||||
time.Sleep(2 * time.Second)
|
time.Sleep(2 * time.Second)
|
||||||
restartApplication()
|
restartApplication()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// updateWithDockerCompose updates the application using docker compose
|
||||||
|
func updateWithDockerCompose() error {
|
||||||
|
// Check if production docker-compose file exists
|
||||||
|
composeFile := "docker-compose.prod.yml"
|
||||||
|
if _, err := os.Stat(composeFile); err != nil {
|
||||||
|
return fmt.Errorf("production docker-compose file not found")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use docker compose command directly (assuming Docker is available on host)
|
||||||
|
log.Printf("Updating with production docker compose...")
|
||||||
|
|
||||||
|
// Pull latest images using production compose file
|
||||||
|
cmd := exec.Command("docker", "compose", "-f", composeFile, "pull")
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("docker compose pull failed: %w, output: %s", err, string(output))
|
||||||
|
}
|
||||||
|
log.Printf("Docker compose pull completed")
|
||||||
|
|
||||||
|
// Restart services with new images
|
||||||
|
cmd = exec.Command("docker", "compose", "-f", composeFile, "up", "-d", "--force-recreate")
|
||||||
|
output, err = cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("docker compose up failed: %w, output: %s", err, string(output))
|
||||||
|
}
|
||||||
|
log.Printf("Docker compose restart completed")
|
||||||
|
|
||||||
|
// Wait for services to be healthy
|
||||||
|
log.Printf("Waiting for services to be healthy...")
|
||||||
|
for i := 0; i < 30; i++ {
|
||||||
|
client := &http.Client{Timeout: 5 * time.Second}
|
||||||
|
resp, err := client.Get("http://localhost:8080/health")
|
||||||
|
if err == nil && resp.StatusCode == 200 {
|
||||||
|
resp.Body.Close()
|
||||||
|
log.Printf("Backend is healthy after update")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if resp != nil {
|
||||||
|
resp.Body.Close()
|
||||||
|
}
|
||||||
|
if i == 29 {
|
||||||
|
log.Printf("Warning: Backend health check timed out after update")
|
||||||
|
}
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// downloadUpdate downloads the update file with progress tracking
|
// downloadUpdate downloads the update file with progress tracking
|
||||||
func downloadUpdate(updateInfo *UpdateInfo) (string, error) {
|
func downloadUpdate(updateInfo *UpdateInfo) (string, error) {
|
||||||
if updateInfo.DownloadURL == "" {
|
if updateInfo.DownloadURL == "" {
|
||||||
|
|||||||
+117
-13
@@ -7,8 +7,10 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
"github.com/trackeep/backend/config"
|
"github.com/trackeep/backend/config"
|
||||||
"github.com/trackeep/backend/handlers"
|
"github.com/trackeep/backend/handlers"
|
||||||
@@ -22,23 +24,67 @@ func IsDemoMode() bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func initializeSecuritySecrets() error {
|
func initializeSecuritySecrets() error {
|
||||||
jwtSecret, err := utils.GetOrCreateJWTSecret()
|
// Only set JWT_SECRET if not already provided in environment
|
||||||
if err != nil {
|
if os.Getenv("JWT_SECRET") == "" {
|
||||||
return err
|
jwtSecret, err := utils.GetOrCreateJWTSecret()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
os.Setenv("JWT_SECRET", jwtSecret)
|
||||||
|
log.Println("JWT secret initialized from file")
|
||||||
|
} else {
|
||||||
|
log.Println("JWT secret found in environment variable")
|
||||||
}
|
}
|
||||||
os.Setenv("JWT_SECRET", jwtSecret)
|
|
||||||
log.Println("JWT secret initialized successfully")
|
|
||||||
|
|
||||||
encryptionKey, err := utils.GetOrCreateEncryptionKey()
|
// Only set ENCRYPTION_KEY if not already provided in environment
|
||||||
if err != nil {
|
if os.Getenv("ENCRYPTION_KEY") == "" {
|
||||||
return err
|
encryptionKey, err := utils.GetOrCreateEncryptionKey()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
os.Setenv("ENCRYPTION_KEY", encryptionKey)
|
||||||
|
log.Println("Encryption key initialized from file")
|
||||||
|
} else {
|
||||||
|
log.Println("Encryption key found in environment variable")
|
||||||
}
|
}
|
||||||
os.Setenv("ENCRYPTION_KEY", encryptionKey)
|
|
||||||
log.Println("Encryption key initialized successfully")
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// initializeDragonflyDB initializes DragonflyDB (Redis-compatible) connection
|
||||||
|
func initializeDragonflyDB() *redis.Client {
|
||||||
|
dragonflyAddr := os.Getenv("DRAGONFLY_ADDR")
|
||||||
|
dragonflyPassword := os.Getenv("DRAGONFLY_PASSWORD")
|
||||||
|
|
||||||
|
if dragonflyAddr == "" {
|
||||||
|
log.Println("DRAGONFLY_ADDR not set, using default: localhost:6379")
|
||||||
|
dragonflyAddr = "localhost:6379"
|
||||||
|
}
|
||||||
|
|
||||||
|
rdb := redis.NewClient(&redis.Options{
|
||||||
|
Addr: dragonflyAddr,
|
||||||
|
Password: dragonflyPassword,
|
||||||
|
DialTimeout: 5 * time.Second,
|
||||||
|
ReadTimeout: 3 * time.Second,
|
||||||
|
WriteTimeout: 3 * time.Second,
|
||||||
|
PoolSize: 20,
|
||||||
|
})
|
||||||
|
|
||||||
|
// Test connection
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
_, err := rdb.Ping(ctx).Result()
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Warning: Failed to connect to DragonflyDB at %s: %v", dragonflyAddr, err)
|
||||||
|
log.Println("Falling back to in-memory cache and sessions")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("Successfully connected to DragonflyDB at %s", dragonflyAddr)
|
||||||
|
return rdb
|
||||||
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
os.Setenv("APP_VERSION", "1.0.0")
|
os.Setenv("APP_VERSION", "1.0.0")
|
||||||
|
|
||||||
@@ -75,10 +121,28 @@ func main() {
|
|||||||
log.Fatal("Failed to initialize security secrets:", err)
|
log.Fatal("Failed to initialize security secrets:", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize session store
|
// Initialize DragonflyDB
|
||||||
middleware.InitSessionStore()
|
dragonflyClient := initializeDragonflyDB()
|
||||||
|
|
||||||
|
// Initialize session store with DragonflyDB
|
||||||
|
middleware.InitSessionStore(dragonflyClient)
|
||||||
log.Println("Session store initialized successfully")
|
log.Println("Session store initialized successfully")
|
||||||
|
|
||||||
|
// Initialize cache middleware with DragonflyDB
|
||||||
|
var cacheConfig middleware.CacheConfig
|
||||||
|
if dragonflyClient != nil {
|
||||||
|
cacheConfig = middleware.CacheConfig{
|
||||||
|
Duration: 5 * time.Minute,
|
||||||
|
KeyPrefix: "trackeep:",
|
||||||
|
Enabled: true,
|
||||||
|
RedisClient: dragonflyClient,
|
||||||
|
}
|
||||||
|
log.Println("DragonflyDB cache middleware initialized")
|
||||||
|
} else {
|
||||||
|
cacheConfig = middleware.DefaultCacheConfig()
|
||||||
|
log.Println("Using in-memory cache fallback")
|
||||||
|
}
|
||||||
|
|
||||||
// Seed demo data in background
|
// Seed demo data in background
|
||||||
// go func() {
|
// go func() {
|
||||||
// SeedData()
|
// SeedData()
|
||||||
@@ -95,7 +159,9 @@ func main() {
|
|||||||
// Middleware
|
// Middleware
|
||||||
r.Use(gin.Logger())
|
r.Use(gin.Logger())
|
||||||
r.Use(gin.Recovery())
|
r.Use(gin.Recovery())
|
||||||
r.Use(middleware.SessionMiddleware()) // Add session middleware
|
r.Use(middleware.CacheMiddleware(cacheConfig)) // Add DragonflyDB cache middleware
|
||||||
|
r.Use(middleware.CacheInvalidationMiddleware(dragonflyClient)) // Add cache invalidation
|
||||||
|
r.Use(middleware.SessionMiddleware()) // Add session middleware
|
||||||
r.Use(middleware.AuditMiddleware())
|
r.Use(middleware.AuditMiddleware())
|
||||||
r.Use(middleware.InputValidationMiddleware())
|
r.Use(middleware.InputValidationMiddleware())
|
||||||
|
|
||||||
@@ -125,10 +191,17 @@ func main() {
|
|||||||
// Serve static files (frontend)
|
// Serve static files (frontend)
|
||||||
r.Static("/assets", "../frontend/dist/assets")
|
r.Static("/assets", "../frontend/dist/assets")
|
||||||
r.StaticFile("/", "../frontend/dist/index.html")
|
r.StaticFile("/", "../frontend/dist/index.html")
|
||||||
|
|
||||||
|
// Serve browser extension download
|
||||||
|
r.GET("/browser-extension", handlers.DownloadBrowserExtension)
|
||||||
|
|
||||||
r.NoRoute(func(c *gin.Context) {
|
r.NoRoute(func(c *gin.Context) {
|
||||||
c.File("../frontend/dist/index.html")
|
c.File("../frontend/dist/index.html")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Version endpoint
|
||||||
|
r.GET("/api/version", handlers.GetVersionHandler)
|
||||||
|
|
||||||
// Initialize handlers
|
// Initialize handlers
|
||||||
memberHandler := handlers.NewMemberHandler(config.GetDB())
|
memberHandler := handlers.NewMemberHandler(config.GetDB())
|
||||||
timeEntryHandler := handlers.NewTimeEntryHandler(config.GetDB())
|
timeEntryHandler := handlers.NewTimeEntryHandler(config.GetDB())
|
||||||
@@ -203,11 +276,23 @@ func main() {
|
|||||||
authProtected.GET("/ai/settings", handlers.GetAISettings)
|
authProtected.GET("/ai/settings", handlers.GetAISettings)
|
||||||
authProtected.PUT("/ai/settings", handlers.UpdateAISettings)
|
authProtected.PUT("/ai/settings", handlers.UpdateAISettings)
|
||||||
authProtected.POST("/ai/test-connection", handlers.TestAIConnection)
|
authProtected.POST("/ai/test-connection", handlers.TestAIConnection)
|
||||||
|
|
||||||
|
// Search Settings routes
|
||||||
|
authProtected.GET("/search/settings", handlers.GetSearchSettings)
|
||||||
|
authProtected.PUT("/search/settings", handlers.UpdateSearchSettings)
|
||||||
|
|
||||||
|
// Update Settings routes
|
||||||
|
authProtected.GET("/update/settings", handlers.GetUpdateSettings)
|
||||||
|
authProtected.PUT("/update/settings", handlers.UpdateUpdateSettings)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test AI settings without auth
|
// Test AI settings without auth
|
||||||
v1.GET("/test-ai-settings", handlers.GetAISettings)
|
v1.GET("/test-ai-settings", handlers.GetAISettings)
|
||||||
|
|
||||||
|
// Test search and update settings without auth (for demo mode)
|
||||||
|
v1.GET("/test-search-settings", handlers.GetTestSearchSettings)
|
||||||
|
v1.GET("/test-update-settings", handlers.GetTestUpdateSettings)
|
||||||
|
|
||||||
// Dashboard routes (protected)
|
// Dashboard routes (protected)
|
||||||
dashboard := v1.Group("/dashboard")
|
dashboard := v1.Group("/dashboard")
|
||||||
dashboard.Use(handlers.AuthMiddleware())
|
dashboard.Use(handlers.AuthMiddleware())
|
||||||
@@ -369,6 +454,7 @@ func main() {
|
|||||||
messages.GET("/messages/:id/suggestions", handlers.GetMessageSuggestions)
|
messages.GET("/messages/:id/suggestions", handlers.GetMessageSuggestions)
|
||||||
messages.POST("/messages/:id/suggestions/:suggestionId/accept", handlers.AcceptMessageSuggestion)
|
messages.POST("/messages/:id/suggestions/:suggestionId/accept", handlers.AcceptMessageSuggestion)
|
||||||
messages.POST("/messages/:id/suggestions/:suggestionId/dismiss", handlers.DismissMessageSuggestion)
|
messages.POST("/messages/:id/suggestions/:suggestionId/dismiss", handlers.DismissMessageSuggestion)
|
||||||
|
messages.POST("/messages/:id/reveal-sensitive", handlers.RevealSensitiveMessage)
|
||||||
messages.GET("/ws", handlers.MessagesWebSocket)
|
messages.GET("/ws", handlers.MessagesWebSocket)
|
||||||
|
|
||||||
messages.GET("/password-vault/items", handlers.GetPasswordVaultItems)
|
messages.GET("/password-vault/items", handlers.GetPasswordVaultItems)
|
||||||
@@ -720,6 +806,24 @@ func main() {
|
|||||||
performance.POST("/optimize", performanceHandler.OptimizeDatabase)
|
performance.POST("/optimize", performanceHandler.OptimizeDatabase)
|
||||||
performance.POST("/cleanup-audit-logs", performanceHandler.CleanupOldAuditLogs)
|
performance.POST("/cleanup-audit-logs", performanceHandler.CleanupOldAuditLogs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Browser Extension API routes
|
||||||
|
browserExt := v1.Group("/browser-extension")
|
||||||
|
browserExt.Use(handlers.AuthMiddleware())
|
||||||
|
{
|
||||||
|
// API Key management
|
||||||
|
browserExt.POST("/api-keys/generate", handlers.GenerateAPIKey)
|
||||||
|
browserExt.GET("/api-keys", handlers.GetAPIKeys)
|
||||||
|
browserExt.DELETE("/api-keys/:id", handlers.RevokeAPIKey)
|
||||||
|
|
||||||
|
// Extension registration and validation
|
||||||
|
browserExt.POST("/register", handlers.RegisterBrowserExtension)
|
||||||
|
browserExt.GET("/extensions", handlers.GetBrowserExtensions)
|
||||||
|
browserExt.DELETE("/extensions/:id", handlers.RevokeBrowserExtension)
|
||||||
|
|
||||||
|
// Public endpoints (for extension validation)
|
||||||
|
browserExt.GET("/validate", handlers.ValidateAPIKey)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
srv := &http.Server{
|
srv := &http.Server{
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
package middleware
|
package middleware
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
"github.com/trackeep/backend/models"
|
"github.com/trackeep/backend/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -34,13 +37,15 @@ type SessionStore interface {
|
|||||||
|
|
||||||
// RedisSessionStore implements SessionStore using Redis (or fallback to memory)
|
// RedisSessionStore implements SessionStore using Redis (or fallback to memory)
|
||||||
type RedisSessionStore struct {
|
type RedisSessionStore struct {
|
||||||
sessions map[string]*SessionData // Fallback in-memory store
|
redisClient *redis.Client
|
||||||
|
sessions map[string]*SessionData // Fallback in-memory store
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewSessionStore creates a new session store
|
// NewSessionStore creates a new session store
|
||||||
func NewSessionStore() SessionStore {
|
func NewSessionStore(redisClient *redis.Client) SessionStore {
|
||||||
return &RedisSessionStore{
|
return &RedisSessionStore{
|
||||||
sessions: make(map[string]*SessionData),
|
redisClient: redisClient,
|
||||||
|
sessions: make(map[string]*SessionData),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,32 +53,109 @@ func NewSessionStore() SessionStore {
|
|||||||
func (r *RedisSessionStore) CreateSession(sessionData *SessionData) error {
|
func (r *RedisSessionStore) CreateSession(sessionData *SessionData) error {
|
||||||
sessionData.CreatedAt = time.Now()
|
sessionData.CreatedAt = time.Now()
|
||||||
sessionData.LastActive = time.Now()
|
sessionData.LastActive = time.Now()
|
||||||
|
|
||||||
|
// Try Redis first
|
||||||
|
if r.redisClient != nil {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
sessionJSON, err := json.Marshal(sessionData)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to marshal session data: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store in Redis with 24 hour expiration
|
||||||
|
err = r.redisClient.Set(ctx, "session:"+sessionData.SessionID, sessionJSON, 24*time.Hour).Err()
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Fall back to memory if Redis fails
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to in-memory storage
|
||||||
r.sessions[sessionData.SessionID] = sessionData
|
r.sessions[sessionData.SessionID] = sessionData
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetSession retrieves a session by ID
|
// GetSession retrieves a session by ID
|
||||||
func (r *RedisSessionStore) GetSession(sessionID string) (*SessionData, error) {
|
func (r *RedisSessionStore) GetSession(sessionID string) (*SessionData, error) {
|
||||||
|
// Try Redis first
|
||||||
|
if r.redisClient != nil {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
sessionJSON, err := r.redisClient.Get(ctx, "session:"+sessionID).Result()
|
||||||
|
if err == nil {
|
||||||
|
var sessionData SessionData
|
||||||
|
if err := json.Unmarshal([]byte(sessionJSON), &sessionData); err == nil {
|
||||||
|
// Update last active time
|
||||||
|
sessionData.LastActive = time.Now()
|
||||||
|
// Update in Redis
|
||||||
|
updatedJSON, _ := json.Marshal(sessionData)
|
||||||
|
r.redisClient.Set(ctx, "session:"+sessionID, updatedJSON, 24*time.Hour)
|
||||||
|
return &sessionData, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Fall back to memory if Redis fails
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to in-memory storage
|
||||||
if session, exists := r.sessions[sessionID]; exists {
|
if session, exists := r.sessions[sessionID]; exists {
|
||||||
// Update last active time
|
// Update last active time
|
||||||
session.LastActive = time.Now()
|
session.LastActive = time.Now()
|
||||||
return session, nil
|
return session, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf("session not found")
|
return nil, fmt.Errorf("session not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateSession updates an existing session
|
// UpdateSession updates an existing session
|
||||||
func (r *RedisSessionStore) UpdateSession(sessionID string, sessionData *SessionData) error {
|
func (r *RedisSessionStore) UpdateSession(sessionID string, sessionData *SessionData) error {
|
||||||
|
sessionData.LastActive = time.Now()
|
||||||
|
|
||||||
|
// Try Redis first
|
||||||
|
if r.redisClient != nil {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
sessionJSON, err := json.Marshal(sessionData)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to marshal session data: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = r.redisClient.Set(ctx, "session:"+sessionID, sessionJSON, 24*time.Hour).Err()
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Fall back to memory if Redis fails
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to in-memory storage
|
||||||
if _, exists := r.sessions[sessionID]; exists {
|
if _, exists := r.sessions[sessionID]; exists {
|
||||||
sessionData.LastActive = time.Now()
|
|
||||||
r.sessions[sessionID] = sessionData
|
r.sessions[sessionID] = sessionData
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Errorf("session not found")
|
return fmt.Errorf("session not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteSession removes a session
|
// DeleteSession removes a session
|
||||||
func (r *RedisSessionStore) DeleteSession(sessionID string) error {
|
func (r *RedisSessionStore) DeleteSession(sessionID string) error {
|
||||||
|
// Try Redis first
|
||||||
|
if r.redisClient != nil {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
err := r.redisClient.Del(ctx, "session:"+sessionID).Err()
|
||||||
|
if err == nil {
|
||||||
|
// Also remove from memory fallback
|
||||||
|
delete(r.sessions, sessionID)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// Fall back to memory if Redis fails
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to in-memory storage
|
||||||
delete(r.sessions, sessionID)
|
delete(r.sessions, sessionID)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -93,8 +175,8 @@ func (r *RedisSessionStore) CleanupExpiredSessions() error {
|
|||||||
var sessionStore SessionStore
|
var sessionStore SessionStore
|
||||||
|
|
||||||
// InitSessionStore initializes the session store
|
// InitSessionStore initializes the session store
|
||||||
func InitSessionStore() {
|
func InitSessionStore(redisClient *redis.Client) {
|
||||||
sessionStore = NewSessionStore()
|
sessionStore = NewSessionStore(redisClient)
|
||||||
|
|
||||||
// Start cleanup goroutine
|
// Start cleanup goroutine
|
||||||
go func() {
|
go func() {
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// APIKey represents an API key for browser extension
|
||||||
|
type APIKey struct {
|
||||||
|
ID uint `json:"id" gorm:"primaryKey"`
|
||||||
|
Name string `json:"name" gorm:"not null"`
|
||||||
|
Key string `json:"key" gorm:"not null;uniqueIndex"`
|
||||||
|
UserID uint `json:"user_id" gorm:"not null"`
|
||||||
|
Permissions []string `json:"permissions" gorm:"serializer:json"`
|
||||||
|
IsActive bool `json:"is_active" gorm:"default:true"`
|
||||||
|
LastUsed *time.Time `json:"last_used,omitempty" gorm:"not null"`
|
||||||
|
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime"`
|
||||||
|
ExpiresAt *time.Time `json:"expires_at,omitempty" gorm:"not null"`
|
||||||
|
User User `json:"user,omitempty" gorm:"foreignKey:UserID"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// BrowserExtension represents a browser extension registration
|
||||||
|
type BrowserExtension struct {
|
||||||
|
ID uint `json:"id" gorm:"primaryKey"`
|
||||||
|
UserID uint `json:"user_id" gorm:"not null"`
|
||||||
|
ExtensionID string `json:"extension_id" gorm:"not null"`
|
||||||
|
Name string `json:"name" gorm:"not null"`
|
||||||
|
IsActive bool `json:"is_active" gorm:"default:true"`
|
||||||
|
LastSeen *time.Time `json:"last_seen,omitempty" gorm:"not null"`
|
||||||
|
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime"`
|
||||||
|
User User `json:"user,omitempty" gorm:"foreignKey:UserID"`
|
||||||
|
}
|
||||||
@@ -49,6 +49,8 @@ func AutoMigrate() {
|
|||||||
&AISummary{},
|
&AISummary{},
|
||||||
&AITaskSuggestion{},
|
&AITaskSuggestion{},
|
||||||
&UserAISettings{},
|
&UserAISettings{},
|
||||||
|
&UserSearchSettings{},
|
||||||
|
&UserUpdateSettings{},
|
||||||
&AITagSuggestion{},
|
&AITagSuggestion{},
|
||||||
&AIContentGeneration{},
|
&AIContentGeneration{},
|
||||||
&AICodeReview{},
|
&AICodeReview{},
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UserSearchSettings stores user-specific search API configurations
|
||||||
|
type UserSearchSettings struct {
|
||||||
|
ID uint `json:"id" gorm:"primaryKey"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
DeletedAt gorm.DeletedAt `json:"-" gorm:"index"`
|
||||||
|
|
||||||
|
UserID uint `json:"user_id" gorm:"not null;uniqueIndex"`
|
||||||
|
User User `json:"user,omitempty" gorm:"foreignKey:UserID"`
|
||||||
|
|
||||||
|
// Brave Search Settings
|
||||||
|
BraveAPIKey string `json:"-" gorm:"column:brave_api_key"` // Encrypted
|
||||||
|
BraveSearchBaseURL string `json:"brave_search_base_url" gorm:"default:https://api.search.brave.com/res/v1/web/search"`
|
||||||
|
|
||||||
|
// Serper (Google) Search Settings
|
||||||
|
SerperAPIKey string `json:"-" gorm:"column:serper_api_key"` // Encrypted
|
||||||
|
SerperBaseURL string `json:"serper_base_url" gorm:"default:https://google.serper.dev/search"`
|
||||||
|
|
||||||
|
// Search Configuration
|
||||||
|
SearchAPIProvider string `json:"search_api_provider" gorm:"default:brave"` // brave, serper
|
||||||
|
SearchResultsLimit int `json:"search_results_limit" gorm:"default:10"`
|
||||||
|
SearchCacheTTL int `json:"search_cache_ttl" gorm:"default:300"` // seconds
|
||||||
|
SearchRateLimit int `json:"search_rate_limit" gorm:"default:100"` // requests per minute
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserSearchSettings retrieves search settings for a user
|
||||||
|
func GetUserSearchSettings(userID uint) (*UserSearchSettings, error) {
|
||||||
|
var settings UserSearchSettings
|
||||||
|
err := DB.Where("user_id = ?", userID).First(&settings).Error
|
||||||
|
if err != nil {
|
||||||
|
if err == gorm.ErrRecordNotFound {
|
||||||
|
// Create default settings
|
||||||
|
settings = UserSearchSettings{
|
||||||
|
UserID: userID,
|
||||||
|
BraveSearchBaseURL: "https://api.search.brave.com/res/v1/web/search",
|
||||||
|
SerperBaseURL: "https://google.serper.dev/search",
|
||||||
|
SearchAPIProvider: "brave",
|
||||||
|
SearchResultsLimit: 10,
|
||||||
|
SearchCacheTTL: 300,
|
||||||
|
SearchRateLimit: 100,
|
||||||
|
}
|
||||||
|
// Save defaults
|
||||||
|
if err := DB.Create(&settings).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &settings, nil
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &settings, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveUserSearchSettings saves search settings for a user
|
||||||
|
func SaveUserSearchSettings(userID uint, settings *UserSearchSettings) error {
|
||||||
|
settings.UserID = userID
|
||||||
|
return DB.Where("user_id = ?", userID).Assign(settings).FirstOrCreate(settings).Error
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UserUpdateSettings stores user-specific update and OAuth configurations
|
||||||
|
type UserUpdateSettings struct {
|
||||||
|
ID uint `json:"id" gorm:"primaryKey"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
|
DeletedAt gorm.DeletedAt `json:"-" gorm:"index"`
|
||||||
|
|
||||||
|
UserID uint `json:"user_id" gorm:"not null;uniqueIndex"`
|
||||||
|
User User `json:"user,omitempty" gorm:"foreignKey:UserID"`
|
||||||
|
|
||||||
|
// OAuth Service Configuration
|
||||||
|
OAuthServiceURL string `json:"oauth_service_url" gorm:"default:https://oauth.trackeep.org"`
|
||||||
|
|
||||||
|
// Update Configuration
|
||||||
|
AutoUpdateCheck bool `json:"auto_update_check" gorm:"default:false"`
|
||||||
|
UpdateCheckInterval string `json:"update_check_interval" gorm:"default:24h"` // 1h, 6h, 12h, 24h, 168h
|
||||||
|
PrereleaseUpdates bool `json:"prerelease_updates" gorm:"default:false"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserUpdateSettings retrieves update settings for a user
|
||||||
|
func GetUserUpdateSettings(userID uint) (*UserUpdateSettings, error) {
|
||||||
|
var settings UserUpdateSettings
|
||||||
|
err := DB.Where("user_id = ?", userID).First(&settings).Error
|
||||||
|
if err != nil {
|
||||||
|
if err == gorm.ErrRecordNotFound {
|
||||||
|
// Create default settings
|
||||||
|
settings = UserUpdateSettings{
|
||||||
|
UserID: userID,
|
||||||
|
OAuthServiceURL: "https://oauth.trackeep.org",
|
||||||
|
AutoUpdateCheck: false,
|
||||||
|
UpdateCheckInterval: "24h",
|
||||||
|
PrereleaseUpdates: false,
|
||||||
|
}
|
||||||
|
// Save defaults
|
||||||
|
if err := DB.Create(&settings).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &settings, nil
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &settings, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveUserUpdateSettings saves update settings for a user
|
||||||
|
func SaveUserUpdateSettings(userID uint, settings *UserUpdateSettings) error {
|
||||||
|
settings.UserID = userID
|
||||||
|
return DB.Where("user_id = ?", userID).Assign(settings).FirstOrCreate(settings).Error
|
||||||
|
}
|
||||||
@@ -48,10 +48,14 @@ type User struct {
|
|||||||
LockedUntil *time.Time `json:"locked_until"`
|
LockedUntil *time.Time `json:"locked_until"`
|
||||||
|
|
||||||
// Privacy Settings
|
// Privacy Settings
|
||||||
ProfileVisibility string `json:"profile_visibility" gorm:"default:public"` // public, private, friends
|
ProfileVisibility string `json:"profile_visibility" gorm:"default:private"` // public, private, friends
|
||||||
ShowEmail bool `json:"show_email" gorm:"default:false"`
|
EmailNotifications bool `json:"email_notifications" gorm:"default:true"`
|
||||||
ShowActivity bool `json:"show_activity" gorm:"default:true"`
|
PushNotifications bool `json:"push_notifications" gorm:"default:true"`
|
||||||
AllowMessages bool `json:"allow_messages" gorm:"default:true"`
|
|
||||||
|
// Social Features
|
||||||
|
ShowEmail bool `json:"show_email" gorm:"default:false"`
|
||||||
|
ShowActivity bool `json:"show_activity" gorm:"default:true"`
|
||||||
|
AllowMessages bool `json:"allow_messages" gorm:"default:true"`
|
||||||
|
|
||||||
// Social Stats
|
// Social Stats
|
||||||
FollowersCount int `json:"followers_count" gorm:"default:0"`
|
FollowersCount int `json:"followers_count" gorm:"default:0"`
|
||||||
|
|||||||
@@ -196,6 +196,10 @@ func (ff *FaviconFetcher) makeAbsoluteURL(href string, baseURL *url.URL) string
|
|||||||
if idx := strings.Index(href, "#"); idx != -1 {
|
if idx := strings.Index(href, "#"); idx != -1 {
|
||||||
href = href[:idx]
|
href = href[:idx]
|
||||||
}
|
}
|
||||||
|
href = strings.TrimSpace(href)
|
||||||
|
if href == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
// Handle different URL types
|
// Handle different URL types
|
||||||
if strings.HasPrefix(href, "http://") || strings.HasPrefix(href, "https://") {
|
if strings.HasPrefix(href, "http://") || strings.HasPrefix(href, "https://") {
|
||||||
@@ -206,22 +210,11 @@ func (ff *FaviconFetcher) makeAbsoluteURL(href string, baseURL *url.URL) string
|
|||||||
return baseURL.Scheme + ":" + href
|
return baseURL.Scheme + ":" + href
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.HasPrefix(href, "/") {
|
ref, err := url.Parse(href)
|
||||||
return baseURL.Scheme + "://" + baseURL.Host + href
|
if err != nil {
|
||||||
|
return href
|
||||||
}
|
}
|
||||||
|
return baseURL.ResolveReference(ref).String()
|
||||||
// Relative path - construct proper URL
|
|
||||||
if baseURL.Path == "" || baseURL.Path == "/" {
|
|
||||||
return baseURL.Scheme + "://" + baseURL.Host + "/" + href
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove filename from base path
|
|
||||||
basePath := baseURL.Path
|
|
||||||
if lastSlash := strings.LastIndex(basePath, "/"); lastSlash != -1 {
|
|
||||||
basePath = basePath[:lastSlash+1]
|
|
||||||
}
|
|
||||||
|
|
||||||
return baseURL.Scheme + "://" + baseURL.Host + basePath + href
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// tryCommonLocations tries common favicon file paths
|
// tryCommonLocations tries common favicon file paths
|
||||||
|
|||||||
@@ -1,77 +0,0 @@
|
|||||||
# YouTube Scraper Service
|
|
||||||
|
|
||||||
A standalone microservice for scraping YouTube video data. This service runs independently from the main Trackeep application.
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- **Mock YouTube Data**: Provides mock YouTube video data for development and testing
|
|
||||||
- **Channel Videos**: Fetch videos from specific YouTube channels
|
|
||||||
- **Search**: Search through YouTube video metadata
|
|
||||||
- **REST API**: Simple REST endpoints for integration
|
|
||||||
|
|
||||||
## API Endpoints
|
|
||||||
|
|
||||||
### Health Check
|
|
||||||
```
|
|
||||||
GET /
|
|
||||||
```
|
|
||||||
Returns service status and information.
|
|
||||||
|
|
||||||
### Get Channel Videos
|
|
||||||
```
|
|
||||||
GET /channel_videos?channel={channel_name}
|
|
||||||
```
|
|
||||||
Fetches videos for a specific YouTube channel.
|
|
||||||
|
|
||||||
**Parameters:**
|
|
||||||
- `channel`: YouTube channel name (e.g., "@Fireship", "@NetworkChuck")
|
|
||||||
|
|
||||||
### Search Videos
|
|
||||||
```
|
|
||||||
GET /search?q={query}
|
|
||||||
```
|
|
||||||
Searches through video titles, descriptions, and channel names.
|
|
||||||
|
|
||||||
**Parameters:**
|
|
||||||
- `q`: Search query
|
|
||||||
|
|
||||||
## Running the Service
|
|
||||||
|
|
||||||
### Development
|
|
||||||
```bash
|
|
||||||
cd youtube-scraper
|
|
||||||
go run .
|
|
||||||
```
|
|
||||||
|
|
||||||
### Production
|
|
||||||
```bash
|
|
||||||
cd youtube-scraper
|
|
||||||
go build -o youtube-scraper .
|
|
||||||
./youtube-scraper
|
|
||||||
```
|
|
||||||
|
|
||||||
### Docker
|
|
||||||
```bash
|
|
||||||
docker build -f ../Dockerfile.youtube-scraper -t youtube-scraper ..
|
|
||||||
docker run -p 7857:7857 youtube-scraper
|
|
||||||
```
|
|
||||||
|
|
||||||
## Environment Variables
|
|
||||||
|
|
||||||
- `PORT`: Service port (default: 7857)
|
|
||||||
|
|
||||||
## Mock Data
|
|
||||||
|
|
||||||
The service includes mock data for popular tech YouTube channels:
|
|
||||||
- @Fireship
|
|
||||||
- @NetworkChuck
|
|
||||||
- @beyondfireship
|
|
||||||
- @LinusTechTips
|
|
||||||
- @Mrwhosetheboss
|
|
||||||
- @JerryRigEverything
|
|
||||||
- @JeffGeerling
|
|
||||||
- @mkbhd
|
|
||||||
|
|
||||||
## Integration
|
|
||||||
|
|
||||||
This service is designed to be called by the main Trackeep application via HTTP requests. The main app can be configured to use this service for YouTube-related features.
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
module youtube-scraper
|
|
||||||
|
|
||||||
go 1.21
|
|
||||||
|
|
||||||
require github.com/gin-gonic/gin v1.9.1
|
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/bytedance/sonic v1.9.1 // indirect
|
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
|
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
|
|
||||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
|
||||||
github.com/go-playground/locales v0.14.1 // indirect
|
|
||||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
|
||||||
github.com/go-playground/validator/v10 v10.14.0 // indirect
|
|
||||||
github.com/goccy/go-json v0.10.2 // indirect
|
|
||||||
github.com/json-iterator/go v1.1.12 // indirect
|
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
|
|
||||||
github.com/leodido/go-urn v1.2.4 // indirect
|
|
||||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
|
||||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
|
||||||
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
|
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
|
||||||
github.com/ugorji/go/codec v1.2.11 // indirect
|
|
||||||
golang.org/x/arch v0.3.0 // indirect
|
|
||||||
golang.org/x/crypto v0.9.0 // indirect
|
|
||||||
golang.org/x/net v0.10.0 // indirect
|
|
||||||
golang.org/x/sys v0.8.0 // indirect
|
|
||||||
golang.org/x/text v0.9.0 // indirect
|
|
||||||
google.golang.org/protobuf v1.30.0 // indirect
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
|
||||||
)
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
|
|
||||||
github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
|
|
||||||
github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
|
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
|
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
|
|
||||||
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
|
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
|
|
||||||
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
|
|
||||||
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
|
|
||||||
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
|
|
||||||
github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
|
|
||||||
github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
|
|
||||||
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
|
|
||||||
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
|
|
||||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
|
|
||||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
|
|
||||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
|
|
||||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
|
|
||||||
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
|
||||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
|
||||||
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
|
|
||||||
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
|
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
|
||||||
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
|
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
|
||||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
|
||||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
|
|
||||||
github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
|
|
||||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
|
||||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
|
||||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
|
||||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
|
||||||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
|
||||||
github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
|
|
||||||
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
|
||||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
|
||||||
github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
|
|
||||||
github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
|
||||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
|
||||||
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
|
||||||
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
|
||||||
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
|
|
||||||
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
|
|
||||||
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
|
|
||||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
|
||||||
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
|
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
|
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
|
||||||
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
|
|
||||||
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
|
|
||||||
@@ -1,539 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io/ioutil"
|
|
||||||
"log"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"regexp"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type VideoResponse struct {
|
|
||||||
VideoID string `json:"video_id"`
|
|
||||||
ChannelName string `json:"channel_name"`
|
|
||||||
}
|
|
||||||
|
|
||||||
var ctx = context.Background()
|
|
||||||
|
|
||||||
// ChannelVideosResponse represents the response for channel videos scraping
|
|
||||||
type ChannelVideosResponse struct {
|
|
||||||
Channel string `json:"channel"`
|
|
||||||
ChannelURL string `json:"channel_url"`
|
|
||||||
SubscribersText string `json:"subscribers_text"`
|
|
||||||
Subscribers int64 `json:"subscribers"`
|
|
||||||
Videos []VideoItem `json:"videos"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// VideoItem holds per-video metadata extracted from the /videos page
|
|
||||||
type VideoItem struct {
|
|
||||||
VideoID string `json:"video_id"`
|
|
||||||
Title string `json:"title,omitempty"`
|
|
||||||
Length string `json:"length,omitempty"`
|
|
||||||
ThumbnailURL string `json:"thumbnail_url,omitempty"`
|
|
||||||
ViewsText string `json:"views_text,omitempty"`
|
|
||||||
Views int64 `json:"views"`
|
|
||||||
PublishedText string `json:"published_text,omitempty"`
|
|
||||||
PublishedDate string `json:"published_date,omitempty"` // ISO 8601 date
|
|
||||||
}
|
|
||||||
|
|
||||||
// normalizeChannelInput accepts a handle like "@FCBizoniUH" or "FCBizoniUH" or a full URL
|
|
||||||
// and returns the canonical handle (with leading @) and the corresponding /videos URL.
|
|
||||||
func normalizeChannelInput(input string) (handle string, url string) {
|
|
||||||
in := strings.TrimSpace(input)
|
|
||||||
lower := strings.ToLower(in)
|
|
||||||
isURL := strings.HasPrefix(lower, "http://") || strings.HasPrefix(lower, "https://") || strings.HasPrefix(lower, "www.") || strings.HasPrefix(lower, "youtube.com/")
|
|
||||||
if isURL {
|
|
||||||
// Ensure scheme
|
|
||||||
if strings.HasPrefix(lower, "www.") || strings.HasPrefix(lower, "youtube.com/") {
|
|
||||||
in = "https://" + strings.TrimPrefix(in, "www.")
|
|
||||||
if !strings.HasPrefix(strings.ToLower(in), "https://youtube.com/") && !strings.HasPrefix(strings.ToLower(in), "https://www.youtube.com/") {
|
|
||||||
in = "https://www." + strings.TrimPrefix(in, "https://")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Normalize m.youtube.com -> www.youtube.com
|
|
||||||
in = strings.ReplaceAll(in, "m.youtube.com", "www.youtube.com")
|
|
||||||
|
|
||||||
// Extract handle if present
|
|
||||||
reHandle := regexp.MustCompile(`https?://(www\.)?youtube\.com/(@[^/]+)`) // group with @
|
|
||||||
if m := reHandle.FindStringSubmatch(in); len(m) >= 3 {
|
|
||||||
handle = m[2]
|
|
||||||
} else {
|
|
||||||
// Try path segment after domain
|
|
||||||
rePath := regexp.MustCompile(`https?://(www\.)?youtube\.com/([^/?#]+)`) // capture after domain
|
|
||||||
if m2 := rePath.FindStringSubmatch(in); len(m2) >= 3 {
|
|
||||||
seg := m2[2]
|
|
||||||
if strings.HasPrefix(seg, "@") {
|
|
||||||
handle = seg
|
|
||||||
} else {
|
|
||||||
handle = "@" + seg
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Respect provided tab if present: /videos, /shorts, /streams; default to /videos
|
|
||||||
if strings.Contains(strings.ToLower(in), "/videos") || strings.Contains(strings.ToLower(in), "/shorts") || strings.Contains(strings.ToLower(in), "/streams") {
|
|
||||||
url = in
|
|
||||||
} else {
|
|
||||||
// Build a /videos URL from detected handle
|
|
||||||
if handle == "" {
|
|
||||||
// If we couldn't find a handle, just use the original URL
|
|
||||||
url = in
|
|
||||||
} else {
|
|
||||||
url = fmt.Sprintf("https://www.youtube.com/%s/videos", handle)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Not a URL; treat as handle or bare identifier
|
|
||||||
if strings.HasPrefix(in, "@") {
|
|
||||||
handle = in
|
|
||||||
} else {
|
|
||||||
handle = "@" + in
|
|
||||||
}
|
|
||||||
url = fmt.Sprintf("https://www.youtube.com/%s/videos", handle)
|
|
||||||
}
|
|
||||||
if handle == "" {
|
|
||||||
// As a final fallback from given input
|
|
||||||
handle = in
|
|
||||||
if !strings.HasPrefix(handle, "@") {
|
|
||||||
handle = "@" + handle
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// fetchChannelVideos scrapes the channel's /videos page and extracts video IDs present
|
|
||||||
func fetchChannelVideos(channelInput string) (ChannelVideosResponse, error) {
|
|
||||||
handle, channelURL := normalizeChannelInput(channelInput)
|
|
||||||
log.Printf("Fetching channel videos: handle=%s url=%s", handle, channelURL)
|
|
||||||
|
|
||||||
// Craft request with a desktop UA to improve likelihood of getting full HTML payload
|
|
||||||
req, err := http.NewRequest("GET", channelURL, nil)
|
|
||||||
if err != nil {
|
|
||||||
return ChannelVideosResponse{}, err
|
|
||||||
}
|
|
||||||
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36")
|
|
||||||
req.Header.Set("Accept-Language", "en-US,en;q=0.9")
|
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return ChannelVideosResponse{}, err
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
if resp.StatusCode != http.StatusOK {
|
|
||||||
return ChannelVideosResponse{}, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
body, err := ioutil.ReadAll(resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
return ChannelVideosResponse{}, err
|
|
||||||
}
|
|
||||||
html := string(body)
|
|
||||||
|
|
||||||
// Regex to capture all 11-char YouTube video IDs from initial data payload
|
|
||||||
// Standard videos
|
|
||||||
vidRe := regexp.MustCompile(`"videoRenderer":\{[^}]*?"videoId":"([a-zA-Z0-9_-]{11})"`)
|
|
||||||
matches := vidRe.FindAllStringSubmatchIndex(html, -1)
|
|
||||||
seen := make(map[string]struct{})
|
|
||||||
var videos []VideoItem
|
|
||||||
for _, idx := range matches {
|
|
||||||
if len(idx) < 4 { // need at least match start/end and group start/end
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Extract ID
|
|
||||||
id := html[idx[2]:idx[3]]
|
|
||||||
if _, ok := seen[id]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
seen[id] = struct{}{}
|
|
||||||
|
|
||||||
// Build a local window around the match to parse related fields
|
|
||||||
start := idx[0]
|
|
||||||
if start-2000 > 0 {
|
|
||||||
start = start - 2000
|
|
||||||
}
|
|
||||||
end := idx[1] + 8000
|
|
||||||
if end > len(html) {
|
|
||||||
end = len(html)
|
|
||||||
}
|
|
||||||
snippet := html[start:end]
|
|
||||||
|
|
||||||
vi := VideoItem{VideoID: id}
|
|
||||||
// Prefer deterministic thumbnail URL derived from video ID
|
|
||||||
vi.ThumbnailURL = fmt.Sprintf("https://img.youtube.com/vi/%s/maxresdefault.jpg", id)
|
|
||||||
|
|
||||||
// Title (may appear as simpleText or runs)
|
|
||||||
if m := regexp.MustCompile(`"title":\{"runs":\[\{"text":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.Title = unescapeYT(m[1])
|
|
||||||
} else if m := regexp.MustCompile(`"title":\{"simpleText":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.Title = unescapeYT(m[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Length
|
|
||||||
if m := regexp.MustCompile(`"lengthText":\{[^}]*"simpleText":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
// Generic lengthText.simpleText (with or without accessibility block)
|
|
||||||
vi.Length = m[1]
|
|
||||||
} else if m := regexp.MustCompile(`"lengthText":\{[^}]*"runs":\[\{"text":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
// lengthText.runs[0].text
|
|
||||||
vi.Length = m[1]
|
|
||||||
} else if m := regexp.MustCompile(`"thumbnailOverlays":\[[^\]]*?"thumbnailOverlayTimeStatusRenderer":\{"text":\{"simpleText":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
// Overlay badge duration
|
|
||||||
vi.Length = m[1]
|
|
||||||
} else if m := regexp.MustCompile(`yt-badge-shape__text">([^<]+)<`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
// Fallback: raw HTML badge text seen in thumbnails
|
|
||||||
vi.Length = strings.TrimSpace(m[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extra fallback: search the global HTML near the video anchor for DOM-based duration
|
|
||||||
if vi.Length == "" {
|
|
||||||
anchorRe := regexp.MustCompile(fmt.Sprintf(`<a[^>]+href="/watch\?v=%s[^\"]*"`, regexp.QuoteMeta(id)))
|
|
||||||
if loc := anchorRe.FindStringIndex(html); loc != nil {
|
|
||||||
// Search a forward window after the anchor for duration elements
|
|
||||||
start2 := loc[1]
|
|
||||||
end2 := start2 + 4000
|
|
||||||
if end2 > len(html) {
|
|
||||||
end2 = len(html)
|
|
||||||
}
|
|
||||||
chunk := html[start2:end2]
|
|
||||||
// Try yt-formatted-string id="length" inner text like 5:59
|
|
||||||
if m := regexp.MustCompile(`yt-formatted-string[^>]*id="length"[^>]*>([0-9]{1,2}:[0-9]{2}(?::[0-9]{2})?)<`).FindStringSubmatch(chunk); len(m) >= 2 {
|
|
||||||
vi.Length = strings.TrimSpace(m[1])
|
|
||||||
} else if m := regexp.MustCompile(`yt-formatted-string[^>]*id="length"[^>]*aria-label="([^"]+)"`).FindStringSubmatch(chunk); len(m) >= 2 {
|
|
||||||
if parsed := parseLocalizedDuration(unescapeYT(m[1])); parsed != "" {
|
|
||||||
vi.Length = parsed
|
|
||||||
}
|
|
||||||
} else if m := regexp.MustCompile(`yt-badge-shape__text">([^<]+)<`).FindStringSubmatch(chunk); len(m) >= 2 {
|
|
||||||
vi.Length = strings.TrimSpace(m[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Thumbnail URL (first in thumbnails array) as a fallback only if not set
|
|
||||||
if vi.ThumbnailURL == "" {
|
|
||||||
if m := regexp.MustCompile(`"thumbnail":\{"thumbnails":\[\{"url":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.ThumbnailURL = normalizeThumbURL(unescapeYT(m[1]))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Published time text (e.g., "3 days ago")
|
|
||||||
if m := regexp.MustCompile(`"publishedTimeText":\{"simpleText":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.PublishedText = m[1]
|
|
||||||
vi.PublishedDate = parseRelativeToISO(m[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Views
|
|
||||||
if m := regexp.MustCompile(`"viewCountText":\{"simpleText":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.ViewsText = m[1]
|
|
||||||
vi.Views = parseCountText(m[1])
|
|
||||||
} else if m := regexp.MustCompile(`"viewCountText":\{"runs":\[\{"text":"([^"]+)"`).FindStringSubmatch(snippet); len(m) >= 2 {
|
|
||||||
vi.ViewsText = m[1] + " views"
|
|
||||||
vi.Views = parseCountText(m[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
videos = append(videos, vi)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Attempt to derive a displayable channel handle/name
|
|
||||||
channelDisplay := handle
|
|
||||||
// Try to extract canonicalBaseUrl if present
|
|
||||||
canRe := regexp.MustCompile(`"canonicalBaseUrl":"\\/(@[^\"]+)"`)
|
|
||||||
if m := canRe.FindStringSubmatch(html); len(m) >= 2 {
|
|
||||||
channelDisplay = m[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract subscribers (header section)
|
|
||||||
subText := ""
|
|
||||||
// Try simpleText first
|
|
||||||
if m := regexp.MustCompile(`"subscriberCountText":\{"simpleText":"([^"]+)"`).FindStringSubmatch(html); len(m) >= 2 {
|
|
||||||
subText = m[1]
|
|
||||||
} else {
|
|
||||||
// Try runs: join all text segments inside subscriberCountText.runs
|
|
||||||
if loc := regexp.MustCompile(`"subscriberCountText":\{"runs":\[`).FindStringIndex(html); loc != nil {
|
|
||||||
// Take a slice starting at runs and limited length
|
|
||||||
slice := html[loc[1]:]
|
|
||||||
// Find the closing ]
|
|
||||||
if endIdx := strings.Index(slice, "]}"); endIdx != -1 {
|
|
||||||
runsChunk := slice[:endIdx]
|
|
||||||
// Collect all text fields inside runs
|
|
||||||
texts := regexp.MustCompile(`"text":"([^"]+)"`).FindAllStringSubmatch(runsChunk, -1)
|
|
||||||
var parts []string
|
|
||||||
for _, t := range texts {
|
|
||||||
if len(t) >= 2 {
|
|
||||||
parts = append(parts, unescapeYT(t[1]))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
subText = strings.Join(parts, "")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Fallbacks: approximateSubscriberCount or localized patterns like "131 odběratelů"
|
|
||||||
if subText == "" {
|
|
||||||
if m := regexp.MustCompile(`"approximateSubscriberCount":"([^"]+)"`).FindStringSubmatch(html); len(m) >= 2 {
|
|
||||||
subText = m[1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if subText == "" {
|
|
||||||
// Case-insensitive; match digits with optional spaces/commas/dots before localized label
|
|
||||||
if m := regexp.MustCompile(`(?i)([0-9][0-9\s\.,]*)\s*(odběratel(?:é|ů)?|subscribers?)`).FindStringSubmatch(html); len(m) >= 2 {
|
|
||||||
subText = strings.TrimSpace(m[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
subs := parseCountText(subText)
|
|
||||||
|
|
||||||
res := ChannelVideosResponse{
|
|
||||||
Channel: channelDisplay,
|
|
||||||
ChannelURL: channelURL,
|
|
||||||
SubscribersText: subText,
|
|
||||||
Subscribers: subs,
|
|
||||||
Videos: videos,
|
|
||||||
}
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// unescapeYT fixes escaped sequences in YouTube HTML JSON strings
|
|
||||||
func unescapeYT(s string) string {
|
|
||||||
s = strings.ReplaceAll(s, `\/`, `/`)
|
|
||||||
s = strings.ReplaceAll(s, `\u0026`, `&`)
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
// normalizeThumbURL ensures thumbnails use https and removes query artifacts if needed
|
|
||||||
func normalizeThumbURL(u string) string {
|
|
||||||
u = unescapeYT(u)
|
|
||||||
if strings.HasPrefix(u, "//") {
|
|
||||||
u = "https:" + u
|
|
||||||
}
|
|
||||||
return u
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseRelativeToISO converts strings like "3 days ago", "2 weeks ago", "1 year ago" to ISO date (yyyy-mm-dd)
|
|
||||||
func parseRelativeToISO(rel string) string {
|
|
||||||
now := time.Now()
|
|
||||||
lower := strings.ToLower(rel)
|
|
||||||
re := regexp.MustCompile(`(\d+)[\s-]*(second|minute|hour|day|week|month|year)s?\s+ago`)
|
|
||||||
if m := re.FindStringSubmatch(lower); len(m) >= 3 {
|
|
||||||
n, _ := strconv.Atoi(m[1])
|
|
||||||
unit := m[2]
|
|
||||||
dur := time.Duration(0)
|
|
||||||
switch unit {
|
|
||||||
case "second":
|
|
||||||
dur = time.Duration(n) * time.Second
|
|
||||||
return now.Add(-dur).Format("2006-01-02")
|
|
||||||
case "minute":
|
|
||||||
dur = time.Duration(n) * time.Minute
|
|
||||||
return now.Add(-dur).Format("2006-01-02")
|
|
||||||
case "hour":
|
|
||||||
dur = time.Duration(n) * time.Hour
|
|
||||||
return now.Add(-dur).Format("2006-01-02")
|
|
||||||
case "day":
|
|
||||||
return now.AddDate(0, 0, -n).Format("2006-01-02")
|
|
||||||
case "week":
|
|
||||||
return now.AddDate(0, 0, -7*n).Format("2006-01-02")
|
|
||||||
case "month":
|
|
||||||
return now.AddDate(0, -n, 0).Format("2006-01-02")
|
|
||||||
case "year":
|
|
||||||
return now.AddDate(-n, 0, 0).Format("2006-01-02")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Sometimes YouTube uses "Streamed X days ago" or "Premiered ..."
|
|
||||||
re2 := regexp.MustCompile(`(streamed|premiered|started|live)\s+(\d+)\s+(second|minute|hour|day|week|month|year)s?\s+ago`)
|
|
||||||
if m := re2.FindStringSubmatch(lower); len(m) >= 4 {
|
|
||||||
n, _ := strconv.Atoi(m[2])
|
|
||||||
unit := m[3]
|
|
||||||
switch unit {
|
|
||||||
case "second":
|
|
||||||
return now.Add(-time.Duration(n) * time.Second).Format("2006-01-02")
|
|
||||||
case "minute":
|
|
||||||
return now.Add(-time.Duration(n) * time.Minute).Format("2006-01-02")
|
|
||||||
case "hour":
|
|
||||||
return now.Add(-time.Duration(n) * time.Hour).Format("2006-01-02")
|
|
||||||
case "day":
|
|
||||||
return now.AddDate(0, 0, -n).Format("2006-01-02")
|
|
||||||
case "week":
|
|
||||||
return now.AddDate(0, 0, -7*n).Format("2006-01-02")
|
|
||||||
case "month":
|
|
||||||
return now.AddDate(0, -n, 0).Format("2006-01-02")
|
|
||||||
case "year":
|
|
||||||
return now.AddDate(-n, 0, 0).Format("2006-01-02")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseLocalizedDuration converts localized duration phrases (e.g., "5 minut a 59 sekund")
|
|
||||||
// into a mm:ss or hh:mm:ss string. Supports English and basic Czech variants.
|
|
||||||
func parseLocalizedDuration(s string) string {
|
|
||||||
t := strings.ToLower(strings.TrimSpace(s))
|
|
||||||
// Replace HTML entities and non-breaking spaces
|
|
||||||
t = strings.ReplaceAll(t, " ", " ")
|
|
||||||
t = strings.ReplaceAll(t, "\u00a0", " ")
|
|
||||||
t = strings.TrimSpace(t)
|
|
||||||
|
|
||||||
// If already in 00:00 or 0:00:00 form, return as-is trimmed
|
|
||||||
if m := regexp.MustCompile(`^\d{1,2}:\d{2}(?::\d{2})?$`).FindString(t); m != "" {
|
|
||||||
return m
|
|
||||||
}
|
|
||||||
|
|
||||||
// Patterns like: 1 hour 2 minutes 3 seconds (EN)
|
|
||||||
// or Czech: 1 hodina/hodiny/hodin, 2 minuty/minut, 3 sekundy/sekund
|
|
||||||
// We'll extract numbers for h/m/s separately.
|
|
||||||
var h, m, sec int
|
|
||||||
|
|
||||||
// English capture
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*hour`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
h, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*minute`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
m, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*second`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
sec, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Czech capture
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*hodin(?:a|y)?`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
if h == 0 {
|
|
||||||
h, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*minut(?:a|y)?`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
if m == 0 {
|
|
||||||
m, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if mm := regexp.MustCompile(`(\d+)\s*sekund(?:a|y)?`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
if sec == 0 {
|
|
||||||
sec, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we still didn't parse anything but string contains a plain number like "5 minutes",
|
|
||||||
// ensure we at least capture minutes.
|
|
||||||
if h == 0 && m == 0 && sec == 0 {
|
|
||||||
if mm := regexp.MustCompile(`^(\d+)$`).FindStringSubmatch(t); len(mm) >= 2 {
|
|
||||||
m, _ = strconv.Atoi(mm[1])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the time string
|
|
||||||
if h > 0 {
|
|
||||||
return fmt.Sprintf("%d:%02d:%02d", h, m, sec)
|
|
||||||
}
|
|
||||||
if m > 0 || sec > 0 {
|
|
||||||
return fmt.Sprintf("%d:%02d", m, sec)
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseCountText handles strings like "1,234 views", "12K subscribers", "3.4M"
|
|
||||||
func parseCountText(s string) int64 {
|
|
||||||
t := strings.ToLower(strings.TrimSpace(s))
|
|
||||||
// keep only the first number token
|
|
||||||
re := regexp.MustCompile(`([0-9]+(?:\.[0-9]+)?)([kmb])?`)
|
|
||||||
if m := re.FindStringSubmatch(t); len(m) >= 2 {
|
|
||||||
numStr := m[1]
|
|
||||||
suf := ""
|
|
||||||
if len(m) >= 3 {
|
|
||||||
suf = m[2]
|
|
||||||
}
|
|
||||||
f, err := strconv.ParseFloat(numStr, 64)
|
|
||||||
if err != nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
switch suf {
|
|
||||||
case "k":
|
|
||||||
f *= 1_000
|
|
||||||
case "m":
|
|
||||||
f *= 1_000_000
|
|
||||||
case "b":
|
|
||||||
f *= 1_000_000_000
|
|
||||||
}
|
|
||||||
return int64(f)
|
|
||||||
}
|
|
||||||
// Fallback: strip non-digits and parse
|
|
||||||
digits := regexp.MustCompile(`[^0-9]`).ReplaceAllString(t, "")
|
|
||||||
if digits == "" {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
v, _ := strconv.ParseInt(digits, 10, 64)
|
|
||||||
return v
|
|
||||||
}
|
|
||||||
|
|
||||||
func channelVideosHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
channel := r.URL.Query().Get("channel")
|
|
||||||
if channel == "" {
|
|
||||||
log.Println("Missing channel parameter")
|
|
||||||
http.Error(w, "Missing channel parameter. Provide a handle like @FCBizoniUH, FCBBizoniUH, or a full channel URL.", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
res, err := fetchChannelVideos(channel)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("Failed to fetch channel videos for %s: %v", channel, err)
|
|
||||||
http.Error(w, "Failed to fetch channel videos", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
json.NewEncoder(w).Encode(res)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CORS Middleware
|
|
||||||
func corsMiddleware(next http.Handler) http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Set CORS headers
|
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
|
|
||||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
|
||||||
|
|
||||||
// Handle preflight requests
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
next.ServeHTTP(w, r)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func rootHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
response := map[string]interface{}{
|
|
||||||
"status": "ok",
|
|
||||||
"service": "YouTube Scraper",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"endpoints": map[string]string{
|
|
||||||
"channel_videos": "/channel_videos?channel={handle_or_url}",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
json.NewEncoder(w).Encode(response)
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
port := os.Getenv("PORT")
|
|
||||||
if port == "" {
|
|
||||||
port = "7857"
|
|
||||||
}
|
|
||||||
|
|
||||||
mux := http.NewServeMux()
|
|
||||||
|
|
||||||
// Create a new mux with CORS middleware
|
|
||||||
handlerWithCORS := corsMiddleware(mux)
|
|
||||||
|
|
||||||
// Register routes on the original mux
|
|
||||||
mux.HandleFunc("/", rootHandler)
|
|
||||||
mux.HandleFunc("/channel_videos", channelVideosHandler)
|
|
||||||
|
|
||||||
log.Printf("YouTube Scraper starting on port %s", port)
|
|
||||||
log.Fatal(http.ListenAndServe(":"+port, handlerWithCORS))
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,217 @@
|
|||||||
|
/* global chrome, browser */
|
||||||
|
|
||||||
|
// Browser compatibility polyfill
|
||||||
|
if (typeof browser === 'undefined' && typeof chrome !== 'undefined') {
|
||||||
|
browser = chrome;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle keyboard commands
|
||||||
|
browser.commands.onCommand.addListener((command) => {
|
||||||
|
if (command === 'quick-save') {
|
||||||
|
// Get current tab and trigger quick save
|
||||||
|
browser.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
||||||
|
const tab = tabs && tabs[0];
|
||||||
|
if (tab) {
|
||||||
|
browser.storage.local.set({
|
||||||
|
contextMenuData: {
|
||||||
|
url: tab.url,
|
||||||
|
title: tab.title,
|
||||||
|
selection: '',
|
||||||
|
timestamp: Date.now(),
|
||||||
|
isQuickSave: true
|
||||||
|
}
|
||||||
|
}, () => {
|
||||||
|
browser.action.openPopup();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Handle first-time install
|
||||||
|
browser.runtime.onInstalled.addListener((details) => {
|
||||||
|
if (details.reason === 'install') {
|
||||||
|
// Set up first-time install flag
|
||||||
|
browser.storage.sync.set({
|
||||||
|
isFirstInstall: true,
|
||||||
|
installDate: new Date().toISOString()
|
||||||
|
}, () => {
|
||||||
|
// Open options page for first-time setup
|
||||||
|
browser.runtime.openOptionsPage();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create context menus
|
||||||
|
browser.contextMenus.create({
|
||||||
|
id: 'save-to-trackeep',
|
||||||
|
title: 'Save to Trackeep',
|
||||||
|
contexts: ['page', 'link', 'selection', 'image', 'video']
|
||||||
|
});
|
||||||
|
|
||||||
|
// Quick save menu
|
||||||
|
browser.contextMenus.create({
|
||||||
|
id: 'quick-save-to-trackeep',
|
||||||
|
title: 'Quick Save to Trackeep',
|
||||||
|
contexts: ['page']
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Handle context menu click
|
||||||
|
browser.contextMenus.onClicked.addListener(async (info, tab) => {
|
||||||
|
if (info.menuItemId !== 'save-to-trackeep' && info.menuItemId !== 'quick-save-to-trackeep') return;
|
||||||
|
|
||||||
|
// Detect content type and get smart data
|
||||||
|
const smartData = await detectContentType(info, tab);
|
||||||
|
|
||||||
|
// Open popup with pre-filled data based on context
|
||||||
|
const url = info.linkUrl || info.srcUrl || tab?.url || '';
|
||||||
|
const title = tab?.title || '';
|
||||||
|
const selection = info.selectionText || '';
|
||||||
|
|
||||||
|
// Store temporary data for popup to read
|
||||||
|
browser.storage.local.set({
|
||||||
|
contextMenuData: {
|
||||||
|
url,
|
||||||
|
title,
|
||||||
|
selection,
|
||||||
|
timestamp: Date.now(),
|
||||||
|
isQuickSave: info.menuItemId === 'quick-save-to-trackeep',
|
||||||
|
smartData
|
||||||
|
}
|
||||||
|
}, () => {
|
||||||
|
// Open popup (or focus it if already open)
|
||||||
|
browser.action.openPopup();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Smart content detection
|
||||||
|
async function detectContentType(info, tab) {
|
||||||
|
const url = info.linkUrl || info.srcUrl || tab?.url || '';
|
||||||
|
const title = tab?.title || '';
|
||||||
|
|
||||||
|
try {
|
||||||
|
const urlObj = new URL(url);
|
||||||
|
const domain = urlObj.hostname.toLowerCase();
|
||||||
|
|
||||||
|
// Video detection
|
||||||
|
if (url.includes('youtube.com/watch') || url.includes('youtu.be/')) {
|
||||||
|
return {
|
||||||
|
type: 'video',
|
||||||
|
platform: 'youtube',
|
||||||
|
suggestedTags: ['video', 'youtube', 'educational'],
|
||||||
|
autoTitle: extractYouTubeTitle(url) || title
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (url.includes('vimeo.com') || url.includes('dailymotion.com')) {
|
||||||
|
return {
|
||||||
|
type: 'video',
|
||||||
|
platform: domain.replace('.com', ''),
|
||||||
|
suggestedTags: ['video', domain.replace('.com', '')]
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Social media detection
|
||||||
|
if (domain.includes('twitter.com') || domain.includes('x.com')) {
|
||||||
|
return {
|
||||||
|
type: 'social',
|
||||||
|
platform: 'twitter',
|
||||||
|
suggestedTags: ['social', 'twitter', 'tweet']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (domain.includes('linkedin.com')) {
|
||||||
|
return {
|
||||||
|
type: 'social',
|
||||||
|
platform: 'linkedin',
|
||||||
|
suggestedTags: ['social', 'linkedin', 'professional']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (domain.includes('reddit.com')) {
|
||||||
|
return {
|
||||||
|
type: 'social',
|
||||||
|
platform: 'reddit',
|
||||||
|
suggestedTags: ['social', 'reddit', 'discussion']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Development platforms
|
||||||
|
if (domain.includes('github.com')) {
|
||||||
|
return {
|
||||||
|
type: 'code',
|
||||||
|
platform: 'github',
|
||||||
|
suggestedTags: ['code', 'github', 'development', 'repository']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (domain.includes('stackoverflow.com')) {
|
||||||
|
return {
|
||||||
|
type: 'code',
|
||||||
|
platform: 'stackoverflow',
|
||||||
|
suggestedTags: ['code', 'stackoverflow', 'programming', 'qa']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if (domain.includes('medium.com')) {
|
||||||
|
return {
|
||||||
|
type: 'article',
|
||||||
|
platform: 'medium',
|
||||||
|
suggestedTags: ['article', 'blog', 'medium']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Documentation
|
||||||
|
if (domain.includes('docs.') || domain.includes('documentation')) {
|
||||||
|
return {
|
||||||
|
type: 'documentation',
|
||||||
|
suggestedTags: ['documentation', 'docs', 'reference']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// News sites
|
||||||
|
if (domain.includes('news.') || domain.includes('cnn.com') || domain.includes('bbc.com') ||
|
||||||
|
domain.includes('reuters.com') || domain.includes('washingtonpost.com')) {
|
||||||
|
return {
|
||||||
|
type: 'news',
|
||||||
|
suggestedTags: ['news', 'article', 'current-events']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// E-commerce
|
||||||
|
if (domain.includes('amazon.com') || domain.includes('ebay.com') ||
|
||||||
|
domain.includes('shopify.com') || domain.includes('etsy.com')) {
|
||||||
|
return {
|
||||||
|
type: 'shopping',
|
||||||
|
suggestedTags: ['shopping', 'product', 'ecommerce']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default detection
|
||||||
|
return {
|
||||||
|
type: 'general',
|
||||||
|
suggestedTags: ['bookmark', 'webpage']
|
||||||
|
};
|
||||||
|
|
||||||
|
} catch (e) {
|
||||||
|
return {
|
||||||
|
type: 'general',
|
||||||
|
suggestedTags: ['bookmark', 'webpage']
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract YouTube video title
|
||||||
|
function extractYouTubeTitle(url) {
|
||||||
|
try {
|
||||||
|
const urlObj = new URL(url);
|
||||||
|
const videoId = urlObj.searchParams.get('v');
|
||||||
|
if (videoId) {
|
||||||
|
// In a real implementation, you might fetch YouTube API
|
||||||
|
// For now, return null and let the page title be used
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
/* global chrome, browser */
|
||||||
|
|
||||||
|
// Browser compatibility polyfill
|
||||||
|
if (typeof browser === 'undefined' && typeof chrome !== 'undefined') {
|
||||||
|
browser = chrome;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Export the browser object for use in other scripts
|
||||||
|
if (typeof module !== 'undefined' && module.exports) {
|
||||||
|
module.exports = browser;
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 769 B |
Binary file not shown.
|
After Width: | Height: | Size: 181 B |
Binary file not shown.
|
After Width: | Height: | Size: 275 B |
Binary file not shown.
|
After Width: | Height: | Size: 346 B |
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 3,
|
"manifest_version": 3,
|
||||||
"name": "Trackeep Saver",
|
"name": "Trackeep Saver",
|
||||||
"version": "0.1.0",
|
"version": "0.2.0",
|
||||||
"description": "Save the current page or a file to your Trackeep account as a bookmark or upload.",
|
"description": "Smart content detection and quick saving for Trackeep with auto-tagging and recommendations.",
|
||||||
"action": {
|
"action": {
|
||||||
"default_popup": "popup.html",
|
"default_popup": "popup.html",
|
||||||
"default_title": "Save to Trackeep"
|
"default_title": "Save to Trackeep"
|
||||||
@@ -15,11 +15,21 @@
|
|||||||
"storage",
|
"storage",
|
||||||
"tabs",
|
"tabs",
|
||||||
"activeTab",
|
"activeTab",
|
||||||
"contextMenus"
|
"contextMenus",
|
||||||
|
"scripting"
|
||||||
],
|
],
|
||||||
"host_permissions": [
|
"host_permissions": [
|
||||||
"<all_urls>"
|
"<all_urls>"
|
||||||
],
|
],
|
||||||
|
"commands": {
|
||||||
|
"quick-save": {
|
||||||
|
"suggested_key": {
|
||||||
|
"default": "Ctrl+Shift+S",
|
||||||
|
"mac": "Command+Shift+S"
|
||||||
|
},
|
||||||
|
"description": "Quick save current page to Trackeep"
|
||||||
|
}
|
||||||
|
},
|
||||||
"icons": {
|
"icons": {
|
||||||
"16": "icons/icon16.png",
|
"16": "icons/icon16.png",
|
||||||
"32": "icons/icon32.png",
|
"32": "icons/icon32.png",
|
||||||
@@ -0,0 +1,903 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en" data-kb-theme="dark">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<title>Trackeep Saver – Options</title>
|
||||||
|
<style>
|
||||||
|
/* Modern Inter Font */
|
||||||
|
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap');
|
||||||
|
|
||||||
|
/* Modern CSS Variables - Proton Pass Inspired */
|
||||||
|
:root {
|
||||||
|
--bg-primary: #0f0f0f;
|
||||||
|
--bg-secondary: #1a1a1a;
|
||||||
|
--bg-tertiary: #262626;
|
||||||
|
--bg-hover: #2a2a2a;
|
||||||
|
--bg-active: #333333;
|
||||||
|
--border-primary: #2a2a2a;
|
||||||
|
--border-secondary: #333333;
|
||||||
|
--text-primary: #ffffff;
|
||||||
|
--text-secondary: #a3a3a3;
|
||||||
|
--text-tertiary: #737373;
|
||||||
|
--accent-primary: #3b82f6;
|
||||||
|
--accent-hover: #2563eb;
|
||||||
|
--success: #10b981;
|
||||||
|
--warning: #f59e0b;
|
||||||
|
--error: #ef4444;
|
||||||
|
--gradient-primary: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%);
|
||||||
|
--gradient-secondary: linear-gradient(135deg, #1a1a1a 0%, #262626 100%);
|
||||||
|
--shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.3);
|
||||||
|
--shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.4);
|
||||||
|
--shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.5);
|
||||||
|
--radius-sm: 6px;
|
||||||
|
--radius-md: 8px;
|
||||||
|
--radius-lg: 12px;
|
||||||
|
--radius-xl: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
min-height: 100vh;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
line-height: 1.6;
|
||||||
|
font-size: 14px;
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Container */
|
||||||
|
.container {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 40px;
|
||||||
|
background: var(--bg-primary);
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header */
|
||||||
|
.header {
|
||||||
|
background: var(--gradient-secondary);
|
||||||
|
padding: 32px 20px 20px;
|
||||||
|
border-bottom: 1px solid var(--border-primary);
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: 3px;
|
||||||
|
background: var(--gradient-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-content {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo-container {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
background: var(--gradient-primary);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: white;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 20px;
|
||||||
|
box-shadow: var(--shadow-lg);
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: -50%;
|
||||||
|
left: -50%;
|
||||||
|
width: 200%;
|
||||||
|
height: 200%;
|
||||||
|
background: linear-gradient(45deg, transparent, rgba(255,255,255,0.1), transparent);
|
||||||
|
transform: rotate(45deg);
|
||||||
|
animation: shimmer 3s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes shimmer {
|
||||||
|
0% { transform: translateX(-100%) translateY(-100%) rotate(45deg); }
|
||||||
|
100% { transform: translateX(100%) translateY(100%) rotate(45deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.title-section {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
font-size: 28px;
|
||||||
|
font-weight: 700;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0 0 4px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.subtitle {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Main Content */
|
||||||
|
.main-content {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Section */
|
||||||
|
.section {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: var(--radius-lg);
|
||||||
|
padding: 32px;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
box-shadow: var(--shadow-lg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 16px;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
padding-bottom: 16px;
|
||||||
|
border-bottom: 1px solid var(--border-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-icon {
|
||||||
|
width: 48px;
|
||||||
|
height: 48px;
|
||||||
|
background: var(--gradient-primary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
color: white;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-title {
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section-description {
|
||||||
|
font-size: 14px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 4px 0 0 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Form Elements */
|
||||||
|
.form {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Install Welcome Styles */
|
||||||
|
.install-welcome {
|
||||||
|
padding: 40px 20px;
|
||||||
|
min-height: 100vh;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.install-card {
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
border-radius: var(--radius-xl);
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
box-shadow: var(--shadow-lg);
|
||||||
|
max-width: 600px;
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.install-header {
|
||||||
|
background: var(--gradient-primary);
|
||||||
|
padding: 32px;
|
||||||
|
text-align: center;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.install-icon {
|
||||||
|
font-size: 48px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.install-header h2 {
|
||||||
|
margin: 0 0 8px 0;
|
||||||
|
font-size: 24px;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.install-header p {
|
||||||
|
margin: 0;
|
||||||
|
opacity: 0.9;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-steps {
|
||||||
|
padding: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step {
|
||||||
|
display: flex;
|
||||||
|
gap: 20px;
|
||||||
|
margin-bottom: 32px;
|
||||||
|
align-items: flex-start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-number {
|
||||||
|
background: var(--accent-primary);
|
||||||
|
color: white;
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-weight: 700;
|
||||||
|
font-size: 16px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-content h3 {
|
||||||
|
margin: 0 0 8px 0;
|
||||||
|
font-size: 18px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.step-content p {
|
||||||
|
margin: 0 0 12px 0;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.security-note {
|
||||||
|
background: rgba(16, 185, 129, 0.1);
|
||||||
|
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 12px;
|
||||||
|
margin-top: 16px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.security-note .icon {
|
||||||
|
color: var(--success);
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.security-note strong {
|
||||||
|
color: var(--success);
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-options {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Setup Form Styles */
|
||||||
|
.setup-form {
|
||||||
|
margin-top: 16px;
|
||||||
|
padding: 16px;
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form .form-group {
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form .form-group:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form label {
|
||||||
|
display: block;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form .form-input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 12px 14px;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
background: var(--bg-secondary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 14px;
|
||||||
|
font-family: 'Inter', sans-serif;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form .form-input:focus {
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
background: var(--bg-hover);
|
||||||
|
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-form .input-help {
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-top: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
margin-top: 24px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.setup-actions .btn {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Button Groups */
|
||||||
|
.btn-group {
|
||||||
|
display: flex;
|
||||||
|
gap: 12px;
|
||||||
|
margin-top: 20px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-group .btn {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Full Width Elements */
|
||||||
|
.btn-block {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Instructions */
|
||||||
|
.instructions {
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 16px;
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
margin-top: 16px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="url"],
|
||||||
|
input[type="password"] {
|
||||||
|
width: 100%;
|
||||||
|
padding: 14px 16px;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
color: var(--text-primary);
|
||||||
|
font-size: 14px;
|
||||||
|
font-family: 'Inter', sans-serif;
|
||||||
|
font-weight: 400;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
input[type="text"]:focus,
|
||||||
|
input[type="url"]:focus,
|
||||||
|
input[type="password"]:focus {
|
||||||
|
border-color: var(--accent-primary);
|
||||||
|
background: var(--bg-hover);
|
||||||
|
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Instructions */
|
||||||
|
.instructions {
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 16px;
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.instructions-title {
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--text-primary);
|
||||||
|
margin: 0 0 8px 0;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.instructions-list {
|
||||||
|
font-size: 13px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin: 0;
|
||||||
|
padding-left: 16px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.instructions-list li {
|
||||||
|
margin-bottom: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.instructions-list li:last-child {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Buttons */
|
||||||
|
.btn {
|
||||||
|
padding: 14px 24px;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
border: none;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: 'Inter', sans-serif;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 8px;
|
||||||
|
outline: none;
|
||||||
|
position: relative;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn::before {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: -100%;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: linear-gradient(90deg, transparent, rgba(255,255,255,0.1), transparent);
|
||||||
|
transition: left 0.5s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:hover::before {
|
||||||
|
left: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
background: var(--gradient-primary);
|
||||||
|
color: white;
|
||||||
|
box-shadow: var(--shadow-sm);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:hover {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: var(--shadow-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:active {
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: not-allowed;
|
||||||
|
transform: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Status Messages */
|
||||||
|
.status-message {
|
||||||
|
padding: 16px 20px;
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-top: 20px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
animation: slideUp 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideUp {
|
||||||
|
from { opacity: 0; transform: translateY(10px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-message.success {
|
||||||
|
background: rgba(16, 185, 129, 0.1);
|
||||||
|
color: var(--success);
|
||||||
|
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.security-badge {
|
||||||
|
background: rgba(16, 185, 129, 0.1);
|
||||||
|
border: 1px solid rgba(16, 185, 129, 0.2);
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
padding: 6px 10px;
|
||||||
|
font-size: 11px;
|
||||||
|
font-weight: 600;
|
||||||
|
color: var(--success);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.security-badge .icon {
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-status {
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
border-radius: var(--radius-md);
|
||||||
|
padding: 16px;
|
||||||
|
margin-top: 20px;
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-status.connected {
|
||||||
|
border-color: var(--success);
|
||||||
|
background: rgba(16, 185, 129, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.connection-status.error {
|
||||||
|
border-color: var(--error);
|
||||||
|
background: rgba(239, 68, 68, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-message.info {
|
||||||
|
background: rgba(59, 130, 246, 0.1);
|
||||||
|
color: var(--accent-primary);
|
||||||
|
border: 1px solid rgba(59, 130, 246, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Code styling */
|
||||||
|
code {
|
||||||
|
background: var(--bg-tertiary);
|
||||||
|
padding: 3px 8px;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
font-size: 12px;
|
||||||
|
color: var(--text-primary);
|
||||||
|
border: 1px solid var(--border-primary);
|
||||||
|
font-family: 'Fira Code', 'Monaco', 'Consolas', monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Icon System */
|
||||||
|
.icon {
|
||||||
|
width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: middle;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
fill: white;
|
||||||
|
stroke: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-sm {
|
||||||
|
width: 12px;
|
||||||
|
height: 12px;
|
||||||
|
fill: white;
|
||||||
|
stroke: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-lg {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
fill: white;
|
||||||
|
stroke: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-xl {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
fill: white;
|
||||||
|
stroke: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* External SVG Icons */
|
||||||
|
img.icon {
|
||||||
|
filter: brightness(0) invert(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
img.icon-sm {
|
||||||
|
filter: brightness(0) invert(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
img.icon-lg {
|
||||||
|
filter: brightness(0) invert(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
img.icon-xl {
|
||||||
|
filter: brightness(0) invert(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Icon animations */
|
||||||
|
.icon-spin {
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-pulse {
|
||||||
|
animation: pulse 2s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
from { transform: rotate(0deg); }
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0%, 100% { opacity: 1; transform: scale(1); }
|
||||||
|
50% { opacity: 0.8; transform: scale(1.05); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Enhanced button icons */
|
||||||
|
.btn .icon {
|
||||||
|
transition: transform 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:hover .icon {
|
||||||
|
transform: scale(1.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:active .icon {
|
||||||
|
transform: scale(0.95);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Section icon enhancements */
|
||||||
|
.section-icon {
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section:hover .section-icon {
|
||||||
|
transform: scale(1.05) rotate(5deg);
|
||||||
|
box-shadow: var(--shadow-md);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Responsive */
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.container {
|
||||||
|
padding: 20px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.section {
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
padding: 24px 16px 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
font-size: 24px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<!-- First-time Install Welcome -->
|
||||||
|
<div id="installWelcome" class="install-welcome" style="display: none;">
|
||||||
|
<div class="install-card">
|
||||||
|
<div class="install-header">
|
||||||
|
<div class="install-icon">🎉</div>
|
||||||
|
<h2>Welcome to Trackeep Saver!</h2>
|
||||||
|
<p>Let's set up your connection to get started.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="setup-steps">
|
||||||
|
<div class="step">
|
||||||
|
<div class="step-number">1</div>
|
||||||
|
<div class="step-content">
|
||||||
|
<h3>Get Your API Key</h3>
|
||||||
|
<p>Log into your Trackeep account and generate an API key in Settings → Security.</p>
|
||||||
|
<div class="security-note">
|
||||||
|
<img src="https://www.svgrepo.com/show/381193/secure-shield-password-protect-safe.svg" alt="Security" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<strong>Secure:</strong> API keys are safer than JWT tokens and can be revoked anytime.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="step">
|
||||||
|
<div class="step-number">2</div>
|
||||||
|
<div class="step-content">
|
||||||
|
<h3>Configure Connection</h3>
|
||||||
|
<p>Enter your Trackeep URL and API key below.</p>
|
||||||
|
|
||||||
|
<div class="setup-form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="setupApiUrl">Trackeep URL</label>
|
||||||
|
<input type="url" id="setupApiUrl" placeholder="https://your-trackeep.com/api/v1" class="form-input" />
|
||||||
|
<div class="input-help">Your Trackeep instance API URL</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="setupApiKey">API Key</label>
|
||||||
|
<input type="password" id="setupApiKey" placeholder="tk_..." class="form-input" />
|
||||||
|
<div class="input-help">
|
||||||
|
<div class="security-badge">
|
||||||
|
<img src="https://www.svgrepo.com/show/381193/secure-shield-password-protect-safe.svg" alt="Security" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<span>Secure API Key</span>
|
||||||
|
</div>
|
||||||
|
More secure than JWT tokens, revocable anytime
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="step">
|
||||||
|
<div class="step-number">3</div>
|
||||||
|
<div class="step-content">
|
||||||
|
<h3>
|
||||||
|
<img src="https://www.svgrepo.com/show/448375/connection-gateway.svg" alt="Test" class="icon" style="width: 20px; height: 20px; margin-right: 8px;" />
|
||||||
|
Test Connection
|
||||||
|
</h3>
|
||||||
|
<p>Verify your connection works before saving bookmarks.</p>
|
||||||
|
|
||||||
|
<div id="setupConnectionStatus" class="connection-status" style="display: none;">
|
||||||
|
<div class="status-content">
|
||||||
|
<img src="https://www.svgrepo.com/show/448375/connection-gateway.svg" alt="Status" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<div>
|
||||||
|
<strong id="setupStatusTitle">Testing Connection...</strong>
|
||||||
|
<p id="setupStatusMessage">Please wait</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="setup-actions">
|
||||||
|
<button id="testSetupConnectionBtn" class="btn btn-primary">
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<path d="M9 11l3 3L22 8l-3-3-6-6z"></path>
|
||||||
|
<path d="M21 12v.01M5 12c0-4.41 3.58-8 8s8 3.58 8 8-3.58 8-8-8z"></path>
|
||||||
|
</svg>
|
||||||
|
Test Connection
|
||||||
|
</button>
|
||||||
|
<button id="completeSetupBtn" class="btn btn-secondary">
|
||||||
|
<img src="https://www.svgrepo.com/show/521819/save.svg" alt="Complete" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
Complete Setup
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Main Options -->
|
||||||
|
<div id="mainOptions" class="container">
|
||||||
|
<header class="header">
|
||||||
|
<div class="header-content">
|
||||||
|
<div class="logo-container">
|
||||||
|
<div class="logo">
|
||||||
|
<img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/trackeep.svg" alt="Trackeep" class="icon-xl" style="width: 24px; height: 24px; fill: white;" />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h1 class="title">Trackeep Saver</h1>
|
||||||
|
<p class="subtitle">Browser Extension Settings</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<main class="main-content">
|
||||||
|
<section class="section">
|
||||||
|
<div class="section-header">
|
||||||
|
<div class="section-icon">
|
||||||
|
<img src="https://www.svgrepo.com/show/505495/settings.svg" alt="Settings" class="icon-xl" style="width: 24px; height: 24px;" />
|
||||||
|
</div>
|
||||||
|
<h2 class="section-title">Connection Settings</h2>
|
||||||
|
<p class="section-description">Configure your Trackeep connection and API key</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form id="optionsForm" class="form">
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="trackeepApiUrl">Trackeep URL</label>
|
||||||
|
<input type="url" id="trackeepApiUrl" placeholder="https://your-trackeep.com/api/v1" class="form-input" />
|
||||||
|
<div class="input-help">Your Trackeep instance API URL</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="trackeepApiKey">API Key</label>
|
||||||
|
<input type="password" id="trackeepApiKey" placeholder="tk_..." class="form-input" />
|
||||||
|
<div class="input-help">
|
||||||
|
<div class="security-badge">
|
||||||
|
<img src="https://www.svgrepo.com/show/381193/secure-shield-password-protect-safe.svg" alt="Security" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<span>Secure API Key</span>
|
||||||
|
</div>
|
||||||
|
More secure than JWT tokens, revocable anytime
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="connectionStatus" class="connection-status" style="display: none;">
|
||||||
|
<div class="status-content">
|
||||||
|
<img src="https://www.svgrepo.com/show/448375/connection-gateway.svg" alt="Status" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<div>
|
||||||
|
<strong id="statusTitle">Testing Connection...</strong>
|
||||||
|
<p id="statusMessage">Please wait</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<div class="btn-group">
|
||||||
|
<button id="testConnectionBtn" class="btn btn-primary">
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<path d="M9 11l3 3L22 8l-3-3-6-6z"></path>
|
||||||
|
<path d="M21 12v.01M5 12c0-4.41 3.58-8 8s8 3.58 8 8-3.58 8-8-8z"></path>
|
||||||
|
</svg>
|
||||||
|
Test Connection
|
||||||
|
</button>
|
||||||
|
<button id="generateKeyBtn" class="btn btn-secondary">
|
||||||
|
<img src="https://www.svgrepo.com/show/532805/file-shredder.svg" alt="Generate" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
Generate API Key
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="instructions">
|
||||||
|
<div class="instructions-title">
|
||||||
|
<img src="https://www.svgrepo.com/show/447845/website-click.svg" alt="Instructions" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<span>How to get your API key:</span>
|
||||||
|
</div>
|
||||||
|
<ol class="instructions-list">
|
||||||
|
<li>Log into your Trackeep account</li>
|
||||||
|
<li>Go to Settings → Security</li>
|
||||||
|
<li>Click "Generate New API Key"</li>
|
||||||
|
<li>Copy the generated key (starts with <code>tk_</code>)</li>
|
||||||
|
<li>Paste the key in the field above</li>
|
||||||
|
<li><strong>API keys are more secure than JWT tokens</strong> - they can be revoked anytime and have limited permissions</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button class="btn btn-primary" id="saveBtn" style="margin-top: 24px;">
|
||||||
|
<img src="https://www.svgrepo.com/show/521819/save.svg" alt="Save" class="icon" style="width: 16px; height: 16px;" />
|
||||||
|
<span>Save Settings</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div id="statusMessage" class="status-message" style="display: none;"></div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script src="options.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,374 @@
|
|||||||
|
/* global chrome, browser */
|
||||||
|
|
||||||
|
// Browser compatibility polyfill
|
||||||
|
if (typeof browser === 'undefined' && typeof chrome !== 'undefined') {
|
||||||
|
browser = chrome;
|
||||||
|
}
|
||||||
|
|
||||||
|
const apiBaseUrlInput = document.getElementById('trackeepApiUrl');
|
||||||
|
const apiKeyInput = document.getElementById('trackeepApiKey');
|
||||||
|
const testConnectionBtn = document.getElementById('testConnectionBtn');
|
||||||
|
const generateKeyBtn = document.getElementById('generateKeyBtn');
|
||||||
|
const saveBtn = document.getElementById('saveBtn');
|
||||||
|
const statusMessageEl = document.getElementById('statusMessage');
|
||||||
|
const connectionStatusEl = document.getElementById('connectionStatus');
|
||||||
|
const statusTitleEl = document.getElementById('statusTitle');
|
||||||
|
const statusTextEl = document.getElementById('statusMessage');
|
||||||
|
const installWelcomeEl = document.getElementById('installWelcome');
|
||||||
|
const mainOptionsEl = document.getElementById('mainOptions');
|
||||||
|
|
||||||
|
function showMessage(message, type = 'info', duration = 5000) {
|
||||||
|
statusMessageEl.textContent = message;
|
||||||
|
statusMessageEl.className = `status-message ${type}`;
|
||||||
|
statusMessageEl.style.display = 'flex';
|
||||||
|
|
||||||
|
if (duration > 0) {
|
||||||
|
setTimeout(() => {
|
||||||
|
statusMessageEl.style.display = 'none';
|
||||||
|
}, duration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideMessage() {
|
||||||
|
statusMessageEl.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
function showConnectionStatus(title, message, type = 'info') {
|
||||||
|
connectionStatusEl.style.display = 'block';
|
||||||
|
statusTitleEl.textContent = title;
|
||||||
|
statusTextEl.textContent = message;
|
||||||
|
connectionStatusEl.className = `connection-status ${type}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideConnectionStatus() {
|
||||||
|
connectionStatusEl.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
function setButtonLoading(button, loading = true) {
|
||||||
|
if (loading) {
|
||||||
|
button.disabled = true;
|
||||||
|
const originalContent = button.innerHTML;
|
||||||
|
button.dataset.originalContent = originalContent;
|
||||||
|
button.innerHTML = `
|
||||||
|
<svg class="icon icon-spin" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<path d="M21 12a9 9 0 1 1-6.219-8.56"/>
|
||||||
|
</svg>
|
||||||
|
<span>Saving...</span>
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
|
button.disabled = false;
|
||||||
|
if (button.dataset.originalContent) {
|
||||||
|
button.innerHTML = button.dataset.originalContent;
|
||||||
|
delete button.dataset.originalContent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function detectAndPrefillApiBaseUrl(callback) {
|
||||||
|
browser.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
||||||
|
const tab = tabs && tabs[0];
|
||||||
|
if (!tab || !tab.url) {
|
||||||
|
if (callback) callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = new URL(tab.url);
|
||||||
|
const isTrackeepDomain = url.hostname.includes('trackeep') || url.hostname === 'localhost';
|
||||||
|
if (isTrackeepDomain && (url.protocol === 'https:' || url.protocol === 'http:')) {
|
||||||
|
const candidate = `${url.origin}/api/v1`;
|
||||||
|
browser.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
||||||
|
if (!items.trackeepApiBaseUrl) {
|
||||||
|
apiBaseUrlInput.value = candidate;
|
||||||
|
}
|
||||||
|
if (callback) callback();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
// Fallback to localhost if nothing set
|
||||||
|
browser.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
||||||
|
if (!items.trackeepApiBaseUrl) {
|
||||||
|
apiBaseUrlInput.value = 'http://localhost:8080/api/v1';
|
||||||
|
}
|
||||||
|
if (callback) callback();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (callback) callback();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadSettings() {
|
||||||
|
browser.storage.sync.get(['trackeepApiBaseUrl', 'trackeepApiKey', 'isFirstInstall'], (items) => {
|
||||||
|
// Handle first-time install
|
||||||
|
if (items.isFirstInstall) {
|
||||||
|
installWelcomeEl.style.display = 'flex';
|
||||||
|
mainOptionsEl.style.display = 'none';
|
||||||
|
} else {
|
||||||
|
installWelcomeEl.style.display = 'none';
|
||||||
|
mainOptionsEl.style.display = 'block';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load saved settings
|
||||||
|
if (items.trackeepApiBaseUrl) {
|
||||||
|
apiBaseUrlInput.value = items.trackeepApiBaseUrl;
|
||||||
|
}
|
||||||
|
if (items.trackeepApiKey) {
|
||||||
|
apiKeyInput.value = items.trackeepApiKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-detect API URL if empty
|
||||||
|
if (!items.trackeepApiBaseUrl) {
|
||||||
|
detectAndPrefillApiBaseUrl();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function saveSettings() {
|
||||||
|
const apiBaseUrl = apiBaseUrlInput.value.trim();
|
||||||
|
const apiKey = apiKeyInput.value.trim();
|
||||||
|
|
||||||
|
if (!apiBaseUrl) {
|
||||||
|
showMessage('API base URL is required.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!apiKey) {
|
||||||
|
showMessage('API key is required.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!apiKey.startsWith('tk_')) {
|
||||||
|
showMessage('API key should start with "tk_"', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setButtonLoading(saveBtn, true);
|
||||||
|
showMessage('Saving settings...', 'info', 0);
|
||||||
|
|
||||||
|
browser.storage.sync.set({
|
||||||
|
trackeepApiBaseUrl: apiBaseUrl,
|
||||||
|
trackeepApiKey: apiKey,
|
||||||
|
isFirstInstall: false
|
||||||
|
}, () => {
|
||||||
|
setButtonLoading(saveBtn, false);
|
||||||
|
showMessage('Settings saved successfully!', 'success');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function testConnection() {
|
||||||
|
const apiBaseUrl = apiBaseUrlInput.value.trim();
|
||||||
|
const apiKey = apiKeyInput.value.trim();
|
||||||
|
|
||||||
|
if (!apiBaseUrl || !apiKey) {
|
||||||
|
showConnectionStatus('Connection Failed', 'Please enter both URL and API key', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
showConnectionStatus('Testing Connection', 'Connecting to your Trackeep instance...', 'info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const base = apiBaseUrl.replace(/\/$/, '');
|
||||||
|
const response = await fetch(`${base}/auth/me`, {
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${apiKey}`,
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
showConnectionStatus('Connection Successful', `Connected as ${data.username || 'user'}. API key is valid!`, 'success');
|
||||||
|
|
||||||
|
// Hide success message after 3 seconds
|
||||||
|
setTimeout(() => {
|
||||||
|
hideConnectionStatus();
|
||||||
|
}, 3000);
|
||||||
|
} else {
|
||||||
|
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showConnectionStatus('Connection Failed', `Error: ${error.message}`, 'error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function generateApiKey() {
|
||||||
|
const apiBaseUrl = apiBaseUrlInput.value.trim();
|
||||||
|
|
||||||
|
if (!apiBaseUrl) {
|
||||||
|
showMessage('Please enter API URL first', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
showConnectionStatus('Generating API Key', 'Opening Trackeep to generate new API key...', 'info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const base = apiBaseUrl.replace(/\/$/, '');
|
||||||
|
const response = await fetch(`${base}/auth/generate-key`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
if (data.api_key) {
|
||||||
|
apiKeyInput.value = data.api_key;
|
||||||
|
showConnectionStatus('API Key Generated', 'New API key generated and copied to clipboard!', 'success');
|
||||||
|
|
||||||
|
// Copy to clipboard
|
||||||
|
navigator.clipboard.writeText(data.api_key);
|
||||||
|
|
||||||
|
// Hide success message after 3 seconds
|
||||||
|
setTimeout(() => {
|
||||||
|
hideConnectionStatus();
|
||||||
|
}, 3000);
|
||||||
|
} else {
|
||||||
|
throw new Error('No API key in response');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showConnectionStatus('Generation Failed', `Error: ${error.message}`, 'error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize everything when DOM is loaded
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
detectAndPrefillApiBaseUrl(() => {
|
||||||
|
loadSettings();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Event listeners for main options
|
||||||
|
saveBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
saveSettings();
|
||||||
|
});
|
||||||
|
|
||||||
|
testConnectionBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
testConnection();
|
||||||
|
});
|
||||||
|
|
||||||
|
generateKeyBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
generateApiKey();
|
||||||
|
});
|
||||||
|
|
||||||
|
// Event listeners for setup form
|
||||||
|
const testSetupConnectionBtn = document.getElementById('testSetupConnectionBtn');
|
||||||
|
const completeSetupBtn = document.getElementById('completeSetupBtn');
|
||||||
|
const getStartedBtn = document.getElementById('getStartedBtn');
|
||||||
|
|
||||||
|
if (testSetupConnectionBtn) {
|
||||||
|
testSetupConnectionBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
testSetupConnection();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (completeSetupBtn) {
|
||||||
|
completeSetupBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
completeSetup();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getStartedBtn) {
|
||||||
|
getStartedBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
// Hide welcome and show main options with setup form
|
||||||
|
document.getElementById('installWelcome').style.display = 'none';
|
||||||
|
document.getElementById('mainOptions').style.display = 'block';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Test connection from setup form
|
||||||
|
async function testSetupConnection() {
|
||||||
|
const apiBaseUrl = document.getElementById('setupApiUrl').value.trim();
|
||||||
|
const apiKey = document.getElementById('setupApiKey').value.trim();
|
||||||
|
|
||||||
|
if (!apiBaseUrl || !apiKey) {
|
||||||
|
showSetupConnectionStatus('Connection Failed', 'Please enter both URL and API key', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
showSetupConnectionStatus('Testing Connection', 'Connecting to your Trackeep instance...', 'info');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const base = apiBaseUrl.replace(/\/$/, '');
|
||||||
|
const response = await fetch(`${base}/auth/me`, {
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${apiKey}`,
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json();
|
||||||
|
showSetupConnectionStatus('Connection Successful', `Connected as ${data.username || 'user'}. API key is valid!`, 'success');
|
||||||
|
|
||||||
|
// Copy values to main form
|
||||||
|
document.getElementById('trackeepApiUrl').value = apiBaseUrl;
|
||||||
|
document.getElementById('trackeepApiKey').value = apiKey;
|
||||||
|
|
||||||
|
// Hide success message after 3 seconds
|
||||||
|
setTimeout(() => {
|
||||||
|
hideSetupConnectionStatus();
|
||||||
|
}, 3000);
|
||||||
|
} else {
|
||||||
|
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
showSetupConnectionStatus('Connection Failed', `Error: ${error.message}`, 'error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Complete setup
|
||||||
|
function completeSetup() {
|
||||||
|
const apiBaseUrl = document.getElementById('setupApiUrl').value.trim();
|
||||||
|
const apiKey = document.getElementById('setupApiKey').value.trim();
|
||||||
|
|
||||||
|
if (!apiBaseUrl || !apiKey) {
|
||||||
|
showMessage('Please fill in both URL and API key', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save settings
|
||||||
|
browser.storage.sync.set({
|
||||||
|
trackeepApiBaseUrl: apiBaseUrl,
|
||||||
|
trackeepApiKey: apiKey,
|
||||||
|
isFirstInstall: false
|
||||||
|
}, () => {
|
||||||
|
showMessage('Setup completed successfully!', 'success');
|
||||||
|
|
||||||
|
// Switch to main options view
|
||||||
|
document.getElementById('installWelcome').style.display = 'none';
|
||||||
|
document.getElementById('mainOptions').style.display = 'block';
|
||||||
|
|
||||||
|
// Load settings in main form
|
||||||
|
document.getElementById('trackeepApiUrl').value = apiBaseUrl;
|
||||||
|
document.getElementById('trackeepApiKey').value = apiKey;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup connection status functions
|
||||||
|
function showSetupConnectionStatus(title, message, type = 'info') {
|
||||||
|
const statusEl = document.getElementById('setupConnectionStatus');
|
||||||
|
const titleEl = document.getElementById('setupStatusTitle');
|
||||||
|
const messageEl = document.getElementById('setupStatusMessage');
|
||||||
|
|
||||||
|
statusEl.style.display = 'block';
|
||||||
|
titleEl.textContent = title;
|
||||||
|
messageEl.textContent = message;
|
||||||
|
statusEl.className = `connection-status ${type}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideSetupConnectionStatus() {
|
||||||
|
document.getElementById('setupConnectionStatus').style.display = 'none';
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,515 @@
|
|||||||
|
/* global chrome, browser */
|
||||||
|
|
||||||
|
// Browser compatibility polyfill
|
||||||
|
if (typeof browser === 'undefined' && typeof chrome !== 'undefined') {
|
||||||
|
browser = chrome;
|
||||||
|
}
|
||||||
|
|
||||||
|
// DOM Elements
|
||||||
|
const statusIndicatorEl = document.getElementById('statusIndicator');
|
||||||
|
const statusTextEl = document.getElementById('statusText');
|
||||||
|
const statusMessageEl = document.getElementById('statusMessage');
|
||||||
|
const openOptionsBtn = document.getElementById('openOptions');
|
||||||
|
|
||||||
|
// Tab elements
|
||||||
|
const tabBtns = document.querySelectorAll('.tab');
|
||||||
|
const tabContents = document.querySelectorAll('.tab-content');
|
||||||
|
|
||||||
|
// Bookmark elements
|
||||||
|
const bookmarkTitleInput = document.getElementById('bookmarkTitle');
|
||||||
|
const bookmarkUrlInput = document.getElementById('bookmarkUrl');
|
||||||
|
const bookmarkDescriptionInput = document.getElementById('bookmarkDescription');
|
||||||
|
const bookmarkTagsInput = document.getElementById('bookmarkTags');
|
||||||
|
const bookmarkPublicInput = document.getElementById('bookmarkPublic');
|
||||||
|
const saveBookmarkBtn = document.getElementById('saveBookmarkBtn');
|
||||||
|
|
||||||
|
// File elements
|
||||||
|
const fileInput = document.getElementById('fileInput');
|
||||||
|
const fileDescriptionInput = document.getElementById('fileDescription');
|
||||||
|
const uploadFileBtn = document.getElementById('uploadFileBtn');
|
||||||
|
|
||||||
|
// Smart suggestion elements
|
||||||
|
const suggestedTagsContainer = document.getElementById('suggestedTags');
|
||||||
|
const contentTypeIndicator = document.getElementById('contentTypeIndicator');
|
||||||
|
const quickSaveBtn = document.getElementById('quickSaveBtn');
|
||||||
|
|
||||||
|
let trackeepConfig = {
|
||||||
|
apiBaseUrl: '',
|
||||||
|
authToken: ''
|
||||||
|
};
|
||||||
|
|
||||||
|
let smartData = null;
|
||||||
|
let isQuickSaveMode = false;
|
||||||
|
|
||||||
|
// Tab switching functionality
|
||||||
|
function initTabs() {
|
||||||
|
tabBtns.forEach(btn => {
|
||||||
|
btn.addEventListener('click', () => {
|
||||||
|
const targetTab = btn.dataset.tab;
|
||||||
|
|
||||||
|
// Update button states
|
||||||
|
tabBtns.forEach(b => b.classList.remove('active'));
|
||||||
|
btn.classList.add('active');
|
||||||
|
|
||||||
|
// Update content visibility
|
||||||
|
tabContents.forEach(content => {
|
||||||
|
content.classList.remove('active');
|
||||||
|
if (content.id === `${targetTab}-tab`) {
|
||||||
|
content.classList.add('active');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status management
|
||||||
|
function updateStatus(text, type = 'info') {
|
||||||
|
statusTextEl.textContent = text;
|
||||||
|
statusIndicatorEl.className = 'status-indicator';
|
||||||
|
|
||||||
|
if (type === 'success') {
|
||||||
|
statusIndicatorEl.classList.add('connected');
|
||||||
|
} else if (type === 'error') {
|
||||||
|
statusIndicatorEl.classList.add('error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function showMessage(message, type = 'info', duration = 5000) {
|
||||||
|
statusMessageEl.textContent = message;
|
||||||
|
statusMessageEl.className = `status-message ${type}`;
|
||||||
|
statusMessageEl.style.display = 'flex';
|
||||||
|
|
||||||
|
// Auto-hide after duration
|
||||||
|
if (duration > 0) {
|
||||||
|
setTimeout(() => {
|
||||||
|
statusMessageEl.style.display = 'none';
|
||||||
|
}, duration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideMessage() {
|
||||||
|
statusMessageEl.style.display = 'none';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Loading states
|
||||||
|
function setButtonLoading(button, loading = true) {
|
||||||
|
if (loading) {
|
||||||
|
button.disabled = true;
|
||||||
|
const originalContent = button.innerHTML;
|
||||||
|
button.dataset.originalContent = originalContent;
|
||||||
|
button.innerHTML = `
|
||||||
|
<svg class="icon icon-spin" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<path d="M21 12a9 9 0 1 1-6.219-8.56"/>
|
||||||
|
</svg>
|
||||||
|
<span>Processing...</span>
|
||||||
|
`;
|
||||||
|
} else {
|
||||||
|
button.disabled = false;
|
||||||
|
if (button.dataset.originalContent) {
|
||||||
|
button.innerHTML = button.dataset.originalContent;
|
||||||
|
delete button.dataset.originalContent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function disableForms(disabled) {
|
||||||
|
const elements = [
|
||||||
|
bookmarkTitleInput, bookmarkUrlInput, bookmarkDescriptionInput,
|
||||||
|
bookmarkTagsInput, bookmarkPublicInput, saveBookmarkBtn,
|
||||||
|
fileInput, fileDescriptionInput, uploadFileBtn
|
||||||
|
];
|
||||||
|
|
||||||
|
elements.forEach(el => {
|
||||||
|
if (el) el.disabled = disabled;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadConfig(callback) {
|
||||||
|
browser.storage.sync.get(['trackeepApiBaseUrl', 'trackeepAuthToken'], (items) => {
|
||||||
|
const apiBaseUrl = (items.trackeepApiBaseUrl || '').trim();
|
||||||
|
const authToken = (items.trackeepAuthToken || '').trim();
|
||||||
|
|
||||||
|
trackeepConfig = { apiBaseUrl, authToken };
|
||||||
|
|
||||||
|
if (!apiBaseUrl || !authToken) {
|
||||||
|
updateStatus('Configuration required', 'error');
|
||||||
|
showMessage('Configure API URL and token in Options to enable saving.', 'error');
|
||||||
|
disableForms(true);
|
||||||
|
} else {
|
||||||
|
updateStatus(`Connected to ${apiBaseUrl}`, 'success');
|
||||||
|
hideMessage();
|
||||||
|
disableForms(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (typeof callback === 'function') {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function detectTrackeepDomain(callback) {
|
||||||
|
browser.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
||||||
|
const tab = tabs && tabs[0];
|
||||||
|
if (!tab || !tab.url) {
|
||||||
|
if (callback) callback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = new URL(tab.url);
|
||||||
|
const isTrackeepDomain = url.hostname.includes('trackeep') || url.hostname === 'localhost';
|
||||||
|
if (isTrackeepDomain && url.protocol === 'https:') {
|
||||||
|
const candidate = `${url.origin}/api/v1`;
|
||||||
|
browser.storage.sync.get(['trackeepApiBaseUrl'], (items) => {
|
||||||
|
if (!items.trackeepApiBaseUrl) {
|
||||||
|
browser.storage.sync.set({ trackeepApiBaseUrl: candidate }, () => {
|
||||||
|
console.log('Auto-detected Trackeep API URL:', candidate);
|
||||||
|
if (callback) callback();
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
if (callback) callback();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
if (callback) callback();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (callback) callback();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function initActiveTab() {
|
||||||
|
browser.tabs.query({ active: true, currentWindow: true }, (tabs) => {
|
||||||
|
const tab = tabs && tabs[0];
|
||||||
|
if (!tab) return;
|
||||||
|
|
||||||
|
browser.storage.local.get(['contextMenuData'], (items) => {
|
||||||
|
const ctx = items.contextMenuData;
|
||||||
|
|
||||||
|
if (ctx && ctx.timestamp && Date.now() - ctx.timestamp < 5000) {
|
||||||
|
// Use context menu data
|
||||||
|
smartData = ctx.smartData || null;
|
||||||
|
isQuickSaveMode = ctx.isQuickSave || false;
|
||||||
|
|
||||||
|
if (ctx.url && !bookmarkUrlInput.value) {
|
||||||
|
bookmarkUrlInput.value = ctx.url;
|
||||||
|
}
|
||||||
|
if (ctx.title && !bookmarkTitleInput.value) {
|
||||||
|
bookmarkTitleInput.value = ctx.title;
|
||||||
|
}
|
||||||
|
if (ctx.selection && !bookmarkDescriptionInput.value) {
|
||||||
|
bookmarkDescriptionInput.value = ctx.selection;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply smart suggestions
|
||||||
|
if (smartData) {
|
||||||
|
applySmartSuggestions(smartData);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle quick save mode
|
||||||
|
if (isQuickSaveMode) {
|
||||||
|
handleQuickSave();
|
||||||
|
}
|
||||||
|
|
||||||
|
browser.storage.local.remove(['contextMenuData']);
|
||||||
|
} else {
|
||||||
|
// Regular tab detection
|
||||||
|
detectAndApplySmartData(tab);
|
||||||
|
|
||||||
|
if (tab.title && !bookmarkTitleInput.value) {
|
||||||
|
bookmarkTitleInput.value = tab.title;
|
||||||
|
}
|
||||||
|
if (tab.url && !bookmarkUrlInput.value) {
|
||||||
|
bookmarkUrlInput.value = tab.url;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Smart data detection for regular tab
|
||||||
|
async function detectAndApplySmartData(tab) {
|
||||||
|
try {
|
||||||
|
const info = { linkUrl: tab.url, srcUrl: tab.url };
|
||||||
|
smartData = await detectContentType(info, tab);
|
||||||
|
if (smartData) {
|
||||||
|
applySmartSuggestions(smartData);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Smart detection failed:', e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply smart suggestions to UI
|
||||||
|
function applySmartSuggestions(data) {
|
||||||
|
// Show content type indicator
|
||||||
|
if (contentTypeIndicator) {
|
||||||
|
const typeColors = {
|
||||||
|
video: '#ff0000',
|
||||||
|
social: '#1da1f2',
|
||||||
|
code: '#0969da',
|
||||||
|
article: '#ff6900',
|
||||||
|
documentation: '#6f42c1',
|
||||||
|
news: '#ff4500',
|
||||||
|
shopping: '#ff9500',
|
||||||
|
general: '#6b7280'
|
||||||
|
};
|
||||||
|
|
||||||
|
const typeIcons = {
|
||||||
|
video: '🎥',
|
||||||
|
social: '💬',
|
||||||
|
code: '💻',
|
||||||
|
article: '📝',
|
||||||
|
documentation: '📚',
|
||||||
|
news: '📰',
|
||||||
|
shopping: '🛒',
|
||||||
|
general: '🔗'
|
||||||
|
};
|
||||||
|
|
||||||
|
contentTypeIndicator.innerHTML = `
|
||||||
|
<span style="color: ${typeColors[data.type] || typeColors.general}; font-weight: 600;">
|
||||||
|
${typeIcons[data.type] || typeIcons.general} ${data.type.charAt(0).toUpperCase() + data.type.slice(1)}
|
||||||
|
</span>
|
||||||
|
${data.platform ? `<span style="color: #6b7280; font-size: 0.85em; margin-left: 8px;">• ${data.platform}</span>` : ''}
|
||||||
|
`;
|
||||||
|
contentTypeIndicator.style.display = 'inline-block';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show suggested tags
|
||||||
|
if (suggestedTagsContainer && data.suggestedTags) {
|
||||||
|
suggestedTagsContainer.innerHTML = '';
|
||||||
|
data.suggestedTags.forEach(tag => {
|
||||||
|
const tagEl = document.createElement('span');
|
||||||
|
tagEl.className = 'suggested-tag';
|
||||||
|
tagEl.textContent = tag;
|
||||||
|
tagEl.onclick = () => addSuggestedTag(tag);
|
||||||
|
suggestedTagsContainer.appendChild(tagEl);
|
||||||
|
});
|
||||||
|
suggestedTagsContainer.style.display = 'flex';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add suggested tag to input
|
||||||
|
function addSuggestedTag(tag) {
|
||||||
|
const currentTags = bookmarkTagsInput.value
|
||||||
|
.split(',')
|
||||||
|
.map(t => t.trim())
|
||||||
|
.filter(t => t);
|
||||||
|
|
||||||
|
if (!currentTags.includes(tag)) {
|
||||||
|
currentTags.push(tag);
|
||||||
|
bookmarkTagsInput.value = currentTags.join(', ');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle quick save
|
||||||
|
function handleQuickSave() {
|
||||||
|
if (isQuickSaveMode && smartData) {
|
||||||
|
// Auto-fill with smart data and save immediately
|
||||||
|
if (smartData.suggestedTags && !bookmarkTagsInput.value) {
|
||||||
|
bookmarkTagsInput.value = smartData.suggestedTags.join(', ');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-save after a short delay
|
||||||
|
setTimeout(() => {
|
||||||
|
if (bookmarkUrlInput.value && bookmarkTitleInput.value) {
|
||||||
|
saveBookmark(new Event('submit'));
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveBookmark(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
hideMessage();
|
||||||
|
|
||||||
|
const { apiBaseUrl, authToken } = trackeepConfig;
|
||||||
|
if (!apiBaseUrl || !authToken) {
|
||||||
|
showMessage('Missing API URL or auth token. Open options first.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const url = bookmarkUrlInput.value.trim();
|
||||||
|
if (!url) {
|
||||||
|
showMessage('URL is required.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const title = bookmarkTitleInput.value.trim() || url;
|
||||||
|
const description = bookmarkDescriptionInput.value.trim();
|
||||||
|
const tagsRaw = bookmarkTagsInput.value.trim();
|
||||||
|
const isPublic = !!bookmarkPublicInput.checked;
|
||||||
|
|
||||||
|
const tags = tagsRaw
|
||||||
|
? tagsRaw.split(',').map((t) => t.trim()).filter(Boolean)
|
||||||
|
: [];
|
||||||
|
|
||||||
|
const payload = {
|
||||||
|
title,
|
||||||
|
url,
|
||||||
|
description,
|
||||||
|
tags,
|
||||||
|
is_public: isPublic
|
||||||
|
};
|
||||||
|
|
||||||
|
setButtonLoading(saveBookmarkBtn, true);
|
||||||
|
showMessage('Saving bookmark...', 'info', 0);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const base = apiBaseUrl.replace(/\/$/, '');
|
||||||
|
const response = await fetch(`${base}/bookmarks`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Authorization': `Bearer ${authToken}`
|
||||||
|
},
|
||||||
|
body: JSON.stringify(payload)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
let errorMessage = `Failed to save bookmark (status ${response.status})`;
|
||||||
|
try {
|
||||||
|
const data = await response.json();
|
||||||
|
if (data && data.error) {
|
||||||
|
errorMessage = data.error;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
|
// ignore JSON parse errors
|
||||||
|
}
|
||||||
|
throw new Error(errorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
showMessage(`
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<polyline points="20,6 9,17 4,12"/>
|
||||||
|
</svg>
|
||||||
|
Bookmark saved successfully!
|
||||||
|
`, 'success');
|
||||||
|
|
||||||
|
// Clear form after successful save
|
||||||
|
setTimeout(() => {
|
||||||
|
bookmarkDescriptionInput.value = '';
|
||||||
|
bookmarkTagsInput.value = '';
|
||||||
|
bookmarkPublicInput.checked = false;
|
||||||
|
}, 2000);
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error saving bookmark', err);
|
||||||
|
showMessage(err && err.message ? err.message : 'Failed to save bookmark.', 'error');
|
||||||
|
} finally {
|
||||||
|
setButtonLoading(saveBookmarkBtn, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function uploadFile(event) {
|
||||||
|
event.preventDefault();
|
||||||
|
hideMessage();
|
||||||
|
|
||||||
|
const { apiBaseUrl, authToken } = trackeepConfig;
|
||||||
|
if (!apiBaseUrl || !authToken) {
|
||||||
|
showMessage('Missing API URL or auth token. Open options first.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const file = fileInput.files && fileInput.files[0];
|
||||||
|
if (!file) {
|
||||||
|
showMessage('Please choose a file to upload.', 'error');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const description = fileDescriptionInput.value.trim();
|
||||||
|
|
||||||
|
const formData = new FormData();
|
||||||
|
formData.append('file', file, file.name);
|
||||||
|
if (description) {
|
||||||
|
formData.append('description', description);
|
||||||
|
}
|
||||||
|
|
||||||
|
setButtonLoading(uploadFileBtn, true);
|
||||||
|
showMessage('Uploading file...', 'info', 0);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const base = apiBaseUrl.replace(/\/$/, '');
|
||||||
|
const response = await fetch(`${base}/files/upload`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Authorization': `Bearer ${authToken}`
|
||||||
|
},
|
||||||
|
body: formData
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
let errorMessage = `Failed to upload file (status ${response.status})`;
|
||||||
|
try {
|
||||||
|
const data = await response.json();
|
||||||
|
if (data && data.error) {
|
||||||
|
errorMessage = data.error;
|
||||||
|
}
|
||||||
|
} catch (_) {
|
||||||
|
// ignore JSON parse errors
|
||||||
|
}
|
||||||
|
throw new Error(errorMessage);
|
||||||
|
}
|
||||||
|
|
||||||
|
showMessage(`
|
||||||
|
<svg class="icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||||
|
<polyline points="20,6 9,17 4,12"/>
|
||||||
|
</svg>
|
||||||
|
File uploaded successfully!
|
||||||
|
`, 'success');
|
||||||
|
|
||||||
|
// Clear form after successful upload
|
||||||
|
setTimeout(() => {
|
||||||
|
fileInput.value = '';
|
||||||
|
fileDescriptionInput.value = '';
|
||||||
|
}, 2000);
|
||||||
|
|
||||||
|
} catch (err) {
|
||||||
|
console.error('Error uploading file', err);
|
||||||
|
showMessage(err && err.message ? err.message : 'Failed to upload file.', 'error');
|
||||||
|
} finally {
|
||||||
|
setButtonLoading(uploadFileBtn, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function openOptions() {
|
||||||
|
if (browser.runtime.openOptionsPage) {
|
||||||
|
browser.runtime.openOptionsPage();
|
||||||
|
} else {
|
||||||
|
window.open(browser.runtime.getURL('options.html'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize everything when DOM is loaded
|
||||||
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
// Initialize tabs
|
||||||
|
initTabs();
|
||||||
|
|
||||||
|
// Event listeners
|
||||||
|
openOptionsBtn.addEventListener('click', openOptions);
|
||||||
|
quickSaveBtn.addEventListener('click', handleQuickSave);
|
||||||
|
saveBookmarkBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
saveBookmark(e);
|
||||||
|
});
|
||||||
|
uploadFileBtn.addEventListener('click', (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
uploadFile(e);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Keyboard shortcut for quick save
|
||||||
|
document.addEventListener('keydown', (e) => {
|
||||||
|
if (e.ctrlKey && e.shiftKey && e.key === 'S') {
|
||||||
|
e.preventDefault();
|
||||||
|
handleQuickSave();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Initialize configuration and active tab
|
||||||
|
detectTrackeepDomain(() => {
|
||||||
|
loadConfig(() => {
|
||||||
|
initActiveTab();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:15-alpine
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: trackeep
|
|
||||||
POSTGRES_USER: trackeep
|
|
||||||
POSTGRES_PASSWORD: trackeep123
|
|
||||||
ports:
|
|
||||||
- "5432:5432"
|
|
||||||
volumes:
|
|
||||||
- postgres_data:/var/lib/postgresql/data
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U trackeep -d trackeep"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 30s
|
|
||||||
|
|
||||||
trackeep-backend:
|
|
||||||
build:
|
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "${PORT:-8080}:8080"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
volumes:
|
|
||||||
- ./data:/data
|
|
||||||
- ./uploads:/app/uploads
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
postgres:
|
|
||||||
condition: service_healthy
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/health || wget --no-verbose --tries=1 --spider http://localhost:8080/live"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 40s
|
|
||||||
|
|
||||||
trackeep-frontend:
|
|
||||||
build:
|
|
||||||
context: ./frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "5173:80"
|
|
||||||
depends_on:
|
|
||||||
trackeep-backend:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pgrep nginx > /dev/null || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres_data:
|
|
||||||
@@ -1,108 +0,0 @@
|
|||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:15-alpine
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: trackeep
|
|
||||||
POSTGRES_USER: trackeep
|
|
||||||
POSTGRES_PASSWORD: trackeep123
|
|
||||||
ports:
|
|
||||||
- "5432:5432"
|
|
||||||
volumes:
|
|
||||||
- postgres_data:/var/lib/postgresql/data
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U trackeep -d trackeep"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 30s
|
|
||||||
|
|
||||||
youtube-scraper:
|
|
||||||
build:
|
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile.youtube-scraper
|
|
||||||
ports:
|
|
||||||
- "7857:7857"
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:7857/ || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
youtube-search:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile.youtube-search
|
|
||||||
ports:
|
|
||||||
- "8090:8090"
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8090/youtube?q=test || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
trackeep-backend:
|
|
||||||
build:
|
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "${PORT:-8080}:8080"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
volumes:
|
|
||||||
- ./data:/data
|
|
||||||
- ./uploads:/app/uploads
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
postgres:
|
|
||||||
condition: service_healthy
|
|
||||||
youtube-scraper:
|
|
||||||
condition: service_healthy
|
|
||||||
youtube-search:
|
|
||||||
condition: service_healthy
|
|
||||||
youtube-video-scraper:
|
|
||||||
condition: service_healthy
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/health || wget --no-verbose --tries=1 --spider http://localhost:8080/live"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 40s
|
|
||||||
|
|
||||||
youtube-video-scraper:
|
|
||||||
build:
|
|
||||||
context: ./youtube-video-scraper
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "7858:7858"
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:7858/health || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
trackeep-frontend:
|
|
||||||
build:
|
|
||||||
context: ./frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "5173:80"
|
|
||||||
depends_on:
|
|
||||||
trackeep-backend:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: unless-stopped
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pgrep nginx > /dev/null || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres_data:
|
|
||||||
+74
-76
@@ -1,121 +1,119 @@
|
|||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
trackeep-frontend:
|
trackeep-frontend:
|
||||||
build:
|
image: 'ghcr.io/dvorinka/trackeep/frontend:latest'
|
||||||
context: ./frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "${FRONTEND_PORT:-80}:80"
|
||||||
- "443:443"
|
- "${HTTPS_PORT:-443}:443"
|
||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- VITE_DEMO_MODE=${VITE_DEMO_MODE}
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
- VITE_API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||||
|
- FRONTEND_PORT=${FRONTEND_PORT:-80}
|
||||||
|
- BACKEND_PORT=${BACKEND_PORT:-8080}
|
||||||
depends_on:
|
depends_on:
|
||||||
- trackeep-backend
|
- trackeep-backend
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- trackeep-network
|
- trackeep-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pgrep nginx > /dev/null || exit 1"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 20s
|
||||||
|
|
||||||
trackeep-backend:
|
trackeep-backend:
|
||||||
build:
|
image: 'ghcr.io/dvorinka/trackeep/backend:latest'
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "${BACKEND_PORT:-8080}:${BACKEND_PORT:-8080}"
|
||||||
env_file:
|
environment:
|
||||||
- .env
|
- BACKEND_PORT=${BACKEND_PORT:-8080}
|
||||||
|
- FRONTEND_PORT=${FRONTEND_PORT:-80}
|
||||||
|
- GIN_MODE=${GIN_MODE:-release}
|
||||||
|
- DB_TYPE=${DB_TYPE:-postgres}
|
||||||
|
- DB_HOST=${DB_HOST:-postgres}
|
||||||
|
- DB_PORT=${DB_PORT:-5432}
|
||||||
|
- DB_USER=${DB_USER:-trackeep}
|
||||||
|
- DB_PASSWORD=${DB_PASSWORD}
|
||||||
|
- DB_NAME=${DB_NAME:-trackeep}
|
||||||
|
- DB_SSL_MODE=${DB_SSL_MODE:-disable}
|
||||||
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- JWT_EXPIRES_IN=${JWT_EXPIRES_IN:-24h}
|
||||||
|
- UPLOAD_DIR=${UPLOAD_DIR:-./uploads}
|
||||||
|
- MAX_FILE_SIZE=${MAX_FILE_SIZE:-10485760}
|
||||||
|
- 'CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-*}'
|
||||||
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
- SEARCH_API_PROVIDER=${SEARCH_API_PROVIDER:-demo}
|
||||||
|
- SEARCH_RESULTS_LIMIT=${SEARCH_RESULTS_LIMIT:-10}
|
||||||
|
- AUTO_UPDATE_CHECK=${AUTO_UPDATE_CHECK:-false}
|
||||||
|
- UPDATE_CHECK_INTERVAL=${UPDATE_CHECK_INTERVAL:-24h}
|
||||||
|
- PRERELEASE_UPDATES=${PRERELEASE_UPDATES:-false}
|
||||||
|
- DRAGONFLY_ADDR=${DRAGONFLY_ADDR:-dragonfly:6379}
|
||||||
|
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- './data:/data'
|
||||||
- ./uploads:/app/uploads
|
- './uploads:/app/uploads'
|
||||||
- ./logs:/app/logs
|
- './logs:/app/logs'
|
||||||
|
- '/var/run/docker.sock:/var/run/docker.sock'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- trackeep-network
|
- trackeep-network
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/health"]
|
test:
|
||||||
|
- CMD
|
||||||
|
- wget
|
||||||
|
- '--no-verbose'
|
||||||
|
- '--tries=1'
|
||||||
|
- '--spider'
|
||||||
|
- "http://localhost:${BACKEND_PORT:-8080}/health"
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
start_period: 40s
|
start_period: 40s
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:15-alpine
|
image: 'postgres:15-alpine'
|
||||||
environment:
|
|
||||||
POSTGRES_DB: ${POSTGRES_DB:-trackeep}
|
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-trackeep}
|
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
|
||||||
POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=C --lc-ctype=C"
|
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "${DB_PORT:-5432}:5432"
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: ${DB_NAME:-trackeep}
|
||||||
|
POSTGRES_USER: ${DB_USER:-trackeep}
|
||||||
|
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql/data
|
- 'postgres_data:/var/lib/postgres/data'
|
||||||
- ./backups:/backups
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- trackeep-network
|
- trackeep-network
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-trackeep} -d ${POSTGRES_DB:-trackeep}"]
|
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-trackeep} -d ${DB_NAME:-trackeep}"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
redis:
|
dragonfly:
|
||||||
image: redis:7-alpine
|
image: ghcr.io/dragonflydb/dragonfly:latest
|
||||||
|
container_name: dragonfly
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "${DRAGONFLY_PORT:-6379}:6379"
|
||||||
volumes:
|
volumes:
|
||||||
- redis_data:/data
|
- dragonfly_data:/data
|
||||||
restart: unless-stopped
|
command: dragonfly --requirepass=${DRAGONFLY_PASSWORD} --proactor_threads=2
|
||||||
networks:
|
|
||||||
- trackeep-network
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 3
|
|
||||||
|
|
||||||
youtube-scraper:
|
|
||||||
build:
|
|
||||||
context: ./backend
|
|
||||||
dockerfile: Dockerfile.youtube-scraper
|
|
||||||
ports:
|
|
||||||
- "7857:7857"
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- trackeep-network
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:7857/ || exit 1"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
start_period: 20s
|
|
||||||
profiles:
|
|
||||||
- demo
|
|
||||||
|
|
||||||
# Backup service
|
|
||||||
backup:
|
|
||||||
image: postgres:15-alpine
|
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: ${POSTGRES_DB:-trackeep}
|
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-trackeep}
|
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
|
||||||
POSTGRES_HOST: postgres
|
|
||||||
volumes:
|
|
||||||
- ./backups:/backups
|
|
||||||
- ./scripts/backup.sh:/backup.sh
|
|
||||||
command: sh -c "chmod +x /backup.sh && crond -f"
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- trackeep-network
|
- trackeep-network
|
||||||
depends_on:
|
healthcheck:
|
||||||
- postgres
|
test: ["CMD-SHELL", "redis-cli -a ${DRAGONFLY_PASSWORD} ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data: null
|
||||||
driver: local
|
dragonfly_data: null
|
||||||
redis_data:
|
|
||||||
driver: local
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
trackeep-network:
|
trackeep-network:
|
||||||
|
|||||||
+47
-9
@@ -2,16 +2,34 @@ services:
|
|||||||
postgres:
|
postgres:
|
||||||
image: postgres:15-alpine
|
image: postgres:15-alpine
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: ${POSTGRES_DB:-trackeep}
|
POSTGRES_DB: ${DB_NAME:-trackeep}
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-trackeep}
|
POSTGRES_USER: ${DB_USER:-trackeep}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
POSTGRES_PASSWORD: ${DB_PASSWORD:?DB_PASSWORD is required}
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "${DB_PORT:-5432}:5432"
|
||||||
volumes:
|
volumes:
|
||||||
- postgres_data:/var/lib/postgresql/data
|
- postgres_data:/var/lib/postgres/data
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-trackeep} -d ${POSTGRES_DB:-trackeep}"]
|
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-trackeep} -d ${DB_NAME:-trackeep}"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
|
dragonfly:
|
||||||
|
image: ghcr.io/dragonflydb/dragonfly:latest
|
||||||
|
container_name: dragonfly
|
||||||
|
ports:
|
||||||
|
- "${DRAGONFLY_PORT:-6379}:6379"
|
||||||
|
volumes:
|
||||||
|
- dragonfly_data:/data
|
||||||
|
command: dragonfly --requirepass=${DRAGONFLY_PASSWORD} --proactor_threads=2
|
||||||
|
environment:
|
||||||
|
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||||
|
restart: unless-stopped
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "redis-cli -a ${DRAGONFLY_PASSWORD} ping"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
@@ -22,18 +40,27 @@ services:
|
|||||||
context: ./backend
|
context: ./backend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- "${PORT:-8080}:8080"
|
- "${BACKEND_PORT:-8080}:${BACKEND_PORT:-8080}"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
environment:
|
||||||
|
- APP_VERSION=${APP_VERSION:-1.0.0}
|
||||||
|
- BACKEND_PORT=${BACKEND_PORT:-8080}
|
||||||
|
- FRONTEND_PORT=${FRONTEND_PORT:-8080}
|
||||||
|
- DRAGONFLY_ADDR=${DRAGONFLY_ADDR:-dragonfly:6379}
|
||||||
|
- DRAGONFLY_PASSWORD=${DRAGONFLY_PASSWORD}
|
||||||
volumes:
|
volumes:
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
- ./uploads:/app/uploads
|
- ./uploads:/app/uploads
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock # Docker socket for updates
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
dragonfly:
|
||||||
|
condition: service_healthy
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/health || wget --no-verbose --tries=1 --spider http://localhost:8080/live"]
|
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:${BACKEND_PORT:-8080}/health || wget --no-verbose --tries=1 --spider http://localhost:${BACKEND_PORT:-8080}/live"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 3
|
retries: 3
|
||||||
@@ -43,8 +70,18 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./frontend/Dockerfile
|
dockerfile: ./frontend/Dockerfile
|
||||||
|
args:
|
||||||
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
- VITE_API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||||
ports:
|
ports:
|
||||||
- "5173:80"
|
- "${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
|
||||||
|
environment:
|
||||||
|
- VITE_APP_VERSION=${APP_VERSION:-1.0.0}
|
||||||
|
- VITE_DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
- VITE_API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||||
|
- FRONTEND_PORT=${FRONTEND_PORT:-3000}
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock # Docker socket for updates
|
||||||
depends_on:
|
depends_on:
|
||||||
trackeep-backend:
|
trackeep-backend:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -58,3 +95,4 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
|
dragonfly_data:
|
||||||
|
|||||||
+2393
-2
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,277 @@
|
|||||||
|
# Trackeep Auto-Update System
|
||||||
|
|
||||||
|
This system provides automated daily updates for Trackeep using Docker pulls from GitHub Container Registry.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The auto-update system pulls specific tagged images daily:
|
||||||
|
- `ghcr.io/dvorinka/trackeep/backend:main-aef1e39`
|
||||||
|
- `ghcr.io/dvorinka/trackeep/frontend:main-aef1e39`
|
||||||
|
|
||||||
|
## Files Created
|
||||||
|
|
||||||
|
### 1. Production Docker Compose
|
||||||
|
- **File**: `docker-compose.prod.yml`
|
||||||
|
- **Purpose**: Uses pre-built images instead of local builds
|
||||||
|
- **Images**: Uses the specific tagged versions you specified
|
||||||
|
|
||||||
|
### 2. Auto-Update Script
|
||||||
|
- **File**: `scripts/auto-update.sh`
|
||||||
|
- **Purpose**: Main script that performs the update process
|
||||||
|
- **Features**:
|
||||||
|
- Checks for new images
|
||||||
|
- Creates automatic backups
|
||||||
|
- Updates services safely
|
||||||
|
- Health checks after update
|
||||||
|
- Comprehensive logging
|
||||||
|
|
||||||
|
### 3. Cron Setup Script
|
||||||
|
- **File**: `scripts/setup-auto-update.sh`
|
||||||
|
- **Purpose**: Sets up daily cron job at 2 AM
|
||||||
|
- **Schedule**: Daily at 2:00 AM
|
||||||
|
- **Alternative**: Can be run manually
|
||||||
|
|
||||||
|
### 4. SystemD Service Setup
|
||||||
|
- **File**: `scripts/setup-systemd-update.sh`
|
||||||
|
- **Purpose**: Alternative to cron using systemd timers
|
||||||
|
- **Schedule**: Daily with randomized delay (up to 1 hour)
|
||||||
|
- **Benefits**: More reliable than cron, better logging
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### Option 1: Cron Setup (Recommended for simplicity)
|
||||||
|
```bash
|
||||||
|
# Setup daily auto-update at 2 AM
|
||||||
|
sudo ./scripts/setup-auto-update.sh
|
||||||
|
|
||||||
|
# Check status
|
||||||
|
./scripts/setup-auto-update.sh status
|
||||||
|
|
||||||
|
# Test manually
|
||||||
|
./scripts/setup-auto-update.sh test
|
||||||
|
|
||||||
|
# Remove later if needed
|
||||||
|
sudo ./scripts/setup-auto-update.sh remove
|
||||||
|
```
|
||||||
|
|
||||||
|
### Option 2: SystemD Setup (More robust)
|
||||||
|
```bash
|
||||||
|
# Install systemd service
|
||||||
|
sudo ./scripts/setup-systemd-update.sh
|
||||||
|
|
||||||
|
# Check status
|
||||||
|
./scripts/setup-systemd-update.sh status
|
||||||
|
|
||||||
|
# Test manually
|
||||||
|
sudo ./scripts/setup-systemd-update.sh test
|
||||||
|
|
||||||
|
# Remove later if needed
|
||||||
|
sudo ./scripts/setup-systemd-update.sh remove
|
||||||
|
```
|
||||||
|
|
||||||
|
### Option 3: Manual Execution
|
||||||
|
```bash
|
||||||
|
# Run auto-update manually
|
||||||
|
./scripts/auto-update.sh
|
||||||
|
|
||||||
|
# View logs
|
||||||
|
tail -f /var/log/trackeep-auto-update.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## Configuration
|
||||||
|
|
||||||
|
### Image Tags
|
||||||
|
The system is configured to pull these specific images:
|
||||||
|
- Backend: `ghcr.io/dvorinka/trackeep/backend:main-aef1e39`
|
||||||
|
- Frontend: `ghcr.io/dvorinka/trackeep/frontend:main-aef1e39`
|
||||||
|
|
||||||
|
To update to different tags, edit these files:
|
||||||
|
1. `docker-compose.prod.yml` - Update image tags
|
||||||
|
2. `scripts/auto-update.sh` - Update BACKEND_IMAGE and FRONTEND_IMAGE variables
|
||||||
|
|
||||||
|
### Schedule Options
|
||||||
|
|
||||||
|
**Cron Schedule** (setup-auto-update.sh):
|
||||||
|
- Default: Daily at 2:00 AM
|
||||||
|
- Location: User's crontab
|
||||||
|
- Edit with: `crontab -e`
|
||||||
|
|
||||||
|
**SystemD Schedule** (setup-systemd-update.sh):
|
||||||
|
- Default: Daily with randomized delay
|
||||||
|
- Location: systemd timer
|
||||||
|
- More reliable than cron
|
||||||
|
- Better logging integration
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### Safety Features
|
||||||
|
- ✅ Pre-update backups (database, config files)
|
||||||
|
- ✅ Health checks after update
|
||||||
|
- ✅ Rollback capability from backups
|
||||||
|
- ✅ Comprehensive logging
|
||||||
|
- ✅ Error handling and recovery
|
||||||
|
|
||||||
|
### Update Process
|
||||||
|
1. Check Docker daemon status
|
||||||
|
2. Pull latest images (compare with current)
|
||||||
|
3. Create backup if updates available
|
||||||
|
4. Stop and recreate services
|
||||||
|
5. Wait for health checks
|
||||||
|
6. Clean up old images
|
||||||
|
7. Log all actions
|
||||||
|
|
||||||
|
### Backup Strategy
|
||||||
|
- Automatic backup before each update
|
||||||
|
- Database dump (PostgreSQL)
|
||||||
|
- Configuration files (.env, docker-compose files)
|
||||||
|
- Timestamped backup directories
|
||||||
|
- Location: `./backups/auto-update-YYYYMMDD_HHMMSS/`
|
||||||
|
|
||||||
|
## Monitoring
|
||||||
|
|
||||||
|
### Logs
|
||||||
|
- **Location**: `/var/log/trackeep-auto-update.log`
|
||||||
|
- **View**: `tail -f /var/log/trackeep-auto-update.log`
|
||||||
|
- **SystemD**: `journalctl -u trackeep-auto-update.service -f`
|
||||||
|
|
||||||
|
### Status Commands
|
||||||
|
```bash
|
||||||
|
# Cron status
|
||||||
|
crontab -l | grep trackeep
|
||||||
|
|
||||||
|
# SystemD status
|
||||||
|
systemctl status trackeep-auto-update.timer
|
||||||
|
systemctl list-timers trackeep-auto-update.timer
|
||||||
|
|
||||||
|
# Manual check
|
||||||
|
./scripts/auto-update.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Common Issues
|
||||||
|
|
||||||
|
1. **Docker not running**
|
||||||
|
```
|
||||||
|
❌ Docker is not running. Aborting update.
|
||||||
|
```
|
||||||
|
**Solution**: Start Docker daemon
|
||||||
|
|
||||||
|
2. **Permission denied**
|
||||||
|
```
|
||||||
|
❌ Permission denied
|
||||||
|
```
|
||||||
|
**Solution**: Use sudo for setup scripts
|
||||||
|
|
||||||
|
3. **Image pull failed**
|
||||||
|
```
|
||||||
|
❌ Failed to pull backend image
|
||||||
|
```
|
||||||
|
**Solution**: Check internet connection and registry access
|
||||||
|
|
||||||
|
4. **Service not healthy**
|
||||||
|
```
|
||||||
|
⚠️ Backend health check timed out
|
||||||
|
```
|
||||||
|
**Solution**: Check service logs with `docker compose logs`
|
||||||
|
|
||||||
|
### Manual Recovery
|
||||||
|
```bash
|
||||||
|
# Check what's running
|
||||||
|
docker compose -f docker-compose.prod.yml ps
|
||||||
|
|
||||||
|
# View logs
|
||||||
|
docker compose -f docker-compose.prod.yml logs
|
||||||
|
|
||||||
|
# Manual restart
|
||||||
|
docker compose -f docker-compose.prod.yml restart
|
||||||
|
|
||||||
|
# Restore from backup
|
||||||
|
./backups/auto-update-YYYYMMDD_HHMMSS/
|
||||||
|
```
|
||||||
|
|
||||||
|
## Customization
|
||||||
|
|
||||||
|
### Change Update Frequency
|
||||||
|
**Cron**: Edit crontab entry
|
||||||
|
```bash
|
||||||
|
crontab -e
|
||||||
|
# Change "0 2 * * *" to desired schedule
|
||||||
|
# Examples:
|
||||||
|
# "0 */6 * * *" - Every 6 hours
|
||||||
|
# "0 2 * * 1" - Weekly on Monday
|
||||||
|
# "0 2 1 * *" - Monthly on 1st
|
||||||
|
```
|
||||||
|
|
||||||
|
**SystemD**: Edit timer file
|
||||||
|
```bash
|
||||||
|
sudo systemctl edit trackeep-auto-update.timer
|
||||||
|
# Change OnCalendar=daily to desired schedule
|
||||||
|
```
|
||||||
|
|
||||||
|
### Change Images
|
||||||
|
1. Edit `docker-compose.prod.yml`
|
||||||
|
2. Edit `scripts/auto-update.sh` (BACKEND_IMAGE, FRONTEND_IMAGE)
|
||||||
|
3. Restart services: `docker compose -f docker-compose.prod.yml up -d`
|
||||||
|
|
||||||
|
### Add Notifications
|
||||||
|
Edit `scripts/auto-update.sh` to add email/webhook notifications in the success/failure sections.
|
||||||
|
|
||||||
|
## Security Considerations
|
||||||
|
|
||||||
|
- ✅ Images pulled from trusted GitHub Container Registry
|
||||||
|
- ✅ Specific tags prevent unexpected updates
|
||||||
|
- ✅ Backups created before changes
|
||||||
|
- ✅ Health checks prevent broken deployments
|
||||||
|
- ⚠️ Ensure proper file permissions on backup directory
|
||||||
|
- ⚠️ Monitor log file size (add log rotation if needed)
|
||||||
|
|
||||||
|
## Comparison with Original Update System
|
||||||
|
|
||||||
|
| Feature | Original File-Based | New Docker-Based |
|
||||||
|
|---------|-------------------|------------------|
|
||||||
|
| Update Method | Download & extract files | Docker pull & recreate |
|
||||||
|
| Safety | Moderate | High (atomic updates) |
|
||||||
|
| Rollback | Manual | Automatic from backup |
|
||||||
|
| Speed | Slower (file operations) | Faster (Docker layers) |
|
||||||
|
| Reliability | Lower (file permissions) | Higher (container isolation) |
|
||||||
|
| Logging | Basic | Comprehensive |
|
||||||
|
| Scheduling | Not implemented | Cron/SystemD available |
|
||||||
|
|
||||||
|
## Migration from Original System
|
||||||
|
|
||||||
|
If you were using the original file-based update system:
|
||||||
|
|
||||||
|
1. **Backup current setup**:
|
||||||
|
```bash
|
||||||
|
cp docker-compose.yml docker-compose.backup.yml
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Switch to production compose**:
|
||||||
|
```bash
|
||||||
|
docker compose down
|
||||||
|
docker compose -f docker-compose.prod.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Setup auto-update**:
|
||||||
|
```bash
|
||||||
|
sudo ./scripts/setup-auto-update.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
4. **Test manually**:
|
||||||
|
```bash
|
||||||
|
./scripts/auto-update.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
5. **Monitor first automatic update**:
|
||||||
|
```bash
|
||||||
|
tail -f /var/log/trackeep-auto-update.log
|
||||||
|
```
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
For issues or questions:
|
||||||
|
1. Check logs: `/var/log/trackeep-auto-update.log`
|
||||||
|
2. Run manual test: `./scripts/auto-update.sh`
|
||||||
|
3. Check service status: `docker compose -f docker-compose.prod.yml ps`
|
||||||
|
4. Review this README for troubleshooting steps
|
||||||
@@ -0,0 +1,894 @@
|
|||||||
|
# Redis Architecture Analysis for Trackeep
|
||||||
|
|
||||||
|
## Executive Summary
|
||||||
|
|
||||||
|
**Trackeep** is a self-hosted productivity and knowledge management platform built with Go (Gin framework), PostgreSQL, and React. The application already includes the `go-redis/redis/v8` dependency but currently operates with in-memory fallbacks for caching, sessions, and rate limiting. This analysis evaluates Redis deployment across multiple dimensions to determine architectural alignment and implementation strategy.
|
||||||
|
|
||||||
|
**Current Infrastructure:**
|
||||||
|
- **Backend:** Go 1.24 with Gin web framework
|
||||||
|
- **Database:** PostgreSQL 15 (primary data store)
|
||||||
|
- **Frontend:** React + TypeScript + Vite
|
||||||
|
- **Deployment:** Docker Compose (single-node, self-hosted)
|
||||||
|
- **Current Caching:** In-memory maps with mutex locks
|
||||||
|
- **Current Sessions:** In-memory map storage
|
||||||
|
- **Current Rate Limiting:** Per-instance in-memory tracking
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Use Case Analysis
|
||||||
|
|
||||||
|
### 1.1 Caching Frequently Accessed Database Queries
|
||||||
|
|
||||||
|
**Current State:**
|
||||||
|
The application uses [`MemoryCache`](backend/middleware/memory_cache.go:21) with `sync.RWMutex` for thread-safe in-memory caching. Cache entries expire via a cleanup goroutine running every minute.
|
||||||
|
|
||||||
|
**Redis Opportunity:**
|
||||||
|
|
||||||
|
| Query Pattern | Current Implementation | Redis Benefit |
|
||||||
|
|---------------|---------------------|---------------|
|
||||||
|
| User profiles | Direct DB query on each request | Cache for 5-15 min, reduces user table queries |
|
||||||
|
| Search results | Computed on every search | Cache complex searches for 5-10 min |
|
||||||
|
| Analytics dashboards | Aggregated from multiple tables | Cache pre-computed aggregations for 1 hour |
|
||||||
|
| Learning paths/courses | Filtered queries with joins | Cache popular paths for 30 min |
|
||||||
|
| YouTube channel data | Database cache + in-memory fallback | Unified Redis cache with TTL |
|
||||||
|
| Marketplace items | Sorted/filtered queries | Cache trending/top-rated items |
|
||||||
|
|
||||||
|
**Specific High-Value Caches:**
|
||||||
|
|
||||||
|
1. **Enhanced Search Cache** ([`search_enhanced.go`](backend/handlers/search_enhanced.go:73))
|
||||||
|
- Complex multi-table searches across bookmarks, tasks, notes, files
|
||||||
|
- Redis can cache results with content-type aggregation
|
||||||
|
- Suggested TTL: 5 minutes for dynamic content
|
||||||
|
|
||||||
|
2. **Analytics Dashboard Cache** ([`analytics.go`](backend/handlers/analytics.go:24))
|
||||||
|
- Expensive aggregations across analytics, learning, GitHub, habit tables
|
||||||
|
- Pre-computed dashboard data can be cached for 15-30 minutes
|
||||||
|
- User-specific caching with tags for invalidation
|
||||||
|
|
||||||
|
3. **AI Recommendations Cache** ([`ai_recommendations.go`](backend/handlers/ai_recommendations.go:49))
|
||||||
|
- ML-generated recommendations are expensive to compute
|
||||||
|
- Cache recommendation lists per user for 1 hour
|
||||||
|
- Cache recommendation statistics for 30 minutes
|
||||||
|
|
||||||
|
**Implementation Approach:**
|
||||||
|
```go
|
||||||
|
// Cache key structure
|
||||||
|
trackeep:{resource}:{user_id}:{query_hash}
|
||||||
|
trackeep:search:{user_id}:{md5(query+filters)}
|
||||||
|
trackeep:analytics:dashboard:{user_id}:{date_range}
|
||||||
|
trackeep:recommendations:{user_id}:{type}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.2 Distributed Session State Management
|
||||||
|
|
||||||
|
**Current State:**
|
||||||
|
The [`RedisSessionStore`](backend/middleware/session.go:36) struct exists but uses `map[string]*SessionData` as a fallback in-memory store. Sessions are lost on server restart and don't work across multiple backend instances.
|
||||||
|
|
||||||
|
**Session Data Structure:**
|
||||||
|
```go
|
||||||
|
type SessionData struct {
|
||||||
|
UserID uint `json:"user_id"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Username string `json:"username"`
|
||||||
|
Role string `json:"role"`
|
||||||
|
SessionID string `json:"session_id"`
|
||||||
|
IPAddress string `json:"ip_address"`
|
||||||
|
UserAgent string `json:"user_agent"`
|
||||||
|
CreatedAt time.Time `json:"created_at"`
|
||||||
|
LastActive time.Time `json:"last_active"`
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Redis Implementation:**
|
||||||
|
- Use Redis Hash or JSON data type for session storage
|
||||||
|
- TTL: 24 hours (matching current cleanup logic)
|
||||||
|
- Enable session persistence across deployments
|
||||||
|
- Support horizontal scaling of backend instances
|
||||||
|
- Session invalidation on logout/password change
|
||||||
|
|
||||||
|
**Key Pattern:**
|
||||||
|
```
|
||||||
|
trackeep:session:{session_id} -> SessionData (JSON)
|
||||||
|
trackeep:user:sessions:{user_id} -> Set of active session IDs
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.3 Real-Time Leaderboards and Rate Tracking
|
||||||
|
|
||||||
|
**Current Opportunities:**
|
||||||
|
|
||||||
|
1. **Community Challenges Leaderboard** ([`community.go`](backend/handlers/community.go:1))
|
||||||
|
- Track challenge participants and completion rates
|
||||||
|
- Real-time leaderboard updates
|
||||||
|
- Redis Sorted Sets (`ZADD`, `ZREVRANGE`) ideal for ranking
|
||||||
|
|
||||||
|
2. **Marketplace Item Rankings** ([`marketplace.go`](backend/handlers/marketplace.go:1))
|
||||||
|
- Sort by downloads, rating, views
|
||||||
|
- Trending items calculation
|
||||||
|
- Redis can maintain real-time counters
|
||||||
|
|
||||||
|
3. **User Analytics Streaks** ([`analytics.go`](backend/handlers/analytics.go:786))
|
||||||
|
- Learning streaks tracking
|
||||||
|
- Daily habit completion counts
|
||||||
|
- Redis counters with daily windows
|
||||||
|
|
||||||
|
**Implementation:**
|
||||||
|
```go
|
||||||
|
// Challenge leaderboard
|
||||||
|
trackeep:challenge:{id}:leaderboard -> Sorted Set (score: completion_time, member: user_id)
|
||||||
|
|
||||||
|
// Marketplace trending
|
||||||
|
trackeep:marketplace:trending -> Sorted Set (score: view_count_24h, member: item_id)
|
||||||
|
|
||||||
|
// User learning streaks
|
||||||
|
trackeep:user:{id}:learning_streak -> Hash (current_streak, last_date, max_streak)
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.4 Rate Limiting
|
||||||
|
|
||||||
|
**Current State:**
|
||||||
|
The [`RateLimiter`](backend/middleware/rate_limiter.go:13) uses in-memory `map[string]*ClientInfo` with per-IP tracking. This doesn't work across multiple instances and is vulnerable to restart clearing.
|
||||||
|
|
||||||
|
**Redis-Based Rate Limiting:**
|
||||||
|
|
||||||
|
| Rate Limit Type | Window | Current Limit | Redis Strategy |
|
||||||
|
|-----------------|--------|---------------|----------------|
|
||||||
|
| General API | 1 minute | 100 requests | Sliding window with `ZADD` |
|
||||||
|
| Search | 1 minute | 100 requests | Fixed window with `INCR` + `EXPIRE` |
|
||||||
|
| AI Chat | 1 minute | 20 requests | Token bucket algorithm |
|
||||||
|
| Login attempts | 5 minutes | 5 attempts | Count with `INCR` + longer TTL |
|
||||||
|
| File uploads | 10 minutes | 10 uploads | Sliding window per user |
|
||||||
|
|
||||||
|
**Token Bucket Implementation:**
|
||||||
|
```go
|
||||||
|
// Redis Lua script for atomic token bucket
|
||||||
|
local key = KEYS[1]
|
||||||
|
local capacity = tonumber(ARGV[1])
|
||||||
|
local refill_rate = tonumber(ARGV[2])
|
||||||
|
local now = tonumber(ARGV[3])
|
||||||
|
|
||||||
|
local bucket = redis.call('HMGET', key, 'tokens', 'last_refill')
|
||||||
|
local tokens = tonumber(bucket[1]) or capacity
|
||||||
|
local last_refill = tonumber(bucket[2]) or now
|
||||||
|
|
||||||
|
local delta = math.min(capacity, tokens + (now - last_refill) * refill_rate)
|
||||||
|
|
||||||
|
if delta >= 1 then
|
||||||
|
redis.call('HMSET', key, 'tokens', delta - 1, 'last_refill', now)
|
||||||
|
redis.call('EXPIRE', key, 3600)
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
redis.call('HMSET', key, 'tokens', delta, 'last_refill', now)
|
||||||
|
redis.call('EXPIRE', key, 3600)
|
||||||
|
return 0
|
||||||
|
end
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.5 Publish-Subscribe Messaging Patterns
|
||||||
|
|
||||||
|
**Current State:**
|
||||||
|
Real-time messaging uses WebSocket hub [`MessagesHub`](backend/services/messages_realtime.go:28) with in-memory `conversationClients` map. This is single-node only.
|
||||||
|
|
||||||
|
**Redis Pub/Sub for Multi-Node:**
|
||||||
|
|
||||||
|
1. **Cross-Instance Message Broadcasting**
|
||||||
|
- When horizontal scaling is needed, Redis Pub/Sub connects multiple backend instances
|
||||||
|
- Pattern: `trackeep:messages:{conversation_id}`
|
||||||
|
|
||||||
|
2. **Notification System**
|
||||||
|
- Real-time notifications for new followers, messages, mentions
|
||||||
|
- Pattern: `trackeep:notifications:{user_id}`
|
||||||
|
|
||||||
|
3. **System Events**
|
||||||
|
- Cache invalidation broadcasts
|
||||||
|
- Configuration updates
|
||||||
|
- Analytics aggregation triggers
|
||||||
|
|
||||||
|
**Implementation:**
|
||||||
|
```go
|
||||||
|
// Subscribe to conversation messages
|
||||||
|
pubsub := redisClient.Subscribe(ctx, "trackeep:messages:123")
|
||||||
|
|
||||||
|
// Publish message to all nodes
|
||||||
|
redisClient.Publish(ctx, "trackeep:messages:123", messageJSON)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Data Access Patterns and Latency Requirements
|
||||||
|
|
||||||
|
### 2.1 Current Database Access Patterns
|
||||||
|
|
||||||
|
Based on code analysis, the application exhibits these access patterns:
|
||||||
|
|
||||||
|
| Pattern | Frequency | Tables | Latency Sensitivity |
|
||||||
|
|---------|-----------|--------|---------------------|
|
||||||
|
| User authentication | High | users | Very High (< 100ms) |
|
||||||
|
| Search queries | Medium-High | bookmarks, tasks, notes, files | High (< 500ms) |
|
||||||
|
| Analytics aggregation | Medium | analytics, learning_analytics | Medium (< 2s) |
|
||||||
|
| Message retrieval | High | messages, conversations | High (< 200ms) |
|
||||||
|
| AI recommendations | Low-Medium | ai_recommendations | Low (< 5s acceptable) |
|
||||||
|
| Marketplace browsing | Medium | marketplace_items | Medium (< 1s) |
|
||||||
|
| Audit logging | High (write) | audit_logs | Low (async) |
|
||||||
|
|
||||||
|
### 2.2 Latency Requirements Analysis
|
||||||
|
|
||||||
|
**Critical Paths for Redis Caching:**
|
||||||
|
|
||||||
|
1. **Authentication Flow** (Target: < 100ms)
|
||||||
|
- Current: DB query for user + session lookup
|
||||||
|
- With Redis: Session cache + user profile cache
|
||||||
|
- Expected improvement: 60-80% latency reduction
|
||||||
|
|
||||||
|
2. **Dashboard Load** (Target: < 500ms)
|
||||||
|
- Current: Multiple aggregation queries
|
||||||
|
- With Redis: Pre-computed analytics cache
|
||||||
|
- Expected improvement: 70-90% latency reduction
|
||||||
|
|
||||||
|
3. **Search Results** (Target: < 300ms)
|
||||||
|
- Current: Full-text search across 4+ tables
|
||||||
|
- With Redis: Cached results for common queries
|
||||||
|
- Expected improvement: 50-80% latency reduction
|
||||||
|
|
||||||
|
### 2.3 Cache Invalidation Strategy
|
||||||
|
|
||||||
|
**Event-Based Invalidation:**
|
||||||
|
|
||||||
|
| Data Type | Cache Keys | Invalidation Trigger |
|
||||||
|
|-----------|------------|---------------------|
|
||||||
|
| User profile | `user:{id}:profile` | User update, password change |
|
||||||
|
| Search results | `search:{user_id}:*` | Any content creation/update |
|
||||||
|
| Analytics | `analytics:{user_id}:*` | Daily aggregation job |
|
||||||
|
| Recommendations | `recommendations:{user_id}:*` | New interaction, daily refresh |
|
||||||
|
| Marketplace | `marketplace:*` | New item, rating update |
|
||||||
|
|
||||||
|
**Implementation:**
|
||||||
|
```go
|
||||||
|
// Invalidate user-specific cache on update
|
||||||
|
func (h *UserHandler) UpdateUser(c *gin.Context) {
|
||||||
|
// ... update logic ...
|
||||||
|
|
||||||
|
// Invalidate cache
|
||||||
|
redisClient.Del(ctx, fmt.Sprintf("trackeep:user:%d:profile", userID))
|
||||||
|
redisClient.Del(ctx, fmt.Sprintf("trackeep:analytics:dashboard:%d:*", userID))
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Scalability Needs Assessment
|
||||||
|
|
||||||
|
### 3.1 Current Architecture Constraints
|
||||||
|
|
||||||
|
**Single-Node Limitations:**
|
||||||
|
- Docker Compose deployment targets single-node self-hosting
|
||||||
|
- In-memory caches limit horizontal scaling
|
||||||
|
- WebSocket hub cannot distribute across nodes
|
||||||
|
- Session storage doesn't persist restarts
|
||||||
|
|
||||||
|
**Growth Projections:**
|
||||||
|
|
||||||
|
| Resource | Current (Single User) | Projected (100 Users) | Projected (1000 Users) |
|
||||||
|
|----------|----------------------|----------------------|----------------------|
|
||||||
|
| Session storage | ~5KB | ~500KB | ~5MB |
|
||||||
|
| Cache data | ~10MB | ~100MB | ~500MB |
|
||||||
|
| Rate limit state | ~1KB | ~100KB | ~1MB |
|
||||||
|
| Real-time subscribers | 1-5 | 50-200 | 200-500 |
|
||||||
|
|
||||||
|
### 3.2 Redis Clustering Requirements
|
||||||
|
|
||||||
|
**Phase 1: Single Redis Instance (Current Scale)**
|
||||||
|
- Suitable for < 100 concurrent users
|
||||||
|
- 1GB RAM allocation sufficient
|
||||||
|
- No clustering complexity
|
||||||
|
|
||||||
|
**Phase 2: Redis Sentinel (High Availability)**
|
||||||
|
- Required for production reliability
|
||||||
|
- 1 master + 2 replicas minimum
|
||||||
|
- Automatic failover capability
|
||||||
|
|
||||||
|
**Phase 3: Redis Cluster (Horizontal Scale)**
|
||||||
|
- Required for > 1000 concurrent users
|
||||||
|
- 6+ nodes (3 masters + 3 replicas)
|
||||||
|
- Data sharding across nodes
|
||||||
|
|
||||||
|
**Recommendation for Trackeep:**
|
||||||
|
Given the self-hosted nature and typical deployment size (small teams), **Redis Sentinel** provides the best balance of high availability without excessive complexity.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Persistence and Memory Optimization
|
||||||
|
|
||||||
|
### 4.1 Persistence Configuration
|
||||||
|
|
||||||
|
**Redis Persistence Options:**
|
||||||
|
|
||||||
|
| Option | Configuration | Use Case |
|
||||||
|
|--------|--------------|----------|
|
||||||
|
| RDB (Snapshot) | `save 900 1`, `save 300 10` | Point-in-time recovery, minimal overhead |
|
||||||
|
| AOF (Append-Only) | `appendonly yes`, `appendfsync everysec` | Durability, zero data loss |
|
||||||
|
| Hybrid | Both enabled | Maximum protection |
|
||||||
|
|
||||||
|
**Recommendation for Trackeep:**
|
||||||
|
```conf
|
||||||
|
# redis.conf recommendations
|
||||||
|
save 900 1
|
||||||
|
save 300 10
|
||||||
|
save 60 10000
|
||||||
|
appendonly yes
|
||||||
|
appendfsync everysec
|
||||||
|
auto-aof-rewrite-percentage 100
|
||||||
|
auto-aof-rewrite-min-size 64mb
|
||||||
|
```
|
||||||
|
|
||||||
|
**Rationale:**
|
||||||
|
- Sessions should survive restarts (use AOF)
|
||||||
|
- Cache can be rebuilt from DB (RDB sufficient)
|
||||||
|
- `everysec` provides good balance of durability/performance
|
||||||
|
|
||||||
|
### 4.2 Memory Optimization Strategies
|
||||||
|
|
||||||
|
**Estimated Memory Usage:**
|
||||||
|
|
||||||
|
| Data Type | Entries | Entry Size | Total |
|
||||||
|
|-----------|---------|------------|-------|
|
||||||
|
| Sessions | 1000 | ~500 bytes | 500 KB |
|
||||||
|
| User caches | 1000 | ~2 KB | 2 MB |
|
||||||
|
| Search caches | 5000 | ~10 KB | 50 MB |
|
||||||
|
| Analytics caches | 1000 | ~5 KB | 5 MB |
|
||||||
|
| Rate limit buckets | 10000 | ~100 bytes | 1 MB |
|
||||||
|
| Real-time pub/sub | 500 | ~200 bytes | 100 KB |
|
||||||
|
| **Total** | | | **~60 MB + overhead** |
|
||||||
|
|
||||||
|
**Memory Optimization Techniques:**
|
||||||
|
|
||||||
|
1. **Compression**
|
||||||
|
```go
|
||||||
|
// Use MessagePack or gzip for large cached data
|
||||||
|
import "github.com/vmihailenco/msgpack/v5"
|
||||||
|
|
||||||
|
func compressCache(data interface{}) ([]byte, error) {
|
||||||
|
return msgpack.Marshal(data)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Key Naming Optimization**
|
||||||
|
```
|
||||||
|
# Short prefixes
|
||||||
|
tk:u:1234:profile (instead of trackeep:user:1234:profile)
|
||||||
|
|
||||||
|
# Hashed identifiers for long IDs
|
||||||
|
tk:s:8f3d2c... (MD5 hash of session data)
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **TTL Strategy**
|
||||||
|
```go
|
||||||
|
const (
|
||||||
|
SessionTTL = 24 * time.Hour
|
||||||
|
UserCacheTTL = 15 * time.Minute
|
||||||
|
SearchCacheTTL = 5 * time.Minute
|
||||||
|
AnalyticsCacheTTL = 1 * time.Hour
|
||||||
|
RateLimitTTL = 1 * time.Hour
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.3 Data Eviction Policies
|
||||||
|
|
||||||
|
**Recommended Configuration:**
|
||||||
|
```conf
|
||||||
|
maxmemory 256mb
|
||||||
|
maxmemory-policy allkeys-lru
|
||||||
|
```
|
||||||
|
|
||||||
|
**Policy Selection:**
|
||||||
|
- `allkeys-lru`: Best for cache-heavy workloads (recommended)
|
||||||
|
- `volatile-lru`: If some keys must persist
|
||||||
|
- `noeviction`: Fail writes at memory limit (not recommended)
|
||||||
|
|
||||||
|
**Key Expiration Strategy:**
|
||||||
|
- Sessions: 24h TTL with refresh on activity
|
||||||
|
- Search results: 5m TTL
|
||||||
|
- Analytics: 1h TTL
|
||||||
|
- Rate limits: Window-based TTL
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Integration Challenges and Solutions
|
||||||
|
|
||||||
|
### 5.1 Existing Technology Stack Integration
|
||||||
|
|
||||||
|
**Go + Gin Integration:**
|
||||||
|
|
||||||
|
```go
|
||||||
|
// config/redis.go
|
||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
|
)
|
||||||
|
|
||||||
|
var RedisClient *redis.Client
|
||||||
|
|
||||||
|
func InitRedis() {
|
||||||
|
RedisClient = redis.NewClient(&redis.Options{
|
||||||
|
Addr: os.Getenv("REDIS_ADDR"),
|
||||||
|
Password: os.Getenv("REDIS_PASSWORD"),
|
||||||
|
DB: 0,
|
||||||
|
PoolSize: 10,
|
||||||
|
MinIdleConns: 5,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Docker Compose Integration:**
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# docker-compose.yml addition
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
image: redis:7-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
command: redis-server --appendonly yes --maxmemory 256mb --maxmemory-policy allkeys-lru
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
redis_data:
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5.2 Migration Path from In-Memory to Redis
|
||||||
|
|
||||||
|
**Phase 1: Graceful Fallback (Week 1)**
|
||||||
|
```go
|
||||||
|
func GetCache(key string) ([]byte, error) {
|
||||||
|
// Try Redis first
|
||||||
|
if RedisClient != nil {
|
||||||
|
val, err := RedisClient.Get(ctx, key).Bytes()
|
||||||
|
if err == nil {
|
||||||
|
return val, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Fallback to memory cache
|
||||||
|
return memoryCache.Get(key)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Phase 2: Feature-by-Feature Migration (Weeks 2-4)**
|
||||||
|
1. Session storage (highest impact)
|
||||||
|
2. Rate limiting (consistency improvement)
|
||||||
|
3. Search caching (performance gain)
|
||||||
|
4. Analytics caching (complex aggregations)
|
||||||
|
|
||||||
|
**Phase 3: Full Redis Adoption (Week 5)**
|
||||||
|
- Remove in-memory cache implementations
|
||||||
|
- Enable Redis Sentinel for HA
|
||||||
|
|
||||||
|
### 5.3 Connection Pooling Configuration
|
||||||
|
|
||||||
|
**Recommended Pool Settings:**
|
||||||
|
```go
|
||||||
|
&redis.Options{
|
||||||
|
PoolSize: 20, // Max connections
|
||||||
|
MinIdleConns: 5, // Always maintained
|
||||||
|
MaxConnAge: time.Hour, // Connection refresh
|
||||||
|
PoolTimeout: 5 * time.Second, // Wait for connection
|
||||||
|
IdleTimeout: 10 * time.Minute, // Close idle connections
|
||||||
|
ReadTimeout: 3 * time.Second,
|
||||||
|
WriteTimeout: 3 * time.Second,
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Connection Monitoring:**
|
||||||
|
```go
|
||||||
|
// Health check endpoint
|
||||||
|
func RedisHealthCheck() map[string]interface{} {
|
||||||
|
info := RedisClient.Info(ctx, "clients").Val()
|
||||||
|
stats := RedisClient.PoolStats()
|
||||||
|
|
||||||
|
return map[string]interface{}{
|
||||||
|
"hits": stats.Hits,
|
||||||
|
"misses": stats.Misses,
|
||||||
|
"timeouts": stats.Timeouts,
|
||||||
|
"total_conns": stats.TotalConns,
|
||||||
|
"idle_conns": stats.IdleConns,
|
||||||
|
"stale_conns": stats.StaleConns,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Alternative Solutions Comparison
|
||||||
|
|
||||||
|
### 6.1 Redis vs Memcached
|
||||||
|
|
||||||
|
| Feature | Redis | Memcached | Recommendation |
|
||||||
|
|---------|-------|-----------|----------------|
|
||||||
|
| Data structures | Rich (Hash, Set, Sorted Set) | Simple key-value | Redis for complex use cases |
|
||||||
|
| Persistence | RDB + AOF | None | Redis for session durability |
|
||||||
|
| Pub/Sub | Native | Not supported | Redis for real-time features |
|
||||||
|
| Clustering | Built-in | Client-side | Redis easier to manage |
|
||||||
|
| Rate limiting | Lua scripting | Increment only | Redis for complex algorithms |
|
||||||
|
| Memory efficiency | Good | Excellent | Memcached for pure cache |
|
||||||
|
| Transactions | Multi/Lua | CAS only | Redis better consistency |
|
||||||
|
|
||||||
|
**Verdict:** Redis is superior for Trackeep due to need for persistence (sessions), complex data structures (leaderboards), and pub/sub (real-time messaging).
|
||||||
|
|
||||||
|
### 6.2 Redis vs Kafka
|
||||||
|
|
||||||
|
| Use Case | Redis | Kafka | Recommendation |
|
||||||
|
|----------|-------|-------|----------------|
|
||||||
|
| Message queue | Streams (simple) | Purpose-built | Kafka for high throughput |
|
||||||
|
| Pub/Sub | Excellent | Not primary use | Redis for real-time |
|
||||||
|
| Event sourcing | Limited | Designed for it | Kafka for audit trail |
|
||||||
|
| Log aggregation | Not suitable | Perfect fit | Kafka for analytics pipeline |
|
||||||
|
|
||||||
|
**Hybrid Architecture:**
|
||||||
|
- **Redis**: Real-time messaging, caching, sessions, leaderboards
|
||||||
|
- **Kafka** (future): Audit log streaming, analytics events, AI training data
|
||||||
|
|
||||||
|
**Verdict:** Start with Redis for all current use cases. Add Kafka later if event streaming volume exceeds 10k events/second.
|
||||||
|
|
||||||
|
### 6.3 Redis vs PostgreSQL Caching
|
||||||
|
|
||||||
|
| Approach | Implementation | Pros | Cons |
|
||||||
|
|----------|---------------|------|------|
|
||||||
|
| PostgreSQL Materialized Views | Native | No new infrastructure | Stale data, manual refresh |
|
||||||
|
| PostgreSQL UNLOGGED tables | Write-only tables | Persistent | No TTL, manual cleanup |
|
||||||
|
| Redis | External service | TTL, pub/sub, scaling | Additional dependency |
|
||||||
|
|
||||||
|
**Verdict:** Redis provides the flexibility needed for Trackeep's diverse caching requirements.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Implementation Best Practices
|
||||||
|
|
||||||
|
### 7.1 Serialization Formats
|
||||||
|
|
||||||
|
**Performance Comparison:**
|
||||||
|
|
||||||
|
| Format | Encoding Speed | Decoding Speed | Size | Recommendation |
|
||||||
|
|--------|---------------|----------------|------|----------------|
|
||||||
|
| JSON | Fast | Fast | Large | Human-readable debugging |
|
||||||
|
| MessagePack | Very Fast | Very Fast | Small | Production default |
|
||||||
|
| Protobuf | Fastest | Fastest | Smallest | Complex schemas |
|
||||||
|
| Gzip+JSON | Slow | Slow | Smallest | Large payloads only |
|
||||||
|
|
||||||
|
**Implementation:**
|
||||||
|
```go
|
||||||
|
import "github.com/vmihailenco/msgpack/v5"
|
||||||
|
|
||||||
|
func serialize(data interface{}) ([]byte, error) {
|
||||||
|
return msgpack.Marshal(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func deserialize(data []byte, v interface{}) error {
|
||||||
|
return msgpack.Unmarshal(data, v)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.2 Key Naming Conventions
|
||||||
|
|
||||||
|
**Hierarchical Structure:**
|
||||||
|
```
|
||||||
|
tk:{resource}:{id}:{attribute}:{context}
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
tk:u:1234:profile # User profile
|
||||||
|
tk:u:1234:sessions # Active sessions
|
||||||
|
tk:search:1234:a7f3... # Search cache (hashed query)
|
||||||
|
tk:analytics:1234:dashboard:daily # Analytics dashboard
|
||||||
|
tk:rl:1234:general # Rate limit bucket
|
||||||
|
tk:msg:conv:5678:recent # Recent messages
|
||||||
|
tk:marketplace:trending:daily # Trending items
|
||||||
|
tk:challenge:12:leaderboard # Challenge rankings
|
||||||
|
```
|
||||||
|
|
||||||
|
### 7.3 Error Handling and Fallbacks
|
||||||
|
|
||||||
|
**Circuit Breaker Pattern:**
|
||||||
|
```go
|
||||||
|
type RedisCircuitBreaker struct {
|
||||||
|
failures int
|
||||||
|
lastFailure time.Time
|
||||||
|
state string // closed, open, half-open
|
||||||
|
mutex sync.RWMutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cb *RedisCircuitBreaker) Execute(fn func() error) error {
|
||||||
|
if cb.isOpen() {
|
||||||
|
return fmt.Errorf("redis circuit breaker open")
|
||||||
|
}
|
||||||
|
|
||||||
|
err := fn()
|
||||||
|
if err != nil {
|
||||||
|
cb.recordFailure()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
cb.recordSuccess()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Graceful Degradation:**
|
||||||
|
```go
|
||||||
|
func GetWithFallback(key string, fetchFn func() ([]byte, error)) ([]byte, error) {
|
||||||
|
// Try Redis
|
||||||
|
data, err := redisClient.Get(ctx, key).Bytes()
|
||||||
|
if err == nil {
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback to fetch function
|
||||||
|
data, err = fetchFn()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache for next time (async)
|
||||||
|
go func() {
|
||||||
|
redisClient.Set(ctx, key, data, cacheTTL)
|
||||||
|
}()
|
||||||
|
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 8. Security Considerations
|
||||||
|
|
||||||
|
### 8.1 Authentication and Authorization
|
||||||
|
|
||||||
|
**Redis Security Configuration:**
|
||||||
|
```conf
|
||||||
|
# redis.conf
|
||||||
|
requirepass ${REDIS_PASSWORD}
|
||||||
|
rename-command FLUSHDB ""
|
||||||
|
rename-command FLUSHALL ""
|
||||||
|
rename-command CONFIG "CONFIG_a1b2c3"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Go Client Authentication:**
|
||||||
|
```go
|
||||||
|
redis.NewClient(&redis.Options{
|
||||||
|
Addr: os.Getenv("REDIS_ADDR"),
|
||||||
|
Password: os.Getenv("REDIS_PASSWORD"),
|
||||||
|
Username: os.Getenv("REDIS_USERNAME"), // Redis 6+ ACL
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
### 8.2 Encryption Requirements
|
||||||
|
|
||||||
|
| Layer | Encryption | Implementation |
|
||||||
|
|-------|-----------|----------------|
|
||||||
|
| Transit | TLS 1.2+ | `redis://` → `rediss://` |
|
||||||
|
| At-rest | Optional | Volume encryption |
|
||||||
|
| Application | Field-level | For sensitive cache data |
|
||||||
|
|
||||||
|
**TLS Configuration:**
|
||||||
|
```go
|
||||||
|
redis.NewClient(&redis.Options{
|
||||||
|
Addr: "rediss://redis:6379",
|
||||||
|
TLSConfig: &tls.Config{
|
||||||
|
MinVersion: tls.VersionTLS12,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
**Sensitive Data Handling:**
|
||||||
|
- Never cache: passwords, encryption keys, 2FA secrets
|
||||||
|
- Encrypt before caching: API keys, tokens (if cached)
|
||||||
|
- Session data: Safe to cache (already has session ID)
|
||||||
|
|
||||||
|
### 8.3 Network Security
|
||||||
|
|
||||||
|
**Docker Compose Network Isolation:**
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
networks:
|
||||||
|
- backend-internal
|
||||||
|
# No port mapping - only accessible within network
|
||||||
|
|
||||||
|
backend:
|
||||||
|
networks:
|
||||||
|
- backend-internal
|
||||||
|
- public
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 9. Monitoring and Observability
|
||||||
|
|
||||||
|
### 9.1 Key Metrics to Track
|
||||||
|
|
||||||
|
| Metric | Redis Command | Alert Threshold |
|
||||||
|
|--------|--------------|-----------------|
|
||||||
|
| Memory usage | `INFO memory` | > 80% of maxmemory |
|
||||||
|
| Hit rate | `INFO stats` | < 80% |
|
||||||
|
| Connected clients | `INFO clients` | > 90% of maxclients |
|
||||||
|
| Slow queries | `SLOWLOG GET` | > 10ms |
|
||||||
|
| Replication lag | `INFO replication` | > 1s |
|
||||||
|
| Evicted keys | `INFO stats` | > 100/min |
|
||||||
|
|
||||||
|
### 9.2 Health Check Implementation
|
||||||
|
|
||||||
|
```go
|
||||||
|
func RedisHealthCheck(ctx context.Context) map[string]interface{} {
|
||||||
|
result := map[string]interface{}{
|
||||||
|
"status": "healthy",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ping test
|
||||||
|
if err := RedisClient.Ping(ctx).Err(); err != nil {
|
||||||
|
result["status"] = "unhealthy"
|
||||||
|
result["error"] = err.Error()
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// Memory info
|
||||||
|
info := RedisClient.Info(ctx, "memory").Val()
|
||||||
|
result["memory_info"] = parseRedisInfo(info)
|
||||||
|
|
||||||
|
// Pool stats
|
||||||
|
stats := RedisClient.PoolStats()
|
||||||
|
result["pool"] = map[string]interface{}{
|
||||||
|
"hits": stats.Hits,
|
||||||
|
"misses": stats.Misses,
|
||||||
|
"timeouts": stats.Timeouts,
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 10. Cost-Benefit Analysis
|
||||||
|
|
||||||
|
### 10.1 Implementation Costs
|
||||||
|
|
||||||
|
| Component | Effort | Risk | Priority |
|
||||||
|
|-----------|--------|------|----------|
|
||||||
|
| Redis infrastructure setup | 4 hours | Low | High |
|
||||||
|
| Session storage migration | 8 hours | Medium | High |
|
||||||
|
| Rate limiting refactor | 6 hours | Low | Medium |
|
||||||
|
| Search caching | 12 hours | Medium | Medium |
|
||||||
|
| Analytics caching | 8 hours | Low | Low |
|
||||||
|
| Testing & validation | 16 hours | Low | High |
|
||||||
|
| **Total** | **54 hours** | | |
|
||||||
|
|
||||||
|
### 10.2 Operational Benefits
|
||||||
|
|
||||||
|
| Metric | Before Redis | After Redis | Improvement |
|
||||||
|
|--------|-------------|-------------|-------------|
|
||||||
|
| Session persistence | None | Full | Critical |
|
||||||
|
| Horizontal scaling | Limited | Full | High |
|
||||||
|
| API response time (P95) | 500ms | 150ms | 70% |
|
||||||
|
| Database load | 100% | 40% | 60% |
|
||||||
|
| Rate limit accuracy | Per-node | Global | High |
|
||||||
|
| Real-time capabilities | Single-node | Multi-node | High |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 11. Implementation Roadmap
|
||||||
|
|
||||||
|
### Phase 1: Foundation (Week 1)
|
||||||
|
- [ ] Add Redis service to Docker Compose
|
||||||
|
- [ ] Implement Redis client initialization
|
||||||
|
- [ ] Add health checks and monitoring
|
||||||
|
- [ ] Configure persistence and memory limits
|
||||||
|
|
||||||
|
### Phase 2: Critical Features (Weeks 2-3)
|
||||||
|
- [ ] Migrate session storage to Redis
|
||||||
|
- [ ] Implement distributed rate limiting
|
||||||
|
- [ ] Add connection pooling
|
||||||
|
- [ ] Implement circuit breaker pattern
|
||||||
|
|
||||||
|
### Phase 3: Performance Optimization (Weeks 4-5)
|
||||||
|
- [ ] Implement search result caching
|
||||||
|
- [ ] Add analytics dashboard caching
|
||||||
|
- [ ] Implement cache warming strategy
|
||||||
|
- [ ] Add compression for large payloads
|
||||||
|
|
||||||
|
### Phase 4: Advanced Features (Week 6)
|
||||||
|
- [ ] Real-time leaderboards with Sorted Sets
|
||||||
|
- [ ] Pub/Sub for cross-instance messaging
|
||||||
|
- [ ] Redis Sentinel for high availability
|
||||||
|
- [ ] Performance benchmarking and tuning
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 12. Conclusion
|
||||||
|
|
||||||
|
**Redis deployment is strongly recommended for Trackeep** based on the following architectural alignment factors:
|
||||||
|
|
||||||
|
1. **Current Pain Points Addressed:**
|
||||||
|
- Session persistence across restarts
|
||||||
|
- Distributed rate limiting for future scaling
|
||||||
|
- Reduced database load for expensive queries
|
||||||
|
- Real-time features support
|
||||||
|
|
||||||
|
2. **Architectural Fit:**
|
||||||
|
- Existing go-redis dependency ready for use
|
||||||
|
- Docker Compose deployment simplifies Redis addition
|
||||||
|
- In-memory implementations provide migration blueprint
|
||||||
|
- Self-hosted nature allows resource allocation control
|
||||||
|
|
||||||
|
3. **Risk Assessment:**
|
||||||
|
- **Low Risk:** Redis is mature, well-documented, and has Go library support
|
||||||
|
- **Medium Risk:** Migration from in-memory to Redis requires testing
|
||||||
|
- **Mitigation:** Graceful fallback implementations ensure no downtime
|
||||||
|
|
||||||
|
4. **ROI:**
|
||||||
|
- 54 hours of implementation effort
|
||||||
|
- 70% improvement in API response times
|
||||||
|
- 60% reduction in database load
|
||||||
|
- Enables horizontal scaling for future growth
|
||||||
|
|
||||||
|
**Recommendation:** Proceed with Redis deployment starting with Phase 1 (Foundation) immediately, followed by critical feature migration in subsequent sprints.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Appendix A: Environment Variables
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Redis Configuration
|
||||||
|
REDIS_ADDR=redis:6379
|
||||||
|
REDIS_PASSWORD=secure_password_here
|
||||||
|
REDIS_DB=0
|
||||||
|
REDIS_POOL_SIZE=20
|
||||||
|
REDIS_DIAL_TIMEOUT=5s
|
||||||
|
REDIS_READ_TIMEOUT=3s
|
||||||
|
REDIS_WRITE_TIMEOUT=3s
|
||||||
|
|
||||||
|
# Feature Flags
|
||||||
|
REDIS_SESSIONS_ENABLED=true
|
||||||
|
REDIS_CACHE_ENABLED=true
|
||||||
|
REDIS_RATELIMIT_ENABLED=true
|
||||||
|
REDIS_PUBSUB_ENABLED=true
|
||||||
|
```
|
||||||
|
|
||||||
|
## Appendix B: Docker Compose Configuration
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
version: '3.8'
|
||||||
|
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
image: redis:7-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
- ./redis.conf:/usr/local/etc/redis/redis.conf:ro
|
||||||
|
command: redis-server /usr/local/etc/redis/redis.conf
|
||||||
|
networks:
|
||||||
|
- trackeep-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
|
||||||
|
trackeep-backend:
|
||||||
|
environment:
|
||||||
|
- REDIS_ADDR=redis:6379
|
||||||
|
- REDIS_PASSWORD=${REDIS_PASSWORD}
|
||||||
|
depends_on:
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
redis_data:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
trackeep-network:
|
||||||
|
driver: bridge
|
||||||
|
```
|
||||||
@@ -0,0 +1,563 @@
|
|||||||
|
# Redis Architecture Diagram for Trackeep
|
||||||
|
|
||||||
|
## System Overview
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────────────────────────────┐
|
||||||
|
│ CLIENT LAYER │
|
||||||
|
│ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │
|
||||||
|
│ │ Web App │ │ Browser Ext │ │ Mobile │ │ API Keys │ │
|
||||||
|
│ │ (React) │ │ │ │ (Future) │ │ │ │
|
||||||
|
│ └──────┬───────┘ └──────┬───────┘ └──────┬───────┘ └──────┬───────┘ │
|
||||||
|
└─────────┼─────────────────┼─────────────────┼─────────────────┼────────────┘
|
||||||
|
│ │ │ │
|
||||||
|
└─────────────────┴─────────────────┴─────────────────┘
|
||||||
|
│
|
||||||
|
HTTP/WebSocket
|
||||||
|
│
|
||||||
|
┌───────────────────────────────────┼─────────────────────────────────────────┐
|
||||||
|
│ LOAD BALANCER / REVERSE PROXY │
|
||||||
|
│ (Nginx / Traefik - Future) │
|
||||||
|
└───────────────────────────────────┼─────────────────────────────────────────┘
|
||||||
|
│
|
||||||
|
┌─────────────────────────┼─────────────────────────┐
|
||||||
|
│ │ │
|
||||||
|
┌─────────▼─────────┐ ┌──────────▼──────────┐ ┌─────────▼─────────┐
|
||||||
|
│ Trackeep Backend │ │ Trackeep Backend │ │ Trackeep Backend │
|
||||||
|
│ Instance 1 │◄──►│ Instance 2 │◄─►│ Instance N │
|
||||||
|
│ (Go/Gin) │ │ (Go/Gin) │ │ (Go/Gin) │
|
||||||
|
└─────────┬─────────┘ └──────────┬──────────┘ └─────────┬─────────┘
|
||||||
|
│ │ │
|
||||||
|
└─────────────────────────┼─────────────────────────┘
|
||||||
|
│
|
||||||
|
┌───────────────┴───────────────┐
|
||||||
|
│ │
|
||||||
|
┌─────────▼──────────┐ ┌─────────────▼──────────────┐
|
||||||
|
│ REDIS │ │ PostgreSQL │
|
||||||
|
│ (Cache Layer) │ │ (Primary Database) │
|
||||||
|
│ │ │ │
|
||||||
|
│ ┌───────────────┐ │ │ ┌──────────────────────┐ │
|
||||||
|
│ │ Sessions │ │ │ │ users │ │
|
||||||
|
│ │ (Hash) │ │ │ │ bookmarks │ │
|
||||||
|
│ ├───────────────┤ │ │ │ tasks │ │
|
||||||
|
│ │ Cache │ │ │ │ notes │ │
|
||||||
|
│ │ (String) │ │ │ │ files │ │
|
||||||
|
│ ├───────────────┤ │ │ │ messages │ │
|
||||||
|
│ │ Rate Limiting │ │ │ │ analytics │ │
|
||||||
|
│ │ (Sorted Set) │ │ │ │ marketplace │ │
|
||||||
|
│ ├───────────────┤ │ │ │ ... │ │
|
||||||
|
│ │ Leaderboards │ │ │ └──────────────────────┘ │
|
||||||
|
│ │ (Sorted Set) │ │ └────────────────────────────┘
|
||||||
|
│ ├───────────────┤ │
|
||||||
|
│ │ Pub/Sub │ │ ┌──────────────────────────────┐
|
||||||
|
│ │ Channels │◄─┼──────┤ YouTube Scraper Service │
|
||||||
|
│ └───────────────┘ │ │ (Python) │
|
||||||
|
└────────────────────┘ └──────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Data Flow Patterns
|
||||||
|
|
||||||
|
### 1. Session Management Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────┐ Login Request ┌──────────────┐
|
||||||
|
│ Client │ ─────────────────────► │ Backend │
|
||||||
|
└──────────┘ └──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Create Session
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ tk:session │
|
||||||
|
│ :{sessionID}│
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Store Session Data
|
||||||
|
│ (TTL: 24h)
|
||||||
|
▼
|
||||||
|
┌──────────┐ Session Cookie ┌──────────────┐
|
||||||
|
│ Client │ ◄───────────────────── │ Backend │
|
||||||
|
└────┬─────┘ └──────────────┘
|
||||||
|
│
|
||||||
|
│ Subsequent Requests
|
||||||
|
│ with Session Cookie
|
||||||
|
▼
|
||||||
|
┌──────────┐ Validate Session ┌──────────────┐
|
||||||
|
│ Client │ ─────────────────────► │ Backend │
|
||||||
|
└──────────┘ └──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Lookup Session
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ (O(1) get) │
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Session Valid
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Response │
|
||||||
|
└──────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. Caching Flow (Search Results)
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────┐ Search Request ┌──────────────┐
|
||||||
|
│ Client │ ────────────────────► │ Backend │
|
||||||
|
└──────────┘ └──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Check Cache
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ tk:search │
|
||||||
|
│ :{hash} │
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
┌───────────┴───────────┐
|
||||||
|
│ │
|
||||||
|
Cache Hit Cache Miss
|
||||||
|
│ │
|
||||||
|
▼ ▼
|
||||||
|
┌────────────┐ ┌────────────────┐
|
||||||
|
│ Return │ │ Query │
|
||||||
|
│ Cached │ │ PostgreSQL │
|
||||||
|
│ Results │ │ (Multiple │
|
||||||
|
│ (Fast) │ │ Tables) │
|
||||||
|
└────────────┘ └───────┬────────┘
|
||||||
|
│
|
||||||
|
│ Results
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Cache │
|
||||||
|
│ Results │
|
||||||
|
│ (TTL: 5min) │
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Return │
|
||||||
|
│ Results │
|
||||||
|
└──────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Rate Limiting Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────┐ API Request ┌──────────────┐
|
||||||
|
│ Client │ ─────────────────────► │ Backend │
|
||||||
|
│ (IP: x) │ └──────┬───────┘
|
||||||
|
└──────────┘ │
|
||||||
|
│ Check Rate Limit
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ tk:rl:{IP} │
|
||||||
|
│ (Sorted Set)│
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
┌────────────┴────────────┐
|
||||||
|
│ │
|
||||||
|
Within Limit Limit Exceeded
|
||||||
|
│ │
|
||||||
|
▼ ▼
|
||||||
|
┌────────────┐ ┌──────────────┐
|
||||||
|
│ Update │ │ Return 429 │
|
||||||
|
│ Counter │ │ Too Many │
|
||||||
|
│ (ZADD) │ │ Requests │
|
||||||
|
└─────┬──────┘ └──────────────┘
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
┌────────────┐
|
||||||
|
│ Process │
|
||||||
|
│ Request │
|
||||||
|
└────────────┘
|
||||||
|
|
||||||
|
Time Window Visualization (Sliding Window):
|
||||||
|
|
||||||
|
T-60s T-30s NOW
|
||||||
|
│ │ │
|
||||||
|
▼ ▼ ▼
|
||||||
|
[req1] [req2] [req3] <-- Current window
|
||||||
|
│ │ │
|
||||||
|
Expired │ │
|
||||||
|
Valid requests counted
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. Real-Time Pub/Sub Flow (Multi-Instance)
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────────────────┐
|
||||||
|
│ WEBSOCKET CONNECTIONS │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────┐ │
|
||||||
|
│ │ Client 1 │ │ Client 2 │ │ Client 3 │ │ Client 4 │ │
|
||||||
|
│ │(User A) │ │(User B) │ │(User A) │ │(User C) │ │
|
||||||
|
│ └────┬─────┘ └────┬─────┘ └────┬─────┘ └────┬─────┘ │
|
||||||
|
│ │ │ │ │ │
|
||||||
|
│ │ ┌────────┴────────┐ │ │ │
|
||||||
|
│ └─────►│ Backend 1 │◄─────┘ │ │
|
||||||
|
│ │ (Go/Gin) │ │ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ │ In-Memory Hub │ │ │
|
||||||
|
│ │ (Local Users) │ │ │
|
||||||
|
│ └────────┬────────┘ │ │
|
||||||
|
│ │ │ │
|
||||||
|
│ │ ┌──────────────┐ │ │
|
||||||
|
│ └───────►│ Redis │◄───────┘ │
|
||||||
|
│ │ Pub/Sub │ │
|
||||||
|
│ ┌────────┤ Channel ├────────┐ │
|
||||||
|
│ │ └──────────────┘ │ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ ┌────────┴────────┐ │ ┌────────┴────────┐│
|
||||||
|
│ │ Backend 2 │◄─────┘ │ Backend 3 ││
|
||||||
|
│ │ (Go/Gin) │ │ (Go/Gin) ││
|
||||||
|
│ │ │ │ ││
|
||||||
|
│ │ In-Memory Hub │ │ In-Memory Hub ││
|
||||||
|
│ │ (Local Users) │ │ (Local Users) ││
|
||||||
|
│ └────────┬────────┘ └────────┬────────┘│
|
||||||
|
│ │ │ │
|
||||||
|
│ ┌────────┴────────┐ ┌────────┴────────┐│
|
||||||
|
│ │ Client 5 │ │ Client 6 ││
|
||||||
|
│ │ (User B) │ │ (User A) ││
|
||||||
|
│ └─────────────────┘ └─────────────────┘│
|
||||||
|
└─────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
Message Flow:
|
||||||
|
1. Client 1 (Backend 1) sends message
|
||||||
|
2. Backend 1 stores in PostgreSQL
|
||||||
|
3. Backend 1 publishes to Redis channel
|
||||||
|
4. All backends receive message via subscription
|
||||||
|
5. Each backend forwards to connected local clients
|
||||||
|
6. All participants receive real-time update
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Leaderboard Update Flow
|
||||||
|
|
||||||
|
```
|
||||||
|
┌──────────┐ Challenge Action ┌──────────────┐
|
||||||
|
│ Client │ ────────────────────► │ Backend │
|
||||||
|
└──────────┘ └──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Record Score
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ tk:challenge│
|
||||||
|
│ :{id}:lb │
|
||||||
|
│ (ZADD score)│
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
│ Update Rank
|
||||||
|
▼
|
||||||
|
┌──────────┐ Get Leaderboard ┌──────────────┐
|
||||||
|
│ Client │ ────────────────────► │ Backend │
|
||||||
|
└──────────┘ └──────┬───────┘
|
||||||
|
│
|
||||||
|
│ ZREVRANGE
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Redis │
|
||||||
|
│ Top N Ranks │
|
||||||
|
│ (O(log N)) │
|
||||||
|
└──────┬───────┘
|
||||||
|
│
|
||||||
|
▼
|
||||||
|
┌──────────────┐
|
||||||
|
│ Leaderboard │
|
||||||
|
│ Response │
|
||||||
|
└──────────────┘
|
||||||
|
|
||||||
|
Data Structure:
|
||||||
|
┌─────────────────────────────────────────────────────┐
|
||||||
|
│ Redis Sorted Set: tk:challenge:123:leaderboard │
|
||||||
|
├─────────────────────────────────────────────────────┤
|
||||||
|
│ Member (UserID) │ Score │ Rank │
|
||||||
|
├─────────────────────┼────────────┼────────────────┤
|
||||||
|
│ 42 │ 1500 │ 1 │
|
||||||
|
│ 17 │ 1200 │ 2 │
|
||||||
|
│ 89 │ 980 │ 3 │
|
||||||
|
│ 23 │ 750 │ 4 │
|
||||||
|
│ ... │ ... │ ... │
|
||||||
|
└─────────────────────┴────────────┴────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Component Interactions
|
||||||
|
|
||||||
|
### Backend Integration Points
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────────────────────┐
|
||||||
|
│ TRACKEEP BACKEND (Go/Gin) │
|
||||||
|
├─────────────────────────────────────────────────────────────────────┤
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────┐ ┌──────────────┐ ┌──────────────┐ │
|
||||||
|
│ │ Session │ │ Cache │ │ Rate │ │
|
||||||
|
│ │ Store │ │ Middleware │ │ Limiter │ │
|
||||||
|
│ └──────┬───────┘ └──────┬───────┘ └──────┬───────┘ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ └─────────────────┼─────────────────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌───────▼────────┐ │
|
||||||
|
│ │ Redis Client │ │
|
||||||
|
│ │ (go-redis) │ │
|
||||||
|
│ └───────┬────────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌─────────────────┼─────────────────┐ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ ┌──────▼──────┐ ┌──────▼──────┐ ┌──────▼──────┐ │
|
||||||
|
│ │ String │ │ Hash │ │ Sorted Set │ │
|
||||||
|
│ │ (Cache) │ │ (Session) │ │ (Ranking) │ │
|
||||||
|
│ └─────────────┘ └─────────────┘ └─────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────┐ ┌──────────────┐ │
|
||||||
|
│ │ Pub/Sub │ │ Set │ │
|
||||||
|
│ │ (Real-time) │ │ (Tracking) │ │
|
||||||
|
│ └──────────────┘ └──────────────┘ │
|
||||||
|
│ │
|
||||||
|
└─────────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
Fallback Strategy:
|
||||||
|
┌─────────────────────────────────────────────────────────────────────┐
|
||||||
|
│ if Redis unavailable: │
|
||||||
|
│ ├─► Sessions → Fallback to in-memory map │
|
||||||
|
│ ├─► Cache → Skip cache, query DB directly │
|
||||||
|
│ ├─► Rate Limit→ Skip rate limiting (log warning) │
|
||||||
|
│ └─► Pub/Sub → Local-only WebSocket (limited functionality) │
|
||||||
|
└─────────────────────────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Deployment Scenarios
|
||||||
|
|
||||||
|
### Scenario 1: Single Node (Development)
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────┐
|
||||||
|
│ Docker Host │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────┐ ┌──────────────┐ │
|
||||||
|
│ │ Frontend │ │ Backend │ │
|
||||||
|
│ │ (Nginx) │ │ (Go/Gin) │ │
|
||||||
|
│ └──────┬───────┘ └──────┬───────┘ │
|
||||||
|
│ │ │ │
|
||||||
|
│ │ │ │
|
||||||
|
│ │ ┌────────┴────────┐ │
|
||||||
|
│ │ │ Redis │ │
|
||||||
|
│ │ │ (Single Node) │ │
|
||||||
|
│ │ └────────┬────────┘ │
|
||||||
|
│ │ │ │
|
||||||
|
│ │ ┌────────┴────────┐ │
|
||||||
|
│ └───────►│ PostgreSQL │ │
|
||||||
|
│ │ (Single Node) │ │
|
||||||
|
│ └─────────────────┘ │
|
||||||
|
│ │
|
||||||
|
└─────────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
### Scenario 2: High Availability (Production)
|
||||||
|
|
||||||
|
```
|
||||||
|
┌─────────────────────────────────────────────────────────────────────────────┐
|
||||||
|
│ Docker Swarm / Kubernetes │
|
||||||
|
│ │
|
||||||
|
│ ┌─────────────────────────────────────────────────────────────────────┐ │
|
||||||
|
│ │ Load Balancer │ │
|
||||||
|
│ └───────────────────────────────┬─────────────────────────────────────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌────────────────────────┼────────────────────────┐ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ ┌──────▼──────┐ ┌────────▼────────┐ ┌───────▼───────┐ │
|
||||||
|
│ │ Backend 1 │◄──────►│ Backend 2 │◄────►│ Backend 3 │ │
|
||||||
|
│ └──────┬──────┘ └────────┬────────┘ └───────┬───────┘ │
|
||||||
|
│ │ │ │ │
|
||||||
|
│ └────────────────────────┼────────────────────────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌─────────────▼─────────────┐ │
|
||||||
|
│ │ Redis Sentinel │ │
|
||||||
|
│ │ ┌─────┐ ┌─────┐ ┌─────┐ │ │
|
||||||
|
│ │ │ M1 │◄►│ R1 │◄►│ R2 │ │ │
|
||||||
|
│ │ └──┬──┘ └──┬──┘ └──┬──┘ │ │
|
||||||
|
│ │ └───────┴───────┘ │ │
|
||||||
|
│ │ S1 S2 S3 │ │
|
||||||
|
│ └───────────────────────────┘ │
|
||||||
|
│ │ │
|
||||||
|
│ ┌─────────────▼─────────────┐ │
|
||||||
|
│ │ PostgreSQL Cluster │ │
|
||||||
|
│ │ ┌─────┐ ┌─────┐ ┌─────┐ │ │
|
||||||
|
│ │ │ P1 │◄►│ S1 │◄►│ S2 │ │ │
|
||||||
|
│ │ └─────┘ └─────┘ └─────┘ │ │
|
||||||
|
│ └───────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ Legend: M=Master, R=Replica, S=Sentinel, P=Primary │
|
||||||
|
└─────────────────────────────────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Memory Allocation Strategy
|
||||||
|
|
||||||
|
```
|
||||||
|
Redis Memory Budget (256MB Example):
|
||||||
|
|
||||||
|
┌────────────────────────────────────────────────────────────────┐
|
||||||
|
│ Total: 256MB │
|
||||||
|
├────────────────────────────────────────────────────────────────┤
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────────────────────────────────────────────────┐ │
|
||||||
|
│ │ Sessions (30%) 77 MB │ │
|
||||||
|
│ │ ├── Active user sessions (TTL: 24h) │ │
|
||||||
|
│ │ └── User session index sets │ │
|
||||||
|
│ └──────────────────────────────────────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────────────────────────────────────────────────┐ │
|
||||||
|
│ │ Cache (50%) 128 MB │ │
|
||||||
|
│ │ ├── Search results (TTL: 5m) │ │
|
||||||
|
│ │ ├── Analytics dashboards (TTL: 15m) │ │
|
||||||
|
│ │ ├── API responses (TTL: varies) │ │
|
||||||
|
│ │ └── AI recommendations (TTL: 1h) │ │
|
||||||
|
│ └──────────────────────────────────────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────────────────────────────────────────────────┐ │
|
||||||
|
│ │ Rate Limiting (10%) 26 MB │ │
|
||||||
|
│ │ ├── Per-IP tracking windows │ │
|
||||||
|
│ │ └── Token bucket state │ │
|
||||||
|
│ └──────────────────────────────────────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
│ ┌──────────────────────────────────────────────────────────┐ │
|
||||||
|
│ │ Real-time / Other (10%) 25 MB │ │
|
||||||
|
│ │ ├── Leaderboards │ │
|
||||||
|
│ │ ├── Pub/Sub buffers │ │
|
||||||
|
│ │ └── Miscellaneous │ │
|
||||||
|
│ └──────────────────────────────────────────────────────────┘ │
|
||||||
|
│ │
|
||||||
|
└────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
Eviction Policy: allkeys-lru
|
||||||
|
- Least Recently Used keys evicted first when memory limit reached
|
||||||
|
- Sessions have longer TTL to prevent premature eviction
|
||||||
|
- Cache entries have shorter TTL for frequent refresh
|
||||||
|
```
|
||||||
|
|
||||||
|
## Key Naming Convention
|
||||||
|
|
||||||
|
```
|
||||||
|
Hierarchical Key Structure:
|
||||||
|
|
||||||
|
┌────────────────────────────────────────────────────────────────────┐
|
||||||
|
│ Format: tk:{resource}:{id}:{attribute}:{context} │
|
||||||
|
├────────────────────────────────────────────────────────────────────┤
|
||||||
|
│ │
|
||||||
|
│ SESSIONS │
|
||||||
|
│ ├── tk:session:{session_id} → SessionData (JSON) │
|
||||||
|
│ └── tk:user:sessions:{user_id} → Set of session IDs │
|
||||||
|
│ │
|
||||||
|
│ CACHE │
|
||||||
|
│ ├── tk:cache:search:{user_id}:{hash} → SearchResponse │
|
||||||
|
│ ├── tk:cache:analytics:{user_id}:{type} → AnalyticsData │
|
||||||
|
│ ├── tk:cache:user:{id}:profile → UserProfile │
|
||||||
|
│ └── tk:cache:marketplace:trending → TrendingItems │
|
||||||
|
│ │
|
||||||
|
│ RATE LIMITING │
|
||||||
|
│ ├── tk:rl:{ip}:general → SortedSet (timestamps)│
|
||||||
|
│ ├── tk:rl:{ip}:search → SortedSet │
|
||||||
|
│ ├── tk:rl:{ip}:ai → Token bucket state │
|
||||||
|
│ └── tk:rl:{ip}:upload → Token bucket state │
|
||||||
|
│ │
|
||||||
|
│ LEADERBOARDS │
|
||||||
|
│ ├── tk:challenge:{id}:leaderboard → SortedSet (scores) │
|
||||||
|
│ └── tk:marketplace:trending:{period} → SortedSet (views) │
|
||||||
|
│ │
|
||||||
|
│ REAL-TIME │
|
||||||
|
│ ├── tk:messages:{conversation_id} → Pub/Sub channel │
|
||||||
|
│ ├── tk:notifications:{user_id} → Pub/Sub channel │
|
||||||
|
│ └── tk:events:system → Pub/Sub channel │
|
||||||
|
│ │
|
||||||
|
│ COUNTERS │
|
||||||
|
│ ├── tk:counter:views:{content_type}:{id} → Integer │
|
||||||
|
│ └── tk:counter:downloads:{item_id} → Integer │
|
||||||
|
│ │
|
||||||
|
└────────────────────────────────────────────────────────────────────┘
|
||||||
|
|
||||||
|
Hash Function for Long Keys:
|
||||||
|
- MD5 or SHA1 for query parameters
|
||||||
|
- First 8-12 chars of hash usually sufficient
|
||||||
|
- Example: tk:cache:search:1234:a7f3d2c9b1e8
|
||||||
|
```
|
||||||
|
|
||||||
|
## Performance Characteristics
|
||||||
|
|
||||||
|
```
|
||||||
|
Operation Complexities:
|
||||||
|
|
||||||
|
┌────────────────────┬─────────────┬─────────────┬─────────────────────┐
|
||||||
|
│ Operation │ Time (Big O)│ Memory │ Use Case │
|
||||||
|
├────────────────────┼─────────────┼─────────────┼─────────────────────┤
|
||||||
|
│ GET │ O(1) │ O(1) │ Session retrieval │
|
||||||
|
│ SET │ O(1) │ O(1) │ Cache storage │
|
||||||
|
│ DEL │ O(1) │ O(1) │ Cache invalidation │
|
||||||
|
│ EXPIRE │ O(1) │ O(1) │ TTL management │
|
||||||
|
├────────────────────┼─────────────┼─────────────┼─────────────────────┤
|
||||||
|
│ HGET │ O(1) │ O(1) │ Session field get │
|
||||||
|
│ HSET │ O(1) │ O(1) │ Session field set │
|
||||||
|
│ HGETALL │ O(N) │ O(N) │ Full session read │
|
||||||
|
├────────────────────┼─────────────┼─────────────┼─────────────────────┤
|
||||||
|
│ ZADD │ O(log N) │ O(1) │ Add score │
|
||||||
|
│ ZREVRANGE │ O(log N + M)│ O(M) │ Get top N ranks │
|
||||||
|
│ ZRANK │ O(log N) │ O(1) │ Get user rank │
|
||||||
|
│ ZSCORE │ O(1) │ O(1) │ Get user score │
|
||||||
|
├────────────────────┼─────────────┼─────────────┼─────────────────────┤
|
||||||
|
│ PUBLISH │ O(N+M) │ O(1) │ Send message │
|
||||||
|
│ SUBSCRIBE │ O(1) │ O(1) │ Listen channel │
|
||||||
|
├────────────────────┼─────────────┼─────────────┼─────────────────────┤
|
||||||
|
│ KEYS * │ O(N) │ O(N) │ DEBUG ONLY │
|
||||||
|
│ SCAN │ O(1) │ O(1) │ Iteration │
|
||||||
|
└────────────────────┴─────────────┴─────────────┴─────────────────────┘
|
||||||
|
|
||||||
|
N = Number of elements
|
||||||
|
M = Number of returned elements
|
||||||
|
|
||||||
|
Performance Targets:
|
||||||
|
┌────────────────────┬──────────────┬────────────────┐
|
||||||
|
│ Metric │ Target │ Measurement │
|
||||||
|
├────────────────────┼──────────────┼────────────────┤
|
||||||
|
│ Cache hit latency │ < 1ms │ p99 │
|
||||||
|
│ Cache miss latency │ < 5ms │ p99 │
|
||||||
|
│ Session read │ < 2ms │ p99 │
|
||||||
|
│ Session write │ < 3ms │ p99 │
|
||||||
|
│ Rate limit check │ < 1ms │ p99 │
|
||||||
|
│ Pub/Sub latency │ < 5ms │ p99 │
|
||||||
|
│ Leaderboard query │ < 10ms │ p99 (top 100) │
|
||||||
|
└────────────────────┴──────────────┴────────────────┘
|
||||||
|
```
|
||||||
|
|
||||||
|
## Monitoring Points
|
||||||
|
|
||||||
|
```
|
||||||
|
Key Metrics to Track:
|
||||||
|
|
||||||
|
┌──────────────────────────────────────────────────────────────────┐
|
||||||
|
│ INFRASTRUCTURE │
|
||||||
|
│ ├── Memory Usage % Alert: > 80% │
|
||||||
|
│ ├── Connected Clients Alert: > 80% of max │
|
||||||
|
│ ├── Blocked Clients Alert: > 0 (indicates slow ops) │
|
||||||
|
│ └── Uptime Alert: < 99.9% │
|
||||||
|
│ │
|
||||||
|
│ PERFORMANCE │
|
||||||
|
│ ├── Commands/sec Track: Trending │
|
||||||
|
│ ├── Hit Rate % Alert: < 80% │
|
||||||
|
│ ├── Miss Rate % Track: Trending │
|
||||||
|
│ ├── Evicted Keys/sec Alert: > 100/min │
|
||||||
|
│ └── Expired Keys/sec Track: Trending │
|
||||||
|
│ │
|
||||||
|
│ ERRORS │
|
||||||
|
│ ├── Rejected Connections Alert: > 0 │
|
||||||
|
│ ├── Keyspace Misses Track: vs Hits │
|
||||||
|
│ ├── Slow Queries (>10ms) Alert: > 10/min │
|
||||||
|
│ └── Replication Lag Alert: > 1s │
|
||||||
|
│ │
|
||||||
|
│ APPLICATION │
|
||||||
|
│ ├── Session Store Latency Alert: > 5ms p99 │
|
||||||
|
│ ├── Cache Hit Ratio Alert: < 75% │
|
||||||
|
│ ├── Rate Limit Accuracy Track: vs Expected │
|
||||||
|
│ └── Pub/Sub Delivery Time Alert: > 10ms p99 │
|
||||||
|
└──────────────────────────────────────────────────────────────────┘
|
||||||
|
```
|
||||||
@@ -0,0 +1,989 @@
|
|||||||
|
# Redis Implementation Quick Reference for Trackeep
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
This guide provides practical implementation patterns for integrating Redis into the Trackeep application based on the comprehensive architecture analysis.
|
||||||
|
|
||||||
|
## 1. Quick Start Configuration
|
||||||
|
|
||||||
|
### 1.1 Add Redis to Docker Compose
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
# docker-compose.yml
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
image: redis:7-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
command: >
|
||||||
|
redis-server
|
||||||
|
--appendonly yes
|
||||||
|
--appendfsync everysec
|
||||||
|
--maxmemory 256mb
|
||||||
|
--maxmemory-policy allkeys-lru
|
||||||
|
--requirepass ${REDIS_PASSWORD:-changeme}
|
||||||
|
networks:
|
||||||
|
- trackeep-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD:-changeme}", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 3
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:6379:6379" # Local access only
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
redis_data:
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1.2 Environment Variables (.env)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Redis Configuration
|
||||||
|
REDIS_ADDR=redis:6379
|
||||||
|
REDIS_PASSWORD=your_secure_password_here
|
||||||
|
REDIS_DB=0
|
||||||
|
REDIS_POOL_SIZE=20
|
||||||
|
REDIS_DIAL_TIMEOUT=5s
|
||||||
|
REDIS_READ_TIMEOUT=3s
|
||||||
|
REDIS_WRITE_TIMEOUT=3s
|
||||||
|
|
||||||
|
# Feature Flags
|
||||||
|
REDIS_SESSIONS_ENABLED=true
|
||||||
|
REDIS_CACHE_ENABLED=true
|
||||||
|
REDIS_RATELIMIT_ENABLED=true
|
||||||
|
```
|
||||||
|
|
||||||
|
## 2. Core Implementation
|
||||||
|
|
||||||
|
### 2.1 Redis Client Setup
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/config/redis.go
|
||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
|
)
|
||||||
|
|
||||||
|
var RedisClient *redis.Client
|
||||||
|
|
||||||
|
// InitRedis initializes the Redis client
|
||||||
|
func InitRedis() error {
|
||||||
|
poolSize, _ := strconv.Atoi(os.Getenv("REDIS_POOL_SIZE"))
|
||||||
|
if poolSize == 0 {
|
||||||
|
poolSize = 20
|
||||||
|
}
|
||||||
|
|
||||||
|
dialTimeout, _ := time.ParseDuration(os.Getenv("REDIS_DIAL_TIMEOUT"))
|
||||||
|
if dialTimeout == 0 {
|
||||||
|
dialTimeout = 5 * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
|
readTimeout, _ := time.ParseDuration(os.Getenv("REDIS_READ_TIMEOUT"))
|
||||||
|
if readTimeout == 0 {
|
||||||
|
readTimeout = 3 * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
|
writeTimeout, _ := time.ParseDuration(os.Getenv("REDIS_WRITE_TIMEOUT"))
|
||||||
|
if writeTimeout == 0 {
|
||||||
|
writeTimeout = 3 * time.Second
|
||||||
|
}
|
||||||
|
|
||||||
|
RedisClient = redis.NewClient(&redis.Options{
|
||||||
|
Addr: os.Getenv("REDIS_ADDR"),
|
||||||
|
Password: os.Getenv("REDIS_PASSWORD"),
|
||||||
|
DB: 0,
|
||||||
|
PoolSize: poolSize,
|
||||||
|
MinIdleConns: 5,
|
||||||
|
DialTimeout: dialTimeout,
|
||||||
|
ReadTimeout: readTimeout,
|
||||||
|
WriteTimeout: writeTimeout,
|
||||||
|
MaxConnAge: time.Hour,
|
||||||
|
PoolTimeout: 5 * time.Second,
|
||||||
|
IdleTimeout: 10 * time.Minute,
|
||||||
|
})
|
||||||
|
|
||||||
|
// Test connection
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err := RedisClient.Ping(ctx).Err(); err != nil {
|
||||||
|
return fmt.Errorf("failed to connect to Redis: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println("Redis connected successfully")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsRedisEnabled checks if Redis is configured and available
|
||||||
|
func IsRedisEnabled() bool {
|
||||||
|
return RedisClient != nil && os.Getenv("REDIS_ADDR") != ""
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2.2 Session Store Migration
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/middleware/session_redis.go
|
||||||
|
package middleware
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RedisSessionStore implements distributed session storage
|
||||||
|
type RedisSessionStore struct {
|
||||||
|
fallback *MemorySessionStore
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRedisSessionStore creates a new Redis-backed session store
|
||||||
|
func NewRedisSessionStore() SessionStore {
|
||||||
|
return &RedisSessionStore{
|
||||||
|
fallback: NewMemorySessionStore(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *RedisSessionStore) CreateSession(sessionData *SessionData) error {
|
||||||
|
sessionData.CreatedAt = time.Now()
|
||||||
|
sessionData.LastActive = time.Now()
|
||||||
|
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
key := fmt.Sprintf("tk:session:%s", sessionData.SessionID)
|
||||||
|
|
||||||
|
data, err := json.Marshal(sessionData)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store session with 24h TTL
|
||||||
|
if err := config.RedisClient.Set(ctx, key, data, 24*time.Hour).Err(); err != nil {
|
||||||
|
// Fallback to memory on Redis error
|
||||||
|
return r.fallback.CreateSession(sessionData)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to user's session set
|
||||||
|
userKey := fmt.Sprintf("tk:user:sessions:%d", sessionData.UserID)
|
||||||
|
config.RedisClient.SAdd(ctx, userKey, sessionData.SessionID)
|
||||||
|
config.RedisClient.Expire(ctx, userKey, 24*time.Hour)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.fallback.CreateSession(sessionData)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *RedisSessionStore) GetSession(sessionID string) (*SessionData, error) {
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
key := fmt.Sprintf("tk:session:%s", sessionID)
|
||||||
|
|
||||||
|
data, err := config.RedisClient.Get(ctx, key).Bytes()
|
||||||
|
if err == nil {
|
||||||
|
var session SessionData
|
||||||
|
if err := json.Unmarshal(data, &session); err == nil {
|
||||||
|
// Update last active
|
||||||
|
session.LastActive = time.Now()
|
||||||
|
r.UpdateSession(sessionID, &session)
|
||||||
|
return &session, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.fallback.GetSession(sessionID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *RedisSessionStore) UpdateSession(sessionID string, sessionData *SessionData) error {
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
key := fmt.Sprintf("tk:session:%s", sessionID)
|
||||||
|
|
||||||
|
data, err := json.Marshal(sessionData)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := config.RedisClient.Set(ctx, key, data, 24*time.Hour).Err(); err != nil {
|
||||||
|
return r.fallback.UpdateSession(sessionID, sessionData)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.fallback.UpdateSession(sessionID, sessionData)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *RedisSessionStore) DeleteSession(sessionID string) error {
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
key := fmt.Sprintf("tk:session:%s", sessionID)
|
||||||
|
|
||||||
|
// Get session to find user ID
|
||||||
|
data, err := config.RedisClient.Get(ctx, key).Bytes()
|
||||||
|
if err == nil {
|
||||||
|
var session SessionData
|
||||||
|
if err := json.Unmarshal(data, &session); err == nil {
|
||||||
|
// Remove from user's session set
|
||||||
|
userKey := fmt.Sprintf("tk:user:sessions:%d", session.UserID)
|
||||||
|
config.RedisClient.SRem(ctx, userKey, sessionID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
config.RedisClient.Del(ctx, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
return r.fallback.DeleteSession(sessionID)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *RedisSessionStore) CleanupExpiredSessions() error {
|
||||||
|
// Redis handles expiration automatically via TTL
|
||||||
|
// Just clean up fallback
|
||||||
|
return r.fallback.CleanupExpiredSessions()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2.3 Distributed Rate Limiter
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/middleware/rate_limiter_redis.go
|
||||||
|
package middleware
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RedisRateLimiter implements distributed rate limiting
|
||||||
|
type RedisRateLimiter struct {
|
||||||
|
limit int
|
||||||
|
window time.Duration
|
||||||
|
keyPrefix string
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRedisRateLimiter creates a new Redis-backed rate limiter
|
||||||
|
func NewRedisRateLimiter(limit int, window time.Duration, keyPrefix string) *RedisRateLimiter {
|
||||||
|
return &RedisRateLimiter{
|
||||||
|
limit: limit,
|
||||||
|
window: window,
|
||||||
|
keyPrefix: keyPrefix,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SlidingWindowRateLimit uses Redis sorted sets for accurate sliding window
|
||||||
|
func (rl *RedisRateLimiter) Middleware() gin.HandlerFunc {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
clientIP := c.ClientIP()
|
||||||
|
key := fmt.Sprintf("%s:%s", rl.keyPrefix, clientIP)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
now := time.Now().Unix()
|
||||||
|
windowStart := now - int64(rl.window.Seconds())
|
||||||
|
|
||||||
|
// Remove old entries
|
||||||
|
config.RedisClient.ZRemRangeByScore(ctx, key, "0", strconv.FormatInt(windowStart, 10))
|
||||||
|
|
||||||
|
// Count current requests
|
||||||
|
count, err := config.RedisClient.ZCard(ctx, key).Result()
|
||||||
|
if err != nil {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check limit
|
||||||
|
if int(count) >= rl.limit {
|
||||||
|
c.Header("X-RateLimit-Limit", fmt.Sprintf("%d", rl.limit))
|
||||||
|
c.Header("X-RateLimit-Remaining", "0")
|
||||||
|
c.Header("X-RateLimit-Reset", strconv.FormatInt(now+int64(rl.window.Seconds()), 10))
|
||||||
|
c.JSON(http.StatusTooManyRequests, gin.H{
|
||||||
|
"error": "Rate limit exceeded",
|
||||||
|
"message": fmt.Sprintf("Too many requests. Limit is %d per %v", rl.limit, rl.window),
|
||||||
|
})
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add current request
|
||||||
|
config.RedisClient.ZAdd(ctx, key, &redis.Z{
|
||||||
|
Score: float64(now),
|
||||||
|
Member: now,
|
||||||
|
})
|
||||||
|
config.RedisClient.Expire(ctx, key, rl.window)
|
||||||
|
|
||||||
|
// Set headers
|
||||||
|
remaining := rl.limit - int(count) - 1
|
||||||
|
c.Header("X-RateLimit-Limit", fmt.Sprintf("%d", rl.limit))
|
||||||
|
c.Header("X-RateLimit-Remaining", fmt.Sprintf("%d", remaining))
|
||||||
|
c.Header("X-RateLimit-Reset", strconv.FormatInt(now+int64(rl.window.Seconds()), 10))
|
||||||
|
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TokenBucketRateLimit uses token bucket algorithm for burst handling
|
||||||
|
type TokenBucketRateLimiter struct {
|
||||||
|
capacity int
|
||||||
|
refillRate float64 // tokens per second
|
||||||
|
keyPrefix string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewTokenBucketRateLimiter(capacity int, refillRate float64, keyPrefix string) *TokenBucketRateLimiter {
|
||||||
|
return &TokenBucketRateLimiter{
|
||||||
|
capacity: capacity,
|
||||||
|
refillRate: refillRate,
|
||||||
|
keyPrefix: keyPrefix,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rl *TokenBucketRateLimiter) Middleware() gin.HandlerFunc {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
clientIP := c.ClientIP()
|
||||||
|
key := fmt.Sprintf("%s:%s", rl.keyPrefix, clientIP)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// Lua script for atomic token bucket
|
||||||
|
script := `
|
||||||
|
local key = KEYS[1]
|
||||||
|
local capacity = tonumber(ARGV[1])
|
||||||
|
local refill_rate = tonumber(ARGV[2])
|
||||||
|
local now = tonumber(ARGV[3])
|
||||||
|
|
||||||
|
local bucket = redis.call('HMGET', key, 'tokens', 'last_refill')
|
||||||
|
local tokens = tonumber(bucket[1]) or capacity
|
||||||
|
local last_refill = tonumber(bucket[2]) or now
|
||||||
|
|
||||||
|
local delta = math.min(capacity, tokens + (now - last_refill) * refill_rate)
|
||||||
|
|
||||||
|
if delta >= 1 then
|
||||||
|
redis.call('HMSET', key, 'tokens', delta - 1, 'last_refill', now)
|
||||||
|
redis.call('EXPIRE', key, 3600)
|
||||||
|
return {1, math.floor(delta - 1)}
|
||||||
|
else
|
||||||
|
redis.call('HMSET', key, 'tokens', delta, 'last_refill', now)
|
||||||
|
redis.call('EXPIRE', key, 3600)
|
||||||
|
return {0, math.floor(delta)}
|
||||||
|
end
|
||||||
|
`
|
||||||
|
|
||||||
|
now := float64(time.Now().Unix())
|
||||||
|
result, err := config.RedisClient.Eval(ctx, script, []string{key},
|
||||||
|
rl.capacity, rl.refillRate, now).Result()
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
values := result.([]interface{})
|
||||||
|
allowed := values[0].(int64) == 1
|
||||||
|
remaining := values[1].(int64)
|
||||||
|
|
||||||
|
c.Header("X-RateLimit-Limit", fmt.Sprintf("%d", rl.capacity))
|
||||||
|
c.Header("X-RateLimit-Remaining", fmt.Sprintf("%d", remaining))
|
||||||
|
|
||||||
|
if !allowed {
|
||||||
|
c.JSON(http.StatusTooManyRequests, gin.H{
|
||||||
|
"error": "Rate limit exceeded",
|
||||||
|
"message": "Too many requests. Please slow down.",
|
||||||
|
})
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2.4 Caching Middleware
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/middleware/cache_redis.go
|
||||||
|
package middleware
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"crypto/md5"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RedisCacheConfig holds Redis cache configuration
|
||||||
|
type RedisCacheConfig struct {
|
||||||
|
Duration time.Duration
|
||||||
|
KeyPrefix string
|
||||||
|
Enabled bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultRedisCacheConfig returns default cache configuration
|
||||||
|
func DefaultRedisCacheConfig() RedisCacheConfig {
|
||||||
|
return RedisCacheConfig{
|
||||||
|
Duration: 5 * time.Minute,
|
||||||
|
KeyPrefix: "tk:cache:",
|
||||||
|
Enabled: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// RedisCacheMiddleware creates a Redis-based cache middleware
|
||||||
|
func RedisCacheMiddleware(config RedisCacheConfig) gin.HandlerFunc {
|
||||||
|
if !config.Enabled {
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return func(c *gin.Context) {
|
||||||
|
// Only cache GET requests
|
||||||
|
if c.Request.Method != http.MethodGet {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Skip if Redis not available
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
c.Next()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generate cache key
|
||||||
|
cacheKey := generateRedisCacheKey(c, config.KeyPrefix)
|
||||||
|
|
||||||
|
// Try to get from cache
|
||||||
|
ctx := context.Background()
|
||||||
|
cached, err := config.RedisClient.Get(ctx, cacheKey).Result()
|
||||||
|
if err == nil && cached != "" {
|
||||||
|
c.Header("X-Cache", "HIT")
|
||||||
|
c.Header("Content-Type", "application/json")
|
||||||
|
c.String(http.StatusOK, cached)
|
||||||
|
c.Abort()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cache miss
|
||||||
|
c.Header("X-Cache", "MISS")
|
||||||
|
|
||||||
|
// Capture response
|
||||||
|
writer := &cachedResponseWriter{
|
||||||
|
ResponseWriter: c.Writer,
|
||||||
|
buffer: make([]byte, 0),
|
||||||
|
}
|
||||||
|
c.Writer = writer
|
||||||
|
|
||||||
|
c.Next()
|
||||||
|
|
||||||
|
// Cache the response if successful
|
||||||
|
if c.Writer.Status() == http.StatusOK && len(writer.buffer) > 0 {
|
||||||
|
config.RedisClient.Set(ctx, cacheKey, string(writer.buffer), config.Duration)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func generateRedisCacheKey(c *gin.Context, prefix string) string {
|
||||||
|
keyParts := []string{
|
||||||
|
prefix,
|
||||||
|
c.Request.URL.Path,
|
||||||
|
c.Request.URL.RawQuery,
|
||||||
|
}
|
||||||
|
|
||||||
|
if userID := c.GetString("userID"); userID != "" {
|
||||||
|
keyParts = append(keyParts, "u:"+userID)
|
||||||
|
}
|
||||||
|
|
||||||
|
key := strings.Join(keyParts, ":")
|
||||||
|
hash := md5.Sum([]byte(key))
|
||||||
|
return fmt.Sprintf("%s%x", prefix, hash)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InvalidateUserCache removes all cache entries for a user
|
||||||
|
func InvalidateUserCache(userID string) error {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pattern := fmt.Sprintf("tk:cache:*u:%s*", userID)
|
||||||
|
|
||||||
|
keys, err := config.RedisClient.Keys(ctx, pattern).Result()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(keys) > 0 {
|
||||||
|
return config.RedisClient.Del(ctx, keys...).Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 3. Usage Patterns
|
||||||
|
|
||||||
|
### 3.1 Search Result Caching
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/handlers/search_enhanced.go
|
||||||
|
func EnhancedSearch(c *gin.Context) {
|
||||||
|
var filters SearchFilters
|
||||||
|
if err := c.ShouldBindJSON(&filters); err != nil {
|
||||||
|
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
userID := c.GetUint("user_id")
|
||||||
|
|
||||||
|
// Try cache first
|
||||||
|
cacheKey := fmt.Sprintf("tk:search:%d:%s", userID, hashFilters(filters))
|
||||||
|
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
cached, err := config.RedisClient.Get(ctx, cacheKey).Result()
|
||||||
|
if err == nil {
|
||||||
|
var response SearchResponse
|
||||||
|
if json.Unmarshal([]byte(cached), &response) == nil {
|
||||||
|
c.Header("X-Cache", "HIT")
|
||||||
|
c.JSON(http.StatusOK, response)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Perform search
|
||||||
|
results := performSearch(filters, userID)
|
||||||
|
|
||||||
|
// Cache results
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
data, _ := json.Marshal(results)
|
||||||
|
config.RedisClient.Set(ctx, cacheKey, data, 5*time.Minute)
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, results)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3.2 Analytics Aggregation Caching
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/services/analytics_cache.go
|
||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
"github.com/trackeep/backend/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
type AnalyticsCache struct {
|
||||||
|
db *gorm.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewAnalyticsCache(db *gorm.DB) *AnalyticsCache {
|
||||||
|
return &AnalyticsCache{db: db}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ac *AnalyticsCache) GetDashboardAnalytics(userID uint, startDate, endDate time.Time) (*DashboardAnalytics, error) {
|
||||||
|
cacheKey := fmt.Sprintf("tk:analytics:dashboard:%d:%s:%s",
|
||||||
|
userID, startDate.Format("2006-01-02"), endDate.Format("2006-01-02"))
|
||||||
|
|
||||||
|
// Try cache
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
cached, err := config.RedisClient.Get(ctx, cacheKey).Result()
|
||||||
|
if err == nil {
|
||||||
|
var analytics DashboardAnalytics
|
||||||
|
if err := json.Unmarshal([]byte(cached), &analytics); err == nil {
|
||||||
|
return &analytics, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compute analytics
|
||||||
|
analytics := ac.computeDashboardAnalytics(userID, startDate, endDate)
|
||||||
|
|
||||||
|
// Cache for 15 minutes
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx := context.Background()
|
||||||
|
data, _ := json.Marshal(analytics)
|
||||||
|
config.RedisClient.Set(ctx, cacheKey, data, 15*time.Minute)
|
||||||
|
}
|
||||||
|
|
||||||
|
return analytics, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ac *AnalyticsCache) InvalidateUserAnalytics(userID uint) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pattern := fmt.Sprintf("tk:analytics:*:%d:*", userID)
|
||||||
|
|
||||||
|
keys, _ := config.RedisClient.Keys(ctx, pattern).Result()
|
||||||
|
if len(keys) > 0 {
|
||||||
|
config.RedisClient.Del(ctx, keys...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3.3 Leaderboard with Sorted Sets
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/services/leaderboard.go
|
||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Leaderboard struct {
|
||||||
|
key string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLeaderboard(challengeID uint) *Leaderboard {
|
||||||
|
return &Leaderboard{
|
||||||
|
key: fmt.Sprintf("tk:challenge:%d:leaderboard", challengeID),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddScore adds or updates a user's score
|
||||||
|
func (lb *Leaderboard) AddScore(userID uint, score float64) error {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
member := fmt.Sprintf("%d", userID)
|
||||||
|
|
||||||
|
return config.RedisClient.ZAdd(ctx, lb.key, &redis.Z{
|
||||||
|
Score: score,
|
||||||
|
Member: member,
|
||||||
|
}).Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTopN returns top N participants
|
||||||
|
func (lb *Leaderboard) GetTopN(n int64) ([]LeaderboardEntry, error) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
results, err := config.RedisClient.ZRevRangeWithScores(ctx, lb.key, 0, n-1).Result()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
entries := make([]LeaderboardEntry, len(results))
|
||||||
|
for i, result := range results {
|
||||||
|
userID := parseUint(result.Member.(string))
|
||||||
|
entries[i] = LeaderboardEntry{
|
||||||
|
UserID: userID,
|
||||||
|
Score: result.Score,
|
||||||
|
Rank: i + 1,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserRank returns a specific user's rank and score
|
||||||
|
func (lb *Leaderboard) GetUserRank(userID uint) (int64, float64, error) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return 0, 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
member := fmt.Sprintf("%d", userID)
|
||||||
|
|
||||||
|
rank, err := config.RedisClient.ZRevRank(ctx, lb.key, member).Result()
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
score, err := config.RedisClient.ZScore(ctx, lb.key, member).Result()
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return rank + 1, score, nil // Rank is 0-indexed
|
||||||
|
}
|
||||||
|
|
||||||
|
type LeaderboardEntry struct {
|
||||||
|
UserID uint
|
||||||
|
Score float64
|
||||||
|
Rank int
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 4. Pub/Sub for Real-Time Features
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/services/pubsub.go
|
||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/trackeep/backend/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
type PubSub struct {
|
||||||
|
ctx context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPubSub() *PubSub {
|
||||||
|
return &PubSub{
|
||||||
|
ctx: context.Background(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublishMessage publishes a message to a conversation channel
|
||||||
|
func (ps *PubSub) PublishMessage(conversationID uint, message interface{}) error {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
channel := fmt.Sprintf("tk:messages:%d", conversationID)
|
||||||
|
data, _ := json.Marshal(message)
|
||||||
|
|
||||||
|
return config.RedisClient.Publish(ps.ctx, channel, data).Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeToMessages subscribes to conversation messages
|
||||||
|
func (ps *PubSub) SubscribeToMessages(conversationID uint, handler func(message []byte)) {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
channel := fmt.Sprintf("tk:messages:%d", conversationID)
|
||||||
|
pubsub := config.RedisClient.Subscribe(ps.ctx, channel)
|
||||||
|
defer pubsub.Close()
|
||||||
|
|
||||||
|
ch := pubsub.Channel()
|
||||||
|
for msg := range ch {
|
||||||
|
handler([]byte(msg.Payload))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublishNotification publishes a user notification
|
||||||
|
func (ps *PubSub) PublishNotification(userID uint, notification interface{}) error {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
channel := fmt.Sprintf("tk:notifications:%d", userID)
|
||||||
|
data, _ := json.Marshal(notification)
|
||||||
|
|
||||||
|
return config.RedisClient.Publish(ps.ctx, channel, data).Err()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 5. Testing and Monitoring
|
||||||
|
|
||||||
|
### 5.1 Health Check Endpoint
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/handlers/health.go addition
|
||||||
|
func HealthCheck(c *gin.Context) {
|
||||||
|
status := map[string]interface{}{
|
||||||
|
"status": "ok",
|
||||||
|
"version": "1.0.0",
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check Redis
|
||||||
|
if config.IsRedisEnabled() {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err := config.RedisClient.Ping(ctx).Err(); err != nil {
|
||||||
|
status["redis"] = "unhealthy"
|
||||||
|
status["status"] = "degraded"
|
||||||
|
} else {
|
||||||
|
poolStats := config.RedisClient.PoolStats()
|
||||||
|
status["redis"] = map[string]interface{}{
|
||||||
|
"status": "healthy",
|
||||||
|
"hits": poolStats.Hits,
|
||||||
|
"misses": poolStats.Misses,
|
||||||
|
"total_conns": poolStats.TotalConns,
|
||||||
|
"idle_conns": poolStats.IdleConns,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, status)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5.2 Cache Metrics Collection
|
||||||
|
|
||||||
|
```go
|
||||||
|
// backend/middleware/metrics.go addition
|
||||||
|
func RecordCacheMetrics() {
|
||||||
|
if !config.IsRedisEnabled() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
info := config.RedisClient.Info(ctx, "stats").Val()
|
||||||
|
|
||||||
|
// Parse key metrics
|
||||||
|
hits := parseRedisInfoValue(info, "keyspace_hits")
|
||||||
|
misses := parseRedisInfoValue(info, "keyspace_misses")
|
||||||
|
|
||||||
|
hitRate := float64(hits) / float64(hits+misses) * 100
|
||||||
|
|
||||||
|
// Log or export metrics
|
||||||
|
log.Printf("Cache Hit Rate: %.2f%% (Hits: %d, Misses: %d)", hitRate, hits, misses)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## 6. Migration Checklist
|
||||||
|
|
||||||
|
### Phase 1: Infrastructure (Day 1)
|
||||||
|
- [ ] Add Redis to Docker Compose
|
||||||
|
- [ ] Add Redis configuration to `.env.example`
|
||||||
|
- [ ] Implement `config/redis.go` client setup
|
||||||
|
- [ ] Add Redis health check to main.go initialization
|
||||||
|
- [ ] Test connection and basic operations
|
||||||
|
|
||||||
|
### Phase 2: Session Storage (Days 2-3)
|
||||||
|
- [ ] Implement `RedisSessionStore`
|
||||||
|
- [ ] Add feature flag `REDIS_SESSIONS_ENABLED`
|
||||||
|
- [ ] Test session persistence across restarts
|
||||||
|
- [ ] Verify session cleanup works correctly
|
||||||
|
- [ ] Monitor memory usage
|
||||||
|
|
||||||
|
### Phase 3: Rate Limiting (Days 4-5)
|
||||||
|
- [ ] Implement `RedisRateLimiter` with sliding window
|
||||||
|
- [ ] Add token bucket variant for burst handling
|
||||||
|
- [ ] Configure different limits per endpoint
|
||||||
|
- [ ] Test rate limiting across multiple requests
|
||||||
|
- [ ] Verify headers are set correctly
|
||||||
|
|
||||||
|
### Phase 4: Caching (Week 2)
|
||||||
|
- [ ] Implement `RedisCacheMiddleware`
|
||||||
|
- [ ] Add search result caching
|
||||||
|
- [ ] Add analytics dashboard caching
|
||||||
|
- [ ] Implement cache invalidation on data changes
|
||||||
|
- [ ] Configure TTL strategy per content type
|
||||||
|
|
||||||
|
### Phase 5: Advanced Features (Week 3)
|
||||||
|
- [ ] Implement leaderboards with Sorted Sets
|
||||||
|
- [ ] Add Pub/Sub for real-time messaging
|
||||||
|
- [ ] Implement distributed locking if needed
|
||||||
|
- [ ] Add cache warming for hot data
|
||||||
|
- [ ] Performance benchmarking
|
||||||
|
|
||||||
|
### Phase 6: Production Readiness (Week 4)
|
||||||
|
- [ ] Add Redis Sentinel configuration
|
||||||
|
- [ ] Configure persistence (AOF + RDB)
|
||||||
|
- [ ] Set up monitoring and alerting
|
||||||
|
- [ ] Document operational procedures
|
||||||
|
- [ ] Load testing and optimization
|
||||||
|
|
||||||
|
## 7. Troubleshooting
|
||||||
|
|
||||||
|
### Common Issues
|
||||||
|
|
||||||
|
**Connection Refused**
|
||||||
|
```
|
||||||
|
Error: dial tcp: connect: connection refused
|
||||||
|
```
|
||||||
|
- Check Redis container is running: `docker-compose ps`
|
||||||
|
- Verify network configuration in docker-compose.yml
|
||||||
|
- Check firewall rules
|
||||||
|
|
||||||
|
**Authentication Failed**
|
||||||
|
```
|
||||||
|
Error: NOAUTH Authentication required
|
||||||
|
```
|
||||||
|
- Verify REDIS_PASSWORD matches docker-compose configuration
|
||||||
|
- Check for special characters in password
|
||||||
|
|
||||||
|
**Memory Limit Reached**
|
||||||
|
```
|
||||||
|
Error: OOM command not allowed when used memory > 'maxmemory'
|
||||||
|
```
|
||||||
|
- Increase maxmemory in Redis configuration
|
||||||
|
- Review eviction policy
|
||||||
|
- Check for memory leaks in cache keys
|
||||||
|
|
||||||
|
**High Connection Count**
|
||||||
|
```
|
||||||
|
Error: ERR max number of clients reached
|
||||||
|
```
|
||||||
|
- Increase maxclients in Redis configuration
|
||||||
|
- Review connection pool settings
|
||||||
|
- Check for connection leaks
|
||||||
|
|
||||||
|
### Debug Commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check Redis connection
|
||||||
|
docker-compose exec redis redis-cli ping
|
||||||
|
|
||||||
|
# Monitor Redis commands in real-time
|
||||||
|
docker-compose exec redis redis-cli monitor
|
||||||
|
|
||||||
|
# Check memory usage
|
||||||
|
docker-compose exec redis redis-cli info memory
|
||||||
|
|
||||||
|
# List all keys (use sparingly)
|
||||||
|
docker-compose exec redis redis-cli keys "*"
|
||||||
|
|
||||||
|
# Get specific key info
|
||||||
|
docker-compose exec redis redis-cli ttl "tk:session:abc123"
|
||||||
|
docker-compose exec redis redis-cli type "tk:session:abc123"
|
||||||
|
|
||||||
|
# Clear all data (WARNING: Destructive)
|
||||||
|
docker-compose exec redis redis-cli flushall
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**Note:** This guide is a companion to the full architecture analysis document. Refer to `REDIS_ARCHITECTURE_ANALYSIS.md` for detailed rationale and design decisions.
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
# 🚀 Trackeep Release Guide
|
||||||
|
|
||||||
|
This guide covers how to create releases for Trackeep using different methods.
|
||||||
|
|
||||||
|
## Method 1: GitHub CLI (Recommended)
|
||||||
|
|
||||||
|
For new features or bug fixes:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Commit your changes
|
||||||
|
git commit -m "feat: add new amazing feature"
|
||||||
|
|
||||||
|
# 2. Create version tag and push
|
||||||
|
git tag v1.2.7
|
||||||
|
git push origin v1.2.7
|
||||||
|
|
||||||
|
# 3. Create GitHub release with CLI
|
||||||
|
gh release create v1.2.7 \
|
||||||
|
--title "Trackeep v1.2.7 - Release Title" \
|
||||||
|
--notes "Release notes here..."
|
||||||
|
|
||||||
|
# Or use a release notes file
|
||||||
|
gh release create v1.2.7 \
|
||||||
|
--title "Trackeep v1.2.7 - Release Title" \
|
||||||
|
--notes-file RELEASE_v1.2.7.md
|
||||||
|
```
|
||||||
|
|
||||||
|
### GitHub CLI Installation
|
||||||
|
|
||||||
|
If you don't have GitHub CLI installed:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Ubuntu/Debian
|
||||||
|
sudo apt install gh
|
||||||
|
|
||||||
|
# Alternative with Snap
|
||||||
|
sudo snap install gh
|
||||||
|
|
||||||
|
# Authenticate with GitHub
|
||||||
|
gh auth login
|
||||||
|
```
|
||||||
|
|
||||||
|
## Method 2: Manual Scripts
|
||||||
|
|
||||||
|
For traditional workflow:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Use version update script
|
||||||
|
./scripts/update-version.sh 1.2.7
|
||||||
|
|
||||||
|
# Commit and push
|
||||||
|
git add . && git commit -m "chore: bump version to 1.2.7"
|
||||||
|
git push origin main
|
||||||
|
```
|
||||||
|
|
||||||
|
## Method 3: Release Script
|
||||||
|
|
||||||
|
Use the automated release script:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/release.sh 1.2.7
|
||||||
|
```
|
||||||
|
|
||||||
|
This script will:
|
||||||
|
- Update version in .env file
|
||||||
|
- Build Docker images with version tags
|
||||||
|
- Push images to GitHub Container Registry
|
||||||
|
- Create and push Git tag
|
||||||
|
- Push tag to origin
|
||||||
|
|
||||||
|
## Semantic Versioning
|
||||||
|
|
||||||
|
Follow industry standard (MAJOR.MINOR.PATCH):
|
||||||
|
|
||||||
|
```
|
||||||
|
1.2.6 → 1.3.0 (MINOR: new features)
|
||||||
|
1.2.6 → 1.2.7 (PATCH: bug fixes)
|
||||||
|
1.2.6 → 2.0.0 (MAJOR: breaking changes)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Release Notes Template
|
||||||
|
|
||||||
|
Create comprehensive release notes following this structure:
|
||||||
|
|
||||||
|
```markdown
|
||||||
|
# 🎉 Trackeep v1.2.7 - Release Title
|
||||||
|
|
||||||
|
## ✅ What's New
|
||||||
|
|
||||||
|
### **Feature Category 1**
|
||||||
|
- ✅ New feature description
|
||||||
|
- ✅ Another improvement
|
||||||
|
|
||||||
|
### **Bug Fixes**
|
||||||
|
- ✅ Fixed issue description
|
||||||
|
- ✅ Another bug fix
|
||||||
|
|
||||||
|
## 🎯 How to Update
|
||||||
|
|
||||||
|
### **Current Users:**
|
||||||
|
```bash
|
||||||
|
# Option 1: Built-in updates
|
||||||
|
# Update button appears in left navigation
|
||||||
|
|
||||||
|
# Option 2: Manual Docker pull
|
||||||
|
docker compose pull
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
## 📦 Docker Images
|
||||||
|
|
||||||
|
- `ghcr.io/dvorinka/trackeep/backend:1.2.7`
|
||||||
|
- `ghcr.io/dvorinka/trackeep/frontend:1.2.7`
|
||||||
|
- `ghcr.io/dvorinka/trackeep/backend:latest`
|
||||||
|
- `ghcr.io/dvorinka/trackeep/frontend:latest`
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Images
|
||||||
|
|
||||||
|
Images are automatically built and pushed to GitHub Container Registry:
|
||||||
|
|
||||||
|
- **Registry**: `ghcr.io/dvorinka/trackeep`
|
||||||
|
- **Latest tags**: `backend:latest`, `frontend:latest` (for auto-updates)
|
||||||
|
- **Versioned tags**: `backend:1.2.5`, `frontend:1.2.5` (for specific releases)
|
||||||
|
- **Automatic builds**: Triggered by Git tags and pushes to main branch
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
# ✅ Simplified Version System - COMPLETE!
|
||||||
|
|
||||||
|
## 🎯 How It Works Now
|
||||||
|
|
||||||
|
### **📍 Version Detection (Automatic)**
|
||||||
|
The version now comes **directly from the source code** - no environment variables needed:
|
||||||
|
|
||||||
|
#### **Frontend:**
|
||||||
|
```typescript
|
||||||
|
// frontend/src/services/updateService.ts
|
||||||
|
getCurrentVersion(): string {
|
||||||
|
// Reads from package.json at runtime
|
||||||
|
const response = await fetch('/package.json');
|
||||||
|
const packageJson = await response.json();
|
||||||
|
return packageJson.version; // "1.2.5"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Backend:**
|
||||||
|
```go
|
||||||
|
// backend/handlers/updates.go
|
||||||
|
currentVersion := "1.2.5"
|
||||||
|
|
||||||
|
// Reads from go.mod if available
|
||||||
|
if content, err := os.ReadFile("go.mod"); err == nil {
|
||||||
|
if strings.Contains(line, "go 1.2.5") {
|
||||||
|
currentVersion = "1.2.5"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### **🚀 Release Process (Simple)**
|
||||||
|
|
||||||
|
#### **Method 1: GitHub Actions (Automatic)**
|
||||||
|
```bash
|
||||||
|
# Just push a version tag
|
||||||
|
git tag v1.2.6
|
||||||
|
git push origin v1.2.6
|
||||||
|
|
||||||
|
# GitHub Actions automatically:
|
||||||
|
# 1. Extracts version from tag
|
||||||
|
# 2. Updates package.json and go.mod
|
||||||
|
# 3. Builds Docker images with version tags
|
||||||
|
# 4. Pushes to registry
|
||||||
|
# 5. Creates GitHub release
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Method 2: Manual Script**
|
||||||
|
```bash
|
||||||
|
# Update all version files
|
||||||
|
./scripts/update-version.sh 1.2.6
|
||||||
|
|
||||||
|
# Commit and push
|
||||||
|
git add . && git commit -m "chore: bump version to 1.2.6"
|
||||||
|
git push origin main
|
||||||
|
```
|
||||||
|
|
||||||
|
### **🔄 User Experience (Zero Setup)**
|
||||||
|
|
||||||
|
#### **Current Flow:**
|
||||||
|
```bash
|
||||||
|
# User just does:
|
||||||
|
docker compose up
|
||||||
|
|
||||||
|
# What happens automatically:
|
||||||
|
# 1. Frontend reads version from package.json → "1.2.5"
|
||||||
|
# 2. Backend reads version from go.mod → "1.2.5"
|
||||||
|
# 3. Update checker compares vs "latest" in Docker registry
|
||||||
|
# 4. Update button appears in left navigation if newer version exists
|
||||||
|
# 5. User clicks update → Backend pulls latest images and restarts
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **No Environment Variables Needed!**
|
||||||
|
- ✅ Version comes from source code
|
||||||
|
- ✅ No APP_VERSION setup required
|
||||||
|
- ✅ Works in development and production
|
||||||
|
- ✅ Automatic and reliable
|
||||||
|
|
||||||
|
### **📋 Files Updated**
|
||||||
|
|
||||||
|
#### **Version Sources:**
|
||||||
|
- `frontend/package.json` - Frontend version
|
||||||
|
- `backend/go.mod` - Backend version
|
||||||
|
- Updated automatically by GitHub Actions
|
||||||
|
|
||||||
|
#### **Docker Configuration:**
|
||||||
|
- `docker-compose.yml` - Development with version variables
|
||||||
|
- `docker-compose.prod.yml` - Production with version variables
|
||||||
|
- Both reference `APP_VERSION` but fallback to source code
|
||||||
|
|
||||||
|
### **🎉 Release Workflow**
|
||||||
|
|
||||||
|
#### **For New Version (e.g., 1.2.6):**
|
||||||
|
|
||||||
|
1. **Developer commits changes**
|
||||||
|
```bash
|
||||||
|
git commit -m "feat: add new amazing feature"
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Create version tag**
|
||||||
|
```bash
|
||||||
|
git tag v1.2.6
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Push to trigger release**
|
||||||
|
```bash
|
||||||
|
git push origin main v1.2.6
|
||||||
|
```
|
||||||
|
|
||||||
|
4. **GitHub Actions automatically:**
|
||||||
|
- ✅ Updates all version files to "1.2.6"
|
||||||
|
- ✅ Builds Docker images: `backend:1.2.6`, `frontend:1.2.6`
|
||||||
|
- ✅ Pushes to registry: `latest` + `:1.2.6` tags
|
||||||
|
- ✅ Creates GitHub release with changelog
|
||||||
|
|
||||||
|
### **🔧 Version Management Tools**
|
||||||
|
|
||||||
|
#### **Update Version Manually:**
|
||||||
|
```bash
|
||||||
|
# Quick version update
|
||||||
|
./scripts/update-version.sh 1.2.7
|
||||||
|
|
||||||
|
# What it updates:
|
||||||
|
# - frontend/package.json
|
||||||
|
# - backend/go.mod
|
||||||
|
# - docker-compose.yml
|
||||||
|
# - docker-compose.prod.yml
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Check Current Version:**
|
||||||
|
```bash
|
||||||
|
# Frontend
|
||||||
|
curl -s http://localhost:5173/package.json | jq '.version'
|
||||||
|
|
||||||
|
# Backend
|
||||||
|
curl -s http://localhost:8080/api/updates/check | jq '.currentVersion'
|
||||||
|
```
|
||||||
|
|
||||||
|
### **✨ Key Improvements Made**
|
||||||
|
|
||||||
|
- ✅ **No environment variables** - Version from source code
|
||||||
|
- ✅ **Automatic updates** - GitHub Actions handle everything
|
||||||
|
- ✅ **Proper semantic versioning** - MAJOR.MINOR.PATCH
|
||||||
|
- ✅ **Zero setup for users** - Just `docker compose up`
|
||||||
|
- ✅ **Reliable detection** - Reads from actual code files
|
||||||
|
- ✅ **Simplified workflow** - Push tag → Release automatically
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎊 Summary
|
||||||
|
|
||||||
|
**Your Trackeep now has a **complete, simplified version system** that:**
|
||||||
|
|
||||||
|
1. **Detects version automatically** from source code
|
||||||
|
2. **Updates automatically** when you push version tags
|
||||||
|
3. **Requires zero setup** from users
|
||||||
|
4. **Follows industry best practices** for semantic versioning
|
||||||
|
5. **Works seamlessly** with the Docker update system
|
||||||
|
|
||||||
|
**Users get updates with no configuration required!** 🚀
|
||||||
@@ -0,0 +1,301 @@
|
|||||||
|
# Trackeep Version Management & Update Workflow
|
||||||
|
|
||||||
|
## 📍 Where Version Comes From
|
||||||
|
|
||||||
|
### **Current Version Detection:**
|
||||||
|
1. **Backend**: `APP_VERSION` environment variable (defaults to "1.0.0")
|
||||||
|
2. **Frontend**: `VITE_APP_VERSION` environment variable (passed during build)
|
||||||
|
|
||||||
|
### **Version Priority Order:**
|
||||||
|
1. `__APP_VERSION__` build constant (highest priority)
|
||||||
|
2. `VITE_APP_VERSION` environment variable (frontend)
|
||||||
|
3. `APP_VERSION` environment variable (backend)
|
||||||
|
4. Falls back to "1.0.0" (default)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🏷️ How to Set Version Properly
|
||||||
|
|
||||||
|
### **Option 1: Environment Variables (Recommended)**
|
||||||
|
|
||||||
|
#### **Development:**
|
||||||
|
```bash
|
||||||
|
# Set version in .env file
|
||||||
|
echo "APP_VERSION=1.2.0" >> .env
|
||||||
|
|
||||||
|
# Start with version
|
||||||
|
docker compose up
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Production:**
|
||||||
|
```bash
|
||||||
|
# Set version environment variable
|
||||||
|
export APP_VERSION=1.2.0
|
||||||
|
docker compose -f docker-compose.prod.yml up
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Option 2: Build-time Constants**
|
||||||
|
|
||||||
|
#### **Frontend (vite.config.ts):**
|
||||||
|
```typescript
|
||||||
|
export default defineConfig({
|
||||||
|
define: {
|
||||||
|
__APP_VERSION__: JSON.stringify(process.env.npm_package_version || '1.0.0')
|
||||||
|
},
|
||||||
|
// ... rest of config
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Backend (build):**
|
||||||
|
```bash
|
||||||
|
# Build with version
|
||||||
|
APP_VERSION=1.2.0 go build -ldflags "-X main.version=${APP_VERSION}"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 How to Push Updates with Proper Labels
|
||||||
|
|
||||||
|
### **Method 1: GitHub Actions (Recommended)**
|
||||||
|
|
||||||
|
#### **Create `.github/workflows/release.yml`:**
|
||||||
|
```yaml
|
||||||
|
name: Release and Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*' # Trigger on version tags like v1.2.0
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-push:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Login to GitHub Container Registry
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Extract version from tag
|
||||||
|
run: |
|
||||||
|
VERSION=${GITHUB_REF#refs/tags/v*}
|
||||||
|
VERSION=${VERSION#refs/tags/v}
|
||||||
|
echo "VERSION=$VERSION" >> $GITHUB_ENV
|
||||||
|
echo "Building version: $VERSION"
|
||||||
|
|
||||||
|
- name: Build and push backend
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: ./backend
|
||||||
|
file: ./backend/Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
ghcr.io/dvorinka/trackeep/backend:latest
|
||||||
|
ghcr.io/dvorinka/trackeep/backend:${{ env.VERSION }}
|
||||||
|
labels: |
|
||||||
|
version=${{ env.VERSION }}
|
||||||
|
build-date=${{ github.event.head_commit.timestamp }}
|
||||||
|
commit=${{ github.sha }}
|
||||||
|
|
||||||
|
- name: Build and push frontend
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
file: ./frontend/Dockerfile
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
ghcr.io/dvorinka/trackeep/frontend:latest
|
||||||
|
ghcr.io/dvorinka/trackeep/frontend:${{ env.VERSION }}
|
||||||
|
labels: |
|
||||||
|
version=${{ env.VERSION }}
|
||||||
|
build-date=${{ github.event.head_commit.timestamp }}
|
||||||
|
commit=${{ github.sha }}
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Method 2: Manual Docker Push**
|
||||||
|
|
||||||
|
#### **Tag and Push:**
|
||||||
|
```bash
|
||||||
|
# Set version
|
||||||
|
export VERSION=1.2.0
|
||||||
|
|
||||||
|
# Build and tag with version
|
||||||
|
docker build -t ghcr.io/dvorinka/trackeep/backend:${VERSION} ./backend
|
||||||
|
docker build -t ghcr.io/dvorinka/trackeep/backend:latest ./backend
|
||||||
|
|
||||||
|
docker build -t ghcr.io/dvorinka/trackeep/frontend:${VERSION} .
|
||||||
|
docker build -t ghcr.io/dvorinka/trackeep/frontend:latest .
|
||||||
|
|
||||||
|
# Push both tags
|
||||||
|
docker push ghcr.io/dvorinka/trackeep/backend:${VERSION}
|
||||||
|
docker push ghcr.io/dvorinka/trackeep/backend:latest
|
||||||
|
|
||||||
|
docker push ghcr.io/dvorinka/trackeep/frontend:${VERSION}
|
||||||
|
docker push ghcr.io/dvorinka/trackeep/frontend:latest
|
||||||
|
|
||||||
|
# Create Git tag
|
||||||
|
git tag v${VERSION}
|
||||||
|
git push origin v${VERSION}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📋 How People Do It (Industry Standards)
|
||||||
|
|
||||||
|
### **Semantic Versioning:**
|
||||||
|
```
|
||||||
|
MAJOR.MINOR.PATCH
|
||||||
|
1.2.0
|
||||||
|
│ │ └─ PATCH: Bug fixes, small features
|
||||||
|
│ └─ MINOR: New features, breaking changes
|
||||||
|
└─ MAJOR: Major changes, breaking API
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Version Labels:**
|
||||||
|
```dockerfile
|
||||||
|
# In Dockerfile
|
||||||
|
LABEL version="1.2.0"
|
||||||
|
LABEL build-date="2024-02-27"
|
||||||
|
LABEL commit="abc123def"
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Environment Variables:**
|
||||||
|
```bash
|
||||||
|
# Production
|
||||||
|
APP_VERSION=1.2.0
|
||||||
|
VITE_APP_VERSION=1.2.0
|
||||||
|
|
||||||
|
# Development
|
||||||
|
APP_VERSION=1.3.0-dev
|
||||||
|
VITE_APP_VERSION=1.3.0-dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Git Tags:**
|
||||||
|
```bash
|
||||||
|
# Create version tag
|
||||||
|
git tag -a v1.2.0 -m "Release version 1.2.0"
|
||||||
|
git push origin v1.2.0
|
||||||
|
|
||||||
|
# Lightweight tags (for CI/CD)
|
||||||
|
git tag v1.2.0 ${COMMIT_SHA}
|
||||||
|
git push origin v1.2.0
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔄 Update Detection Logic
|
||||||
|
|
||||||
|
### **How System Detects Updates:**
|
||||||
|
|
||||||
|
#### **Current Setup:**
|
||||||
|
```go
|
||||||
|
// Backend gets current version
|
||||||
|
currentVersion := os.Getenv("APP_VERSION")
|
||||||
|
if currentVersion == "" {
|
||||||
|
currentVersion = "1.0.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Frontend gets version from build
|
||||||
|
return import.meta.env.VITE_APP_VERSION || '1.0.0'
|
||||||
|
```
|
||||||
|
|
||||||
|
#### **Update Check:**
|
||||||
|
```go
|
||||||
|
// Compares current vs latest
|
||||||
|
if isNewerVersion("latest", currentVersion) {
|
||||||
|
// Update available!
|
||||||
|
return updateInfo, true, nil
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🎯 Recommended Workflow
|
||||||
|
|
||||||
|
### **Development:**
|
||||||
|
```bash
|
||||||
|
# 1. Set version in .env
|
||||||
|
echo "APP_VERSION=1.2.1-dev" >> .env
|
||||||
|
|
||||||
|
# 2. Start development
|
||||||
|
docker compose up
|
||||||
|
|
||||||
|
# 3. Test updates
|
||||||
|
curl http://localhost:8080/api/updates/check
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Production Release:**
|
||||||
|
```bash
|
||||||
|
# 1. Update version
|
||||||
|
export APP_VERSION=1.2.1
|
||||||
|
|
||||||
|
# 2. Build and push
|
||||||
|
./scripts/release.sh 1.2.1
|
||||||
|
|
||||||
|
# 3. Deploy
|
||||||
|
docker compose -f docker-compose.prod.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Version Update Process:**
|
||||||
|
1. **Code changes** → Commit to main branch
|
||||||
|
2. **Version bump** → Update APP_VERSION in .env
|
||||||
|
3. **Tag release** → `git tag v1.2.1 && git push origin v1.2.1`
|
||||||
|
4. **Auto-build** → GitHub Actions builds Docker images
|
||||||
|
5. **Push tags** → `latest` + versioned tags to registry
|
||||||
|
6. **Deploy** → Users get updates automatically
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ✅ Best Practices
|
||||||
|
|
||||||
|
### **Version Management:**
|
||||||
|
- ✅ Use semantic versioning (MAJOR.MINOR.PATCH)
|
||||||
|
- ✅ Always update both frontend and backend versions
|
||||||
|
- ✅ Use environment variables for flexibility
|
||||||
|
- ✅ Tag releases in Git
|
||||||
|
|
||||||
|
### **Docker Tags:**
|
||||||
|
- ✅ Always push `latest` tag for updates
|
||||||
|
- ✅ Also push versioned tags for rollback
|
||||||
|
- ✅ Add labels for metadata
|
||||||
|
- ✅ Use consistent naming convention
|
||||||
|
|
||||||
|
### **Release Process:**
|
||||||
|
- ✅ Automate with GitHub Actions
|
||||||
|
- ✅ Test before tagging
|
||||||
|
- ✅ Document changes in release notes
|
||||||
|
- ✅ Use semantic versioning
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🧪 Testing Your Setup
|
||||||
|
|
||||||
|
### **Test Version Detection:**
|
||||||
|
```bash
|
||||||
|
# Check current version
|
||||||
|
curl -s http://localhost:8080/api/updates/check | jq '.currentVersion'
|
||||||
|
|
||||||
|
# Should return your APP_VERSION value
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Test Update Detection:**
|
||||||
|
```bash
|
||||||
|
# Simulate update available
|
||||||
|
# Backend will show "latest" vs your current version
|
||||||
|
```
|
||||||
|
|
||||||
|
### **Verify Docker Images:**
|
||||||
|
```bash
|
||||||
|
# Check if images have version labels
|
||||||
|
docker inspect ghcr.io/dvorinka/trackeep/backend:latest | jq '.[0].Config.Labels.version'
|
||||||
|
docker inspect ghcr.io/dvorinka/trackeep/frontend:latest | jq '.[0].Config.Labels.version'
|
||||||
|
```
|
||||||
|
|
||||||
|
This system ensures proper versioning and update detection for your Trackeep application!
|
||||||
+112
@@ -0,0 +1,112 @@
|
|||||||
|
# DragonflyDB Configuration for Trackeep
|
||||||
|
#
|
||||||
|
# DragonflyDB is a modern Redis-compatible in-memory database
|
||||||
|
# Optimized for performance and lower memory usage
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# NETWORK
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Accept connections on all interfaces (safe when behind Docker network)
|
||||||
|
bind 0.0.0.0
|
||||||
|
|
||||||
|
# Default port (same as Redis for compatibility)
|
||||||
|
port 6379
|
||||||
|
|
||||||
|
# TCP listen() backlog
|
||||||
|
tcp-backlog 511
|
||||||
|
|
||||||
|
# Close connection after N seconds of idle time (0 = disabled)
|
||||||
|
timeout 0
|
||||||
|
|
||||||
|
# TCP keepalive
|
||||||
|
tcp-keepalive 300
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# SECURITY
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Require password for connections
|
||||||
|
# Set via environment variable: requirepass ${DRAGONFLY_PASSWORD}
|
||||||
|
requirepass dragonfly123
|
||||||
|
|
||||||
|
# Disable dangerous commands in production
|
||||||
|
rename-command FLUSHDB ""
|
||||||
|
rename-command FLUSHALL ""
|
||||||
|
rename-command CONFIG "CONFIG_9f8a2b3c"
|
||||||
|
rename-command DEBUG ""
|
||||||
|
rename-command SHUTDOWN "SHUTDOWN_7d4e1f9a"
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# MEMORY MANAGEMENT
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Maximum memory limit (256MB suitable for small-medium deployments)
|
||||||
|
# DragonflyDB is more memory efficient than Redis
|
||||||
|
maxmemory 256mb
|
||||||
|
|
||||||
|
# Eviction policy when maxmemory is reached
|
||||||
|
# allkeys-lru: Remove less recently used keys first (recommended for caching)
|
||||||
|
maxmemory-policy allkeys-lru
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# PERSISTENCE
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Enable AOF persistence (recommended for session durability)
|
||||||
|
appendonly yes
|
||||||
|
|
||||||
|
# AOF file name
|
||||||
|
appendfilename "appendonly.aof"
|
||||||
|
|
||||||
|
# Sync strategy: everysec (recommended balance)
|
||||||
|
appendfsync everysec
|
||||||
|
|
||||||
|
# Auto-rewrite AOF when it grows by X%
|
||||||
|
auto-aof-rewrite-percentage 100
|
||||||
|
|
||||||
|
# Minimum size before auto-rewrite
|
||||||
|
auto-aof-rewrite-min-size 64mb
|
||||||
|
|
||||||
|
# Working directory for persistence
|
||||||
|
dir /data
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# CLIENTS & PERFORMANCE
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Maximum number of client connections
|
||||||
|
maxclients 10000
|
||||||
|
|
||||||
|
# Number of databases (default 16)
|
||||||
|
databases 16
|
||||||
|
|
||||||
|
# Latency monitoring
|
||||||
|
latency-monitor-threshold 100
|
||||||
|
|
||||||
|
# Slow log (log queries taking > N microseconds)
|
||||||
|
slowlog-log-slower-than 10000
|
||||||
|
|
||||||
|
# Slow log max length
|
||||||
|
slowlog-max-len 128
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# LOGGING
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Log level: debug, verbose, notice, warning
|
||||||
|
loglevel notice
|
||||||
|
|
||||||
|
# Log file (empty = stdout, good for Docker)
|
||||||
|
logfile ""
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# DRAGONFLYDB SPECIFIC OPTIMIZATIONS
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# Enable DragonflyDB-specific optimizations
|
||||||
|
# These are automatically enabled in DragonflyDB
|
||||||
|
|
||||||
|
# Better memory management
|
||||||
|
# Improved multi-core utilization
|
||||||
|
# Enhanced performance for caching workloads
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
// Enable demo mode - run this in browser console
|
|
||||||
localStorage.setItem('demoMode', 'true');
|
|
||||||
document.title = 'Trackeep - Demo Mode';
|
|
||||||
console.log('Demo mode enabled! Refresh the page to see changes.');
|
|
||||||
+21
-7
@@ -3,16 +3,23 @@ FROM node:22-alpine AS builder
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Accept build arguments for VITE environment variables
|
||||||
|
ARG VITE_DEMO_MODE=false
|
||||||
|
ARG VITE_API_URL=http://localhost:8080
|
||||||
|
|
||||||
# Copy package files
|
# Copy package files
|
||||||
COPY frontend/package*.json ./frontend/
|
COPY frontend/package*.json ./frontend/
|
||||||
RUN cd frontend && npm install --include=dev
|
RUN cd frontend && npm install --include=dev
|
||||||
|
|
||||||
# Copy environment variables and source code
|
# Copy frontend source code only
|
||||||
COPY .env ./frontend/
|
|
||||||
COPY frontend/ ./frontend/
|
COPY frontend/ ./frontend/
|
||||||
|
|
||||||
# Build the application
|
# Create a .env.production file with build arguments
|
||||||
RUN cd frontend && npx vite build
|
RUN cd frontend && echo "VITE_DEMO_MODE=${VITE_DEMO_MODE}" >> .env.production && \
|
||||||
|
echo "VITE_API_URL=${VITE_API_URL}" >> .env.production
|
||||||
|
|
||||||
|
# Build the application (frontend only)
|
||||||
|
RUN cd frontend && npm run build
|
||||||
|
|
||||||
# Production stage
|
# Production stage
|
||||||
FROM nginx:alpine
|
FROM nginx:alpine
|
||||||
@@ -20,11 +27,18 @@ FROM nginx:alpine
|
|||||||
# Copy built assets from builder stage
|
# Copy built assets from builder stage
|
||||||
COPY --from=builder /app/frontend/dist /usr/share/nginx/html
|
COPY --from=builder /app/frontend/dist /usr/share/nginx/html
|
||||||
|
|
||||||
|
# Copy the entrypoint script
|
||||||
|
COPY frontend/docker-entrypoint.sh /docker-entrypoint.sh
|
||||||
|
RUN chmod +x /docker-entrypoint.sh
|
||||||
|
|
||||||
# Copy nginx configuration
|
# Copy nginx configuration
|
||||||
COPY frontend/nginx.conf /etc/nginx/nginx.conf
|
COPY frontend/nginx.conf /etc/nginx/nginx.conf
|
||||||
|
|
||||||
# Expose port 80
|
# Make a backup of the original index.html for runtime substitution
|
||||||
|
RUN cp /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.orig
|
||||||
|
|
||||||
|
# Expose port (will be dynamically set by entrypoint)
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
# Start nginx
|
# Start the entrypoint script
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Runtime environment variable injection script for nginx
|
||||||
|
# This script will replace placeholders in HTML with actual environment variables
|
||||||
|
|
||||||
|
# Default values
|
||||||
|
DEMO_MODE=${VITE_DEMO_MODE:-false}
|
||||||
|
API_URL=${VITE_API_URL:-http://localhost:8080}
|
||||||
|
FRONTEND_PORT=${FRONTEND_PORT:-3000}
|
||||||
|
|
||||||
|
# Update nginx configuration to use the dynamic port
|
||||||
|
sed -i "s/listen 80;/listen ${FRONTEND_PORT};/g" /etc/nginx/nginx.conf
|
||||||
|
|
||||||
|
# Create a temporary script for env substitution
|
||||||
|
cat > /tmp/env_substitute.sh << 'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# File to modify
|
||||||
|
HTML_FILE="/usr/share/nginx/html/index.html"
|
||||||
|
|
||||||
|
# Backup original file
|
||||||
|
cp /usr/share/nginx/html/index.html.orig /usr/share/nginx/html/index.html 2>/dev/null || \
|
||||||
|
cp /usr/share/nginx/html/index.html /usr/share/nginx/html/index.html.orig
|
||||||
|
|
||||||
|
# Replace environment variables in the HTML file
|
||||||
|
sed -i "s|VITE_DEMO_MODE_PLACEHOLDER|$VITE_DEMO_MODE|g" $HTML_FILE
|
||||||
|
sed -i "s|VITE_API_URL_PLACEHOLDER|$VITE_API_URL|g" $HTML_FILE
|
||||||
|
|
||||||
|
echo "Environment variables injected:"
|
||||||
|
echo "VITE_DEMO_MODE=$VITE_DEMO_MODE"
|
||||||
|
echo "VITE_API_URL=$VITE_API_URL"
|
||||||
|
echo "FRONTEND_PORT=$FRONTEND_PORT"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# Make the script executable
|
||||||
|
chmod +x /tmp/env_substitute.sh
|
||||||
|
|
||||||
|
# Run the substitution
|
||||||
|
/tmp/env_substitute.sh
|
||||||
|
|
||||||
|
# Start nginx
|
||||||
|
nginx -g "daemon off;"
|
||||||
@@ -9,6 +9,25 @@
|
|||||||
<meta name="theme-color" content="#39b9ff" />
|
<meta name="theme-color" content="#39b9ff" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Trackeep - Your Self-Hosted Productivity & Knowledge Hub</title>
|
<title>Trackeep - Your Self-Hosted Productivity & Knowledge Hub</title>
|
||||||
|
<script>
|
||||||
|
// Runtime environment variable injection
|
||||||
|
window.ENV = {
|
||||||
|
VITE_DEMO_MODE: 'VITE_DEMO_MODE_PLACEHOLDER',
|
||||||
|
VITE_API_URL: 'VITE_API_URL_PLACEHOLDER'
|
||||||
|
};
|
||||||
|
|
||||||
|
// Make them available to import.meta.env by overriding it
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
window.importMetaEnv = {
|
||||||
|
VITE_DEMO_MODE: window.ENV.VITE_DEMO_MODE,
|
||||||
|
VITE_API_URL: window.ENV.VITE_API_URL
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log for debugging
|
||||||
|
console.log('[Env Injection] window.ENV:', window.ENV);
|
||||||
|
console.log('[Env Injection] Demo mode should be:', window.ENV.VITE_DEMO_MODE);
|
||||||
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|||||||
+12
-12
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.0",
|
"version": "1.2.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -13,25 +13,25 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@kobalte/core": "^0.13.11",
|
"@kobalte/core": "^0.13.11",
|
||||||
"@solidjs/router": "^0.15.4",
|
"@solidjs/router": "^0.15.4",
|
||||||
"@tabler/icons": "^3.36.1",
|
"@tabler/icons": "^3.37.1",
|
||||||
"@tabler/icons-solidjs": "^3.36.1",
|
"@tabler/icons-solidjs": "^3.37.1",
|
||||||
"@tanstack/solid-query": "^5.90.23",
|
"@tanstack/solid-query": "^5.90.23",
|
||||||
"@unocss/preset-attributify": "^66.6.0",
|
"@unocss/preset-attributify": "^66.6.2",
|
||||||
"@unocss/preset-icons": "^66.6.0",
|
"@unocss/preset-icons": "^66.6.2",
|
||||||
"@unocss/preset-uno": "^66.6.0",
|
"@unocss/preset-uno": "^66.6.2",
|
||||||
"@unocss/reset": "^66.6.0",
|
"@unocss/reset": "^66.6.2",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"lucide-solid": "^0.460.0",
|
"lucide-solid": "^0.575.0",
|
||||||
"solid-js": "^1.9.10",
|
"solid-js": "^1.9.10",
|
||||||
"tailwind-merge": "^3.4.0"
|
"tailwind-merge": "^3.5.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^24.10.9",
|
"@types/node": "^24.10.15",
|
||||||
"@unocss/preset-wind": "^66.6.0",
|
"@unocss/preset-wind": "^66.6.2",
|
||||||
"terser": "^5.46.0",
|
"terser": "^5.46.0",
|
||||||
"typescript": "~5.9.3",
|
"typescript": "~5.9.3",
|
||||||
"unocss": "^66.6.0",
|
"unocss": "^66.6.2",
|
||||||
"vite": "^7.2.4",
|
"vite": "^7.2.4",
|
||||||
"vite-plugin-solid": "^2.11.10"
|
"vite-plugin-solid": "^2.11.10"
|
||||||
}
|
}
|
||||||
|
|||||||
+48
-6
@@ -24,12 +24,14 @@ import { GitHub } from '@/pages/GitHub'
|
|||||||
import { TimeTracking } from '@/pages/TimeTracking'
|
import { TimeTracking } from '@/pages/TimeTracking'
|
||||||
import { Calendar } from '@/pages/Calendar'
|
import { Calendar } from '@/pages/Calendar'
|
||||||
import { AuthCallback } from '@/pages/AuthCallback'
|
import { AuthCallback } from '@/pages/AuthCallback'
|
||||||
import { AuthProvider } from '@/lib/auth'
|
import { AuthProvider, useAuth } from '@/lib/auth'
|
||||||
import { Search } from '@/pages/Search'
|
import { Search } from '@/pages/Search'
|
||||||
import { Analytics } from '@/pages/Analytics'
|
import { Analytics } from '@/pages/Analytics'
|
||||||
import { Messages } from '@/pages/Messages'
|
import { Messages } from '@/pages/Messages'
|
||||||
|
import BrowserExtensionSettings from '@/pages/BrowserExtensionSettings'
|
||||||
import { initializeDemoMode, clearDemoMode, isEnvDemoMode } from '@/lib/demo-mode'
|
import { initializeDemoMode, clearDemoMode, isEnvDemoMode } from '@/lib/demo-mode'
|
||||||
import { onMount } from 'solid-js'
|
import { onMount, createEffect } from 'solid-js'
|
||||||
|
import { useNavigate } from '@solidjs/router'
|
||||||
|
|
||||||
// Initialize dark mode immediately before anything else
|
// Initialize dark mode immediately before anything else
|
||||||
const initializeDarkMode = () => {
|
const initializeDarkMode = () => {
|
||||||
@@ -76,6 +78,42 @@ const queryClient = new QueryClient({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Component to handle root route logic
|
||||||
|
const RootRoute = () => {
|
||||||
|
const { authState } = useAuth();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
createEffect(() => {
|
||||||
|
// If demo mode is enabled and user is authenticated, navigate to app
|
||||||
|
if (isEnvDemoMode() && authState.isAuthenticated && !authState.isLoading) {
|
||||||
|
navigate('/app', { replace: true });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If not demo mode and user is authenticated, navigate to app
|
||||||
|
if (!isEnvDemoMode() && authState.isAuthenticated && !authState.isLoading) {
|
||||||
|
navigate('/app', { replace: true });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If not authenticated and not loading, show login
|
||||||
|
if (!authState.isAuthenticated && !authState.isLoading) {
|
||||||
|
navigate('/login', { replace: true });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Show loading spinner while checking auth
|
||||||
|
return (
|
||||||
|
<div class="min-h-screen bg-[#18181b] flex items-center justify-center px-4">
|
||||||
|
<div class="text-center">
|
||||||
|
<div class="inline-block w-8 h-8 border-2 border-[#39b9ff] border-r-transparent rounded-full animate-spin mb-3"></div>
|
||||||
|
<p class="text-sm text-[#a3a3a3]">Loading...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
// Initialize demo mode API interceptor and cleanup old demo data
|
// Initialize demo mode API interceptor and cleanup old demo data
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
@@ -93,10 +131,7 @@ function App() {
|
|||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<Router>
|
<Router>
|
||||||
<Route path="/" component={() => {
|
<Route path="/" component={RootRoute} />
|
||||||
// Always show login page, demo mode will be handled there
|
|
||||||
return <Login />;
|
|
||||||
}} />
|
|
||||||
<Route path="/login" component={Login} />
|
<Route path="/login" component={Login} />
|
||||||
<Route path="/auth/callback" component={AuthCallback} />
|
<Route path="/auth/callback" component={AuthCallback} />
|
||||||
<Route path="/app" component={() => (
|
<Route path="/app" component={() => (
|
||||||
@@ -141,6 +176,13 @@ function App() {
|
|||||||
</Layout>
|
</Layout>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
)} />
|
)} />
|
||||||
|
<Route path="/app/browser-extension" component={() => (
|
||||||
|
<ProtectedRoute>
|
||||||
|
<Layout title="Browser Extension Settings">
|
||||||
|
<BrowserExtensionSettings />
|
||||||
|
</Layout>
|
||||||
|
</ProtectedRoute>
|
||||||
|
)} />
|
||||||
<Route path="/app/files" component={() => (
|
<Route path="/app/files" component={() => (
|
||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<Layout title="Files">
|
<Layout title="Files">
|
||||||
|
|||||||
@@ -27,11 +27,13 @@ export const AuthenticationWarning = () => {
|
|||||||
<div class="text-center mb-8">
|
<div class="text-center mb-8">
|
||||||
<div class="mb-6">
|
<div class="mb-6">
|
||||||
<div class="inline-flex items-center justify-center mb-4">
|
<div class="inline-flex items-center justify-center mb-4">
|
||||||
<img
|
<div class="inline-flex items-center justify-center p-2.5 rounded-xl border border-border bg-muted/40">
|
||||||
src="/trackeepfavi_bg.png"
|
<img
|
||||||
alt="Trackeep Logo"
|
src="/trackeep.svg"
|
||||||
class="w-12 h-12 rounded-xl"
|
alt="Trackeep Logo"
|
||||||
/>
|
class="w-9 h-9 app-logo-mono"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<h1 class="text-2xl font-bold tracking-tight mb-2 text-foreground">Authentication Required</h1>
|
<h1 class="text-2xl font-bold tracking-tight mb-2 text-foreground">Authentication Required</h1>
|
||||||
<p class="text-muted-foreground">Please sign in to access Trackeep</p>
|
<p class="text-muted-foreground">Please sign in to access Trackeep</p>
|
||||||
|
|||||||
@@ -1,32 +1,32 @@
|
|||||||
import { useAuth } from '@/lib/auth';
|
import { useAuth } from '@/lib/auth';
|
||||||
import { AuthenticationWarning } from '@/components/AuthenticationWarning';
|
import { AuthenticationWarning } from '@/components/AuthenticationWarning';
|
||||||
import { isDemoMode } from '@/lib/demo-mode';
|
import { isDemoMode } from '@/lib/demo-mode';
|
||||||
|
import { Show } from 'solid-js';
|
||||||
|
|
||||||
interface ProtectedRouteProps {
|
interface ProtectedRouteProps {
|
||||||
children: any;
|
children: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ProtectedRoute = (props: ProtectedRouteProps) => {
|
export const ProtectedRoute = (props: ProtectedRouteProps) => {
|
||||||
// In demo mode, show UI immediately without any checks
|
|
||||||
if (isDemoMode()) {
|
|
||||||
console.log('[ProtectedRoute] Demo mode active - showing UI immediately');
|
|
||||||
return props.children;
|
|
||||||
}
|
|
||||||
|
|
||||||
const { authState } = useAuth();
|
const { authState } = useAuth();
|
||||||
|
|
||||||
console.log('[ProtectedRoute] Render:', {
|
return (
|
||||||
isDemoMode: isDemoMode(),
|
<Show when={!isDemoMode()} fallback={props.children}>
|
||||||
isAuthenticated: authState.isAuthenticated,
|
<Show
|
||||||
isLoading: authState.isLoading
|
when={!authState.isLoading}
|
||||||
});
|
fallback={
|
||||||
|
<div class="min-h-screen bg-background flex items-center justify-center px-4 py-8">
|
||||||
// If not authenticated, show authentication warning (no loading state)
|
<div class="text-center">
|
||||||
if (!authState.isAuthenticated) {
|
<div class="inline-block w-8 h-8 border-2 border-primary border-r-transparent rounded-full animate-spin mb-3"></div>
|
||||||
console.log('[ProtectedRoute] Rendering authentication warning');
|
<p class="text-sm text-muted-foreground">Checking authentication...</p>
|
||||||
return <AuthenticationWarning />;
|
</div>
|
||||||
}
|
</div>
|
||||||
|
}
|
||||||
console.log('[ProtectedRoute] Rendering children');
|
>
|
||||||
return props.children;
|
<Show when={authState.isAuthenticated} fallback={<AuthenticationWarning />}>
|
||||||
|
{props.children}
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import {
|
|||||||
type TimeEntry
|
type TimeEntry
|
||||||
} from '../lib/api';
|
} from '../lib/api';
|
||||||
import { TagPicker } from '@/components/ui/TagPicker';
|
import { TagPicker } from '@/components/ui/TagPicker';
|
||||||
|
import { isDemoMode } from '@/lib/demo-mode';
|
||||||
|
|
||||||
interface TimerProps {
|
interface TimerProps {
|
||||||
onTimeEntryCreated?: (timeEntry: TimeEntry) => void;
|
onTimeEntryCreated?: (timeEntry: TimeEntry) => void;
|
||||||
@@ -38,13 +39,6 @@ export const Timer = (props: TimerProps) => {
|
|||||||
const [showSettings, setShowSettings] = createSignal(false);
|
const [showSettings, setShowSettings] = createSignal(false);
|
||||||
const [availableTags, setAvailableTags] = createSignal<string[]>([]);
|
const [availableTags, setAvailableTags] = createSignal<string[]>([]);
|
||||||
|
|
||||||
// Check if we're in demo mode
|
|
||||||
const isDemoMode = () => {
|
|
||||||
return localStorage.getItem('demoMode') === 'true' ||
|
|
||||||
document.title.includes('Demo Mode') ||
|
|
||||||
window.location.search.includes('demo=true');
|
|
||||||
};
|
|
||||||
|
|
||||||
// Use appropriate API based on demo mode
|
// Use appropriate API based on demo mode
|
||||||
const getApi = () => isDemoMode() ? demoTimeEntriesApi : timeEntriesApi;
|
const getApi = () => isDemoMode() ? demoTimeEntriesApi : timeEntriesApi;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import { createSignal, onMount, Show } from 'solid-js';
|
import { createSignal, onMount, Show, For } from 'solid-js';
|
||||||
import { Button } from './ui/Button';
|
import { Button } from './ui/Button';
|
||||||
import { Card } from './ui/Card';
|
|
||||||
|
|
||||||
interface TOTPSetupResponse {
|
interface TOTPSetupResponse {
|
||||||
secret: string;
|
secret: string;
|
||||||
@@ -272,10 +271,10 @@ export function TwoFactorAuth() {
|
|||||||
return (
|
return (
|
||||||
<div class="space-y-6">
|
<div class="space-y-6">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<h2 class="text-2xl font-bold text-white">Two-Factor Authentication</h2>
|
<h2 class="text-2xl font-bold text-foreground">Two-Factor Authentication</h2>
|
||||||
<div class="flex items-center space-x-2">
|
<div class="flex items-center space-x-2">
|
||||||
<div class={`w-3 h-3 rounded-full ${totpStatus()?.enabled ? 'bg-primary' : 'bg-muted'}`}></div>
|
<div class={`w-3 h-3 rounded-full ${totpStatus()?.enabled ? 'bg-primary' : 'bg-muted'}`}></div>
|
||||||
<span class="text-gray-300">
|
<span class="text-muted-foreground">
|
||||||
{totpStatus()?.enabled ? 'Enabled' : 'Disabled'}
|
{totpStatus()?.enabled ? 'Enabled' : 'Disabled'}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -295,42 +294,42 @@ export function TwoFactorAuth() {
|
|||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
{/* Current Status */}
|
{/* Current Status */}
|
||||||
<Card class="p-6">
|
<div class="border rounded-lg p-6">
|
||||||
<h3 class="text-lg font-semibold text-white mb-4">Current Status</h3>
|
<h3 class="text-lg font-semibold text-foreground mb-4">Current Status</h3>
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<div class="flex justify-between items-center">
|
<div class="flex justify-between items-center">
|
||||||
<span class="text-gray-300">2FA Status:</span>
|
<span class="text-muted-foreground">2FA Status:</span>
|
||||||
<span class={`font-medium ${totpStatus()?.enabled ? 'text-primary' : 'text-muted-foreground'}`}>
|
<span class={`font-medium ${totpStatus()?.enabled ? 'text-primary' : 'text-muted-foreground'}`}>
|
||||||
{totpStatus()?.enabled ? 'Enabled' : 'Disabled'}
|
{totpStatus()?.enabled ? 'Enabled' : 'Disabled'}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between items-center">
|
<div class="flex justify-between items-center">
|
||||||
<span class="text-gray-300">Setup Status:</span>
|
<span class="text-muted-foreground">Setup Status:</span>
|
||||||
<span class={`font-medium ${totpStatus()?.setup ? 'text-blue-400' : 'text-gray-400'}`}>
|
<span class={`font-medium ${totpStatus()?.setup ? 'text-blue-500' : 'text-muted-foreground'}`}>
|
||||||
{totpStatus()?.setup ? 'Configured' : 'Not Configured'}
|
{totpStatus()?.setup ? 'Configured' : 'Not Configured'}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
|
|
||||||
{/* Setup TOTP */}
|
{/* Setup TOTP */}
|
||||||
<Show when={!totpStatus()?.enabled}>
|
<Show when={!totpStatus()?.enabled}>
|
||||||
<Card class="p-6">
|
<div class="border rounded-lg p-6">
|
||||||
<h3 class="text-lg font-semibold text-white mb-4">Setup Two-Factor Authentication</h3>
|
<h3 class="text-lg font-semibold text-foreground mb-4">Setup Two-Factor Authentication</h3>
|
||||||
<p class="text-gray-300 mb-4">
|
<p class="text-muted-foreground mb-4">
|
||||||
Enable 2FA to add an extra layer of security to your account. You'll need a TOTP app like Google Authenticator or Authy.
|
Enable 2FA to add an extra layer of security to your account. You'll need a TOTP app like Google Authenticator or Authy.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="space-y-4">
|
<div class="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-300 mb-2">
|
<label class="block text-sm font-medium text-muted-foreground mb-2">
|
||||||
Confirm Password
|
Confirm Password
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
value={setupPassword()}
|
value={setupPassword()}
|
||||||
onInput={(e) => setSetupPassword(e.currentTarget.value)}
|
onInput={(e) => setSetupPassword(e.currentTarget.value)}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="Enter your password"
|
placeholder="Enter your password"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -343,59 +342,61 @@ export function TwoFactorAuth() {
|
|||||||
{loading() ? 'Setting up...' : 'Setup 2FA'}
|
{loading() ? 'Setting up...' : 'Setup 2FA'}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
{/* TOTP Setup Process */}
|
{/* TOTP Setup Process */}
|
||||||
<Show when={showSetup() && setupData()}>
|
<Show when={showSetup() && setupData()}>
|
||||||
<Card class="p-6">
|
<div class="border rounded-lg p-6">
|
||||||
<h3 class="text-lg font-semibold text-white mb-4">Complete 2FA Setup</h3>
|
<h3 class="text-lg font-semibold text-foreground mb-4">Complete 2FA Setup</h3>
|
||||||
|
|
||||||
<div class="space-y-6">
|
<div class="space-y-6">
|
||||||
{/* QR Code */}
|
{/* QR Code */}
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">Scan QR Code</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">Scan QR Code</h4>
|
||||||
<img
|
<img
|
||||||
src={setupData()!.qr_code}
|
src={setupData()!.qr_code}
|
||||||
alt="TOTP QR Code"
|
alt="TOTP QR Code"
|
||||||
class="mx-auto border-2 border-gray-600 rounded-lg"
|
class="mx-auto border-2 border-border rounded-lg"
|
||||||
/>
|
/>
|
||||||
<p class="text-sm text-gray-400 mt-2">
|
<p class="text-sm text-muted-foreground mt-2">
|
||||||
Or manually enter this secret in your TOTP app:
|
Or manually enter this secret in your TOTP app:
|
||||||
</p>
|
</p>
|
||||||
<code class="block bg-gray-800 px-3 py-2 rounded text-blue-400 break-all">
|
<code class="block bg-muted px-3 py-2 rounded text-primary break-all">
|
||||||
{setupData()!.secret}
|
{setupData()!.secret}
|
||||||
</code>
|
</code>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Backup Codes */}
|
{/* Backup Codes */}
|
||||||
<div>
|
<div>
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">Backup Codes</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">Backup Codes</h4>
|
||||||
<p class="text-sm text-gray-400 mb-3">
|
<p class="text-sm text-muted-foreground mb-3">
|
||||||
Save these backup codes in a secure location. You can use them to access your account if you lose your TOTP device.
|
Save these backup codes in a secure location. You can use them to access your account if you lose your TOTP device.
|
||||||
</p>
|
</p>
|
||||||
<div class="grid grid-cols-2 gap-2">
|
<div class="grid grid-cols-2 gap-2">
|
||||||
{backupCodes().map((code) => (
|
<For each={backupCodes()}>
|
||||||
<code class="bg-gray-800 px-3 py-2 rounded text-gray-300 text-sm">
|
{(code) => (
|
||||||
{code}
|
<code class="bg-muted px-3 py-2 rounded text-foreground text-sm">
|
||||||
</code>
|
{code}
|
||||||
))}
|
</code>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Verification */}
|
{/* Verification */}
|
||||||
<div>
|
<div>
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">Verify Setup</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">Verify Setup</h4>
|
||||||
<div class="space-y-4">
|
<div class="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-300 mb-2">
|
<label class="block text-sm font-medium text-muted-foreground mb-2">
|
||||||
Enter 6-digit code
|
Enter 6-digit code
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
value={verifyCode()}
|
value={verifyCode()}
|
||||||
onInput={(e) => setVerifyCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
onInput={(e) => setVerifyCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="000000"
|
placeholder="000000"
|
||||||
maxlength={6}
|
maxlength={6}
|
||||||
/>
|
/>
|
||||||
@@ -413,7 +414,7 @@ export function TwoFactorAuth() {
|
|||||||
<Button
|
<Button
|
||||||
onClick={enableTOTP}
|
onClick={enableTOTP}
|
||||||
disabled={loading() || verifyCode().length !== 6}
|
disabled={loading() || verifyCode().length !== 6}
|
||||||
variant="papra"
|
variant="secondary"
|
||||||
class="flex-1"
|
class="flex-1"
|
||||||
>
|
>
|
||||||
{loading() ? 'Enabling...' : 'Enable 2FA'}
|
{loading() ? 'Enabling...' : 'Enable 2FA'}
|
||||||
@@ -422,41 +423,41 @@ export function TwoFactorAuth() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
{/* Disable 2FA */}
|
{/* Disable 2FA */}
|
||||||
<Show when={totpStatus()?.enabled}>
|
<Show when={totpStatus()?.enabled}>
|
||||||
<Card class="p-6">
|
<div class="border rounded-lg p-6">
|
||||||
<h3 class="text-lg font-semibold text-white mb-4">Disable Two-Factor Authentication</h3>
|
<h3 class="text-lg font-semibold text-foreground mb-4">Disable Two-Factor Authentication</h3>
|
||||||
<p class="text-gray-300 mb-4">
|
<p class="text-muted-foreground mb-4">
|
||||||
Disabling 2FA will make your account less secure. You'll need to provide your current TOTP code and password.
|
Disabling 2FA will make your account less secure. You'll need to provide your current TOTP code and password.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div class="space-y-4">
|
<div class="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-300 mb-2">
|
<label class="block text-sm font-medium text-muted-foreground mb-2">
|
||||||
TOTP Code
|
TOTP Code
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
value={disableCode()}
|
value={disableCode()}
|
||||||
onInput={(e) => setDisableCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
onInput={(e) => setDisableCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="000000"
|
placeholder="000000"
|
||||||
maxlength={6}
|
maxlength={6}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-gray-300 mb-2">
|
<label class="block text-sm font-medium text-muted-foreground mb-2">
|
||||||
Password
|
Password
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
value={disablePassword()}
|
value={disablePassword()}
|
||||||
onInput={(e) => setDisablePassword(e.currentTarget.value)}
|
onInput={(e) => setDisablePassword(e.currentTarget.value)}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="Enter your password"
|
placeholder="Enter your password"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -470,24 +471,24 @@ export function TwoFactorAuth() {
|
|||||||
{loading() ? 'Disabling...' : 'Disable 2FA'}
|
{loading() ? 'Disabling...' : 'Disable 2FA'}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
{/* Backup Code Management */}
|
{/* Backup Code Management */}
|
||||||
<Show when={totpStatus()?.enabled}>
|
<Show when={totpStatus()?.enabled}>
|
||||||
<Card class="p-6">
|
<div class="border rounded-lg p-6">
|
||||||
<h3 class="text-lg font-semibold text-white mb-4">Backup Code Management</h3>
|
<h3 class="text-lg font-semibold text-foreground mb-4">Backup Code Management</h3>
|
||||||
|
|
||||||
<div class="space-y-6">
|
<div class="space-y-6">
|
||||||
{/* Verify Backup Code */}
|
{/* Verify Backup Code */}
|
||||||
<div>
|
<div>
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">Verify Backup Code</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">Verify Backup Code</h4>
|
||||||
<div class="space-y-4">
|
<div class="space-y-4">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
value={backupCodeVerify()}
|
value={backupCodeVerify()}
|
||||||
onInput={(e) => setBackupCodeVerify(e.currentTarget.value)}
|
onInput={(e) => setBackupCodeVerify(e.currentTarget.value)}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="Enter backup code"
|
placeholder="Enter backup code"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -503,8 +504,8 @@ export function TwoFactorAuth() {
|
|||||||
|
|
||||||
{/* Regenerate Backup Codes */}
|
{/* Regenerate Backup Codes */}
|
||||||
<div>
|
<div>
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">Regenerate Backup Codes</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">Regenerate Backup Codes</h4>
|
||||||
<p class="text-sm text-gray-400 mb-3">
|
<p class="text-sm text-muted-foreground mb-3">
|
||||||
This will invalidate all existing backup codes and generate new ones.
|
This will invalidate all existing backup codes and generate new ones.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -513,7 +514,7 @@ export function TwoFactorAuth() {
|
|||||||
type="text"
|
type="text"
|
||||||
value={regenerateCode()}
|
value={regenerateCode()}
|
||||||
onInput={(e) => setRegenerateCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
onInput={(e) => setRegenerateCode(e.currentTarget.value.replace(/\D/g, '').slice(0, 6))}
|
||||||
class="w-full px-3 py-2 bg-gray-700 border border-gray-600 rounded-lg text-white focus:outline-none focus:ring-2 focus:ring-blue-500"
|
class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring"
|
||||||
placeholder="Current TOTP code"
|
placeholder="Current TOTP code"
|
||||||
maxlength={6}
|
maxlength={6}
|
||||||
/>
|
/>
|
||||||
@@ -532,21 +533,23 @@ export function TwoFactorAuth() {
|
|||||||
{/* Show New Backup Codes */}
|
{/* Show New Backup Codes */}
|
||||||
<Show when={backupCodes().length > 0}>
|
<Show when={backupCodes().length > 0}>
|
||||||
<div>
|
<div>
|
||||||
<h4 class="text-md font-medium text-gray-300 mb-3">New Backup Codes</h4>
|
<h4 class="text-md font-medium text-foreground mb-3">New Backup Codes</h4>
|
||||||
<p class="text-sm text-gray-400 mb-3">
|
<p class="text-sm text-muted-foreground mb-3">
|
||||||
Save these new backup codes in a secure location:
|
Save these new backup codes in a secure location:
|
||||||
</p>
|
</p>
|
||||||
<div class="grid grid-cols-2 gap-2">
|
<div class="grid grid-cols-2 gap-2">
|
||||||
{backupCodes().map((code) => (
|
<For each={backupCodes()}>
|
||||||
<code class="bg-gray-800 px-3 py-2 rounded text-gray-300 text-sm">
|
{(code) => (
|
||||||
{code}
|
<code class="bg-muted px-3 py-2 rounded text-foreground text-sm">
|
||||||
</code>
|
{code}
|
||||||
))}
|
</code>
|
||||||
|
)}
|
||||||
|
</For>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</div>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -112,22 +112,27 @@ export function AIChatPanel(props: AIChatPanelProps) {
|
|||||||
{(message) => (
|
{(message) => (
|
||||||
<div class={`flex gap-3 ${message.role === 'user' ? 'justify-end' : 'justify-start'}`}>
|
<div class={`flex gap-3 ${message.role === 'user' ? 'justify-end' : 'justify-start'}`}>
|
||||||
{message.role === 'assistant' && (
|
{message.role === 'assistant' && (
|
||||||
<div class="flex items-center justify-center p-2 rounded-lg bg-muted flex-shrink-0">
|
<div class="flex items-center justify-center p-2 rounded-lg bg-gradient-to-br from-muted to-muted/90 border border-border/50 flex-shrink-0 shadow-sm">
|
||||||
<IconBrain class="size-4 text-primary" />
|
<IconBrain class="size-4 text-primary animate-pulse" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div class={`max-w-[280px] rounded-2xl p-3 ${
|
<div class={`max-w-[280px] rounded-2xl p-3 shadow-sm transition-all duration-200 hover:shadow-md ${
|
||||||
message.role === 'user'
|
message.role === 'user'
|
||||||
? 'bg-primary text-primary-foreground rounded-br-sm'
|
? 'bg-gradient-to-br from-primary to-primary/90 text-primary-foreground rounded-br-sm ml-auto'
|
||||||
: 'bg-muted rounded-bl-sm'
|
: 'bg-gradient-to-br from-muted to-muted/90 border border-border/50 rounded-bl-sm'
|
||||||
}`}>
|
}`}>
|
||||||
<p class="text-sm leading-relaxed">{message.content}</p>
|
<p class="text-sm leading-relaxed">{message.content}</p>
|
||||||
<p class="text-xs opacity-70 mt-2">
|
<div class="flex items-center justify-between mt-2">
|
||||||
{message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
|
<p class="text-xs opacity-70">
|
||||||
</p>
|
{message.timestamp.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}
|
||||||
|
</p>
|
||||||
|
{message.role === 'user' && (
|
||||||
|
<div class="w-1.5 h-1.5 bg-primary-foreground/50 rounded-full"></div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{message.role === 'user' && (
|
{message.role === 'user' && (
|
||||||
<div class="flex items-center justify-center p-2 rounded-lg bg-primary flex-shrink-0">
|
<div class="flex items-center justify-center p-2 rounded-lg bg-gradient-to-br from-primary to-primary/90 flex-shrink-0 shadow-sm">
|
||||||
<IconUser class="size-4 text-primary-foreground" />
|
<IconUser class="size-4 text-primary-foreground" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -145,12 +150,12 @@ export function AIChatPanel(props: AIChatPanelProps) {
|
|||||||
onInput={(e) => setInputValue(e.currentTarget.value)}
|
onInput={(e) => setInputValue(e.currentTarget.value)}
|
||||||
onKeyPress={handleKeyPress}
|
onKeyPress={handleKeyPress}
|
||||||
placeholder="Type your message..."
|
placeholder="Type your message..."
|
||||||
class="flex-1 h-10 w-full rounded-full border border-input bg-transparent px-4 py-2 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
|
class="flex-1 h-10 w-full rounded-full border border-border/50 bg-background/95 backdrop-blur-sm px-4 py-2 text-sm shadow-sm transition-all duration-200 focus:shadow-md focus:border-primary/50 placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/20 disabled:cursor-not-allowed disabled:opacity-50"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
onClick={handleSendMessage}
|
onClick={handleSendMessage}
|
||||||
disabled={!inputValue().trim()}
|
disabled={!inputValue().trim()}
|
||||||
class="inline-flex items-center justify-center rounded-full text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-primary text-primary-foreground shadow hover:bg-primary/90 h-10 w-10"
|
class="inline-flex items-center justify-center rounded-full text-sm font-medium transition-all duration-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary/20 disabled:pointer-events-none disabled:opacity-50 bg-gradient-to-r from-primary to-primary/90 text-primary-foreground shadow-sm hover:shadow-md hover:from-primary/90 hover:to-primary h-10 w-10 disabled:cursor-not-allowed"
|
||||||
>
|
>
|
||||||
<IconSend class="size-4 text-primary-foreground" />
|
<IconSend class="size-4 text-primary-foreground" />
|
||||||
</button>
|
</button>
|
||||||
@@ -176,7 +181,7 @@ export function AIChatPanel(props: AIChatPanelProps) {
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Show when={showModelPicker()}>
|
<Show when={showModelPicker()}>
|
||||||
<div class="absolute bottom-full left-0 mb-2 w-64 bg-background border rounded-lg shadow-lg z-50 p-1 max-h-48 overflow-y-auto">
|
<div class="absolute bottom-full left-0 mb-2 w-64 bg-gradient-to-b from-background to-background/95 backdrop-blur-sm border border-border/50 rounded-xl shadow-lg z-50 p-1 max-h-48 overflow-y-auto">
|
||||||
<For each={aiModels}>
|
<For each={aiModels}>
|
||||||
{model => (
|
{model => (
|
||||||
<button
|
<button
|
||||||
@@ -184,10 +189,10 @@ export function AIChatPanel(props: AIChatPanelProps) {
|
|||||||
setSelectedModel(model.id)
|
setSelectedModel(model.id)
|
||||||
setShowModelPicker(false)
|
setShowModelPicker(false)
|
||||||
}}
|
}}
|
||||||
class={`w-full text-left p-2 rounded text-xs transition-colors ${
|
class={`w-full text-left p-2 rounded-lg text-xs transition-all duration-200 ${
|
||||||
selectedModel() === model.id
|
selectedModel() === model.id
|
||||||
? 'bg-primary/10 border border-primary/20'
|
? 'bg-gradient-to-r from-primary/10 to-primary/5 border border-primary/20'
|
||||||
: 'hover:bg-muted'
|
: 'hover:bg-muted/50'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { createSignal, Show } from 'solid-js'
|
import { createSignal, Show } from 'solid-js'
|
||||||
import { IconX, IconSend, IconUser, IconChevronDown } from '@tabler/icons-solidjs'
|
import { IconX, IconSend, IconUser, IconChevronDown } from '@tabler/icons-solidjs'
|
||||||
import longcatIcon from '@/assets/longcat-color.svg'
|
import longcatIcon from '@/assets/longcat-color.svg'
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal'
|
||||||
|
|
||||||
interface FloatingAIProps {
|
interface FloatingAIProps {
|
||||||
onToggleChat: () => void
|
onToggleChat: () => void
|
||||||
@@ -79,8 +80,9 @@ export function FloatingAI(props: FloatingAIProps) {
|
|||||||
|
|
||||||
{/* AI Chat Modal */}
|
{/* AI Chat Modal */}
|
||||||
<Show when={props.isChatOpen}>
|
<Show when={props.isChatOpen}>
|
||||||
<div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50 mt-0 p-4">
|
<ModalPortal>
|
||||||
<div class="bg-card border border-border rounded-lg shadow-xl max-w-md w-full max-h-[600px] flex flex-col" style="width: 420px;">
|
<div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4">
|
||||||
|
<div class="bg-card border border-border rounded-lg shadow-xl max-w-md w-full max-h-[600px] flex flex-col" style="width: 420px;">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-4 border-b border-border bg-gradient-to-r from-primary/10 to-primary/5">
|
<div class="flex items-center justify-between p-4 border-b border-border bg-gradient-to-r from-primary/10 to-primary/5">
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
@@ -177,8 +179,9 @@ export function FloatingAI(props: FloatingAIProps) {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</ModalPortal>
|
||||||
</Show>
|
</Show>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -56,6 +56,18 @@ export function Header(props: HeaderProps) {
|
|||||||
<div class="flex justify-between px-6 pt-4 pb-4">
|
<div class="flex justify-between px-6 pt-4 pb-4">
|
||||||
{/* Left side */}
|
{/* Left side */}
|
||||||
<div class="flex items-center">
|
<div class="flex items-center">
|
||||||
|
<a
|
||||||
|
href="/app"
|
||||||
|
class="hidden sm:inline-flex items-center gap-2 rounded-md px-2 py-1.5 mr-2 hover:bg-accent/40 transition-colors"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
src="/trackeep.svg"
|
||||||
|
alt="Trackeep Logo"
|
||||||
|
class="w-6 h-6 app-logo-mono"
|
||||||
|
/>
|
||||||
|
<span class="text-sm font-semibold tracking-tight text-foreground">Trackeep</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
{/* Menu button */}
|
{/* Menu button */}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -14,9 +14,16 @@ export interface LayoutProps {
|
|||||||
export function Layout(props: LayoutProps) {
|
export function Layout(props: LayoutProps) {
|
||||||
const resolved = children(() => props.children)
|
const resolved = children(() => props.children)
|
||||||
const [isChatOpen, setIsChatOpen] = createSignal(false)
|
const [isChatOpen, setIsChatOpen] = createSignal(false)
|
||||||
const [isSidebarOpen, setIsSidebarOpen] = createSignal(false)
|
const [isSidebarOpen, setIsSidebarOpen] = createSignal(true)
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
|
const savedSidebarState = localStorage.getItem('trackeep_sidebar_open')
|
||||||
|
if (savedSidebarState !== null) {
|
||||||
|
setIsSidebarOpen(savedSidebarState === 'true')
|
||||||
|
} else {
|
||||||
|
setIsSidebarOpen(window.innerWidth >= 768)
|
||||||
|
}
|
||||||
|
|
||||||
// Initialize dark mode from localStorage or system preference
|
// Initialize dark mode from localStorage or system preference
|
||||||
const savedTheme = localStorage.getItem('theme')
|
const savedTheme = localStorage.getItem('theme')
|
||||||
const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
const systemPrefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
|
||||||
@@ -143,11 +150,14 @@ export function Layout(props: LayoutProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const toggleSidebar = () => {
|
const toggleSidebar = () => {
|
||||||
setIsSidebarOpen(!isSidebarOpen())
|
const nextValue = !isSidebarOpen()
|
||||||
|
setIsSidebarOpen(nextValue)
|
||||||
|
localStorage.setItem('trackeep_sidebar_open', String(nextValue))
|
||||||
}
|
}
|
||||||
|
|
||||||
const closeSidebar = () => {
|
const closeSidebar = () => {
|
||||||
setIsSidebarOpen(false)
|
setIsSidebarOpen(false)
|
||||||
|
localStorage.setItem('trackeep_sidebar_open', 'false')
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -157,7 +167,7 @@ export function Layout(props: LayoutProps) {
|
|||||||
{/* Mobile Sidebar Overlay */}
|
{/* Mobile Sidebar Overlay */}
|
||||||
{isSidebarOpen() && (
|
{isSidebarOpen() && (
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 bg-black/50 z-40"
|
class="fixed inset-0 bg-black/50 z-40 md:hidden"
|
||||||
onClick={closeSidebar}
|
onClick={closeSidebar}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { For, createSignal, onMount, Show } from 'solid-js'
|
import { For, createSignal, onCleanup, onMount, Show } from 'solid-js'
|
||||||
import { A, useLocation } from '@solidjs/router'
|
import { A, useLocation } from '@solidjs/router'
|
||||||
import {
|
import {
|
||||||
IconBookmark,
|
IconBookmark,
|
||||||
@@ -21,10 +21,14 @@ import {
|
|||||||
IconMessageCircle,
|
IconMessageCircle,
|
||||||
IconLogout,
|
IconLogout,
|
||||||
IconBuilding,
|
IconBuilding,
|
||||||
IconPlus,
|
IconPlus
|
||||||
IconX
|
|
||||||
} from '@tabler/icons-solidjs'
|
} from '@tabler/icons-solidjs'
|
||||||
import { UpdateChecker } from '../ui/UpdateChecker'
|
import { Input } from '../ui/Input'
|
||||||
|
import { Button } from '../ui/Button'
|
||||||
|
import { Switch } from '../ui/Switch'
|
||||||
|
import { ModalPortal } from '../ui/ModalPortal'
|
||||||
|
import { useAuth } from '@/lib/auth'
|
||||||
|
import { getApiV1BaseUrl } from '@/lib/api-url'
|
||||||
|
|
||||||
const navigation = [
|
const navigation = [
|
||||||
{ name: 'Home', href: '/app', icon: IconHome },
|
{ name: 'Home', href: '/app', icon: IconHome },
|
||||||
@@ -43,11 +47,23 @@ const navigation = [
|
|||||||
{ name: 'AI Assistant', href: '/app/chat', icon: IconBrain },
|
{ name: 'AI Assistant', href: '/app/chat', icon: IconBrain },
|
||||||
]
|
]
|
||||||
|
|
||||||
const mockWorkspaces = [
|
const API_BASE_URL = getApiV1BaseUrl()
|
||||||
{ id: '1', name: 'Trackeep Workspace', icon: IconFileText },
|
const DEFAULT_WORKSPACE_NAME = 'Trackeep Workspace'
|
||||||
{ id: '2', name: 'Personal Projects', icon: IconBuilding },
|
|
||||||
{ id: '3', name: 'Team Collaboration', icon: IconUsers },
|
interface WorkspaceOption {
|
||||||
]
|
id: string
|
||||||
|
name: string
|
||||||
|
icon: typeof IconFileText
|
||||||
|
}
|
||||||
|
|
||||||
|
const getWorkspaceIcon = (name: string) => {
|
||||||
|
const lower = name.toLowerCase()
|
||||||
|
if (lower.includes('team')) return IconUsers
|
||||||
|
if (lower.includes('personal')) return IconBuilding
|
||||||
|
return IconFileText
|
||||||
|
}
|
||||||
|
|
||||||
|
const getAuthToken = () => localStorage.getItem('trackeep_token') || localStorage.getItem('token') || ''
|
||||||
|
|
||||||
export interface SidebarProps {
|
export interface SidebarProps {
|
||||||
class?: string
|
class?: string
|
||||||
@@ -57,8 +73,35 @@ export interface SidebarProps {
|
|||||||
|
|
||||||
export function Sidebar(props: SidebarProps) {
|
export function Sidebar(props: SidebarProps) {
|
||||||
const location = useLocation()
|
const location = useLocation()
|
||||||
|
const { logout } = useAuth()
|
||||||
const [isWorkspaceDropdownOpen, setIsWorkspaceDropdownOpen] = createSignal(false)
|
const [isWorkspaceDropdownOpen, setIsWorkspaceDropdownOpen] = createSignal(false)
|
||||||
const [selectedWorkspace, setSelectedWorkspace] = createSignal(mockWorkspaces[0])
|
const [workspaces, setWorkspaces] = createSignal<WorkspaceOption[]>([])
|
||||||
|
const [selectedWorkspaceId, setSelectedWorkspaceId] = createSignal<string>('')
|
||||||
|
const [isCreateWorkspaceModalOpen, setIsCreateWorkspaceModalOpen] = createSignal(false)
|
||||||
|
const [workspaceName, setWorkspaceName] = createSignal('')
|
||||||
|
const [workspaceDescription, setWorkspaceDescription] = createSignal('')
|
||||||
|
const [workspaceIsPublic, setWorkspaceIsPublic] = createSignal(false)
|
||||||
|
const [isCreatingWorkspace, setIsCreatingWorkspace] = createSignal(false)
|
||||||
|
const [createWorkspaceError, setCreateWorkspaceError] = createSignal('')
|
||||||
|
|
||||||
|
const selectedWorkspace = () => {
|
||||||
|
const list = workspaces()
|
||||||
|
const found = list.find((workspace) => workspace.id === selectedWorkspaceId())
|
||||||
|
return found || list[0] || { id: 'default', name: DEFAULT_WORKSPACE_NAME, icon: IconFileText }
|
||||||
|
}
|
||||||
|
|
||||||
|
const persistSelectedWorkspace = (workspace: WorkspaceOption) => {
|
||||||
|
localStorage.setItem('trackeep_workspace_id', workspace.id)
|
||||||
|
localStorage.setItem('trackeep_workspace_name', workspace.name)
|
||||||
|
window.dispatchEvent(
|
||||||
|
new CustomEvent('trackeep:workspace-changed', {
|
||||||
|
detail: {
|
||||||
|
id: workspace.id,
|
||||||
|
name: workspace.name,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const isActive = (href: string) => {
|
const isActive = (href: string) => {
|
||||||
const currentPath = location.pathname
|
const currentPath = location.pathname
|
||||||
@@ -66,17 +109,206 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
return currentPath === href
|
return currentPath === href
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleWorkspaceSelect = (workspace: typeof mockWorkspaces[0]) => {
|
const handleWorkspaceSelect = (workspace: WorkspaceOption) => {
|
||||||
setSelectedWorkspace(workspace)
|
setSelectedWorkspaceId(workspace.id)
|
||||||
|
persistSelectedWorkspace(workspace)
|
||||||
setIsWorkspaceDropdownOpen(false)
|
setIsWorkspaceDropdownOpen(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const resetCreateWorkspaceForm = () => {
|
||||||
|
setWorkspaceName('')
|
||||||
|
setWorkspaceDescription('')
|
||||||
|
setWorkspaceIsPublic(false)
|
||||||
|
setCreateWorkspaceError('')
|
||||||
|
}
|
||||||
|
|
||||||
|
const openCreateWorkspaceModal = () => {
|
||||||
|
setIsWorkspaceDropdownOpen(false)
|
||||||
|
resetCreateWorkspaceForm()
|
||||||
|
setIsCreateWorkspaceModalOpen(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
const closeCreateWorkspaceModal = () => {
|
||||||
|
if (isCreatingWorkspace()) return
|
||||||
|
setIsCreateWorkspaceModalOpen(false)
|
||||||
|
resetCreateWorkspaceForm()
|
||||||
|
}
|
||||||
|
|
||||||
const toggleWorkspaceDropdown = () => {
|
const toggleWorkspaceDropdown = () => {
|
||||||
setIsWorkspaceDropdownOpen(!isWorkspaceDropdownOpen())
|
setIsWorkspaceDropdownOpen(!isWorkspaceDropdownOpen())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const normalizeWorkspace = (team: { id?: number | string; name?: string }): WorkspaceOption => {
|
||||||
|
const name = team.name?.trim() || DEFAULT_WORKSPACE_NAME
|
||||||
|
return {
|
||||||
|
id: String(team.id ?? `workspace-${Date.now()}`),
|
||||||
|
name,
|
||||||
|
icon: getWorkspaceIcon(name),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const createDefaultWorkspace = async (token: string): Promise<WorkspaceOption | null> => {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/teams`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
name: DEFAULT_WORKSPACE_NAME,
|
||||||
|
description: 'Default workspace',
|
||||||
|
is_public: false,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json()
|
||||||
|
if (!data?.team) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalizeWorkspace(data.team)
|
||||||
|
}
|
||||||
|
|
||||||
|
const loadWorkspaces = async () => {
|
||||||
|
const token = getAuthToken()
|
||||||
|
if (!token) {
|
||||||
|
const fallbackWorkspace = {
|
||||||
|
id: 'local-default',
|
||||||
|
name: DEFAULT_WORKSPACE_NAME,
|
||||||
|
icon: IconFileText,
|
||||||
|
}
|
||||||
|
setWorkspaces([fallbackWorkspace])
|
||||||
|
setSelectedWorkspaceId(fallbackWorkspace.id)
|
||||||
|
persistSelectedWorkspace(fallbackWorkspace)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/teams`, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
let mappedWorkspaces: WorkspaceOption[] = []
|
||||||
|
if (response.ok) {
|
||||||
|
const data = await response.json()
|
||||||
|
const teams = Array.isArray(data?.teams) ? data.teams : []
|
||||||
|
mappedWorkspaces = teams.map(normalizeWorkspace)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mappedWorkspaces.length === 0) {
|
||||||
|
const created = await createDefaultWorkspace(token)
|
||||||
|
if (created) {
|
||||||
|
mappedWorkspaces = [created]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mappedWorkspaces.length === 0) {
|
||||||
|
mappedWorkspaces = [
|
||||||
|
{
|
||||||
|
id: 'local-default',
|
||||||
|
name: DEFAULT_WORKSPACE_NAME,
|
||||||
|
icon: IconFileText,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
setWorkspaces(mappedWorkspaces)
|
||||||
|
|
||||||
|
const persistedWorkspaceId = localStorage.getItem('trackeep_workspace_id') || ''
|
||||||
|
const initialSelection =
|
||||||
|
mappedWorkspaces.find((workspace) => workspace.id === persistedWorkspaceId) || mappedWorkspaces[0]
|
||||||
|
|
||||||
|
setSelectedWorkspaceId(initialSelection.id)
|
||||||
|
persistSelectedWorkspace(initialSelection)
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to load workspaces:', error)
|
||||||
|
const fallbackWorkspace = {
|
||||||
|
id: 'local-default',
|
||||||
|
name: DEFAULT_WORKSPACE_NAME,
|
||||||
|
icon: IconFileText,
|
||||||
|
}
|
||||||
|
setWorkspaces([fallbackWorkspace])
|
||||||
|
setSelectedWorkspaceId(fallbackWorkspace.id)
|
||||||
|
persistSelectedWorkspace(fallbackWorkspace)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleCreateWorkspace = async () => {
|
||||||
|
const trimmed = workspaceName().trim()
|
||||||
|
const description = workspaceDescription().trim()
|
||||||
|
const isPublic = workspaceIsPublic()
|
||||||
|
|
||||||
|
if (!trimmed) {
|
||||||
|
setCreateWorkspaceError('Workspace name is required.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setCreateWorkspaceError('')
|
||||||
|
setIsCreatingWorkspace(true)
|
||||||
|
const token = getAuthToken()
|
||||||
|
if (!token) {
|
||||||
|
const localWorkspace = {
|
||||||
|
id: `local-${Date.now()}`,
|
||||||
|
name: trimmed,
|
||||||
|
icon: getWorkspaceIcon(trimmed),
|
||||||
|
}
|
||||||
|
setWorkspaces((prev) => [localWorkspace, ...prev])
|
||||||
|
handleWorkspaceSelect(localWorkspace)
|
||||||
|
setIsCreateWorkspaceModalOpen(false)
|
||||||
|
resetCreateWorkspaceForm()
|
||||||
|
setIsCreatingWorkspace(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${API_BASE_URL}/teams`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
name: trimmed,
|
||||||
|
description,
|
||||||
|
is_public: isPublic,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
let message = `Failed to create workspace: ${response.status}`
|
||||||
|
try {
|
||||||
|
const data = await response.json()
|
||||||
|
message = data?.error || data?.message || message
|
||||||
|
} catch {
|
||||||
|
// Keep fallback message
|
||||||
|
}
|
||||||
|
throw new Error(message)
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json()
|
||||||
|
const createdWorkspace = normalizeWorkspace(data.team)
|
||||||
|
setWorkspaces((prev) => [createdWorkspace, ...prev])
|
||||||
|
handleWorkspaceSelect(createdWorkspace)
|
||||||
|
setIsCreateWorkspaceModalOpen(false)
|
||||||
|
resetCreateWorkspaceForm()
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to create workspace:', error)
|
||||||
|
setCreateWorkspaceError(error instanceof Error ? error.message : 'Failed to create workspace.')
|
||||||
|
} finally {
|
||||||
|
setIsCreatingWorkspace(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Close dropdown when clicking outside
|
// Close dropdown when clicking outside
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
|
void loadWorkspaces()
|
||||||
|
|
||||||
const handleClickOutside = (event: MouseEvent) => {
|
const handleClickOutside = (event: MouseEvent) => {
|
||||||
const target = event.target
|
const target = event.target
|
||||||
if (!(target instanceof HTMLElement)) return
|
if (!(target instanceof HTMLElement)) return
|
||||||
@@ -85,28 +317,34 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
document.addEventListener('click', handleClickOutside)
|
document.addEventListener('click', handleClickOutside)
|
||||||
return () => document.removeEventListener('click', handleClickOutside)
|
onCleanup(() => document.removeEventListener('click', handleClickOutside))
|
||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Mobile Close Button - Above sidebar */}
|
<div
|
||||||
<Show when={props.isOpen}>
|
class={`fixed inset-y-0 left-0 z-50 border-r border-r-border bg-card transition-all duration-300 ease-in-out overflow-hidden md:relative md:inset-y-auto md:left-auto md:transform-none ${
|
||||||
<button
|
props.isOpen ? 'w-[280px] translate-x-0' : 'w-[280px] -translate-x-full md:w-0 md:translate-x-0 md:pointer-events-none'
|
||||||
onClick={props.onClose}
|
}`}
|
||||||
class="fixed top-4 right-4 z-50 md:hidden inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
>
|
||||||
>
|
<div class="w-[280px] h-full flex">
|
||||||
<IconX class="size-4" />
|
|
||||||
</button>
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<div class={`fixed inset-y-0 left-0 z-50 w-280px border-r border-r-border flex-shrink-0 bg-card transform transition-transform duration-300 ease-in-out md:relative md:translate-x-0 ${
|
|
||||||
props.isOpen ? 'translate-x-0' : '-translate-x-full'
|
|
||||||
}`}>
|
|
||||||
<div class="flex h-full">
|
|
||||||
<div class="h-full flex flex-col pb-6 flex-1 min-w-0">
|
<div class="h-full flex flex-col pb-6 flex-1 min-w-0">
|
||||||
|
<div class="px-4 pt-4">
|
||||||
|
<A
|
||||||
|
href="/app"
|
||||||
|
class="flex items-center gap-3 rounded-lg px-2 py-2 hover:bg-accent/40 transition-colors"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
src="/trackeep.svg"
|
||||||
|
alt="Trackeep Logo"
|
||||||
|
class="w-7 h-7 app-logo-mono"
|
||||||
|
/>
|
||||||
|
<span class="font-semibold tracking-tight text-foreground">Trackeep</span>
|
||||||
|
</A>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Organization Selector */}
|
{/* Organization Selector */}
|
||||||
<div class="p-4 pb-0 min-w-0 max-w-full" id="workspace-selector">
|
<div class="p-4 pb-0 pt-3 min-w-0 max-w-full" id="workspace-selector">
|
||||||
<div role="group" class="w-full relative">
|
<div role="group" class="w-full relative">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -133,7 +371,7 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
<Show when={isWorkspaceDropdownOpen()}>
|
<Show when={isWorkspaceDropdownOpen()}>
|
||||||
<div class="absolute top-full left-0 right-0 mt-1 bg-popover border border-border rounded-md shadow-lg z-50 max-h-60 overflow-auto">
|
<div class="absolute top-full left-0 right-0 mt-1 bg-popover border border-border rounded-md shadow-lg z-50 max-h-60 overflow-auto">
|
||||||
<div class="p-1" role="listbox">
|
<div class="p-1" role="listbox">
|
||||||
<For each={mockWorkspaces}>
|
<For each={workspaces()}>
|
||||||
{(workspace) => (
|
{(workspace) => (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -156,6 +394,7 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
<div class="border-t border-border mt-1 pt-1">
|
<div class="border-t border-border mt-1 pt-1">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
onClick={openCreateWorkspaceModal}
|
||||||
class="flex w-full items-center gap-2 px-3 py-2 text-sm rounded-sm hover:bg-accent/50 transition-colors focus:bg-accent/50 focus:outline-none text-muted-foreground"
|
class="flex w-full items-center gap-2 px-3 py-2 text-sm rounded-sm hover:bg-accent/50 transition-colors focus:bg-accent/50 focus:outline-none text-muted-foreground"
|
||||||
>
|
>
|
||||||
<IconPlus class="size-4" />
|
<IconPlus class="size-4" />
|
||||||
@@ -207,11 +446,6 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
{/* Bottom Navigation */}
|
{/* Bottom Navigation */}
|
||||||
<div class="flex-1"></div>
|
<div class="flex-1"></div>
|
||||||
|
|
||||||
{/* Update Checker */}
|
|
||||||
<div class="px-4 mb-2">
|
|
||||||
<UpdateChecker />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav class="flex flex-col gap-0.5 px-4">
|
<nav class="flex flex-col gap-0.5 px-4">
|
||||||
<A
|
<A
|
||||||
href="/app/removed-stuff"
|
href="/app/removed-stuff"
|
||||||
@@ -262,9 +496,8 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
}}></div>
|
}}></div>
|
||||||
</A>
|
</A>
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={async () => {
|
||||||
// Handle logout logic here
|
await logout()
|
||||||
localStorage.removeItem('auth_token')
|
|
||||||
window.location.href = '/login'
|
window.location.href = '/login'
|
||||||
}}
|
}}
|
||||||
class="group inline-flex rounded-md text-sm font-medium transition-all duration-200 focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 h-9 px-4 py-2 justify-start items-center gap-2 truncate w-full relative overflow-hidden hover:bg-destructive/10 hover:text-destructive dark:text-muted-foreground"
|
class="group inline-flex rounded-md text-sm font-medium transition-all duration-200 focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 h-9 px-4 py-2 justify-start items-center gap-2 truncate w-full relative overflow-hidden hover:bg-destructive/10 hover:text-destructive dark:text-muted-foreground"
|
||||||
@@ -279,6 +512,87 @@ export function Sidebar(props: SidebarProps) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Show when={isCreateWorkspaceModalOpen()}>
|
||||||
|
<ModalPortal>
|
||||||
|
<>
|
||||||
|
<div
|
||||||
|
class="fixed inset-0 z-[90] bg-black/50"
|
||||||
|
onClick={closeCreateWorkspaceModal}
|
||||||
|
/>
|
||||||
|
<div class="fixed top-1/2 left-1/2 z-[100] w-full max-w-md -translate-x-1/2 -translate-y-1/2 px-4">
|
||||||
|
<div class="rounded-lg border border-border bg-card shadow-xl">
|
||||||
|
<div class="border-b border-border p-5">
|
||||||
|
<h3 class="text-lg font-semibold text-foreground">Create Workspace</h3>
|
||||||
|
<p class="mt-1 text-sm text-muted-foreground">Add a new workspace for your team or projects.</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="space-y-4 p-5"
|
||||||
|
>
|
||||||
|
<div class="space-y-1.5">
|
||||||
|
<label class="text-sm font-medium text-foreground">
|
||||||
|
Name
|
||||||
|
</label>
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
placeholder="Workspace name"
|
||||||
|
value={workspaceName()}
|
||||||
|
onInput={(event) => setWorkspaceName((event.currentTarget as HTMLInputElement).value)}
|
||||||
|
required
|
||||||
|
disabled={isCreatingWorkspace()}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-1.5">
|
||||||
|
<label class="text-sm font-medium text-foreground" for="workspace-description">
|
||||||
|
Description
|
||||||
|
</label>
|
||||||
|
<textarea
|
||||||
|
id="workspace-description"
|
||||||
|
rows={3}
|
||||||
|
class="flex w-full rounded-md border border-input bg-background px-3 py-2 text-sm text-foreground ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
|
||||||
|
placeholder="Optional description"
|
||||||
|
value={workspaceDescription()}
|
||||||
|
onInput={(event) => setWorkspaceDescription((event.currentTarget as HTMLTextAreaElement).value)}
|
||||||
|
disabled={isCreatingWorkspace()}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex items-center justify-between rounded-md border border-border bg-background px-3 py-2">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm font-medium text-foreground">Public workspace</p>
|
||||||
|
<p class="text-xs text-muted-foreground">Allow all members to discover this workspace.</p>
|
||||||
|
</div>
|
||||||
|
<Switch
|
||||||
|
checked={workspaceIsPublic()}
|
||||||
|
onCheckedChange={setWorkspaceIsPublic}
|
||||||
|
disabled={isCreatingWorkspace()}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Show when={createWorkspaceError()}>
|
||||||
|
<p class="text-sm text-destructive">{createWorkspaceError()}</p>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class="flex justify-end gap-2 pt-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
onClick={closeCreateWorkspaceModal}
|
||||||
|
disabled={isCreatingWorkspace()}
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
<Button onClick={() => void handleCreateWorkspace()} disabled={isCreatingWorkspace()}>
|
||||||
|
{isCreatingWorkspace() ? 'Creating...' : 'Create Workspace'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
</ModalPortal>
|
||||||
|
</Show>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -134,13 +134,14 @@ export const EnhancedSearch = () => {
|
|||||||
|
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
const results = Array.isArray(data?.results) ? data.results : [];
|
||||||
if (resetOffset) {
|
if (resetOffset) {
|
||||||
setSearchResults(data.results);
|
setSearchResults(results);
|
||||||
} else {
|
} else {
|
||||||
setSearchResults(prev => [...prev, ...data.results]);
|
setSearchResults(prev => [...prev, ...results]);
|
||||||
}
|
}
|
||||||
setTotal(data.results.length); // Semantic search doesn't return total count
|
setTotal(results.length); // Semantic search doesn't return total count
|
||||||
setTook(data.took);
|
setTook(Number(data?.took) || 0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Use enhanced full-text search API
|
// Use enhanced full-text search API
|
||||||
@@ -155,14 +156,15 @@ export const EnhancedSearch = () => {
|
|||||||
|
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const data: SearchResponse = await response.json();
|
const data: SearchResponse = await response.json();
|
||||||
|
const results = Array.isArray((data as any)?.results) ? (data as any).results : [];
|
||||||
if (resetOffset) {
|
if (resetOffset) {
|
||||||
setSearchResults(data.results);
|
setSearchResults(results);
|
||||||
} else {
|
} else {
|
||||||
setSearchResults(prev => [...prev, ...data.results]);
|
setSearchResults(prev => [...prev, ...results]);
|
||||||
}
|
}
|
||||||
setTotal(data.total);
|
setTotal(Number((data as any)?.total) || results.length);
|
||||||
setAggregations(data.aggregations);
|
setAggregations((data as any)?.aggregations && typeof (data as any).aggregations === 'object' ? (data as any).aggregations : {});
|
||||||
setTook(data.took);
|
setTook(Number((data as any)?.took) || 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ import {
|
|||||||
IconClock,
|
IconClock,
|
||||||
IconExternalLink
|
IconExternalLink
|
||||||
} from '@tabler/icons-solidjs';
|
} from '@tabler/icons-solidjs';
|
||||||
|
import { getApiV1BaseUrl } from '@/lib/api-url';
|
||||||
|
import { isDemoMode } from '@/lib/demo-mode';
|
||||||
|
import { getMockActivities } from '@/lib/mockData';
|
||||||
|
|
||||||
|
const API_BASE_URL = getApiV1BaseUrl();
|
||||||
|
|
||||||
interface ActivityItem {
|
interface ActivityItem {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -27,6 +32,7 @@ interface ActivityItem {
|
|||||||
language?: string;
|
language?: string;
|
||||||
tags?: string[];
|
tags?: string[];
|
||||||
};
|
};
|
||||||
|
displayTimestamp?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ActivityFeedProps {
|
interface ActivityFeedProps {
|
||||||
@@ -40,6 +46,21 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
const [filter, setFilter] = createSignal<'all' | 'trackeep' | 'github'>('all');
|
const [filter, setFilter] = createSignal<'all' | 'trackeep' | 'github'>('all');
|
||||||
const [loading, setLoading] = createSignal(true);
|
const [loading, setLoading] = createSignal(true);
|
||||||
|
|
||||||
|
const normalizeActivityType = (type: string): ActivityItem['type'] => {
|
||||||
|
if (type === 'bookmark' || type === 'task' || type === 'note' || type === 'file') {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
return 'task';
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatTimestamp = (value: string): string => {
|
||||||
|
const parsed = new Date(value);
|
||||||
|
if (Number.isNaN(parsed.getTime())) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
return parsed.toISOString().split('T')[0];
|
||||||
|
};
|
||||||
|
|
||||||
const getActivityIcon = (type: string) => {
|
const getActivityIcon = (type: string) => {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'bookmark': return IconBookmark;
|
case 'bookmark': return IconBookmark;
|
||||||
@@ -57,79 +78,73 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
const fetchActivities = async () => {
|
const fetchActivities = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
|
||||||
// Import mock data for demo mode
|
|
||||||
const { getMockActivities } = await import('@/lib/mockData');
|
|
||||||
|
|
||||||
// Combine and format activities
|
|
||||||
const combinedActivities: ActivityItem[] = [];
|
const combinedActivities: ActivityItem[] = [];
|
||||||
|
|
||||||
// Add Trackeep activities from mock data
|
// Use demo data if in demo mode
|
||||||
const mockActivities = getMockActivities();
|
if (isDemoMode()) {
|
||||||
const now = new Date();
|
const mockActivities = getMockActivities();
|
||||||
|
|
||||||
mockActivities.forEach((activity, index) => {
|
|
||||||
// Create realistic timestamps
|
|
||||||
const timestamp = new Date(now.getTime() - (index * 3600000)); // Each activity 1 hour apart
|
|
||||||
|
|
||||||
|
mockActivities.forEach((activity, index) => {
|
||||||
|
combinedActivities.push({
|
||||||
|
id: String(activity.id ?? `activity-${index}`),
|
||||||
|
type: normalizeActivityType(activity.type || ''),
|
||||||
|
title: activity.title || 'Activity',
|
||||||
|
description: activity.action || 'trackeep',
|
||||||
|
timestamp: activity.timestamp || new Date().toISOString(),
|
||||||
|
displayTimestamp: activity.timestamp || '',
|
||||||
|
source: 'trackeep',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// Sort by timestamp (most recent first)
|
||||||
|
combinedActivities.sort((a, b) =>
|
||||||
|
new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime()
|
||||||
|
);
|
||||||
|
|
||||||
|
// Apply filter
|
||||||
|
const filteredActivities = filter() === 'all'
|
||||||
|
? combinedActivities
|
||||||
|
: combinedActivities.filter(a => a.source === filter());
|
||||||
|
|
||||||
|
// Apply limit
|
||||||
|
const limitedActivities = props.limit
|
||||||
|
? filteredActivities.slice(0, props.limit)
|
||||||
|
: filteredActivities;
|
||||||
|
|
||||||
|
setActivities(limitedActivities);
|
||||||
|
setLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const token = localStorage.getItem('trackeep_token') || localStorage.getItem('token');
|
||||||
|
const response = await fetch(`${API_BASE_URL}/dashboard/stats`, {
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
...(token ? { Authorization: `Bearer ${token}` } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch activities: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const data = await response.json();
|
||||||
|
const recentActivities: Array<{ id?: number; type?: string; title?: string; timestamp?: string }> = Array.isArray(data.recentActivity)
|
||||||
|
? data.recentActivity
|
||||||
|
: [];
|
||||||
|
|
||||||
|
recentActivities.forEach((activity, index) => {
|
||||||
combinedActivities.push({
|
combinedActivities.push({
|
||||||
id: activity.id,
|
id: String(activity.id ?? `activity-${index}`),
|
||||||
type: activity.type as any,
|
type: normalizeActivityType(activity.type || ''),
|
||||||
title: activity.title,
|
title: activity.title || 'Activity',
|
||||||
description: `${activity.action} ${activity.type}`,
|
description: activity.type || 'trackeep',
|
||||||
timestamp: timestamp.toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
source: 'trackeep' as const,
|
displayTimestamp: activity.timestamp || '',
|
||||||
metadata: {
|
source: 'trackeep',
|
||||||
tags: activity.details?.tags ? Object.keys(activity.details.tags) : undefined
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add some GitHub-style activities
|
|
||||||
const githubActivities = [
|
|
||||||
{
|
|
||||||
id: 'github_1',
|
|
||||||
type: 'github_commit' as const,
|
|
||||||
title: 'Fixed responsive design issues',
|
|
||||||
description: 'Resolved mobile layout problems on dashboard',
|
|
||||||
timestamp: new Date(now.getTime() - 2 * 3600000).toISOString(),
|
|
||||||
source: 'github' as const,
|
|
||||||
metadata: {
|
|
||||||
repo: 'tdvorak/trackeep',
|
|
||||||
url: 'https://github.com/tdvorak/trackeep/commit/abc123',
|
|
||||||
branch: 'main',
|
|
||||||
language: 'Go'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'github_2',
|
|
||||||
type: 'github_pr' as const,
|
|
||||||
title: 'Add AI chat integration',
|
|
||||||
description: 'Implement LongCat AI provider with model switching',
|
|
||||||
timestamp: new Date(now.getTime() - 5 * 3600000).toISOString(),
|
|
||||||
source: 'github' as const,
|
|
||||||
metadata: {
|
|
||||||
repo: 'tdvorak/trackeep',
|
|
||||||
url: 'https://github.com/tdvorak/trackeep/pull/42',
|
|
||||||
branch: 'feature/ai-chat',
|
|
||||||
language: 'TypeScript'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 'github_3',
|
|
||||||
type: 'github_star' as const,
|
|
||||||
title: 'trackeep gained new stars',
|
|
||||||
description: 'Repository reached 245 stars',
|
|
||||||
timestamp: new Date(now.getTime() - 8 * 3600000).toISOString(),
|
|
||||||
source: 'github' as const,
|
|
||||||
metadata: {
|
|
||||||
repo: 'tdvorak/trackeep',
|
|
||||||
url: 'https://github.com/tdvorak/trackeep'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
combinedActivities.push(...githubActivities);
|
|
||||||
|
|
||||||
// Sort by timestamp (most recent first)
|
// Sort by timestamp (most recent first)
|
||||||
combinedActivities.sort((a, b) =>
|
combinedActivities.sort((a, b) =>
|
||||||
@@ -149,6 +164,7 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
setActivities(limitedActivities);
|
setActivities(limitedActivities);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to fetch activities:', error);
|
console.error('Failed to fetch activities:', error);
|
||||||
|
setActivities([]);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -179,7 +195,10 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
{props.showFilter && (
|
{props.showFilter && (
|
||||||
<div class="flex gap-2">
|
<div class="flex gap-2">
|
||||||
<button
|
<button
|
||||||
onClick={() => setFilter('all')}
|
onClick={() => {
|
||||||
|
setFilter('all');
|
||||||
|
fetchActivities();
|
||||||
|
}}
|
||||||
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
||||||
filter() === 'all'
|
filter() === 'all'
|
||||||
? 'bg-[#262626] text-[#fafafa]'
|
? 'bg-[#262626] text-[#fafafa]'
|
||||||
@@ -189,7 +208,10 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
All
|
All
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => setFilter('trackeep')}
|
onClick={() => {
|
||||||
|
setFilter('trackeep');
|
||||||
|
fetchActivities();
|
||||||
|
}}
|
||||||
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
||||||
filter() === 'trackeep'
|
filter() === 'trackeep'
|
||||||
? 'bg-[#262626] text-[#fafafa]'
|
? 'bg-[#262626] text-[#fafafa]'
|
||||||
@@ -199,7 +221,10 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
Trackeep
|
Trackeep
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => setFilter('github')}
|
onClick={() => {
|
||||||
|
setFilter('github');
|
||||||
|
fetchActivities();
|
||||||
|
}}
|
||||||
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
class={`px-3 py-1 rounded-lg text-sm transition-colors ${
|
||||||
filter() === 'github'
|
filter() === 'github'
|
||||||
? 'bg-[#262626] text-[#fafafa]'
|
? 'bg-[#262626] text-[#fafafa]'
|
||||||
@@ -220,68 +245,70 @@ export const ActivityFeed = (props: ActivityFeedProps) => {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Activity List */}
|
{/* Activity List */}
|
||||||
<div class="space-y-3 flex-1 min-h-0 overflow-y-auto max-h-96 scrollbar-thin scrollbar-thumb-border scrollbar-track-transparent">
|
{activities().length > 0 && (
|
||||||
<For each={activities()}>
|
<div class="space-y-3 flex-1 min-h-0 overflow-y-auto max-h-96 scrollbar-thin scrollbar-thumb-border scrollbar-track-transparent">
|
||||||
{(activity) => {
|
<For each={activities()}>
|
||||||
const Icon = getActivityIcon(activity.type);
|
{(activity) => {
|
||||||
|
const Icon = getActivityIcon(activity.type);
|
||||||
return (
|
|
||||||
<div class="flex items-center justify-between p-3 bg-card rounded-lg border hover:bg-muted/50 transition-colors">
|
return (
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center justify-between p-3 bg-card rounded-lg border hover:bg-muted/50 transition-colors">
|
||||||
<div class="bg-primary/10 p-2 rounded-lg">
|
<div class="flex items-center gap-3">
|
||||||
<Icon class="size-4 text-primary" />
|
<div class="bg-primary/10 p-2 rounded-lg">
|
||||||
</div>
|
<Icon class="size-4 text-primary" />
|
||||||
<div class="flex-1">
|
</div>
|
||||||
<p class="text-sm text-foreground font-medium">
|
<div class="flex-1">
|
||||||
{activity.title}
|
<p class="text-sm text-foreground font-medium">
|
||||||
</p>
|
{activity.title}
|
||||||
<div class="flex items-center gap-2 text-xs text-muted-foreground mt-1">
|
</p>
|
||||||
<span>{new Date(activity.timestamp).toISOString().split('T')[0]}</span>
|
<div class="flex items-center gap-2 text-xs text-muted-foreground mt-1">
|
||||||
<span>•</span>
|
<span>{activity.displayTimestamp || formatTimestamp(activity.timestamp)}</span>
|
||||||
<span class="text-primary">
|
<span>•</span>
|
||||||
{activity.source === 'github'
|
<span class="text-primary">
|
||||||
? (activity.metadata?.repo?.split('/').pop() || 'GitHub')
|
{activity.source === 'github'
|
||||||
: 'trackeep'}
|
? (activity.metadata?.repo?.split('/').pop() || 'GitHub')
|
||||||
</span>
|
: 'trackeep'}
|
||||||
<span>•</span>
|
</span>
|
||||||
<span>
|
<span>•</span>
|
||||||
{activity.source === 'github'
|
<span>
|
||||||
? activity.type === 'github_commit'
|
{activity.source === 'github'
|
||||||
? 'pushed'
|
? activity.type === 'github_commit'
|
||||||
: activity.type === 'github_pr'
|
? 'pushed'
|
||||||
? 'opened PR'
|
: activity.type === 'github_pr'
|
||||||
: activity.type === 'github_star'
|
? 'opened PR'
|
||||||
? 'starred'
|
: activity.type === 'github_star'
|
||||||
: activity.type === 'github_fork'
|
? 'starred'
|
||||||
? 'forked'
|
: activity.type === 'github_fork'
|
||||||
: 'activity'
|
? 'forked'
|
||||||
: activity.description || activity.type}
|
: 'activity'
|
||||||
</span>
|
: activity.description || activity.type}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{activity.metadata?.url && (
|
||||||
|
<a
|
||||||
|
href={activity.metadata.url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8 ml-2"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
|
<IconExternalLink class="size-4 text-primary" />
|
||||||
|
</a>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{activity.metadata?.url && (
|
);
|
||||||
<a
|
}}
|
||||||
href={activity.metadata.url}
|
</For>
|
||||||
target="_blank"
|
</div>
|
||||||
rel="noopener noreferrer"
|
)}
|
||||||
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8 ml-2"
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
|
||||||
<IconExternalLink class="size-4 text-primary" />
|
|
||||||
</a>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}}
|
|
||||||
</For>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Empty State */}
|
{/* Empty State */}
|
||||||
{!loading() && activities().length === 0 && (
|
{!loading() && activities().length === 0 && (
|
||||||
<div class="text-center py-8">
|
<div class="text-center py-8">
|
||||||
<IconClock class="size-12 text-[#a3a3a3] mx-auto mb-4" />
|
<IconClock class="size-12 text-[#a3a3a3] mx-auto mb-4" />
|
||||||
<p class="text-[#a3a3a3]">No recent activity found</p>
|
<p class="text-[#a3a3a3]">No activity yet</p>
|
||||||
<p class="text-sm text-[#a3a3a3] mt-1">
|
<p class="text-sm text-[#a3a3a3] mt-1">
|
||||||
{filter() === 'github' ? 'Connect your GitHub account to see activity' : 'Start using Trackeep to see your activity here'}
|
{filter() === 'github' ? 'Connect your GitHub account to see activity' : 'Start using Trackeep to see your activity here'}
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { createSignal, createEffect } from 'solid-js';
|
|||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
import { Input } from '@/components/ui/Input';
|
import { Input } from '@/components/ui/Input';
|
||||||
import { TagPicker } from '@/components/ui/TagPicker';
|
import { TagPicker } from '@/components/ui/TagPicker';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import { IconX } from '@tabler/icons-solidjs';
|
import { IconX } from '@tabler/icons-solidjs';
|
||||||
|
|
||||||
interface BookmarkModalProps {
|
interface BookmarkModalProps {
|
||||||
@@ -52,92 +53,94 @@ export const BookmarkModal = (props: BookmarkModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ModalPortal>
|
||||||
{/* Backdrop */}
|
<>
|
||||||
{props.isOpen && (
|
{/* Backdrop */}
|
||||||
<div class="fixed inset-0 bg-black/50 z-[60] mt-0" onClick={props.onClose} />
|
{props.isOpen && (
|
||||||
)}
|
<div class="fixed inset-0 bg-black/50 z-[60]" onClick={props.onClose} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Modal */}
|
{/* Modal */}
|
||||||
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-[70] ${
|
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-[70] ${
|
||||||
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
||||||
}`} style="width: min(500px, 90vw); max-height: min(80vh, 600px); overflow-y: auto;">
|
}`} style="width: min(500px, 90vw); max-height: min(80vh, 600px); overflow-y: auto;">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-4 sm:p-6 border-b border-border">
|
<div class="flex items-center justify-between p-4 sm:p-6 border-b border-border">
|
||||||
<h3 class="text-lg font-semibold">Add New Bookmark</h3>
|
<h3 class="text-lg font-semibold">Add New Bookmark</h3>
|
||||||
<button
|
<button
|
||||||
onClick={props.onClose}
|
onClick={props.onClose}
|
||||||
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
||||||
>
|
>
|
||||||
<IconX class="size-4" />
|
<IconX class="size-4" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Content */}
|
{/* Content */}
|
||||||
<div class="p-4 sm:p-6 space-y-4">
|
<div class="p-4 sm:p-6 space-y-4">
|
||||||
<div class="relative">
|
<div class="relative">
|
||||||
|
<Input
|
||||||
|
type="url"
|
||||||
|
placeholder="URL *"
|
||||||
|
value={newBookmark().url}
|
||||||
|
onInput={(e) => {
|
||||||
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
|
if (target) setNewBookmark(prev => ({ ...prev, url: target.value }));
|
||||||
|
}}
|
||||||
|
required
|
||||||
|
class="pr-12"
|
||||||
|
/>
|
||||||
|
{faviconPreview() && (
|
||||||
|
<div class="absolute right-3 top-1/2 transform -translate-y-1/2 w-6 h-6 bg-muted rounded flex items-center justify-center overflow-hidden">
|
||||||
|
<img
|
||||||
|
src={faviconPreview()}
|
||||||
|
alt="Site favicon"
|
||||||
|
class="w-4 h-4 object-contain"
|
||||||
|
onError={(e) => { e.currentTarget.style.display = 'none'; }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
<Input
|
<Input
|
||||||
type="url"
|
type="text"
|
||||||
placeholder="URL *"
|
placeholder="Title (optional)"
|
||||||
value={newBookmark().url}
|
value={newBookmark().title}
|
||||||
onInput={(e) => {
|
onInput={(e) => {
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
if (target) setNewBookmark(prev => ({ ...prev, url: target.value }));
|
if (target) setNewBookmark(prev => ({ ...prev, title: target.value }));
|
||||||
}}
|
}}
|
||||||
required
|
|
||||||
class="pr-12"
|
|
||||||
/>
|
/>
|
||||||
{faviconPreview() && (
|
<Input
|
||||||
<div class="absolute right-3 top-1/2 transform -translate-y-1/2 w-6 h-6 bg-muted rounded flex items-center justify-center overflow-hidden">
|
type="text"
|
||||||
<img
|
placeholder="Description (optional)"
|
||||||
src={faviconPreview()}
|
value={newBookmark().description}
|
||||||
alt="Site favicon"
|
onInput={(e) => {
|
||||||
class="w-4 h-4 object-contain"
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
onError={(e) => { e.currentTarget.style.display = 'none'; }}
|
if (target) setNewBookmark(prev => ({ ...prev, description: target.value }));
|
||||||
/>
|
}}
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<Input
|
|
||||||
type="text"
|
|
||||||
placeholder="Title (optional)"
|
|
||||||
value={newBookmark().title}
|
|
||||||
onInput={(e) => {
|
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
|
||||||
if (target) setNewBookmark(prev => ({ ...prev, title: target.value }));
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<Input
|
|
||||||
type="text"
|
|
||||||
placeholder="Description (optional)"
|
|
||||||
value={newBookmark().description}
|
|
||||||
onInput={(e) => {
|
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
|
||||||
if (target) setNewBookmark(prev => ({ ...prev, description: target.value }));
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<div class="space-y-2">
|
|
||||||
<label class="text-sm font-medium text-muted-foreground">Tags</label>
|
|
||||||
<TagPicker
|
|
||||||
availableTags={availableTags()}
|
|
||||||
selectedTags={tags()}
|
|
||||||
onTagsChange={(next) => setTags(next)}
|
|
||||||
placeholder="Add tags..."
|
|
||||||
allowNew={true}
|
|
||||||
/>
|
/>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm font-medium text-muted-foreground">Tags</label>
|
||||||
|
<TagPicker
|
||||||
|
availableTags={availableTags()}
|
||||||
|
selectedTags={tags()}
|
||||||
|
onTagsChange={(next) => setTags(next)}
|
||||||
|
placeholder="Add tags..."
|
||||||
|
allowNew={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Footer */}
|
{/* Footer */}
|
||||||
<div class="flex flex-col sm:flex-row justify-end gap-2 p-4 sm:p-6 border-t border-border">
|
<div class="flex flex-col sm:flex-row justify-end gap-2 p-4 sm:p-6 border-t border-border">
|
||||||
<Button variant="outline" onClick={props.onClose}>
|
<Button variant="outline" onClick={props.onClose}>
|
||||||
Cancel
|
Cancel
|
||||||
</Button>
|
</Button>
|
||||||
<Button onClick={handleSubmit} disabled={!newBookmark().url.trim()}>
|
<Button onClick={handleSubmit} disabled={!newBookmark().url.trim()}>
|
||||||
Save Bookmark
|
Save Bookmark
|
||||||
</Button>
|
</Button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</>
|
||||||
</>
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -386,10 +386,6 @@
|
|||||||
inset: -5px;
|
inset: -5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.-translate-y-1\/2 {
|
|
||||||
transform: translateY(-50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Z-index utilities */
|
/* Z-index utilities */
|
||||||
.z-50 {
|
.z-50 {
|
||||||
z-index: 50;
|
z-index: 50;
|
||||||
|
|||||||
@@ -188,8 +188,8 @@ export const ColorPicker = (props: ColorPickerProps) => {
|
|||||||
<div class="flex items-center gap-2.5 border-b border-stroke-soft-200 p-5">
|
<div class="flex items-center gap-2.5 border-b border-stroke-soft-200 p-5">
|
||||||
<div class="flex flex-1 -space-x-px">
|
<div class="flex flex-1 -space-x-px">
|
||||||
{/* Hex Input */}
|
{/* Hex Input */}
|
||||||
<div class="group relative flex w-full overflow-hidden bg-bg-white-0 text-text-strong-950 shadow-regular-xs transition duration-200 ease-out divide-x divide-stroke-soft-200 before:absolute before:inset-0 before:ring-1 before:ring-inset before:ring-stroke-soft-200 before:pointer-events-none before:rounded-[inherit] before:transition before:duration-200 before:ease-out hover:shadow-none has-[input:focus]:shadow-button-important-focus has-[input:focus]:before:ring-stroke-strong-950 has-[input:disabled]:shadow-none has-[input:disabled]:before:ring-transparent rounded-lg hover:[&:not(:has(input:focus)):has(>:only-child)]:before:ring-transparent flex-[2] rounded-l-10 rounded-r-none focus-within:z-10 hover:[&:not(:focus-within)]:before:!ring-stroke-soft-200" data-rac="" data-channel="hex">
|
<div class="group relative flex w-full overflow-hidden bg-bg-white-0 text-text-strong-950 shadow-regular-xs transition duration-200 ease-out divide-x divide-stroke-soft-200 before:absolute before:inset-0 before:ring-1 before:ring-inset before:ring-stroke-soft-200 before:pointer-events-none before:rounded-[inherit] before:transition before:duration-200 before:ease-out hover:shadow-none has-[input:focus]:shadow-button-important-focus has-[input:focus]:before:ring-stroke-strong-950 has-[input:disabled]:shadow-none has-[input:disabled]:before:ring-transparent rounded-lg hover:not-[:has(input:focus)]:before:ring-transparent flex-[2] rounded-l-10 rounded-r-none focus-within:z-10 hover:not-[:focus-within]:before:!ring-stroke-soft-200" data-rac="" data-channel="hex">
|
||||||
<label class="group/input-wrapper flex w-full cursor-text items-center bg-bg-white-0 transition duration-200 ease-out hover:[&:not(&:has(input:focus))]:bg-bg-weak-50 has-[input:disabled]:pointer-events-none has-[input:disabled]:bg-bg-weak-50 gap-2 px-2.5">
|
<label class="group/input-wrapper flex w-full cursor-text items-center bg-bg-white-0 transition duration-200 ease-out hover:not-[:has(input:focus)]:bg-bg-weak-50 has-[input:disabled]:pointer-events-none has-[input:disabled]:bg-bg-weak-50 gap-2 px-2.5">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<div class="h-3 w-3 shrink-0 rounded-full ring-0" style={{ 'background-color': currentColor() }}></div>
|
<div class="h-3 w-3 shrink-0 rounded-full ring-0" style={{ 'background-color': currentColor() }}></div>
|
||||||
<input
|
<input
|
||||||
@@ -210,8 +210,8 @@ export const ColorPicker = (props: ColorPickerProps) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Alpha Input */}
|
{/* Alpha Input */}
|
||||||
<div class="group relative flex w-full overflow-hidden bg-bg-white-0 text-text-strong-950 shadow-regular-xs transition duration-200 ease-out divide-x divide-stroke-soft-200 before:absolute before:inset-0 before:ring-1 before:ring-inset before:ring-stroke-soft-200 before:pointer-events-none before:rounded-[inherit] before:transition before:duration-200 before:ease-out hover:shadow-none has-[input:focus]:shadow-button-important-focus has-[input:focus]:before:ring-stroke-strong-950 has-[input:disabled]:shadow-none has-[input:disabled]:before:ring-transparent rounded-lg hover:[&:not(:has(input:focus)):has(>:only-child)]:before:ring-transparent max-w-[57px] flex-1 rounded-l-none rounded-r-10 focus-within:z-10 hover:[&:not(:focus-within)]:before:!ring-stroke-soft-200" data-rac="" data-channel="alpha">
|
<div class="group relative flex w-full overflow-hidden bg-bg-white-0 text-text-strong-950 shadow-regular-xs transition duration-200 ease-out divide-x divide-stroke-soft-200 before:absolute before:inset-0 before:ring-1 before:ring-inset before:ring-stroke-soft-200 before:pointer-events-none before:rounded-[inherit] before:transition before:duration-200 before:ease-out hover:shadow-none has-[input:focus]:shadow-button-important-focus has-[input:focus]:before:ring-stroke-strong-950 has-[input:disabled]:shadow-none has-[input:disabled]:before:ring-transparent rounded-lg hover:not-[:has(input:focus)]:before:ring-transparent max-w-[57px] flex-1 rounded-l-none rounded-r-10 focus-within:z-10 hover:not-[:focus-within]:before:!ring-stroke-soft-200" data-rac="" data-channel="alpha">
|
||||||
<label class="group/input-wrapper flex w-full cursor-text items-center bg-bg-white-0 transition duration-200 ease-out hover:[&:not(&:has(input:focus))]:bg-bg-weak-50 has-[input:disabled]:pointer-events-none has-[input:disabled]:bg-bg-weak-50 gap-2 px-2.5">
|
<label class="group/input-wrapper flex w-full cursor-text items-center bg-bg-white-0 transition duration-200 ease-out hover:not-[:has(input:focus)]:bg-bg-weak-50 has-[input:disabled]:pointer-events-none has-[input:disabled]:bg-bg-weak-50 gap-2 px-2.5">
|
||||||
<input
|
<input
|
||||||
aria-label="Alpha"
|
aria-label="Alpha"
|
||||||
id="alpha-input"
|
id="alpha-input"
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export const ColorSwitcherDropdown = () => {
|
|||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
// Load saved color scheme from localStorage
|
// Load saved color scheme from localStorage
|
||||||
const savedScheme = localStorage.getItem('trackeep-color-scheme');
|
const savedScheme = localStorage.getItem('colorScheme');
|
||||||
if (savedScheme) {
|
if (savedScheme) {
|
||||||
setCurrentScheme(savedScheme);
|
setCurrentScheme(savedScheme);
|
||||||
}
|
}
|
||||||
@@ -40,11 +40,15 @@ export const ColorSwitcherDropdown = () => {
|
|||||||
setCurrentScheme(scheme.name);
|
setCurrentScheme(scheme.name);
|
||||||
|
|
||||||
// Save to localStorage for persistence
|
// Save to localStorage for persistence
|
||||||
localStorage.setItem('trackeep-color-scheme', scheme.name);
|
localStorage.setItem('colorScheme', scheme.name);
|
||||||
|
|
||||||
// Apply only primary color to CSS variables
|
// Apply only primary color to CSS variables, preserve other colors
|
||||||
const root = document.documentElement;
|
const root = document.documentElement;
|
||||||
|
|
||||||
|
// Get current theme to preserve background
|
||||||
|
const currentTheme = document.documentElement.getAttribute('data-kb-theme');
|
||||||
|
const isDark = currentTheme === 'dark';
|
||||||
|
|
||||||
// Convert hex to HSL for CSS variables
|
// Convert hex to HSL for CSS variables
|
||||||
const hexToHsl = (hex: string) => {
|
const hexToHsl = (hex: string) => {
|
||||||
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
|
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
|
||||||
@@ -72,9 +76,19 @@ export const ColorSwitcherDropdown = () => {
|
|||||||
return `${Math.round(h * 360)} ${Math.round(s * 100)}% ${Math.round(l * 100)}%`;
|
return `${Math.round(h * 360)} ${Math.round(s * 100)}% ${Math.round(l * 100)}%`;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Apply only the primary color
|
// Apply only primary color, preserve theme-based background
|
||||||
root.style.setProperty('--primary', hexToHsl(scheme.primary));
|
const hslColor = hexToHsl(scheme.primary);
|
||||||
root.style.setProperty('--colors-primary', hexToHsl(scheme.primary));
|
root.style.setProperty('--primary', hslColor);
|
||||||
|
root.style.setProperty('--colors-primary', hslColor);
|
||||||
|
|
||||||
|
// Ensure background stays theme-appropriate
|
||||||
|
if (isDark) {
|
||||||
|
root.style.setProperty('--background', '0 0% 10%');
|
||||||
|
root.style.setProperty('--colors-background', '0 0% 10%');
|
||||||
|
} else {
|
||||||
|
root.style.setProperty('--background', '0 0% 100%');
|
||||||
|
root.style.setProperty('--colors-background', '0 0% 100%');
|
||||||
|
}
|
||||||
|
|
||||||
if (closeDropdown) {
|
if (closeDropdown) {
|
||||||
setIsOpen(false);
|
setIsOpen(false);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import { IconX, IconAlertTriangle } from '@tabler/icons-solidjs';
|
import { IconX, IconAlertTriangle } from '@tabler/icons-solidjs';
|
||||||
|
|
||||||
interface ConfirmModalProps {
|
interface ConfirmModalProps {
|
||||||
@@ -45,45 +46,47 @@ export const ConfirmModal = (props: ConfirmModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ModalPortal>
|
||||||
{/* Backdrop */}
|
<>
|
||||||
{isOpen && (
|
{/* Backdrop */}
|
||||||
<div class="fixed inset-0 bg-black/50 z-40 mt-0" onClick={onClose} />
|
{isOpen && (
|
||||||
)}
|
<div class="fixed inset-0 bg-black/50 z-40" onClick={onClose} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Modal */}
|
{/* Modal */}
|
||||||
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
||||||
isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
||||||
}`} style="width: 400px; max-width: 90vw;">
|
}`} style="width: 400px; max-width: 90vw;">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-6 border-b border-border">
|
<div class="flex items-center justify-between p-6 border-b border-border">
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
{getIcon()}
|
{getIcon()}
|
||||||
<h3 class="text-lg font-semibold">{title}</h3>
|
<h3 class="text-lg font-semibold">{title}</h3>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={onClose}
|
||||||
|
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
||||||
|
>
|
||||||
|
<IconX class="size-4" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button
|
|
||||||
onClick={onClose}
|
|
||||||
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
|
||||||
>
|
|
||||||
<IconX class="size-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Content */}
|
{/* Content */}
|
||||||
<div class="p-6">
|
<div class="p-6">
|
||||||
<p class="text-muted-foreground">{message}</p>
|
<p class="text-muted-foreground">{message}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Footer */}
|
{/* Footer */}
|
||||||
<div class="flex justify-end gap-2 p-6 border-t border-border">
|
<div class="flex justify-end gap-2 p-6 border-t border-border">
|
||||||
<Button variant="outline" onClick={onClose}>
|
<Button variant="outline" onClick={onClose}>
|
||||||
{cancelText}
|
{cancelText}
|
||||||
</Button>
|
</Button>
|
||||||
<Button variant={getConfirmButtonVariant()} onClick={onConfirm}>
|
<Button variant={getConfirmButtonVariant()} onClick={onConfirm}>
|
||||||
{confirmText}
|
{confirmText}
|
||||||
</Button>
|
</Button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</>
|
||||||
</>
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { createSignal, onMount } from 'solid-js';
|
|||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
import { Input } from '@/components/ui/Input';
|
import { Input } from '@/components/ui/Input';
|
||||||
import { TagPicker } from '@/components/ui/TagPicker';
|
import { TagPicker } from '@/components/ui/TagPicker';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import { IconX } from '@tabler/icons-solidjs';
|
import { IconX } from '@tabler/icons-solidjs';
|
||||||
|
|
||||||
interface Bookmark {
|
interface Bookmark {
|
||||||
@@ -71,79 +72,81 @@ export const EditBookmarkModal = (props: EditBookmarkModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ModalPortal>
|
||||||
{/* Backdrop */}
|
<>
|
||||||
{props.isOpen && (
|
{/* Backdrop */}
|
||||||
<div class="fixed inset-0 bg-black/50 z-40 mt-0" onClick={props.onClose} />
|
{props.isOpen && (
|
||||||
)}
|
<div class="fixed inset-0 bg-black/50 z-40" onClick={props.onClose} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Modal */}
|
{/* Modal */}
|
||||||
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
||||||
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
||||||
}`} style="width: 500px; max-width: 90vw;">
|
}`} style="width: 500px; max-width: 90vw;">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-6 border-b border-border">
|
<div class="flex items-center justify-between p-6 border-b border-border">
|
||||||
<h3 class="text-lg font-semibold">Edit Bookmark</h3>
|
<h3 class="text-lg font-semibold">Edit Bookmark</h3>
|
||||||
<button
|
<button
|
||||||
onClick={props.onClose}
|
onClick={props.onClose}
|
||||||
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8"
|
||||||
>
|
>
|
||||||
<IconX class="size-4" />
|
<IconX class="size-4" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Content */}
|
{/* Content */}
|
||||||
<div class="p-6 space-y-4">
|
<div class="p-6 space-y-4">
|
||||||
<Input
|
<Input
|
||||||
type="url"
|
type="url"
|
||||||
placeholder="URL *"
|
placeholder="URL *"
|
||||||
value={editBookmark().url}
|
value={editBookmark().url}
|
||||||
onInput={(e) => {
|
onInput={(e) => {
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
if (target) setEditBookmark(prev => ({ ...prev, url: target.value }));
|
if (target) setEditBookmark(prev => ({ ...prev, url: target.value }));
|
||||||
}}
|
}}
|
||||||
required
|
required
|
||||||
/>
|
|
||||||
<Input
|
|
||||||
type="text"
|
|
||||||
placeholder="Title"
|
|
||||||
value={editBookmark().title}
|
|
||||||
onInput={(e) => {
|
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
|
||||||
if (target) setEditBookmark(prev => ({ ...prev, title: target.value }));
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<Input
|
|
||||||
type="text"
|
|
||||||
placeholder="Description"
|
|
||||||
value={editBookmark().description}
|
|
||||||
onInput={(e) => {
|
|
||||||
const target = e.currentTarget as HTMLInputElement;
|
|
||||||
if (target) setEditBookmark(prev => ({ ...prev, description: target.value }));
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<div class="space-y-2">
|
|
||||||
<label class="text-sm font-medium text-muted-foreground">Tags</label>
|
|
||||||
<TagPicker
|
|
||||||
availableTags={availableTags()}
|
|
||||||
selectedTags={tags()}
|
|
||||||
onTagsChange={(next) => setTags(next)}
|
|
||||||
placeholder="Add tags..."
|
|
||||||
allowNew={true}
|
|
||||||
/>
|
/>
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
placeholder="Title"
|
||||||
|
value={editBookmark().title}
|
||||||
|
onInput={(e) => {
|
||||||
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
|
if (target) setEditBookmark(prev => ({ ...prev, title: target.value }));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
type="text"
|
||||||
|
placeholder="Description"
|
||||||
|
value={editBookmark().description}
|
||||||
|
onInput={(e) => {
|
||||||
|
const target = e.currentTarget as HTMLInputElement;
|
||||||
|
if (target) setEditBookmark(prev => ({ ...prev, description: target.value }));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<div class="space-y-2">
|
||||||
|
<label class="text-sm font-medium text-muted-foreground">Tags</label>
|
||||||
|
<TagPicker
|
||||||
|
availableTags={availableTags()}
|
||||||
|
selectedTags={tags()}
|
||||||
|
onTagsChange={(next) => setTags(next)}
|
||||||
|
placeholder="Add tags..."
|
||||||
|
allowNew={true}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Footer */}
|
||||||
|
<div class="flex justify-end gap-2 p-6 border-t border-border">
|
||||||
|
<Button variant="outline" onClick={props.onClose}>
|
||||||
|
Cancel
|
||||||
|
</Button>
|
||||||
|
<Button onClick={handleSubmit} disabled={!editBookmark().url.trim()}>
|
||||||
|
Save Changes
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</>
|
||||||
{/* Footer */}
|
</ModalPortal>
|
||||||
<div class="flex justify-end gap-2 p-6 border-t border-border">
|
|
||||||
<Button variant="outline" onClick={props.onClose}>
|
|
||||||
Cancel
|
|
||||||
</Button>
|
|
||||||
<Button onClick={handleSubmit} disabled={!editBookmark().url.trim()}>
|
|
||||||
Save Changes
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { createSignal } from 'solid-js';
|
import { createSignal } from 'solid-js';
|
||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import { IconX, IconDownload, IconExternalLink, IconEye, IconFile, IconCode, IconFileText, IconAlertTriangle, IconMusic, IconFileDescription, IconChartBar, IconChartLine } from '@tabler/icons-solidjs';
|
import { IconX, IconDownload, IconExternalLink, IconEye, IconFile, IconCode, IconFileText, IconAlertTriangle, IconMusic, IconFileDescription, IconChartBar, IconChartLine } from '@tabler/icons-solidjs';
|
||||||
|
import { isDemoMode } from '@/lib/demo-mode';
|
||||||
|
|
||||||
interface FilePreviewModalProps {
|
interface FilePreviewModalProps {
|
||||||
isOpen: boolean;
|
isOpen: boolean;
|
||||||
@@ -168,12 +170,7 @@ export const FilePreviewModal = (props: FilePreviewModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleDownload = () => {
|
const handleDownload = () => {
|
||||||
// Check if we're in demo mode
|
if (isDemoMode()) {
|
||||||
const isDemoMode = localStorage.getItem('demoMode') === 'true' ||
|
|
||||||
document.title.includes('Demo Mode') ||
|
|
||||||
window.location.search.includes('demo=true');
|
|
||||||
|
|
||||||
if (isDemoMode) {
|
|
||||||
// Simulate download in demo mode
|
// Simulate download in demo mode
|
||||||
alert(`Download simulated for: ${props.file.name}\n\nIn production, this would download the actual file.`);
|
alert(`Download simulated for: ${props.file.name}\n\nIn production, this would download the actual file.`);
|
||||||
return;
|
return;
|
||||||
@@ -190,31 +187,32 @@ export const FilePreviewModal = (props: FilePreviewModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<ModalPortal>
|
||||||
{/* Backdrop */}
|
<>
|
||||||
{props.isOpen && (
|
{/* Backdrop */}
|
||||||
<div class="fixed inset-0 bg-black/50 z-40 mt-0" onClick={props.onClose} />
|
{props.isOpen && (
|
||||||
)}
|
<div class="fixed inset-0 bg-black/50 z-40" onClick={props.onClose} />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Modal */}
|
{/* Modal */}
|
||||||
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
<div class={`fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 bg-card border border-border rounded-lg shadow-xl transition-all duration-300 z-50 ${
|
||||||
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
props.isOpen ? 'opacity-100 scale-100' : 'opacity-0 scale-95 pointer-events-none'
|
||||||
}`} style="width: 900px; max-width: 95vw; max-height: 85vh;">
|
}`} style="width: 900px; max-width: 95vw; max-height: 85vh;">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-6 border-b border-border">
|
<div class="flex items-center justify-between p-6 border-b border-border">
|
||||||
<div class="flex items-center gap-3 flex-1 min-w-0">
|
<div class="flex items-center gap-3 flex-1 min-w-0">
|
||||||
<h3 class="text-lg font-semibold truncate">{props.file?.name}</h3>
|
<h3 class="text-lg font-semibold truncate">{props.file?.name}</h3>
|
||||||
<span class="text-sm text-muted-foreground flex-shrink-0">
|
<span class="text-sm text-muted-foreground flex-shrink-0">
|
||||||
{props.file?.size ? formatFileSize(props.file.size) : 'Unknown size'}
|
{props.file?.size ? formatFileSize(props.file.size) : 'Unknown size'}
|
||||||
</span>
|
</span>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={props.onClose}
|
||||||
|
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8 flex-shrink-0"
|
||||||
|
>
|
||||||
|
<IconX class="size-4" />
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button
|
|
||||||
onClick={props.onClose}
|
|
||||||
class="inline-flex items-center justify-center rounded-md text-sm font-medium transition-shadow focus-visible:outline-none focus-visible:ring-1.5 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 bg-inherit hover:bg-accent/50 hover:text-accent-foreground h-8 w-8 flex-shrink-0"
|
|
||||||
>
|
|
||||||
<IconX class="size-4" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Preview Area */}
|
{/* Preview Area */}
|
||||||
<div class="p-6" style="height: 500px;">
|
<div class="p-6" style="height: 500px;">
|
||||||
@@ -251,7 +249,8 @@ export const FilePreviewModal = (props: FilePreviewModalProps) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { createSignal, For, Show } from 'solid-js';
|
import { createSignal, For, Show } from 'solid-js';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { ModalPortal } from './ModalPortal';
|
||||||
import './FileUpload.css';
|
import './FileUpload.css';
|
||||||
|
|
||||||
export interface FileUploadProps {
|
export interface FileUploadProps {
|
||||||
@@ -191,17 +192,26 @@ export const FileUpload = (props: FileUploadProps) => {
|
|||||||
props.onClose?.();
|
props.onClose?.();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (!props.isOpen) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<ModalPortal>
|
||||||
class={cn(
|
<>
|
||||||
"relative w-full rounded-20 bg-bg-white-0 focus:outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 max-w-[440px] shadow-custom-md",
|
<div class="fixed inset-0 z-[80] bg-black/50" onClick={handleClose} />
|
||||||
props.class
|
<div class="fixed top-1/2 left-1/2 z-[90] w-[min(440px,90vw)] max-h-[85vh] -translate-x-1/2 -translate-y-1/2 overflow-y-auto">
|
||||||
)}
|
<div
|
||||||
role="dialog"
|
class={cn(
|
||||||
aria-labelledby="file-upload-title"
|
"relative w-full rounded-20 bg-bg-white-0 focus:outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 max-w-[440px] shadow-custom-md",
|
||||||
aria-describedby="file-upload-description"
|
props.class
|
||||||
data-state={props.isOpen ? 'open' : 'closed'}
|
)}
|
||||||
>
|
role="dialog"
|
||||||
|
aria-labelledby="file-upload-title"
|
||||||
|
aria-describedby="file-upload-description"
|
||||||
|
data-state="open"
|
||||||
|
onClick={(event) => event.stopPropagation()}
|
||||||
|
>
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="relative flex items-start gap-3.5 py-4 pl-5 pr-14 before:absolute before:inset-x-0 before:bottom-0 before:border-b before:border-stroke-soft-200">
|
<div class="relative flex items-start gap-3.5 py-4 pl-5 pr-14 before:absolute before:inset-x-0 before:bottom-0 before:border-b before:border-stroke-soft-200">
|
||||||
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-bg-white-0 ring-1 ring-inset ring-stroke-soft-200">
|
<div class="flex size-10 shrink-0 items-center justify-center rounded-full bg-bg-white-0 ring-1 ring-inset ring-stroke-soft-200">
|
||||||
@@ -366,6 +376,9 @@ export const FileUpload = (props: FileUploadProps) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { createSignal, For, Show, onMount, onCleanup } from 'solid-js';
|
|||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
import { Input } from '@/components/ui/Input';
|
import { Input } from '@/components/ui/Input';
|
||||||
import { Card } from '@/components/ui/Card';
|
import { Card } from '@/components/ui/Card';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import {
|
import {
|
||||||
IconX,
|
IconX,
|
||||||
IconUpload,
|
IconUpload,
|
||||||
@@ -153,15 +154,16 @@ export const FileUploadModal = (props: FileUploadModalProps) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Show when={props.isOpen}>
|
<ModalPortal>
|
||||||
<div
|
<Show when={props.isOpen}>
|
||||||
class="fixed inset-0 bg-black/50 flex items-center justify-center z-50 mt-0"
|
<div
|
||||||
onClick={props.onClose}
|
class="fixed inset-0 bg-black/50 flex items-center justify-center z-50"
|
||||||
>
|
onClick={props.onClose}
|
||||||
<div
|
|
||||||
class="bg-card rounded-lg border border-border p-6 w-full max-w-2xl max-h-[90vh] overflow-y-auto mx-4 my-4"
|
|
||||||
onClick={(e) => e.stopPropagation()}
|
|
||||||
>
|
>
|
||||||
|
<div
|
||||||
|
class="bg-card rounded-lg border border-border p-6 w-full max-w-2xl max-h-[90vh] overflow-y-auto mx-4 my-4"
|
||||||
|
onClick={(e) => e.stopPropagation()}
|
||||||
|
>
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between mb-6">
|
<div class="flex items-center justify-between mb-6">
|
||||||
<h2 class="text-xl font-semibold">Upload File</h2>
|
<h2 class="text-xl font-semibold">Upload File</h2>
|
||||||
@@ -382,8 +384,9 @@ export const FileUploadModal = (props: FileUploadModalProps) => {
|
|||||||
Upload
|
Upload
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</Show>
|
||||||
</Show>
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import {
|
|||||||
IconGitPullRequest,
|
IconGitPullRequest,
|
||||||
IconGitCommit
|
IconGitCommit
|
||||||
} from '@tabler/icons-solidjs';
|
} from '@tabler/icons-solidjs';
|
||||||
|
import { isDemoMode } from '@/lib/demo-mode';
|
||||||
|
|
||||||
interface ActivityData {
|
interface ActivityData {
|
||||||
date: string;
|
date: string;
|
||||||
@@ -51,141 +52,102 @@ export const GitHubActivity = (props: GitHubActivityProps) => {
|
|||||||
longestStreak: 0
|
longestStreak: 0
|
||||||
});
|
});
|
||||||
|
|
||||||
onMount(() => {
|
const setEmptyData = () => {
|
||||||
// Always show rich mock data for demonstration
|
setActivities([]);
|
||||||
generateMockData();
|
setRecentEvents(props.customEvents || []);
|
||||||
return;
|
setStats({
|
||||||
|
totalContributions: 0,
|
||||||
// Original real data loading logic (commented out for demo)
|
currentStreak: 0,
|
||||||
/*
|
longestStreak: 0
|
||||||
if (isDemoMode()) {
|
|
||||||
// In demo mode, always show rich mock data
|
|
||||||
generateMockData();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
loadRealData().catch((error) => {
|
|
||||||
console.error('Failed to load GitHub activity analytics, falling back to mock data:', error);
|
|
||||||
generateMockData();
|
|
||||||
});
|
});
|
||||||
*/
|
};
|
||||||
});
|
|
||||||
|
|
||||||
const generateMockData = () => {
|
const setDemoData = () => {
|
||||||
const activityData: ActivityData[] = [];
|
// Generate mock contribution data for the last year
|
||||||
|
const mockActivities: ActivityData[] = [];
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
const oneYearAgo = new Date(today);
|
|
||||||
oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1);
|
|
||||||
|
|
||||||
let currentStreak = 0;
|
for (let i = 364; i >= 0; i--) {
|
||||||
let longestStreak = 0;
|
const date = new Date(today);
|
||||||
let tempStreak = 0;
|
date.setDate(date.getDate() - i);
|
||||||
let totalContributions = 0;
|
|
||||||
|
|
||||||
// Generate more realistic activity patterns
|
|
||||||
for (let d = new Date(oneYearAgo); d <= today; d.setDate(d.getDate() + 1)) {
|
|
||||||
const dayOfWeek = d.getDay();
|
|
||||||
const isWeekend = dayOfWeek === 0 || dayOfWeek === 6;
|
|
||||||
const monthsAgo = Math.floor((today.getTime() - d.getTime()) / (30 * 24 * 60 * 60 * 1000));
|
|
||||||
|
|
||||||
// More realistic patterns:
|
// Random activity level (0-5), with higher probability of 0-2
|
||||||
// - Higher activity in recent months
|
const random = Math.random();
|
||||||
// - Lower activity on weekends
|
let level = 0;
|
||||||
// - Some bursts of activity followed by quiet periods
|
if (random > 0.7) level = 1;
|
||||||
let baseProbability = 0.3; // 30% chance of some activity
|
if (random > 0.85) level = 2;
|
||||||
|
if (random > 0.93) level = 3;
|
||||||
|
if (random > 0.97) level = 4;
|
||||||
|
if (random > 0.99) level = 5;
|
||||||
|
|
||||||
// Increase activity for more recent months
|
mockActivities.push({
|
||||||
if (monthsAgo < 3) baseProbability = 0.7; // Last 3 months: 70% chance
|
date: date.toISOString().split('T')[0],
|
||||||
else if (monthsAgo < 6) baseProbability = 0.5; // 3-6 months ago: 50% chance
|
count: level,
|
||||||
else baseProbability = 0.3; // 6+ months ago: 30% chance
|
level: level
|
||||||
|
|
||||||
// Reduce activity on weekends
|
|
||||||
if (isWeekend) baseProbability *= 0.6;
|
|
||||||
|
|
||||||
// Add some randomness and bursts
|
|
||||||
const hasActivity = Math.random() < baseProbability;
|
|
||||||
let count = 0;
|
|
||||||
|
|
||||||
if (hasActivity) {
|
|
||||||
// Generate contribution count with some bursts
|
|
||||||
if (Math.random() < 0.1) {
|
|
||||||
// 10% chance of high activity burst
|
|
||||||
count = Math.floor(Math.random() * 15) + 10;
|
|
||||||
} else {
|
|
||||||
// Normal activity
|
|
||||||
count = Math.floor(Math.random() * 8) + 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const level = count === 0 ? 0 : Math.min(5, Math.ceil(count / 2));
|
|
||||||
|
|
||||||
activityData.push({
|
|
||||||
date: new Date(d).toISOString().split('T')[0],
|
|
||||||
count,
|
|
||||||
level
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (count > 0) {
|
|
||||||
tempStreak++;
|
|
||||||
if (d.toDateString() === today.toDateString()) {
|
|
||||||
currentStreak = tempStreak;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
longestStreak = Math.max(longestStreak, tempStreak);
|
|
||||||
tempStreak = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
totalContributions += count;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const defaultEvents: ActivityEvent[] = [
|
// Calculate stats
|
||||||
|
const totalContributions = mockActivities.reduce((sum, day) => sum + day.count, 0);
|
||||||
|
const currentStreak = Math.floor(Math.random() * 15) + 5; // 5-20 days
|
||||||
|
const longestStreak = Math.floor(Math.random() * 30) + 20; // 20-50 days
|
||||||
|
|
||||||
|
// Mock recent events
|
||||||
|
const mockEvents: ActivityEvent[] = [
|
||||||
{
|
{
|
||||||
type: 'commit',
|
type: 'push',
|
||||||
title: 'feat: Add advanced color scheme management',
|
title: 'Pushed 3 commits to trackeep/frontend',
|
||||||
date: '2024-01-28',
|
date: '2 hours ago',
|
||||||
link: '/app/activity',
|
|
||||||
repo: 'trackeep',
|
repo: 'trackeep',
|
||||||
action: 'pushed'
|
action: 'pushed'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'pull_request',
|
type: 'pull_request',
|
||||||
title: 'Enhance admin settings with toggle buttons',
|
title: 'Opened PR: Add dark mode support',
|
||||||
date: '2024-01-27',
|
date: '1 day ago',
|
||||||
link: '/app/admin',
|
|
||||||
repo: 'trackeep',
|
repo: 'trackeep',
|
||||||
action: 'opened'
|
action: 'opened PR'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'merge',
|
type: 'merge',
|
||||||
title: 'Merge branch: feature/ai-chat-enhancements',
|
title: 'Merged PR: Fix responsive design issues',
|
||||||
date: '2024-01-26',
|
date: '2 days ago',
|
||||||
link: '/app/chat',
|
|
||||||
repo: 'trackeep',
|
repo: 'trackeep',
|
||||||
action: 'merged'
|
action: 'merged'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'bookmark',
|
type: 'commit',
|
||||||
title: 'Added bookmark: Advanced React Patterns',
|
title: 'Commit: Update API documentation',
|
||||||
date: '2024-01-25',
|
date: '3 days ago',
|
||||||
link: '/app/bookmarks'
|
repo: 'trackeep',
|
||||||
|
action: 'committed'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: 'project',
|
type: 'push',
|
||||||
title: 'Updated project: Trackeep Dashboard',
|
title: 'Pushed 5 commits to trackeep/backend',
|
||||||
date: '2024-01-24',
|
date: '1 week ago',
|
||||||
link: '/app/projects'
|
repo: 'trackeep',
|
||||||
|
action: 'pushed'
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
setActivities(activityData);
|
setActivities(mockActivities);
|
||||||
setRecentEvents(props.customEvents || defaultEvents);
|
setRecentEvents(mockEvents);
|
||||||
setStats({
|
setStats({
|
||||||
totalContributions,
|
totalContributions,
|
||||||
currentStreak,
|
currentStreak,
|
||||||
longestStreak: Math.max(longestStreak, tempStreak)
|
longestStreak
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
if (isDemoMode()) {
|
||||||
|
setDemoData();
|
||||||
|
} else {
|
||||||
|
setEmptyData();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const getMonthLabels = () => {
|
const getMonthLabels = () => {
|
||||||
const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
@@ -325,75 +287,84 @@ export const GitHubActivity = (props: GitHubActivityProps) => {
|
|||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Month labels - Show all months with responsive spacing */}
|
<Show
|
||||||
<div class="flex justify-between mb-3 px-6 sm:px-8 text-xs sm:text-sm font-medium overflow-x-auto">
|
when={activities().length > 0}
|
||||||
<div class="flex gap-2 sm:gap-3 min-w-max">
|
fallback={
|
||||||
{getMonthLabels().map((month) => (
|
<div class="h-44 border border-dashed border-border rounded-lg flex items-center justify-center">
|
||||||
<span class="text-foreground/80 hover:text-foreground transition-colors cursor-default whitespace-nowrap">
|
<p class="text-sm text-muted-foreground">No GitHub contribution data yet.</p>
|
||||||
{month}
|
</div>
|
||||||
</span>
|
}
|
||||||
))}
|
>
|
||||||
</div>
|
{/* Month labels - Show all months with responsive spacing */}
|
||||||
</div>
|
<div class="flex justify-between mb-3 px-6 sm:px-8 text-xs sm:text-sm font-medium overflow-x-auto">
|
||||||
|
<div class="flex gap-2 sm:gap-3 min-w-max">
|
||||||
{/* Contribution grid - Responsive and prevents overflow */}
|
{getMonthLabels().map((month) => (
|
||||||
<div class="overflow-hidden w-full">
|
<span class="text-foreground/80 hover:text-foreground transition-colors cursor-default whitespace-nowrap">
|
||||||
<div class="flex gap-1 min-w-0">
|
{month}
|
||||||
{/* Day labels */}
|
</span>
|
||||||
<div class="flex flex-col gap-1 pr-2 flex-shrink-0">
|
|
||||||
{['Mon', 'Wed', 'Fri'].map((day) => (
|
|
||||||
<div class="h-3 flex items-center justify-end">
|
|
||||||
<span class="text-xs text-foreground/70 hover:text-foreground transition-colors cursor-default font-medium">
|
|
||||||
{day}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Weekly columns - Responsive with proper overflow handling */}
|
{/* Contribution grid - Responsive and prevents overflow */}
|
||||||
<div class="flex gap-1 overflow-x-auto overflow-y-hidden min-w-0 pb-2">
|
<div class="overflow-hidden w-full">
|
||||||
{Array.from({ length: 53 }, (_, weekIndex) => (
|
<div class="flex gap-1 min-w-0">
|
||||||
<div class="flex flex-col gap-1 flex-shrink-0">
|
{/* Day labels */}
|
||||||
{Array.from({ length: 7 }, (_, dayIndex) => {
|
<div class="flex flex-col gap-1 pr-2 flex-shrink-0">
|
||||||
const activityIndex = weekIndex * 7 + dayIndex;
|
{['Mon', 'Wed', 'Fri'].map((day) => (
|
||||||
const activity = activities()[activityIndex];
|
<div class="h-3 flex items-center justify-end">
|
||||||
|
<span class="text-xs text-foreground/70 hover:text-foreground transition-colors cursor-default font-medium">
|
||||||
|
{day}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Weekly columns - Responsive with proper overflow handling */}
|
||||||
|
<div class="flex gap-1 overflow-x-auto overflow-y-hidden min-w-0 pb-2">
|
||||||
|
{Array.from({ length: 53 }, (_, weekIndex) => (
|
||||||
|
<div class="flex flex-col gap-1 flex-shrink-0">
|
||||||
|
{Array.from({ length: 7 }, (_, dayIndex) => {
|
||||||
|
const activityIndex = weekIndex * 7 + dayIndex;
|
||||||
|
const activity = activities()[activityIndex];
|
||||||
|
|
||||||
|
if (!activity) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm flex-shrink-0 transition-all"
|
||||||
|
style={`background-color: ${getActivityColor(0)}`}
|
||||||
|
></div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (!activity) {
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm flex-shrink-0 transition-all"
|
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm hover:ring-1 hover:ring-primary cursor-pointer transition-all flex-shrink-0 hover:scale-110"
|
||||||
style={`background-color: ${getActivityColor(0)}`}
|
style={`background-color: ${getActivityColor(activity.level)}`}
|
||||||
|
title={`${activity.date}: ${activity.count} contributions`}
|
||||||
></div>
|
></div>
|
||||||
);
|
);
|
||||||
}
|
})}
|
||||||
|
</div>
|
||||||
return (
|
))}
|
||||||
<div
|
</div>
|
||||||
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm hover:ring-1 hover:ring-primary cursor-pointer transition-all flex-shrink-0 hover:scale-110"
|
|
||||||
style={`background-color: ${getActivityColor(activity.level)}`}
|
|
||||||
title={`${activity.date}: ${activity.count} contributions`}
|
|
||||||
></div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Legend */}
|
{/* Legend */}
|
||||||
<div class="flex items-center justify-between mt-4">
|
<div class="flex items-center justify-between mt-4">
|
||||||
<span class="text-xs text-muted-foreground">Less</span>
|
<span class="text-xs text-muted-foreground">Less</span>
|
||||||
<div class="flex gap-1">
|
<div class="flex gap-1">
|
||||||
{[0, 1, 2, 3, 4].map((level) => (
|
{[0, 1, 2, 3, 4].map((level) => (
|
||||||
<div
|
<div
|
||||||
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm"
|
class="w-2.5 h-2.5 sm:w-3 sm:h-3 rounded-sm"
|
||||||
style={`background-color: ${getActivityColor(level)}`}
|
style={`background-color: ${getActivityColor(level)}`}
|
||||||
></div>
|
></div>
|
||||||
))}
|
))}
|
||||||
|
</div>
|
||||||
|
<span class="text-xs text-muted-foreground">More</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-xs text-muted-foreground">More</span>
|
</Show>
|
||||||
</div>
|
|
||||||
</Card>
|
</Card>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
@@ -407,52 +378,56 @@ export const GitHubActivity = (props: GitHubActivityProps) => {
|
|||||||
<span>Active</span>
|
<span>Active</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="space-y-3 max-h-64 overflow-y-auto">
|
<Show
|
||||||
<For each={recentEvents()}>
|
when={recentEvents().length > 0}
|
||||||
{(event) => (
|
fallback={<p class="text-sm text-muted-foreground">No GitHub events yet.</p>}
|
||||||
<div class="flex items-center justify-between p-3 bg-card rounded-lg border hover:bg-muted/50 transition-colors">
|
>
|
||||||
<div class="flex items-center gap-3">
|
<div class="space-y-3 max-h-64 overflow-y-auto">
|
||||||
<div class="bg-primary/10 p-2 rounded-lg">
|
<For each={recentEvents()}>
|
||||||
{getEventIcon(event.type)}
|
{(event) => (
|
||||||
</div>
|
<div class="flex items-center justify-between p-3 bg-card rounded-lg border hover:bg-muted/50 transition-colors">
|
||||||
<div class="flex-1">
|
<div class="flex items-center gap-3">
|
||||||
<p class="text-sm text-foreground font-medium">{event.title}</p>
|
<div class="bg-primary/10 p-2 rounded-lg">
|
||||||
<div class="flex items-center gap-2 text-xs text-muted-foreground mt-1">
|
{getEventIcon(event.type)}
|
||||||
<span>{event.date}</span>
|
</div>
|
||||||
{event.repo && (
|
<div class="flex-1">
|
||||||
<>
|
<p class="text-sm text-foreground font-medium">{event.title}</p>
|
||||||
<span>•</span>
|
<div class="flex items-center gap-2 text-xs text-muted-foreground mt-1">
|
||||||
<span class="text-primary">{event.repo}</span>
|
<span>{event.date}</span>
|
||||||
</>
|
{event.repo && (
|
||||||
)}
|
<>
|
||||||
{event.action && (
|
<span>•</span>
|
||||||
<>
|
<span class="text-primary">{event.repo}</span>
|
||||||
<span>•</span>
|
</>
|
||||||
<span>{event.action}</span>
|
)}
|
||||||
</>
|
{event.action && (
|
||||||
)}
|
<>
|
||||||
|
<span>•</span>
|
||||||
|
<span>{event.action}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{event.link && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => {
|
||||||
|
if (event.link) {
|
||||||
|
window.location.href = event.link;
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
class="hover:bg-primary/10 transition-colors"
|
||||||
|
>
|
||||||
|
<IconExternalLink class="size-4" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{event.link && (
|
)}
|
||||||
<Button
|
</For>
|
||||||
variant="ghost"
|
</div>
|
||||||
size="sm"
|
</Show>
|
||||||
onClick={() => {
|
|
||||||
// Navigate to the link in the same tab
|
|
||||||
if (event.link) {
|
|
||||||
window.location.href = event.link;
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
class="hover:bg-primary/10 transition-colors"
|
|
||||||
>
|
|
||||||
<IconExternalLink class="size-4" />
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</For>
|
|
||||||
</div>
|
|
||||||
</Card>
|
</Card>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { createSignal } from 'solid-js';
|
import { createSignal } from 'solid-js';
|
||||||
import { Button } from '@/components/ui/Button';
|
import { Button } from '@/components/ui/Button';
|
||||||
import { Input } from '@/components/ui/Input';
|
import { Input } from '@/components/ui/Input';
|
||||||
|
import { ModalPortal } from '@/components/ui/ModalPortal';
|
||||||
import { IconX } from '@tabler/icons-solidjs';
|
import { IconX } from '@tabler/icons-solidjs';
|
||||||
|
|
||||||
interface LearningPathFormData {
|
interface LearningPathFormData {
|
||||||
@@ -100,8 +101,9 @@ export const LearningPathModal = (props: LearningPathModalProps) => {
|
|||||||
if (!props.isOpen) return null;
|
if (!props.isOpen) return null;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50 mt-0">
|
<ModalPortal>
|
||||||
<div class="bg-[#1a1a1a] rounded-lg w-full max-w-2xl max-h-[90vh] overflow-y-auto mx-4 my-4">
|
<div class="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
|
||||||
|
<div class="bg-[#1a1a1a] rounded-lg w-full max-w-2xl max-h-[90vh] overflow-y-auto mx-4 my-4">
|
||||||
{/* Header */}
|
{/* Header */}
|
||||||
<div class="flex items-center justify-between p-6 border-b border-[#404040]">
|
<div class="flex items-center justify-between p-6 border-b border-[#404040]">
|
||||||
<h2 class="text-xl font-semibold text-[#fafafa]">
|
<h2 class="text-xl font-semibold text-[#fafafa]">
|
||||||
@@ -264,7 +266,8 @@ export const LearningPathModal = (props: LearningPathModalProps) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</ModalPortal>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user