diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c20d607..3421d3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,3 +14,4 @@ jobs: steps: - uses: actions/checkout@v4 - run: yarn + - run: yarn build diff --git a/netlify.toml b/netlify.toml index f3b20c5..05b0264 100644 --- a/netlify.toml +++ b/netlify.toml @@ -14,7 +14,7 @@ ## (optional) Settings for Netlify Dev ## https://github.com/netlify/cli/blob/main/docs/netlify-dev.md#project-detection [dev] - command = "next start" # Command to start your dev server + command = "yarn start" # Command to start your dev server port = 3000 # Port that the dev server will be listening on # publish = "dist" # Folder with the static content for _redirect file publish = ".next" diff --git a/src/Components/submitProposal/theproposal/index.tsx b/src/Components/submitProposal/theproposal/index.tsx index 6118002..d59cf14 100644 --- a/src/Components/submitProposal/theproposal/index.tsx +++ b/src/Components/submitProposal/theproposal/index.tsx @@ -6,7 +6,7 @@ import { useContext, useState } from "react"; import { useRouter } from "next/navigation"; import { useProposalContext } from "@/Context/submitPropolsal"; import ProposalName from "../ProposalName"; -import TextEditorDropdown from "@/Components/TextEditor/TextEditorDropdown"; +// import TextEditorDropdown from "@/Components/TextEditor/TextEditorDropdown"; type Props = { className?: string; @@ -72,11 +72,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */} {/*

@@ -105,11 +105,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

2. Problem Statement

@@ -120,11 +120,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

3. The Solution

@@ -137,11 +137,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

@@ -158,11 +158,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

b. Who does this solution help?

@@ -172,11 +172,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

4. Why Kusama

@@ -186,11 +186,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */}

