Merge branch 'main' of github.com:uc-cdis/commons-frontend-app into u…

…c-cdis-main

.eslintignore

@@ -0,0 +1,2 @@
+*.css
+node_modules

.eslintrc.js

@@ -23,6 +23,7 @@ module.exports = {
   },
   plugins: ['jsx-a11y', 'react', 'react-hooks', '@typescript-eslint'],
   rules: {
+    '@typescript-eslint/no-explicit-any':['warn'],
     'no-underscore-dangle': 'off',
     'import/prefer-default-export': 'off',
     'linebreak-style': ['error', 'unix'],

.nvmrc

@@ -1 +1 @@
-20
+v20.17.0

Dockerfile

@@ -31,17 +31,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && npm install -g [email protected]
 
 RUN  addgroup --system --gid 1001 nextjs && adduser --system --uid 1001 nextjs
-COPY ./package.json ./package-lock.json ./
-COPY ./package-lock.json ./
+COPY ./package.json ./package-lock.json ./next.config.js ./tsconfig.json ./.env.development  ./tailwind.config.js ./postcss.config.js  ./
 COPY ./src ./src
 COPY ./public ./public
 COPY ./config ./config
-COPY ./next.config.js ./
-COPY ./tsconfig.json ./
-COPY ./.env.development ./
-COPY ./.env.production ./
-COPY ./tailwind.config.js ./
-COPY ./postcss.config.js ./
 RUN npm ci
 RUN npm install \
     "@swc/core" \

config/gen3/alternate_colors/dark.json

@@ -0,0 +1,9 @@
+{
+  "primary": "#009688",
+  "secondary": "#465451",
+  "accent": "#cba12c",
+  "base": "#111111",
+  "accentWarm": "#892115",
+  "accentCool": "#255990",
+  "chart": "#0d95A1"
+}

config/gen3/alternate_colors/pallet2.json

@@ -0,0 +1,11 @@
+
+
+{
+"primary": "#edae49",
+"secondary": "#772b38",
+"accent": "#00798c",
+"base": "#7a7a7a",
+"accentWarm": "#30638e",
+"accentCool": "#003d5b",
+"chart": "#0d95A1"
+}

config/gen3/alternate_colors/urban.json

@@ -0,0 +1,9 @@
+{
+  "primary": "#2C2C54",
+  "secondary": "#AAABB8",
+  "accent": "#474787",
+  "base": "#ECECEC",
+  "accentWarm": "#892115",
+  "accentCool": "#255990",
+  "chart": "#0d95A1"
+}

config/gen3/apps/CohortDiscovery.json

@@ -0,0 +1,33 @@
+{
+  "name": "CohortDiscovery",
+  "dataIndexes": [
+    {
+      "dataConfig": {
+        "dataType": "subject",
+        "nodeCountTitle": "Cases"
+      },
+      "tabTitle": "Cases",
+      "tabs": [
+        {
+          "title": "Demographic",
+          "fields": [
+            "gender",
+            "race",
+            "ethnicity",
+            "vital_status"
+          ]
+        },
+        {
+          "title": "Study",
+          "fields": [
+            "gender",
+            "race",
+            "ethnicity",
+            "vital_status",
+            "project"
+          ]
+        }
+      ]
+    }
+  ]
+}

config/gen3/apps/CohortDiversity.json

@@ -0,0 +1,53 @@
+{
+  "datasets": {
+    "ground": {
+      "dataset": "census",
+      "label": "Census"
+    },
+    "comparison": [
+      {
+        "dataset": "MIDRC",
+        "label": "MIDRC Data Commons"
+      }
+    ]
+  },
+  "fields": [
+    "age_at_index",
+    "sex",
+    "race",
+    "ethnicity"
+  ],
+  "fieldsConfig": {
+    "Age_at_Index": {
+      "title": "Age at Index"
+    }
+  },
+  "charts": {
+    "age_at_index": {
+      "chartType": "bar"
+    },
+    "sex": {
+      "chartType": "bar"
+    },
+    "race": {
+      "chartType": "bar"
+    },
+    "ethnicity": {
+      "chartType": "bar"
+    }
+  },
+  "comparisonCharts": {
+    "age_at_index": {
+      "chartType": "radarComparison"
+    },
+    "sex": {
+      "chartType": "barComparison"
+    },
+    "race": {
+      "chartType": "barComparison"
+    },
+    "ethnicity": {
+      "chartType": "barComparison"
+    }
+  }
+}

config/gen3/colors.json

@@ -1,10 +1,9 @@
 {
-  "primary": "#3283C8",
-  "secondary": "#3283C8",
-  "accent": "#b75113",
-  "base": "#c0c0c0",
-  "accentWarm": "#25869b",
-  "accentCool": "#1f839b",
-  "chart": "#0d95A1",
-  "table": "#c0c0c0"
+  "primary": "#2C2C54",
+  "secondary": "#AAABB8",
+  "accent": "#474787",
+  "base": "#ECECEC",
+  "accentWarm": "#892115",
+  "accentCool": "#255990",
+  "chart": "#0d95A1"
 }