Skip to content
Snippets Groups Projects
Commit 72180a35 authored by esikkala's avatar esikkala
Browse files

Tidy up

parent c97c3468
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 99 deletions
src/client/actions/index.js
+ 0
− 4
View file @ 72180a35
......@@ -226,7 +226,3 @@ export const animateMap = value => ({
type: ANIMATE_MAP,
value
})
// export const updateURL = ({ resultClass = 'manuscripts', newURL }) => ({
// type: UPDATE_URL,
// resultClass, newURL
// });
src/client/components/facet_results/LeafletMap.css 0 → 100644
+ 16
− 0
View file @ 72180a35
.leaflet-popup-content {
font-size: 14px;
font-family: 'Roboto', sans-serif;
}
.marker-cluster-grey {
background-color: rgba(128, 128, 128, 0.6);
}
.marker-cluster-small div {
background-color: rgba(211, 211, 211, 0.6);
}
.leaflet-popup-scrolled {
border: 0px;
}
\ No newline at end of file
src/client/components/facet_results/LeafletMap.js
+ 7
− 7
View file @ 72180a35
......@@ -5,8 +5,9 @@ import L from 'leaflet'
import { has, orderBy } from 'lodash'
import CircularProgress from '@material-ui/core/CircularProgress'
import { purple } from '@material-ui/core/colors'
import 'leaflet/dist/leaflet.css'
import { MAPBOX_ACCESS_TOKEN } from '../../configs/config'
import 'leaflet/dist/leaflet.css'
import './LeafletMap.css'
// Leaflet plugins
import 'leaflet-fullscreen/dist/fullscreen.png'
......@@ -30,11 +31,6 @@ import markerIconGreen from '../../img/markers/marker-icon-green.png'
import markerIconRed from '../../img/markers/marker-icon-red.png'
import markerIconOrange from '../../img/markers/marker-icon-orange.png'
const style = {
width: '100%',
height: '100%'
}
const styles = theme => ({
leafletContainerfacetResults: {
height: 400,
......@@ -50,6 +46,10 @@ const styles = theme => ({
},
position: 'relative'
},
mapElement: {
width: '100%',
height: '100%'
},
spinnerContainer: {
height: 40,
width: 40,
......@@ -439,7 +439,7 @@ class LeafletMap extends React.Component {
return (
<>
<div className={this.props.classes[`leafletContainer${this.props.pageType}`]}>
<div id='map' style={style} />
<div id='map' className={this.props.classes.mapElement} />
{this.props.fetching &&
<div className={this.props.classes.spinnerContainer}>
<CircularProgress style={{ color: purple[500] }} thickness={5} />
......
src/client/configs/config.js
+ 2
− 0
View file @ 72180a35
export const rootUrl = ''
export const defaultLocale = 'en'
export const publishedPort = 3006
export const MAPBOX_ACCESS_TOKEN = 'pk.eyJ1IjoiZWtrb25lbiIsImEiOiJjam5vampzZ28xd2dyM3BzNXR0Zzg4azl4In0.eozyF-bBaZbA3ibhvJlJpQ'
src/client/index.css 0 → 100644
+ 47
− 0
View file @ 72180a35
html {
height: 100%;
}
body {
height: 100%;
margin: 0;
min-width: 300px;
}
fieldset, .opacity-slider {
outline: 0 !important;
}
#root, #app {
height: 100%;
background-color: #bdbdbd;
}
a, a:visited, a:hover, a:active {
color: inherit;
}
.rstcustom__rowWrapper {
display: flex;
align-items: center;
}
.rstcustom__rowSearchMatch {
/*box-shadow: 0 2px 0 #673ab7 ;*/
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.ReactVirtualized__Grid {
outline: none;
}
.apexcharts-legend {
box-shadow: 0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12);
transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
}
.apexcharts-legend-marker {
top: 3px !important;
}
\ No newline at end of file
src/client/index.html
+ 14
− 67
View file @ 72180a35
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="The Mapping Manuscript Migrations project links datasets from Europe and U.S. to provide a global view of the history of medieval and Renaissance manuscripts." />
<meta name="robots" content="noindex">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<style>
html {
height: 100%;
}
body {
height: 100%;
margin: 0;
min-width: 300px;
}
fieldset, .opacity-slider {
outline: 0 !important;
}
#root, #app {
height: 100%;
background-color: #bdbdbd;
}
a, a:visited, a:hover, a:active {
color: inherit;
}
.leaflet-popup-content {
font-size: 14px;
font-family: 'Roboto', sans-serif;
}
.marker-cluster-grey {
background-color: rgba(128,128,128, 0.6);
}
.marker-cluster-small div {
background-color: rgba(211,211,211, 0.6);
}
.rstcustom__rowWrapper {
display: flex;
align-items: center;
}
.rstcustom__rowSearchMatch {
/*box-shadow: 0 2px 0 #673ab7 ;*/
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.leaflet-popup-scrolled {
border: 0px;
}
.ReactVirtualized__Grid {
outline: none;
}
.apexcharts-legend {
box-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),
0px 1px 1px 0px rgba(0,0,0,0.14),
0px 1px 3px 0px rgba(0,0,0,0.12);
transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
}
.apexcharts-legend-marker {
top: 3px !important;
}
</style>
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<div id="root"></div>
</body>
</html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="" />
<meta name="robots" content="noindex">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<title>Sampo Semantic Portal</title>
</head>
<body>
<div id="root"></div>
</body>
</html>
\ No newline at end of file
src/client/index.js
+ 3
− 12
View file @ 72180a35
......@@ -10,8 +10,9 @@ import reducer from './reducers'
import rootEpic from './epics'
import App from './components/App'
import { loadLocales } from './actions'
// import { updateURL } from './actions';
import { defaultLocale } from './configs/config'
import './index.css'
import 'react-sortable-tree/style.css'
import 'react-redux-toastr/lib/css/react-redux-toastr.min.css'
import 'mapbox-gl/dist/mapbox-gl.css'
......@@ -34,17 +35,7 @@ epicMiddleware.run(rootEpic)
bindActionCreators(toastrActions, store.dispatch)
// init locale
// const lang = localStorage.getItem('locale') || 'en';
const lang = 'en'
store.dispatch(loadLocales(lang))
// // update url on app load
// store.dispatch(updateURL({ newURL: window.location.pathname + window.location.search }));
//
// // update url on back/forward
// window.onpopstate = () => {
// store.dispatch(updateURL({ newURL: window.location.pathname + window.location.search }));
// };
store.dispatch(loadLocales(defaultLocale))
render(
<Provider store={store}>
......
webpack.client.common.js
+ 0
− 1
View file @ 72180a35
......@@ -12,7 +12,6 @@ module.exports = {
plugins: [
new CleanWebpackPlugin(['dist']),
new HtmlWebpackPlugin({
title: 'Sampo Semantic Portal',
// Load a custom template
template: 'src/client/index.html'
}),
......
webpack.client.dev.js
+ 4
− 4
View file @ 72180a35
const merge = require('webpack-merge');
const common = require('./webpack.client.common.js');
const merge = require('webpack-merge')
const common = require('./webpack.client.common.js')
module.exports = merge(common, {
mode: 'development',
......@@ -9,6 +9,6 @@ module.exports = merge(common, {
port: 8080,
open: true,
historyApiFallback: true,
publicPath: '/',
publicPath: '/'
}
});
})
webpack.client.prod.js
+ 4
− 4
View file @ 72180a35
const webpack = require('webpack');
const merge = require('webpack-merge');
const common = require('./webpack.client.common.js');
const webpack = require('webpack')
const merge = require('webpack-merge')
const common = require('./webpack.client.common.js')
module.exports = merge(common, {
mode: 'production',
......@@ -10,4 +10,4 @@ module.exports = merge(common, {
'process.env.NODE_ENV': JSON.stringify('production')
})
]
});
})
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment