Merge pull request #20 from rodydavis/master

Fixing errors caused in staging deployment

.gitignore

@@ -7,4 +7,5 @@ app/js/*.js
 config.js
 config.yaml
 
-app/ts/config.ts
+app/ts/config.ts
+spec.json

README.md

@@ -38,3 +38,12 @@ npm run start
 ```
 
 6. View the server at http://localhost:8080/
+
+
+## Troubleshooting
+
+```
+ImportError: cannot import name apiproxy
+```
+
+https://stackoverflow.com/questions/69465376/app-engine-python-2-7-importerror-cannot-import-name-apiproxy

app.yaml

@@ -48,6 +48,12 @@ handlers:
   - url: /third_party
     static_dir: third_party
 
+  - url: /third_party/js
+    static_dir: third_party/js
+
+  - url: /third_party/css
+    static_dir: third_party/css
+
   - url: /css
     static_dir: app/css
 

app/ts/baseCtrl.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 app.controller(
   'baseCtrl',
@@ -50,7 +50,7 @@ app.controller(
       ev.stopPropagation();
 
       // Clone project data
-      Spec.get({ id: project.id }, function (data) {
+      Spec.get({id: project.id}, function (data) {
         var newSpec = {
           group: data.group,
           groupHandle: data.groupHandle,
@@ -89,7 +89,7 @@ app.controller(
       $mdDialog.show(confirm).then(
         function () {
           // Delete project
-          Spec.delete({ id: project.id }, function (resp) {
+          Spec.delete({id: project.id}, function (resp) {
             if (callback) {
               callback();
             }

app/ts/canvasDirectives.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 declare const angular;
 

app/ts/filters.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 app.filter('nl2br', [
   '$sce',

app/ts/gapi.ts

@@ -32,7 +32,7 @@ var scopeModel;
 
 function onApiLoad() {
   gapi.load('auth');
-  gapi.load('picker', { callback: onPickerApiLoad });
+  gapi.load('picker', {callback: onPickerApiLoad});
 }
 
 function loadPicker(model) {

app/ts/groupCtrl.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 declare const angular;
 
@@ -26,7 +26,7 @@ app.controller(
 
     var groupHandle = $routeParams.group.replace(/\s+/g, '-').toLowerCase();
 
-    Spec.query({ group: groupHandle }, function (specs) {
+    Spec.query({group: groupHandle}, function (specs) {
       // Show new project message if necessary
       if (specs.length < 1) {
         $scope.hasProjects = false;

app/ts/projectListService.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 app.service('projectListService', function () {
   // multispec selection

app/ts/sidebarCtrl.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 declare const angular;
 
@@ -22,7 +22,7 @@ app.controller('sidebarCtrl', function ($scope, Spec, projectListService) {
   // Updates sidebar with new items and edits
   $scope.$on('refreshSidebar', function () {
     $scope.projectGroups = [];
-    Spec.query({ owner: $scope.user }, function (specs) {
+    Spec.query({owner: $scope.user}, function (specs) {
       $scope.projectGroups = [];
       angular.forEach(specs, function (spec, index) {
         projectListService.addProject($scope, spec);

app/ts/specCtrl.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 app.controller('specCtrl', function ($scope, $routeParams, $sce, $location) {
   // Initial Config

app/ts/specDirectives.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 /*
  * initializes wrapperElem for specTabCtrl scope
@@ -178,7 +178,7 @@ app.directive('scrubbable', function () {
         // @ts-ignore
         scrubber.draggable({
           axis: 'x',
-          cursorAt: { left: 0 },
+          cursorAt: {left: 0},
           drag: function (evt, ui) {
             ui.position.left = constrainScrubberX(ui.position.left);
             scrubVideoX(ui.position.left);

app/ts/specResource.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 app.provider('Spec', function () {
   // @ts-ignore
@@ -83,7 +83,7 @@ app.provider('Spec', function () {
 
               value.id = id;
               localStorageService.set(id, value);
-              callback({ id: id });
+              callback({id: id});
             }, 0);
           },
           update: function (params, value, callback) {

app/ts/specTabCtrl.ts

@@ -226,6 +226,13 @@ app.controller(
           const result = e.target?.result;
           if (!result) return;
           const json = JSON.parse(result as string);
+          const current = $scope.data;
+          // Copy id,persmissions, group,groupHandle
+          json.id = current.id;
+          json.permissions = current.permissions;
+          json.group = current.group;
+          json.groupHandle = current.groupHandle;
+          // json.title = current.title;
           $scope.data = json;
           $scope.spec = $scope.data.spec;
           $scope.refreshCanvas();
@@ -238,7 +245,7 @@ app.controller(
 
     $scope.exportJson = function () {
       // Export Json
-      const spec = $scope.spec;
+      const spec = $scope.data;
       const json = JSON.stringify(spec, null, 2);
       const blob = new Blob([json], {type: 'application/json'});
       const url = URL.createObjectURL(blob);

app/ts/storageService.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 declare const angular;
 
@@ -44,14 +44,24 @@ app.service(
     var sanitizedData = function (data) {
       if (typeof data === 'undefined') return data;
       // Clone data
-      var sanitizedData = JSON.parse(JSON.stringify(data));
+      let sanitizedData = JSON.parse(JSON.stringify(data));
 
       // spec properties to remove
-      delete sanitizedData.spec.canvas.width;
-      delete sanitizedData.spec.divisions.minorCount;
-      delete sanitizedData.spec.divisions.minorGap;
-      delete sanitizedData.spec.divisions.majorCount;
-      delete sanitizedData.spec.divisions.majorGap;
+      // try {
+      //   delete sanitizedData.spec.canvas.width;
+      // } catch (error) {}
+      // try {
+      //   delete sanitizedData.spec.divisions.minorCount;
+      // } catch (error) {}
+      // try {
+      //   delete sanitizedData.spec.divisions.minorGap;
+      // } catch (error) {}
+      // try {
+      //   delete sanitizedData.spec.divisions.majorCount;
+      // } catch (error) {}
+      // try {
+      //   delete sanitizedData.spec.divisions.majorGap;
+      // } catch (error) {}
 
       return sanitizedData;
     };
@@ -74,7 +84,7 @@ app.service(
     var save = function (scope) {
       // Update Spec
       Spec.update(
-        { id: scope.data.id },
+        {id: scope.data.id},
         sanitizedData(scope.data),
         function (resp) {
           console.log(resp);

app/ts/userCtrl.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { app } from './app.js';
+import {app} from './app.js';
 
 declare const angular;
 
@@ -31,7 +31,7 @@ app.controller(
       $scope.isOwner = false;
     }
 
-    Spec.query({ owner: $routeParams.user }, function (specs) {
+    Spec.query({owner: $routeParams.user}, function (specs) {
       // Show new project message if necessary
       if (specs.length < 1) {
         $scope.hasProjects = false;