Skip to content

Commit 1ed0dca

Browse files
authored
Merge pull request #278 from UW-Macrostrat/fix-page-styles
Fix page styles
2 parents 42f1419 + 1413db8 commit 1ed0dca

File tree

132 files changed

+5210
-14236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+5210
-14236
lines changed
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
---
22
name: Ingestion Update
33
about: Create a report to help us improve
4-
title: ''
4+
title: ""
55
labels: map-ingestion-interface
6-
assignees: ''
7-
6+
assignees: ""
87
---
98

109
- [ ] Bug
1110
- [ ] Feature Request
1211

1312
**Description**
14-

.github/workflows/build-image.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ permissions: read-all
44

55
on:
66
push:
7-
branches: [ "main" ]
7+
branches: ["main"]
88
tags:
9-
- 'v*.*.*' # glob for semver tags (including prereleases)
9+
- "v*.*.*" # glob for semver tags (including prereleases)
1010
pull_request:
11-
branches: [ main ]
11+
branches: [main]
1212

1313
jobs:
1414
call-build-image:
1515
uses: UW-Macrostrat/build-push/.github/workflows/build-push.yaml@main
1616
secrets: inherit
1717
with:
1818
context: .
19-
image: 'hub.opensciencegrid.org/macrostrat/web'
19+
image: "hub.opensciencegrid.org/macrostrat/web"

.prettierignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
*.mdx
2+
.yarn
3+
.idea
4+
.vscode
5+
dist
6+
content/.obsidian

README.md

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,38 @@
11
# Macrostrat's map interface
22

3-
Macrostrat's map interface is web portal to a geologic model of the Earth's crust.
3+
Macrostrat's map interface is web portal to a geologic model of the Earth's
4+
crust.
45

