diff --git a/.babelrc b/.babelrc index d216484..efb9368 100644 --- a/.babelrc +++ b/.babelrc @@ -1,4 +1,4 @@ { - "presets": ["env", "react"], + "presets": ["@babel/preset-env", "@babel/preset-react"], "plugins": ["babel-plugin-styled-components", "transform-object-rest-spread"] } diff --git a/.gitignore b/.gitignore index 9bd93ab..e149c26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,72 +1,94 @@ # Logs + logs -*.log -npm-debug.log* +_.log +npm-debug.log_ yarn-debug.log* yarn-error.log* # Runtime data + pids -*.pid -*.seed -*.pid.lock +_.pid +_.seed +\*.pid.lock # Directory for instrumented libs generated by jscoverage/JSCover + lib-cov # Coverage directory used by tools like istanbul + coverage # nyc test coverage + .nyc_output # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) + .grunt # Bower dependency directory (https://bower.io/) + bower_components # node-waf configuration + .lock-wscript # Compiled binary addons (https://nodejs.org/api/addons.html) + build/Release # Dependency directories + node_modules/ jspm_packages/ # TypeScript v1 declaration files + typings/ # Optional npm cache directory + .npm # Optional eslint cache + .eslintcache # Optional REPL history + .node_repl_history # Output of 'npm pack' -*.tgz + +\*.tgz # Yarn Integrity file + .yarn-integrity # dotenv environment variables file + .env # next.js build output + .next # local vscode settings + .vscode # built files + dist .cache +.parcel-cache # cypress videos & screenshots + cypress/videos -cypress/screenshots \ No newline at end of file +cypress/screenshots diff --git a/final/App.js b/final/App.js index 0477eee..3f7d981 100644 --- a/final/App.js +++ b/final/App.js @@ -9,9 +9,9 @@ import { import { setContext } from 'apollo-link-context'; // import global styles -import GlobalStyle from '/components/GlobalStyle'; +import GlobalStyle from './components/GlobalStyle'; // import our routes -import Pages from '/pages'; +import Pages from './pages'; // configure our API URI & cache const uri = process.env.API_URI; diff --git a/final/components/Header.js b/final/components/Header.js index 3736074..e22a450 100644 --- a/final/components/Header.js +++ b/final/components/Header.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import logo from '../img/logo.svg'; +import logo from 'url:../img/logo.svg'; import { useQuery } from '@apollo/client'; import { Link, withRouter } from 'react-router-dom'; diff --git a/final/index.html b/final/index.html index fffc25d..a8af151 100644 --- a/final/index.html +++ b/final/index.html @@ -3,12 +3,12 @@
- +