add next page, fix https

OSWeekends · Mar 1, 2017 · 30040d5 · 30040d5
1 parent a57c7ac
commit 30040d5
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 15 deletions.
diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,2 @@
 env: flex
-runtime: nodejs
-env_variables:
-  image: 'apple'
-
+runtime: custom
diff --git a/package.json b/package.json
@@ -14,7 +14,8 @@
     "pubnub": "^4.4.4",
     "serve-favicon": "^2.4.0",
     "swig": "^1.4.2",
-    "uuid": "^3.0.1"
+    "uuid": "^3.0.1",
+    "yes-https": "^0.0.3"
   },
   "devDependencies": {},
   "scripts": {

diff --git a/public/script.js b/public/script.js
@@ -65,7 +65,7 @@ function takepicture() {
     return response.json();
   }).then((result) => {
     console.log(result);
-    window.location.href = result.url;
+    window.location.href = '/next?url=' + encodeURIComponent(result.url);
   }).catch((err) => {
     console.error('There was a problem :(');
     console.error(err);

diff --git a/server.js b/server.js
@@ -7,6 +7,7 @@ const PubNub = require('pubnub');
 const multer  = require('multer');
 const uuid = require('uuid');
 const fs = require('fs');
+const yes = require('yes-https');
 const gm = require('gm');
 const child_process = require('child_process');
 const cloudSettings = {
@@ -25,6 +26,7 @@ const bucket = storage.bucket('photobooth-next');
 
 // configure express
 const app = express();
+app.use(yes());
 const upload = multer();
 app.set('views', path.join(__dirname, 'views'));
 app.engine('html', swig.renderFile);
@@ -52,6 +54,12 @@ app.get('/dashboard', (req, res, next) => {
     });
 });
 
+app.get('/next', (req, res, next) => {
+
+  res.render('next', { 
+    url: req.query.url
+  });
+});
 
 
 // find objects in the picture with the cloud vision API
@@ -91,19 +99,13 @@ app.post('/sendpic', upload.array(), (req, res, next) => {
               console.error(err);
               return next(err);
             }
-            let expiration = new Date();
-            expiration.setDate(expiration.getDate() + 1);
-            let config = {
-              action: 'read',
-              expires: expiration
-            }
-            file.getSignedUrl(config, (err, url) => {
+            file.makePublic((err, data) => {
               if (err) {
                 console.error(err);
                 return next(err);
               }
               res.json({
-                url: url
+                url: file.metadata.mediaLink
               });
           });
         });

diff --git a/views/index.html b/views/index.html
@@ -7,7 +7,7 @@
     <script src="script.js"></script>
 </head>
 <body>
-  <div id="message">Your card is on it's way!</div>
+  <div id="message">Your card is on its way!</div>
   <div class="camera">
     <video id="video">Video stream not available.</video>
     <button id="startbutton"></button>

diff --git a/views/next.html b/views/next.html
@@ -0,0 +1,41 @@
+<html>
+  <head>
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@GoogleCloud">
+    <meta name="twitter:creator" content="@JustinBeckwith">
+    <meta name="twitter:title" content="You can do that on App Engine!?">
+    <meta name="twitter:description" content="I came to GCP Next 2017 to learn all about App Engine.  You can too!">
+    <meta name="twitter:image" content="{{url}}">
+    <script>//window.location.href='https://cloud.google.com/appengine'</script>
+  </head>
+  <body>
+    <a class="twitter-share-button" 
+        data-size="large"
+        href="https://twitter.com/intent/tweet?text=I%20came%20to%20GCP%20Next%202017%20to%20learn%20all%20about%20App%20Engine.%20You%20can%20too!">
+      Tweet
+    </a>
+    <div style="margin-top:15px;">
+      <a href="https://cloud.google.com/appengine">
+        <img src="{{url}}">
+      </a>
+    <div>
+    <script>
+      window.twttr = (function(d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0],
+          t = window.twttr || {};
+        if (d.getElementById(id)) return t;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = "https://platform.twitter.com/widgets.js";
+        fjs.parentNode.insertBefore(js, fjs);
+
+        t._e = [];
+        t.ready = function(f) {
+          t._e.push(f);
+        };
+
+        return t;
+      }(document, "script", "twitter-wjs"));
+    </script>
+  </body>
+</html>
diff --git a/yarn.lock b/yarn.lock
@@ -2256,3 +2256,7 @@ yargs@~3.5.4:
     decamelize "^1.0.0"
     window-size "0.1.0"
     wordwrap "0.0.2"
+
+yes-https@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/yes-https/-/yes-https-0.0.3.tgz#d95927d619271169c7c977c753dd510252e3bae6"