diff --git a/.env.development b/.env.development index 52a3fdf..ebb1497 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,2 @@ -GEN3_COMMONS_NAME=gen3 +GEN3_COMMONS_NAME=heal NEXT_PUBLIC_GEN3_API=https://localhost:3010 -NEXT_PUBLIC_GEN3_DOMAIN=https://localhost:3010 - -# set these if you want to use different endpoints -#NEXT_PUBLIC_GEN3_GUPPY_API= diff --git a/.env.production b/.env.production index fa20fe4..ebb1497 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,2 @@ -GEN3_COMMONS_NAME=gen3 -NEXT_PUBLIC_GEN3_API=https://localhost/ -NEXT_PUBLIC_GEN3_DOMAIN=https://localhost/ +GEN3_COMMONS_NAME=heal +NEXT_PUBLIC_GEN3_API=https://localhost:3010 diff --git a/README.md b/README.md index ccbd32e..fb2b13e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -This is the base REPOSITORY for Gen3.2 data commons. +This is the NextJS application for the HEAL Data Commons. ## Getting Started -Gen3 Data Commons using the Gen3 Frontend Framework is a matter of the following: +The HEAL Data Commons develop quick startup: -* create a clone of [Gen3 Data Commons Application](https://github.com/uc-cdis/commons-frontend-app/)   +* create a clone of [HEAL Data Commons](https://github.com/uc-cdis/heal-data-commons) * Configure the commons by editing the configuration files in the ```config``` @@ -16,11 +16,11 @@ Gen3 Data Commons using the Gen3 Frontend Framework is a matter of the following Changes to the Gen3 Data Commons Application can be pulled from the Common Frontend Repository. You need configure git to pull from the Common Frontend Repository. ```bash -git remote add upstream https://github.com/uc-cdis/commons-frontend-app.git +git remote add upstream https://github.com/uc-cdis/heal-data-commons.git ``` or ```bash -git remote add upstream git@github.com:uc-cdis/commons-frontend-app.git +git remote add upstream git@github.com:uc-cdis/heal-data-commons.git ``` changes to ```main``` can be pulled from the Common Frontend Repository by running: @@ -34,12 +34,12 @@ This documentation is currently less complete than we would like, but we will be ## Installation -The minimum node version is set to v20.11.0 only from an LTS perspective. +The minimum node version is set to v20.71.0. Node can be downloaded from the official Node.js site. You may also consider using a [Node version manager](https://docs.npmjs.com/cli/v7/configuring-npm/install#using-a-node-version-manager-to-install-nodejs-and-npm). Your version of Node may not ship with npm v10. To install it, run: ```bash -npm install npm@10.2.4 -g +npm install npm@10.8.2 -g ``` Note: if you see this error: @@ -51,7 +51,7 @@ you can run ```npx next telemetry disable``` Alternatively, you can use `nvm` to install the correct version of npm: ```bash -nvm install 20.11.0 +nvm install 20.17.0 ``` ### Install Dependencies @@ -78,3 +78,16 @@ You build a Docker image by: ```bash docker build . ``` + +## Configuration + +All the configuration files are located in ```config/heal```. As HEAL is currently only used for the landing page the +relevant configuration files are: + +* navigation.json +* footer.json +* banner + +## Custom Pages + +See ```src/pages/SamplePage``` for an example of adding a new page to the HEAL commons. diff --git a/config/gen3/alternate_colors/dark.json b/config/gen3/alternate_colors/dark.json deleted file mode 100644 index 492038e..0000000 --- a/config/gen3/alternate_colors/dark.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "primary": "#009688", - "secondary": "#465451", - "accent": "#cba12c", - "base": "#111111", - "accentWarm": "#892115", - "accentCool": "#255990", - "chart": "#0d95A1" -} diff --git a/config/gen3/alternate_colors/pallet2.json b/config/gen3/alternate_colors/pallet2.json deleted file mode 100644 index b3fb0a1..0000000 --- a/config/gen3/alternate_colors/pallet2.json +++ /dev/null @@ -1,11 +0,0 @@ - - -{ -"primary": "#edae49", -"secondary": "#772b38", -"accent": "#00798c", -"base": "#7a7a7a", -"accentWarm": "#30638e", -"accentCool": "#003d5b", -"chart": "#0d95A1" -} diff --git a/config/gen3/alternate_colors/urban.json b/config/gen3/alternate_colors/urban.json deleted file mode 100644 index 3d83f54..0000000 --- a/config/gen3/alternate_colors/urban.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "primary": "#2C2C54", - "secondary": "#AAABB8", - "accent": "#474787", - "base": "#ECECEC", - "accentWarm": "#892115", - "accentCool": "#255990", - "chart": "#0d95A1" -} diff --git a/config/gen3/footer.json b/config/gen3/footer.json deleted file mode 100644 index 0985b5a..0000000 --- a/config/gen3/footer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "footerRightLogos": [ - [ - { - "logo": "/images/gen3.png", - "width": 132, - "height": 60, - "description": "Gen3 Logo" - }, - { - "logo": "/images/createdby.png", - "width": 170, - "height": 60, - "description": "Created by CTDS" - } - ] - ] -} diff --git a/config/gen3/navigation.json b/config/gen3/navigation.json deleted file mode 100644 index 5f5de63..0000000 --- a/config/gen3/navigation.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "navigation": { - "classNames": { - "root": "pl-1 mr-6 bg-base-max text-primary opacity-100 hover:opacity-100", - "item": "py-2 px-4 hover:bg-base-lightest hover:text-base-contrast", - "navigationPanel": "bg-base-max text-primary" - }, - "logo": { - "src": "/icons/gen3-dark.svg", - "height": 128, - "href": "/" - }, - "items": [ - { - "icon": "gen3:query", - "href": "/Discovery", - "name": "Discovery", - "tooltip": "Use free-text search and tags to rapidly find relevant studies." - }, - { - "icon": "gen3:dictionary", - "href": "/DataDictionary", - "name": "Dictionary", - "tooltip": "The Data Dictionary serves to inform the data model and is updated as new data is ingested." - }, - { - "icon": "gen3:exploration", - "href": "/Explorer", - "name": "Exploration", - "tooltip": "The Exploration Page enables discovery of the data at the subject level and features a cohort builder." - }, - { - "icon": "gen3:query", - "href": "/Query", - "name": "Query", - "tooltip": "Query the databases using GraphiQL." - }, - { - "icon": "gen3:analysis", - "href": "/resource-browser", - "name": "Analysis", - "tooltip": "Learn how to use Jupyter Notebooks to explore and visualize data available by running a tutorial notebook, or use one of these examples as a launching point for your own custom analysis." - }, - { - "icon": "gen3:workspace", - "href": "/#hostname#workspace/", - "name": "Workspace", - "tooltip": "Gen3 workspaces are secure data analysis environments in the cloud that can access data from one or more data resources." - }, - { - "icon": "gen3:profile", - "href": "/Profile", - "name": "Profile", - "tooltip": "Create API keys for programmatic data access, and review your authorization privileges to datasets and services." - } - ] - }, - "topBar": { - "items": [ - { - "rightIcon": "gen3:upload", - "href": "/submission", - "name": "Browse Data" - }, - { - "href": "https://gen3.org/resources/user/", - "name": "Documentation" - } - ], - "loginButtonVisibility": "visible" - } -} diff --git a/config/gen3/themeFonts.json b/config/gen3/themeFonts.json deleted file mode 100644 index f40ccb8..0000000 --- a/config/gen3/themeFonts.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "heading": ["Poppins", "sans-serif"], - "content": ["Poppins", "sans-serif"], - "fontFamily": "Poppins" -} diff --git a/config/heal/banner.json b/config/heal/banner.json new file mode 100644 index 0000000..06dfabe --- /dev/null +++ b/config/heal/banner.json @@ -0,0 +1,16 @@ +[ + { + "message": "[View the latest studies that have shared data with the HEAL Data Platform!](/landing/newly-available-datasets)", + "level": "MESSAGE", + "dismissible": true, + "isExternalLink": false, + "id": 0 + }, + { + "message": "Our helpdesk has moved! Starting 8/21, please contact us at [heal-support@gen3.org](mailto:heal-support@gen3.org)", + "level": "MESSAGE", + "dismissible": false, + "isExternalLink": false, + "id": 0 + } +] diff --git a/config/gen3/colors.json b/config/heal/colors.json similarity index 100% rename from config/gen3/colors.json rename to config/heal/colors.json diff --git a/config/gen3/crosswalk.json b/config/heal/crosswalk.json similarity index 100% rename from config/gen3/crosswalk.json rename to config/heal/crosswalk.json diff --git a/config/gen3/dictionary.json b/config/heal/dictionary.json similarity index 100% rename from config/gen3/dictionary.json rename to config/heal/dictionary.json diff --git a/config/gen3/discovery.json b/config/heal/discovery.json similarity index 100% rename from config/gen3/discovery.json rename to config/heal/discovery.json diff --git a/config/gen3/explorer.json b/config/heal/explorer.json similarity index 100% rename from config/gen3/explorer.json rename to config/heal/explorer.json diff --git a/config/heal/footer.json b/config/heal/footer.json new file mode 100644 index 0000000..9ddd7d5 --- /dev/null +++ b/config/heal/footer.json @@ -0,0 +1,185 @@ +{ + "classNames": { + "mode": "replace", + "root": "bg-navigation-footer px-8 py-4" + }, + "rightSection": { + "className": "flex justify-start items-start", + "columns": [ + { + "rows": [ + { + "Section": { + "className": "flex justify-start items-start", + "columns": [ + { + "classNames": { + "root": "pl-8", + "heading": "font-bold text-xl text-white font-heading", + "rowItem": "heal-link-footer flex flex-col font-medium text-sm p-0.5 text-white font-content" + }, + "heading": "Contact", + "rows": [ + { + "Link": { + "text": "About Us", + "href": "/landing/about-us", + "linkType": "gen3ff" + } + }, + { + "Link": { + "text": "Contact", + "href": "/landing/contact", + "linkType": "gen3ff" + } + } + ] + }, + { + "classNames": { + "root": "pl-10", + "heading": "font-bold text-xl text-white font-heading", + "rowItem": "heal-link-footer flex flex-col font-medium text-sm p-0.5 text-white font-content" + }, + "heading": "Help", + "rows": [ + { + "Link": { + "text": "User Guides", + "href": "/documentation" + } + }, + { + "Link": { + "text": "Tutorials", + "href": "/documentation/platform_tutorial_videos" + } + }, + { + "Link": { + "text": "FAQ", + "href": "/documentation/faqs" + } + } + ] + }, + { + "classNames": { + "root": "pl-10", + "heading": "font-bold text-xl text-white font-heading", + "rowItem": "heal-link-footer flex flex-col font-medium text-sm p-0.5 text-white font-content" + }, + "heading": "Platform", + "rows": [ + { + "Link": { + "text": "Workspaces", + "href": "/workspace", + "linkType": "portal" + } + }, + { + "Link": { + "text": "Discovery", + "href": "/discovery", + "linkType": "portal" + } + }, + { + "Link": { + "text": "Profile", + "href": "/identity", + "linkType": "portal" + } + } + ] + } + ] + } + }, + { + "Links": { + "className": "pt-1 m-1 text-right text-xs text-white font-content", + "links": [ + { + "text": "NIH HEAL Initiative", + "href": "https://heal.nih.gov/" + }, + { + "text": "HHS Responsible Disclosure Form", + "href": "https://hhs.responsibledisclosure.com/hc/en-us" + } + ] + } + } + ] + } + ] + }, + "leftSection": { + "className": "flex items-start", + "columns": [ + { + "classNames": { + "mode": "replace", + "root": "flex flex-col mr-8 justify-between" + }, + "rows": [ + { + "Icon": { + "className": "mb-4", + "logo": "/images/gen3.png", + "width": 80, + "height": 40, + "description": "Gen3 Logo" + } + }, + { + "Icon": { + "logo": "/images/createdby.png", + "width": 120, + "height": 38, + "description": "created by CTDS at the University of Chicago" + } + } + ] + }, + { + "classNames": { + "root": "flex flex-col justify-center mr-8" + }, + "rows": [ + { + "Icon": { + "logo": "/images/logo.png", + "width": 164, + "height": 100, + "description": "NIH HEAL Logo" + } + } + ] + }, + { + "classNames": { + "mode": "replace", + "root": "w-1/5 text-xs text-white text-left font-content" + }, + "rows": [ + { + "Label": { + "className": "p-1", + "text": "The HEAL Data Platform is funded by the NIH HEAL Initiative." + } + }, + { + "Label": { + "className": "p-1", + "text": "NIH HEAL Initiative and Helping to End Addiction Long-term are service marks of the U.S. Department of Health and Human Services." + } + } + ] + } + ] + } +} diff --git a/config/gen3/landingPage.json b/config/heal/landingPage.json similarity index 100% rename from config/gen3/landingPage.json rename to config/heal/landingPage.json diff --git a/config/gen3/login.json b/config/heal/login.json similarity index 100% rename from config/gen3/login.json rename to config/heal/login.json diff --git a/config/gen3/modals.json b/config/heal/modals.json similarity index 100% rename from config/gen3/modals.json rename to config/heal/modals.json diff --git a/config/heal/navigation.json b/config/heal/navigation.json new file mode 100644 index 0000000..09019dc --- /dev/null +++ b/config/heal/navigation.json @@ -0,0 +1,70 @@ +{ + "navigation": { + "classNames": { + "root": "pl-1 mr-2 bg-base-max text-primary opacity-100 hover:opacity-100", + "item": "py-2 px-4 hover:bg-base-lightest hover:text-base-contrast", + "navigationPanel": "bg-base-max w-1/5" + }, + "logo": { + "src": "/images/logo.png", + "description": "HEAL Data Platform", + "title":"HEAL Data Platform", + "width" : 80, + "height" : 50, + "href": "/", + "divider" : true, + "classNames": { + "logo" : "pr-1 pt-2", + "link": "relative px-4", + "title": "ml-1 text-xl font-bold text-primary hover:text-primary-dark" + } + }, + "items": [ + { + "icon": "gen3:query", + "href": "/discovery", + "name": "Discovery", + "tooltip": "Use free-text search and tags to find studies, discover datasets, and export selected data files to an analysis workspace.", + "classNames" : { + "root" : "px-1" + } + }, + { + "icon": "gen3:workspace", + "href": "/workspace", + "name": "Workspace", + "tooltip": "Gen3 workspaces are secure cloud environments where users can analyze data from one or more data resources." + }, + { + "name": "Example Analysis", + "href": "/resource-browser", + "icon": "gen3:bar-chart", + "tooltip": "Learn how to use Jupyter Notebooks to explore and visualize data available on the HEAL platform by running a static tutorial notebook, or use one of these examples as a launching point for your own custom analysis." + }, + { + "icon": "gen3:profile", + "href": "/identity", + "name": "Profile", + "tooltip": "Create API keys for programmatic data access, and review your authorization privileges to datasets and services." + } + ] + }, + "topBar": { + "classNames" : { + "root" : "bg-navigation-top" + }, + "items": [ + { + "href": "/documentation", + "name": "Help and Guidance", + "leftIcon": "bx:radio-circle-marked", + "classNames" : { + "leftIcon" : "text-white", + "label" : "text-white", + "button" : "hover:border-white" + } + } + ], + "loginButtonVisibility": "hide" + } +} diff --git a/config/gen3/profile.json b/config/heal/profile.json similarity index 100% rename from config/gen3/profile.json rename to config/heal/profile.json diff --git a/config/gen3/query.json b/config/heal/query.json similarity index 100% rename from config/gen3/query.json rename to config/heal/query.json diff --git a/config/gen3/session.json b/config/heal/session.json similarity index 100% rename from config/gen3/session.json rename to config/heal/session.json diff --git a/config/gen3/submission.json b/config/heal/submission.json similarity index 100% rename from config/gen3/submission.json rename to config/heal/submission.json diff --git a/config/gen3/themeColors.json b/config/heal/themeColors.json similarity index 95% rename from config/gen3/themeColors.json rename to config/heal/themeColors.json index 1376bc3..22fa785 100644 --- a/config/gen3/themeColors.json +++ b/config/heal/themeColors.json @@ -214,5 +214,14 @@ "darker": "#111111", "darkest": "#fefefe", "min": "#fefefe" - } + }, + "navigation": { + "footer": "#373A3C", + "topbar_hover": "#FFFFFF", + "top": "#402264", + "DEFAULT": "#111111", + "dark": "#402264", + "darker": "#111111", + "darkest": "#111111", + "min": "#111111"} } diff --git a/config/heal/themeFonts.json b/config/heal/themeFonts.json new file mode 100644 index 0000000..b76c137 --- /dev/null +++ b/config/heal/themeFonts.json @@ -0,0 +1,5 @@ +{ + "heading": ["Montserrat", "sans-serif"], + "content": ["Montserrat", "sans-serif"], + "fontFamily": "Montserrat" +} diff --git a/config/gen3/workspaces.json b/config/heal/workspaces.json similarity index 100% rename from config/gen3/workspaces.json rename to config/heal/workspaces.json diff --git a/package-lock.json b/package-lock.json index 2d0ad96..ad22c05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,17 @@ { - "name": "@gen3/commons-portal-app-base", - "version": "0.10.31", + "name": "@gen3/heal-data-commons-webapp", + "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@gen3/commons-portal-app-base", - "version": "0.10.31", + "name": "@gen3/heal-data-commons-webapp", + "version": "0.1.0", "dependencies": { - "@axe-core/react": "^4.10.0", "@fontsource/montserrat": "^5.0.19", "@fontsource/poppins": "^5.0.15", "@fontsource/source-sans-pro": "^5.0.8", - "@gen3/frontend": "^0.10.44", + "@gen3/frontend": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-frontend-0.10.45.tgz", "@mantine/core": "^7.12.1", "@mantine/form": "^7.12.1", "@mantine/hooks": "^7.12.1", @@ -21,17 +20,18 @@ "@mdx-js/loader": "^3.0.0", "@mdx-js/react": "^3.0.0", "@next/mdx": "^14.2.8", - "@types/mdx": "^2.0.11", "cookies-next": "^4.1.1", "swr": "^2.2.5" }, "devDependencies": { - "@gen3/toolsff": "^0.10.44", + "@axe-core/react": "^4.10.0", + "@gen3/toolsff": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-toolsff-0.10.45.tgz", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/line-clamp": "^0.4.2", "@tailwindcss/typography": "^0.5.7", "@types/lodash": "^4.14.202", + "@types/mdx": "^2.0.11", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@typescript-eslint/eslint-plugin": "^7.12.0", @@ -55,8 +55,8 @@ "typescript": "5.5.4" }, "engines": { - "node": ">=20.11.0", - "npm": ">=10.2.3" + "node": ">=20.17.0", + "npm": ">=10.8.2" } }, "node_modules/@alloc/quick-lru": { @@ -110,6 +110,7 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/@axe-core/react/-/react-4.10.0.tgz", "integrity": "sha512-gpFj1+G0zabbd0ZDum1N5FPJtUOfPIfslXNH58WuR7opSK0WTwPJ49ZlYr/Wg2fA4VGI5lfkG5fAZSG9p8ecKw==", + "dev": true, "license": "MPL-2.0", "dependencies": { "axe-core": "~4.10.0", @@ -120,6 +121,7 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.0.tgz", "integrity": "sha512-Mr2ZakwQ7XUAjp7pAwQWRhhK8mQQ6JAaNWSjmjxil0R8BPioMtQsTLOolGYkji1rcL++3dCqZA3zWqpT+9Ew6g==", + "dev": true, "license": "MPL-2.0", "engines": { "node": ">=4" @@ -1786,9 +1788,9 @@ } }, "node_modules/@gen3/frontend": { - "version": "0.10.44", - "resolved": "https://registry.npmjs.org/@gen3/frontend/-/frontend-0.10.44.tgz", - "integrity": "sha512-E1vrR1BK8tjcXhlVTDm9BssR/Avcv3ucdJUhPCxLDzGiybh46xfcCMUWMEj/rINYXkFM7z5sAlY+LJsev95/KQ==", + "version": "0.10.45", + "resolved": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-frontend-0.10.45.tgz", + "integrity": "sha512-akExg7VoGdwiBIi3oAdrJ9t7TQWvKPGGZKqJjaq1PbMR0VLrpWY6dsxpRupQNM6RsHHFZv2BdhGnUmIEju4VQw==", "license": "Apache-2.0", "dependencies": { "@graphiql/react": "^0.23.1", @@ -1844,7 +1846,7 @@ "remark-gfm": "^4.0.0", "sharp": "^0.33.2", "stable-hash": "^0.0.3", - "tailwind-merge": "^2.2.2", + "tailwind-merge": "^2.5.2", "tailwind-styled-components": "^2.2.0", "use-deep-compare": "^1.1.0", "victory": "^36.6.11", @@ -1915,21 +1917,19 @@ } }, "node_modules/@gen3/frontend/node_modules/tailwind-merge": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.3.0.tgz", - "integrity": "sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==", - "dependencies": { - "@babel/runtime": "^7.24.1" - }, + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz", + "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" } }, "node_modules/@gen3/toolsff": { - "version": "0.10.44", - "resolved": "https://registry.npmjs.org/@gen3/toolsff/-/toolsff-0.10.44.tgz", - "integrity": "sha512-2P+lOXFGXje0xrZybNKl6Fg8fg81VuNK4XXebYCOmM/k5OPvUATfjvhA8JDTXpgYmd/mj44G1MHF6nYyuqZkqg==", + "version": "0.10.45", + "resolved": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-toolsff-0.10.45.tgz", + "integrity": "sha512-RCk32tdemJ3275ve4A2bVn+aRIopBvQ3FKIfxKgCakpzsZs73esX0LN2yKy1m2Nr3F0tL0Cf8QWpVY+1VME45w==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -7718,9 +7718,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001591", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001591.tgz", - "integrity": "sha512-PCzRMei/vXjJyL5mJtzNiUCKP59dm8Apqc3PH8gJkMnMXZGox93RbE76jHsmLwmIo6/3nsYIpJtx0O7u5PqFuQ==", + "version": "1.0.30001659", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz", + "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==", "funding": [ { "type": "opencollective", @@ -7734,7 +7734,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/canvas-fit": { "version": "1.5.0", @@ -23240,6 +23241,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/requestidlecallback/-/requestidlecallback-0.3.0.tgz", "integrity": "sha512-TWHFkT7S9p7IxLC5A1hYmAYQx2Eb9w1skrXmQ+dS1URyvR8tenMLl4lHbqEOUnpEYxNKpkVMXUgknVpBZWXXfQ==", + "dev": true, "license": "MIT" }, "node_modules/require-directory": { diff --git a/package.json b/package.json index e65bcaf..6f5bb5b 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "@gen3/commons-portal-app-base", - "version": "0.10.31", + "name": "@gen3/heal-data-commons-webapp", + "version": "0.1.0", "private": "true", "engines": { - "npm": ">=10.2.3", - "node": ">=20.11.0" + "npm": ">=10.8.2", + "node": ">=20.17.0" }, "scripts": { "lint": "next lint", @@ -19,9 +19,9 @@ }, "dependencies": { "@fontsource/montserrat": "^5.0.19", - "@fontsource/source-sans-pro": "^5.0.8", "@fontsource/poppins": "^5.0.15", - "@gen3/frontend": "^0.10.44", + "@fontsource/source-sans-pro": "^5.0.8", + "@gen3/frontend": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-frontend-0.10.45.tgz", "@mantine/core": "^7.12.1", "@mantine/form": "^7.12.1", "@mantine/hooks": "^7.12.1", @@ -30,13 +30,12 @@ "@mdx-js/loader": "^3.0.0", "@mdx-js/react": "^3.0.0", "@next/mdx": "^14.2.8", - "@types/mdx": "^2.0.11", "cookies-next": "^4.1.1", - "swr": "^2.2.5", - "@axe-core/react": "^4.10.0" + "swr": "^2.2.5" }, "devDependencies": { - "@gen3/toolsff": "^0.10.44", + "@axe-core/react": "^4.10.0", + "@gen3/toolsff": "https://github.com/uc-cdis/gen3-frontend-framework/releases/download/v0.10.0-alpha/gen3-toolsff-0.10.45.tgz", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", "@tailwindcss/line-clamp": "^0.4.2", @@ -44,13 +43,15 @@ "@types/lodash": "^4.14.202", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", + "@types/mdx": "^2.0.11", + "@typescript-eslint/eslint-plugin": "^7.12.0", "eslint": "8.57.0", + "eslint-config-next": "14.2.3", "eslint-config-prettier": "^8.8.0", "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsx-a11y": "^6.6.1", "eslint-plugin-react": "^7.30.1", "eslint-plugin-react-hooks": "^4.6.0", - "eslint-config-next": "14.2.3", "next": "^14.2.8", "postcss": "^8.4.29", "postcss-loader": "^7.3.2", @@ -61,7 +62,6 @@ "tailwindcss": "^3.4.10", "ts-jest": "^29.1.2", "ts-node": "^10.9.1", - "typescript": "5.5.4", - "@typescript-eslint/eslint-plugin": "^7.12.0" + "typescript": "5.5.4" } } diff --git a/public/icons/createdby.png b/public/icons/createdby.png deleted file mode 100644 index 1471108..0000000 Binary files a/public/icons/createdby.png and /dev/null differ diff --git a/public/icons/midrc-logo.png b/public/icons/midrc-logo.png deleted file mode 100644 index 5f7cc18..0000000 Binary files a/public/icons/midrc-logo.png and /dev/null differ diff --git a/public/images/createdby.png b/public/images/createdby.png new file mode 100644 index 0000000..b361a54 Binary files /dev/null and b/public/images/createdby.png differ diff --git a/public/icons/gen3.png b/public/images/gen3.png similarity index 100% rename from public/icons/gen3.png rename to public/images/gen3.png diff --git a/public/icons/logo.png b/public/images/logo.png similarity index 100% rename from public/icons/logo.png rename to public/images/logo.png diff --git a/public/images/sideTexture.png b/public/images/sideTexture.png deleted file mode 100644 index 2327f88..0000000 Binary files a/public/images/sideTexture.png and /dev/null differ diff --git a/tailwind.config.js b/tailwind.config.js index 15fe3cd..4b1a9ba 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -155,4 +155,10 @@ module.exports = { }); }), ], + // Add any colors used in a json config file here + safelist: [ + { pattern: /^bg-navigation-footer$/ }, + { pattern: /^border-navigation-topbar_hover$/ }, + { pattern: /^bg-navigation-top$/ }, + ], };