switched ajax calls to Heroku-deployed server

js/res/images.js

@@ -5,22 +5,30 @@ const images =  {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit//master/graphics/backgrounds/Kaleidoscope.mp4',
                 url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/abstract-kaleidoscope-background-beautiful-multicolor-260nw-1084042973.jpg'
             }, 
+         beach: {
+                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg',
+                url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg'
+            }, 
          space: {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/ps_space.jpg',
                 url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/ps_space.jpg'
             }, 
-         comicon: {
-                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/comicon%20360%20image.jpg',
-                url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/comicon%20360%20image.jpg'
-            }, 
          theater: {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/theater.jpg',
                 url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/theater-thumbnail.jpg'
             }, 
+         comicon: {
+                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/comicon%20360%20image.jpg',
+                url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/comicon%20360%20image.jpg'
+            }, 
          interior: {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/interior%20360%20image.jpg',
                 url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/interior%20360%20image.jpg'
             }, 
+         alps: {
+                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/alps.mp4',
+                url: ''
+            }, 
          cheshire: {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/chesh.mp4',
                 url: ''
@@ -29,14 +37,6 @@ const images =  {
                 uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/IMG_0635.JPG',
                 url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/IMG_0635.JPG'
             }, 
-         beach: {
-                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg',
-                url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg'
-            }, 
-         alps: {
-                uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/alps.mp4',
-                url: ''
-            }, 
   },
 
         element: { 
@@ -50,9 +50,9 @@ const images =  {
           }, 
        alduin: {
               uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin-dragon.obj',
-              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin.jpg'
-,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin-dragon.mtl'
+              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin-dragon.mtl'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin_n.jpg'
+,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduin.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduineyes.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alduin/alduineyes_g.jpg'
  ],
@@ -88,14 +88,14 @@ const images =  {
           }, 
        ballChair: {
               uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/ball-chair.obj',
-              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/ball-chair.mtl'
-,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/padding_bump.jpg'
+              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/padding_bump.jpg'
+,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/ball-chair.mtl'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/padding_color.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/padding_specular.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/pillows_bump.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/pillows_color.jpg'
-,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/trim_color.jpg'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/shell_color.jpg'
+,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/trim_color.jpg'
  ],
               url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/ball-chair/ball-chair-thumbnail.jpg' 
 
@@ -125,6 +125,13 @@ const images =  {
  ],
               url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/alice/aliceThumbnail.png' 
 
+          }, 
+       heart: {
+              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heart.obj',
+              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heart.mtl'
+ ],
+              url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heartThumbnail.jpg' 
+
           }, 
        goku: {
               uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/goku.obj',
@@ -138,21 +145,14 @@ const images =  {
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_25.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_24.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_23.png'
-,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_22.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_21.png'
+,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_22.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_20.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_19.png'
 ,'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/Dolphin.exe_Tue_Mar_22_01-00-09_2011_18.png'
  ],
               url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/goku/GokuThumbnail.jpg' 
 
-          }, 
-       heart: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heart.obj',
-              resources: ['https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heart.mtl'
- ],
-              url: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/elements/heart/heartThumbnail.jpg' 
-
           }, 
  },
 
@@ -162,24 +162,12 @@ const images =  {
     uri:
       'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/defaults/portal-2-aperture-laboratories-video-game-clip-art-portal.jpg'
   }, 
-       beach_vacation: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg'
-          }, 
-
-               Publicevent: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/defaults/portal.png'
-          }, 
-
-               Dragonbroad: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/defaults/portal.png'
-          }, 
-
-               Something: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/defaults/portal.png'
+       party_event: {
+              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/abstract-kaleidoscope-background-beautiful-multicolor-260nw-1084042973.jpg'
           }, 
 
-               party_event: {
-              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/abstract-kaleidoscope-background-beautiful-multicolor-260nw-1084042973.jpg'
+               beach_vacation: {
+              uri: 'https://raw.githubusercontent.com/mARkitFS/mARkit/master/graphics/backgrounds/guadalupe_360.jpg'
           }, 
 
          }

js/screens/CreatorDashboard.js

