Skip to content

Commit

Permalink
fix: Move DndProvider because of react-dnd/react-dnd#763
Browse files Browse the repository at this point in the history
  • Loading branch information
kore committed Aug 17, 2022
1 parent baa87f0 commit 65bcd66
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 58 deletions.
6 changes: 4 additions & 2 deletions pages/_app.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { DndProvider } from "react-dnd";
import { HTML5Backend } from "react-dnd-html5-backend";
import "../styles/globals.css";

function MyApp({ Component, pageProps }) {
return (
<>
<DndProvider backend={HTML5Backend}>
<Component {...pageProps} />
</>
</DndProvider>
);
}

Expand Down
108 changes: 52 additions & 56 deletions pages/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { useState, useEffect } from "react";
import dynamic from "next/dynamic";
import Link from "next/link";
import { DndProvider } from "react-dnd";
import { HTML5Backend } from "react-dnd-html5-backend";
import ArrowIcon from "../components/ArrowIcon";
import Column from "../components/Column";
import Footer from "../components/Footer";
Expand Down Expand Up @@ -74,61 +72,59 @@ export default function Index({}) {

return (
<Layout>
<DndProvider backend={HTML5Backend}>
<SEO title={globalData.name} description={globalData.blogTitle} />
<Header
name={globalData.name}
modules={modules}
setModules={setModules}
moveModule={moveModule}
settings={settings}
setSettings={setSettings}
/>
<main className="w-full">
<ul
className={`${gridClassName} mb-6 grid w-full grid-cols-1 gap-6 pt-6`}
>
{[...Array(+(settings.columns ?? 3)).keys()].map((column) => {
return (
<Column
key={column + 1}
column={column}
moveModule={moveModule}
>
<ul>
{(modules[column] ?? []).map((module, index) => {
const ModuleComponent =
availableModules[module.type] ??
availableModules["notfound"];
<SEO title={globalData.name} description={globalData.blogTitle} />
<Header
name={globalData.name}
modules={modules}
setModules={setModules}
moveModule={moveModule}
settings={settings}
setSettings={setSettings}
/>
<main className="w-full">
<ul
className={`${gridClassName} mb-6 grid w-full grid-cols-1 gap-6 pt-6`}
>
{[...Array(+(settings.columns ?? 3)).keys()].map((column) => {
return (
<Column
key={column + 1}
column={column}
moveModule={moveModule}
>
<ul>
{(modules[column] ?? []).map((module, index) => {
const ModuleComponent =
availableModules[module.type] ??
availableModules["notfound"];

return (
<Module
key={module.id}
id={module.id}
column={column}
index={index}
moveModule={moveModule}
>
<ModuleComponent configuration={module} />
</Module>
);
})}
</ul>
</Column>
);
})}
</ul>
</main>
<Footer copyrightText={globalData.footerText} />
<GradientBackground
variant="large"
className="fixed top-20 opacity-40 dark:opacity-60"
/>
<GradientBackground
variant="small"
className="absolute bottom-0 opacity-20 dark:opacity-10"
/>
</DndProvider>
return (
<Module
key={module.id}
id={module.id}
column={column}
index={index}
moveModule={moveModule}
>
<ModuleComponent configuration={module} />
</Module>
);
})}
</ul>
</Column>
);
})}
</ul>
</main>
<Footer copyrightText={globalData.footerText} />
<GradientBackground
variant="large"
className="fixed top-20 opacity-40 dark:opacity-60"
/>
<GradientBackground
variant="small"
className="absolute bottom-0 opacity-20 dark:opacity-10"
/>
</Layout>
);
}
Expand Down

0 comments on commit 65bcd66

Please sign in to comment.