Add upload and download (local files) to the BlocklyProp system

pjewald · pjewald · commit 6be953eb5352 · 2017-01-07T14:04:55.000-08:00
diff --git a/src/main/java/com/parallax/server/blocklyprop/converter/ProjectConverter.java b/src/main/java/com/parallax/server/blocklyprop/converter/ProjectConverter.java
@@ -84,10 +84,8 @@ public JsonObject toJson(ProjectRecord project) {
         result.addProperty("modified", DateConversion.toDateTimeString(project.getModified().getTime()));
         boolean isYours = project.getIdUser().equals(BlocklyPropSecurityUtils.getCurrentUserId());
         result.addProperty("yours", isYours);
-        if (!isYours) {
-            result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
-
-        } else {
+        result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
+        if (isYours) {
             List<ProjectSharingRecord> projectSharingRecords = projectSharingService.getSharingInfo(project.getId());
             if (projectSharingRecords != null && !projectSharingRecords.isEmpty()) {
                 result.addProperty("share-key", projectSharingRecords.get(0).getSharekey());
@@ -126,9 +124,7 @@ public JsonObject toJson(Project project) {
         result.addProperty("modified", DateConversion.toDateTimeString(project.getModified().getTime()));
         boolean isYours = project.getIdUser().equals(BlocklyPropSecurityUtils.getCurrentUserId());
         result.addProperty("yours", isYours);
-        if (!isYours) {
-            result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
-        }
+        result.addProperty("user", userService.getUserScreenName(project.getIdUser()));
 
         if (project.getBasedOn() != null) {
             JsonObject basedOn = new JsonObject();
diff --git a/src/main/java/com/parallax/server/blocklyprop/servlets/PingServlet.java b/src/main/java/com/parallax/server/blocklyprop/servlets/PingServlet.java
@@ -24,7 +24,7 @@ public class PingServlet extends HttpServlet {
      */
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        resp.getWriter().write("pong");
+        resp.getWriter().write("<html><body>pong</body></html>");
     }
 
 }
diff --git a/src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties b/src/main/resources/com/parallax/server/blocklyprop/internationalization/translations.properties
@@ -101,6 +101,7 @@ project.table.user = User
 project.changed = Project changes have been saved
 project.created = Created
 project.modified = Modified
+
 project.create.title = Your project
 project.create.basic = Basic info
 project.create.basic.title = Basic project info
@@ -215,6 +216,19 @@ editor.client.title = BlocklyPropClient
 editor.client.checking = Checking for BlocklyPropClient
 editor.client.available = BlocklyPropClient available
 editor.client.not-available = BlocklyPropClient not available
+editor.download = Download
+editor.upload = Upload
+editor.upload.selectfile = Select File
+editor.upload.valid = The selected file appears valid.
+editor.upload.notvalid = The selected file is not valid.
+editor.upload.boardtype.warning = <strong>Warning!</strong> You are about to upload a blocks file from a different board than you are currently using.  If the blocks you are trying to upload are not available for your current board, uploading this blocks file into your project may <strong>break your project</strong>.  If your project does break after uploading this file - do not save it! Click your browser's refresh button to reload your project.
+editor.clear-workspace = Clear Workspace
+editor.button.close = Close
+editor.button.cancel = Cancel
+editor.button.replace = Replace
+editor.button.append = Append
+editor.title.terminal = Terminal
+editor.title.result = Result
 
 editor.demo.dialog.title = You are not logged in
 editor.demo.dialog.continue = Continue demo
diff --git a/src/main/webapp/WEB-INF/includes/pageparts/editor-menu.jsp b/src/main/webapp/WEB-INF/includes/pageparts/editor-menu.jsp
@@ -13,13 +13,21 @@
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav" id="navbar-left">
                 <!--  <li><a href="help/index.html">Manual</a></li> -->
+                
+<!-- Activate From Here ---------------------------
+                <li><a class="external_link" href="<url:getUrl url="/projectcreate.jsp?lang=PROPC"/>" ><fmt:message key="editor.newproject.title" /></a></li>
+---- To Here when closing SPIN access --------- -->
+
+<!-- Delete From Here ------------------------- -->
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="editor.newproject.title" /><b class="caret"></b></a>
                     <ul class="dropdown-menu">
                         <li><a href="<url:getUrl url="/projectcreate.jsp?lang=SPIN"/>"><fmt:message key="editor.newproject.spin" /></a></li>
                         <li><a href="<url:getUrl url="/projectcreate.jsp?lang=PROPC"/>"><fmt:message key="editor.newproject.c" /></a></li>
                     </ul>
                 </li>
+<!-- To Here when closing SPIN access --------- -->
+                
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><fmt:message key="editor.projects.title" /> <b class="caret"></b></a>
                     <ul class="dropdown-menu" role="menu">
@@ -90,6 +98,11 @@
                             </button>
                             <ul class="dropdown-menu">
                                 <li><a id="save-project-as" href="#"><fmt:message key="editor.save-as" /></a></li>
+                                
+                                <li><a id="download-project" href="#"><fmt:message key="editor.download" /></a></li>
+                                <li><a id="upload-project" href="#"><fmt:message key="editor.upload" /></a></li>
+                        <!-- -->
+                                <li><a id="clear-workspace" href="#"><fmt:message key="editor.clear-workspace" /></a></li>
                             </ul>
                         </div>
                     </li>
diff --git a/src/main/webapp/cdn/blockly/language/en/_messages.js b/src/main/webapp/cdn/blockly/language/en/_messages.js
@@ -42,6 +42,13 @@ Blockly.MSG_DISABLE_BLOCK = 'Disable Block';
 Blockly.MSG_ENABLE_BLOCK = 'Enable Block';
 Blockly.MSG_HELP = 'Help';
 
+// Editor dialogs.
+Blockly.Msg.DIALOG_CLEAR_WORKSPACE = 'Clear Workspace';
+Blockly.Msg.DIALOG_CLEAR_WORKSPACE_WARNING = 'Are you sure you want to clear your workspace?  This action cannot be undone!';
+Blockly.Msg.DIALOG_CHANGED_SINCE = 'The project has been changed since the last save.';
+Blockly.Msg.DIALOG_PROJECT_SAVED = 'Project saved';
+Blockly.Msg.DIALOG_PROJECT_SAVED_TEXT = 'The project has been saved';
+
 // Variable renaming.
 Blockly.MSG_CHANGE_VALUE_TITLE = 'Change value:';
 Blockly.MSG_NEW_VARIABLE = 'New variable...';
diff --git a/src/main/webapp/cdn/demoeditor.js b/src/main/webapp/cdn/demoeditor.js
@@ -84,9 +84,9 @@ function getUrlParameters(parameter, staticURL, decode) {
 
     for (var i = 0; i < parArr.length; i++) {
         parr = parArr[i].split("=");
-        if (parr[0] == parameter) {
-            return (decode) ? decodeURIComponent(parr[1]) : parr[1];
+        if (parr[0] === parameter) {
             returnBool = true;
+            return (decode) ? decodeURIComponent(parr[1]) : parr[1];
         } else {
             returnBool = false;
         }
diff --git a/src/main/webapp/cdn/editor.js b/src/main/webapp/cdn/editor.js
diff --git a/src/main/webapp/cdn/utils.js b/src/main/webapp/cdn/utils.js
diff --git a/src/main/webapp/editor/blocklyc.jsp b/src/main/webapp/editor/blocklyc.jsp

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class PingServlet extends HttpServlet {`
`24`	`24`	`*/`
`25`	`25`	`@Override`
`26`	`26`	`protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {`
`27`		`- resp.getWriter().write("pong");`
	`27`	`+ resp.getWriter().write("<html><body>pong</body></html>");`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`}`