Skip to content

Commit 4bdf1da

Browse files
authored
Merge pull request #3411 from OpenNeuroOrg/components-refactor
Drop @openneuro/components package
2 parents 8588b62 + 11218ea commit 4bdf1da

File tree

304 files changed

+428
-2682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+428
-2682
lines changed

.pnp.cjs

Lines changed: 116 additions & 246 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 0 additions & 1 deletion

packages/openneuro-app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"react-dom": "^18.2.0",
4141
"react-helmet": "6.1.0",
4242
"react-markdown": "^9.0.1",
43+
"react-multi-carousel": "^2.8.5",
4344
"react-router-dom": "6.3.0",
4445
"react-toastify": "6.0.9",
4546
"react-usestateref": "^1.0.8",

packages/openneuro-app/src/client.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import Index from "./scripts/index"
1212
import { config } from "./scripts/config"
1313
import * as gtag from "./scripts/utils/gtag"
1414
import { relayStylePagination } from "@apollo/client/utilities"
15-
import "@openneuro/components/page/page.scss"
15+
// TODO - This should be a global SCSS?
16+
import "./scripts/components/page/page.scss"
1617

1718
gtag.initialize(config.analytics.trackingIds)
1819

packages/openneuro-app/src/scripts/common/containers/footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import type { FC } from "react"
3-
import { Footer } from "@openneuro/components/footer"
3+
import { Footer } from "../../components/footer/Footer"
44
import { version as openneuroVersion } from "../../../lerna.json"
55

66
const FooterContainer: FC = () => {

packages/openneuro-app/src/scripts/common/containers/header.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ import type { FC } from "react"
33
import useState from "react-usestateref"
44
import UploaderContext from "../../uploader/uploader-context.js"
55
import UploadProgress from "../../uploader/upload-progress.jsx"
6-
import { Header, LandingExpandedHeader } from "@openneuro/components/header"
7-
import { Input } from "@openneuro/components/input"
6+
import { Header } from "../../components/header/Header"
7+
import { LandingExpandedHeader } from "../../components/header/LandingExpandedHeader"
8+
import { Input } from "../../components/input/Input"
89
import ModalitySelect from "../../search/inputs/modality-select"
910
import { UserModalOpenCtx } from "../../utils/user-login-modal-ctx"
1011
import { useLocation, useNavigate } from "react-router-dom"

packages/openneuro-components/src/content/affiliate-content.jsx renamed to packages/openneuro-app/src/scripts/common/content/affiliate-content.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react"
2-
import bidslogo from "../assets/bids.jpg"
3-
import dataladlogo from "../assets/datalad.jpg"
4-
import nihlogo from "../assets/nih-bi-logo.png"
2+
import bidslogo from "./assets/affiliates/bids.jpg"
3+
import dataladlogo from "./assets/affiliates/datalad.jpg"
4+
import nihlogo from "./assets/affiliates/nih-bi-logo.png"
55

66
export const affiliateContent = [
77
{

0 commit comments

Comments
 (0)