Skip to content

Commit

Permalink
Merge pull request #271 from MoTrPAC/265_JZ_Homepage_Refresh
Browse files Browse the repository at this point in the history
Connects to #265. Homepage redesign preliminary release with failed test.
  • Loading branch information
jimmyzhen authored Oct 20, 2023
2 parents 3c760dc + 5d3a01e commit b2c08b0
Show file tree
Hide file tree
Showing 22 changed files with 5,737 additions and 308 deletions.
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"redux": "^4.0.1",
"redux-thunk": "^2.3.0",
"tsparticles": "1.36.0",
"victory": "36.4.1"
"victory": "36.4.1",
"vis-network-react": "^1.3.6"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -77,5 +78,10 @@
},
"resolutions": {
"autoprefixer": "10.4.5"
},
"jest": {
"transformIgnorePatterns": [
"/node_modules/(?!(vis-network|vis-data))"
]
}
}
4 changes: 2 additions & 2 deletions src/App/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import configureStore from './configureStore';
import 'bootstrap';
import History from './history';
import NavbarConnected from '../Navbar/navbar';
import FooterConnected from '../Footer/footer';
import Footer from '../Footer/footer';
import LandingPageConnected from '../LandingPage/landingPage';
import LinkoutPage from '../LinkoutPage/linkoutPage';
import AnalysisHomePageConnected from '../AnalysisPage/analysisHomePage';
Expand Down Expand Up @@ -136,7 +136,7 @@ function App({ history = History }) {
</div>
</div>
</Router>
<FooterConnected />
<Footer />
</Provider>
);
}
Expand Down
Loading

0 comments on commit b2c08b0

Please sign in to comment.