Merge pull request #1071 from complexdatacollective/feature/better-st…

…art-screen-2 Version 6.0.0
complexdatacollective · Oct 19, 2020 · 03e5503 · 03e5503
2 parents 7b4a780 + 1ad894e
commit 03e5503
Show file tree

Hide file tree

Showing 263 changed files with 12,525 additions and 15,782 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -108,7 +108,8 @@
                 "scrollable",
                 "draggable",
                 "dyad",
-                "Dyad"
+                "Dyad",
+                "hostname"
              ],
              "skipIfMatch": [
                 "http(s)?://[^s]*",

diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,6 @@ IDEWorkspaceChecks.plist
 
 # Ignore protocol template used for schema generation
 src/schemas/abstract-protocol.json
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "src/utils/protocol/protocol-validation"]
 	path = src/utils/protocol/protocol-validation
 	url = https://github.com/complexdatacollective/protocol-validation.git
-[submodule "development-protocol"]
-	path = development-protocol
-	url = https://github.com/complexdatacollective/development-protocol.git
 [submodule "src/utils/network-exporters"]
 	path = src/utils/network-exporters
 	url = https://github.com/complexdatacollective/network-exporters
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ cache:
 
 install:
   - npm install
+  - npx browserslist@latest --update-db # update browserslist browser versions
 jobs:
   include:
     - stage: lint

diff --git a/build-resources/file.icns b/build-resources/file.icns
diff --git a/build-resources/file.ico b/build-resources/file.ico
diff --git a/config.xml b/config.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="50002" id="org.codaco.networkCanvas" ios-CFBundleIdentifier="networkCanvas" ios-CFBundleVersion="50002" version="5.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>NetworkCanvas</name>
+<widget android-versionCode="6000" id="org.codaco.networkCanvas6" ios-CFBundleIdentifier="networkCanvas6" ios-CFBundleVersion="6000" version="6.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>Network Canvas</name>
     <description>
         Simplifying complex network data collection.
     </description>
@@ -33,9 +33,19 @@
         </edit-config>
     </platform>
     <platform name="ios">
+        <allow-navigation href="*" />
+        <allow-navigation href="*" />
         <allow-navigation href="*" />
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
+        <config-file parent="NSBonjourServices" target="*-Info.plist">
+            <array>
+                <string>_nc-server-6._tcp.</string>
+            </array>
+        </config-file>
+        <config-file parent="NSLocalNetworkUsageDescription" target="*-Info.plist">
+            <string>Network Canvas uses this feature to enable automatic discovery of computers running Server on your network.</string>
+        </config-file>
         <icon height="40" src="www/icons/ios/NC-Square-40.png" width="40" />
         <icon height="50" src="www/icons/ios/NC-Square-50.png" width="50" />
         <icon height="72" src="www/icons/ios/NC-Square-72.png" width="72" />
@@ -54,28 +64,31 @@
     <preference name="Orientation" value="landscape" />
     <preference name="target-device" value="tablet" />
     <preference name="DisallowOverscroll" value="true" />
-    <preference name="Fullscreen" value="false" />
+    <preference name="Fullscreen" value="true" />
     <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="AndroidPersistentFileLocation" value="Internal" />
     <preference name="iosPersistentFileLocation" value="Library" />
     <preference name="AllowInlineMediaPlayback" value="true" />
     <preference name="android-minSdkVersion" value="25" />
     <preference name="android-targetSdkVersion" value="28" />
-    <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
     <plugin name="cordova-plugin-file" spec="^5.0.0" />
     <plugin name="cordova-plugin-file-transfer" spec="^1.7.1" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
-    <plugin name="cordova-plugin-wkwebview-engine" spec="^1.1.4" />
     <plugin name="cordova-plugin-device" spec="^2.0.2" />
     <plugin name="cordova-plugin-network-canvas-client" spec="./cordova-plugin-network-canvas-client" />
     <plugin name="cordova-plugin-keyboard" spec="^1.2.0" />
     <plugin name="cordova-plugin-x-socialsharing" spec="^5.6.4">
