Skip to content

Commit c7eba0a

Browse files
guittariguittari
authored
Merge branch 'main' into 50-data-model-tab
2 parents 4519ce7 + f7d21dd commit c7eba0a

File tree

6 files changed

+146
-31
lines changed

6 files changed

+146
-31
lines changed

‎frontend/.prettierrc‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
"singleQuote": true,
33
"semi": true,
4-
"printWidth": 100
4+
"printWidth": 100,
5+
"overrides": [
6+
{
7+
"files": "*.md",
8+
"options": {
9+
"tabWidth": 4
10+
}
11+
}
12+
]
513
}

‎frontend/README.md‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
1-
# EMBER Archive Frontend
1+
# EMBER Archive
22

3-
A Vue.js 3 / Quasar Project
3+
## EMBER: Ecosystem for Multi-modal Brain-behavior Experimentation and Research
4+
5+
EMBER is the NIH BRAIN Initiative data archive for multi-modal neurophysiological and behavioral data, supporting the Brain Behavior Quantification and Synchronization (BBQS) Program.
6+
7+
This repository contains a Vue.js 3 + Quasar frontend supporting the EMBER Archive.
48

59
## Prerequisities
610

711
- [Node.js](https://nodejs.org/en) v20
8-
- We recommend using `nvm` to manage Node.js versions. Follow the instructions [here](https://github.com/nvm-sh/nvm) for Linux or [here](https://github.com/coreybutler/nvm-windows) for Windows.
12+
- We recommend using `nvm` to manage Node.js versions. Follow the instructions [here](https://github.com/nvm-sh/nvm) for Linux or [here](https://github.com/coreybutler/nvm-windows) for Windows.
913

1014
## Install
1115

1216
1. (Recommend) Ensure you have `nvm` installed and enabled
1317

14-
```bash
15-
nvm on
16-
nvm use
17-
```
18+
```bash
19+
nvm on
20+
nvm use
21+
```
22+
23+
## _Note: For Windows users, if you needed to modify any environment variables, make sure you close and restart any terminals before trying to run nvm or npm commands_
24+
25+
- nvm use will activate the Node.js version specified in frontend/.nvmrc
1826

19-
## _Note: For Windows users, if you needed to modify any environment variables, make sure you close and restart any terminals before trying to run nvm or npm commands_
27+
1. Install `yarn`
2028

21-
- nvm use will activate the Node.js version specified in frontend/.nvmrc
29+
```bash
30+
npm install --global yarn
31+
```
2232

2333
1. Install dependencies
2434

25-
```bash
26-
yarn install
27-
```
35+
```bash
36+
yarn install
37+
```
2838

2939
## Development
3040

3141
1. Start the application in development mode
3242

33-
```bash
34-
yarn quasar dev
35-
```
43+
```bash
44+
yarn run dev
45+
```
3646

3747
1. The frontend should now be running at [http://localhost:9000](). The application will reload as you make edits.
3848

@@ -49,16 +59,16 @@ The workflow is triggered **on every pull request** and runs the following jobs:
4959
- **Job**: `link-check`
5060
- **Purpose**: Runs [ESLint](https://eslint.org/) to identify and enforce coding style and best practices.
5161
- **Failure Resolution**:
52-
- Run `yarn run lint` locally to see the errors.
53-
- Fix the reported linting issues.
54-
- This can either be done manually, or with `yarn run lint-fix`
55-
- Commit and push the changes.
62+
- Run `yarn run lint` locally to see the errors.
63+
- Fix the reported linting issues.
64+
- This can either be done manually, or with `yarn run lint-fix`
65+
- Commit and push the changes.
5666

5767
#### Prettier Check
5868

5969
- **Job**: `format-check`
6070
- **Purpose**: Runs [Prettier](https://prettier.io/) to check if the code follows the required formatting.
6171
- **Failure Resolution**:
62-
- Run `yarn run format-check` locally to see the errors.
63-
- Run `yarn run format` locally to automatically fix formatting issues.
64-
- Commit and push the changes.
72+
- Run `yarn run format-check` locally to see the errors.
73+
- Run `yarn run format` locally to automatically fix formatting issues.
74+
- Commit and push the changes.

‎frontend/scripts/fetchProjectMetadata.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ async function fetchProjectData(grantNumber: string): Promise<ProjectMetadata |
8383
(async () => {
8484
const projects: ProjectMetadata[] = [];
8585
const grantNumbers: string[] = [
86+
'U01DA063534',
87+
'R61MH138705',
8688
'R61MH135106',
8789
'R34DA059510',
8890
'R34DA059509',

‎frontend/src/constants/projects.ts‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,89 @@ import { ContributorRole } from 'src/models/projects';
99

1010
// Semi auto-generated from fetchProjectMetadata.ts script
1111
const initialProjectList: ProjectMetadata[] = [
12+
{
13+
funding: {
14+
awardTitle: 'Neural and Behavioral Correlates of Live Face-to-Face Interactions',
15+
awardIdentifier: 'R61MH138705',
16+
activityCode: 'R61',
17+
awardeeOrganization: 'Yale University',
18+
startDate: new Date('2025-09-01T12:09:00.000Z'),
19+
periodOfPerformance: 3,
20+
awardLink: '',
21+
programOfficers: [{ name: 'Elizabeth Ankudowich' }],
22+
principalInvestigators: [{ name: 'Joy Hirsch' }],
23+
},
24+
contributors: [
25+
{
26+
name: 'Joy Hirsch',
27+
email: '[email protected]',
28+
roles: [
29+
ContributorRole.principalInvestigator,
30+
ContributorRole.contactPrincipalInvestigator,
31+
],
32+
},
33+
],
34+
species: [
35+
{
36+
taxonomyId: 9606,
37+
currentName: 'Homo sapiens',
38+
genbankCommonName: 'human',
39+
ncbiBlastName: 'primates',
40+
rank: 'species',
41+
commonName: '',
42+
},
43+
],
44+
sensors: [],
45+
dataModalities: [],
46+
approaches: [],
47+
dataGenerationSort: [],
48+
},
49+
{
50+
funding: {
51+
awardTitle:
52+
'Toward comprehensive models of naturalistic cooperation and competition in primates',
53+
awardIdentifier: 'U01DA063534',
54+
activityCode: 'U01',
55+
awardeeOrganization: 'Yale University',
56+
startDate: new Date('2025-09-01T12:09:00.000Z'),
57+
periodOfPerformance: 5,
58+
awardLink: '',
59+
programOfficers: [{ name: 'Holly Marie Moore' }],
60+
principalInvestigators: [
61+
{ name: 'Steve W C Chang' },
62+
{ name: 'Monika P Jadi' },
63+
{ name: 'Anirvan S Nandy' },
64+
{ name: 'Shreya Saxena' },
65+
],
66+
},
67+
contributors: [
68+
{
69+
name: 'Steve W C Chang',
70+
email: '[email protected]',
71+
roles: [
72+
ContributorRole.principalInvestigator,
73+
ContributorRole.contactPrincipalInvestigator,
74+
],
75+
},
76+
{ name: 'Monika P Jadi', roles: [ContributorRole.principalInvestigator] },
77+
{ name: 'Anirvan S Nandy', roles: [ContributorRole.principalInvestigator] },
78+
{ name: 'Shreya Saxena', roles: [ContributorRole.principalInvestigator] },
79+
],
80+
species: [
81+
{
82+
taxonomyId: 9483,
83+
currentName: 'Callithrix jacchus',
84+
genbankCommonName: 'common marmoset',
85+
ncbiBlastName: 'primates',
86+
rank: 'species',
87+
commonName: 'common marmoset',
88+
},
89+
],
90+
sensors: [],
91+
dataModalities: [],
92+
approaches: [],
93+
dataGenerationSort: [],
94+
},
1295
{
1396
funding: {
1497
awardTitle:

‎frontend/src/pages/AboutPage.vue‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<q-page class="column items-center">
33
<PageTitle title="About" />
44
<div class="q-mx-xl">
5-
<q-card flat class="q-mt-lg">
5+
<q-card flat class="q-my-lg">
66
<q-card-section>
77
<p>
88
In September 2024, our team at the
@@ -63,7 +63,7 @@
6363
</q-card-section>
6464
</q-card>
6565

66-
<q-card flat class="q-mt-lg">
66+
<q-card flat class="q-my-lg">
6767
<q-card-section>
6868
<div class="text-h2">The Team</div>
6969
</q-card-section>
@@ -86,6 +86,18 @@
8686
</div>
8787
</q-card-section>
8888
</q-card>
89+
90+
<q-card flat class="q-my-lg">
91+
<q-card-section>
92+
<div class="text-h2">Contact Us</div>
93+
</q-card-section>
94+
<q-card-section>
95+
<div>
96+
For any questions, suggestions, or collaboration interests please contact:
97+
<LinkText text="[email protected]" uri="mailto:[email protected]" />
98+
</div>
99+
</q-card-section>
100+
</q-card>
89101
</div>
90102
</q-page>
91103
</template>

‎frontend/yarn.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,9 +1355,9 @@ camel-case@^4.1.2:
13551355
tslib "^2.0.3"
13561356

13571357
caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
1358-
version "1.0.30001683"
1359-
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001683.tgz"
1360-
integrity sha512-iqmNnThZ0n70mNwvxpEC2nBJ037ZHZUoBI5Gorh1Mw6IlEAZujEoU1tXA628iZfzm7R9FvFzxbfdgml82a3k8Q==
1358+
version "1.0.30001751"
1359+
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz"
1360+
integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==
13611361

13621362
chalk@^4.0.0, chalk@^4.1.0:
13631363
version "4.1.2"
@@ -3931,9 +3931,9 @@ vite-plugin-checker@^0.9.1:
39313931
vscode-uri "^3.1.0"
39323932

39333933
vite@^6.1.0:
3934-
version "6.3.6"
3935-
resolved "https://registry.yarnpkg.com/vite/-/vite-6.3.6.tgz#69a976b64930750d40219fbc68c5200874d315c1"
3936-
integrity sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==
3934+
version "6.4.1"
3935+
resolved "https://registry.yarnpkg.com/vite/-/vite-6.4.1.tgz#afbe14518cdd6887e240a4b0221ab6d0ce733f96"
3936+
integrity sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==
39373937
dependencies:
39383938
esbuild "^0.25.0"
39393939
fdir "^6.4.4"

0 commit comments

Comments
 (0)