Merge pull request #34 from jwagstaff/stage

Autodesk viewer and new landing

Author: rg3l3dr

index.html

@@ -13,6 +13,8 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pace/1.0.2/themes/blue/pace-theme-minimal.min.css">
     <!-- <link rel="stylesheet" href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css"/> -->
     <link rel="stylesheet" href="/static/custom.css">
+<!--     <link rel="stylesheet" href="https://developer.api.autodesk.com/modelderivative/v2/viewers/style.min.css" type="text/css">
+ -->
 
     <!-- JS that needs to load first -->
     <script type="text/javascript" src="https://js.stripe.com/v2/"></script>
@@ -25,6 +27,9 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">
     <script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>
 
+    <script src="https://developer.api.autodesk.com/modelderivative/v2/viewers/three.min.js"></script>
+    <script src="https://developer.api.autodesk.com/modelderivative/v2/viewers/viewer3D.min.js"></script>
+
     <!-- <script type="text/javascript">
     windfow.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c<p.length;c++)heap[p[c]]=o(p[c])};
       heap.load("667135797");

package.json

@@ -20,6 +20,7 @@
     "file-system": "^2.2.2",
     "fs": "0.0.1-security",
     "marked": "^0.3.6",
+    "node-sass": "^4.7.2",
     "raven-js": "^3.16.0",
     "rusha": "^0.8.6",
     "simplemde": "^1.11.2",

src/components/base/navbar.vue

@@ -84,7 +84,7 @@
             </div>
           </div>
           <router-link to="/accounts/auth/login" class="item" v-if='session.active===false'>Login</router-link>
-          <router-link to="/accounts/auth/register" v-if='session.active===false' class="item">Signup</router-link>
+          <!-- <router-link to="/accounts/auth/register" v-if='session.active===false' class="item">Signup</router-link> -->
         </div>
       </div>
 

src/components/designs/design.vue

@@ -265,13 +265,16 @@
                     <div class="ui small basic button" @click='showShareModal()'>
                       <i class="share icon"></i>Share
                     </div>
-                    <a
-                      v-if='design.shares > 0'
+                    <router-link
+                      tag='a'
                       class="ui small basic left pointing label"
-                      @click='viewShares()'
+                      :to='designRoute + "/settings/shares"'
+                      v-if='design.shares > 0'
                     >
-                      {{ design.shares }}
-                    </a>
+                      <a>
+                        {{ design.shares }}
+                      </a>
+                    </router-link>
                     <div
                       v-else
                       class='ui small basic left pointing label'