Skip to content

Commit

Permalink
Merge branch 'staging' of https://github.com/AI-READI/fairhub-app int…
Browse files Browse the repository at this point in the history
…o email-verification

# Conflicts:
#	src/router/index.ts
  • Loading branch information
Aydawka committed Feb 13, 2025
2 parents 79d5f29 + 23c6ce8 commit e465a9b
Show file tree
Hide file tree
Showing 16 changed files with 889 additions and 112 deletions.
3 changes: 0 additions & 3 deletions src/components/dashboard/DashboardModule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ Visualization Background
Visualization Elements
*/
.visualization-container {
max-height: 760px;
}
.visualization-container svg {
shape-rendering: geometricPrecision;
}
Expand Down
20 changes: 0 additions & 20 deletions src/components/header/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,6 @@ const profileOptions = [
{ default: () => "View Profile" }
),
},
{
icon: renderIcon("carbon:chart-network"),
key: "integrations",
label: () =>
h(
RouterLink,
{
to: {
path: "/integrations",
},
},
{ default: () => "Integrations" }
),
},
{
key: "d1",
type: "divider",
Expand Down Expand Up @@ -74,12 +60,6 @@ const handleSelect = (key: string | number) => {
</RouterLink>

<n-space justify="space-between" align="center">
<n-input size="large" placeholder="Search">
<template #suffix>
<Icon icon="ion:search-sharp" />
</template>
</n-input>

<div class="flex items-center justify-center space-x-3">
<RouterLink to="/auth/login" v-if="!authStore.isAuthenticated">
<n-button type="primary">
Expand Down
14 changes: 0 additions & 14 deletions src/components/sidebar/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -242,20 +242,6 @@ const lowerMenuOptions: MenuOption[] = [
{ default: () => "Documentation" }
),
},
{
icon: renderIcon("tabler:history"),
key: "changelog",
label: () =>
h(
RouterLink,
{
to: {
path: "/help/changelog",
},
},
{ default: () => "Changelog" }
),
},
],
icon: renderIcon("tabler:help"),
key: "help",
Expand Down
40 changes: 40 additions & 0 deletions src/modules/dashboard/config/modules-manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,22 @@ const DashboardModulesManifest: DashboardModuleConnector[] = [
report_key: "participant-values",
selected: false,
},
{
id: "phenotype-recruitment-by-phase",
name: "Phenotype Recruitment Counts by Phase",
available: true,
public: true,
report_key: "participant-values",
selected: false,
},
{
id: "race-recruitment-by-phase",
name: "Self-Reported Race Recruitment Counts by Phase",
available: true,
public: true,
report_key: "participant-values",
selected: false,
},
{
id: "race-recruitment",
name: "Self-Reported Race Recruitment Counts",
Expand Down Expand Up @@ -101,6 +117,30 @@ const DashboardModulesManifest: DashboardModuleConnector[] = [
report_key: "participant-values",
selected: false,
},
{
id: "race-phenotype-by-phase",
name: "Self-Reported Race & Phenotype by Phase",
available: true,
public: true,
report_key: "participant-values",
selected: false,
},
{
id: "race-sex-by-phase",
name: "Self-Reported Race & Self-Reported Sex by Phase",
available: true,
public: true,
report_key: "participant-values",
selected: false,
},
{
id: "phenotype-race-by-phase",
name: "Phenotype & Self-Reported Race by Phase",
available: true,
public: true,
report_key: "participant-values",
selected: false,
},
{
id: "sex-phenotype-by-race",
name: "Self-Reported Sex & Phenotype by Self-Reported Race",
Expand Down
162 changes: 162 additions & 0 deletions src/modules/dashboard/config/modules/phenotype-race-by-phase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"name": "Phenotype & Self-Reported Race by Phase",
"id": "phenotype-race-by-phase",
"title": "Participant Phenotype and Self-Reported Race by Phase",
"subtitle": "Participant Counts Aggregated by Phenotype & Self-Reported Race",
"width": 1280,
"height": 720,
"visualizations": [{
"type": "GroupedStackedBar",
"config": {
"id": "#phenotype-race-by-phase_grouped-stacked-bar",
"width": 1080,
"height": 520,
"position": {
"top": 0,
"left": 0,
"right": 0,
"bottom": 0
},
"margin": {
"top": 0,
"left": 0,
"right": 0,
"bottom": 20
},
"padding": {
"top": 20,
"left": 0,
"right": 36,
"bottom": 0
},
"axis": {
"scaling": {
"x": 1.0,
"y": 1.1
}
},
"transitions": {
"opacity": {
"from": 0.7,
"to": 1.0
},
"translate": {
"from": "left",
"to": "left"
}
},
"animations": {
"opacity": {
"delay": 0,
"duration": 200,
"easing": "expOut"
},
"translate": {
"delay": 0,
"duration": 600,
"easing": "expOut"
}
},
"legend": {
"title": "Self-Reported Race",
"accessor": "subgroup",
"width": 200,
"height": 140,
"itemsize": 20,
"fontsize": 10,
"vposition": "bottom",
"hposition": "left",
"padding": {
"top": 0,
"left": 0,
"right": 0,
"bottom": 0
}
},
"tooltip": {
"title": "Data Point Details",
"width": 720,
"height": 140,
"itemsize": 20,
"fontsize": 10,
"vposition": "bottom",
"hposition": "left",
"padding": {
"top": 0,
"left": 320,
"right": 0,
"bottom": 0
}
},
"filters": {
"width": 720,
"height": 140,
"itemsize": 20,
"fontsize": 10,
"vposition": "bottom",
"hposition": "left",
"padding": {
"top": 0,
"left": 320,
"right": 0,
"bottom": 0
}
},
"palette": [
"#5DD462",
"#FE7E6D",
"#C79F38",
"#82C5E6",
"#999EEB",
"#7F8C9F",
"#727272"
],
"textures": {
"size": 11,
"fill": "transparent",
"stroke": "rgba(255, 255, 255, 0.8)",
"patterns": [
"woven",
"waves",
"nylon",
"crosses",
"caps",
"squares"
]
},
"sorting": {
"by": "group",
"on": "subgroup",
"ordering": "none"
},
"accessors": {
"filterby": {
"name": "Phase",
"key": "filterby",
"type": "String"
},
"group": {
"name": "Phenotype",
"key": "group",
"type": "String"
},
"subgroup": {
"name": "Self-Reported Race",
"key": "subgroup",
"type": "String"
},
"color": {
"name": "Self-Reported Race",
"key": "subgroup",
"type": "String"
},
"value": {
"name": "Count (n)",
"key": "value",
"type": "Number"
}
},
"data": []
}
}]
}
Loading

0 comments on commit e465a9b

Please sign in to comment.