-        <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
-        <variable name="PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
-        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
+      <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.1+" />
+      <variable name="PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
+      <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="This app requires photo library access to function properly." />
     </plugin>
     <plugin name="cordova-plugin-zeroconf" spec="^1.4.1" />
+    <plugin name="cordova-plugin-inappbrowser" spec="~4.0.0" />
+    <plugin name="cordova-plugin-app-version" spec="^0.1.9" />
+    <plugin name="cordova-plugin-network-information" spec="~2.0.2" />
+    <plugin name="cordova-plugin-chooser" spec="~1.3.1" />
+    <plugin name="cordova-plugin-wkwebview-engine" spec="^1.2.1" />
     <engine name="android" spec="^8.0.0" />
-    <engine name="ios" spec="^5.0.1" />
+    <engine name="ios" spec="^5.1.1" />
 </widget>
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
@@ -28,11 +28,19 @@ const resolveAlias = {
   // Use the UMD version of React Markdown, so that we can keep building for
   // electron-renderer and running other browsers
   'react-markdown': require.resolve('react-markdown/umd/react-markdown.js'),
+  // TODO: Track this issue
+  // https://github.com/mapbox/concaveman/issues/18
+  tinyqueue: '../tinyqueue/tinyqueue.js',
 };
 if (!isTargetingElectron) {
   resolveAlias.electron = `${paths.appSrc}/utils/electron-shim`;
 }
 
+if (isTargetingElectron) {
+  // Force node version of jszip for electron target
+  resolveAlias.jszip = require.resolve('jszip/lib/index.js');
+}
+
 // This is the development configuration.
 // It is focused on developer experience and fast rebuilds.
 // The production configuration is different and lives in a separate file.
