cal.pub0.org/pages/settings/teams.tsx

import { GetServerSideProps } from "next";
import Head from "next/head";
import Shell from "../../components/Shell";
import SettingsShell from "../../components/Settings";
import { useEffect, useState } from "react";
import type { Session } from "next-auth";
import { getSession, useSession } from "next-auth/client";
import { UsersIcon } from "@heroicons/react/outline";
import TeamList from "../../components/team/TeamList";
import TeamListItem from "../../components/team/TeamListItem";
import Loader from "@components/Loader";

export default function Teams() {
  const [, loading] = useSession();
  const [teams, setTeams] = useState([]);
  const [invites, setInvites] = useState([]);
  const [showCreateTeamModal, setShowCreateTeamModal] = useState(false);

  const handleErrors = async (resp) => {
    if (!resp.ok) {
      const err = await resp.json();
      throw new Error(err.message);
    }
    return resp.json();
  };

  const loadData = () => {
    fetch("/api/user/membership")
      .then(handleErrors)
      .then((data) => {
        setTeams(data.membership.filter((m) => m.role !== "INVITEE"));
        setInvites(data.membership.filter((m) => m.role === "INVITEE"));
      })
      .catch(console.log);
  };

  useEffect(() => {
    loadData();
  }, []);

  if (loading) {
    return <Loader />;
  }

  const createTeam = (e) => {
    e.preventDefault();

    return fetch("/api/teams", {
      method: "POST",
      body: JSON.stringify({ name: e.target.elements["name"].value }),
      headers: {
        "Content-Type": "application/json",
      },
    }).then(() => {
      loadData();
      setShowCreateTeamModal(false);
    });
  };

  return (
    <Shell heading="Teams" subtitle="Create and manage teams to use collaborative features.">
      <Head>
        <title>Teams | Calendso</title>
        <link rel="icon" href="/favicon.ico" />
      </Head>
      <SettingsShell>
        <div className="divide-y divide-gray-200 lg:col-span-9">
          <div className="py-6 lg:pb-8">
            <div className="flex justify-between">
              <div>
                {!(invites.length || teams.length) && (
                  <div className="bg-gray-50 sm:rounded-sm">
                    <div className="px-4 py-5 sm:p-6">
                      <h3 className="text-lg leading-6 font-medium text-gray-900">
                        Create a team to get started
                      </h3>
                      <div className="mt-2 max-w-xl text-sm text-gray-500">
                        <p>Create your first team and invite other users to work together with you.</p>
                      </div>
                      <div className="mt-5">
                        <button
                          type="button"
                          onClick={() => setShowCreateTeamModal(true)}
                          className="btn btn-primary">
                          Create new team
                        </button>
                      </div>
                    </div>
                  </div>
                )}
              </div>
              {!!(invites.length || teams.length) && (
                <div>
                  <button className="btn-sm btn-primary mb-4" onClick={() => setShowCreateTeamModal(true)}>
                    Create new team
                  </button>
                </div>
              )}
            </div>
            <div>
              {!!teams.length && <TeamList teams={teams} onChange={loadData}></TeamList>}

              {!!invites.length && (
                <div>
                  <h2 className="text-lg leading-6 font-medium text-gray-900">Open Invitations</h2>
                  <ul className="border px-2 rounded mt-2 mb-2 divide-y divide-gray-200">
                    {invites.map((team) => (
                      <TeamListItem onChange={loadData} key={team.id} team={team}></TeamListItem>
                    ))}
                  </ul>
                </div>
              )}
            </div>
            {/*{teamsLoaded && <div className="flex justify-between">
              <div>
                <h2 className="text-lg leading-6 font-medium text-gray-900 mb-1">Transform account</h2>
                <p className="text-sm text-gray-500 mb-1">
                  {membership.length !== 0 && "You cannot convert this account into a team until you leave all teams that you’re a member of."}
                  {membership.length === 0 && "A user account can be turned into a team, as a team ...."}
                </p>
              </div>
              <div>
                <button className="mt-2 btn-sm btn-primary opacity-50 cursor-not-allowed" disabled>Convert {session.user.username} into a team</button>
              </div>
            </div>}*/}
          </div>
        </div>
        {showCreateTeamModal && (
          <div
            className="fixed z-50 inset-0 overflow-y-auto"
            aria-labelledby="modal-title"
            role="dialog"
            aria-modal="true">
            <div className="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
              <div
                className="fixed inset-0 bg-gray-500 z-0 bg-opacity-75 transition-opacity"
                aria-hidden="true"></div>

              <span className="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">
                &#8203;
              </span>

              <div className="inline-block align-bottom bg-white rounded-sm px-4 pt-5 pb-4 text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6">
                <div className="sm:flex sm:items-start mb-4">
                  <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-neutral-100 sm:mx-0 sm:h-10 sm:w-10">
                    <UsersIcon className="h-6 w-6 text-neutral-900" />
                  </div>
                  <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
                    <h3 className="text-lg leading-6 font-medium text-gray-900" id="modal-title">
                      Create a new team
                    </h3>
                    <div>
                      <p className="text-sm text-gray-400">Create a new team to collaborate with users.</p>
                    </div>
                  </div>
                </div>
                <form onSubmit={createTeam}>
                  <div className="mb-4">
                    <label htmlFor="name" className="block text-sm font-medium text-gray-700">
                      Name
                    </label>
                    <input
                      type="text"
                      name="name"
                      id="name"
                      placeholder="Acme Inc."
                      required
                      className="mt-1 block w-full border border-gray-300 rounded-sm shadow-sm py-2 px-3 focus:outline-none focus:ring-neutral-500 focus:border-neutral-500 sm:text-sm"
                    />
                  </div>
                  <div className="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
                    <button type="submit" className="btn btn-primary">
                      Create team
                    </button>
                    <button
                      onClick={() => setShowCreateTeamModal(false)}
                      type="button"
                      className="btn btn-white mr-2">
                      Cancel
                    </button>
                  </div>
                </form>
              </div>
            </div>
          </div>
        )}
      </SettingsShell>
    </Shell>
  );
}

