Loading...
;
- if (error) return Error: {error}
;
- if (!contact) return Contact not found
;
-
- const availableNeeds = allNeeds.filter(
- (n) => !contact.needs.some((cn) => cn.id === n.id)
- );
-
- const getContactName = (contactId: number) => {
- const c = allContacts.find((ct) => ct.id === contactId);
- return c?.name || `Contact #${contactId}`;
- };
-
- const getRelationshipDisplayName = (type: string) => {
- const rt = RELATIONSHIP_TYPES.find((r) => r.value === type);
- return rt?.displayName || type;
- };
-
- // Group relationships by category for display
- const groupRelationships = () => {
- const familial: typeof contact.related_to = [];
- const friends: typeof contact.related_to = [];
- const partners: typeof contact.related_to = [];
- const professional: typeof contact.related_to = [];
- const other: typeof contact.related_to = [];
-
- const familialTypes = ['parent', 'child', 'sibling', 'grandparent', 'grandchild', 'aunt_uncle', 'niece_nephew', 'cousin', 'in_law'];
- const friendTypes = ['best_friend', 'close_friend', 'friend', 'acquaintance', 'neighbor'];
- const partnerTypes = ['spouse', 'partner'];
- const professionalTypes = ['mentor', 'mentee', 'business_partner', 'colleague', 'manager', 'direct_report', 'client'];
-
- for (const rel of contact.related_to) {
- if (familialTypes.includes(rel.relationship_type)) {
- familial.push(rel);
- } else if (friendTypes.includes(rel.relationship_type)) {
- friends.push(rel);
- } else if (partnerTypes.includes(rel.relationship_type)) {
- partners.push(rel);
- } else if (professionalTypes.includes(rel.relationship_type)) {
- professional.push(rel);
- } else {
- other.push(rel);
- }
- }
-
- return { familial, friends, partners, professional, other };
- };
-
- const relationshipGroups = groupRelationships();
-
- return (
-
-
- );
-}
diff --git a/frontend/src/components/ContactForm.tsx b/frontend/src/components/ContactForm.tsx
deleted file mode 100644
index 14e6bd3..0000000
--- a/frontend/src/components/ContactForm.tsx
+++ /dev/null
@@ -1,325 +0,0 @@
-import { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
-import { api } from "../api/client";
-import type { ContactCreate, Need } from "../types";
-
-export function ContactForm() {
- const { id } = useParams<{ id: string }>();
- const navigate = useNavigate();
- const isEdit = Boolean(id);
-
- const [allNeeds, setAllNeeds] = useState
- {/* Header with name and profile pic */}
-
-
- {/* Management section (expandable) */}
-
-
-
-
-
- I.D.: {contact.name}
-
- {contact.profile_pic ? (
- 
- ) : (
-
-
- {contact.name.charAt(0).toUpperCase()}
-
- )}
-
-
- Edit
-
-
- Back
-
-
-
- {/* Left column - Basic info */}
-
-
- {/* Needs/Warnings at bottom */}
- {contact.needs.length > 0 && (
-
- {contact.legal_name && (
-
-
- {/* Right column - Bio and Relationships */}
- Legal name: {contact.legal_name}
- )}
- {contact.suffix && (
- Suffix: {contact.suffix}
- )}
- {contact.gender && (
- Gender: {contact.gender}
- )}
- {contact.age && (
- Age: {contact.age}
- )}
- {contact.current_job && (
- Job: {contact.current_job}
- )}
- {contact.social_structure_style && (
- Social style: {contact.social_structure_style}
- )}
- {contact.self_sufficiency_score !== null && (
- Self-Sufficiency: {contact.self_sufficiency_score}
- )}
- {contact.timezone && (
- Timezone: {contact.timezone}
- )}
-
- {contact.safe_conversation_starters && (
-
- Safe con starters: {contact.safe_conversation_starters}
-
- )}
-
- {contact.topics_to_avoid && (
-
- Topics to avoid: {contact.topics_to_avoid}
-
- )}
-
- {contact.goals && (
-
- Goals: {contact.goals}
-
- )}
-
- {contact.bio && (
-
-
- Bio: {contact.bio}
-
- )}
-
-
-
- Relationships
- - {relationshipGroups.familial.length > 0 && ( -
- Familial:{" "}
- {relationshipGroups.familial.map((rel, i) => (
-
-
- {getContactName(rel.related_contact_id)}
-
- ({getRelationshipDisplayName(rel.relationship_type)})
- {i < relationshipGroups.familial.length - 1 && ", "}
-
- ))}
-
- )}
-
- {relationshipGroups.partners.length > 0 && (
-
- Partners:{" "}
- {relationshipGroups.partners.map((rel, i) => (
-
-
- {getContactName(rel.related_contact_id)}
-
- {i < relationshipGroups.partners.length - 1 && ", "}
-
- ))}
-
- )}
-
- {relationshipGroups.friends.length > 0 && (
-
- Friends:{" "}
- {relationshipGroups.friends.map((rel, i) => (
-
-
- {getContactName(rel.related_contact_id)}
-
- {i < relationshipGroups.friends.length - 1 && ", "}
-
- ))}
-
- )}
-
- {relationshipGroups.professional.length > 0 && (
-
- Professional:{" "}
- {relationshipGroups.professional.map((rel, i) => (
-
-
- {getContactName(rel.related_contact_id)}
-
- ({getRelationshipDisplayName(rel.relationship_type)})
- {i < relationshipGroups.professional.length - 1 && ", "}
-
- ))}
-
- )}
-
- {relationshipGroups.other.length > 0 && (
-
- Other:{" "}
- {relationshipGroups.other.map((rel, i) => (
-
-
- {getContactName(rel.related_contact_id)}
-
- ({getRelationshipDisplayName(rel.relationship_type)})
- {i < relationshipGroups.other.length - 1 && ", "}
-
- ))}
-
- )}
-
- {contact.related_from.length > 0 && (
-
- Known by:{" "}
- {contact.related_from.map((rel, i) => (
-
-
- {getContactName(rel.contact_id)}
-
- {i < contact.related_from.length - 1 && ", "}
-
- ))}
-
- )}
-
- {contact.needs.map((need) => (
-
- )}
-
-
- Warning: {need.name}
- {need.description && - {need.description}}
-
- ))}
-
-
- Manage Contact
- -
-
-
- Manage Relationships
-
- {contact.related_to.map((rel) => (
-
-
- {allContacts.length > 0 && (
-
-
- {getContactName(rel.related_contact_id)}
-
- {getRelationshipDisplayName(rel.relationship_type)}
-
-
-
- ))}
-
-
-
-
-
- )}
-
-
- Manage Needs/Warnings
--
- {contact.needs.map((need) => (
-
- - {need.name} - {need.description && - {need.description}} - - - ))} -
-
-
-
- )}
- Loading...
;
-
- return (
-
-
+{% endblock %}
diff --git a/python/api/templates/contact_list.html b/python/api/templates/contact_list.html
new file mode 100644
index 0000000..3934844
--- /dev/null
+++ b/python/api/templates/contact_list.html
@@ -0,0 +1,14 @@
+{% extends "base.html" %}
+{% block title %}Contacts{% endblock %}
+{% block content %}
+{isEdit ? "Edit Contact" : "New Contact"}
- - {error &&{error}
}
-
-
+
+
+{% endblock %}
diff --git a/python/api/templates/graph.html b/python/api/templates/graph.html
new file mode 100644
index 0000000..4deb8b5
--- /dev/null
+++ b/python/api/templates/graph.html
@@ -0,0 +1,198 @@
+{% extends "base.html" %}
+{% block title %}Relationship Graph{% endblock %}
+{% block content %}
+
+
+
+ Contacts
+ Add Contact +
+ {% include "partials/contact_table.html" %}
+
+
+
+
+
+{% endblock %}
diff --git a/python/api/templates/need_list.html b/python/api/templates/need_list.html
new file mode 100644
index 0000000..b7978ea
--- /dev/null
+++ b/python/api/templates/need_list.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+{% block title %}Needs{% endblock %}
+{% block content %}
+
+
+ Relationship Graph
+Drag nodes to reposition. Closer relationships have shorter, darker edges.
+ + +
+
+Relationship Closeness (1-10)
+
+
+
+
+ 10 - Very Close (Spouse, Partner)
+
+
+
+ 7 - Close (Family, Best Friend)
+
+
+
+ 4 - Moderate (Friend, Colleague)
+
+
+
+ 2 - Distant (Acquaintance)
+
+
+
+{% endblock %}
diff --git a/python/api/templates/partials/contact_table.html b/python/api/templates/partials/contact_table.html
new file mode 100644
index 0000000..0f570f8
--- /dev/null
+++ b/python/api/templates/partials/contact_table.html
@@ -0,0 +1,33 @@
+{% if contacts %}
+
+
+
+
+
+ Needs / Accommodations
+ +
+ {% include "partials/need_items.html" %}
+
+| Name | +Job | +Timezone | +Actions | +
|---|---|---|---|
| {{ contact.name }} | +{{ contact.current_job or "-" }} | +{{ contact.timezone or "-" }} | ++ Edit + + | +
No contacts yet.
+{% endif %} diff --git a/python/api/templates/partials/manage_needs.html b/python/api/templates/partials/manage_needs.html new file mode 100644 index 0000000..f1a4b69 --- /dev/null +++ b/python/api/templates/partials/manage_needs.html @@ -0,0 +1,14 @@ +-
+ {% for need in contact.needs %}
+
- + {{ need.name }} + {% if need.description %} - {{ need.description }}{% endif %} + + + {% endfor %} +
-
+ {% for need in needs %}
+
-
+ + {{ need.name }} + {% if need.description %}+ +
{{ need.description }}
{% endif %} +
+ {% endfor %}
+
No needs defined yet.
+{% endif %} diff --git a/systems/jeeves/services/contact_api.nix b/systems/jeeves/services/contact_api.nix index b5904ae..0762591 100644 --- a/systems/jeeves/services/contact_api.nix +++ b/systems/jeeves/services/contact_api.nix @@ -8,18 +8,13 @@ 8069 ]; systemd.services.contact-api = { - description = "Contact Database API with Frontend"; + description = "Contact Database API"; after = [ "postgresql.service" "network.target" ]; requires = [ "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; - path = [ - pkgs.nodejs - pkgs.coreutils - pkgs.bash - ]; environment = { PYTHONPATH = "${inputs.self}"; @@ -27,18 +22,15 @@ POSTGRES_HOST = "/run/postgresql"; POSTGRES_USER = "richie"; POSTGRES_PORT = "5432"; - HOME = "/var/lib/contact-api"; }; serviceConfig = { Type = "simple"; - ExecStart = "${pkgs.my_python}/bin/python -m python.api.main --host 192.168.90.40 --port 8069 --frontend-dir ${inputs.self}/frontend"; - StateDirectory = "contact-api"; + ExecStart = "${pkgs.my_python}/bin/python -m python.api.main --host 192.168.90.40 --port 8069"; Restart = "on-failure"; RestartSec = "5s"; StandardOutput = "journal"; StandardError = "journal"; - # Security hardening NoNewPrivileges = true; ProtectSystem = "strict"; ProtectHome = "read-only";