From 419a270df9c925876f52f986f8597b174029cbba Mon Sep 17 00:00:00 2001 From: Matchu Date: Mon, 20 Jul 2020 21:32:42 -0700 Subject: [PATCH] upgrade to Chakra v1 it's a preview version, but it has a feature I want, so let's get ahead of the curve! --- package.json | 7 +- src/app/App.js | 7 +- src/app/HomePage.js | 6 +- src/app/Item.js | 9 +- src/app/ItemsAndSearchPanels.js | 8 +- src/app/ItemsPanel.js | 16 +- src/app/OutfitControls.js | 17 +- src/app/OutfitPreview.js | 5 +- src/app/PosePicker.js | 4 +- yarn.lock | 937 ++++++++++++++++++++++++-------- 10 files changed, 743 insertions(+), 273 deletions(-) diff --git a/package.json b/package.json index 64b180c..5dc93fa 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "dependencies": { "@apollo/react-hooks": "^3.1.5", "@apollographql/graphql-playground-html": "^1.6.24", - "@chakra-ui/core": "^0.7.0", - "@emotion/core": "^10.0.28", - "@emotion/styled": "^10.0.27", + "@chakra-ui/core": "^1.0.0-next.6", + "@chakra-ui/icons": "^1.0.0-next.6", + "@chakra-ui/theme": "^1.0.0-next.6", "@loadable/component": "^5.12.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", @@ -19,7 +19,6 @@ "apollo-server-env": "^2.4.3", "dataloader": "^2.0.0", "emotion": "^10.0.27", - "emotion-theming": "^10.0.27", "graphql": "^15.0.0", "immer": "^6.0.3", "mysql2": "^2.1.0", diff --git a/src/app/App.js b/src/app/App.js index e72534a..7aa22bf 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -1,6 +1,7 @@ import React from "react"; import { ApolloProvider } from "@apollo/react-hooks"; -import { CSSReset, ThemeProvider, theme } from "@chakra-ui/core"; +import { CSSReset, ChakraProvider } from "@chakra-ui/core"; +import theme from "@chakra-ui/theme"; import { BrowserRouter as Router, Switch, Route } from "react-router-dom"; import loadable from "@loadable/component"; @@ -19,7 +20,7 @@ function App() { return ( - + @@ -29,7 +30,7 @@ function App() { - + ); diff --git a/src/app/HomePage.js b/src/app/HomePage.js index 5000d36..727fa88 100644 --- a/src/app/HomePage.js +++ b/src/app/HomePage.js @@ -30,7 +30,7 @@ function HomePage() { alt="" width="200px" height="200px" - rounded="lg" + borderRadius="lg" boxShadow="md" /> @@ -94,7 +94,7 @@ function StartOutfitForm() {