FairCopy v1.1.1 (#447)

.vscode/launch.json

@@ -40,7 +40,7 @@
             "windows": {
                 "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd"
             },
-            "env": { "FAIRCOPY_DEBUG_MODE": "true", "FAIRCOPY_DEV_VERSION": "0.10.2" },
+            "env": { "FAIRCOPY_DEBUG_MODE": "true", "FAIRCOPY_DEV_VERSION": "1.1.1" },
             "program": "${workspaceRoot}/public/electron.js",
             "protocol": "inspector",
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "faircopy",
-  "version": "1.0.2-dev.1",
+  "version": "1.1.1",
   "description": "A word processor for the humanities scholar.",
   "main": "public/electron.js",
   "private": true,
@@ -29,13 +29,14 @@
   "devDependencies": {
     "dotenv": "^8.2.0",
     "electron": "^18.2.0",
-    "electron-builder": "^23.0.3",
+    "electron-builder": "^23.3.3",
     "electron-notarize": "^1.2.1"
   },
   "dependencies": {
     "@material-ui/core": "^4.9.14",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.53",
+    "@rails/actioncable": "^6.0.5",
     "annotorious-openseadragon": "github:performant-software/annotorious-openseadragon",
     "axios": "^0.19.2",
     "debounce": "^1.2.0",
@@ -46,18 +47,18 @@
     "jszip": "3.2.0",
     "openseadragon": "^3.0.0",
     "prop-types": "^15.7.2",
-    "prosemirror-commands": "^1.1.12",
+    "prosemirror-commands": "^1.3.0",
     "prosemirror-dev-tools": "^3.1.0",
-    "prosemirror-dropcursor": "^1.4.0",
-    "prosemirror-gapcursor": "^1.2.0",
-    "prosemirror-history": "^1.2.0",
-    "prosemirror-keymap": "^1.1.5",
-    "prosemirror-model": "^1.15.0",
-    "prosemirror-schema-basic": "^1.1.2",
-    "prosemirror-schema-list": "^1.1.6",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-transform": "^1.3.3",
-    "prosemirror-view": "^1.23.2",
+    "prosemirror-dropcursor": "^1.6.0",
+    "prosemirror-gapcursor": "^1.3.1",
+    "prosemirror-history": "^1.3.0",
+    "prosemirror-keymap": "^1.2.0",
+    "prosemirror-model": "^1.18.1",
+    "prosemirror-schema-basic": "^1.2.0",
+    "prosemirror-schema-list": "^1.2.1",
+    "prosemirror-state": "^1.4.1",
+    "prosemirror-transform": "^1.7.0",
+    "prosemirror-view": "^1.27.2",
     "react": "^16.14.0",
     "react-beautiful-dnd": "^13.0.0",
     "react-dom": "^16.13.1",
@@ -121,8 +122,8 @@
     "publish": {
       "provider": "keygen",
       "account": "8a8d3d6a-ab09-4f51-aea5-090bfd025dd8",
-      "product": "b2bfc67b-26bf-4407-b3d9-d7ad94d7f225",
-      "channel": "dev"
+      "product": "1e330e29-f0b4-4942-b813-0c78614e3abb",
+      "channel": "stable"
     }
   },
   "postinstall": "electron-builder install-app-deps",

public/css/CheckInDialog.css

@@ -0,0 +1,13 @@
+#CheckInDialog .checkin-panel {    
+    min-width: 350px;
+    margin: 5px;
+}
+
+#CheckInDialog .commit-message-field {
+    min-width: 350px;
+    margin-bottom: 20px;
+}
+
+#CheckInDialog .error-message {
+    color: red;
+}

public/css/ChooseLocalFilePanel.css

@@ -0,0 +1,4 @@
+#ChooseLocalFilePanel .form-actions {
+    margin-left: 450px;
+    margin-bottom: 10px;
+}

public/css/FacsIndex.css

@@ -1,11 +1,9 @@
 #FacsIndex .facs-index-list {
     margin-left: 5px;
-    margin-top: 60px;
 }
 
-
 #FacsIndex .table-container {
-    height: calc(100vh - 210px);
+    height: calc(100vh - 200px);
 }
 
 #FacsIndex .facs-index-container-with-bar .table-container {

public/css/LoginDialog.css

@@ -0,0 +1,34 @@
+#LoginDialog {
+    margin: 12px;
+    background: #F8F5FF;
+    padding: 5px;
+    padding-top: 15px;
+    border-radius: 10px;
+}
+
+#LoginDialog li {
+    list-style: none;
+}
+
+#LoginDialog h2 {
+    margin-left: 15px;
+}
+
+#LoginDialog .login-field {
+    width: 300px;
+    margin-bottom: 10px;
+}
+
+#LoginDialog .form-actions {
+    margin-left: 520px;
+    margin-bottom: 10px;
+}
+
+#LoginDialog .action-button {
+    margin-right: 10px;
+}
+
+#LoginDialog .login-button-active {
+    background: #1976d2;
+    margin-right: 10px;
+}

public/css/LoginPanel.css

