Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update prod from main #400

Merged
merged 13 commits into from
Dec 16, 2024
Merged

Update prod from main #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2302788
fix(website): west nile: properly change `mainDateField` for staging
fengelniederhammer Dec 10, 2024
09e505a
chore(website): bump @genspectrum/dashboard-components in /website (#…
dependabot[bot] Dec 10, 2024
a7e72fe
feat(website): bring back mpox
Dec 10, 2024
74119b9
fix(website): allow scrolling on mega menu
Dec 10, 2024
8a7b38c
chore(website): bump the minorandpatch group across 1 directory with …
dependabot[bot] Dec 11, 2024
cb94ee2
fix(website): add required lapisDateField to relative growth advantage
Dec 11, 2024
64dcd79
fix(website): fixes login button
Dec 11, 2024
bbaaba4
chore(website): bump astro from 4.16.16 to 5.0.4 in /website
dependabot[bot] Dec 11, 2024
d2a4d03
refactor(website): extract GenericSequencingEffortsPage (#412)
fengelniederhammer Dec 12, 2024
167b2fd
refactor(website): extract Gs*.astro components that wrap the web com…
fengelniederhammer Dec 12, 2024
0d280ec
feat(website): allow each organism to not include all pages
anna-parker Dec 12, 2024
e492f2e
Merge pull request #419 from GenSpectrum/make_more_generic
anna-parker Dec 12, 2024
f954a5e
feat(website): add compare to baseline landing page (#422)
anna-parker Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions backend/src/main/resources/application-dashboards-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ dashboards:
menuIcon: "database"
mpox:
lapis:
url: "https://gs-staging-1.int.genspectrum.org/mpox"
mainDateField: "sampleCollectionDate"
url: "https://lapis.pathoplexus.org/mpox"
mainDateField: "sampleCollectionDateRangeLower"
locationFields:
- "country"
- "division"
- "geoLocCountry"
- "geoLocAdmin1"
hostField: "hostNameScientific"
authorAffiliationsField: "authorAffiliations"
authorsField: "authors"
additionalFilters:
versionStatus: "LATEST_VERSION"
isRevocation: "false"
externalNavigationLinks:
- url: "https://loculus.staging.genspectrum.org/mpox"
- url: "https://pathoplexus.org/mpox"
label: "Browse data"
menuIcon: "database"
westNile:
Expand Down
10 changes: 5 additions & 5 deletions backend/src/main/resources/application-dashboards-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ dashboards:
menuIcon: "database"
mpox:
lapis:
url: "https://api.loculus.genspectrum.org/mpox"
mainDateField: "sampleCollectionDate"
url: "https://lapis.pathoplexus.org/mpox"
mainDateField: "sampleCollectionDateRangeLower"
locationFields:
- "country"
- "division"
- "geoLocCountry"
- "geoLocAdmin1"
hostField: "hostNameScientific"
authorAffiliationsField: "authorAffiliations"
authorsField: "authors"
additionalFilters:
versionStatus: "LATEST_VERSION"
isRevocation: "false"
externalNavigationLinks:
- url: "https://loculus.genspectrum.org/mpox"
- url: "https://pathoplexus.org/mpox"
label: "Browse data"
menuIcon: "database"
westNile:
Expand Down
10 changes: 5 additions & 5 deletions backend/src/main/resources/application-dashboards-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@ dashboards:
menuIcon: "database"
mpox:
lapis:
url: "https://api.loculus.staging.genspectrum.org/mpox"
url: "https://lapis.pathoplexus.org/mpox"
mainDateField: "sampleCollectionDateRangeLower"
locationFields:
- "country"
- "division"
- "geoLocCountry"
- "geoLocAdmin1"
hostField: "hostNameScientific"
authorAffiliationsField: "authorAffiliations"
authorsField: "authors"
additionalFilters:
versionStatus: "LATEST_VERSION"
isRevocation: "false"
externalNavigationLinks:
- url: "https://loculus.staging.genspectrum.org/mpox"
- url: "https://pathoplexus.org/mpox"
label: "Browse data"
menuIcon: "database"
westNile:
lapis:
url: "https://lapis.pathoplexus.org/west-nile"
mainDateField: "sampleCollectionDate"
mainDateField: "sampleCollectionDateRangeLower"
locationFields:
- "geoLocCountry"
- "geoLocAdmin1"
Expand Down
32 changes: 16 additions & 16 deletions website/.prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"printWidth": 120,
"tabWidth": 4,
"trailingComma": "all",
"semi": true,
"jsxSingleQuote": true,
"singleQuote": true,
"quoteProps": "consistent",
"plugins": ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
"overrides": [
{
"files": "*.astro",
"options": {
"parser": "astro"
}
}
]
"printWidth": 120,
"tabWidth": 4,
"trailingComma": "all",
"semi": true,
"jsxSingleQuote": true,
"singleQuote": true,
"quoteProps": "consistent",
"plugins": ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
"overrides": [
{
"files": "*.astro",
"options": {
"parser": "astro"
}
}
]
}
2 changes: 1 addition & 1 deletion website/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const disableFromReact = {
};

export default tseslint.config(
{ ignores: ['dist', 'node_modules'], files: ['**/*.ts', '**/*.tsx'] },
{
ignores: ['**/.astro/content.d.ts'],
files: ['**/*.ts', '**/*.tsx'],
extends: [
eslint.configs.recommended,
Expand Down
Loading
Loading