Skip to content

Commit 056ae24

Browse files
davidsklar99davidsklar99
authored
Merge pull request #37 from UW-Macrostrat/updates
Explore, Trips, Checkins updates
2 parents 689a91c + cf6e334 commit 056ae24

File tree

17 files changed

+1178
-806
lines changed

17 files changed

+1178
-806
lines changed

‎pages/+Page.client.ts‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
import { Image, Footer } from "./index";
2+
import "./main.sass";
3+
import "./main-page.styl";
4+
import "@macrostrat/style-system";
5+
import h from "@macrostrat/hyper";
6+
import "@macrostrat/style-system";
7+
8+
9+
export function Page() {
10+
return h("div", { className: "main-page" }, [
11+
h("div", { className: "new_container field" }, [
12+
h("div", { className: "mask" }, [
13+
h(Image, { src: "main-page/field.jpg", className: "start-img back-img", alt: "Field" }),
14+
h("div", { className: "main-content row row-eq-height" }, [
15+
h("div", { className: "side" }, [
16+
h("div", { className: "center-me" }, [
17+
h("div", { className: "center" }, [
18+
h(Image, { src: "main-page/rockd_transparent.png", className: "not-huge", alt: "Logo" }),
19+
h("p", {}, "Learn, explore, and document your geologic world"),
20+
h("div.download-buttons", [
21+
h("a", { href: "https://itunes.apple.com/us/app/id1153056624", className: "ios-container" }, [
22+
h(Image, { src: "main-page/appstore.png", className: "download-badge ios", alt: "App Store" })
23+
]),
24+
h("a", { href: "https://play.google.com/store/apps/details?id=org.macrostrat.rockd", className: "android-container" }, [
25+
h(Image, { src: "main-page/google-play-badge.png", className: "download-badge android", alt: "Google Play" })
26+
])
27+
]),
28+
h("p", {}, [
29+
h("a", { className: "explore-link", href: "/explore" }, "Explore the data")
30+
])
31+
])
32+
]),
33+
h(Image, { src: "main-page/main.png", className: "main-img", alt: "Main" })
34+
])
35+
])
36+
])
37+
]),
38+
h("div", { className: "new_container map-container" }, [
39+
h("div", { className: "side" }, [
40+
h("div", { className: "map-imgs" }, [
41+
h(Image, { src: "main-page/grand_canyon.jpg", className: "map-shot grand_canyon" }),
42+
h(Image, { src: "main-page/new_zealand.jpg", className: "map-shot new_zealand" }),
43+
h(Image, { src: "main-page/world.jpg", className: "map-shot world" }),
44+
h(Image, { src: "main-page/appalachia.jpg", className: "map-shot appalachia" })
45+
]),
46+
h("div", { className: "center map-info" }, [
47+
h("h1", {}, [
48+
"Instant access to more than 290 ",
49+
h("a", { href: "https://macrostrat.org/map/sources" }, "geologic maps"),
50+
" globally"
51+
]),
52+
h("p", {}, [
53+
"Includes direct links to ",
54+
h("a", { href: "https://macrostrat.org" }, "Macrostrat"),
55+
" and ",
56+
h("a", { href: "https://xdd.wisc.edu" }, "xDD"),
57+
" (where available)"
58+
])
59+
])
60+
])
61+
]),
62+
63+
h("div", { className: "new_container white-container" }, [
64+
h("div", { className: "row" }, [
65+
h("div", { className: "col-sm-6 col-sm-offset-3" }, [
66+
h("div", { className: "headline-alligner" }, [
67+
h("div", { className: "center curious" }, [
68+
h("h1", {}, "Curious what you're standing on?"),
69+
h("p", {}, "The Dashboard distills key facts about your location into a single, easy-to-read interface")
70+
])
71+
])
72+
]),
73+
h("div", { className: "col-xs-12 dashboard-img-container" }, [
74+
h(Image, { src: "main-page/pilbara-australia.png" }),
75+
h(Image, { src: "main-page/huronian-supergroup.png" }),
76+
h(Image, { src: "main-page/copper-harbor.png" }),
77+
h(Image, { src: "main-page/appalachian-foreland.png" }),
78+
h(Image, { src: "main-page/gotthard-pass.png" }),
79+
h(Image, { src: "main-page/ozark-plateau.png" }),
80+
h(Image, { src: "main-page/eastern-australia.png" })
81+
])
82+
])
83+
]),
84+
h("div", { className: "new_container red_rock" }, [
85+
h(Image, { src: "main-page/red_rock.jpg", className: "back-img red-rock-img" }),
86+
87+
h("div", { className: "img-container row row-eq-height" }, [
88+
h("div", { className: "col-sm-6 stats-container" }, [
89+
h(Image, { src: "main-page/profile.png", className: "profile-img" })
90+
]),
91+
92+
h("div", { className: "col-sm-6 center-me" }, [
93+
h("div", { className: "headline-alligner" }, [
94+
h("div", { className: "center" }, [
95+
h("h1", {}, '"The best geologist is the one who has seen the most rocks"'),
96+
h("p", {}, "Track your progress through the geologic rock record with summary statistics about your checkins")
97+
])
98+
])
99+
])
100+
])
101+
]),
102+
h("div", { className: "record-block" }, [
103+
h("div", { className: "row" }, [
104+
h("div", { className: "col-sm-6 col-sm-offset-3" }, [
105+
h("div", { className: "headline-alligner" }, [
106+
h("div", { className: "center" }, [
107+
h("h1", {}, "Record your observations"),
108+
h("p", {}, "Rockd allows you to easily record your geological observations, using your location to provide spatially informed suggestions for nearby geologic units, time intervals, and fossils")
109+
])
110+
])
111+
]),
112+
113+
h("div", { className: "image-grid" }, [
114+
h("div", { className: "col-sm-6" }, [
115+
h("div", { className: "headline-alligner" }, [
116+
h("div", { className: "center" }, [
117+
h(Image, { src: "main-page/checkin.png", className: "record-block-img" }),
118+
h("p", { className: "record-img-caption" }, h("span", {}, "Take pictures of and rate features"))
119+
])
120+
])
121+
]),
122+
123+
h("div", { className: "col-sm-6" }, [
124+
h("div", { className: "headline-alligner" }, [
125+
h("div", { className: "center" }, [
126+
h(Image, { src: "main-page/strat-names.png", className: "record-block-img" }),
127+
h("p", { className: "record-img-caption" }, h("span", {}, "Tag stratigraphic names, even offline"))
128+
])
129+
])
130+
]),
131+
132+
h("div", { className: "col-sm-6" }, [
133+
h("div", { className: "headline-alligner" }, [
134+
h("div", { className: "center" }, [
135+
h(Image, { src: "main-page/strike-dip.png", className: "record-block-img" }),
136+
h("p", { className: "record-img-caption" }, h("span", {}, "Use your phone's compass to record strike and dip"))
137+
])
138+
])
139+
]),
140+
141+
h("div", { className: "col-sm-6" }, [
142+
h("div", { className: "headline-alligner" }, [
143+
h("div", { className: "center" }, [
144+
h(Image, { src: "main-page/taxa.png", className: "record-block-img" }),
145+
h("p", { className: "record-img-caption" }, [
146+
h("span", {}, "Search for and tag "),
147+
h("a", { href: "https://paleobiodb.org" }, "Paleobiology Database"),
148+
h("span", {}, " taxa.")
149+
])
150+
])
151+
])
152+
])
153+
]),
154+
])
155+
]),
156+
157+
158+
h(Footer)
159+
160+
]);
161+
}

‎pages/+Page.mdx‎

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

0 commit comments

Comments
 (0)