@@ -199,11 +199,11 @@ const SubmitProposalContext: React.FC = (props) => {

- + /> */} {/* Button Row - take one level up */} diff --git a/src/Context/submitPropolsal.tsx b/src/Context/submitPropolsal.tsx index bc235ff..32f06b4 100644 --- a/src/Context/submitPropolsal.tsx +++ b/src/Context/submitPropolsal.tsx @@ -102,7 +102,7 @@ export type submitContext = { changeMilestones: (milestone: any) => void; }; -const defaultState = { +const defaultState: submitContext = { proposalStep: undefined, proposalIndex: null, setProposalIndex: (index: number) => { @@ -144,6 +144,7 @@ const defaultState = { changeMilestones: (milestone: any) => { return; }, + changeProposalContext: () => {} }; type Props = { diff --git a/src/app/page.tsx b/src/app/page.tsx index ae8f4d2..874a113 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,14 +1,14 @@ "use client"; -import { useEffect } from "react"; - -import LogIn from "@/Components/Login/"; +// import LogIn from "@/Components/Login/"; +import dynamic from "next/dynamic"; +const LogIn = dynamic(() => import('@/Components/Login'), {ssr: false}) export default function Home() { return (
- +
); } diff --git a/src/app/signup/chooseprofile/2/page.tsx b/src/app/signup/chooseprofile/2/page.tsx index 68694af..f00ee66 100644 --- a/src/app/signup/chooseprofile/2/page.tsx +++ b/src/app/signup/chooseprofile/2/page.tsx @@ -8,9 +8,12 @@ import { useProfileContext } from "@/Context/ProfileStore"; import { useChainApiContext } from "@/Context/ChainApiStore"; import { usePhalaContractContext } from "@/Context/PhalaContractApiStore"; import { useEffect, useState } from "react"; -import ConnectWallet from "@/Components/ConnectWallet"; +// import ConnectWallet from "@/Components/ConnectWallet"; import { onSignCertificate } from "@/lib/PhalaContract/Utils/phalaCertificate"; import { useWalletContext } from "@/Context/WalletStore"; +import dynamic from "next/dynamic"; + +const ConnectWallet = dynamic(() => import('@/Components/ConnectWallet'), {ssr: false}) const ChooseProfileStep2 = () => { //Context diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx index 371fd73..5ee49c4 100644 --- a/src/app/signup/page.tsx +++ b/src/app/signup/page.tsx @@ -3,7 +3,10 @@ import Link from "next/link"; import Image from "next/image"; import OrdumLogoLight from "@/assets/svg-icons/ordum-logo-light.svg"; -import ConnectWallet from "@/Components/ConnectWallet"; +import dynamic from "next/dynamic"; +// import ConnectWallet from "@/Components/ConnectWallet"; + +const ConnectWallet = dynamic(() => import('@/Components/ConnectWallet'), {ssr: false}) const SignUp = () => { // const { user } = useSelector((state: RootState) => state.user); diff --git a/src/app/submitproposal/review/page.tsx b/src/app/submitproposal/review/page.tsx index 69b9ecb..fc9dbf9 100644 --- a/src/app/submitproposal/review/page.tsx +++ b/src/app/submitproposal/review/page.tsx @@ -3,7 +3,10 @@ import Layout from "@/Components/ui/Layout"; import SubmitPropolsalPreview from "@/Components/submitProposal/review"; import SubmitPropolsalSidePanel from "@/Components/submitProposal/sidePanel"; -import Review from "@/Components/Review"; +// import Review from "@/Components/Review"; +import dynamic from "next/dynamic"; + +const Review = dynamic(() => import('@/Components/Review'), {ssr:false}) const submitProposalPreview = () => { diff --git a/src/app/submitproposal/theproposal/page.tsx b/src/app/submitproposal/theproposal/page.tsx index 25130b0..e13a8b1 100644 --- a/src/app/submitproposal/theproposal/page.tsx +++ b/src/app/submitproposal/theproposal/page.tsx @@ -2,9 +2,12 @@ import Layout from "@/Components/ui/Layout"; import SubmitPropolsalSidePanel from "@/Components/submitProposal/sidePanel"; -import Editor from "@/Components/OrdumTextEditor/src/ProposalEditor"; +// import Editor from "@/Components/OrdumTextEditor/src/ProposalEditor"; import SubmitProposalContext from "@/Components/submitProposal/theproposal"; import SubmitProposalTextEditor from "@/Components/submitProposal/SubmitProposalTextEditor/page"; +import dynamic from "next/dynamic"; + +const Editor = dynamic(() => import('@/Components/OrdumTextEditor/src/ProposalEditor'), {ssr: false}) const SubmitProposal: React.FC = () => { return ( diff --git a/src/app/texteditor/page.tsx b/src/app/texteditor/page.tsx index b6ac169..0123dd7 100644 --- a/src/app/texteditor/page.tsx +++ b/src/app/texteditor/page.tsx @@ -5,10 +5,13 @@ // import Editor from "@/Components/LexicalTextEditor/Editor"; // import Editor from "@/Components/OrdumTextEditor/Editor"; // import Editor from "@/Components/TestEditor/packages/lexical-playground/src/Editor"; -import Editor from "@/Components/OrdumTextEditor/src/app" -import Viewer from "@/Components/OrdumTextEditor/src/Viewer" +// import Editor from "@/Components/OrdumTextEditor/src/app" +// import Viewer from "@/Components/OrdumTextEditor/src/Viewer" +import dynamic from "next/dynamic"; import { useState } from "react"; +const Viewer = dynamic(() => import('@/Components/OrdumTextEditor/src/Viewer'), {ssr: false}) + const TextEditor: React.FC = () => { const [text, setText] = useState(""); const [description, setDescription] = useState(text); diff --git a/tsconfig.json b/tsconfig.json index 4efe431..0e22e7b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,7 @@ "incremental": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "NodeNext", + "moduleResolution": "node", "resolveJsonModule": true, "isolatedModules": true, "jsx": "preserve",