Skip to content

Commit 4f45a0a

Browse files
davenquinndavenquinn
committed
Updated with locally referenced dependencies
1 parent e94b8f0 commit 4f45a0a

File tree

39 files changed

+91
-328
lines changed

39 files changed

+91
-328
lines changed

‎package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
"test": "vitest"
1818
},
1919
"workspaces": [
20-
"deps/web-components/packages/*",
21-
"deps/cesium-viewer",
2220
"packages/*"
2321
],
2422
"authors": [
@@ -73,7 +71,9 @@
7371
"@macrostrat/data-components": "^0.0.5",
7472
"@macrostrat/data-sheet": "^2.0.0",
7573
"@macrostrat/feedback-components": "^1.1.0",
74+
"@macrostrat/form-components": "^0.1.1",
7675
"@macrostrat/hyper": "^2.2.1",
76+
"@macrostrat/map-components": "portal:../web-components/packages/svg-map-components",
7777
"@macrostrat/map-interface": "^1.1.0",
7878
"@macrostrat/map-styles": "^1.0.3",
7979
"@macrostrat/mapbox-react": "^2.4.0",
@@ -178,7 +178,8 @@
178178
"@macrostrat/timescale": "portal:../web-components/packages/timescale",
179179
"@macrostrat/ui-components": "portal:../web-components/packages/ui-components",
180180
"@macrostrat/hyperstyle-loader": "portal:../web-components/toolchain/hyperstyle-loader",
181-
"@macrostrat/vite-plugin-hyperstyles": "portal:../web-components/toolchain/vite-plugin-hyperstyles"
181+
"@macrostrat/vite-plugin-hyperstyles": "portal:../web-components/toolchain/vite-plugin-hyperstyles",
182+
"@macrostrat/map-components": "portal:../web-components/packages/svg-map-components"
182183
},
183184
"prettier": {
184185
"proseWrap": "always"

‎packages/globe-dev/__temp_disabled/cesium-view.old.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export function BaseLayer({ enabled = true, style, accessToken, ...rest }) {
4444
import "@znemz/cesium-navigation/dist/index.css";
4545

4646
import { SETTINGS } from "../settings";
47-
import { buildXRayStyle } from "@macrostrat/mapbox-styles";
47+
import { buildXRayStyle } from "@macrostrat/map-styles";
4848

4949
// const VectorGeologyLayer = ({ enabled = true, ...rest }) => {
5050
// const provider = useRef(

‎pages/_error/+Page.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function LoginButton() {
4040
/** For now, the login button only loads on the client side */
4141
return h(ClientOnly, {
4242
load: async () => {
43-
const res = await import("@macrostrat/auth-components");
43+
const res = await import("@macrostrat/form-components");
4444
return res.AuthStatus;
4545
},
4646
fallback: h(

‎pages/columns/@column/column-inspector/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MacrostratAPIProvider } from "@macrostrat/api-views";
1+
import { MacrostratAPIProvider } from "@macrostrat/column-views";
22
import {
33
ColumnNavigatorMap,
44
UnitSelectionProvider,

‎pages/dev/concepts/carbon-isotopes/+Page.ts‎

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,7 @@
11
import h from "@macrostrat/hyper";
2-
import { APIProvider, useAPIResult } from "@macrostrat/ui-components";
3-
import Column from "./column";
4-
import {
5-
ColumnNavigatorMap,
6-
MeasurementsLayer,
7-
} from "@macrostrat/column-views/src/map";
8-
import { MeasurementDataProvider } from "@macrostrat/concept-app-helpers";
2+
import { CarbonIsotopesApp } from "@macrostrat/column-views";
93
import { PatternProvider } from "~/_providers.client";
10-
import { useColumnNav } from "@macrostrat/column-views";
11-
12-
const ColumnTitle = (props) => {
13-
return h.if(props.data != null)("h1", props.data?.col_name);
14-
};
15-
16-
const defaultArgs = {
17-
col_id: 2192,
18-
//unit_id: null,
19-
project_id: 10,
20-
status_code: "in process",
21-
};
22-
23-
function ColumnManager() {
24-
const [columnArgs, setCurrentColumn] = useColumnNav(defaultArgs);
25-
const { col_id, ...projectParams } = columnArgs;
26-
27-
console.log(columnArgs);
28-
29-
const colParams = { ...columnArgs, format: "geojson" };
30-
const res = useAPIResult("/columns", colParams, [columnArgs]);
31-
const columnFeature = res?.features[0];
32-
33-
//return h("div.column-manager", "Hello, world");
34-
35-
return h(MeasurementDataProvider, columnArgs, [
36-
h("div.column-ui", [
37-
h("div.column-view", [
38-
h(ColumnTitle, { data: columnFeature?.properties }),
39-
h(Column, { params: columnArgs }),
40-
]),
41-
h("div.map-column", [
42-
h(
43-
ColumnNavigatorMap,
44-
{
45-
currentColumn: columnFeature,
46-
setCurrentColumn,
47-
margin: 0,
48-
...projectParams,
49-
},
50-
h(MeasurementsLayer, {
51-
...projectParams,
52-
style: {
53-
fill: "dodgerblue",
54-
stroke: "blue",
55-
},
56-
})
57-
),
58-
]),
59-
]),
60-
]);
61-
}
624

635
export function Page() {
64-
return h(
65-
PatternProvider,
66-
h(
67-
APIProvider,
68-
{
69-
baseURL: "https://dev.macrostrat.org/api/v2",
70-
unwrapResponse: (res) => res.success.data,
71-
},
72-
h(ColumnManager)
73-
)
74-
);
6+
return h(PatternProvider, h(CarbonIsotopesApp));
757
}

‎pages/dev/concepts/carbon-isotopes/column.ts‎

Lines changed: 0 additions & 128 deletions
This file was deleted.

‎pages/dev/concepts/detrital-zircon/column.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ import {
99
ColumnContext,
1010
NotesColumn,
1111
} from "@macrostrat/column-components";
12-
import { MacrostratColumnProvider } from "@macrostrat/api-views";
13-
import { CompositeUnitsColumn, IUnit } from "@macrostrat/column-views";
12+
import {
13+
CompositeUnitsColumn,
14+
IUnit,
15+
MacrostratColumnProvider,
16+
} from "@macrostrat/column-views";
1417
import { useContext } from "react";
1518

1619
interface IColumnProps {

‎pages/dev/concepts/eODP/age-model-column.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { format } from "d3-format";
22
import h from "@macrostrat/hyper";
33
import classNames from "classnames";
4-
import { AxisBottom } from "@vx/axis";
4+
import { AxisBottom } from "@visx/axis";
55
import { useMemo } from "react";
66
import { useColumnNav } from "@macrostrat/column-views";
77

‎pages/dev/concepts/eODP/column.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ import {
77
NotesColumn,
88
} from "@macrostrat/column-components";
99
import { useContext } from "react";
10-
import { AnnotatedUnitsColumn } from "@macrostrat/column-views";
10+
import {
11+
AnnotatedUnitsColumn,
12+
AgeAxis,
13+
MacrostratColumnProvider,
14+
} from "@macrostrat/column-views";
1115
import { IUnit, transformAxisType } from "@macrostrat/column-views";
12-
import { AgeAxis } from "@macrostrat/concept-app-helpers";
1316
import { TrackedLabeledUnit } from "@macrostrat/column-views";
1417
import { useAPIResult } from "@macrostrat/ui-components";
1518
import { useColumnNav } from "@macrostrat/column-views";
@@ -19,7 +22,6 @@ import {
1922
ReconstructedColumnAgeDataset,
2023
useColumnAgeModel,
2124
} from "./age-model-column";
22-
import { MacrostratColumnProvider } from "@macrostrat/api-views";
2325
// import "@macrostrat/timescale/dist/timescale.css";
2426
import { Timescale } from "@macrostrat/timescale";
2527
import styles from "./age-model.module.styl";

‎pages/dev/concepts/multiscale-figure/+Page.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,19 @@ import {
88
import { BaseSection, InteriorSection } from "./src/section";
99
import {
1010
CompositeUnitsColumn,
11-
CompositeUnitComponent,
1211
IUnit,
13-
} from "@macrostrat/column-views";
14-
import type { ColumnSpec } from "@macrostrat/api-types";
15-
import {
1612
IsotopesColumn,
17-
IsotopesDataset,
1813
MeasurementDataProvider,
19-
} from "@macrostrat/concept-app-helpers";
14+
preprocessUnits,
15+
} from "@macrostrat/column-views";
16+
import type { ColumnSpec } from "@macrostrat/api-types";
17+
2018
import {
2119
IsotopesSpectraColumn,
2220
IsotopeSpectrumNote,
2321
shouldRenderNote,
2422
} from "./src/spectra";
2523
import { MeasuredSection } from "./src/measured-section";
26-
import { preprocessUnits } from "@macrostrat/concept-app-helpers";
2724
import { ColumnMap } from "./src/map";
2825
import "./src/main.styl";
2926

@@ -74,7 +71,7 @@ function Column(props: React.PropsWithChildren<{ params: ColumnSpec }>) {
7471

7572
function MultiIsotopesColumn({ transform }) {
7673
return h("g.isotopes-columns", { transform }, [
77-
h(IsotopesColumn, {
74+
h(CarbonIsotopesColumn, {
7875
label: "δ¹³C",
7976
color: "dodgerblue",
8077
domain: [-20, 5],
@@ -83,7 +80,7 @@ function MultiIsotopesColumn({ transform }) {
8380
showAxis: true,
8481
parameter: "D13C",
8582
}),
86-
h(IsotopesColumn, {
83+
h(CarbonIsotopesColumn, {
8784
label: "δ¹⁸O",
8885
color: "red",
8986
domain: [-15, 5],

0 commit comments

Comments
 (0)