Skip to content

Commit 6c1d0e8

Browse files
jzongkerjzongker
committed
Updated apphelper and material ui components
1 parent 2b0f921 commit 6c1d0e8

11 files changed

Lines changed: 184 additions & 253 deletions

File tree

‎package-lock.json‎

Lines changed: 104 additions & 152 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"private": true,
55
"type": "module",
66
"dependencies": {
7-
"@churchapps/apphelper": "^0.4.35",
8-
"@churchapps/apphelper-donations": "^0.4.35",
9-
"@churchapps/apphelper-forms": "^0.4.35",
10-
"@churchapps/apphelper-login": "^0.4.35",
11-
"@churchapps/apphelper-markdown": "^0.4.35",
12-
"@churchapps/helpers": "^1.1.3",
7+
"@churchapps/apphelper": "^0.4.41",
8+
"@churchapps/apphelper-donations": "^0.4.41",
9+
"@churchapps/apphelper-forms": "^0.4.41",
10+
"@churchapps/apphelper-login": "^0.4.41",
11+
"@churchapps/apphelper-markdown": "^0.4.41",
12+
"@churchapps/helpers": "^1.1.4",
1313
"@mui/icons-material": "^7.1.2",
1414
"@mui/material": "^7.1.2",
1515
"@stripe/react-stripe-js": "^3.8.0",
@@ -32,6 +32,7 @@
3232
"devDependencies": {
3333
"@eslint/js": "^9.28.0",
3434
"@playwright/test": "^1.53.1",
35+
"@rollup/rollup-win32-x64-msvc": "^4.49.0",
3536
"@tanstack/react-query-devtools": "^5.83.0",
3637
"@types/react": "^19.1.8",
3738
"@types/react-csv": "^1.1.10",

‎src/forms/components/FormMembers.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ export const FormMembers: React.FC<Props> = memo((props) => {
168168

169169
return (
170170
<Grid container spacing={3}>
171-
<Grid xs={12} md={8}>
171+
<Grid size={{ xs: 12, md: 8 }}>
172172
<DisplayBox headerText={Locale.label("forms.formMembers.formMem")} headerIcon="group" help="chums/forms">
173173
{getTable()}
174174
</DisplayBox>
175175
</Grid>
176-
<Grid xs={12} md={4}>
176+
<Grid size={{ xs: 12, md: 4 }}>
177177
<DisplayBox headerText={Locale.label("forms.formMembers.addPpl")} headerIcon="person_add">
178178
<PersonAdd getPhotoUrl={PersonHelper.getPhotoUrl} addFunction={addPerson} filterList={filterList} />
179179
</DisplayBox>

‎src/forms/components/FormSubmissions.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
} from "@churchapps/apphelper";
1616
import { useReactToPrint } from "react-to-print";
1717
import {
18-
Grid, Icon, Table, TableBody, TableRow, TableCell, TableHead, Card, Box, Typography, Stack
18+
Grid, Icon, Table, TableBody, TableRow, TableCell, TableHead, Card, Box, Typography, Stack
1919
} from "@mui/material";
2020
import { useQuery } from "@tanstack/react-query";
2121

@@ -146,7 +146,7 @@ export const FormSubmissions: React.FC<Props> = memo((props) => {
146146
const results: JSX.Element[] = [];
147147
summary.forEach((s: any, i: number) => {
148148
results.push(
149-
<Grid xs={12} md={6} key={s.id + "-" + i}>
149+
<Grid size={{ xs: 12, md: 6 }} key={s.id + "-" + i}>
150150
<h4>{s.title}</h4>
151151
{getResultCount(s.values)}
152152
</Grid>
@@ -220,11 +220,11 @@ export const FormSubmissions: React.FC<Props> = memo((props) => {
220220
formSubmissions.data?.forEach((submission: any, i: number) => {
221221
// Process the submission data inline
222222
const processedSubmission = people.data ? setFormSubmissionData(people.data, submission) : submission;
223-
223+
224224
// Allow submissions even without a person ID (anonymous submissions)
225225
const personName = processedSubmission.person?.name || Locale.label("forms.formSubmissions.anon");
226226
const personId = processedSubmission.person?.id;
227-
227+
228228
rows.push(
229229
<TableRow
230230
key={i}
@@ -315,7 +315,7 @@ export const FormSubmissions: React.FC<Props> = memo((props) => {
315315

316316
return (
317317
<Grid container spacing={3}>
318-
<Grid xs={12} md={8} className="form-submission-summary">
318+
<Grid size={{ xs: 12, md: 8 }} className="form-submission-summary">
319319
<div ref={contentRef} className="form-submission-summary">
320320
<DisplayBox headerText={Locale.label("forms.formSubmissions.subSum")} headerIcon="group" editContent={editLinks}>
321321
<Grid container spacing={3}>

‎src/groups/components/GroupSessions.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ export const GroupSessions: React.FC<Props> = memo((props) => {
301301
<Box sx={{ mb: 3 }}>
302302
<Grid container spacing={2} sx={{ mb: 2 }}>
303303
{paginatedSessions.map((sessionItem) => (
304-
<Grid item xs={12} sm={6} md={4} lg={3} key={sessionItem.id}>
304+
<Grid item size={{ xs: 12, sm: 6, md: 4, lg: 3 }} key={sessionItem.id}>
305305
<SessionCard
306306
session={sessionItem}
307307
attendanceCount={sessionAttendanceCounts[sessionItem.id] || 0}

‎src/settings/RolePage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ export const RolePage = () => {
7777
</Banner>
7878
<div id="mainContent">
7979
<Grid container spacing={3}>
80-
<Grid xs={12} md={8}>
80+
<Grid size={{ xs: 12, md: 8 }}>
8181
<RoleMembers role={role} roleMembers={roleMembers} addFunction={handleShowAdd} setSelectedRoleMember={setSelectedRoleMemberId} updatedFunction={handleAdd} />
8282
</Grid>
83-
<Grid xs={12} md={4}>
83+
<Grid size={{ xs: 12, md: 4 }}>
8484
{getSidebar()}
8585
</Grid>
8686
</Grid>

‎src/settings/components/BigLinkButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface Props {
1010
}
1111

1212
export const BigLinkButton: React.FC<Props> = React.memo((props) => (
13-
<Grid xs={6} md={3}>
13+
<Grid size={{ xs: 6, md: 3 }}>
1414
<LinkType href={props.href} outsideLink={props.outsideLink}>
1515
<Card>
1616
<CardContent sx={{ textAlign: "center" }}>

‎src/settings/components/DomainSettingsEdit.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const DomainSettingsEdit: React.FC<Props> = (props) => {
107107
{Locale.label("settings.domainSettingsEdit.domMsg4")}
108108
</p>
109109
<Grid container spacing={3}>
110-
<Grid xs={12} md={6}>
110+
<Grid size={{ xs: 12, md: 6 }}>
111111
<Table>
112112
<TableHead>
113113
<TableRow>

‎src/settings/components/FeeOptionsSettingsEdit.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const FeeOptionsSettingsEdit: React.FC<Props> = (props) => {
9696

9797
return (
9898
<Grid container spacing={2}>
99-
<Grid xs={12} md={6}>
99+
<Grid size={{ xs: 12, md: 6 }}>
100100
<TextField
101101
fullWidth
102102
margin="dense"
@@ -110,7 +110,7 @@ export const FeeOptionsSettingsEdit: React.FC<Props> = (props) => {
110110
InputProps={{ startAdornment: <Icon fontSize="small">attach_money</Icon> }}
111111
/>
112112
</Grid>
113-
<Grid xs={12} md={6}>
113+
<Grid size={{ xs: 12, md: 6 }}>
114114
<TextField
115115
fullWidth
116116
margin="dense"
@@ -124,7 +124,7 @@ export const FeeOptionsSettingsEdit: React.FC<Props> = (props) => {
124124
InputProps={{ endAdornment: <Icon fontSize="small">percent</Icon> }}
125125
/>
126126
</Grid>
127-
<Grid xs={12} md={6}>
127+
<Grid size={{ xs: 12, md: 6 }}>
128128
<TextField
129129
fullWidth
130130
margin="dense"
@@ -138,7 +138,7 @@ export const FeeOptionsSettingsEdit: React.FC<Props> = (props) => {
138138
InputProps={{ endAdornment: <Icon fontSize="small">percent</Icon> }}
139139
/>
140140
</Grid>
141-
<Grid xs={12} md={6}>
141+
<Grid size={{ xs: 12, md: 6 }}>
142142
<TextField
143143
fullWidth
144144
margin="dense"

‎src/settings/components/GivingSettingsEdit.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ export const GivingSettingsEdit: React.FC<Props> = (props) => {
3939
else {
4040
return (
4141
<>
42-
<Grid xs={12} md={4}>
42+
<Grid size={{ xs: 12, md: 4 }}>
4343
<TextField fullWidth name="publicKey" label={Locale.label("settings.givingSettingsEdit.pubKey")} value={publicKey} onChange={handleChange} />
4444
</Grid>
45-
<Grid xs={12} md={4}>
45+
<Grid size={{ xs: 12, md: 4 }}>
4646
<TextField fullWidth name="privateKey" label={Locale.label("settings.givingSettingsEdit.secKey")} value={privateKey} placeholder="********" type="password" onChange={handleChange} />
4747
</Grid>
48-
<Grid xs={12}>
48+
<Grid size={{ xs: 12 }}>
4949
<Stack direction="row" alignItems="center">
5050
<Typography>{Locale.label("settings.givingSettingsEdit.transFee")}</Typography>
5151
<Tooltip title={Locale.label("settings.givingSettingsEdit.forceMsg")} arrow>
@@ -113,7 +113,7 @@ export const GivingSettingsEdit: React.FC<Props> = (props) => {
113113
<>
114114
{/* <div className="subHead">{Locale.label("settings.givingSettingsEdit.giving")}</div> */}
115115
<Grid container spacing={3} marginBottom={2}>
116-
<Grid xs={12} md={4}>
116+
<Grid size={{ xs: 12, md: 4 }}>
117117
<FormControl fullWidth>
118118
<InputLabel>{Locale.label("settings.givingSettingsEdit.prov")}</InputLabel>
119119
<Select name="provider" label={Locale.label("settings.givingSettingsEdit.prov")} value={provider} onChange={handleChange}>

0 commit comments

Comments
 (0)