@churchapps/apphelper 0.1.10 → 0.1.11

package/src/components/TabPanel.tsx

@@ -1,34 +1,34 @@
-import { Box, styled } from "@mui/material";
-import React from "react"
-
-interface Props {
-  children?: React.ReactNode;
-  index: number;
-  value: number;
-}
-
-export const TabPanel: React.FC<Props> = (props: Props) => {
-
-  const { children, value, index } = props;
-  const StyledMenuBox = styled(Box)(
-    ({ theme }) => ({
-      paddingTop: 10,
-      "& .MuiListItemButton-root": { paddingLeft: 30 },
-      "& .MuiListItemIcon-root": {
-        color: theme.palette.primary.main
-      },
-      "& .MuiListItemText-root": { color: theme.palette.text.primary },
-      "& .selected .MuiListItemText-root span": { fontWeight: "bold" }
-    })
-  );
-
-  return (
-    <div role="tabpanel" hidden={value !== index} id={`userMenuPanel-${index}`}>
-      {value === index && (
-        <StyledMenuBox>
-          <Box>{children}</Box>
-        </StyledMenuBox>
-      )}
-    </div>
-  );
-}
+import { Box, styled } from "@mui/material";
+import React from "react"
+
+interface Props {
+  children?: React.ReactNode;
+  index: number;
+  value: number;
+}
+
+export const TabPanel: React.FC<Props> = (props: Props) => {
+
+  const { children, value, index } = props;
+  const StyledMenuBox = styled(Box)(
+    ({ theme }) => ({
+      paddingTop: 10,
+      "& .MuiListItemButton-root": { paddingLeft: 30 },
+      "& .MuiListItemIcon-root": {
+        color: theme.palette.primary.main
+      },
+      "& .MuiListItemText-root": { color: theme.palette.text.primary },
+      "& .selected .MuiListItemText-root span": { fontWeight: "bold" }
+    })
+  );
+
+  return (
+    <div role="tabpanel" hidden={value !== index} id={`userMenuPanel-${index}`}>
+      {value === index && (
+        <StyledMenuBox>
+          <Box>{children}</Box>
+        </StyledMenuBox>
+      )}
+    </div>
+  );
+}

package/src/components/gallery/GalleryModal.tsx