@@ -0,0 +1,34 @@
+#LoginPanel {
+    margin: 12px;
+    background: #F8F5FF;
+    padding: 5px;
+    padding-top: 15px;
+    border-radius: 10px;
+}
+
+#LoginPanel li {
+    list-style: none;
+}
+
+#LoginPanel h2 {
+    margin-left: 15px;
+}
+
+#LoginPanel .login-field {
+    width: 300px;
+    margin-bottom: 10px;
+}
+
+#LoginPanel .form-actions {
+    margin-left: 520px;
+    margin-bottom: 10px;
+}
+
+#LoginPanel .action-button {
+    margin-right: 10px;
+}
+
+#LoginPanel .login-button-active {
+    background: #1976d2;
+    margin-right: 10px;
+}

public/css/ReadOnlyToolbar.css

@@ -0,0 +1,20 @@
+#ReadOnlyToolbar {
+    border: 2px solid #EAEAEA;
+    border-radius: 10px;
+    margin: 10px;
+    padding: 7px;
+}
+
+#ReadOnlyToolbar .leftgroup {
+    display: inline-block;
+}
+
+#ReadOnlyToolbar .rightgroup {
+    display: inline-block;
+}
+
+@media (min-width: 1050px) {
+    #ReadOnlyToolbar .rightgroup {
+        float: right;
+    }    
+}

public/css/ResourceBrowser.css

@@ -7,6 +7,16 @@
     margin-right: 20px;
 }
 
+#ResourceBrowser .right-button {
+    float: right;
+}
+
+#ResourceBrowser .empty-list-card {
+    position: absolute;
+    left: 33%;
+    top: 33%;
+    max-width: 300px;
+}
 
 #ResourceBrowser .down-caret {
     margin-left: 5px;
@@ -15,3 +25,16 @@
 #ResourceBrowser .table-container {
     height: calc(100vh - 215px);
 }
+
+#ResourceBrowser .deleted-resource {
+    color: red;
+    text-decoration: line-through;
+}
+
+#ResourceBrowser .deleted-icon {
+    color: red;
+}
+
+#ResourceBrowser .inline-button-group {
+    display: inline-block;
+}

public/css/SelectRemoteProjectPanel.css

@@ -0,0 +1,23 @@
+#SelectRemoteProjectPanel {
+    margin: 12px;
+    background: #F8F5FF;
+    padding: 5px;
+    padding-top: 15px;
+    border-radius: 10px;
+}
+
+#SelectRemoteProjectPanel .heading {
+    margin: 10px;
+}
+
+#SelectRemoteProjectPanel .project-card {
+    margin: 10px;
+    min-width: 200px;
+    cursor: pointer;
+}
+
+#SelectRemoteProjectPanel .card-container {
+    margin-bottom: 10px;
+    display: flex;
+    flex-wrap: wrap;
+}

public/css/SurfaceEditorToolbar.css

@@ -1,3 +1,7 @@
+#SurfaceEditorToolbar {
+    height: 40px;    
+}
+
 #SurfaceEditorToolbar .selected-action {
     color: rgb(101, 177, 210);
 }

public/css/index.css

@@ -1,6 +1,7 @@
 
 @import "root.css";
 @import "annotorious.min.css";
+@import "ring-spinner.css";
 
 @import "EditorGutter.css";
 @import "TEIElementStyles.css";
@@ -49,4 +50,10 @@
 @import "ImportConsoleDialog.css";
 @import "SearchDialog.css";
 @import "LicenseBar.css";
-@import "LicenseDialog.css";
+@import "LicenseDialog.css";
+@import "ReadOnlyToolbar.css";
+@import "LoginPanel.css";
+@import "LoginDialog.css";
+@import "CheckInDialog.css";
+@import "SelectRemoteProjectPanel.css";
+@import "ChooseLocalFilePanel.css";

public/css/ring-spinner.css

@@ -0,0 +1,82 @@
+/* Small inline spinner */
+.inline-ring-spinner {
+    display: inline-block;
+    margin-left: 10px;
+    margin-right: 10px;
+    width: 16px;
+    height: 16px;
+  }
+
+.inline-ring-spinner .light {
+  border: 3px solid #fff;
+  border-color: #fff transparent transparent transparent;
+}
+
+.inline-ring-spinner .dark {
+  border: 3px solid #000;
+  border-color: #000 transparent transparent transparent;
+}
+
+.inline-ring-spinner div {
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  animation: inline-ring-spinner 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+}
+.inline-ring-spinner div:nth-child(1) {
+  animation-delay: -0.45s;
+}
+.inline-ring-spinner div:nth-child(2) {
+  animation-delay: -0.3s;
+}
+.inline-ring-spinner div:nth-child(3) {
+  animation-delay: -0.15s;
+}
+@keyframes inline-ring-spinner {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+/* Big spinner */
+.big-ring-spinner {
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+}
+.big-ring-spinner div {
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  width: 128px;
+  height: 128px;
+  margin-top: 30vh;
+  border: 16px solid #000;
+  border-radius: 50%;
+  animation: big-ring-spinner 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+  border-color: #000 transparent transparent transparent;
+}
+.big-ring-spinner div:nth-child(1) {
+  animation-delay: -0.45s;
+}
+.big-ring-spinner div:nth-child(2) {
+  animation-delay: -0.3s;
+}
+.big-ring-spinner div:nth-child(3) {
+  animation-delay: -0.15s;
+}
+@keyframes big-ring-spinner {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}