Merge pull request #1 from ddelpiano/feature/github_pages

changes for the github pages
MetaCell · Dec 10, 2021 · 7b88266 · 7b88266
2 parents fc6a967 + dc740b0
commit 7b88266
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "sds-viewer",
+  "homepage": "https://MetaCell.github.io/sds-viewer/",
   "version": "0.1.0",
   "license": "MIT",
   "private": true,
@@ -21,6 +22,7 @@
     "@types/react-dom": "^17.0.3",
     "axios": "^0.21.1",
     "fs": "^0.0.1-security",
+    "gh-pages": "^3.2.3",
     "jest": "26.6.0",
     "material-ui-dropzone": "^3.5.0",
     "n3": "^1.10.0",
@@ -35,6 +37,8 @@
   },
   "scripts": {
     "start": "craco start",
+    "predeploy": "yarn build",
+    "deploy": "gh-pages -d build",
     "build": "craco build",
     "test": "jest"
   },

diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Web site created using create-react-app"
+      content="Sparc DataSets Viewer"
     />
     <!--
       manifest.json provides metadata used when your web app is installed on a

diff --git a/src/components/FileUploader/UploadView/UploadProgress.js b/src/components/FileUploader/UploadView/UploadProgress.js
@@ -4,7 +4,7 @@ import Progress from './Progress';
 import FileExtension from './FileExtension';
 import CANCEL from '../../../images/cancel.svg';
 import SUCCESS from '../../../images/success.svg';
-const FileHandler = require('../../../utils/filesHandler');
+import FileHandler from '../../../utils/filesHandler';
 
 const uploadFile = (file, onProgress, onUpload) => {
   const fileHandler = new FileHandler();

diff --git a/src/components/FileUploader/UrlUploader.js b/src/components/FileUploader/UrlUploader.js
@@ -10,8 +10,7 @@ import LINK from '../../images/url.svg';
 import LINK_GREEN from '../../images/link-green.svg';
 import CANCEL from '../../images/cancel.svg';
 import UploadSubmit from './UploadSubmit';
-
-const FileHandler = require('../../utils/filesHandler');
+import FileHandler from '../../utils/filesHandler';
 
 const UrlUploader = ({ handleClose, handleDone }) => {
   const [loader, setLoader] = useState(false);

diff --git a/src/components/TestComponent/TestComponent.js b/src/components/TestComponent/TestComponent.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-const Splinter = require('../../utils/Splinter');
-const FileHandler = require('../../utils/filesHandler');
+import Splinter from '../../utils/Splinter';
+import { FileHandler } from '../../utils/filesHandler';
 
 export default class TestComponent extends React.Component {
 

diff --git a/src/utils/filesHandler.js b/src/utils/filesHandler.js
@@ -1,6 +1,6 @@
 const axios = require('axios');
 
-class FileHandler {
+export default class FileHandler {
 
     get_local_file(path, callback, progressCallback) {
         if (path === undefined)
@@ -37,5 +37,3 @@ class FileHandler {
         });
     }
 }
-
-module.exports = FileHandler
diff --git a/yarn.lock b/yarn.lock
@@ -3361,7 +3361,7 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^2.6.2:
+async@^2.6.1, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -4733,7 +4733,7 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.15.1, commander@^2.20.0:
+commander@2, commander@^2.15.1, commander@^2.18.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -6706,6 +6706,11 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+email-addresses@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.1.0.tgz#cabf7e085cbdb63008a70319a74e6136188812fb"
+  integrity sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==
+
 emittery@^0.7.1:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82"
@@ -7556,6 +7561,20 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filename-reserved-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
+  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
+
+filenamify@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.3.0.tgz#62391cb58f02b09971c9d4f9d63b3cf9aba03106"
+  integrity sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==
+  dependencies:
+    filename-reserved-regex "^2.0.0"
+    strip-outer "^1.0.1"
+    trim-repeated "^1.0.0"
+
 [email protected]:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
@@ -7965,6 +7984,19 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
+gh-pages@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-3.2.3.tgz#897e5f15e111f42af57d21d430b83e5cdf29472c"
+  integrity sha512-jA1PbapQ1jqzacECfjUaO9gV8uBgU6XNMV0oXLtfCX3haGLe5Atq8BxlrADhbD6/UdG9j6tZLWAkAybndOXTJg==
+  dependencies:
+    async "^2.6.1"
+    commander "^2.18.0"
+    email-addresses "^3.0.1"
+    filenamify "^4.3.0"
+    find-cache-dir "^3.3.1"
+    fs-extra "^8.1.0"
+    globby "^6.1.0"
+
 gl-axes3d@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/gl-axes3d/-/gl-axes3d-1.5.3.tgz#47e3dd6c21356a59349910ec01af58e28ea69fe9"
@@ -16165,6 +16197,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+strip-outer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
 strongly-connected-components@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strongly-connected-components/-/strongly-connected-components-1.0.1.tgz#0920e2b4df67c8eaee96c6b6234fe29e873dba99"
@@ -16779,6 +16818,13 @@ triangulate-polyline@^1.0.0:
   dependencies:
     cdt2d "^1.0.0"
 
+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"