@t2ca/gatsby-theme-showcase 1.0.18 → 1.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +7 -7
- package/src/components/layout.js +1 -63
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@t2ca/gatsby-theme-showcase",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.20",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"devDependencies": {
|
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
"@emotion/styled": "^10.0.17",
|
|
27
27
|
"@hot-loader/react-dom": "^16.9.0",
|
|
28
28
|
"@mdx-js/mdx": "^1.4.0",
|
|
29
|
-
"@theme-ui/components": "^0.3.0
|
|
30
|
-
"@theme-ui/preset-bootstrap": "^0.3.0
|
|
31
|
-
"@theme-ui/preset-tailwind": "^0.3.0
|
|
32
|
-
"@theme-ui/sidenav": "^0.3.0
|
|
33
|
-
"@theme-ui/typography": "^0.3.0
|
|
29
|
+
"@theme-ui/components": "^0.3.0",
|
|
30
|
+
"@theme-ui/preset-bootstrap": "^0.3.0",
|
|
31
|
+
"@theme-ui/preset-tailwind": "^0.3.0",
|
|
32
|
+
"@theme-ui/sidenav": "^0.3.0",
|
|
33
|
+
"@theme-ui/typography": "^0.3.0",
|
|
34
34
|
"deepmerge": "^4.0.0",
|
|
35
35
|
"gatsby": "^2.13.3",
|
|
36
36
|
"gatsby-image": "^2.2.7",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"react-spring": "^8.0.27",
|
|
50
50
|
"react-switch": "^5.0.0",
|
|
51
51
|
"remark-slug": "^5.1.2",
|
|
52
|
-
"theme-ui": "^0.3.0
|
|
52
|
+
"theme-ui": "^0.3.0"
|
|
53
53
|
},
|
|
54
54
|
"scripts": {
|
|
55
55
|
"build": "gatsby build",
|
package/src/components/layout.js
CHANGED
|
@@ -1,18 +1,8 @@
|
|
|
1
1
|
/** @jsx jsx */
|
|
2
2
|
import React, { useState, useRef } from "react"
|
|
3
|
-
import { jsx, Styled
|
|
3
|
+
import { jsx, Styled } from "theme-ui"
|
|
4
4
|
import { Global } from "@emotion/core"
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
withGoogleMap,
|
|
8
|
-
withScriptjs,
|
|
9
|
-
GoogleMap,
|
|
10
|
-
Marker,
|
|
11
|
-
} from "react-google-maps"
|
|
12
|
-
|
|
13
|
-
import jsonMapStyles from "./map-styles"
|
|
14
|
-
import jsonMapStylesDark from "./map-styles-dark"
|
|
15
|
-
|
|
16
6
|
import MobileNavigation from "./navigation-mobile"
|
|
17
7
|
import Header from "./header"
|
|
18
8
|
import Footer from "./footer"
|
|
@@ -22,42 +12,15 @@ const Layout = ({ header, main, location, children }) => {
|
|
|
22
12
|
const [menuOpen, setMenuOpen] = useState(false)
|
|
23
13
|
const nav = useRef(null)
|
|
24
14
|
|
|
25
|
-
const [colorMode] = useColorMode()
|
|
26
|
-
|
|
27
|
-
const Map = () => {
|
|
28
|
-
return (
|
|
29
|
-
<GoogleMap
|
|
30
|
-
defaultZoom={10}
|
|
31
|
-
defaultCenter={{ lat: 51.0486, lng: -114.0708 }}
|
|
32
|
-
defaultOptions={{
|
|
33
|
-
styles: colorMode === "light" ? jsonMapStyles : jsonMapStylesDark,
|
|
34
|
-
disableDefaultUI: true,
|
|
35
|
-
zoomControl: false,
|
|
36
|
-
scaleControl: false,
|
|
37
|
-
scrollwheel: false,
|
|
38
|
-
disableDoubleClickZoom: true,
|
|
39
|
-
}}
|
|
40
|
-
>
|
|
41
|
-
<Marker position={{ lat: 51.0486, lng: -114.0708 }} />
|
|
42
|
-
</GoogleMap>
|
|
43
|
-
)
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
const WrapperMap = withScriptjs(withGoogleMap(Map))
|
|
47
|
-
|
|
48
15
|
return (
|
|
49
16
|
<Styled.root>
|
|
50
17
|
<Global
|
|
51
18
|
styles={{
|
|
52
|
-
body: { margin: 0 },
|
|
53
19
|
html: {
|
|
54
20
|
fontSize: `16px`,
|
|
55
21
|
WebkitFontSmoothing: `antialiased`,
|
|
56
22
|
MozOsxFontSmoothing: `grayscale`,
|
|
57
23
|
},
|
|
58
|
-
".mapElement > div": {
|
|
59
|
-
backgroundColor: "transparent !important",
|
|
60
|
-
},
|
|
61
24
|
}}
|
|
62
25
|
/>
|
|
63
26
|
|
|
@@ -99,31 +62,6 @@ const Layout = ({ header, main, location, children }) => {
|
|
|
99
62
|
<Footer />
|
|
100
63
|
</div>
|
|
101
64
|
|
|
102
|
-
{/* {location && location.pathname === "/contact/" ? (
|
|
103
|
-
<div sx={{ display: ["none", "initial"] }}>
|
|
104
|
-
<WrapperMap
|
|
105
|
-
googleMapURL={`https://maps.googleapis.com/maps/api/js?v=3.exp&libraries=geometry,drawing,places&key=AIzaSyBOY0sT1quks122bprrLM_0wrWLDWyVnMQ`}
|
|
106
|
-
loadingElement={<div sx={{ height: `350px` }} />}
|
|
107
|
-
containerElement={
|
|
108
|
-
<div
|
|
109
|
-
sx={{
|
|
110
|
-
height: `350px`,
|
|
111
|
-
backgroundColor: colorMode === "light" ? "#f8f9fa" : "#333",
|
|
112
|
-
}}
|
|
113
|
-
/>
|
|
114
|
-
}
|
|
115
|
-
mapElement={
|
|
116
|
-
<div
|
|
117
|
-
sx={{
|
|
118
|
-
height: `100%`,
|
|
119
|
-
}}
|
|
120
|
-
className="mapElement"
|
|
121
|
-
/>
|
|
122
|
-
}
|
|
123
|
-
/>
|
|
124
|
-
</div>
|
|
125
|
-
) : null}*/}
|
|
126
|
-
|
|
127
65
|
<MobileNavigation />
|
|
128
66
|
</Styled.root>
|
|
129
67
|
)
|