diff --git a/package.json b/package.json index ba94ffe..4c7a324 100644 --- a/package.json +++ b/package.json @@ -3,37 +3,37 @@ "version": "0.1.0", "private": true, "dependencies": { - "@apollo/client": "^3.6.9", - "@babel/plugin-proposal-decorators": "^7.16.7", - "@fortawesome/fontawesome-svg-core": "^6.1.1", - "@fortawesome/free-brands-svg-icons": "^6.1.2", - "@fortawesome/free-solid-svg-icons": "^6.1.1", - "@fortawesome/react-fontawesome": "^0.1.18", - "@mdx-js/loader": "^1.6.22", - "@testing-library/jest-dom": "^5.11.4", - "@testing-library/user-event": "^12.1.10", + "@apollo/client": "^3.7.2", + "@babel/plugin-proposal-decorators": "^7.20.5", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", + "@fortawesome/react-fontawesome": "^0.2.0", + "@mdx-js/loader": "^2.1.5", + "@testing-library/jest-dom": "^5.16.5", + "@testing-library/user-event": "^14.4.3", "apollo-link-error": "^1.1.13", - "axios": "^0.27.2", - "bootstrap": "^5.0.1", - "date-fns": "^2.29.1", + "axios": "^1.2.1", + "bootstrap": "^5.2.3", + "date-fns": "^2.29.3", "dotenv": "^16.0.3", "eslint-plugin-import": "^2.26.0", - "eslint-plugin-markdown": "^2.2.1", + "eslint-plugin-markdown": "^3.0.0", "eslint-plugin-react-hooks": "^4.3.0", "graphql": "^16.6.0", - "react": "^17.0.2", - "react-bootstrap": "^1.6.1", - "react-dom": "^17.0.2", - "react-icons": "^4.2.0", - "react-router": "^5.2.0", - "react-router-bootstrap": "^0.25.0", - "react-router-dom": "^5.3.3", - "react-scripts": "4.0.3", + "react": "^18.2.0", + "react-bootstrap": "^2.6.0", + "react-dom": "^18.2.0", + "react-icons": "^4.7.1", + "react-router": "^6.4.4", + "react-router-bootstrap": "^0.26.2", + "react-router-dom": "^6.4.4", + "react-scripts": "5.0.1", "react-switch": "^7.0.0", "react-user-profile": "^1.0.3", "smooth-scroll": "^16.1.3", - "styled-components": "^5.3.5", - "web-vitals": "^1.0.1" + "styled-components": "^5.3.6", + "web-vitals": "^3.1.0" }, "scripts": { "start": "react-scripts start", @@ -57,24 +57,24 @@ ] }, "devDependencies": { - "@babel/core": "^7.16.7", - "@babel/eslint-parser": "^7.16.5", + "@babel/core": "^7.20.5", + "@babel/eslint-parser": "^7.19.1", "@babel/preset-react": "^7.16.7", - "@testing-library/react": "^11.2.7", - "autoprefixer": "^9.8.6", - "eslint": "^7.32.0", + "@testing-library/react": "^13.4.0", + "autoprefixer": "^10.4.13", + "eslint": "^8.29.0", "eslint-config": "^0.3.0", "eslint-config-airbnb": "^19.0.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-jest": "^24.3.6", - "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-jest": "^27.1.6", + "eslint-plugin-jsx-a11y": "^6.6.1", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-react": "^7.28.0", + "eslint-plugin-react": "^7.31.11", "jest-dom": "^4.0.0", - "postcss": "^7.0.39", + "postcss": "^8.4.19", "postcss-flexbugs-fixes": "^5.0.2", - "postcss-preset-env": "^7.7.2", - "prettier": "^2.5.1", - "react-test-renderer": "^17.0.2" + "postcss-preset-env": "^7.8.3", + "prettier": "^2.8.0", + "react-test-renderer": "^18.2.0" } } diff --git a/src/App.js b/src/App.js index 53ff16d..1924712 100644 --- a/src/App.js +++ b/src/App.js @@ -7,23 +7,20 @@ import { React } from 'react'; // Libraries -import ReactDOM from 'react-dom'; -import { BrowserRouter as Router, Switch, Route, Redirect, useHistory } from 'react-router-dom'; -import { ApolloClient, InMemoryCache, ApolloProvider, HttpLink, from } from '@apollo/client'; -import { format } from 'date-fns'; +import { ApolloClient, ApolloProvider, from, HttpLink, InMemoryCache } from '@apollo/client'; import { onError } from '@apollo/client/link/error'; +import { Route, Routes } from 'react-router-dom'; // import * as dotenv from 'dotenv'; // Styles -import './index.css'; import 'bootstrap/dist/css/bootstrap.min.css'; +import './index.css'; // Components +import { AddJournal, Auth, Footer, JournalDetails, Layout, Login } from './components'; import Profile from './components/Authentication/User-Profile/useprofile'; -import { Journal, Manifesto, Home } from './pages'; -import { Footer, Auth, Header, Login, JournalDetails, AddJournal, Layout } from './components'; -import Navbar from './components/marginals/Navbar/Navbar'; import Edit from './components/EditJournal/Edit'; +import { Home, Journal } from './pages'; // Context import { DataProvider } from './context/DataContext'; @@ -53,33 +50,16 @@ function App() { - - - - - - - - - - - - - - - - - - - - - - - - - - - + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> +