Commit 39069bc8 authored by Andrew Hrdy's avatar Andrew Hrdy

Update dependencies

parent 264b27c9
......@@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2017 SRCT
Copyright 2020 SRCT
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
......
This diff is collapsed.
......@@ -4,70 +4,70 @@
"homepage": "./",
"private": true,
"dependencies": {
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
"@types/classnames": "^2.2.7",
"@types/history": "^4.7.2",
"@types/mapbox-gl": "^0.51.4",
"@types/material-ui": "^0.21.6",
"@types/memoize-one": "^4.1.0",
"@types/node": "^11.9.4",
"@material-ui/core": "^4.8.3",
"@material-ui/icons": "^4.5.1",
"@types/classnames": "^2.2.9",
"@types/history": "^4.7.4",
"@types/mapbox-gl": "^1.6.3",
"@types/material-ui": "^0.21.7",
"@types/memoize-one": "^5.1.2",
"@types/node": "^13.1.8",
"@types/phone-formatter": "0.0.2",
"@types/react": "^16.8.3",
"@types/react-dom": "^16.8.1",
"@types/react-redux": "^7.0.1",
"@types/react-router": "^4.4.4",
"@types/react-router-dom": "^4.3.1",
"classnames": "^2.2.5",
"connected-react-router": "^6.3.1",
"history": "^4.7.2",
"jss": "^9.8.7",
"mapbox-gl": "^0.53.0",
"memoize-one": "^5.0.0",
"@types/react": "^16.9.18",
"@types/react-dom": "^16.9.5",
"@types/react-redux": "^7.1.6",
"@types/react-router": "^5.1.4",
"@types/react-router-dom": "^5.1.3",
"classnames": "^2.2.6",
"connected-react-router": "^6.6.1",
"history": "^4.10.1",
"jss": "^10.0.3",
"mapbox-gl": "^1.6.1",
"memoize-one": "^5.1.1",
"phone-formatter": "^0.0.2",
"promise": "8.0.2",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-mapbox-gl": "^4.2.0",
"react-piwik": "^1.6.0",
"react-redux": "^6.0.0",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"redux": "^4.0.1",
"promise": "8.0.3",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-mapbox-gl": "^4.8.2",
"react-piwik": "^1.8.0",
"react-redux": "^7.1.3",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"redux": "4.0.4",
"redux-devtools-extension": "^2.13.8",
"redux-saga": "^1.0.1",
"typeface-roboto": "0.0.50"
"redux-saga": "^1.1.3",
"typeface-roboto": "0.0.75"
},
"devDependencies": {
"autoprefixer": "7.1.1",
"autoprefixer": "9.7.4",
"babel": "^6.23.0",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.4",
"babel-loader": "^8.0.6",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"clean-webpack-plugin": "^0.1.19",
"css-loader": "^0.28.4",
"file-loader": "^1.1.11",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^3.4.2",
"file-loader": "^5.0.2",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.4.0",
"node-sass": "^4.12.0",
"optimize-css-assets-webpack-plugin": "^4.0.2",
"postcss-loader": "2.0.6",
"sass-loader": "^7.0.2",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"postcss-loader": "3.0.0",
"sass-loader": "^8.0.2",
"source-map-loader": "^0.2.4",
"style-loader": "^0.18.2",
"sw-precache-webpack-plugin": "0.11.3",
"ts-loader": "^5.3.3",
"tslint": "^5.12.1",
"style-loader": "^1.1.3",
"sw-precache-webpack-plugin": "0.11.5",
"ts-loader": "^6.2.1",
"tslint": "^6.0.0",
"tslint-loader": "^3.5.4",
"tslint-react": "^3.6.0",
"typescript": "^3.3.3",
"uglifyjs-webpack-plugin": "^1.2.6",
"webpack": "^4.4.1",
"webpack-cli": "^2.1.5",
"webpack-dev-server": "^3.2.0"
"tslint-react": "^4.2.0",
"typescript": "^3.7.5",
"uglifyjs-webpack-plugin": "^2.2.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.10.1"
},
"proxy": "http://localhost:3001",
"scripts": {
......
......@@ -49,7 +49,7 @@ class CardContainer extends React.Component<CardContainerProps> {
const {facilities} = this.props;
return (
<Grid container={true} className={'card-container-root'} spacing={24} justify={'center'} alignItems={'flex-end'}>
<Grid container={true} className={'card-container-root'} spacing={3} justify={'center'} alignItems={'flex-end'}>
{facilities.filter(this.filterCards).map((item) => {
return (
<Grid key={item.slug} item={true}>
......
import * as ReactPiwik from 'react-piwik';
import { routerMiddleware } from 'connected-react-router';
import createHistory from 'history/createBrowserHistory';
import { createBrowserHistory } from 'history';
export const whatsOpenPiwik = new ReactPiwik({
url: 'matomo.srct.gmu.edu/',
......@@ -10,7 +10,7 @@ export const whatsOpenPiwik = new ReactPiwik({
trackDocumentTitle: true
});
export const whatsOpenPiwikHistory = whatsOpenPiwik.connectToHistory(createHistory());
export const whatsOpenPiwikHistory = whatsOpenPiwik.connectToHistory(createBrowserHistory());
export const whatsOpenPiwikMiddleware = () => routerMiddleware(whatsOpenPiwikHistory);
......
......@@ -58,7 +58,7 @@ export const generateStore = (): Store<ApplicationState, ApplicationAction> => {
viewedAlerts = [];
}
const store = createStore<ApplicationState, ApplicationAction, {}, {}>(rootReducer, {
const store = createStore<ApplicationState, ApplicationAction, {}, {}>(rootReducer, {
alerts: {
viewedAlerts: viewedAlerts,
alerts: []
......
......@@ -86,7 +86,6 @@
/* autoprefixer: off */
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
/* autoprefixer: on */
}
}
......
......@@ -93,51 +93,6 @@ const theme = createMuiTheme({
fontWeightLight: 300,
fontWeightRegular: 400,
fontWeightMedium: 500,
useNextVariants: true,
display4: {
fontSize: 112,
fontWeight: 300,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
letterSpacing: '-.04em',
lineHeight: 1,
color: 'rgba(0, 0, 0, 0.54)'
},
display3: {
fontSize: 56,
fontWeight: 400,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
letterSpacing: '-.02em',
lineHeight: 1.35,
color: 'rgba(0, 0, 0, 0.54)'
},
display2: {
fontSize: 45,
fontWeight: 400,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '48px',
color: 'rgba(0, 0, 0, 0.54)'
},
display1: {
fontSize: 34,
fontWeight: 400,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '40px',
color: 'rgba(0, 0, 0, 0.54)'
},
headline: {
fontSize: 24,
fontWeight: 400,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: '32px',
color: 'rgba(0, 0, 0, 0.87)'
},
title: {
fontSize: 21,
fontWeight: 500,
fontFamily: '"Roboto", "-apple-system", "Helvetica", "Arial", sans-serif',
lineHeight: 1,
color: 'rgba(0, 0, 0, 0.87)'
},
subtitle1: {
fontSize: 16,
fontWeight: 400,
......@@ -227,9 +182,7 @@ const theme = createMuiTheme({
'0px 11px 14px -7px rgba(0, 0, 0, 0.2),0px 23px 36px 3px rgba(0, 0, 0, 0.14),0px 9px 44px 8px rgba(0, 0, 0, 0.12)',
'0px 11px 15px -7px rgba(0, 0, 0, 0.2),0px 24px 38px 3px rgba(0, 0, 0, 0.14),0px 9px 46px 8px rgba(0, 0, 0, 0.12)'
],
spacing: {
unit: 8
},
spacing: 8,
zIndex: {
mobileStepper: 900,
appBar: 1100,
......
......@@ -113,4 +113,4 @@ const generateFacilitiesByLocation = (facilities: IFacility[]): FacilitiesByLoca
return locations;
};
export {addRoute, getGeoLine, getMaxBounds, getCenterOfCampusRegion, generateFacilitiesByLocation};
\ No newline at end of file
export { addRoute, getGeoLine, getMaxBounds, getCenterOfCampusRegion, generateFacilitiesByLocation };
\ No newline at end of file
......@@ -104,6 +104,7 @@
"prefer-object-spread": true,
"jsx-alignment": false,
"jsx-no-multiline-js": false,
"jsx-no-lambda": false
"jsx-no-lambda": false,
"jsx-wrap-multiline": false
}
}
Markdown is supported
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