5-
Version 5 of the application transitions to using [Vite](https://vitejs.dev/) for bundling and [Vike](https://vike.dev/)
6-
for server-side rendering. We are working on updating this version for performance and stability.
6+
Version 5 of the application transitions to using [Vite](https://vitejs.dev/)
7+
for bundling and [Vike](https://vike.dev/) for server-side rendering. We are
8+
working on updating this version for performance and stability.
79

810
## Installation for local development
911

1012
1. Clone the repository
1113
2. Pull down submodules (`git submodule update --init --recursive`)
12-
3. Create and populate a `.env` file with the appropriate environment variables (See [
13-
`.env.example`](https://github.com/UW-Macrostrat/web/blob/main/.env.example) for more information.)
14-
4. Verify that you have access to recent versions of Node.js and the Yarn package manager ( `node >= 16.0.0` and
15-
`yarn >= 4.0.0`; run `node -v` and `yarn -v` to check)
14+
3. Create and populate a `.env` file with the appropriate environment variables
15+
(See
16+
[ `.env.example`](https://github.com/UW-Macrostrat/web/blob/main/.env.example)
17+
for more information.)
18+
4. Verify that you have access to recent versions of Node.js and the Yarn
19+
package manager ( `node >= 16.0.0` and `yarn >= 4.0.0`; run `node -v` and
20+
`yarn -v` to check)
1621
5. Run `yarn install` to update packages
17-
6. Start the live-reloading development server with `yarn run dev`. The server will be available at
18-
`http://localhost:3000` by default.
22+
6. Start the live-reloading development server with `yarn run dev`. The server
23+
will be available at `http://localhost:3000` by default.
1924

2025
## Contributing
2126

22-
Please see the [Contributing guide](./CONTRIBUTING.md) for information on how to contribute to this codebase.
27+
Please see the [Contributing guide](./CONTRIBUTING.md) for information on how to
28+
contribute to this codebase.
2329

2430
## Packaging
2531

2632
### Running locally with Docker
2733

28-
Spins up a instance of the website for development on the same node image used for prod.
34+
Spins up a instance of the website for development on the same node image used
35+
for prod.
2936

3037
```bash
3138
docker run -it -p 3010:3000 -v $(pwd):/app -w /app node:20 git config --global --add safe.directory /app && yarn run dev
@@ -57,15 +64,16 @@ To deploy to kubernetes there is two steps.
5764

5865
2. Update the deployment in Kubernetes
5966

60-
You do this by updating the image tag here to whatever you tagged
61-
above: https://github.com/UW-Macrostrat/tiger-macrostrat-config/blob/main/manifests/development/web/deployment-patch.yaml
67+
You do this by updating the image tag here to whatever you tagged above:
68+
https://github.com/UW-Macrostrat/tiger-macrostrat-config/blob/main/manifests/development/web/deployment-patch.yaml
6269

6370
## Testing authentication on localhost
6471

65-
If you are developing locally and need to test authentication, you can
66-
use a browser extension like **CookieSync** to automatically pull cookies from the production or development
67-
site into your local environment. This will allow you to use the same session
68-
information locally. The cookie that must be copied is called `access_token`.
72+
If you are developing locally and need to test authentication, you can use a
73+
browser extension like **CookieSync** to automatically pull cookies from the
74+
production or development site into your local environment. This will allow you
75+
to use the same session information locally. The cookie that must be copied is
76+
called `access_token`.
6977

7078
We will eventually build an enhanced authentication service to allow for easier
7179
local development.
@@ -74,4 +82,3 @@ local development.
7482
MACROSTRAT_API_PROXY_DOMAIN="https://dev2.macrostrat.org"
7583
VITE_MACROSTRAT_API_DOMAIN="http://localhost:3000"
7684
```
77-

content/Architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- Macrostrat is centered around a [[PostgreSQL]] database
2-
- A "database-centric" application
2+
- A "database-centric" application
33

44
## Architectural models
55

content/Community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Macrostrat is part of a broad geoinformatics ecosystem.
33
## Geological systems
44

55
- Paleobiology database (PBDB): [https://paleobiodb.org](https://paleobiodb.org)
6-
- The [EarthByte](https://www.earthbyte.org) group is engaged in many complementary activities towards building a
7-
digital crust
6+
- The [EarthByte](https://www.earthbyte.org) group is engaged in many
7+
complementary activities towards building a digital crust
88

99
## Cool Earth observing websites
1010

content/Components/Macrostrat data services.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@ geologic column data.
33

44
There are two main reasons for this:
55

6-
1. Macrostrat currently contains voluminous geologic map and column data that cannot be accessed in aggregate anywhere
7-
else.
8-
- Over 300 different geologic maps, containing more than 2.5 million rock unit polygons covering the world, have
9-
been integrated into a single, unified, queryable environment in Macrostrat.
10-
- Additionally, more than 35,000 rock units from over 1,500 regional columns covering all of North America and
11-
limited other regions are publicly available.
12-
2. Macrostrat has a public "REST" application programming interface (API) that makes the full complement of data
13-
available in Findable, Accessible, Interoperable, and Reusable (FAIR) fashion with a CC-BY license.
6+
1. Macrostrat currently contains voluminous geologic map and column data that
7+
cannot be accessed in aggregate anywhere else.
8+
- Over 300 different geologic maps, containing more than 2.5 million rock
9+
unit polygons covering the world, have been integrated into a single,
10+
unified, queryable environment in Macrostrat.
11+
- Additionally, more than 35,000 rock units from over 1,500 regional columns
12+
covering all of North America and limited other regions are publicly
13+
available.
14+
2. Macrostrat has a public "REST" application programming interface (API) that
15+
makes the full complement of data available in Findable, Accessible,
16+
Interoperable, and Reusable (FAIR) fashion with a CC-BY license.
1417

15-
Many third-party applications and users take advantage of Macrostrat data services:
18+
Many third-party applications and users take advantage of Macrostrat data
19+
services:
1620

1721
- Mancos
1822
- StraboSpot
@@ -24,8 +28,11 @@ Many third-party applications and users take advantage of Macrostrat data servic
2428

2529
## Usage
2630

27-
Macrostrat’s data services have become impactful community resources for geologic information:
31+
Macrostrat’s data services have become impactful community resources for
32+
geologic information:
2833

29-
- Our geologic map server has served more than 2 billion tile requests since logging began in 2018 (~10 per second)
30-
- Over the last 28 days, our other data APIs have served 3.8 million requests (~2 per second).
34+
- Our geologic map server has served more than 2 billion tile requests since
35+
logging began in 2018 (~10 per second)
36+
- Over the last 28 days, our other data APIs have served 3.8 million requests
37+
(~2 per second).
3138
- Conservatively, these amount to 100,000 requests for information each day.
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Macrostrat maintains a lexicon of geologic information, such as stratigraphic units, etc.
1+
Macrostrat maintains a lexicon of geologic information, such as stratigraphic
2+
units, etc.
23

34
## Concepts
45

@@ -10,12 +11,14 @@ Macrostrat maintains a lexicon of geologic information, such as stratigraphic un
1011
## Mechanics
1112

1213
- This lexicon integrates curated information from a variety of publishers
13-
- Notably the USGS Stratigraphic Names lexicon
14-
- Also lexicons from other organizations
15-
- Linked to from map and column descriptive information (mostly using autogenerated scripts)
16-
- The capability to manage geologic names and concepts is not unique but the tools on top of it are
14+
- Notably the USGS Stratigraphic Names lexicon
15+
- Also lexicons from other organizations
16+
- Linked to from map and column descriptive information (mostly using
17+
autogenerated scripts)
18+
- The capability to manage geologic names and concepts is not unique but the
19+
tools on top of it are
1720

1821
## Resources
1922

2023
- https://ngmdb.usgs.gov/Geolex/stratres/lexicons
21-
- [USGS Geolex Search](https://ngmdb.usgs.gov/Geolex/search)
24+
- [USGS Geolex Search](https://ngmdb.usgs.gov/Geolex/search)
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
- Representation of stratigraphy in chronostratigraphic or lithostratigraphic context
1+
- Representation of stratigraphy in chronostratigraphic or lithostratigraphic
2+
context
23
- Provided by [[Macrostrat data services]]
3-
- Will soon be viewable in [[Macrostrat user interfaces]]
4+
- Will soon be viewable in [[Macrostrat user interfaces]]
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
[[Macrostrat]] user interfaces seek to express the world as geologists are used to seeing it
1+
[[Macrostrat]] user interfaces seek to express the world as geologists are used
2+
to seeing it
23

34
## Core components
45

56
- Maps
67
- Stratigraphic columns
7-
- Summary pages for geologic entities (units, samples, geochemical datasets, etc.)
8+
- Summary pages for geologic entities (units, samples, geochemical datasets,
9+
etc.)
810

911
Based on [[Macrostrat data services]]

0 commit comments

Comments
 (0)