From c7c09260648d8391ff222e9c87d83f195b5f8203 Mon Sep 17 00:00:00 2001 From: Alisamar Husain Date: Wed, 26 May 2021 14:45:31 +0530 Subject: [PATCH 01/60] Removed (mostly) PF3 --- package.json | 1 + src/components/AppLayout/AppLayout.js | 3 - src/components/CreatePlugin/CreatePlugin.js | 117 +++++++++--------- .../CreatePlugin/CreatePlugin.test.js | 2 +- .../DashGitHubView/DashGitHubView.js | 34 +++-- .../DashPluginCardView/DashPluginCardView.js | 54 ++++---- .../CopyToClipboard/CopyToClipboard.js | 55 +++----- yarn.lock | 40 ++++++ 8 files changed, 159 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index bc4ea01e..b662337a 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@patternfly/patternfly": "^4.59.1", "@patternfly/react-core": "^4.75.2", "@patternfly/react-icons": "^4.7.16", + "@patternfly/react-table": "^4.27.7", "classnames": "^2.2.6", "core-js": "^2.5.7", "dompurify": "^2.2.7", diff --git a/src/components/AppLayout/AppLayout.js b/src/components/AppLayout/AppLayout.js index a9625437..4421dd0c 100644 --- a/src/components/AppLayout/AppLayout.js +++ b/src/components/AppLayout/AppLayout.js @@ -1,6 +1,3 @@ -// based on -// https://github.com/patternfly/patternfly-react-seed/blob/2195cdb69c4a82b64b4cf6870a67750cc1896ef2/src/app/AppLayout/AppLayout.tsx - import React, { useCallback, useState } from 'react'; import { Page, SkipToContent } from '@patternfly/react-core'; import ConnectedNavbar from '../Navbar/Navbar'; diff --git a/src/components/CreatePlugin/CreatePlugin.js b/src/components/CreatePlugin/CreatePlugin.js index 2c6ce7a4..9bfdbc07 100644 --- a/src/components/CreatePlugin/CreatePlugin.js +++ b/src/components/CreatePlugin/CreatePlugin.js @@ -1,12 +1,13 @@ import React, { Component } from 'react'; +import classNames from 'classnames'; import Client from '@fnndsc/chrisstoreapi'; import { Link } from 'react-router-dom'; -import { - Form, FormGroup, ControlLabel, FormControl, HelpBlock, - Col, Icon -} from 'patternfly-react'; +import { Grid, GridItem } from '@patternfly/react-core'; +import { Form, FormGroup, TextInput, FileUpload, FormHelperText as HelpBlock } from '@patternfly/react-core'; +import { Label as ControlLabel } from '@patternfly/react-core'; +import { FileIcon, UploadIcon, ExclamationTriangleIcon } from '@patternfly/react-icons' + import Button from '../Button'; -import classNames from 'classnames'; import './CreatePlugin.css'; import { Plugin } from '../Plugin/Plugin'; @@ -14,26 +15,6 @@ import { Alert, AlertActionCloseButton, Card, CardBody, CodeBlock, CodeBlockCode import HintBlock from '../Hintblock'; import { createPluginHint } from './constant'; -const generateFormGroup = (id, label, help, value, handleChange) => ( - - - {label} - - - - - {help} - - - -); - const formGroupsData = [ { id: 'name', @@ -74,6 +55,34 @@ class CreatePlugin extends Component { methods.forEach((method) => { this[method] = this[method].bind(this); }); } + generateFormGroup = (id, label, help, value, handleChange) => ( + + + + {label} + + + + + {help} + + + + {/* + + */} + {/* + + */} + + ); + setFileError(state) { this.setState((prevState) => { const nextState = {}; @@ -114,14 +123,13 @@ class CreatePlugin extends Component { this.setState({ [event.target.name]: event.target.value }); } - handleFile(event) { - const { target: { files: [file] } } = event; - if (file && file.type === 'application/json') { - this.setState({ fileName: file.name }); - this.readFile(file) + handleFile({ value, filename }) { + if (value && value.type === 'application/json') { + this.setState({ fileName: filename }); + this.readFile(value) .then(() => this.setFileError(false)) .catch(() => this.setFileError(true)); - } else if (!file) { + } else if (!value) { this.setState({ fileName: undefined, pluginRepresentation: {}, @@ -313,7 +321,7 @@ class CreatePlugin extends Component { // generate formGroups based on data const formGroups = formGroupsData.map((formGroup) => { const { id, label, help } = formGroup; - return generateFormGroup(id, label, help, state[id], this.handleChange); + return this.generateFormGroup(id, label, help, state[id], this.handleChange); }); const pluginData = { @@ -329,26 +337,6 @@ class CreatePlugin extends Component { ...pluginRepresentation, }; - // change file icon based on state - let iconName; - let fileText; - if (fileError === true) { - iconName = 'exclamation-triangle'; - fileText = 'Invalid JSON'; - } else if (typeof fileName !== 'undefined') { - iconName = 'file'; - fileText = fileName; - } else { - iconName = 'upload'; - fileText = 'Upload Plugin Representation'; - } - - const labelClassNames = classNames('createplugin-upload-label', { - dragover: dragOver, - hasfile: fileName, - haserror: fileError, - }); - return (
@@ -422,14 +410,18 @@ class CreatePlugin extends Component {
-
- - {fileText} + { + fileError ? + <> {"Invalid JSON"} + : + ( + !fileName ? + <> {"Upload Plugin Representation"} + : + <> {fileName} + ) + }
diff --git a/src/components/CreatePlugin/CreatePlugin.test.js b/src/components/CreatePlugin/CreatePlugin.test.js index 1734e4ea..c51b0697 100644 --- a/src/components/CreatePlugin/CreatePlugin.test.js +++ b/src/components/CreatePlugin/CreatePlugin.test.js @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { ControlLabel } from 'patternfly-react'; +import { Label as ControlLabel } from '@patternfly/react-core'; import CreatePlugin from './CreatePlugin'; import validPluginRepresentation from './samplePluginRepresentation'; diff --git a/src/components/Dashboard/components/DashGitHubView/DashGitHubView.js b/src/components/Dashboard/components/DashGitHubView/DashGitHubView.js index 8ff03083..291ac06b 100644 --- a/src/components/Dashboard/components/DashGitHubView/DashGitHubView.js +++ b/src/components/Dashboard/components/DashGitHubView/DashGitHubView.js @@ -1,11 +1,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import isEmpty from 'lodash/isEmpty'; -import { - ListView, - Col, -} from 'patternfly-react'; -import {Card, CardTitle, CardBody} from '@patternfly/react-core'; +import { List } from '@patternfly/react-core'; +import { Card, CardTitle, CardBody } from '@patternfly/react-core'; + import './DashGitHubView.css'; import BrainyPointer from '../../../../assets/img/brainy-pointer.png'; @@ -31,20 +29,18 @@ class DashGitHubView extends Component { const showEmptyState = isEmpty(plugins); return ( - - - - Revisions to My Plugins - - - { showEmptyState ? - - : - - } - - - + + + Revisions to My Plugins + + + { showEmptyState ? + + : + + } + + ); } } diff --git a/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js b/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js index e0a820f3..a8890ff2 100644 --- a/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js +++ b/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js @@ -3,13 +3,15 @@ import PropTypes from "prop-types"; import { Link } from "react-router-dom"; import isEmpty from "lodash/isEmpty"; import { - Col, EmptyStateAction, EmptyStateInfo, FieldLevelHelp, MessageDialog -} from "patternfly-react"; -import { CardTitle, CardBody, Card, DropdownItem, Dropdown, KebabToggle, GridItem, Grid, Form } from "@patternfly/react-core"; +} from "@patternfly/react-core"; +import { CardTitle, CardBody, Card } from "@patternfly/react-core"; +import { DropdownItem, Dropdown, KebabToggle } from "@patternfly/react-core"; +import { GridItem, Grid, Form } from "@patternfly/react-core"; + import Button from "../../../Button"; import "./DashPluginCardView.css"; import BrainImg from "../../../../assets/img/empty-brain-xs.png"; @@ -18,31 +20,29 @@ import RelativeDate from "../../../RelativeDate/RelativeDate"; import FormInput from "../../../FormInput"; const DashGitHubEmptyState = () => ( - - - My Plugins - -

- You have no plugins in the ChRIS store -

-

Lets fix that!

-
-
- Click Add Plugin -
-
-

- Create a new listing for your plugin in the ChRIS store by - clicking "Add Plugin" below. -

- -
+ + My Plugins + +

+ You have no plugins in the ChRIS store +

+

Lets fix that!

+
+
+ Click Add Plugin +
+
+

+ Create a new listing for your plugin in the ChRIS store by + clicking "Add Plugin" below. +

+
- - - +
+ + ); const DashApplicationType = type => { diff --git a/src/components/Developers/components/CopyToClipboard/CopyToClipboard.js b/src/components/Developers/components/CopyToClipboard/CopyToClipboard.js index d6a30404..7be77a1c 100644 --- a/src/components/Developers/components/CopyToClipboard/CopyToClipboard.js +++ b/src/components/Developers/components/CopyToClipboard/CopyToClipboard.js @@ -1,45 +1,26 @@ -import React, { Component } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import Clipboard from 'react-clipboard.js'; -import { Icon, OverlayTrigger, Tooltip } from 'patternfly-react'; +import { Tooltip } from '@patternfly/react-core'; +import { CopyIcon } from '@patternfly/react-icons'; import './CopyToClipboard.css'; -class CopyToClipboard extends Component { - constructor(props) { - super(props); - this.overlayTrigger = React.createRef(); - this.showTooltip = this.showTooltip.bind(this); - } - - showTooltip() { - this.overlayTrigger.current.show(); - setTimeout(() => { this.overlayTrigger.current.hide(); }, 600); - } - - render() { - return ( - - Copied! - - )} +const CopyToClipboard = ({ clipboardText }) => ( + + Copied! + )}> + - - - - - ); - } -} + + + + +) CopyToClipboard.propTypes = { clipboardText: PropTypes.string.isRequired }; diff --git a/yarn.lock b/yarn.lock index badd5046..398d5216 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1547,6 +1547,19 @@ resolved "https://registry.yarnpkg.com/@patternfly/patternfly/-/patternfly-4.59.1.tgz#87c03b860f2eec494dfc3ae67f04bf178f06491b" integrity sha512-zk3aqg62JXMTzzJMJsyVgt5fXlcxUUkRKkaxUv/hwpjhGiyLexZ1l3Gupb9ziYl74p38KzbbfcfdnlFCwJZfgg== +"@patternfly/react-core@^4.121.1": + version "4.121.1" + resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.121.1.tgz#25ce945c54366a202e1f581e48ff167df4d3f7fc" + integrity sha512-WIlh7Wd4o4r0PA2+9/fPcOxMAnc2H/InPx8rulJzD9a8KdUevl7+XDtKok6p6grKRUriV5wKPQyfZrxcb5VVHw== + dependencies: + "@patternfly/react-icons" "^4.10.7" + "@patternfly/react-styles" "^4.10.7" + "@patternfly/react-tokens" "^4.11.8" + focus-trap "6.2.2" + react-dropzone "9.0.0" + tippy.js "5.1.2" + tslib "1.13.0" + "@patternfly/react-core@^4.75.2": version "4.115.2" resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.115.2.tgz#084d1e408463945fa94f2b3bed13bd0b1146dcae" @@ -1565,6 +1578,11 @@ resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.10.2.tgz#d0659e7763364b1e73ec0f3b60e20cf9e4f067d6" integrity sha512-mSkBRaEFukpaAoLDyd3nI+6Cj0z2/5DgJTA2i7By/UW1wJifKnBWW8NRO2SsJQVQIUtuuAunjUrjzKHdcxs5IQ== +"@patternfly/react-icons@^4.10.7": + version "4.10.7" + resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.10.7.tgz#fe2eabf88512afe7dab0c0e7c71142ec6e594664" + integrity sha512-CiHYDOS8jrxNiy/KIxv9vPqg3cie4SzsbQKh+eW8lj41x68IrgILiw3VvjcJeVXXJDRW36T7u3IPKjMI6zuoyA== + "@patternfly/react-icons@^4.7.16": version "4.7.16" resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.7.16.tgz#5a99a31e6da6b06d68f55749a8e20f727102f491" @@ -1575,11 +1593,33 @@ resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.10.2.tgz#f399766ecb26e44e605355e94271da54029b5990" integrity sha512-cGvDFAISGrt+RAkX5NVyILCjWV1l9PCUpnMq6v4/6jBJOEHTBnRjaIGa92dw3OrLh407cBOIC0ugweRnocRmPw== +"@patternfly/react-styles@^4.10.7": + version "4.10.7" + resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.10.7.tgz#3b0ce38f3e12a69cdcbaf1ada163a5b114b919bd" + integrity sha512-oA9R1dXAJaKhj0/1z/uf2Z1wzsQ4jGQw2F8alPBagbDLyZD+pvUmElBr7o2Ucz/fm+/pLcphekCkGEVtyV3jOA== + +"@patternfly/react-table@^4.27.7": + version "4.27.7" + resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-4.27.7.tgz#f3159c703b4e5119d3f45dff7f4e9853b0b646a5" + integrity sha512-5lQBkXeBC5qtvum7HWPyd6PxpfO2j/UaIdy8ZeN7X0AVI96p3Zb4hH5WSTla2EAOUEmN0g16Nmxg57ZZREp+kg== + dependencies: + "@patternfly/react-core" "^4.121.1" + "@patternfly/react-icons" "^4.10.7" + "@patternfly/react-styles" "^4.10.7" + "@patternfly/react-tokens" "^4.11.8" + lodash "^4.17.19" + tslib "1.13.0" + "@patternfly/react-tokens@^4.11.3": version "4.11.3" resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.11.3.tgz#f102df85af3d248728b6b33d5c16784fa0ad3ebb" integrity sha512-7VbmT+aOwxk1DYzwer+wZgcbvkSsUUTKMKJDzhMvm5xi9nDeW8qI7laxQbWC9PDfsI5tiPxI2+BSuHnZpV/eRg== +"@patternfly/react-tokens@^4.11.8": + version "4.11.8" + resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.11.8.tgz#ea0c9ca036f6b0506cda43e899c3248971920337" + integrity sha512-k3UwsnWRoHHYbFbiqmUHtkrAPtw6D8BZLB1tPGzdXBlqQXRX1t8xukgDcTSUWo6wOPVdk8WrOgmWMy0u0Tk+sw== + "@polka/url@^1.0.0-next.9": version "1.0.0-next.11" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz#aeb16f50649a91af79dbe36574b66d0f9e4d9f71" From adefca4ef25ef177f82f4844abc20e4d3cdd5169 Mon Sep 17 00:00:00 2001 From: Alisamar Husain Date: Wed, 26 May 2021 14:51:25 +0530 Subject: [PATCH 02/60] Shift dev deps to deps, CRA requires this --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index b662337a..97fadf8f 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,7 @@ "sirv-cli": "^1.0.8", "sortabular": "^1.6.0", "table-resolver": "^4.1.1", - "undux": "^5.0.0-beta.18" - }, - "devDependencies": { + "undux": "^5.0.0-beta.18", "concurrently": "^4.1.0", "cross-env": "^5.2.0", "enzyme": "^3.3.0", From a53677bb4e4eb12c466fc76202a4f5cb9c09c319 Mon Sep 17 00:00:00 2001 From: Alisamar Husain Date: Wed, 26 May 2021 15:02:22 +0530 Subject: [PATCH 03/60] Change all React js to jsx Change all React js to jsx --- src/components/App/{App.js => App.jsx} | 0 src/components/App/{App.test.js => App.test.jsx} | 0 .../App/__snapshots__/{App.test.js.snap => App.test.jsx.snap} | 0 src/components/AppLayout/{AppLayout.js => AppLayout.jsx} | 0 src/components/Button/{index.js => index.jsx} | 0 .../CreatePlugin/{CreatePlugin.js => CreatePlugin.jsx} | 4 +++- .../{CreatePlugin.test.js => CreatePlugin.test.jsx} | 0 src/components/CreatePlugin/constant.js | 1 - src/components/Dashboard/{Dashboard.js => Dashboard.jsx} | 0 .../DashGitHubView/{DashGitHubView.js => DashGitHubView.jsx} | 0 .../{DashPluginCardView.js => DashPluginCardView.jsx} | 0 .../DashTeamView/{DashTeamView.js => DashTeamView.jsx} | 0 src/components/Developers/{Developers.js => Developers.jsx} | 0 .../Developers/{Developers.test.js => Developers.test.jsx} | 0 .../components/BashLine/{BashLine.js => BashLine.jsx} | 0 .../BashLine/{BashLine.test.js => BashLine.test.jsx} | 0 .../{BashLine.test.js.snap => BashLine.test.jsx.snap} | 0 .../{CopyToClipboard.js => CopyToClipboard.jsx} | 0 .../{CopyToClipboard.test.js => CopyToClipboard.test.jsx} | 0 ...ToClipboard.test.js.snap => CopyToClipboard.test.jsx.snap} | 0 .../DeveloperCTA/{DeveloperCTA.js => DeveloperCTA.jsx} | 0 .../{DeveloperCTA.test.js => DeveloperCTA.test.jsx} | 0 .../{DeveloperCTA.test.js.snap => DeveloperCTA.test.jsx.snap} | 0 .../{DeveloperSignup.js => DeveloperSignup.jsx} | 0 .../{DeveloperSignup.test.js => DeveloperSignup.test.jsx} | 0 ...loperSignup.test.js.snap => DeveloperSignup.test.jsx.snap} | 0 .../Instructions/{Instructions.js => Instructions.jsx} | 0 .../{Instructions.test.js => Instructions.test.jsx} | 0 src/components/Footer/{Footer.js => Footer.jsx} | 0 src/components/Footer/{Footer.test.js => Footer.test.jsx} | 0 .../{Footer.test.js.snap => Footer.test.jsx.snap} | 0 src/components/FormInput/{index.js => index.jsx} | 0 src/components/Hintblock/{index.js => index.jsx} | 0 .../{LoadingContainer.js => LoadingContainer.jsx} | 0 .../{LoadingContainer.test.js => LoadingContainer.test.jsx} | 0 ...gContainer.test.js.snap => LoadingContainer.test.jsx.snap} | 0 .../LoadingContent/{LoadingContent.js => LoadingContent.jsx} | 0 .../{LoadingContent.test.js => LoadingContent.test.jsx} | 0 ...adingContent.test.js.snap => LoadingContent.test.jsx.snap} | 0 src/components/Navbar/{Navbar.js => Navbar.jsx} | 0 src/components/Navbar/{Navbar.test.js => Navbar.test.jsx} | 0 .../{Navbar.test.js.snap => Navbar.test.jsx.snap} | 0 .../Navbar/components/Search/{Search.js => Search.jsx} | 0 .../components/Search/{Search.test.js => Search.test.jsx} | 0 .../{Search.test.js.snap => Search.test.jsx.snap} | 0 src/components/NotFound/{NotFound.js => NotFound.jsx} | 0 .../NotFound/{NotFound.test.js => NotFound.test.jsx} | 0 .../{NotFound.test.js.snap => NotFound.test.jsx.snap} | 0 src/components/Notification/{index.js => index.jsx} | 0 src/components/Plugin/{Plugin.js => Plugin.jsx} | 0 src/components/Plugin/{Plugin.test.js => Plugin.test.jsx} | 0 .../LoadingPlugin/{LoadingPlugin.js => LoadingPlugin.jsx} | 0 .../{LoadingPlugin.test.js => LoadingPlugin.test.jsx} | 0 .../components/PluginBody/{PluginBody.js => PluginBody.jsx} | 0 .../PluginBody/{PluginBody.test.js => PluginBody.test.jsx} | 0 src/components/Plugins/{Plugins.js => Plugins.jsx} | 0 src/components/Plugins/{Plugins.test.js => Plugins.test.jsx} | 0 .../{Plugins.test.js.snap => Plugins.test.jsx.snap} | 0 .../{LoadingPluginItem.js => LoadingPluginItem.jsx} | 0 .../{LoadingPluginItem.test.js => LoadingPluginItem.test.jsx} | 0 .../components/PluginItem/{PluginItem.js => PluginItem.jsx} | 0 .../PluginItem/{PluginItem.test.js => PluginItem.test.jsx} | 0 .../{PluginsCategories.js => PluginsCategories.jsx} | 0 .../{PluginsCategories.test.js => PluginsCategories.test.jsx} | 0 .../RelativeDate/{RelativeDate.js => RelativeDate.jsx} | 0 .../{RelativeDate.test.js => RelativeDate.test.jsx} | 0 .../Router/{ProtectedRoute.js => ProtectedRoute.jsx} | 0 src/components/Router/{Router.js => Router.jsx} | 0 src/components/Router/{Router.test.js => Router.test.jsx} | 0 .../{Router.test.js.snap => Router.test.jsx.snap} | 0 src/components/SignIn/{SignIn.js => SignIn.jsx} | 0 src/components/SignIn/{SignIn.test.js => SignIn.test.jsx} | 0 .../{SignIn.test.js.snap => SignIn.test.jsx.snap} | 0 src/components/Welcome/{Welcome.js => Welcome.jsx} | 0 src/components/Welcome/{Welcome.test.js => Welcome.test.jsx} | 0 .../{Welcome.test.js.snap => Welcome.test.jsx.snap} | 0 .../components/WelcomeCTA/{WelcomeCTA.js => WelcomeCTA.jsx} | 0 .../WelcomeCTA/{WelcomeCTA.test.js => WelcomeCTA.test.jsx} | 0 .../{WelcomeCategories.js => WelcomeCategories.jsx} | 0 .../{WelcomeCategories.test.js => WelcomeCategories.test.jsx} | 0 .../{sampleCategories.js => sampleCategories.jsx} | 0 .../{WelcomeCategory.js => WelcomeCategory.jsx} | 0 .../{WelcomeCategory.test.js => WelcomeCategory.test.jsx} | 0 .../WelcomeChRIS/{WelcomeChRIS.js => WelcomeChRIS.jsx} | 0 .../{WelcomeChRIS.test.js => WelcomeChRIS.test.jsx} | 0 .../{WelcomeDevelopers.js => WelcomeDevelopers.jsx} | 0 .../{WelcomeDevelopers.test.js => WelcomeDevelopers.test.jsx} | 0 .../WelcomeFeature/{WelcomeFeature.js => WelcomeFeature.jsx} | 0 .../{WelcomeFeature.test.js => WelcomeFeature.test.jsx} | 0 .../general/{CopyURLButton.js => CopyURLButton.jsx} | 0 90 files changed, 3 insertions(+), 2 deletions(-) rename src/components/App/{App.js => App.jsx} (100%) rename src/components/App/{App.test.js => App.test.jsx} (100%) rename src/components/App/__snapshots__/{App.test.js.snap => App.test.jsx.snap} (100%) rename src/components/AppLayout/{AppLayout.js => AppLayout.jsx} (100%) rename src/components/Button/{index.js => index.jsx} (100%) rename src/components/CreatePlugin/{CreatePlugin.js => CreatePlugin.jsx} (98%) rename src/components/CreatePlugin/{CreatePlugin.test.js => CreatePlugin.test.jsx} (100%) delete mode 100644 src/components/CreatePlugin/constant.js rename src/components/Dashboard/{Dashboard.js => Dashboard.jsx} (100%) rename src/components/Dashboard/components/DashGitHubView/{DashGitHubView.js => DashGitHubView.jsx} (100%) rename src/components/Dashboard/components/DashPluginCardView/{DashPluginCardView.js => DashPluginCardView.jsx} (100%) rename src/components/Dashboard/components/DashTeamView/{DashTeamView.js => DashTeamView.jsx} (100%) rename src/components/Developers/{Developers.js => Developers.jsx} (100%) rename src/components/Developers/{Developers.test.js => Developers.test.jsx} (100%) rename src/components/Developers/components/BashLine/{BashLine.js => BashLine.jsx} (100%) rename src/components/Developers/components/BashLine/{BashLine.test.js => BashLine.test.jsx} (100%) rename src/components/Developers/components/BashLine/__snapshots__/{BashLine.test.js.snap => BashLine.test.jsx.snap} (100%) rename src/components/Developers/components/CopyToClipboard/{CopyToClipboard.js => CopyToClipboard.jsx} (100%) rename src/components/Developers/components/CopyToClipboard/{CopyToClipboard.test.js => CopyToClipboard.test.jsx} (100%) rename src/components/Developers/components/CopyToClipboard/__snapshots__/{CopyToClipboard.test.js.snap => CopyToClipboard.test.jsx.snap} (100%) rename src/components/Developers/components/DeveloperCTA/{DeveloperCTA.js => DeveloperCTA.jsx} (100%) rename src/components/Developers/components/DeveloperCTA/{DeveloperCTA.test.js => DeveloperCTA.test.jsx} (100%) rename src/components/Developers/components/DeveloperCTA/__snapshots__/{DeveloperCTA.test.js.snap => DeveloperCTA.test.jsx.snap} (100%) rename src/components/Developers/components/DeveloperSignup/{DeveloperSignup.js => DeveloperSignup.jsx} (100%) rename src/components/Developers/components/DeveloperSignup/{DeveloperSignup.test.js => DeveloperSignup.test.jsx} (100%) rename src/components/Developers/components/DeveloperSignup/__snapshots__/{DeveloperSignup.test.js.snap => DeveloperSignup.test.jsx.snap} (100%) rename src/components/Developers/components/Instructions/{Instructions.js => Instructions.jsx} (100%) rename src/components/Developers/components/Instructions/{Instructions.test.js => Instructions.test.jsx} (100%) rename src/components/Footer/{Footer.js => Footer.jsx} (100%) rename src/components/Footer/{Footer.test.js => Footer.test.jsx} (100%) rename src/components/Footer/__snapshots__/{Footer.test.js.snap => Footer.test.jsx.snap} (100%) rename src/components/FormInput/{index.js => index.jsx} (100%) rename src/components/Hintblock/{index.js => index.jsx} (100%) rename src/components/LoadingContainer/{LoadingContainer.js => LoadingContainer.jsx} (100%) rename src/components/LoadingContainer/{LoadingContainer.test.js => LoadingContainer.test.jsx} (100%) rename src/components/LoadingContainer/__snapshots__/{LoadingContainer.test.js.snap => LoadingContainer.test.jsx.snap} (100%) rename src/components/LoadingContainer/components/LoadingContent/{LoadingContent.js => LoadingContent.jsx} (100%) rename src/components/LoadingContainer/components/LoadingContent/{LoadingContent.test.js => LoadingContent.test.jsx} (100%) rename src/components/LoadingContainer/components/LoadingContent/__snapshots__/{LoadingContent.test.js.snap => LoadingContent.test.jsx.snap} (100%) rename src/components/Navbar/{Navbar.js => Navbar.jsx} (100%) rename src/components/Navbar/{Navbar.test.js => Navbar.test.jsx} (100%) rename src/components/Navbar/__snapshots__/{Navbar.test.js.snap => Navbar.test.jsx.snap} (100%) rename src/components/Navbar/components/Search/{Search.js => Search.jsx} (100%) rename src/components/Navbar/components/Search/{Search.test.js => Search.test.jsx} (100%) rename src/components/Navbar/components/Search/__snapshots__/{Search.test.js.snap => Search.test.jsx.snap} (100%) rename src/components/NotFound/{NotFound.js => NotFound.jsx} (100%) rename src/components/NotFound/{NotFound.test.js => NotFound.test.jsx} (100%) rename src/components/NotFound/__snapshots__/{NotFound.test.js.snap => NotFound.test.jsx.snap} (100%) rename src/components/Notification/{index.js => index.jsx} (100%) rename src/components/Plugin/{Plugin.js => Plugin.jsx} (100%) mode change 100755 => 100644 rename src/components/Plugin/{Plugin.test.js => Plugin.test.jsx} (100%) rename src/components/Plugin/components/LoadingPlugin/{LoadingPlugin.js => LoadingPlugin.jsx} (100%) rename src/components/Plugin/components/LoadingPlugin/{LoadingPlugin.test.js => LoadingPlugin.test.jsx} (100%) rename src/components/Plugin/components/PluginBody/{PluginBody.js => PluginBody.jsx} (100%) rename src/components/Plugin/components/PluginBody/{PluginBody.test.js => PluginBody.test.jsx} (100%) rename src/components/Plugins/{Plugins.js => Plugins.jsx} (100%) mode change 100755 => 100644 rename src/components/Plugins/{Plugins.test.js => Plugins.test.jsx} (100%) rename src/components/Plugins/__snapshots__/{Plugins.test.js.snap => Plugins.test.jsx.snap} (100%) rename src/components/Plugins/components/LoadingPluginItem/{LoadingPluginItem.js => LoadingPluginItem.jsx} (100%) rename src/components/Plugins/components/LoadingPluginItem/{LoadingPluginItem.test.js => LoadingPluginItem.test.jsx} (100%) rename src/components/Plugins/components/PluginItem/{PluginItem.js => PluginItem.jsx} (100%) rename src/components/Plugins/components/PluginItem/{PluginItem.test.js => PluginItem.test.jsx} (100%) rename src/components/Plugins/components/PluginsCategories/{PluginsCategories.js => PluginsCategories.jsx} (100%) rename src/components/Plugins/components/PluginsCategories/{PluginsCategories.test.js => PluginsCategories.test.jsx} (100%) rename src/components/RelativeDate/{RelativeDate.js => RelativeDate.jsx} (100%) rename src/components/RelativeDate/{RelativeDate.test.js => RelativeDate.test.jsx} (100%) rename src/components/Router/{ProtectedRoute.js => ProtectedRoute.jsx} (100%) rename src/components/Router/{Router.js => Router.jsx} (100%) rename src/components/Router/{Router.test.js => Router.test.jsx} (100%) rename src/components/Router/__snapshots__/{Router.test.js.snap => Router.test.jsx.snap} (100%) rename src/components/SignIn/{SignIn.js => SignIn.jsx} (100%) rename src/components/SignIn/{SignIn.test.js => SignIn.test.jsx} (100%) rename src/components/SignIn/__snapshots__/{SignIn.test.js.snap => SignIn.test.jsx.snap} (100%) rename src/components/Welcome/{Welcome.js => Welcome.jsx} (100%) rename src/components/Welcome/{Welcome.test.js => Welcome.test.jsx} (100%) rename src/components/Welcome/__snapshots__/{Welcome.test.js.snap => Welcome.test.jsx.snap} (100%) rename src/components/Welcome/components/WelcomeCTA/{WelcomeCTA.js => WelcomeCTA.jsx} (100%) rename src/components/Welcome/components/WelcomeCTA/{WelcomeCTA.test.js => WelcomeCTA.test.jsx} (100%) rename src/components/Welcome/components/WelcomeCategories/{WelcomeCategories.js => WelcomeCategories.jsx} (100%) rename src/components/Welcome/components/WelcomeCategories/{WelcomeCategories.test.js => WelcomeCategories.test.jsx} (100%) rename src/components/Welcome/components/WelcomeCategories/{sampleCategories.js => sampleCategories.jsx} (100%) rename src/components/Welcome/components/WelcomeCategory/{WelcomeCategory.js => WelcomeCategory.jsx} (100%) rename src/components/Welcome/components/WelcomeCategory/{WelcomeCategory.test.js => WelcomeCategory.test.jsx} (100%) rename src/components/Welcome/components/WelcomeChRIS/{WelcomeChRIS.js => WelcomeChRIS.jsx} (100%) rename src/components/Welcome/components/WelcomeChRIS/{WelcomeChRIS.test.js => WelcomeChRIS.test.jsx} (100%) rename src/components/Welcome/components/WelcomeDevelopers/{WelcomeDevelopers.js => WelcomeDevelopers.jsx} (100%) rename src/components/Welcome/components/WelcomeDevelopers/{WelcomeDevelopers.test.js => WelcomeDevelopers.test.jsx} (100%) rename src/components/Welcome/components/WelcomeFeature/{WelcomeFeature.js => WelcomeFeature.jsx} (100%) rename src/components/Welcome/components/WelcomeFeature/{WelcomeFeature.test.js => WelcomeFeature.test.jsx} (100%) rename src/components/general/{CopyURLButton.js => CopyURLButton.jsx} (100%) diff --git a/src/components/App/App.js b/src/components/App/App.jsx similarity index 100% rename from src/components/App/App.js rename to src/components/App/App.jsx diff --git a/src/components/App/App.test.js b/src/components/App/App.test.jsx similarity index 100% rename from src/components/App/App.test.js rename to src/components/App/App.test.jsx diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.jsx.snap similarity index 100% rename from src/components/App/__snapshots__/App.test.js.snap rename to src/components/App/__snapshots__/App.test.jsx.snap diff --git a/src/components/AppLayout/AppLayout.js b/src/components/AppLayout/AppLayout.jsx similarity index 100% rename from src/components/AppLayout/AppLayout.js rename to src/components/AppLayout/AppLayout.jsx diff --git a/src/components/Button/index.js b/src/components/Button/index.jsx similarity index 100% rename from src/components/Button/index.js rename to src/components/Button/index.jsx diff --git a/src/components/CreatePlugin/CreatePlugin.js b/src/components/CreatePlugin/CreatePlugin.jsx similarity index 98% rename from src/components/CreatePlugin/CreatePlugin.js rename to src/components/CreatePlugin/CreatePlugin.jsx index 9bfdbc07..e3fd7062 100644 --- a/src/components/CreatePlugin/CreatePlugin.js +++ b/src/components/CreatePlugin/CreatePlugin.jsx @@ -13,7 +13,6 @@ import './CreatePlugin.css'; import { Plugin } from '../Plugin/Plugin'; import { Alert, AlertActionCloseButton, Card, CardBody, CodeBlock, CodeBlockCode } from '@patternfly/react-core'; import HintBlock from '../Hintblock'; -import { createPluginHint } from './constant'; const formGroupsData = [ { @@ -33,6 +32,9 @@ const formGroupsData = [ }, ]; +const createPluginHint = "Plugins should already exist and have their own public source repo and existing docker image. " + +"Adding a plugin to the store simply adds the location of your plugin, as well as some metadata, to the store, allowing other users easy access to it." + class CreatePlugin extends Component { constructor() { super(); diff --git a/src/components/CreatePlugin/CreatePlugin.test.js b/src/components/CreatePlugin/CreatePlugin.test.jsx similarity index 100% rename from src/components/CreatePlugin/CreatePlugin.test.js rename to src/components/CreatePlugin/CreatePlugin.test.jsx diff --git a/src/components/CreatePlugin/constant.js b/src/components/CreatePlugin/constant.js deleted file mode 100644 index 32bf23a5..00000000 --- a/src/components/CreatePlugin/constant.js +++ /dev/null @@ -1 +0,0 @@ -export const createPluginHint = "Plugins should already exist and have their own public source repo and existing docker image. Adding a plugin to the store simply adds the location of your plugin, as well as some metadata, to the store, allowing other users easy access to it." \ No newline at end of file diff --git a/src/components/Dashboard/Dashboard.js b/src/components/Dashboard/Dashboard.jsx similarity index 100% rename from src/components/Dashboard/Dashboard.js rename to src/components/Dashboard/Dashboard.jsx diff --git a/src/components/Dashboard/components/DashGitHubView/DashGitHubView.js b/src/components/Dashboard/components/DashGitHubView/DashGitHubView.jsx similarity index 100% rename from src/components/Dashboard/components/DashGitHubView/DashGitHubView.js rename to src/components/Dashboard/components/DashGitHubView/DashGitHubView.jsx diff --git a/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js b/src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.jsx similarity index 100% rename from src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.js rename to src/components/Dashboard/components/DashPluginCardView/DashPluginCardView.jsx diff --git a/src/components/Dashboard/components/DashTeamView/DashTeamView.js b/src/components/Dashboard/components/DashTeamView/DashTeamView.jsx similarity index 100% rename from src/components/Dashboard/components/DashTeamView/DashTeamView.js rename to src/components/Dashboard/components/DashTeamView/DashTeamView.jsx diff --git a/src/components/Developers/Developers.js b/src/components/Developers/Developers.jsx similarity index 100% rename from src/components/Developers/Developers.js rename to src/components/Developers/Developers.jsx diff --git a/src/components/Developers/Developers.test.js b/src/components/Developers/Developers.test.jsx similarity index 100% rename from src/components/Developers/Developers.test.js rename to src/components/Developers/Developers.test.jsx diff --git a/src/components/Developers/components/BashLine/BashLine.js b/src/components/Developers/components/BashLine/BashLine.jsx similarity index 100% rename from src/components/Developers/components/BashLine/BashLine.js rename to src/components/Developers/components/BashLine/BashLine.jsx diff --git a/src/components/Developers/components/BashLine/BashLine.test.js b/src/components/Developers/components/BashLine/BashLine.test.jsx similarity index 100% rename from src/components/Developers/components/BashLine/BashLine.test.js rename to src/components/Developers/components/BashLine/BashLine.test.jsx diff --git a/src/components/Developers/components/BashLine/__snapshots__/BashLine.test.js.snap b/src/components/Developers/components/BashLine/__snapshots__/BashLine.test.jsx.snap similarity index 100% rename from src/components/Developers/components/BashLine/__snapshots__/BashLine.test.js.snap rename to src/components/Developers/components/BashLine/__snapshots__/BashLine.test.jsx.snap diff --git a/src/components/Developers/components/CopyToClipboard/CopyToClipboard.js b/src/components/Developers/components/CopyToClipboard/CopyToClipboard.jsx similarity index 100% rename from src/components/Developers/components/CopyToClipboard/CopyToClipboard.js rename to src/components/Developers/components/CopyToClipboard/CopyToClipboard.jsx diff --git a/src/components/Developers/components/CopyToClipboard/CopyToClipboard.test.js b/src/components/Developers/components/CopyToClipboard/CopyToClipboard.test.jsx similarity index 100% rename from src/components/Developers/components/CopyToClipboard/CopyToClipboard.test.js rename to src/components/Developers/components/CopyToClipboard/CopyToClipboard.test.jsx diff --git a/src/components/Developers/components/CopyToClipboard/__snapshots__/CopyToClipboard.test.js.snap b/src/components/Developers/components/CopyToClipboard/__snapshots__/CopyToClipboard.test.jsx.snap similarity index 100% rename from src/components/Developers/components/CopyToClipboard/__snapshots__/CopyToClipboard.test.js.snap rename to src/components/Developers/components/CopyToClipboard/__snapshots__/CopyToClipboard.test.jsx.snap diff --git a/src/components/Developers/components/DeveloperCTA/DeveloperCTA.js b/src/components/Developers/components/DeveloperCTA/DeveloperCTA.jsx similarity index 100% rename from src/components/Developers/components/DeveloperCTA/DeveloperCTA.js rename to src/components/Developers/components/DeveloperCTA/DeveloperCTA.jsx diff --git a/src/components/Developers/components/DeveloperCTA/DeveloperCTA.test.js b/src/components/Developers/components/DeveloperCTA/DeveloperCTA.test.jsx similarity index 100% rename from src/components/Developers/components/DeveloperCTA/DeveloperCTA.test.js rename to src/components/Developers/components/DeveloperCTA/DeveloperCTA.test.jsx diff --git a/src/components/Developers/components/DeveloperCTA/__snapshots__/DeveloperCTA.test.js.snap b/src/components/Developers/components/DeveloperCTA/__snapshots__/DeveloperCTA.test.jsx.snap similarity index 100% rename from src/components/Developers/components/DeveloperCTA/__snapshots__/DeveloperCTA.test.js.snap rename to src/components/Developers/components/DeveloperCTA/__snapshots__/DeveloperCTA.test.jsx.snap diff --git a/src/components/Developers/components/DeveloperSignup/DeveloperSignup.js b/src/components/Developers/components/DeveloperSignup/DeveloperSignup.jsx similarity index 100% rename from src/components/Developers/components/DeveloperSignup/DeveloperSignup.js rename to src/components/Developers/components/DeveloperSignup/DeveloperSignup.jsx diff --git a/src/components/Developers/components/DeveloperSignup/DeveloperSignup.test.js b/src/components/Developers/components/DeveloperSignup/DeveloperSignup.test.jsx similarity index 100% rename from src/components/Developers/components/DeveloperSignup/DeveloperSignup.test.js rename to src/components/Developers/components/DeveloperSignup/DeveloperSignup.test.jsx diff --git a/src/components/Developers/components/DeveloperSignup/__snapshots__/DeveloperSignup.test.js.snap b/src/components/Developers/components/DeveloperSignup/__snapshots__/DeveloperSignup.test.jsx.snap similarity index 100% rename from src/components/Developers/components/DeveloperSignup/__snapshots__/DeveloperSignup.test.js.snap rename to src/components/Developers/components/DeveloperSignup/__snapshots__/DeveloperSignup.test.jsx.snap diff --git a/src/components/Developers/components/Instructions/Instructions.js b/src/components/Developers/components/Instructions/Instructions.jsx similarity index 100% rename from src/components/Developers/components/Instructions/Instructions.js rename to src/components/Developers/components/Instructions/Instructions.jsx diff --git a/src/components/Developers/components/Instructions/Instructions.test.js b/src/components/Developers/components/Instructions/Instructions.test.jsx similarity index 100% rename from src/components/Developers/components/Instructions/Instructions.test.js rename to src/components/Developers/components/Instructions/Instructions.test.jsx diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.jsx similarity index 100% rename from src/components/Footer/Footer.js rename to src/components/Footer/Footer.jsx diff --git a/src/components/Footer/Footer.test.js b/src/components/Footer/Footer.test.jsx similarity index 100% rename from src/components/Footer/Footer.test.js rename to src/components/Footer/Footer.test.jsx diff --git a/src/components/Footer/__snapshots__/Footer.test.js.snap b/src/components/Footer/__snapshots__/Footer.test.jsx.snap similarity index 100% rename from src/components/Footer/__snapshots__/Footer.test.js.snap rename to src/components/Footer/__snapshots__/Footer.test.jsx.snap diff --git a/src/components/FormInput/index.js b/src/components/FormInput/index.jsx similarity index 100% rename from src/components/FormInput/index.js rename to src/components/FormInput/index.jsx diff --git a/src/components/Hintblock/index.js b/src/components/Hintblock/index.jsx similarity index 100% rename from src/components/Hintblock/index.js rename to src/components/Hintblock/index.jsx diff --git a/src/components/LoadingContainer/LoadingContainer.js b/src/components/LoadingContainer/LoadingContainer.jsx similarity index 100% rename from src/components/LoadingContainer/LoadingContainer.js rename to src/components/LoadingContainer/LoadingContainer.jsx diff --git a/src/components/LoadingContainer/LoadingContainer.test.js b/src/components/LoadingContainer/LoadingContainer.test.jsx similarity index 100% rename from src/components/LoadingContainer/LoadingContainer.test.js rename to src/components/LoadingContainer/LoadingContainer.test.jsx diff --git a/src/components/LoadingContainer/__snapshots__/LoadingContainer.test.js.snap b/src/components/LoadingContainer/__snapshots__/LoadingContainer.test.jsx.snap similarity index 100% rename from src/components/LoadingContainer/__snapshots__/LoadingContainer.test.js.snap rename to src/components/LoadingContainer/__snapshots__/LoadingContainer.test.jsx.snap diff --git a/src/components/LoadingContainer/components/LoadingContent/LoadingContent.js b/src/components/LoadingContainer/components/LoadingContent/LoadingContent.jsx similarity index 100% rename from src/components/LoadingContainer/components/LoadingContent/LoadingContent.js rename to src/components/LoadingContainer/components/LoadingContent/LoadingContent.jsx diff --git a/src/components/LoadingContainer/components/LoadingContent/LoadingContent.test.js b/src/components/LoadingContainer/components/LoadingContent/LoadingContent.test.jsx similarity index 100% rename from src/components/LoadingContainer/components/LoadingContent/LoadingContent.test.js rename to src/components/LoadingContainer/components/LoadingContent/LoadingContent.test.jsx diff --git a/src/components/LoadingContainer/components/LoadingContent/__snapshots__/LoadingContent.test.js.snap b/src/components/LoadingContainer/components/LoadingContent/__snapshots__/LoadingContent.test.jsx.snap similarity index 100% rename from src/components/LoadingContainer/components/LoadingContent/__snapshots__/LoadingContent.test.js.snap rename to src/components/LoadingContainer/components/LoadingContent/__snapshots__/LoadingContent.test.jsx.snap diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.jsx similarity index 100% rename from src/components/Navbar/Navbar.js rename to src/components/Navbar/Navbar.jsx diff --git a/src/components/Navbar/Navbar.test.js b/src/components/Navbar/Navbar.test.jsx similarity index 100% rename from src/components/Navbar/Navbar.test.js rename to src/components/Navbar/Navbar.test.jsx diff --git a/src/components/Navbar/__snapshots__/Navbar.test.js.snap b/src/components/Navbar/__snapshots__/Navbar.test.jsx.snap similarity index 100% rename from src/components/Navbar/__snapshots__/Navbar.test.js.snap rename to src/components/Navbar/__snapshots__/Navbar.test.jsx.snap diff --git a/src/components/Navbar/components/Search/Search.js b/src/components/Navbar/components/Search/Search.jsx similarity index 100% rename from src/components/Navbar/components/Search/Search.js rename to src/components/Navbar/components/Search/Search.jsx diff --git a/src/components/Navbar/components/Search/Search.test.js b/src/components/Navbar/components/Search/Search.test.jsx similarity index 100% rename from src/components/Navbar/components/Search/Search.test.js rename to src/components/Navbar/components/Search/Search.test.jsx diff --git a/src/components/Navbar/components/Search/__snapshots__/Search.test.js.snap b/src/components/Navbar/components/Search/__snapshots__/Search.test.jsx.snap similarity index 100% rename from src/components/Navbar/components/Search/__snapshots__/Search.test.js.snap rename to src/components/Navbar/components/Search/__snapshots__/Search.test.jsx.snap diff --git a/src/components/NotFound/NotFound.js b/src/components/NotFound/NotFound.jsx similarity index 100% rename from src/components/NotFound/NotFound.js rename to src/components/NotFound/NotFound.jsx diff --git a/src/components/NotFound/NotFound.test.js b/src/components/NotFound/NotFound.test.jsx similarity index 100% rename from src/components/NotFound/NotFound.test.js rename to src/components/NotFound/NotFound.test.jsx diff --git a/src/components/NotFound/__snapshots__/NotFound.test.js.snap b/src/components/NotFound/__snapshots__/NotFound.test.jsx.snap similarity index 100% rename from src/components/NotFound/__snapshots__/NotFound.test.js.snap rename to src/components/NotFound/__snapshots__/NotFound.test.jsx.snap diff --git a/src/components/Notification/index.js b/src/components/Notification/index.jsx similarity index 100% rename from src/components/Notification/index.js rename to src/components/Notification/index.jsx diff --git a/src/components/Plugin/Plugin.js b/src/components/Plugin/Plugin.jsx old mode 100755 new mode 100644 similarity index 100% rename from src/components/Plugin/Plugin.js rename to src/components/Plugin/Plugin.jsx diff --git a/src/components/Plugin/Plugin.test.js b/src/components/Plugin/Plugin.test.jsx similarity index 100% rename from src/components/Plugin/Plugin.test.js rename to src/components/Plugin/Plugin.test.jsx diff --git a/src/components/Plugin/components/LoadingPlugin/LoadingPlugin.js b/src/components/Plugin/components/LoadingPlugin/LoadingPlugin.jsx similarity index 100% rename from src/components/Plugin/components/LoadingPlugin/LoadingPlugin.js rename to src/components/Plugin/components/LoadingPlugin/LoadingPlugin.jsx diff --git a/src/components/Plugin/components/LoadingPlugin/LoadingPlugin.test.js b/src/components/Plugin/components/LoadingPlugin/LoadingPlugin.test.jsx similarity index 100% rename from src/components/Plugin/components/LoadingPlugin/LoadingPlugin.test.js rename to src/components/Plugin/components/LoadingPlugin/LoadingPlugin.test.jsx diff --git a/src/components/Plugin/components/PluginBody/PluginBody.js b/src/components/Plugin/components/PluginBody/PluginBody.jsx similarity index 100% rename from src/components/Plugin/components/PluginBody/PluginBody.js rename to src/components/Plugin/components/PluginBody/PluginBody.jsx diff --git a/src/components/Plugin/components/PluginBody/PluginBody.test.js b/src/components/Plugin/components/PluginBody/PluginBody.test.jsx similarity index 100% rename from src/components/Plugin/components/PluginBody/PluginBody.test.js rename to src/components/Plugin/components/PluginBody/PluginBody.test.jsx diff --git a/src/components/Plugins/Plugins.js b/src/components/Plugins/Plugins.jsx old mode 100755 new mode 100644 similarity index 100% rename from src/components/Plugins/Plugins.js rename to src/components/Plugins/Plugins.jsx diff --git a/src/components/Plugins/Plugins.test.js b/src/components/Plugins/Plugins.test.jsx similarity index 100% rename from src/components/Plugins/Plugins.test.js rename to src/components/Plugins/Plugins.test.jsx diff --git a/src/components/Plugins/__snapshots__/Plugins.test.js.snap b/src/components/Plugins/__snapshots__/Plugins.test.jsx.snap similarity index 100% rename from src/components/Plugins/__snapshots__/Plugins.test.js.snap rename to src/components/Plugins/__snapshots__/Plugins.test.jsx.snap diff --git a/src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.js b/src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.jsx similarity index 100% rename from src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.js rename to src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.jsx diff --git a/src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.test.js b/src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.test.jsx similarity index 100% rename from src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.test.js rename to src/components/Plugins/components/LoadingPluginItem/LoadingPluginItem.test.jsx diff --git a/src/components/Plugins/components/PluginItem/PluginItem.js b/src/components/Plugins/components/PluginItem/PluginItem.jsx similarity index 100% rename from src/components/Plugins/components/PluginItem/PluginItem.js rename to src/components/Plugins/components/PluginItem/PluginItem.jsx diff --git a/src/components/Plugins/components/PluginItem/PluginItem.test.js b/src/components/Plugins/components/PluginItem/PluginItem.test.jsx similarity index 100% rename from src/components/Plugins/components/PluginItem/PluginItem.test.js rename to src/components/Plugins/components/PluginItem/PluginItem.test.jsx diff --git a/src/components/Plugins/components/PluginsCategories/PluginsCategories.js b/src/components/Plugins/components/PluginsCategories/PluginsCategories.jsx similarity index 100% rename from src/components/Plugins/components/PluginsCategories/PluginsCategories.js rename to src/components/Plugins/components/PluginsCategories/PluginsCategories.jsx diff --git a/src/components/Plugins/components/PluginsCategories/PluginsCategories.test.js b/src/components/Plugins/components/PluginsCategories/PluginsCategories.test.jsx similarity index 100% rename from src/components/Plugins/components/PluginsCategories/PluginsCategories.test.js rename to src/components/Plugins/components/PluginsCategories/PluginsCategories.test.jsx diff --git a/src/components/RelativeDate/RelativeDate.js b/src/components/RelativeDate/RelativeDate.jsx similarity index 100% rename from src/components/RelativeDate/RelativeDate.js rename to src/components/RelativeDate/RelativeDate.jsx diff --git a/src/components/RelativeDate/RelativeDate.test.js b/src/components/RelativeDate/RelativeDate.test.jsx similarity index 100% rename from src/components/RelativeDate/RelativeDate.test.js rename to src/components/RelativeDate/RelativeDate.test.jsx diff --git a/src/components/Router/ProtectedRoute.js b/src/components/Router/ProtectedRoute.jsx similarity index 100% rename from src/components/Router/ProtectedRoute.js rename to src/components/Router/ProtectedRoute.jsx diff --git a/src/components/Router/Router.js b/src/components/Router/Router.jsx similarity index 100% rename from src/components/Router/Router.js rename to src/components/Router/Router.jsx diff --git a/src/components/Router/Router.test.js b/src/components/Router/Router.test.jsx similarity index 100% rename from src/components/Router/Router.test.js rename to src/components/Router/Router.test.jsx diff --git a/src/components/Router/__snapshots__/Router.test.js.snap b/src/components/Router/__snapshots__/Router.test.jsx.snap similarity index 100% rename from src/components/Router/__snapshots__/Router.test.js.snap rename to src/components/Router/__snapshots__/Router.test.jsx.snap diff --git a/src/components/SignIn/SignIn.js b/src/components/SignIn/SignIn.jsx similarity index 100% rename from src/components/SignIn/SignIn.js rename to src/components/SignIn/SignIn.jsx diff --git a/src/components/SignIn/SignIn.test.js b/src/components/SignIn/SignIn.test.jsx similarity index 100% rename from src/components/SignIn/SignIn.test.js rename to src/components/SignIn/SignIn.test.jsx diff --git a/src/components/SignIn/__snapshots__/SignIn.test.js.snap b/src/components/SignIn/__snapshots__/SignIn.test.jsx.snap similarity index 100% rename from src/components/SignIn/__snapshots__/SignIn.test.js.snap rename to src/components/SignIn/__snapshots__/SignIn.test.jsx.snap diff --git a/src/components/Welcome/Welcome.js b/src/components/Welcome/Welcome.jsx similarity index 100% rename from src/components/Welcome/Welcome.js rename to src/components/Welcome/Welcome.jsx diff --git a/src/components/Welcome/Welcome.test.js b/src/components/Welcome/Welcome.test.jsx similarity index 100% rename from src/components/Welcome/Welcome.test.js rename to src/components/Welcome/Welcome.test.jsx diff --git a/src/components/Welcome/__snapshots__/Welcome.test.js.snap b/src/components/Welcome/__snapshots__/Welcome.test.jsx.snap similarity index 100% rename from src/components/Welcome/__snapshots__/Welcome.test.js.snap rename to src/components/Welcome/__snapshots__/Welcome.test.jsx.snap diff --git a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.js b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCTA/WelcomeCTA.js rename to src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx diff --git a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.test.js b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCTA/WelcomeCTA.test.js rename to src/components/Welcome/components/WelcomeCTA/WelcomeCTA.test.jsx diff --git a/src/components/Welcome/components/WelcomeCategories/WelcomeCategories.js b/src/components/Welcome/components/WelcomeCategories/WelcomeCategories.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCategories/WelcomeCategories.js rename to src/components/Welcome/components/WelcomeCategories/WelcomeCategories.jsx diff --git a/src/components/Welcome/components/WelcomeCategories/WelcomeCategories.test.js b/src/components/Welcome/components/WelcomeCategories/WelcomeCategories.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCategories/WelcomeCategories.test.js rename to src/components/Welcome/components/WelcomeCategories/WelcomeCategories.test.jsx diff --git a/src/components/Welcome/components/WelcomeCategories/sampleCategories.js b/src/components/Welcome/components/WelcomeCategories/sampleCategories.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCategories/sampleCategories.js rename to src/components/Welcome/components/WelcomeCategories/sampleCategories.jsx diff --git a/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.js b/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCategory/WelcomeCategory.js rename to src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx diff --git a/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.test.js b/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeCategory/WelcomeCategory.test.js rename to src/components/Welcome/components/WelcomeCategory/WelcomeCategory.test.jsx diff --git a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.js b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.js rename to src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx diff --git a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.test.js b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.test.js rename to src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.test.jsx diff --git a/src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.js b/src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.js rename to src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.jsx diff --git a/src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.test.js b/src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.test.js rename to src/components/Welcome/components/WelcomeDevelopers/WelcomeDevelopers.test.jsx diff --git a/src/components/Welcome/components/WelcomeFeature/WelcomeFeature.js b/src/components/Welcome/components/WelcomeFeature/WelcomeFeature.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeFeature/WelcomeFeature.js rename to src/components/Welcome/components/WelcomeFeature/WelcomeFeature.jsx diff --git a/src/components/Welcome/components/WelcomeFeature/WelcomeFeature.test.js b/src/components/Welcome/components/WelcomeFeature/WelcomeFeature.test.jsx similarity index 100% rename from src/components/Welcome/components/WelcomeFeature/WelcomeFeature.test.js rename to src/components/Welcome/components/WelcomeFeature/WelcomeFeature.test.jsx diff --git a/src/components/general/CopyURLButton.js b/src/components/general/CopyURLButton.jsx similarity index 100% rename from src/components/general/CopyURLButton.js rename to src/components/general/CopyURLButton.jsx From d1c9134b88f50f8d9d37750a4b365b41dd896030 Mon Sep 17 00:00:00 2001 From: Alisamar Husain Date: Wed, 26 May 2021 12:37:00 +0530 Subject: [PATCH 04/60] Welcome page and developers --- src/components/Button/index.jsx | 1 + .../components/DeveloperCTA/DeveloperCTA.css | 39 +---- .../components/DeveloperCTA/DeveloperCTA.jsx | 67 ++++---- .../DeveloperSignup/DeveloperSignup.css | 6 +- .../DeveloperSignup/DeveloperSignup.jsx | 54 +++---- src/components/Welcome/Welcome.jsx | 4 +- .../components/WelcomeCTA/WelcomeCTA.css | 143 ++++-------------- .../components/WelcomeCTA/WelcomeCTA.jsx | 80 +++++----- .../WelcomeCategories/welcomeCategories.css | 10 +- .../WelcomeCategory/WelcomeCategory.jsx | 2 +- .../components/WelcomeChRIS/WelcomeChRIS.css | 130 +++++----------- .../components/WelcomeChRIS/WelcomeChRIS.jsx | 119 +++++++++------ .../WelcomeDevelopers/WelcomeDevelopers.css | 45 +++--- .../WelcomeDevelopers/WelcomeDevelopers.jsx | 63 +++++--- .../WelcomeFeature/WelcomeFeature.css | 25 ++- src/index.css | 14 +- 16 files changed, 347 insertions(+), 455 deletions(-) diff --git a/src/components/Button/index.jsx b/src/components/Button/index.jsx index efa2122e..8c59c388 100644 --- a/src/components/Button/index.jsx +++ b/src/components/Button/index.jsx @@ -13,6 +13,7 @@ const ButtonComponent = ({ ...otherProps }) => { const history = useHistory(); + window.scrollTo(0, 0); return (
- )} - {loading && Creating Account} - ); +
+ {loading ? : ( + + )} + {loading && Creating Account} +
+ + ); } } diff --git a/src/components/Welcome/Welcome.jsx b/src/components/Welcome/Welcome.jsx index fcb3172f..eb19e90f 100644 --- a/src/components/Welcome/Welcome.jsx +++ b/src/components/Welcome/Welcome.jsx @@ -1,14 +1,14 @@ import React from 'react'; import WelcomeCTA from './components/WelcomeCTA/WelcomeCTA'; -import WelcomeCategories from './components/WelcomeCategories/WelcomeCategories'; import WelcomeChRIS from './components/WelcomeChRIS/WelcomeChRIS'; +import WelcomeCategories from './components/WelcomeCategories/WelcomeCategories'; import WelcomeDevelopers from './components/WelcomeDevelopers/WelcomeDevelopers'; const Welcome = () => (
- +
); diff --git a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.css b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.css index 26399501..13c7edf4 100644 --- a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.css +++ b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.css @@ -1,105 +1,58 @@ .welcome-cta { font-size: 1.4em; -} -.welcome-cta-img { /* color */ - background: #393f44; + /* background: #393f44; background: var(--pf-black-800); background: linear-gradient(135deg #4d5258, #393f44); - background: linear-gradient(135deg, var(--pf-black-700), var(--pf-black-800)); - background: url('../../../../assets/img/banner_chris-users.png') #393f44; + background: linear-gradient(135deg, var(--pf-black-700), var(--pf-black-800)); */ + background: url('../../../../assets/img/banner_chris-users.png'); + background: linear-gradient(transparent, var(--pf-blue-400) 96%, var(--pf-blue-500) 100%), + linear-gradient(transparent, #0b68b440, var(--pf-blue-500)), + url('../../../../assets/img/banner_chris-users.png'); + background-repeat: no-repeat; background-size: cover; background-position: center; color: #fafafa; color: var(--pf-black-100); - /* display */ - padding: 3em 30px; - - /* font */ - text-shadow: 3px 3px 6px #030303; - text-shadow: 3px 3px 6px var(--pf-black); - + /* vertically align text in div */ display: flex; justify-content: center; flex-direction: column; + padding: 1em; } -.welcome-cta-header { - /* font */ - font-size: 1.3em; - line-height: 1.3; -} - -.welcome-cta-featured { - /* color */ - background: #0088ce; - background: var(--pf-blue-400); - background: linear-gradient(#39a5dc, #0088ce); - background: linear-gradient(var(--pf-blue-300), var(--pf-blue-400)); - - /* display */ - min-height: 300px; - padding-bottom: 1.5em; -} - -.welcome-cta-featured-desc { - /* color */ - color: #fafafa; - color: var(--pf-black-100); - - /* display */ - padding: 1.5em 1em; - - /* font */ +#welcome-cta-header { + margin: 2em; text-align: center; - font-weight: 300; + padding: 2em 0; +} #welcome-cta-header h1 { + font-size: 4.5em; + font-weight: 500; + line-height: 1.25; + margin: 0.5em 0; + color: white; +} #welcome-cta-header p { + font-size: 1.25em; + line-height: 1.25; + max-width: 600px; } .welcome-cta .welcome-cta-featured-container { - /* display */ display: flex; width: 300px; width: fit-content; /* flex */ - flex-direction: column; -} - -.welcome-cta-featured-container > * { + flex-flow: row; + flex-wrap: wrap; +} .welcome-cta-featured-container > * { flex: 1; } -.welcome-scroll-caret { - /* color */ - color: #fafafa; - color: var(--pf-black-100); - - /* display */ - display: none; - - /* font */ - font-size: 2em; - text-align: center; -} - -.welcome-user-cta { - /* display */ - padding: 6em 2em; - padding-bottom: 8em; -} - -.welcome-user-cta-header { - /* display */ - margin-bottom: 0.5em; - - /* font */ - font-size: 2em; -} - /* ============================== */ /* ---------- ANIMATIONS -------- */ /* ============================== */ @@ -115,57 +68,17 @@ /* ============================== */ @media (min-width: 480px) { - .welcome-cta-img { - /* display */ - padding: 3em 2em; - } - .welcome-cta-header { - /* font */ - font-size: 1.9em; + font-size: 2em; } } @media (min-width: 768px) { - .welcome-cta-img { - /* display */ - min-height: 300px; - /* fill up the entire page except for the features (300px) and navbar (66px) */ - height: calc(100vh - 325px - 66px); - padding: 0; - } - .welcome-cta-header { - /* font */ font-size: 2.5em; } - .welcome-cta-featured { - /* display */ - min-height: 325px; - padding-bottom: 0; - } - - .welcome-cta .welcome-cta-featured-container { - /* display */ - width: auto; - text-align: center; - - /* flex */ - flex-direction: row; - } - - .welcome-cta-header { padding: 0 8%; } - - .welcome-scroll-caret { - /* display */ - display: block; - - /* other */ - animation: fadein 2s; - } - - .welcome-user-cta { - width: 70%; + .welcome-cta .welcome-cta-featured { + padding: 3em 3em 6em 3em; } } diff --git a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx index a40f4712..25d82e25 100644 --- a/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx +++ b/src/components/Welcome/components/WelcomeCTA/WelcomeCTA.jsx @@ -1,5 +1,4 @@ import React from 'react'; -import { AngleDownIcon } from '@patternfly/react-icons'; import './WelcomeCTA.css'; import WelcomeFeature from '../WelcomeFeature/WelcomeFeature'; @@ -11,48 +10,47 @@ import antLogo from '../../../../assets/img/plugins/ant_90.png'; import civetLogo from '../../../../assets/img/plugins/civet_90.png'; -const WelcomeCTA = () => ( -
-
-
- Accessible medical imaging using the latest - research innovations, backed by cloud-based - computing power. -
-
-
-
- Apps available in the ChRIS store include: -
-
- - - - - -
-
- -
-
-
-
-
- Focus on your data. Not the tools. -
-
- You need to run analyses on data, view the results, - create visualizations, collaborate on your findings. - Not build an infrastructure and become a software developer. +const WelcomeCTA = () => { + // Object to make fetching from build/external easier later + const features = [ + {name: "Fastsurfer", url: 'https://chrisstore.co/plugin/44', img: freesurferLogo}, + {name: "Civet", url: 'https://chrisstore.co/plugin/2', img: civetLogo}, + {name: "Infant FreeSurfer", url: 'https://chrisstore.co/plugin/78', img: infantLogo}, + {name: "IRTK Reconstruction", url: 'https://chrisstore.co/plugin/85', img: biomediaLogo}, + {name: "N4 Bias Field Correction", url: 'https://chrisstore.co/plugin/77', img: antLogo}, + ] + + return ( + <> +
+
+
+

ChRIS Store

+

+ Accessible medical imaging using the latest + research innovations, backed by cloud-based + computing power. +

-
-
- The ChRIS platform provides a common infrastructure to - which you can deploy... +
+ +
+
+ {/*
+

Apps available in the ChRIS Store

+
*/} +
+ { + features.map((feature)=>( + + )) + } +
-
+
-
-); + + ); +} export default WelcomeCTA; diff --git a/src/components/Welcome/components/WelcomeCategories/welcomeCategories.css b/src/components/Welcome/components/WelcomeCategories/welcomeCategories.css index 3da22a98..22d1fd08 100644 --- a/src/components/Welcome/components/WelcomeCategories/welcomeCategories.css +++ b/src/components/Welcome/components/WelcomeCategories/welcomeCategories.css @@ -9,8 +9,7 @@ background-size: auto; background-position: center; - /* display */ - padding-bottom: 1em; + padding: 1em; } .welcome-categories-header { @@ -22,7 +21,7 @@ padding: 2em; /* font */ - text-align: left; + text-align: center; font-size: 2em; text-shadow: 0 0 1em #030303;; text-shadow: 0 0 1em var(--pf-black); @@ -42,12 +41,9 @@ @media (min-width: 768px) { .welcome-categories { /* display */ - padding-top: 1em; - padding-bottom: 6em; + padding: 3em; } - .welcome-categories-header { text-align: center; } - .welcome-categories-container { /* display */ display: flex; diff --git a/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx b/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx index b3a6bec0..1969b047 100644 --- a/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx +++ b/src/components/Welcome/components/WelcomeCategory/WelcomeCategory.jsx @@ -22,7 +22,7 @@ const WelcomeCategory = ({ category, ...props }) => ( diff --git a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.css b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.css index 49fa95ec..afaed7f5 100644 --- a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.css +++ b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.css @@ -1,130 +1,82 @@ -.welcome-chris { - /* color */ - background: #39a5dc; - background: var(--pf-blue-300); - - /* display */ +#welcome-chris { min-height: 400px; padding: 2em; - - /* position */ - position: relative; } -.welcome-chris .row > div { - /* display */ - padding: 1em; - /* flex */ - flex: 1; +#welcome-user-cta { + padding: 6em 0.5em 8em 0.5em; + text-align: center; } -.welcome-chris-text { - /* color */ - color: #fafafa; - color: var(--pf-black-100); -} -.welcome-chris-text-container > div { - font-weight: 400; +#welcome-user-cta-header { + margin-bottom: 0.5em; +} #welcome-user-cta-header .tag { + font-weight: 800; + opacity: 0.6; +} #welcome-user-cta-header h1 { font-size: 3em; + line-height: 1.3; + margin: 0.25em 0; + color: var(--pf-blue-500); +} #welcome-user-cta-header p { + font-size: 1.5em; } -.welcome-chris-text-container > p { font-size: 1.3em; } -.welcome-chris-video-column { - /* display */ - display: flex; - - /* flex */ - flex-direction: column; - justify-content: center; +#welcome-chris-text-container > div { + font-weight: 400; + font-size: 3em; +} #welcome-chris-text-container > p { + font-size: 1.3em; } -.welcome-chris-video { - /* display */ + +#welcome-chris-video { width: 100%; height: 200px; -} - -.welcome-chris-video-desc { - /* color */ - color: #fafafa; - color: var(--pf-black-100); - - /* display */ + margin: 1em auto; +} #welcome-chris-video-desc { padding: 1em 1em 0 0; -} + margin: auto; -.welcome-chris-btn { - /* display */ - background: #fafafa !important; - display: block !important; - width: auto; + text-align: center; + line-height: 1.5; + max-width: 75%; } -.welcome-chris-btn .other-btn { - width: auto; -} - -.welcome-chris-banner { display: none; } - /* ============================== */ /* ---------- RESPONSIVE -------- */ /* ============================== */ -@media (min-width: 420px) { - .welcome-chris-btn-row > div { display: inline-block; } - - .welcome-chris-btn { width: max-content; } -} - @media (min-width: 480px) { - .welcome-chris-video { height: 50vw; } + #welcome-chris-video { height: 50vw; } } @media (min-width: 768px) { - .welcome-chris-video { - /* display */ + #welcome-user-cta { + padding: 6em 2em 8em 2em; + } + #welcome-user-cta-header h1 { + font-size: 4em; + } + #welcome-chris-video { width: 45vw; height: 25.3vw; } - - .welcome-chris-more-btn { - /* display */ - width: 208.5px; - - /* other */ - float: right; - } - - .welcome-chris > .row:first-child { flex-direction: row-reverse; } } @media (min-width: 1108px) { - .welcome-chris-video { - /* display */ + #welcome-chris-video { width: 500px; height: 281.25px; } - - .welcome-chris-text-container { - /* display */ - padding: 0 2em 1.1em 2em; - width: 33vw; - } - - .welcome-chris-banner { - /* display */ - display: block; - - /* position */ - position: absolute; - top: 0; - right: 5em; - } } @media (min-width: 1267px) { - .welcome-chris-text-container { width: auto; } + #welcome-chris-text-container { + padding: 5em 2em; + width: auto; + } } diff --git a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx index bd19cce7..4065a4fe 100644 --- a/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx +++ b/src/components/Welcome/components/WelcomeChRIS/WelcomeChRIS.jsx @@ -1,68 +1,89 @@ import React from 'react'; -import Button from '../../../Button'; +import { Link } from 'react-router-dom'; +import { Grid, GridItem } from '@patternfly/react-core'; import './WelcomeChRIS.css'; -import chrisBanner from '../../../../assets/img/chris_logo-ribbon.png'; +import Button from '../../../Button'; const WelcomeChRIS = () => ( -
-
-
-
-
- What is ChRIS? -
-

- ChRIS is an open source framework that utilizes cloud technologies to - democratize medical analytics application development and enables - healthcare organizations to keep owning their data while benefiting from - public cloud processing capabilities. -

-

- ChRIS uses Docker/containers, Kubernetes/OpenShift, and a set of other - technologies to standardize healthcare application development. -

-
-
-
-
-