@@ -1,119 +1,119 @@
-import { FileHelper, ApiHelper } from "../../helpers";
-import { CommonEnvironmentHelper } from "../../helpers/CommonEnvironmentHelper";
-import { } from "../../helpers";
-import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, FormControl, Grid, IconButton, InputLabel, MenuItem, Select, Tab, Tabs, Tooltip, Icon } from "@mui/material";
-import React, { useState } from "react";
-import { ImageEditor } from "../ImageEditor";
-import { TabPanel } from "../TabPanel";
-import { StockPhotos } from "./StockPhotos";
-
-interface Props {
-  aspectRatio: number,
-  onClose: () => void,
-  onSelect: (img: string) => void
-}
-
-export const GalleryModal: React.FC<Props> = (props: Props) => {
-  const [images, setImages] = useState<string[]>([]);
-  const [tabIndex, setTabIndex] = React.useState(0);
-  const [aspectRatio, setAspectRatio] = React.useState(Math.round(props.aspectRatio * 100) / 100);
-  const [editorPhotoUrl, setEditorPhotoUrl] = React.useState("");
-
-  const handleTabChange = (el: any, newValue: any) => { setTabIndex(newValue); }
-
-  const loadData = () => { ApiHelper.get("/gallery/" + aspectRatio.toString(), "ContentApi").then(data => setImages(data.images)); }
-
-  const handleImageUpdated = async (dataUrl: string) => {
-    const fileName = Math.floor(Date.now() / 1000).toString() + ".jpg"
-    const blob = FileHelper.dataURLtoBlob(dataUrl);
-    const file = new File([blob], "file_name");
-
-    const params = { folder: aspectRatio.toString(), fileName };
-    const presigned = await ApiHelper.post("/gallery/requestUpload", params, "ContentApi");
-    const doUpload = presigned.key !== undefined;
-    if (doUpload) await FileHelper.postPresignedFile(presigned, file, () => { });
-    //return doUpload;
-    setTabIndex(0);
-    loadData();
-  };
-
-  const handleDelete = (folder: string, image: string) => {
-    if (window.confirm("Are you sure you wish to delete this image from gallery?")){
-      ApiHelper.delete("/gallery/" + folder + "/" + image, "ContentApi").then(() => { loadData(); });
-    }
-  }
-
-  React.useEffect(() => { if (aspectRatio !== props.aspectRatio) setAspectRatio(Math.round(props.aspectRatio * 100) / 100) }, [props.aspectRatio]); //eslint-disable-line
-  React.useEffect(loadData, [aspectRatio]); //eslint-disable-line
-
-  const getImages = () => {
-    let result: JSX.Element[] = [];
-    images.forEach(img => {
-      const parts = img.split("/");
-
-      result.push(<Grid item md={4} xs={12}>
-        <Box sx={{ position: "relative", ":hover #deleteIcon": { visibility: "visible" } }}>
-          <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onSelect(CommonEnvironmentHelper.ContentRoot + "/" + img) }}>
-            <Box component="img" src={CommonEnvironmentHelper.ContentRoot + "/" + img} className="img-fluid" alt="custom" />
-          </a>
-          <Box id="deleteIcon" sx={{ position: "absolute", top: 3, right: 3, visibility: "hidden", backgroundColor: "whitesmoke", borderRadius: 5 }}>
-            <Tooltip title="Delete">
-              <IconButton size="small" color="error" onClick={() => handleDelete(parts[2], parts[3])}>
-                <Icon sx={{ fontSize: "17px !important" }}>delete_outline</Icon>
-              </IconButton>
-          </Tooltip>
-          </Box>
-        </Box>
-      </Grid>);
-    })
-    return result;
-  }
-
-  const handleStockSelect = (url: string) => {
-    setEditorPhotoUrl(url);
-    setTabIndex(1);
-  }
-
-  return (<>
-    <Dialog open={true} onClose={props.onClose}>
-      <DialogTitle>Select a Photo</DialogTitle>
-      <DialogContent style={{ minWidth: 600 }}>
-
-        <Tabs variant="fullWidth" value={tabIndex} onChange={handleTabChange}>
-          <Tab label="Gallery" />
-          <Tab label="Upload" />
-          <Tab label="Stock Photos" />
-        </Tabs>
-        <TabPanel value={tabIndex} index={0}>
-          {(props.aspectRatio === 0) && (
-            <FormControl fullWidth>
-              <InputLabel>Aspect Ratio</InputLabel>
-              <Select size="small" label="Aspect Ratio" name="aspectRatio" value={aspectRatio} onChange={(e) => setAspectRatio(parseFloat(e.target.value.toString()))}>
-                <MenuItem value="0">Free Form</MenuItem>
-                <MenuItem value="1">1:1</MenuItem>
-                <MenuItem value="2">2:1</MenuItem>
-                <MenuItem value="4">4:1</MenuItem>
-                <MenuItem value="1.33">4:3</MenuItem>
-                <MenuItem value="1.78">16:9</MenuItem>
-                <MenuItem value="0.5">1:2</MenuItem>
-                <MenuItem value="0.5625">9:16</MenuItem>
-              </Select>
-            </FormControl>
-          )}
-          <Grid container spacing={3} alignItems="center">
-            {getImages()}
-          </Grid>
-        </TabPanel>
-        <TabPanel value={tabIndex} index={1}>
-          <ImageEditor onUpdate={handleImageUpdated} photoUrl={editorPhotoUrl} aspectRatio={aspectRatio} outputWidth={1280} outputHeight={768} hideDelete={true} />
-        </TabPanel>
-        <TabPanel value={tabIndex} index={2}>
-          <StockPhotos aspectRatio={aspectRatio} onSelect={props.onSelect} onStockSelect={handleStockSelect} />
-        </TabPanel>
-      </DialogContent>
-      <DialogActions sx={{ paddingX: "16px", paddingBottom: "12px" }}>
-        <Button variant="outlined" onClick={props.onClose}>Close</Button>
-      </DialogActions>
-    </Dialog>
-  </>);
-};
+import { FileHelper, ApiHelper } from "../../helpers";
+import { CommonEnvironmentHelper } from "../../helpers/CommonEnvironmentHelper";
+import { } from "../../helpers";
+import { Box, Button, Dialog, DialogActions, DialogContent, DialogTitle, FormControl, Grid, IconButton, InputLabel, MenuItem, Select, Tab, Tabs, Tooltip, Icon } from "@mui/material";
+import React, { useState } from "react";
+import { ImageEditor } from "../ImageEditor";
+import { TabPanel } from "../TabPanel";
+import { StockPhotos } from "./StockPhotos";
+
+interface Props {
+  aspectRatio: number,
+  onClose: () => void,
+  onSelect: (img: string) => void
+}
+
+export const GalleryModal: React.FC<Props> = (props: Props) => {
+  const [images, setImages] = useState<string[]>([]);
+  const [tabIndex, setTabIndex] = React.useState(0);
+  const [aspectRatio, setAspectRatio] = React.useState(Math.round(props.aspectRatio * 100) / 100);
+  const [editorPhotoUrl, setEditorPhotoUrl] = React.useState("");
+
+  const handleTabChange = (el: any, newValue: any) => { setTabIndex(newValue); }
+
+  const loadData = () => { ApiHelper.get("/gallery/" + aspectRatio.toString(), "ContentApi").then(data => setImages(data.images)); }
+
+  const handleImageUpdated = async (dataUrl: string) => {
+    const fileName = Math.floor(Date.now() / 1000).toString() + ".jpg"
+    const blob = FileHelper.dataURLtoBlob(dataUrl);
+    const file = new File([blob], "file_name");
+
+    const params = { folder: aspectRatio.toString(), fileName };
+    const presigned = await ApiHelper.post("/gallery/requestUpload", params, "ContentApi");
+    const doUpload = presigned.key !== undefined;
+    if (doUpload) await FileHelper.postPresignedFile(presigned, file, () => { });
+    //return doUpload;
+    setTabIndex(0);
+    loadData();
+  };
+
+  const handleDelete = (folder: string, image: string) => {
+    if (window.confirm("Are you sure you wish to delete this image from gallery?")){
+      ApiHelper.delete("/gallery/" + folder + "/" + image, "ContentApi").then(() => { loadData(); });
+    }
+  }
+
+  React.useEffect(() => { if (aspectRatio !== props.aspectRatio) setAspectRatio(Math.round(props.aspectRatio * 100) / 100) }, [props.aspectRatio]); //eslint-disable-line
+  React.useEffect(loadData, [aspectRatio]); //eslint-disable-line
+
+  const getImages = () => {
+    let result: JSX.Element[] = [];
+    images.forEach(img => {
+      const parts = img.split("/");
+
+      result.push(<Grid item md={4} xs={12}>
+        <Box sx={{ position: "relative", ":hover #deleteIcon": { visibility: "visible" } }}>
+          <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onSelect(CommonEnvironmentHelper.ContentRoot + "/" + img) }}>
+            <Box component="img" src={CommonEnvironmentHelper.ContentRoot + "/" + img} className="img-fluid" alt="custom" />
+          </a>
+          <Box id="deleteIcon" sx={{ position: "absolute", top: 3, right: 3, visibility: "hidden", backgroundColor: "whitesmoke", borderRadius: 5 }}>
+            <Tooltip title="Delete">
+              <IconButton size="small" color="error" onClick={() => handleDelete(parts[2], parts[3])}>
+                <Icon sx={{ fontSize: "17px !important" }}>delete_outline</Icon>
+              </IconButton>
+          </Tooltip>
+          </Box>
+        </Box>
+      </Grid>);
+    })
+    return result;
+  }
+
+  const handleStockSelect = (url: string) => {
+    setEditorPhotoUrl(url);
+    setTabIndex(1);
+  }
+
+  return (<>
+    <Dialog open={true} onClose={props.onClose}>
+      <DialogTitle>Select a Photo</DialogTitle>
+      <DialogContent style={{ minWidth: 600 }}>
+
+        <Tabs variant="fullWidth" value={tabIndex} onChange={handleTabChange}>
+          <Tab label="Gallery" />
+          <Tab label="Upload" />
+          <Tab label="Stock Photos" />
+        </Tabs>
+        <TabPanel value={tabIndex} index={0}>
+          {(props.aspectRatio === 0) && (
+            <FormControl fullWidth>
+              <InputLabel>Aspect Ratio</InputLabel>
+              <Select size="small" label="Aspect Ratio" name="aspectRatio" value={aspectRatio} onChange={(e) => setAspectRatio(parseFloat(e.target.value.toString()))}>
+                <MenuItem value="0">Free Form</MenuItem>
+                <MenuItem value="1">1:1</MenuItem>
+                <MenuItem value="2">2:1</MenuItem>
+                <MenuItem value="4">4:1</MenuItem>
+                <MenuItem value="1.33">4:3</MenuItem>
+                <MenuItem value="1.78">16:9</MenuItem>
+                <MenuItem value="0.5">1:2</MenuItem>
+                <MenuItem value="0.5625">9:16</MenuItem>
+              </Select>
+            </FormControl>
+          )}
+          <Grid container spacing={3} alignItems="center">
+            {getImages()}
+          </Grid>
+        </TabPanel>
+        <TabPanel value={tabIndex} index={1}>
+          <ImageEditor onUpdate={handleImageUpdated} photoUrl={editorPhotoUrl} aspectRatio={aspectRatio} outputWidth={1280} outputHeight={768} hideDelete={true} />
+        </TabPanel>
+        <TabPanel value={tabIndex} index={2}>
+          <StockPhotos aspectRatio={aspectRatio} onSelect={props.onSelect} onStockSelect={handleStockSelect} />
+        </TabPanel>
+      </DialogContent>
+      <DialogActions sx={{ paddingX: "16px", paddingBottom: "12px" }}>
+        <Button variant="outlined" onClick={props.onClose}>Close</Button>
+      </DialogActions>
+    </Dialog>
+  </>);
+};