@@ -99,11 +107,7 @@ module.exports = {
     // `web` extension prefixes have been added for better support
     // for React Native Web.
     extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
-    alias: {
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
+    alias: resolveAlias,
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
       // This often causes confusion because we only process files within src/ with babel.

diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
@@ -11,7 +11,7 @@ const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
-const { reactBundleTarget } = require('./nc-dev-utils');
+const { reactBundleTarget, isTargetingElectron } = require('./nc-dev-utils');
 
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -82,6 +82,23 @@ const getStyleLoaders = (preProcessor) => {
   return loaders;
 };
 
+const resolveAlias = {
+  // Use the UMD version of React Markdown, so that we can keep building for
+  // electron-renderer and running other browsers
+  'react-markdown': require.resolve('react-markdown/umd/react-markdown.js'),
+  // TODO: Track this issue
+  // https://github.com/mapbox/concaveman/issues/18
+  tinyqueue: '../tinyqueue/tinyqueue.js',
+};
+if (!isTargetingElectron) {
+  resolveAlias.electron = `${paths.appSrc}/utils/electron-shim`;
+}
+
+if (isTargetingElectron) {
+  // Force node version of jszip for electron target
+  resolveAlias.jszip = require.resolve('jszip/lib/index.js');
+}
+
 // This is the production configuration.
 // It compiles slowly and is focused on producing a fast and minimal bundle.
 // The development configuration is different and lives in a separate file.
@@ -122,14 +139,7 @@ module.exports = {
     // `web` extension prefixes have been added for better support
     // for React Native Web.
     extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
-    alias: {
-      // Use the UMD version of React Markdown, so that we can keep building for
-      // electron-renderer and running other browsers
-      'react-markdown': require.resolve('react-markdown/umd/react-markdown.js'),
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
+    alias: resolveAlias,
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
       // This often causes confusion because we only process files within src/ with babel.

diff --git a/cordova-plugin-network-canvas-client/README.md b/cordova-plugin-network-canvas-client/README.md
@@ -1,3 +1,3 @@
 # Network Canvas Client
 
-An API client for an instance of [Network Canvas](https://github.com/codaco/Network-Canvas) communicating with paired instances of [Server](https://github.com/codaco/Server).
+An API client for an instance of [Network Canvas](https://github.com/complexdatacollective/Network-Canvas) communicating with paired instances of [Server](https://github.com/complexdatacollective/Server).
diff --git a/cordova-plugin-network-canvas-client/src/ios/NetworkCanvasClient.h b/cordova-plugin-network-canvas-client/src/ios/NetworkCanvasClient.h
@@ -2,7 +2,7 @@
 //  NetworkCanvasClient.h
 //  NetworkCanvas
 //
-//  See LICENSE file at project root or https://github.com/codaco/Network-Canvas/blob/master/LICENSE
+//  See LICENSE file at project root or https://github.com/complexdatacollective/Network-Canvas/blob/master/LICENSE
 //
 
 #import <Cordova/CDV.h>

diff --git a/cordova-plugin-network-canvas-client/src/ios/NetworkCanvasClient.m b/cordova-plugin-network-canvas-client/src/ios/NetworkCanvasClient.m
@@ -5,7 +5,7 @@
 //  This plugin requires the Cordova File Plugin:
 //  https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-file/
 //
-//  See LICENSE file at project root or https://github.com/codaco/Network-Canvas/blob/master/LICENSE
+//  See LICENSE file at project root or https://github.com/complexdatacollective/Network-Canvas/blob/master/LICENSE
 //
 
 #import "NetworkCanvasClient.h"

diff --git a/...NetworkCanvasClientPlugin/NetworkCanvasClientPluginTests/NetworkCanvasClientPluginTests.m b/...NetworkCanvasClientPlugin/NetworkCanvasClientPluginTests/NetworkCanvasClientPluginTests.m
@@ -2,7 +2,7 @@
 //  NetworkCanvasClientPluginTests.m
 //  NetworkCanvasClientPluginTests
 //
-//  See LICENSE file at project root or https://github.com/codaco/Network-Canvas/blob/master/LICENSE
+//  See LICENSE file at project root or https://github.com/complexdatacollective/Network-Canvas/blob/master/LICENSE
 //
 
 #import <XCTest/XCTest.h>

diff --git a/integration-tests/__tests__/dyad-census.test.js b/integration-tests/__tests__/dyad-census.test.js
@@ -82,6 +82,6 @@ describe('Dyad Census Interface', () => {
     await timelinePrevious(app);
     await app.client.pause(timing.long);
     await app.client.waitForExist('//div[@class="progress-bar__filler" and style="width: 100%;"]', 500, true);
-    await app.client.waitForExist('//div[@class="dyad-interface__no"]//input[@class="form-field-togglebutton__input" and value="true" and checked]', 500, true);
+    await app.client.waitForExist('//div[@class="dyad-census__no"]//input[@class="form-field-togglebutton__input" and value="true" and checked]', 500, true);
   });
 });
diff --git a/integration-tests/__tests__/ego-form.test.js b/integration-tests/__tests__/ego-form.test.js
@@ -36,7 +36,7 @@ describe('EgoForm Interface', () => {
 
   it('Allows leaving via Timeline if not changed', async () => {
     await goToStage(app, 'dyadcensus');
-    await app.client.waitForVisible('.dyad-interface__introduction');
+    await app.client.waitForVisible('.dyad-census__introduction');
   });
 
   it('Disallows leaving via Next if invalid', async () => {
@@ -54,6 +54,6 @@ describe('EgoForm Interface', () => {
     await goToStage(app, 'dyadcensus');
     await app.client.waitForVisible('.dialog--confirm');
     await app.client.click('span=Discard changes');
-    await app.client.waitForVisible('.dyad-interface__introduction');
+    await app.client.waitForVisible('.dyad-census__introduction');
   });
 });