Skip to content

Commit be5ec6d

Browse files
davidsklar99davidsklar99
committed
add footer
1 parent bb46fd6 commit be5ec6d

File tree

3 files changed

+70
-61
lines changed

3 files changed

+70
-61
lines changed

‎pages/lex/+Page.ts‎

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ContentPage } from "~/layouts";
33
import { apiV2Prefix } from "@macrostrat-web/settings";
44
import { useAPIResult } from "@macrostrat/ui-components";
55
import h from "./+Page.module.sass";
6-
import { Loading } from "~/components/general";
6+
import { Loading, Footer } from "~/components/general";
77

88
export function Page() {
99
const res = useAPIResult(apiV2Prefix + "/stats?all")?.success?.data;
@@ -31,64 +31,67 @@ export function Page() {
3131
measurements += stat.measurements || 0;
3232
});
3333

34-
return h(ContentPage, [
35-
h(PageHeader, { title: "Lexicon" }),
34+
return h('div', [
35+
h(ContentPage, [
36+
h(PageHeader, { title: "Lexicon" }),
3637

37-
h("p", [
38-
"This is the homepage of Macrostrat's geological lexicons, which are assembled from many data sources including Canada's ",
38+
h("p", [
39+
"This is the homepage of Macrostrat's geological lexicons, which are assembled from many data sources including Canada's ",
40+
h(
41+
"a",
42+
{ href: "https://weblex.canada.ca/weblexnet4/weblex_e.aspx" },
43+
"WebLex"
44+
),
45+
", the USGS's ",
46+
h("a", { href: "https://ngmdb.usgs.gov/Geolex/search" }, "Geolex"),
47+
", and other sources. The lexicon is continually updated in partnership with researchers and data providers.",
48+
]),
49+
h("div.stats-table", [
50+
h("p.stat", `${formatNumber(columns)} columns`),
51+
h("p.stat", `${formatNumber(packages)} packages`),
52+
h("p.stat", `${formatNumber(units)} units`),
53+
h("p.stat", `${formatNumber(measurements)} measurements`),
54+
]),
55+
56+
h("h2", "Dictionaries"),
3957
h(
40-
"a",
41-
{ href: "https://weblex.canada.ca/weblexnet4/weblex_e.aspx" },
42-
"WebLex"
58+
LinkCard,
59+
{ href: "/lex/strat-names", title: "Stratigraphic names" },
60+
"Names of rock units, organized hierarchically and concepts that capture relationships between differently-named rock units"
4361
),
44-
", the USGS's ",
45-
h("a", { href: "https://ngmdb.usgs.gov/Geolex/search" }, "Geolex"),
46-
", and other sources. The lexicon is continually updated in partnership with researchers and data providers.",
47-
]),
48-
h("div.stats-table", [
49-
h("p.stat", `${formatNumber(columns)} columns`),
50-
h("p.stat", `${formatNumber(packages)} packages`),
51-
h("p.stat", `${formatNumber(units)} units`),
52-
h("p.stat", `${formatNumber(measurements)} measurements`),
53-
]),
54-
55-
h("h2", "Dictionaries"),
56-
h(
57-
LinkCard,
58-
{ href: "/lex/strat-names", title: "Stratigraphic names" },
59-
"Names of rock units, organized hierarchically and concepts that capture relationships between differently-named rock units"
60-
),
6162

62-
h(
63-
LinkCard,
64-
{ href: "/lex/intervals", title: "Intervals" },
65-
"Time intervals"
66-
),
67-
h(
68-
LinkCard,
69-
{ href: "/lex/timescales", title: "Timescales" },
70-
"Continuous representations of relative geologic time"
71-
),
72-
h(
73-
LinkCard,
74-
{ href: "/lex/lithology", title: "Lithologies" },
75-
"Names of geologic materials"
76-
),
77-
h(
78-
LinkCard,
79-
{ href: "/lex/environments", title: "Environments" },
80-
"Depositional environments and formation mechanisms"
81-
),
82-
h(
83-
LinkCard,
84-
{ href: "/lex/economics", title: "Economics" },
85-
"Economic uses of geologic materials"
86-
),
63+
h(
64+
LinkCard,
65+
{ href: "/lex/intervals", title: "Intervals" },
66+
"Time intervals"
67+
),
68+
h(
69+
LinkCard,
70+
{ href: "/lex/timescales", title: "Timescales" },
71+
"Continuous representations of relative geologic time"
72+
),
73+
h(
74+
LinkCard,
75+
{ href: "/lex/lithology", title: "Lithologies" },
76+
"Names of geologic materials"
77+
),
78+
h(
79+
LinkCard,
80+
{ href: "/lex/environments", title: "Environments" },
81+
"Depositional environments and formation mechanisms"
82+
),
83+
h(
84+
LinkCard,
85+
{ href: "/lex/economics", title: "Economics" },
86+
"Economic uses of geologic materials"
87+
),
8788

88-
h("p", [
89-
h("strong", h("a", { href: "/sift" }, "Sift")),
90-
", Macrostrat's legacy lexicon app, is still available for use as it is gradually brought into this new framework.",
89+
h("p", [
90+
h("strong", h("a", { href: "/sift" }, "Sift")),
91+
", Macrostrat's legacy lexicon app, is still available for use as it is gradually brought into this new framework.",
92+
]),
9193
]),
94+
h(Footer)
9295
]);
9396
}
9497

‎pages/projects/+Page.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import h from "./main.module.scss";
22
import { ContentPage } from "~/layouts";
33
import { PageHeader, LinkCard } from "~/components";
44
import { useData } from "vike-react/useData";
5-
import { Image } from "~/components/general";
5+
import { Footer, Image } from "~/components/general";
66

77
export function Page() {
88
// static list of projects with pictures
@@ -15,11 +15,14 @@ export function Page() {
1515

1616
const { projects } = useData();
1717

18-
return h(ContentPage, [
19-
h(PageHeader, { title: "Projects" }),
20-
projects.map((d) =>
21-
h(ProjectItem, { data: d, key: d.project_id, pictures })
22-
),
18+
return h('div', [
19+
h(ContentPage, [
20+
h(PageHeader, { title: "Projects" }),
21+
projects.map((d) =>
22+
h(ProjectItem, { data: d, key: d.project_id, pictures })
23+
),
24+
]),
25+
h(Footer)
2326
]);
2427
}
2528

‎src/components/lex/index.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { SETTINGS } from "@macrostrat-web/settings";
44
import { PageHeader, Link, PageBreadcrumbs } from "~/components";
55
import { Card, Icon, Popover, Divider, RangeSlider } from "@blueprintjs/core";
66
import { ContentPage } from "~/layouts";
7-
import { BlankImage, Loading } from "~/components/general";
7+
import { BlankImage, Footer, Loading } from "~/components/general";
88
import { useState, useCallback, act } from "react";
99
import { asChromaColor } from "@macrostrat/color-utils";
1010
import { DarkModeButton } from "@macrostrat/ui-components";
@@ -103,7 +103,8 @@ export function IndividualPage(id, type, header) {
103103
intRes;
104104
const area = parseInt(col_area.toString().split(".")[0]);
105105

106-
return h(ContentPage, { className: "int-page" }, [
106+
return h('div', [
107+
h(ContentPage, { className: "int-page" }, [
107108
h("div.page-header", [
108109
h(PageBreadcrumbs, { title: "#" + id }),
109110
h(DarkModeButton, { className: "dark-mode-button", showText: true }),
@@ -225,6 +226,8 @@ export function IndividualPage(id, type, header) {
225226
),
226227
]),
227228
h(References, { res1: fossilResult, res2: colDataResult }),
229+
]),
230+
h(Footer),
228231
]);
229232
}
230233

0 commit comments

Comments
 (0)