Skip to content

28 add microanimations and general UI ux improvements #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aambrose1 merged 6 commits into from
May 3, 2026
Merged

28 add microanimations and general UI ux improvements #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
79bb5ff
Refactor syles to be more unified and less random.
MatthewLoyed Apr 20, 2026
f74be35
Improved ui animations, polish, and css overall.
MatthewLoyed Apr 20, 2026
ed6f83e
Fixed sidebar hover on share tree.
MatthewLoyed Apr 26, 2026
d9e56e8
Merge origin/main into 28-add-microanimations-and-general-ui-ux-impro…
MatthewLoyed May 3, 2026
8820444
Update Share Tree UI.
MatthewLoyed May 3, 2026
293cba5
Merge branch 'main' into 28-add-microanimations-and-general-ui-ux-imp…
MatthewLoyed May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions client/src/components/AddFamilyMember/AddFamilyMember.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ function AddFamilyMemberPopup({ trigger, userid }) {
<div>
<label>
Relationship:
<select {...register("selectedMemberRelationship", { required: true })} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '145px' }} defaultValue={''}>
<select {...register("selectedMemberRelationship", { required: true })} style={styles.SelectStyle} defaultValue={''}>
<option value="" disabled hidden>Select</option>
<option value="spouse">Spouse</option>
<option value="child">Child</option>
Expand Down Expand Up @@ -651,7 +651,7 @@ function AddFamilyMemberPopup({ trigger, userid }) {
}}>
<label>
{extendedRelations[selectedMemberRelationship]?.label || "Connect To"}:
<select {...register("connectTo", { required: false })} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '180px' }} defaultValue={''}>
<select {...register("connectTo", { required: false })} style={styles.SelectStyle} defaultValue={''}>
<option value="">Skip / Link Later</option>
{treeMembers
.filter(m => String(m.id) !== String(currentAccountID))
Expand Down Expand Up @@ -784,9 +784,9 @@ function AddFamilyMemberPopup({ trigger, userid }) {
<input {...register2("lastName", { required: true })} type="text" placeholder="" style={styles.FieldStyle} required />
</label>
</li>
<li style={styles.ItemStyle} >
<li style={styles.ItemStyle}>
<label>*Gender:
<select {...register2("gender", { required: true })} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '85px' }} defaultValue={''} required>
<select {...register2("gender", { required: true })} style={styles.SelectStyle} defaultValue={''} required>
<option value="" disabled hidden>Select</option>
<option value="M">Male</option>
<option value="F">Female</option>
Expand All @@ -798,7 +798,7 @@ function AddFamilyMemberPopup({ trigger, userid }) {
<li style={styles.ItemStyle}>
<label>
*Relationship:
<select {...register2("relationship", { required: true })} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '145px' }} defaultValue={''} required>
<select {...register2("relationship", { required: true })} style={styles.SelectStyle} defaultValue={''} required>
<option value="" disabled hidden>Select</option>
<option value="spouse">Spouse</option>
<option value="child">Child</option>
Expand Down
239 changes: 140 additions & 99 deletions client/src/components/AddFamilyMember/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,140 @@
export const DefaultStyle = {
fontFamily: 'Alata',
};

export const FieldStyle = {
borderRadius: '5px',
border: '1px solid #000000',
marginLeft: '10px'
};

export const ListStyle = {
listStyleType: 'none',
fontFamily: 'Alata',
display: 'flex',
flexDirection: 'column',
textAlign: 'left',
marginRight: '15%'
};

export const ButtonDivStyle = {
fontFamily: 'Alata',
display: 'flex',
justifyContent: 'center',
}

export const ButtonStyle = {
fontFamily: 'Alata',
backgroundColor: '#3a5a40',
color: 'white',
borderRadius: '20px',
border: 'none',
padding: '10px 30px',
margin: '10px',
cursor: 'pointer',
}

export const GrayButtonStyle = {
fontFamily: 'Alata',
backgroundColor: '#D9D9D9',
color: 'black',
borderRadius: '20px',
border: 'none',
padding: '10px 20px',
margin: '10px',
cursor: 'pointer',
display: 'flex',
flexDirection: 'row',
boxShadow: 'gray 0px 10px 10px -8px',
}

export const FormStyle = {
padding: '2vw',
paddingTop: '0px',
minWidth: '360px',
}

export const ItemStyle = {
margin: '10px 0px'
}

