Merge branch 'main' into 1-log-in-system

201flaviosilva · Apr 12, 2023 · 58db9e3 · 58db9e3
2 parents 6b263f5 + 1f30b3f
commit 58db9e3
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "redux": "^4.2.1"
   },
   "devDependencies": {
-    "@types/react": "^18.0.34",
+    "@types/react": "^18.0.35",
     "@types/react-dom": "^18.0.11",
     "@types/react-redux": "^7.1.25",
     "@typescript-eslint/eslint-plugin": "^5.58.0",

diff --git a/src/App.tsx b/src/App.tsx
@@ -2,9 +2,9 @@ import { Provider } from "react-redux";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
 import "./App.css";
 import { store } from "./app/store";
-import Account from "./Pages/Account";
-import Home from "./Pages/Home";
-import NotFound from "./Pages/NotFound";
+import Account from "./pages/Account";
+import Home from "./pages/Home";
+import NotFound from "./pages/NotFound";
 
 export default function App() {
   return (

diff --git a/src/app/store.ts b/src/app/store.ts
@@ -1,6 +1,6 @@
 import { configureStore } from "@reduxjs/toolkit";
 import usersReducer from "../actions/users";
-import counterReducer from "../Components/Counter/state";
+import counterReducer from "../components/Counter/state";
 
 export const store = configureStore({
   reducer: {

diff --git a/src/Components/Counter/index.tsx → src/components/Counter/index.tsx b/src/Components/Counter/index.tsx → src/components/Counter/index.tsx
diff --git a/src/Components/Counter/state.tsx → src/components/Counter/state.tsx b/src/Components/Counter/state.tsx → src/components/Counter/state.tsx
diff --git a/src/Pages/Account/Account.tsx → src/pages/Account/Account.tsx b/src/Pages/Account/Account.tsx → src/pages/Account/Account.tsx
diff --git a/src/Pages/Account/index.tsx → src/pages/Account/index.tsx b/src/Pages/Account/index.tsx → src/pages/Account/index.tsx
diff --git a/src/Pages/Home/index.tsx → src/pages/Home/index.tsx b/src/Pages/Home/index.tsx → src/pages/Home/index.tsx
@@ -1,4 +1,4 @@
-import Counter from "../../Components/Counter";
+import Counter from "../../components/Counter";
 
 export default function Home() {
 	return (

diff --git a/src/Pages/NotFound/index.tsx → src/pages/NotFound/index.tsx b/src/Pages/NotFound/index.tsx → src/pages/NotFound/index.tsx