removing spawm

Geovation · Nov 13, 2018 · 7ac53bd · 7ac53bd
1 parent de1812c
commit 7ac53bd
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 48 deletions.
diff --git a/functions/index.js b/functions/index.js
@@ -4,10 +4,11 @@ const functions = require('firebase-functions');
 const mkdirp = require('mkdirp-promise');
 const admin = require('firebase-admin');
 admin.initializeApp();
-const spawn = require('child-process-promise').spawn;
+admin.firestore().settings({ timestampsInSnapshots: true });
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
+const gm = require('gm').subClass({imageMagick: true});
 
 const THUMB_MAX_SIZE = 50;
 const THUMB_NAME = 'thumbnail.jpg';
@@ -62,9 +63,9 @@ exports.generateThumbnail = functions.storage.object().onFinalize(async (object)
   await file.download({destination: tempLocalFile});
   console.log('The file has been downloaded to', tempLocalFile);
   // Generate a thumbnail using ImageMagick.
-  await spawn('convert', [tempLocalFile, '-thumbnail', `${THUMB_MAX_SIZE}x${THUMB_MAX_SIZE}>`, tempLocalThumbFile], {capture: ['stdout', 'stderr']});
+  await resize(tempLocalFile, tempLocalThumbFile, THUMB_MAX_SIZE);
   console.log('Thumbnail created at', tempLocalThumbFile);
-  await spawn('convert', [tempLocalFile, '-thumbnail', `${MAIN_MAX_SIZE}x${MAIN_MAX_SIZE}>`, tempLocalMainFile], {capture: ['stdout', 'stderr']});
+  await resize(tempLocalFile, tempLocalMainFile, MAIN_MAX_SIZE);
   console.log('Main created at', tempLocalMainFile);
 
   // Uploading the Thumbnail.
@@ -98,3 +99,11 @@ exports.generateThumbnail = functions.storage.object().onFinalize(async (object)
 
   return console.log(`Thumbnail URLs saved to database.`);
 });
+
+async function resize(inFile, outFile, maxSize) {
+  return new Promise( (resolve, reject) => {
+    gm(inFile).resize(maxSize,maxSize).write(outFile, (err) => {
+      if (err) reject(err); else resolve();
+    });
+  });
+}
diff --git a/functions/package-lock.json b/functions/package-lock.json
diff --git a/functions/package.json b/functions/package.json
@@ -10,11 +10,11 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "child-process-promise": "^2.2.0",
-    "mkdirp": "^0.5.1",
-    "mkdirp-promise": "^4.0.0",
     "firebase-admin": "~6.1.0",
-    "firebase-functions": "^2.1.0"
+    "firebase-functions": "^2.1.0",
+    "gm": "^1.23.1",
+    "mkdirp": "^0.5.1",
+    "mkdirp-promise": "^4.0.0"
   },
   "devDependencies": {
     "eslint": "^4.12.0",

diff --git a/src/components/ModeratorPage.js b/src/components/ModeratorPage.js
@@ -30,9 +30,7 @@ class ModeratorPage extends Component {
       confirmDialogContent: "",
       confirmDialogHandleCancel: this.handleCancelDialog,
       confirmDialogHandleOk: null,
-      confirmDialogOpen: false,
-      photoDetailsOpen: false,
-      photoDetailsId: null
+      confirmDialogOpen: false
     };
   }
 
@@ -74,10 +72,6 @@ class ModeratorPage extends Component {
     this.setState({confirmDialogOpen: false})
   };
 
-  handleListItemClick = (photoDetailsId) => () => {
-    this.setState({photoDetailsOpen: true, photoDetailsId});
-  };
-
   render() {
     return (
       <div className='geovation-moderatorPage'>
@@ -94,7 +88,7 @@ class ModeratorPage extends Component {
         </AppBar>
         <List dense={false}>
           {this.props.photos.map(photo => (
-            <ListItem key={photo.id} button onClick={() => alert(photo)}>
+            <ListItem key={photo.id} button>
               <Avatar alt={photo.description} src={photo.thumbnail} />
               <ListItemText primary={`${photo.description}`} />
               <ListItemSecondaryAction>
@@ -108,8 +102,6 @@ class ModeratorPage extends Component {
             </ListItem>
           ))}
         </List>
-        <PhotoDetails open={this.state.photoDetailsOpen}
-          photoId={this.state.photoDetailsId}/>
         <Dialog open={this.state.confirmDialogOpen}>
           <DialogTitle>{this.state.confirmDialogTitle}</DialogTitle>
           <DialogContent>{this.state.confirmDialogContent}</DialogContent>