Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make jotai and icons more global #4486

Merged
merged 3 commits into from
Sep 28, 2024
Merged

Make jotai and icons more global #4486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ad6458
Enable using jotai in AuthProvider
bilalabbad Sep 28, 2024
efe541a
Make icon global to the complete app
bilalabbad Sep 28, 2024
f39afaa
update jotai and iconify to latest version
bilalabbad Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 33 additions & 29 deletions frontend/app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions frontend/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@headlessui/react": "^1.7.18",
"@heroicons/react": "^2.1.3",
"@hookform/error-message": "^2.0.1",
"@iconify-icon/react": "^2.0.1",
"@iconify-json/mdi": "^1.1.64",
"@iconify-icon/react": "^2.1.0",
"@iconify-json/mdi": "^1.2.0",
"@popperjs/core": "^2.11.8",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-label": "^2.0.2",
Expand All @@ -64,7 +64,7 @@
"graphiql": "^3.1.2",
"graphql": "^16.8.1",
"handlebars": "^4.7.8",
"jotai": "^2.7.2",
"jotai": "^2.10.0",
"json-to-graphql-query": "^2.2.5",
"prismjs": "^1.29.0",
"query-string": "^9.0.0",
Expand Down
12 changes: 8 additions & 4 deletions frontend/app/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ import { AuthProvider } from "@/hooks/useAuth";
import { router } from "@/router";
import ErrorFallback from "@/screens/errors/error-fallback";
import { store } from "@/state";
import { addCollection } from "@iconify-icon/react";
import mdiIcons from "@iconify-json/mdi/icons.json";

import "./styles/index.css";
import "react-toastify/dist/ReactToastify.css";

addCollection(mdiIcons);

export function App() {
return (
<ErrorBoundary FallbackComponent={ErrorFallback}>
<AuthProvider>
<Provider store={store}>
<Provider store={store}>
<AuthProvider>
<ApolloProvider client={graphqlClient}>
<ToastContainer
hideProgressBar={true}
Expand All @@ -29,8 +33,8 @@ export function App() {
/>
<RouterProvider router={router} />
</ApolloProvider>
</Provider>
</AuthProvider>
</AuthProvider>
</Provider>
</ErrorBoundary>
);
}
5 changes: 0 additions & 5 deletions frontend/app/src/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ import { Config, configState } from "./state/atoms/config.atom";
import LoadingScreen from "@/screens/loading-screen/loading-screen";
import { fetchUrl } from "@/utils/fetch";

import { addCollection } from "@iconify-icon/react";
import mdiIcons from "@iconify-json/mdi/icons.json";

addCollection(mdiIcons);

export const Root = ({ children }: { children?: ReactNode }) => {
const setConfig = useSetAtom(configState);
const [isLoadingConfig, setIsLoadingConfig] = useState(true);
Expand Down
Loading