Merge pull request #108 from scottaames/fullscreen-menu-experimental (9b0d4465) · Commits · aflab / astrogeology / Asc Geostac

app/src/components/presentational/ConsoleCoordinates.jsx

+1 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,7 @@ import StyledTooltip from "./StyledTooltip.jsx";
		const useStyles = makeStyles({
		grid: {
		height: "100%",
		maxHeight: 60,
		paddingRight: 8
		maxHeight: 60
		},
		title: {
		color: "#343a40",

+13 −1

Original line number	Diff line number	Diff line
		@@ -53,6 +53,8 @@ export default function CreditsDisplay() {
		>
		<Grid item xs={2}>
		<Link
		target="_blank"
		rel="noopener"
		color="inherit"
		style={{ fontWeight: 600 }}
		variant="caption"
		@@ -64,6 +66,8 @@ export default function CreditsDisplay() {
		<Divider orientation="vertical" />
		<Grid item xs={2}>
		<Link
		target="_blank"
		rel="noopener"
		color="inherit"
		style={{ fontWeight: 600 }}
		variant="caption"
		@@ -77,6 +81,8 @@ export default function CreditsDisplay() {
		<Typography style={{ fontSize: 12 }} variant="caption">
		Made by{" "}
		<Link
		target="_blank"
		rel="noopener"
		variant="caption"
		color="inherit"
		style={{ fontWeight: 600 }}
		@@ -100,6 +106,8 @@ export default function CreditsDisplay() {
		<Divider orientation="vertical" />
		<Grid item xs={2}>
		<Link
		target="_blank"
		rel="noopener"
		color="inherit"
		variant="caption"
		style={{ fontWeight: 600 }}
		@@ -110,7 +118,11 @@ export default function CreditsDisplay() {
		</Grid>
		<Divider orientation="vertical" />
		<Grid item xs={2}>
		<Link href="https://github.com/CartoCosmos/CartoCosmos/app">
		<Link
		target="_blank"
		rel="noopener"
		href="https://github.com/CartoCosmos/CartoCosmos/"
		>
		<GitHubIcon
		style={{
		color: "#343a40",

+2 −2

Original line number	Diff line number	Diff line
		@@ -269,12 +269,12 @@ export default L.Map.AstroMap = L.Map.extend({
		},

		/**
		* @function AstroMap.prototype.getCenter
		* @function AstroMap.prototype.center
		* @description getter method to access the center of the map.
		*
		* @return {LatLng} The center coordinates of the map.
		*/
		getCenter: function() {
		center: function() {
		return this.options.center;
		}
		});

+8 −10

Original line number	Diff line number	Diff line
		@@ -39,13 +39,11 @@ export default L.Control.ViewCenter = L.Control.extend({
		let link = L.DomUtil.create("a", className, container);
		link.href = "#";
		link.title = "Center map";
		L.DomEvent.on(link, "click", L.DomEvent.stopPropagation)
		.on(link, "click", L.DomEvent.preventDefault)
		.on(
		L.DomEvent.on(
		link,
		"click",
		function() {
		map.setView(map.getCenter(), map.getZoom());
		map.setView(map.center(), map.getZoom());
		},
		map
		);

+22 −23

Original line number	Diff line number	Diff line
		@@ -9,64 +9,63 @@ module.exports = {
		new CleanWebpackPlugin(),
		new HtmlWebpackPlugin({
		template: "./src/index.html",
		filename: "./index.html"
		filename: "./index.html",
		}),
		new webpack.ProvidePlugin({
		L: "leaflet",
		Leaflet: "leaflet"
		Leaflet: "leaflet",
		}),
		new webpack.ProvidePlugin({
		$: "jquery"
		})
		$: "jquery",
		}),
		],
		watch: true,
		output: {
		filename: "bundle.js",
		path: path.resolve(__dirname, "dist")
		path: path.resolve(__dirname, "dist"),
		},
		module: {
		rules: [
		{
		test: /\.(js\|jsx)$/,
		use: {
		loader: "babel-loader"
		loader: "babel-loader",
		},
		exclude: /node_modules/
		exclude: /node_modules/,
		},
		{
		test: /\.html/,
		use: [
		{
		loader: "html-loader"
		}
		]
		loader: "html-loader",
		},
		],
		},
		{
		test: /\.css$/,
		use: [
		{
		loader: "style-loader"
		loader: "style-loader",
		},
		{
		loader: "css-loader",
		options: {
		importLoaders: 1
		}
		}
		]
		importLoaders: 1,
		},
		},
		],
		},
		{
		test: /\.png$/,
		use: [
		{
		loader: "url-loader"
		}
		]
		loader: "url-loader",
		},
		],
		},
		{
		test: /\.svg$/,
		use: ["@svgr/webpack"]
		}
		]
		}
		use: ["@svgr/webpack"],
		},
		],
		},
		};