export const DateFieldStyle = {
borderRadius: '5px',
border: '1px solid #000000',
marginLeft: '10px',
width: '147px',
fontFamily: 'Alata'
};


export const MainContainerStyle = {
display: 'flex',
flexDirection: 'column',
padding: '2vw',
paddingTop: '0px',
alignItems: 'center',
minWidth: '360px',
minHeight: '150px',
justifyContent: 'space-between',
}

export const AddOptionsStyle = {
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
width: '90%',
padding: '10px',
fontFamily: 'Alata',
// border: '1px solid gray',
// borderRadius: '5px',
marginTop: '10px',
height: '200px',
overflow: 'auto'
}

export const ListingStyle = {
padding: '10px',
border: '1px solid gray',
width: '90%'
}
export const DefaultStyle = {
fontFamily: 'inherit',
color: 'var(--text-color)',
};

export const FieldStyle = {
borderRadius: 'var(--radius-md)',
border: '1px solid var(--border-color)',
backgroundColor: 'var(--surface-alt)',
color: 'var(--text-color)',
padding: 'var(--space-2) var(--space-4)',
marginLeft: 'var(--space-2)',
outline: 'none',
fontFamily: 'inherit',
fontSize: '0.95rem',
transition: 'all var(--timing-standard)',
width: '100%',
boxSizing: 'border-box',
};

export const SelectStyle = {
...FieldStyle,
cursor: 'pointer',
appearance: 'none',
backgroundImage: `url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e")`,
backgroundRepeat: 'no-repeat',
backgroundPosition: 'right 0.7rem center',
backgroundSize: '1rem',
paddingRight: '2.5rem',
};

export const ListStyle = {
listStyleType: 'none',
fontFamily: 'inherit',
display: 'flex',
flexDirection: 'column',
textAlign: 'left',
marginRight: '15%',
width: '100%',
};

export const ButtonDivStyle = {
fontFamily: 'inherit',
display: 'flex',
justifyContent: 'center',
gap: 'var(--space-3)',
marginTop: 'var(--space-4)',
}

export const ButtonStyle = {
fontFamily: 'inherit',
backgroundColor: 'var(--kt-green-primary)',
color: 'white',
borderRadius: 'var(--radius-full)',
border: 'none',
padding: '10px 30px',
margin: 'var(--space-2)',
cursor: 'pointer',
fontWeight: '600',
transition: 'background-color 0.2s',
}

export const GrayButtonStyle = {
fontFamily: 'inherit',
backgroundColor: 'var(--surface-alt)',
color: 'var(--text-color)',
borderRadius: 'var(--radius-full)',
border: '1px solid var(--border-color)',
padding: '10px 20px',
margin: 'var(--space-2)',
cursor: 'pointer',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
boxShadow: 'var(--shadow-sm)',
fontWeight: '500',
transition: 'all 0.2s',
}

export const FormStyle = {
padding: 'var(--space-4)',
paddingTop: '0px',
minWidth: '360px',
width: '100%',
}

export const ItemStyle = {
margin: 'var(--space-3) 0px',
display: 'flex',
flexDirection: 'column',
gap: 'var(--space-1)',
}

export const DateFieldStyle = {
borderRadius: 'var(--radius-sm)',
border: '1px solid var(--input-border)',
backgroundColor: 'var(--input-bg)',
color: 'var(--text-color)',
marginLeft: 'var(--space-2)',
width: '150px',
padding: 'var(--space-1) var(--space-2)',
fontFamily: 'inherit',
outline: 'none',
};


export const MainContainerStyle = {
display: 'flex',
flexDirection: 'column',
padding: 'var(--space-6)',
paddingTop: '0px',
alignItems: 'center',
minWidth: '360px',
minHeight: '150px',
justifyContent: 'space-between',
backgroundColor: 'var(--card-bg)',
}

export const AddOptionsStyle = {
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
width: '100%',
padding: 'var(--space-3)',
fontFamily: 'inherit',
marginTop: 'var(--space-3)',
height: '250px',
overflow: 'auto',
border: '1px solid var(--border-color)',
borderRadius: 'var(--radius-md)',
}

export const ListingStyle = {
padding: 'var(--space-3)',
border: '1px solid var(--border-color)',
width: '100%',
marginBottom: 'var(--space-2)',
borderRadius: 'var(--radius-sm)',
backgroundColor: 'var(--surface-alt)',
}
Loading
Loading