@@ -27,7 +27,7 @@ class CreatorDashboard extends Component {
     this.setState({userId: userId});
     try {
       const {data} = await axios.get(
-        `http://10.1.85.95:8080/api/portals/user/${userId}`,
+        `https://vast-falls-27580.herokuapp.com/api/portals/user/${userId}`,
       );
       this.setState({items: data});
     } catch (error) {

js/screens/creationPage.js

@@ -42,10 +42,10 @@ class CreationPage extends Component {
 
     try {
       const backgrounds = await axios.get(
-        `http://10.1.85.95:8080/api/backgrounds`,
+        `https://vast-falls-27580.herokuapp.com/api/backgrounds`,
       );
       console.log('CDM background ajax call: ', backgrounds);
-      const elements = await axios.get(`http://10.1.85.95:8080/api/elements`);
+      const elements = await axios.get(`https://vast-falls-27580.herokuapp.com/api/elements`);
       console.log('CDM element ajax call: ', elements);
       this.setState({
         allBackgrounds: backgrounds.data,
@@ -79,12 +79,12 @@ class CreationPage extends Component {
     };
     try {
       const newPortal = await axios.post(
-        'http://10.1.85.95:8080/api/portals/add',
+        'https://vast-falls-27580.herokuapp.com/api/portals/add',
         portalObj,
       );
 
       const {data} = await axios.get(
-        `http://10.1.85.95:8080/api/portals/${newPortal.data.id}`,
+        `https://vast-falls-27580.herokuapp.com/api/portals/${newPortal.data.id}`,
       );
 
       console.log('newPortal:>>>>', newPortal.data);
@@ -131,7 +131,7 @@ class CreationPage extends Component {
       };
       try {
         const newElementProps = await axios.post(
-          'http://10.1.85.95:8080/api/elementprops/add',
+          'https://vast-falls-27580.herokuapp.com/api/elementprops/add',
           elementPropsObj,
         );
         console.log('newElementProps: ', newElementProps);
@@ -160,7 +160,7 @@ class CreationPage extends Component {
       };
       try {
         const newPortel = await axios.post(
-          'http://10.1.85.95:8080/api/portels/add',
+          'https://vast-falls-27580.herokuapp.com/api/portels/add',
           portelObj,
         );
         console.log('newPortel: ', newPortel);
@@ -248,7 +248,7 @@ class CreationPage extends Component {
                 items: this.state.allElements,
                 type: 'element',
                 userId: this.state.userId,
-                selectedBackground,
+                selectedBackground: this.state.selectedBackground,
               })
             }>
             <Text style={{fontSize: 20, textAlign: 'center'}}>
@@ -260,7 +260,15 @@ class CreationPage extends Component {
           {/* view for previewbutton */}
           <TouchableOpacity
             // title="Preview your work"
-            onPress={this.handleSubmit}
+            onPress={() =>
+              navigate('PreviewPortal', {
+                items: [
+                  this.state.selectedBackground,
+                  ...this.state.selectedElements,
+                ],
+                userId: this.state.userId,
+              })
+            }
             style={{
               width: 400,
               backgroundColor: '#FDB327',

js/screens/filteredDashboard.js

@@ -27,7 +27,7 @@ class FilteredDashboard extends Component {
     this.setState({userId: userId});
     try {
       const {data} = await axios.get(
-        `http://10.1.85.95:8080/api/portals/user/${userId}`,
+        `https://vast-falls-27580.herokuapp.com/api/portals/user/${userId}`,
       );
       this.setState({items: data});
     } catch (error) {

js/screens/previewPortal.js

@@ -56,12 +56,12 @@ export default class PreviewPortal extends Component {
     };
     try {
       const newPortal = await axios.post(
-        'http://10.1.85.95:8080/api/portals/add',
+        'https://vast-falls-27580.herokuapp.com/api/portals/add',
         portalObj,
       );
 
       const {data} = await axios.get(
-        `http://10.1.85.95:8080/api/portals/${newPortal.data.id}`,
+        `https://vast-falls-27580.herokuapp.com/api/portals/${newPortal.data.id}`,
       );
       console.log('newPortal:>>>>', newPortal.data);
       this.addPortels(newPortal.data.id);
@@ -101,7 +101,7 @@ export default class PreviewPortal extends Component {
       };
       try {
         const newElementProps = await axios.post(
-          'http://10.1.85.95:8080/api/elementprops/add',
+          'https://vast-falls-27580.herokuapp.com/api/elementprops/add',
           elementPropsObj,
         );
         console.log('newElementProps: ', newElementProps);
@@ -132,7 +132,7 @@ export default class PreviewPortal extends Component {
       };
       try {
         const newPortel = await axios.post(
-          'http://10.1.85.95:8080/api/portels/add',
+          'https://vast-falls-27580.herokuapp.com/api/portels/add',
           portelObj,
         );
         console.log('newPortel: ', newPortel);
@@ -143,6 +143,7 @@ export default class PreviewPortal extends Component {
   }
 
   render() {
+    console.log(this.state.items, 'this.state.items');
     if (this.state.items.length === 0) {
       return (
         <View style={styles.loader}>

js/screens/singlePortal.js

@@ -26,10 +26,10 @@ export default class SinglePortal extends Component {
     const portalId = portal.id;
     try {
       const element = await axios.get(
-        `http://10.1.85.95:8080/api/elementprops/portal/${portalId}`,
+        `https://vast-falls-27580.herokuapp.com/api/elementprops/portal/${portalId}`,
       );
       const background = await axios.get(
-        `http://10.1.85.95:8080/api/backgrounds/${portal.backgroundId}`,
+        `https://vast-falls-27580.herokuapp.com/api/backgrounds/${portal.backgroundId}`,
       );
       let Viro360Type =
         background.data.type === 'Viro360Video' ? Viro360Video : Viro360Image;

js/screens/viewerDashboard.js

@@ -20,7 +20,7 @@ export default class Table extends Component {
   }
   async componentDidMount() {
     try {
-      const {data} = await axios.get(`http://10.1.85.95:8080/api/portals`);
+      const {data} = await axios.get(`https://vast-falls-27580.herokuapp.com/api/portals`);
       this.setState({items: data});
     } catch (err) {
       console.error(err);

script/createImage.js

@@ -5,12 +5,12 @@ const colors = require('colors');
 (async () => {
   const portalId = 1;
   const element = await axios.get(
-    `http://10.1.85.95:8080/api/elements/format/${portalId}`,
+    `https://vast-falls-27580.herokuapp.com/api/elements/format/${portalId}`,
   );
 
-  const background = await axios.get(`http://10.1.85.95:8080/api/backgrounds`);
+  const background = await axios.get(`https://vast-falls-27580.herokuapp.com/api/backgrounds`);
 
-  const portal = await axios.get(`http://10.1.85.95:8080/api/portals`);
+  const portal = await axios.get(`https://vast-falls-27580.herokuapp.com/api/portals`);
 
   let defaultPortal = `default: {
     uri: