Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
12a317b
Correlation chart small fixes
davenquinn Mar 8, 2025
e84ece0
Fixed unconformity labels
davenquinn Mar 8, 2025
6be7583
Improved unconformity labels
davenquinn Mar 8, 2025
f55a819
Simplify correlation diagram view
davenquinn Mar 8, 2025
000b3a0
Fix errors
davenquinn Mar 8, 2025
1f2b4ee
Works pretty decently with package-oriented view
davenquinn Mar 8, 2025
5601c9e
Added unconformity line, but unused so far
davenquinn Mar 8, 2025
cad2809
Simplify package rendering a bit
davenquinn Mar 8, 2025
b6c1e43
Added a basic overlay for entire correlation diagram
davenquinn Mar 9, 2025
1883980
Remove spacing between columns
davenquinn Mar 9, 2025
0cd0434
Move column provider inside SVG
davenquinn Mar 9, 2025
c2b6ef5
Improve unit selection manager
davenquinn Mar 9, 2025
771beba
Changed width parameterization
davenquinn Mar 9, 2025
ed54016
Move unit selection to separate file
davenquinn Mar 9, 2025
ba13ab0
Starting point to expand units laterally
davenquinn Mar 9, 2025
e2be4e0
Merge branch 'correlation-overlay' into correlation-fixes
davenquinn Mar 9, 2025
aa0658c
Start working on unit coloring
davenquinn Mar 9, 2025
6326848
Fixed legend panel
davenquinn Mar 9, 2025
afa73d8
Some changes for column correlations
davenquinn Mar 10, 2025
4086698
Updated column widths
davenquinn Mar 10, 2025
831615a
Column background colors
davenquinn Mar 13, 2025
156c290
Added chart settings
davenquinn Mar 15, 2025
ac7f625
Added basic correlation diagram settings
davenquinn Mar 17, 2025
05d4b0b
Got display density management to work
davenquinn Mar 17, 2025
e81a57f
Improved how we manage correlation state
davenquinn Mar 17, 2025
e3cf321
Improved correlation diagram coloring
davenquinn Mar 21, 2025
cb49c7e
Merge branch 'column-colors' into correlation-fixes
davenquinn Mar 21, 2025
674feee
Fix style loading functions
davenquinn Mar 23, 2025
b4e347b
Improved correlation diagram wrapper
davenquinn Mar 23, 2025
faa28fa
Partially working column page
davenquinn Mar 27, 2025
fcc6519
Added colored units
davenquinn Mar 27, 2025
9e0c1af
Updated column loading approach
davenquinn Mar 27, 2025
3512198
Update column view
davenquinn Mar 27, 2025
c5a3cfd
Fix column rendering on client
davenquinn Mar 27, 2025
4a3ce6d
Fixed column map association with projects
davenquinn Mar 27, 2025
c024509
Partial success with hydration
davenquinn Mar 28, 2025
8950528
At least partial building with server-side rendering
davenquinn Mar 28, 2025
f3e1053
Ensure that some elements can run on the server
davenquinn Mar 28, 2025
a85f176
Fix dark mode
davenquinn Mar 28, 2025
7f316e6
Updated page layouts
davenquinn Mar 28, 2025
5e3533b
Improved rendering functions
davenquinn Mar 28, 2025
195f29b
Updated column group fetching
davenquinn Mar 28, 2025
98537f2
Fixed column correlation page
davenquinn Mar 28, 2025
9d0c607
Updated yarn version
davenquinn Apr 4, 2025
7026142
Merge commit '9d0c607d'
davenquinn Apr 4, 2025
a4bde7a
Merge branch 'main' into column-map-updates
davenquinn Apr 4, 2025
953ce9c
Updated some files in dev pages
davenquinn Apr 4, 2025
8eb8d9e
Column page works reasonably well
davenquinn Apr 4, 2025
77845cb
Fixed column pages
davenquinn Apr 9, 2025
ac1aab2
Major fixes to correlation page
davenquinn Apr 9, 2025
d8401b4
Fixed correlation
davenquinn Apr 9, 2025
88d77cd
Updated styles
davenquinn Apr 9, 2025
5b0388c
Fix some aspects of unconformities
davenquinn Apr 9, 2025
58e6ffd
Fixed column selection map
davenquinn Apr 9, 2025
a80ad69
Updated styles for column page
davenquinn Apr 10, 2025
b7585e8
Use bundled dependencies
davenquinn Apr 10, 2025
ae2828f
Updated vite bundling:
davenquinn Apr 10, 2025
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
691 changes: 346 additions & 345 deletions .yarn/releases/yarn-4.6.0.cjs → .yarn/releases/yarn-4.8.1.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ pnpFallbackMode: all

pnpMode: loose

yarnPath: .yarn/releases/yarn-4.6.0.cjs
yarnPath: .yarn/releases/yarn-4.8.1.cjs
34 changes: 15 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,21 @@
"@macrostrat-web/sift": "workspace:*",
"@macrostrat-web/text-toolchain": "workspace:*",
"@macrostrat-web/utility-functions": "workspace:*",
"@macrostrat/api-types": "^1.0.0",
"@macrostrat/color-utils": "^1.0.0",
"@macrostrat/column-components": "^1.0.3",
"@macrostrat/column-views": "^1.0.2",
"@macrostrat/data-components": "^0.0.6",
"@macrostrat/data-sheet": "^2.0.1",
"@macrostrat/api-types": "^1.1.0",
"@macrostrat/color-utils": "^1.1.0",
"@macrostrat/column-components": "^1.1.0",
"@macrostrat/column-views": "^2.0.0",
"@macrostrat/data-components": "^0.1.0",
"@macrostrat/data-sheet": "^2.0.2",
"@macrostrat/feedback-components": "^1.0.1",
"@macrostrat/form-components": "^0.1.2",
"@macrostrat/form-components": "^0.2.1",
"@macrostrat/hyper": "^3.0.6",
"@macrostrat/map-interface": "^1.2.2",
"@macrostrat/map-styles": "^1.1.1",
"@macrostrat/mapbox-react": "^2.5.0",
"@macrostrat/mapbox-utils": "^1.4.0",
"@macrostrat/style-system": "^0.2.0",
"@macrostrat/svg-map-components": "^1.0.3",
"@macrostrat/map-interface": "^1.3.0",
"@macrostrat/map-styles": "^1.2.0",
"@macrostrat/mapbox-react": "^2.6.0",
"@macrostrat/mapbox-utils": "^1.5.0",
"@macrostrat/style-system": "^0.2.1",
"@macrostrat/svg-map-components": "^1.0.4",
"@macrostrat/timescale": "^2.1.1",
"@macrostrat/ui-components": "^4.1.2",
"@react-hook/size": "^2.1.2",
Expand Down Expand Up @@ -156,14 +156,10 @@
"vite-plugin-cesium": "^1.2.22",
"vite-plugin-cjs-interop": "^2.1.6",
"vite-plugin-inspect": "^0.8.4",
"zustand": "^4.5.1"
},
"resolutions": {
"cesium": "^1.123.1",
"resium:": "1.17.1"
"zustand": "^5.0.1"
},
"prettier": {
"proseWrap": "always"
},
"packageManager": "yarn@4.6.0"
"packageManager": "yarn@4.8.1"
}
4 changes: 2 additions & 2 deletions packages/globe-dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@macrostrat/cesium-vector-provider": "2.0.2",
"@macrostrat/cesium-viewer": "^1.2.1",
"@macrostrat/hyper": "^3.0.6",
"@macrostrat/mapbox-react": "^2.5.0",
"@macrostrat/mapbox-utils": "^1.4.0",
"@macrostrat/mapbox-react": "^2.6.0",
"@macrostrat/mapbox-utils": "^1.5.0",
"cesium": "^1.123.1",
"resium": "^1.18.0"
}
Expand Down
Loading
Loading