package/src/components/gallery/StockPhotos.tsx

@@ -1,74 +1,74 @@
-import { Button, Grid, TextField } from "@mui/material";
-import React, { useState } from "react";
-import { ApiHelper } from "../../helpers";
-import { CommonEnvironmentHelper } from "../../helpers/CommonEnvironmentHelper";
-
-interface Props {
-  aspectRatio: number,
-  onSelect: (img: string) => void,
-  onStockSelect: (img: string) => void
-}
-
-interface SearchResult { description: string, url: string, photographer: string, photographerUrl: string, large: string, thumbnail: string }
-
-export const StockPhotos: React.FC<Props> = (props: Props) => {
-  const [images, setImages] = useState<string[]>([]);
-  const [searchText, setSearchText] = useState("");
-  const [searchResults, setSearchResults] = useState<SearchResult[]>(null);
-
-  const loadData = () => { ApiHelper.getAnonymous("/gallery/stock/" + props.aspectRatio.toString(), "ContentApi").then(data => setImages(data.images)); }
-
-  React.useEffect(loadData, [props.aspectRatio]); //eslint-disable-line
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => { e.preventDefault(); setSearchText(e.currentTarget.value); }
-
-  const handleSearch = (e: React.MouseEvent) => {
-    if (e !== null) e.preventDefault();
-    let term = searchText.trim();
-    ApiHelper.post("/stock/search", { term: term }, "ContentApi").then((data: SearchResult[]) => { setSearchResults(data) });
-  }
-
-  const getImages = () => {
-    if (searchResults) return getResults();
-    else return getSuggested();
-  }
-
-  const getResults = () => {
-    let result: JSX.Element[] = [];
-    searchResults.forEach(p => {
-      result.push(<Grid item md={4} xs={12}>
-        <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onStockSelect(p.large) }}>
-          <img src={p.thumbnail} className="img-fluid" alt="stock" />
-        </a>
-        <div>
-          <i style={{ fontSize: 12 }}>
-            <a href={p.url} target="_blank" rel="noreferrer noopener">Photo</a> by: <a href={p.photographerUrl} target="_blank" rel="noreferrer noopener">{p.photographer}</a></i>
-        </div>
-      </Grid>);
-    })
-    return result;
-  }
-
-  const getSuggested = () => {
-    let result: JSX.Element[] = [];
-    images.forEach(img => {
-      result.push(<Grid item md={4} xs={12}>
-        <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onSelect(CommonEnvironmentHelper.ContentRoot + "/" + img) }}>
-          <img src={CommonEnvironmentHelper.ContentRoot + "/" + img} className="img-fluid" alt="stock" />
-        </a>
-      </Grid>);
-    })
-    return result;
-  }
-
-  return (<>
-    <TextField fullWidth name="personAddText" label="Search Term" value={searchText} onChange={handleChange}
-      InputProps={{ endAdornment: <Button variant="contained" id="searchButton" data-cy="search-button" onClick={handleSearch}>Search</Button> }}
-    />
-    {searchResults && <div>Stock photos provided by <a href="https://pexels.com">Pexels</a>.</div>}
-    <Grid container spacing={3} alignItems="center">
-      {getImages()}
-    </Grid>
-
-  </>);
-};
+import { Button, Grid, TextField } from "@mui/material";
+import React, { useState } from "react";
+import { ApiHelper } from "../../helpers";
+import { CommonEnvironmentHelper } from "../../helpers/CommonEnvironmentHelper";
+
+interface Props {
+  aspectRatio: number,
+  onSelect: (img: string) => void,
+  onStockSelect: (img: string) => void
+}
+
+interface SearchResult { description: string, url: string, photographer: string, photographerUrl: string, large: string, thumbnail: string }
+
+export const StockPhotos: React.FC<Props> = (props: Props) => {
+  const [images, setImages] = useState<string[]>([]);
+  const [searchText, setSearchText] = useState("");
+  const [searchResults, setSearchResults] = useState<SearchResult[]>(null);
+
+  const loadData = () => { ApiHelper.getAnonymous("/gallery/stock/" + props.aspectRatio.toString(), "ContentApi").then(data => setImages(data.images)); }
+
+  React.useEffect(loadData, [props.aspectRatio]); //eslint-disable-line
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => { e.preventDefault(); setSearchText(e.currentTarget.value); }
+
+  const handleSearch = (e: React.MouseEvent) => {
+    if (e !== null) e.preventDefault();
+    let term = searchText.trim();
+    ApiHelper.post("/stock/search", { term: term }, "ContentApi").then((data: SearchResult[]) => { setSearchResults(data) });
+  }
+
+  const getImages = () => {
+    if (searchResults) return getResults();
+    else return getSuggested();
+  }
+
+  const getResults = () => {
+    let result: JSX.Element[] = [];
+    searchResults.forEach(p => {
+      result.push(<Grid item md={4} xs={12}>
+        <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onStockSelect(p.large) }}>
+          <img src={p.thumbnail} className="img-fluid" alt="stock" />
+        </a>
+        <div>
+          <i style={{ fontSize: 12 }}>
+            <a href={p.url} target="_blank" rel="noreferrer noopener">Photo</a> by: <a href={p.photographerUrl} target="_blank" rel="noreferrer noopener">{p.photographer}</a></i>
+        </div>
+      </Grid>);
+    })
+    return result;
+  }
+
+  const getSuggested = () => {
+    let result: JSX.Element[] = [];
+    images.forEach(img => {
+      result.push(<Grid item md={4} xs={12}>
+        <a href="about:blank" onClick={(e) => { e.preventDefault(); props.onSelect(CommonEnvironmentHelper.ContentRoot + "/" + img) }}>
+          <img src={CommonEnvironmentHelper.ContentRoot + "/" + img} className="img-fluid" alt="stock" />
+        </a>
+      </Grid>);
+    })
+    return result;
+  }
+
+  return (<>
+    <TextField fullWidth name="personAddText" label="Search Term" value={searchText} onChange={handleChange}
+      InputProps={{ endAdornment: <Button variant="contained" id="searchButton" data-cy="search-button" onClick={handleSearch}>Search</Button> }}
+    />
+    {searchResults && <div>Stock photos provided by <a href="https://pexels.com">Pexels</a>.</div>}
+    <Grid container spacing={3} alignItems="center">
+      {getImages()}
+    </Grid>
+
+  </>);
+};

package/src/components/gallery/index.ts

@@ -1 +1 @@
-export { GalleryModal } from "./GalleryModal";
+export { GalleryModal } from "./GalleryModal";