Merge branch 'dev' of https://github.com/minskylab/plexo-platform

Author: bregydoc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plexo-platform",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "private": false,
   "scripts": {
     "generate": "graphql-codegen -c codegen.yml",

src/components/ui/Task/newSubtasks.tsx

@@ -31,7 +31,8 @@ const NewSubTasks = ({ subtasks, setSubtasks }: NewSubTasks) => {
   const [status, setStatus] = useState<TaskStatus>(TaskStatus.Backlog);
   const [lead, setLead] = useState<Member | null>(null);
 
-  const handleAddSubtask = () => {
+  const handleAddSubtask = (event: { preventDefault: () => void; }) => {
+    event.preventDefault();
     setSubtasks([
       ...subtasks,
       {
@@ -90,34 +91,37 @@ const NewSubTasks = ({ subtasks, setSubtasks }: NewSubTasks) => {
       <Text p={"xs"} size={"xs"}>
         Sub-tasks
       </Text>
-      <Group spacing={0} px={6} py={4}>
-        <StatusSelector status={status} setStatus={setStatus} type="icon" />
-        <LeadTaskSelector lead={lead} setLead={setLead} type="icon" />
+      <form onSubmit={handleAddSubtask}>
+        <Group spacing={0} px={6} py={4}>
+          <StatusSelector status={status} setStatus={setStatus} type="icon" />
+          <LeadTaskSelector lead={lead} setLead={setLead} type="icon" />
 
-        <TextInput
-          autoFocus
-          placeholder="Task Title"
-          variant="unstyled"
-          value={title}
-          onChange={e => setTitle(e.target.value)}
-          styles={{
-            root: {
-              flexGrow: 1,
-            },
-          }}
-        />
+          <TextInput
+            autoFocus
+            placeholder="Task Title"
+            variant="unstyled"
+            value={title}
+            onChange={e => setTitle(e.target.value)}
+            styles={{
+              root: {
+                flexGrow: 1,
+              },
+            }}
+          />
 
-        <Button
-          compact
-          disabled={title.length ? false : true}
-          variant="light"
-          color={"brand"}
-          leftIcon={<Plus size={16} />}
-          onClick={handleAddSubtask}
-        >
-          <Text size={"xs"}>Add subtask</Text>
-        </Button>
-      </Group>
+          <Button
+            compact
+            disabled={title.length ? false : true}
+            variant="light"
+            color={"brand"}
+            leftIcon={<Plus size={16} />}
+            type="submit"
+            
+          >
+            <Text size={"xs"}>Add subtask</Text>
+          </Button>
+        </Group>
+      </form>
       <Stack spacing={1}>{tasks.length ? tasks : null}</Stack>
     </Stack>
   );

src/context/PlexoContext.tsx

@@ -13,7 +13,6 @@ import { Label, Member, Project, Task, Team, User } from "lib/types";
 type PlexoProviderProps = {
   children: ReactNode;
   authCookie?: string;
-  authEmailURL?: string;
 };
 
 type PlexoContextProps = {
@@ -28,7 +27,6 @@ type PlexoContextProps = {
   createMoreTasks: boolean;
   setCreateMoreTasks: (createMoreTasks: boolean) => void;
   authCookie: string | undefined;
-  authEmailURL: string | undefined;
   setAuthCookie: (authCookie: string) => void;
   userData: User | undefined;
   isLoadingUser: boolean;
@@ -52,7 +50,7 @@ export const usePlexoContext = () => {
   return context;
 };
 
-const PlexoProvider = ({ authCookie, authEmailURL, children }: PlexoProviderProps) => {
+const PlexoProvider = ({ authCookie, children }: PlexoProviderProps) => {
   const [taskId, setTaskId] = useState<string | undefined>(undefined);
   const [tasks, setTasks] = useState<Task[] | undefined>(undefined);
 
@@ -129,7 +127,6 @@ const PlexoProvider = ({ authCookie, authEmailURL, children }: PlexoProviderProp
         setCreateMoreTasks,
         authCookie: authCookieState,
         setAuthCookie,
-        authEmailURL,
         taskId,
         setTaskId,
         tasks,

src/lib/auth.ts

@@ -1,14 +1,8 @@
-export const loginWithEmail = async ({
-  authEmailURL,
-  email,
-  password,
-}: {
-  authEmailURL: string | undefined;
-  email: string;
-  password: string;
-}) => {
+const loginURL = process.env.NEXT_PUBLIC_URL_EMAIL_AUTH || "/api/auth/email/login";
+
+export const loginWithEmail = async ({ email, password }: { email: string; password: string }) => {
   try {
-    const res = await fetch(authEmailURL || "/api/auth/email/login", {
+    const res = await fetch(loginURL, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",

src/lib/client.tsx

@@ -1,20 +1,19 @@
-import { devtoolsExchange } from "@urql/devtools";
+// import { devtoolsExchange } from "@urql/devtools";
 import {
   cacheExchange,
   CombinedError,
   createClient,
-  dedupExchange,
+  // dedupExchange,
   errorExchange,
   fetchExchange,
   subscriptionExchange,
 } from "urql";
 import { createClient as createWSClient } from "graphql-ws";
 
-export const URQLClient = ({ graphQLEndpoint }: { graphQLEndpoint?: string }) => {
+export const URQLClient = () => {
   // console.log("CREATING URQL CLIENT");
 
-  const GRAPHQL_ENDPOINT =
-    process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT || graphQLEndpoint || "/graphql";
+  const GRAPHQL_ENDPOINT = process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT || "/graphql";
 
   const WS_ENDPOINT = process.env.NEXT_PUBLIC_WS_ENDPOINT || "/graphql/ws";
 
@@ -34,7 +33,7 @@ export const URQLClient = ({ graphQLEndpoint }: { graphQLEndpoint?: string }) =>
       },
     },
     exchanges: [
-      devtoolsExchange,
+      // devtoolsExchange,
       // dedupExchange,
       cacheExchange,
       errorExchange({

src/pages/_app.tsx

@@ -1,7 +1,7 @@
 import { ColorScheme } from "@mantine/core";
 import type { AppProps } from "next/app";
 import { getCookie } from "cookies-next";
-import { ReactElement, ReactNode, useState } from "react";
+import { ReactElement, ReactNode } from "react";
 import { Provider as URQLProvider } from "urql";
 import { GetServerSidePropsContext, NextPage } from "next";
 import Head from "next/head";
@@ -24,14 +24,9 @@ type PlexoPlatformAppProps = {
   colorScheme: ColorScheme;
   viewMode: "list" | "grid";
   authCookie: string;
-  //
-  graphQLEndpoint: string | undefined;
-  authEmailURL: string | undefined;
 };
 
-const client = URQLClient({
-  graphQLEndpoint: process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT,
-});
+const client = URQLClient();
 
 const PlexoApp = ({
   Component,

src/pages/login/index.tsx

@@ -59,7 +59,6 @@ const LoginPage = () => {
     setAuthResponse(undefined);
 
     const response = await loginWithEmail({
-      authEmailURL: plexo.authEmailURL,
       email: values.email,
       password: values.password,
     });