From 31a7d58ae0caae0c24d8236923cab14b9bf67e22 Mon Sep 17 00:00:00 2001 From: Abraham Yunes Date: Tue, 14 May 2019 15:05:17 -0500 Subject: [PATCH] v0.4.0-alpha --- package-lock.json | 103 ++++++++++++++++++++++++++++- package.json | 5 +- src/App.scss | 5 ++ src/components/CampaignDetails.tsx | 26 +++----- src/components/CampaignList.tsx | 5 +- src/components/NavBar.tsx | 2 + 6 files changed, 125 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c0ca0e..86a4b37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "sc2-campaign-manager", - "version": "0.1.0", + "version": "0.3.0-alpha", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1304,6 +1304,11 @@ "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.2.tgz", "integrity": "sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==" }, + "@types/json-schema": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz", + "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==" + }, "@types/node": { "version": "10.12.21", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", @@ -1331,6 +1336,23 @@ "@types/react": "*" } }, + "@types/react-images": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@types/react-images/-/react-images-0.5.1.tgz", + "integrity": "sha512-n2guyR+kblfNEAr1TA3GnrpEdt0/2dHxMOFaFcCgI62NRQaQClaNdgidsim3JRVWLlUiWilDjzZnJUSR0kMncQ==", + "requires": { + "@types/react": "*" + } + }, + "@types/react-jsonschema-form": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/react-jsonschema-form/-/react-jsonschema-form-1.3.2.tgz", + "integrity": "sha512-aG2zyxAlRw9+96le7U0P3mqrVgallf5cmsDW4OhZgFhpXyrB0N93hhNfw4zTlC39aVA04ZlhQ3cG1hv1G9X4yA==", + "requires": { + "@types/json-schema": "*", + "@types/react": "*" + } + }, "@types/react-router": { "version": "4.4.5", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.4.5.tgz", @@ -1676,6 +1698,15 @@ } } }, + "aphrodite": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/aphrodite/-/aphrodite-0.5.0.tgz", + "integrity": "sha1-pLmokCZiOV0nAucKx6K0ymbyVwM=", + "requires": { + "asap": "^2.0.3", + "inline-style-prefixer": "^2.0.0" + } + }, "app-builder-bin": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.4.tgz", @@ -1868,6 +1899,11 @@ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -2664,6 +2700,11 @@ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" }, + "bowser": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.9.4.tgz", + "integrity": "sha512-9IdMmj2KjigRq6oWhmwv1W36pDuA4STQZ8q6YO9um+x07xgYNCD3Oou+WP/3L1HNz7iqythGet3/p4wvc8AAwQ==" + }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -4996,6 +5037,11 @@ "strip-eof": "^1.0.0" } }, + "exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" + }, "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", @@ -6777,6 +6823,11 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "hyphenate-style-name": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", + "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==" + }, "iconv-lite": { "version": "0.4.23", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", @@ -6880,6 +6931,15 @@ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, + "inline-style-prefixer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz", + "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=", + "requires": { + "bowser": "^1.0.0", + "hyphenate-style-name": "^1.0.1" + } + }, "internal-ip": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-3.0.1.tgz", @@ -9427,6 +9487,30 @@ } } }, + "react-images": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/react-images/-/react-images-0.5.19.tgz", + "integrity": "sha512-B3d4W1uFJj+m17K8S65iAyEJShKGBjPk7n7N1YsPiAydEm8mIq9a6CoeQFMY1d7N2QMs6FBCjT9vELyc5jP5JA==", + "requires": { + "aphrodite": "^0.5.0", + "prop-types": "^15.6.0", + "react-scrolllock": "^2.0.1", + "react-transition-group": "2" + }, + "dependencies": { + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + } + } + } + }, "react-is": { "version": "16.8.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.2.tgz", @@ -9447,8 +9531,7 @@ "react-lifecycles-compat": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==", - "dev": true + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-lightbox-component": { "version": "1.2.1", @@ -9480,6 +9563,11 @@ } } }, + "react-prop-toggle": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/react-prop-toggle/-/react-prop-toggle-1.0.2.tgz", + "integrity": "sha512-JmerjAXs7qJ959+d0Ygt7Cb2+4fG+n3I2VXO6JO0AcAY1vkRN/JpZKAN67CMXY889xEJcfylmMPhzvf6nWO68Q==" + }, "react-router": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", @@ -9522,6 +9610,15 @@ "warning": "^4.0.1" } }, + "react-scrolllock": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/react-scrolllock/-/react-scrolllock-2.0.7.tgz", + "integrity": "sha512-Gzpu8+ulxdYcybAgJOFTXc70xs7SBZDQbZNpKzchZUgLCJKjz6lrgESx6LHHZgfELx1xYL4yHu3kYQGQPFas/g==", + "requires": { + "exenv": "^1.2.2", + "react-prop-toggle": "^1.0.2" + } + }, "react-transition-group": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.1.tgz", diff --git a/package.json b/package.json index 0c8ff46..96ce7d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sc2-campaign-manager", - "version": "0.3.0-alpha", + "version": "0.4.0-alpha", "description": "A Campaign Manager for StarCraft II. ", "main": "main.js", "build": { @@ -58,6 +58,8 @@ "@types/electron": "^1.6.10", "@types/react": "^16.8.13", "@types/react-dom": "^16.8.3", + "@types/react-images": "^0.5.1", + "@types/react-jsonschema-form": "^1.3.2", "@types/react-router-dom": "^4.3.1", "babel-core": "^6.26.3", "bootstrap": "^4.3.1", @@ -73,6 +75,7 @@ "rage-edit": "^1.2.0", "react": "^16.8.2", "react-dom": "^16.8.2", + "react-images": "^0.5.19", "react-jsonschema-form": "^1.3.0", "react-lightbox-component": "^1.2.1", "react-markdown": "^4.0.6", diff --git a/src/App.scss b/src/App.scss index f61c36f..cef511f 100644 --- a/src/App.scss +++ b/src/App.scss @@ -11,6 +11,11 @@ background: rgba(255, 255, 255, 0.08); } +progress[value="0"] { + /* Reset the default appearance */ + visibility: hidden; + } + progress[value] { /* Reset the default appearance */ -webkit-appearance: none; diff --git a/src/components/CampaignDetails.tsx b/src/components/CampaignDetails.tsx index 09cddb1..af89522 100644 --- a/src/components/CampaignDetails.tsx +++ b/src/components/CampaignDetails.tsx @@ -4,9 +4,9 @@ import ReactMarkdown from 'react-markdown' import Campaign, {ICampaign, IAuthor} from '../classes/Campaign' import PropTypes from 'prop-types'; -import Lightbox from 'react-lightbox-component'; +//import Lightbox as Lightbox2 from 'react-lightbox-component'; import DownloadBar from './DownloadBar' - +import Lightbox from 'react-images' @@ -66,6 +66,7 @@ class CampaignDetails extends Component { const { id, name, + author, description, maps, lastUpdated, @@ -75,7 +76,7 @@ class CampaignDetails extends Component { progress } = campaign; - const author:IAuthor = (selectedCampaignAuthor)?selectedCampaignAuthor:emptyAuthor; + //const author:IAuthor = (selectedCampaignAuthor)?selectedCampaignAuthor:emptyAuthor; const isCampaignInstalled:boolean = installed;//!Campaign.isCampaignInstalled(campaign); const onDownloadClick = onDownloadCampaignClick; @@ -91,7 +92,7 @@ class CampaignDetails extends Component { {(isCampaignInstalled) && - + {/* */} } {(!isCampaignInstalled) && @@ -101,9 +102,10 @@ class CampaignDetails extends Component {

{name}

- By {author.name}. Last Updated: + By {author}. Last Updated:

-

+ {/* +

Tagged under {(installed) && Installed @@ -112,6 +114,7 @@ class CampaignDetails extends Component { Updated }

+ */} {(!isCampaignInstalled) && } @@ -121,7 +124,7 @@ class CampaignDetails extends Component {
- + Description @@ -140,18 +143,11 @@ class CampaignDetails extends Component {
- + } /> -
    - {screenshots.map((screenshot:any) => - -
  • {screenshot.src}
    • -     - )} -
} /> diff --git a/src/components/CampaignList.tsx b/src/components/CampaignList.tsx index 7c637c5..ed55cc2 100644 --- a/src/components/CampaignList.tsx +++ b/src/components/CampaignList.tsx @@ -10,15 +10,16 @@ function CampaignListItem(props:any) { const downloadProgress = (progress)?progress:0; return ( ); } diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 479fdeb..895ca40 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -35,6 +35,7 @@ function NavBar(props:NavBarProps) { + {/* + */}
);