// Export the `session` prop to use sessions with Server Side Rendering
export const getServerSideProps: GetServerSideProps<{ session: Session | null }> = async (context) => {
  const session = await getSession(context);
  if (!session) {
    return { redirect: { permanent: false, destination: "/auth/login" } };
  }

  return {
    props: { session },
  };
};
-												Update pages/settings/teams.tsx

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
											
										
										
											2021-07-02 10:32:11 +00:00
+								import { GetServerSideProps } from "next";
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								import Head from "next/head";
 								import Shell from "../../components/Shell";
 								import SettingsShell from "../../components/Settings";
 								import { useEffect, useState } from "react";
-												Update pages/settings/teams.tsx

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
											
										
										
											2021-07-02 10:31:59 +00:00
+								import type { Session } from "next-auth";
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								import { getSession, useSession } from "next-auth/client";
 								import { UsersIcon } from "@heroicons/react/outline";
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								import TeamList from "../../components/team/TeamList";
 								import TeamListItem from "../../components/team/TeamListItem";
-												replaced Loading... with Loader component

											
										
										
											2021-08-08 20:31:08 +00:00
+								import Loader from "@components/Loader";
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
-												update fetch to also handle errors

											
										
										
											2021-07-01 08:47:27 +00:00
+								export default function Teams() {
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								  const [, loading] = useSession();
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								  const [teams, setTeams] = useState([]);
 								  const [invites, setInvites] = useState([]);
 								  const [showCreateTeamModal, setShowCreateTeamModal] = useState(false);
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
-												update fetch to also handle errors

											
										
										
											2021-07-01 08:47:27 +00:00
+								  const handleErrors = async (resp) => {
 								    if (!resp.ok) {
 								      const err = await resp.json();
 								      throw new Error(err.message);
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								    }
-												update fetch to also handle errors

											
										
										
											2021-07-01 08:47:27 +00:00
+								    return resp.json();
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								  };
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
-												update fetch to also handle errors

											
										
										
											2021-07-01 08:47:27 +00:00
+								  const loadData = () => {
-												Update pages/settings/teams.tsx

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
											
										
										
											2021-07-01 09:30:10 +00:00
+								    fetch("/api/user/membership")
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								      .then(handleErrors)
 								      .then((data) => {
 								        setTeams(data.membership.filter((m) => m.role !== "INVITEE"));
 								        setInvites(data.membership.filter((m) => m.role === "INVITEE"));
 								      })
 								      .catch(console.log);
 								  };
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
-												fix api 500 and redirect to login if not authenticated when accessing /settings/team

											
										
										
											2021-06-30 13:48:34 +00:00
+								  useEffect(() => {
 								    loadData();
 								  }, []);
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
 								  if (loading) {
-												replaced Loading... with Loader component

											
										
										
											2021-08-08 20:31:08 +00:00
+								    return <Loader />;
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								  }
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								  const createTeam = (e) => {
 								    e.preventDefault();
-												update fetch to also handle errors

											
										
										
											2021-07-01 08:47:27 +00:00
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								    return fetch("/api/teams", {
 								      method: "POST",
 								      body: JSON.stringify({ name: e.target.elements["name"].value }),
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								      headers: {
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								        "Content-Type": "application/json",
 								      },
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								    }).then(() => {
-												fix api 500 and redirect to login if not authenticated when accessing /settings/team

											
										
										
											2021-06-30 13:48:34 +00:00
+								      loadData();
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								      setShowCreateTeamModal(false);
 								    });
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								  };
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								  return (
-												added bottom nav, replaced png with svg integration icons, added subtitle to shell component

											
										
										
											2021-08-02 14:10:24 +00:00
+								    <Shell heading="Teams" subtitle="Create and manage teams to use collaborative features.">
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								      <Head>
 								        <title>Teams | Calendso</title>
 								        <link rel="icon" href="/favicon.ico" />
 								      </Head>
 								      <SettingsShell>
 								        <div className="divide-y divide-gray-200 lg:col-span-9">
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								          <div className="py-6 lg:pb-8">
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								            <div className="flex justify-between">
 								              <div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                {!(invites.length || teams.length) && (
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								                  <div className="bg-gray-50 sm:rounded-sm">
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                    <div className="px-4 py-5 sm:p-6">
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                      <h3 className="text-lg leading-6 font-medium text-gray-900">
 								                        Create a team to get started
 								                      </h3>
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                      <div className="mt-2 max-w-xl text-sm text-gray-500">
 								                        <p>Create your first team and invite other users to work together with you.</p>
 								                      </div>
 								                      <div className="mt-5">
 								                        <button
 								                          type="button"
 								                          onClick={() => setShowCreateTeamModal(true)}
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                          className="btn btn-primary">
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                          Create new team
 								                        </button>
 								                      </div>
 								                    </div>
 								                  </div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                )}
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								              </div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								              {!!(invites.length || teams.length) && (
 								                <div>
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								                  <button className="btn-sm btn-primary mb-4" onClick={() => setShowCreateTeamModal(true)}>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    Create new team
 								                  </button>
 								                </div>
 								              )}
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								            </div>
 								            <div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								              {!!teams.length && <TeamList teams={teams} onChange={loadData}></TeamList>}
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								              {!!invites.length && (
 								                <div>
 								                  <h2 className="text-lg leading-6 font-medium text-gray-900">Open Invitations</h2>
 								                  <ul className="border px-2 rounded mt-2 mb-2 divide-y divide-gray-200">
 								                    {invites.map((team) => (
 								                      <TeamListItem onChange={loadData} key={team.id} team={team}></TeamListItem>
 								                    ))}
 								                  </ul>
 								                </div>
 								              )}
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								            </div>
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								            {/*{teamsLoaded && <div className="flex justify-between">
 								              <div>
 								                <h2 className="text-lg leading-6 font-medium text-gray-900 mb-1">Transform account</h2>
 								                <p className="text-sm text-gray-500 mb-1">
 								                  {membership.length !== 0 && "You cannot convert this account into a team until you leave all teams that you’re a member of."}
 								                  {membership.length === 0 && "A user account can be turned into a team, as a team ...."}
 								                </p>
 								              </div>
 								              <div>
 								                <button className="mt-2 btn-sm btn-primary opacity-50 cursor-not-allowed" disabled>Convert {session.user.username} into a team</button>
 								              </div>
 								            </div>}*/}
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								          </div>
 								        </div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								        {showCreateTeamModal && (
 								          <div
-												moved zIndex for modal to 50 from 10

											
										
										
											2021-08-03 11:19:32 +00:00
+								            className="fixed z-50 inset-0 overflow-y-auto"
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								            aria-labelledby="modal-title"
 								            role="dialog"
 								            aria-modal="true">
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								            <div className="flex items-end justify-center min-h-screen pt-4 px-4 pb-20 text-center sm:block sm:p-0">
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								              <div
-												changed zIndex of modal backfrop to 0

											
										
										
											2021-08-03 11:23:19 +00:00
+								                className="fixed inset-0 bg-gray-500 z-0 bg-opacity-75 transition-opacity"
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                aria-hidden="true"></div>
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								              <span className="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">
 								                &#8203;
 								              </span>
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								              <div className="inline-block align-bottom bg-white rounded-sm px-4 pt-5 pb-4 text-left shadow-xl transform transition-all sm:my-8 sm:align-middle sm:max-w-lg sm:w-full sm:p-6">
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                <div className="sm:flex sm:items-start mb-4">
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								                  <div className="mx-auto flex-shrink-0 flex items-center justify-center h-12 w-12 rounded-full bg-neutral-100 sm:mx-0 sm:h-10 sm:w-10">
 								                    <UsersIcon className="h-6 w-6 text-neutral-900" />
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                  </div>
 								                  <div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    <h3 className="text-lg leading-6 font-medium text-gray-900" id="modal-title">
 								                      Create a new team
 								                    </h3>
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                    <div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                      <p className="text-sm text-gray-400">Create a new team to collaborate with users.</p>
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                    </div>
 								                  </div>
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								                </div>
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                <form onSubmit={createTeam}>
 								                  <div className="mb-4">
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    <label htmlFor="name" className="block text-sm font-medium text-gray-700">
 								                      Name
 								                    </label>
 								                    <input
 								                      type="text"
 								                      name="name"
 								                      id="name"
 								                      placeholder="Acme Inc."
 								                      required
-												Initial restyling

											
										
										
											2021-07-30 23:05:38 +00:00
+								                      className="mt-1 block w-full border border-gray-300 rounded-sm shadow-sm py-2 px-3 focus:outline-none focus:ring-neutral-500 focus:border-neutral-500 sm:text-sm"
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    />
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                  </div>
 								                  <div className="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
 								                    <button type="submit" className="btn btn-primary">
 								                      Create team
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    </button>
 								                    <button
 								                      onClick={() => setShowCreateTeamModal(false)}
 								                      type="button"
 								                      className="btn btn-white mr-2">
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                      Cancel
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								                    </button>
-												Minor UI changes to teams

											
										
										
											2021-06-08 16:00:06 +00:00
+								                  </div>
 								                </form>
 								              </div>
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								            </div>
-												Implemented the API, split the teams page up into multiple components

											
										
										
											2021-06-05 22:53:33 +00:00
+								          </div>
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								        )}
-												Tracking work in progress changes

											
										
										
											2021-06-03 20:55:34 +00:00
+								      </SettingsShell>
 								    </Shell>
 								  );
-												fix api 500 and redirect to login if not authenticated when accessing /settings/team

											
										
										
											2021-06-30 13:48:34 +00:00
+								}
-												fix: ssr session on teams page

											
										
										
											2021-07-02 10:28:33 +00:00
 								// Export the `session` prop to use sessions with Server Side Rendering
-												Update pages/settings/teams.tsx

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
											
										
										
											2021-07-02 10:32:27 +00:00
+								export const getServerSideProps: GetServerSideProps<{ session: Session | null }> = async (context) => {
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								  const session = await getSession(context);
 								  if (!session) {
 								    return { redirect: { permanent: false, destination: "/auth/login" } };
 								  }
-												fix: ssr session on teams page

											
										
										
											2021-07-02 10:28:33 +00:00
-												Resolved conflicts

											
										
										
											2021-07-07 10:43:13 +00:00
+								  return {
 								    props: { session },
 								  };
 								};