Feat/editor as preview (#294)

* try editor as preview * add databinding for editor actions and message * add actions, reordering base interactions * add drag and drop ordering for categoriers * category skeleton * fix linting issues * add role list and add button, non-functional * bump packages * add role search prototype * yarn.lock sync * fix lint * remove cfw-emulator bin
2025-04-24 19:39:11 +00:00 · 2021-07-08 16:51:00 -05:00 · 2021-07-08 16:51:00 -05:00 · ab3f718e6d
commit ab3f718e6d
parent 7d681d69d6
43 changed files with 1157 additions and 741 deletions
--- a/package.json
+++ b/package.json
@ -36,12 +36,12 @@
    "test": "jest"
  },
  "devDependencies": {
-    "@types/enzyme": "^3.10.8",
-    "@types/lodash": "^4.14.170",
+    "@types/enzyme": "^3.10.9",
+    "@types/lodash": "^4.14.171",
    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.2",
    "enzyme": "^3.11.0",
    "enzyme-adapter-react-16": "^1.15.6",
-    "husky": "^6.0.0",
+    "husky": "^7.0.1",
    "is-ci": "^3.0.0",
    "jest": "26.6.0",
    "jest-enzyme": "^7.1.2",
@ -59,7 +59,7 @@
    "stylelint-config-styled-components": "^0.1.1",
    "stylelint-prettier": "^1.2.0",
    "ts-jest": "^26.0.0",
-    "typescript": "^4.3.4"
+    "typescript": "^4.3.5"
  },
  "resolutions": {
    "webpack": "4.44.2"
--- a/packages/api/index.ts
+++ b/packages/api/index.ts
@ -8,6 +8,7 @@ import { LoginBounce } from './handlers/login-bounce';
 import { LoginCallback } from './handlers/login-callback';
 import { RevokeSession } from './handlers/revoke-session';
 import { SyncFromLegacy } from './handlers/sync-from-legacy';
+import { UpdateGuild } from './handlers/update-guild';
 import { UpdateRoles } from './handlers/update-roles';
 import { Router } from './router';
 import { respond } from './utils/api-tools';
@ -28,6 +29,7 @@ router.add('POST', 'revoke-session', RevokeSession);
 router.add('GET', 'get-slug', GetSlug);
 router.add('GET', 'get-picker-data', GetPickerData);
 router.add('PATCH', 'update-roles', UpdateRoles);
+router.add('PATCH', 'update-guild', UpdateGuild);
 router.add('POST', 'sync-from-legacy', SyncFromLegacy);
 router.add('POST', 'clear-guild-cache', ClearGuildCache);

--- a/packages/backend-emulator/package.json
+++ b/packages/backend-emulator/package.json
@ -1,9 +1,6 @@
 {
  "name": "@roleypoly/worker-emulator",
  "version": "0.1.0",
-  "bin": {
-    "cfw-emulator": "./main.js"
-  },
  "scripts": {
    "build": "node main.js --build",
    "start": "node main.js"
--- a/packages/design-system/atoms/breakpoints/BreakpointText.tsx
+++ b/packages/design-system/atoms/breakpoints/BreakpointText.tsx
@ -0,0 +1,26 @@
+import styled, { css } from 'styled-components';
+import { onSmallScreen } from './Breakpoints';
+
+const ShowOnSmall = styled.span`
+  display: none;
+  ${onSmallScreen(css`
+    display: initial;
+  `)}
+`;
+
+const ShowOnLarge = styled.span`
+  display: initial;
+  ${onSmallScreen(css`
+    display: none;
+  `)}
+`;
+
+export const BreakpointText = (props: { small: string; large: string }) => {
+  const { small, large } = props;
+  return (
+    <>
+      <ShowOnSmall>{small}</ShowOnSmall>
+      <ShowOnLarge>{large}</ShowOnLarge>
+    </>
+  );
+};
--- a/packages/design-system/atoms/breakpoints/index.ts
+++ b/packages/design-system/atoms/breakpoints/index.ts
@ -1,3 +1,4 @@
 export * from './BreakpointProvider';
 export * from './Breakpoints';
+export * from './BreakpointText';
 export * from './Context';
--- a/packages/design-system/atoms/button/Button.styled.ts
+++ b/packages/design-system/atoms/button/Button.styled.ts
@ -67,6 +67,13 @@ const colors = {
      background-color: ${palette.taupe200};
    }
  `,
+  silent: css`
+    background: none;
+    border-color: transparent;
+    :hover {
+      background-color: ${palette.taupe200};
+    }
+  `,
 };

 const sizes = {
--- a/packages/design-system/atoms/text-input/TextInput.tsx
+++ b/packages/design-system/atoms/text-input/TextInput.tsx
@ -94,18 +94,27 @@ const StyledTextarea = styled.textarea`
 export const MultilineTextInput = (
  props: TextInputProps<HTMLTextAreaElement> & { rows?: number }
 ) => {
-  const { ...rest } = props;
+  const { children, ...rest } = props;
  const [value, setValue] = React.useState(String(props.value));
-  const rows = Math.min(10, Math.max(props.rows || 2, value.split(/\r?\n/).length));
+  const rows = React.useMemo(
+    () => Math.min(10, Math.max(props.rows || 2, value.split(/\r?\n/).length)),
+    [value]
+  );
+
+  React.useEffect(() => {
+    setValue(String(props.value));
+  }, [props.value]);
+
  return (
    <StyledTextarea
      {...rest}
      rows={rows}
-      value={value}
      onChange={(eventData) => {
        setValue(eventData.target.value);
        props.onChange?.(eventData);
      }}
-    />
+    >
+      {value}
+    </StyledTextarea>
  );
 };
--- a/packages/design-system/atoms/toggle/Toggle.styled.tsx
+++ b/packages/design-system/atoms/toggle/Toggle.styled.tsx
@ -20,9 +20,9 @@ export const ToggleState = styled.div`
 export const ToggleSwitch = styled.div<{ state: boolean }>`
  display: inline-block;
  background-color: ${(props) => (props.state ? palette.green200 : 'rgba(0,0,0,0.45)')};
-  height: 1.3em;
-  width: 2.6em;
-  border-radius: 1.3em;
+  height: 1.375rem;
+  width: 2.675rem;
+  border-radius: 1.375rem;
  position: relative;
  border: 1px solid rgba(0, 0, 0, 0.1);
  top: 0.23em;
--- a/packages/design-system/molecules/editable-server-message/EditableServerMessage.stories.tsx
+++ b/packages/design-system/molecules/editable-server-message/EditableServerMessage.stories.tsx
@ -0,0 +1,26 @@
+import * as React from 'react';
+import { mastheadSlugs } from '../../fixtures/storyData';
+import { EditableServerMessage } from './EditableServerMessage';
+export default {
+  title: 'Molecules/Editable Server Message',
+  component: EditableServerMessage,
+  args: {
+    value: 'Hello World',
+    guild: mastheadSlugs[1],
+  },
+};
+
+export const editableServerMessage = (args) => {
+  const [value, setValue] = React.useState(args.value);
+  React.useEffect(() => {
+    setValue(args.value);
+  }, [args.value]);
+
+  return (
+    <EditableServerMessage
+      {...args}
+      value={value}
+      onChange={(message) => setValue(message)}
+    />
+  );
+};
--- a/packages/design-system/molecules/editable-server-message/EditableServerMessage.tsx
+++ b/packages/design-system/molecules/editable-server-message/EditableServerMessage.tsx
@ -0,0 +1,37 @@
+import { palette } from '@roleypoly/design-system/atoms/colors';
+import { FaderOpacity } from '@roleypoly/design-system/atoms/fader';
+import { MultilineTextInput } from '@roleypoly/design-system/atoms/text-input';
+import {
+  AmbientLarge,
+  Text as TextTypo,
+} from '@roleypoly/design-system/atoms/typography';
+import { MessageBox } from '@roleypoly/design-system/organisms/role-picker/RolePicker.styled';
+import { GuildSlug } from '@roleypoly/types';
+import { GoEyeClosed } from 'react-icons/go';
+
+type Props = {
+  guild: GuildSlug;
+  onChange: (newMessage: string) => void;
+  value: string;
+};
+
+export const EditableServerMessage = (props: Props) => (
+  <MessageBox>
+    <TextTypo>Server Message</TextTypo>
+    <MultilineTextInput
+      rows={2}
+      value={props.value}
+      onChange={(event) => props.onChange(event.target.value)}
+      placeholder={`Hey friend from ${props.guild.name}! Pick your roles!`}
+    >
+      {props.value}
+    </MultilineTextInput>
+    <AmbientLarge style={{ display: 'flex', color: palette.taupe600 }}>
+      Shows a message to your server members.
+      <FaderOpacity isVisible={props.value.trim().length === 0}>
+        &nbsp;Since the message is empty, this won't show up.&nbsp;&nbsp;&nbsp;
+        <GoEyeClosed style={{ position: 'relative', top: 2 }} />
+      </FaderOpacity>
+    </AmbientLarge>
+  </MessageBox>
+);
--- a/packages/design-system/molecules/editable-server-message/index.ts
+++ b/packages/design-system/molecules/editable-server-message/index.ts
@ -0,0 +1 @@
+export * from './EditableServerMessage';
--- a/packages/design-system/molecules/editor-category-short/EditorCategoryShort.spec.tsx
+++ b/packages/design-system/molecules/editor-category-short/EditorCategoryShort.spec.tsx
@ -1,12 +0,0 @@
-import { mockCategory } from '@roleypoly/design-system/fixtures/storyData';
-import { render } from '@testing-library/react';
-import { EditorCategoryShort } from './EditorCategoryShort';
-
-it('triggers onOpen when clicked', async () => {
-  const onOpen = jest.fn();
-  const view = render(<EditorCategoryShort category={mockCategory} onOpen={onOpen} />);
-
-  view.getByRole('menuitem')?.click();
-
-  expect(onOpen).toHaveBeenCalled();
-});
--- a/packages/design-system/molecules/editor-category-short/EditorCategoryShort.stories.tsx
+++ b/packages/design-system/molecules/editor-category-short/EditorCategoryShort.stories.tsx
@ -1,30 +0,0 @@
-import { mockCategory } from '@roleypoly/design-system/fixtures/storyData';
-import ReactTooltip from 'react-tooltip';
-import styled from 'styled-components';
-import { EditorCategoryShort } from './EditorCategoryShort';
-
-const decorator = (story) => (
-  <Wrapper>
-    {story()}
-    <ReactTooltip />
-  </Wrapper>
-);
-
-export default {
-  title: 'Molecules/Short Category',
-  component: EditorCategoryShort,
-  args: {
-    category: mockCategory,
-  },
-  decorators: [decorator],
-};
-
-const Wrapper = styled.div`
-  box-shadow: 0 0 10px #000;
-`;
-
-export const shortEditor = (args) => <EditorCategoryShort {...args} />;
-export const shortEditorHidden = (args) => <EditorCategoryShort {...args} />;
-shortEditorHidden.args = {
-  category: { ...mockCategory, hidden: true },
-};
--- a/packages/design-system/molecules/editor-category-short/EditorCategoryShort.styled.ts
+++ b/packages/design-system/molecules/editor-category-short/EditorCategoryShort.styled.ts
@ -1,60 +0,0 @@
-import { transitions } from '@roleypoly/design-system/atoms/timings';
-import styled from 'styled-components';
-
-export const GrabberBox = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 1em;
-  flex: 0;
-  cursor: grab;
-  position: relative;
-
-  ::before {
-    content: '';
-    position: absolute;
-    top: -5px;
-    left: -8px;
-    width: 32px;
-    height: 32px;
-    background-color: rgba(0, 0, 0, 0.25);
-    opacity: 0;
-    border-radius: 50%;
-    transition: opacity ${transitions.actionable}s ease-in-out;
-  }
-
-  &:hover {
-    ::before {
-      opacity: 1;
-    }
-  }
-`;
-
-export const Opener = styled.div`
-  opacity: 0;
-  transition: opacity ${transitions.actionable}s ease-in-out;
-`;
-
-export const Container = styled.div`
-  display: flex;
-  padding: 1em;
-  cursor: pointer;
-
-  &:hover {
-    ${Opener} {
-      opacity: 1;
-    }
-  }
-`;
-
-export const Name = styled.div`
-  position: relative;
-  top: -2px;
-  margin-right: 1em;
-`;
-
-export const Flags = styled.div``;
-
-export const Void = styled.div`
-  flex: 1;
-`;
--- a/packages/design-system/molecules/editor-category-short/EditorCategoryShort.tsx
+++ b/packages/design-system/molecules/editor-category-short/EditorCategoryShort.tsx
@ -1,31 +0,0 @@
-import { Category } from '@roleypoly/types';
-import { DragEventHandler, MouseEventHandler } from 'react';
-import { GoEyeClosed, GoGrabber, GoKebabHorizontal } from 'react-icons/go';
-import {
-  Container,
-  Flags,
-  GrabberBox,
-  Name,
-  Opener,
-  Void,
-} from './EditorCategoryShort.styled';
-
-type ShortProps = {
-  category: Category;
-  onDrag?: DragEventHandler;
-  onOpen?: MouseEventHandler;
-};
-
-export const EditorCategoryShort = (props: ShortProps) => (
-  <Container onClick={props.onOpen} role="menuitem">
-    <GrabberBox onDrag={props.onDrag} role="button">
-      <GoGrabber />
-    </GrabberBox>
-    <Name>{props.category.name}</Name>
-    <Flags>{props.category.hidden && <GoEyeClosed data-tip="Hidden to Members" />}</Flags>
-    <Void />
-    <Opener role="button">
-      <GoKebabHorizontal />
-    </Opener>
-  </Container>
-);
--- a/packages/design-system/molecules/editor-category-short/index.ts
+++ b/packages/design-system/molecules/editor-category-short/index.ts
@ -1 +0,0 @@
-export * from './EditorCategoryShort';
--- a/packages/design-system/molecules/editor-category/EditorCategory.stories.tsx
+++ b/packages/design-system/molecules/editor-category/EditorCategory.stories.tsx
@ -1,19 +1,30 @@
 import * as React from 'react';
-import { mockCategory, roleCategory, roleCategory2 } from '../../fixtures/storyData';
+import { mockCategory, roleCategory } from '../../fixtures/storyData';
 import { EditorCategory } from './EditorCategory';

 export default {
-  title: 'Molecules/Editor/Category',
+  title: 'Molecules/Editor Category',
+  component: EditorCategory,
+  args: {
+    title: 'Pronouns',
+    roles: roleCategory,
+    category: mockCategory,
+    selectedRoles: [],
+  },
 };

-export const CategoryEditor = () => {
-  const [categoryData, setCategoryData] = React.useState(mockCategory);
-  return (
-    <EditorCategory
-      category={categoryData}
-      onChange={(category) => setCategoryData(category)}
-      uncategorizedRoles={roleCategory}
-      guildRoles={[...roleCategory, ...roleCategory2]}
-    />
-  );
+export const Default = (args) => {
+  return <EditorCategory {...args} />;
+};
+export const Single = (args) => {
+  return <EditorCategory {...args} type="single" />;
+};
+Single.args = {
+  type: 'single',
+};
+export const Multi = (args) => {
+  return <EditorCategory {...args} type="single" />;
+};
+Multi.args = {
+  type: 'multi',
 };
--- a/packages/design-system/molecules/editor-category/EditorCategory.styled.ts
+++ b/packages/design-system/molecules/editor-category/EditorCategory.styled.ts
@ -1,13 +1,78 @@
-import styled from 'styled-components';
+import { onSmallScreen } from '@roleypoly/design-system/atoms/breakpoints';
+import { palette } from '@roleypoly/design-system/atoms/colors';
+import { transitions } from '@roleypoly/design-system/atoms/timings';
+import styled, { css } from 'styled-components';
+
+export const Head = styled.div`
+  margin: 7px 5px;
+  line-height: 200%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+`;
+
+export const HeadTitle = styled.div`
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+`;
+
+export const HeadSub = styled.div`
+  flex-shrink: 0;
+  margin-top: -4px;
+`;
+
+export const Box = styled.div`
+  display: flex;
+  align-items: top;
+  justify-content: space-between;
+  flex-wrap: wrap;
+`;
+
+export const Section = styled.div<{ big?: boolean }>`
+  padding: 7px 5px;
+  flex: 1 2 ${(props) => (props.big ? '100%' : '50%')};
+  ${onSmallScreen(css`
+    flex-basis: 100%;
+  `)}
+`;

 export const RoleContainer = styled.div`
  display: flex;
-  margin: 10px;
  flex-wrap: wrap;
-
  & > div {
-    /* This should be a Role element */
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    margin: 1px;
+    margin: 2.5px;
  }
 `;
+
+export const AddRoleButton = styled.div<{ long?: boolean }>`
+  border: 2px solid ${palette.taupe500};
+  color: ${palette.taupe500};
+  border-radius: 24px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all ${transitions.actionable}s ease-in-out;
+
+  &:hover {
+    background-color: ${palette.taupe100};
+    transform: translateY(-2px);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+  }
+
+  &:active {
+    transform: translateY(0);
+    box-shadow: none;
+  }
+
+  ${(props) =>
+    props.long
+      ? css`
+          padding: 0 14px;
+        `
+      : css`
+          width: 32px;
+        `};
+`;
--- a/packages/design-system/molecules/editor-category/EditorCategory.tsx
+++ b/packages/design-system/molecules/editor-category/EditorCategory.tsx
@ -1,142 +1,159 @@
-import { FaderOpacity } from '@roleypoly/design-system/atoms/fader';
 import { Popover } from '@roleypoly/design-system/atoms/popover';
 import { Role } from '@roleypoly/design-system/atoms/role';
-import { Space } from '@roleypoly/design-system/atoms/space';
-import { TextInput, TextInputWithIcon } from '@roleypoly/design-system/atoms/text-input';
+import { TextInput } from '@roleypoly/design-system/atoms/text-input';
 import { Toggle } from '@roleypoly/design-system/atoms/toggle';
 import { Text } from '@roleypoly/design-system/atoms/typography';
 import { RoleSearch } from '@roleypoly/design-system/molecules/role-search';
-import { Category, CategoryType, Role as RoleType } from '@roleypoly/types';
+import { Category as CategoryT, CategoryType, Role as RoleT } from '@roleypoly/types';
+import { sortBy, uniq } from 'lodash';
 import * as React from 'react';
-import { GoSearch } from 'react-icons/go';
-import { RoleContainer } from './EditorCategory.styled';
+import { GoPlus } from 'react-icons/go';
+import ReactTooltip from 'react-tooltip';
+import { AddRoleButton, Box, RoleContainer, Section } from './EditorCategory.styled';

-type Props = {
-  category: Category;
-  uncategorizedRoles: RoleType[];
-  guildRoles: RoleType[];
-  onChange: (category: Category) => void;
+export type CategoryProps = {
+  title: string;
+  roles: RoleT[];
+  category: CategoryT;
+  unselectedRoles: RoleT[];
+  onChange: (updatedCategory: CategoryT) => void;
 };

-const typeEnumToSwitch = (typeData: CategoryType) => {
-  if (typeData === CategoryType.Single) {
-    return 'Single';
-  } else {
-    return 'Multiple';
-  }
-};
+export const EditorCategory = (props: CategoryProps) => {
+  const [searchOpen, setSearchOpen] = React.useState(false);

-const switchToTypeEnum = (typeData: 'Single' | 'Multiple') => {
-  if (typeData === 'Single') {
-    return CategoryType.Single;
-  } else {
-    return CategoryType.Multi;
-  }
-};
-
-export const EditorCategory = (props: Props) => {
-  const [roleSearchPopoverActive, setRoleSearchPopoverActive] = React.useState(false);
-  const [roleSearchTerm, updateSearchTerm] = React.useState('');
-
-  const onUpdate =
-    (key: keyof typeof props.category, pred?: (newValue: any) => any) =>
-    (newValue: any) => {
-      props.onChange({
-        ...props.category,
-        [key]: pred ? pred(newValue) : newValue,
-      });
-    };
-
-  const handleRoleSelect = (role: RoleType) => {
-    setRoleSearchPopoverActive(false);
-    updateSearchTerm('');
-    props.onChange({
-      ...props.category,
-      roles: [...props.category.roles, role.id],
-    });
+  const updateValue = <T extends keyof CategoryT>(key: T, value: CategoryT[T]) => {
+    props.onChange({ ...props.category, [key]: value });
  };

-  const handleRoleDeselect = (role: RoleType) => () => {
-    props.onChange({
-      ...props.category,
-      roles: props.category.roles.filter((x) => x !== role.id),
-    });
+  const handleRoleDelete = (role: RoleT) => () => {
+    const updatedRoles = props.category.roles.filter((r) => r !== role.id);
+    updateValue('roles', updatedRoles);
+  };
+
+  const handleRoleAdd = (role: RoleT) => {
+    const updatedRoles = uniq([...props.category.roles, role.id]);
+    updateValue('roles', updatedRoles);
+    setSearchOpen(false);
+  };
+
+  const handleSearchOpen = () => {
+    setSearchOpen(true);
  };

  return (
-    <div>
-      <Text>Category Name</Text>
-      <TextInput
-        placeholder="Pronouns, Political, Colors..."
-        value={props.category.name}
-        onChange={onUpdate('name', (x) => x.target.value)}
-      />
-
-      <Space />
-
-      <div>
-        <Toggle
-          state={props.category.type === CategoryType.Multi}
-          onChange={onUpdate('type', (x) =>
-            x ? CategoryType.Multi : CategoryType.Single
-          )}
-        >
-          Allow users to pick multiple roles
-        </Toggle>
-      </div>
-
-      <Space />
-      <div>
-        <Toggle state={props.category.hidden} onChange={onUpdate('hidden')}>
-          Hide category from users
-        </Toggle>
-      </div>
-
-      <Space />
-      <Text>Roles</Text>
-      <Popover
-        position={'top left'}
-        headContent={null}
-        active={roleSearchPopoverActive}
-        onExit={() => setRoleSearchPopoverActive(false)}
-      >
-        {() => (
-          <RoleSearch
-            placeholder={'Type or drag a role...'}
-            roles={props.uncategorizedRoles}
-            onSelect={handleRoleSelect}
-            searchTerm={roleSearchTerm}
-            onSearchUpdate={(newTerm) => updateSearchTerm(newTerm)}
-          />
-        )}
-      </Popover>
-      <FaderOpacity isVisible={!roleSearchPopoverActive}>
-        <TextInputWithIcon
-          icon={<GoSearch />}
-          placeholder={'Type or drag a role...'}
-          onFocus={() => setRoleSearchPopoverActive(true)}
-          value={roleSearchTerm}
-          onChange={(x) => updateSearchTerm(x.target.value)}
+    <Box>
+      <Section>
+        <div>
+          <Text>Category Name</Text>
+        </div>
+        <TextInput
+          value={props.category.name}
+          onChange={(event) => updateValue('name', event.target.value)}
        />
-        <RoleContainer>
-          {props.category.roles.map((id) => {
-            const role = props.guildRoles.find((x) => x.id === id);
-            if (!role) {
-              return <></>;
-            }
+      </Section>

-            return (
-              <Role
-                role={role}
-                selected={false}
-                key={id}
-                type="delete"
-                onClick={handleRoleDeselect(role)}
-              />
-            );
-          })}
+      <Section>
+        <div>
+          <Text>Options</Text>
+        </div>
+        <div>
+          <Toggle
+            state={props.category.hidden}
+            onChange={(value) => updateValue('hidden', value)}
+          >
+            Show this category to members
+          </Toggle>
+          <Toggle
+            state={props.category.type === CategoryType.Multi}
+            onChange={(value) =>
+              updateValue('type', value ? CategoryType.Multi : CategoryType.Single)
+            }
+          >
+            Let members pick more than one role
+          </Toggle>
+        </div>
+      </Section>
+
+      <Section big>
+        <div>
+          <Text>Roles</Text>
+        </div>
+        <RoleContainer>
+          {props.roles.length > 0 ? (
+            <>
+              {sortBy(props.roles, 'position').map((role) => (
+                <Role
+                  key={role.id}
+                  role={role}
+                  selected={false}
+                  type="delete"
+                  onClick={handleRoleDelete(role)}
+                />
+              ))}
+              <RoleAddButton onClick={handleSearchOpen} tooltipId={props.category.id} />
+            </>
+          ) : (
+            <RoleAddButton
+              long
+              onClick={handleSearchOpen}
+              tooltipId={props.category.id}
+            />
+          )}
+          <RoleSearchPopover
+            isOpen={searchOpen}
+            onExit={() => setSearchOpen(false)}
+            unselectedRoles={props.unselectedRoles}
+            onSelect={handleRoleAdd}
+          />
        </RoleContainer>
-      </FaderOpacity>
-    </div>
+      </Section>
+
+      <ReactTooltip id={props.category.id} />
+    </Box>
+  );
+};
+
+const RoleAddButton = (props: {
+  onClick: () => void;
+  tooltipId: string;
+  long?: boolean;
+}) => (
+  <AddRoleButton
+    data-tip="Add a role to the category"
+    data-for={props.tooltipId}
+    onClick={props.onClick}
+    long={props.long}
+  >
+    {props.long && <>Add a role&nbsp;&nbsp;</>}
+    <GoPlus />
+  </AddRoleButton>
+);
+
+const RoleSearchPopover = (props: {
+  onSelect: (role: RoleT) => void;
+  onExit: (type: string) => void;
+  isOpen: boolean;
+  unselectedRoles: RoleT[];
+}) => {
+  const [searchTerm, setSearchTerm] = React.useState('');
+
+  return (
+    <Popover
+      position="top left"
+      active={props.isOpen}
+      canDefocus
+      onExit={props.onExit}
+      headContent={null}
+    >
+      {() => (
+        <RoleSearch
+          onSelect={props.onSelect}
+          roles={props.unselectedRoles}
+          searchTerm={searchTerm}
+          onSearchUpdate={setSearchTerm}
+        />
+      )}
+    </Popover>
  );
 };
--- a/packages/design-system/molecules/editor-category/index.ts
+++ b/packages/design-system/molecules/editor-category/index.ts
@ -1 +1 @@
-export * from './EditorCategory';
+export { EditorCategory } from './EditorCategory';
--- a/packages/design-system/organisms/app-shell/AppShell.styled.tsx
+++ b/packages/design-system/organisms/app-shell/AppShell.styled.tsx
@ -2,9 +2,9 @@ import { palette } from '@roleypoly/design-system/atoms/colors';
 import { fontCSS } from '@roleypoly/design-system/atoms/fonts';
 import styled, { createGlobalStyle } from 'styled-components';

-export const Content = styled.div<{ small?: boolean }>`
+export const Content = styled.div<{ small?: boolean; double?: boolean }>`
  margin: 0 auto;
-  margin-top: 50px;
+  margin-top: ${(props) => (props.double ? '100px' : '50px')};
  width: ${(props) => (props.small ? '960px' : '1024px')};
  max-width: 98vw;
  max-height: calc(100vh - 50px);
--- a/packages/design-system/organisms/app-shell/AppShell.tsx
+++ b/packages/design-system/organisms/app-shell/AppShell.tsx
@ -11,6 +11,7 @@ export type AppShellProps = {
  user?: DiscordUser;
  showFooter?: boolean;
  small?: boolean;
+  double?: boolean;
  activeGuildId?: string | null;
  guilds?: GuildSlug[];
  recentGuilds?: string[];
@ -56,7 +57,9 @@ export const AppShell = (props: AppShellProps) => (
    )}
    <OptionallyScroll shouldScroll={!props.skeleton}>
      <>
-        <Content small={props.small}>{props.children}</Content>
+        <Content small={props.small} double={props.double}>
+          {props.children}
+        </Content>
        {props.showFooter && <Footer />}
      </>
    </OptionallyScroll>
--- a/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.stories.tsx
+++ b/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.stories.tsx
@ -1,12 +0,0 @@
-import { guildEnum } from '@roleypoly/design-system/fixtures/storyData';
-import { EditorCategoriesTab } from './EditorCategoriesTab';
-
-export default {
-  title: 'Organisms/Editor/Categories Tab',
-  component: EditorCategoriesTab,
-  args: {
-    guild: guildEnum.guilds[0],
-  },
-};
-
-export const categoriesTab = (args) => <EditorCategoriesTab {...args} />;
--- a/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.styled.ts
+++ b/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.styled.ts
@ -1,8 +0,0 @@
-import { palette } from '@roleypoly/design-system/atoms/colors';
-import styled from 'styled-components';
-
-export const CategoryContainer = styled.div`
-  background-color: ${palette.taupe100};
-  padding: 10px;
-  margin: 15px 0;
-`;
--- a/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.tsx
+++ b/packages/design-system/organisms/editor-categories-tab/EditorCategoriesTab.tsx
@ -1,39 +0,0 @@
-import { TabDepth } from '@roleypoly/design-system/atoms/tab-view/TabView.styled';
-import { EditorCategory } from '@roleypoly/design-system/molecules/editor-category';
-import { EditorCategoryShort } from '@roleypoly/design-system/molecules/editor-category-short/EditorCategoryShort';
-import { EditorShellProps } from '@roleypoly/design-system/organisms/editor-shell';
-import { Category } from '@roleypoly/types';
-import { sortBy } from 'lodash';
-import * as React from 'react';
-import { CategoryContainer } from './EditorCategoriesTab.styled';
-
-export const EditorCategoriesTab = (props: EditorShellProps) => {
-  const [openStates, setOpenStates] = React.useState<Category['id'][]>([]);
-
-  const onCategoryOpen = (id: Category['id']) => () => {
-    setOpenStates([...new Set(openStates).add(id)]);
-  };
-
-  return (
-    <TabDepth>
-      {sortBy(props.guild.data.categories, ['position', 'id']).map((category, idx) =>
-        openStates.includes(category.id) ? (
-          <CategoryContainer key={idx}>
-            <EditorCategory
-              category={category}
-              uncategorizedRoles={[]}
-              guildRoles={props.guild.roles}
-              onChange={(category) => props.onCategoryChange?.(category)}
-            />
-          </CategoryContainer>
-        ) : (
-          <EditorCategoryShort
-            key={idx}
-            category={category}
-            onOpen={onCategoryOpen(category.id)}
-          />
-        )
-      )}
-    </TabDepth>
-  );
-};
--- a/packages/design-system/organisms/editor-categories-tab/index.ts
+++ b/packages/design-system/organisms/editor-categories-tab/index.ts
@ -1 +0,0 @@
-export * from './EditorCategoriesTab';
--- a/packages/design-system/organisms/editor-details-tab/EditorDetailsTab.tsx
+++ b/packages/design-system/organisms/editor-details-tab/EditorDetailsTab.tsx
@ -1,20 +0,0 @@
-import { Space } from '@roleypoly/design-system/atoms/space';
-import { TabDepth } from '@roleypoly/design-system/atoms/tab-view/TabView.styled';
-import { MultilineTextInput } from '@roleypoly/design-system/atoms/text-input';
-import { Text } from '@roleypoly/design-system/atoms/typography';
-import { EditorShellProps } from '@roleypoly/design-system/organisms/editor-shell';
-import * as React from 'react';
-
-export const EditorDetailsTab = (props: EditorShellProps) => {
-  return (
-    <TabDepth>
-      <Space />
-      <Text>Server Message</Text>
-      <MultilineTextInput
-        value={props.guild.data.message}
-        onChange={(eventData) => props.onMessageChange?.(eventData.target.value)}
-      />
-      <Space />
-    </TabDepth>
-  );
-};
--- a/packages/design-system/organisms/editor-details-tab/index.ts
+++ b/packages/design-system/organisms/editor-details-tab/index.ts
@ -1 +0,0 @@
-export * from './EditorDetailsTab';
--- a/packages/design-system/organisms/editor-shell/EditorShell.stories.tsx
+++ b/packages/design-system/organisms/editor-shell/EditorShell.stories.tsx
@ -1,12 +1,20 @@
 import { BreakpointsProvider } from '@roleypoly/design-system/atoms/breakpoints';
 import { guildEnum } from '@roleypoly/design-system/fixtures/storyData';
 import * as React from 'react';
+import ReactTooltip from 'react-tooltip';
 import { EditorShell } from './EditorShell';

 export default {
  title: 'Organisms/Editor',
  component: EditorShell,
-  decorators: [(story) => <BreakpointsProvider>{story()}</BreakpointsProvider>],
+  decorators: [
+    (story) => (
+      <BreakpointsProvider>
+        {story()}
+        <ReactTooltip />
+      </BreakpointsProvider>
+    ),
+  ],
 };

 export const Shell = () => <EditorShell guild={guildEnum.guilds[0]} />;
--- a/packages/design-system/organisms/editor-shell/EditorShell.tsx
+++ b/packages/design-system/organisms/editor-shell/EditorShell.tsx
@ -1,8 +1,9 @@
 import { Space } from '@roleypoly/design-system/atoms/space';
-import { Tab, TabView } from '@roleypoly/design-system/atoms/tab-view';
-import { EditorMasthead } from '@roleypoly/design-system/molecules/editor-masthead';
-import { EditorCategoriesTab } from '@roleypoly/design-system/organisms/editor-categories-tab';
-import { EditorDetailsTab } from '@roleypoly/design-system/organisms/editor-details-tab';
+import { EditableServerMessage } from '@roleypoly/design-system/molecules/editable-server-message';
+import { ServerMasthead } from '@roleypoly/design-system/molecules/server-masthead';
+import { SecondaryEditing } from '@roleypoly/design-system/organisms/masthead';
+import { Container } from '@roleypoly/design-system/organisms/role-picker/RolePicker.styled';
+import { ServerCategoryEditor } from '@roleypoly/design-system/organisms/server-category-editor';
 import { Category, PresentableGuild } from '@roleypoly/types';
 import deepEqual from 'deep-equal';
 import React from 'react';
@ -17,16 +18,16 @@ export type EditorShellProps = {
 export const EditorShell = (props: EditorShellProps) => {
  const [guild, setGuild] = React.useState<PresentableGuild>(props.guild);

+  React.useEffect(() => {
+    setGuild(props.guild);
+  }, [props.guild]);
+
  const reset = () => {
    setGuild(props.guild);
  };

-  const onCategoryChange = (category: Category) => {
+  const replaceCategories = (categories: Category[]) => {
    setGuild((currentGuild) => {
-      const categories = [
-        ...currentGuild.data.categories.filter((x) => x.id !== category.id),
-        category,
-      ];
      return { ...currentGuild, data: { ...currentGuild.data, categories } };
    });
  };
@ -37,45 +38,34 @@ export const EditorShell = (props: EditorShellProps) => {
    });
  };

+  const doSubmit = () => {
+    props.onGuildChange?.(guild);
+  };
+
  const hasChanges = React.useMemo(
    () => !deepEqual(guild.data, props.guild.data),
    [guild.data, props.guild.data]
  );

  return (
-    <div>
-      <Space />
-      <TabView
-        initialTab={0}
-        masthead={
-          <EditorMasthead
-            guild={guild}
-            onReset={reset}
-            onSubmit={() => props.onGuildChange?.(guild)}
-            showSaveReset={hasChanges}
-          />
-        }
-      >
-        <Tab title="Guild Details">
-          {() => (
-            <EditorDetailsTab
-              {...props}
-              guild={guild}
-              onMessageChange={onMessageChange}
-            />
-          )}
-        </Tab>
-        <Tab title="Categories & Roles">
-          {() => (
-            <EditorCategoriesTab
-              {...props}
-              guild={guild}
-              onCategoryChange={onCategoryChange}
-            />
-          )}
-        </Tab>
-        <Tab title="Utilities">{() => <div>hi2!</div>}</Tab>
-      </TabView>
-    </div>
+    <>
+      <SecondaryEditing
+        showReset={hasChanges}
+        guild={props.guild.guild}
+        onReset={reset}
+        onSubmit={doSubmit}
+      />
+      <Container style={{ marginTop: 95 }}>
+        <ServerMasthead guild={props.guild.guild} editable={false} />
+        <Space />
+        <EditableServerMessage
+          onChange={onMessageChange}
+          value={guild.data.message}
+          guild={guild.guild}
+        />
+        <Space />
+        <ServerCategoryEditor guild={guild} onChange={replaceCategories} />
+      </Container>
+    </>
  );
 };
--- a/packages/design-system/organisms/masthead/Masthead.stories.tsx
+++ b/packages/design-system/organisms/masthead/Masthead.stories.tsx
@ -2,6 +2,7 @@ import * as React from 'react';
 import { guild, mastheadSlugs, user } from '../../fixtures/storyData';
 import { Authed } from './Authed';
 import { Guest } from './Guest';
+import { SecondaryEditing } from './Secondary';
 import { Skeleton } from './Skeleton';

 export default {
@ -12,6 +13,18 @@ export const hasGuilds = () => (
  <Authed guilds={mastheadSlugs} activeGuildId={guild.id} user={user} recentGuilds={[]} />
 );

+export const withSecondary = () => (
+  <>
+    <Authed
+      guilds={mastheadSlugs}
+      activeGuildId={mastheadSlugs[0].id}
+      user={user}
+      recentGuilds={[]}
+    />
+    <SecondaryEditing guild={mastheadSlugs[0]} showReset />
+  </>
+);
+
 export const noGuilds = () => (
  <Authed guilds={[]} activeGuildId={null} user={user} recentGuilds={[]} />
 );
--- a/packages/design-system/organisms/masthead/Masthead.styled.tsx
+++ b/packages/design-system/organisms/masthead/Masthead.styled.tsx
@ -91,3 +91,29 @@ export const GuildPopoverHead = styled.div`
    `)}
  }
 `;
+
+export const SecondaryBase = styled(MastheadBase)`
+  top: 50px;
+  background-color: ${palette.taupe300};
+  z-index: 99;
+  padding: 0 15px;
+  box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.05);
+`;
+
+export const IconHolder = styled.div`
+  width: 30px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 2px;
+  border: 2px solid ${palette.taupe200};
+  background-color: ${palette.taupe100};
+  margin-right: 1em;
+`;
+
+export const TextHolder = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+`;
--- a/packages/design-system/organisms/masthead/Secondary.tsx
+++ b/packages/design-system/organisms/masthead/Secondary.tsx
@ -0,0 +1,46 @@
+import { BreakpointText } from '@roleypoly/design-system/atoms/breakpoints';
+import { Button } from '@roleypoly/design-system/atoms/button';
+import { FaderOpacity } from '@roleypoly/design-system/atoms/fader';
+import { GuildSlug } from '@roleypoly/types';
+import { GoCheck, GoPencil } from 'react-icons/go';
+import {
+  IconHolder,
+  MastheadAlignment,
+  MastheadLeft,
+  MastheadRight,
+  SecondaryBase,
+  TextHolder,
+} from './Masthead.styled';
+
+type SecondaryEditingProps = {
+  guild: GuildSlug;
+  showReset: boolean;
+  onReset?: () => void;
+  onSubmit?: () => void;
+};
+
+export const SecondaryEditing = (props: SecondaryEditingProps) => (
+  <SecondaryBase>
+    <MastheadAlignment>
+      <MastheadLeft>
+        <TextHolder>
+          <IconHolder>
+            <GoPencil />
+          </IconHolder>
+          <BreakpointText small="Editing..." large={`Editing ${props.guild.name}...`} />
+        </TextHolder>
+      </MastheadLeft>
+      <MastheadRight>
+        <FaderOpacity isVisible={props.showReset}>
+          <Button size="small" color="silent" onClick={props.onReset}>
+            Reset
+          </Button>
+        </FaderOpacity>
+        &nbsp;&nbsp;
+        <Button size="small" onClick={props.onSubmit}>
+          Done <GoCheck />
+        </Button>
+      </MastheadRight>
+    </MastheadAlignment>
+  </SecondaryBase>
+);
--- a/packages/design-system/organisms/masthead/index.ts
+++ b/packages/design-system/organisms/masthead/index.ts
@ -1,3 +1,4 @@
 export * from './Authed';
 export * from './Guest';
+export * from './Secondary';
 export * from './Skeleton';
--- a/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.styled.ts
+++ b/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.styled.ts
@ -0,0 +1,49 @@
+import { transitions } from '@roleypoly/design-system/atoms/timings';
+import { CategoryContainer } from '@roleypoly/design-system/organisms/role-picker/RolePicker.styled';
+import styled, { css } from 'styled-components';
+
+export const CategoryActions = styled.div<{ right?: boolean }>`
+  display: flex;
+  flex-direction: row;
+
+  & > button {
+    ${(props) =>
+      props.right
+        ? css`
+            margin-left: 5px;
+          `
+        : css`
+            margin-right: 5px;
+          `};
+  }
+
+  ${(props) =>
+    props.right &&
+    css`
+      justify-content: flex-end;
+    `}
+`;
+
+export const ReorderButton = styled.div`
+  height: 40px;
+  width: 40px;
+  font-size: 20px;
+  margin-right: 5px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  cursor: pointer;
+  transition: background-color ${transitions.actionable}s ease-in-out;
+
+  &:hover {
+    background-color: rgba(0, 0, 0, 0.15);
+  }
+`;
+
+export const ReorderCategoryContainer = styled(CategoryContainer)`
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  user-select: none;
+`;
--- a/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx
+++ b/packages/design-system/organisms/server-category-editor/ServerCategoryEditor.tsx
@ -0,0 +1,203 @@
+import { BreakpointText } from '@roleypoly/design-system/atoms/breakpoints';
+import { Button } from '@roleypoly/design-system/atoms/button';
+import { FaderOpacity } from '@roleypoly/design-system/atoms/fader';
+import { LargeText } from '@roleypoly/design-system/atoms/typography';
+import { EditorCategory } from '@roleypoly/design-system/molecules/editor-category';
+import { CategoryContainer } from '@roleypoly/design-system/organisms/role-picker/RolePicker.styled';
+import { Category, CategoryType, PresentableGuild, Role } from '@roleypoly/types';
+import KSUID from 'ksuid';
+import { flatten, sortBy } from 'lodash';
+import React from 'react';
+import { DragDropContext, Draggable, Droppable, DropResult } from 'react-beautiful-dnd';
+import { CgReorder } from 'react-icons/cg';
+import { GoArrowDown, GoArrowUp, GoCheck, GoGrabber, GoPlus } from 'react-icons/go';
+import {
+  CategoryActions,
+  ReorderButton,
+  ReorderCategoryContainer,
+} from './ServerCategoryEditor.styled';
+
+type Props = {
+  guild: PresentableGuild;
+  onChange: (categories: PresentableGuild['data']['categories']) => void;
+};
+
+const resetOrder = (categories: Category[]) =>
+  sortBy(categories, ['position', 'id']).map((c, index) => ({ ...c, position: index }));
+
+const forceOrder = (categories: Category[]) =>
+  categories.map((c, index) => ({ ...c, position: index }));
+
+export const ServerCategoryEditor = (props: Props) => {
+  const [reorderMode, setReorderMode] = React.useState(false);
+
+  const unselectedRoles = React.useMemo(() => {
+    const selectedRoles = flatten(props.guild.data.categories.map((c) => c.roles));
+    return props.guild.roles.filter((r) => !selectedRoles.includes(r.id));
+  }, [props.guild.data.categories, props.guild.roles]);
+
+  const updateSingleCategory = (category: Category) => {
+    const newCategories = props.guild.data.categories.map((c) => {
+      if (c.id === category.id) {
+        return category;
+      }
+      return c;
+    });
+    props.onChange(newCategories);
+  };
+
+  const createCategory = () => {
+    // Reset order now that we're creating a new category
+    const categories = resetOrder(props.guild.data.categories);
+
+    const newCategory: Category = {
+      id: KSUID.randomSync().string,
+      name: 'New Category',
+      type: CategoryType.Multi,
+      position: categories.length,
+      roles: [],
+      hidden: false,
+    };
+
+    props.onChange([...categories, newCategory]);
+  };
+
+  const onReorder = (categories: Category[] | null) => {
+    setReorderMode(false);
+    if (categories === null) {
+      return;
+    }
+
+    props.onChange(resetOrder(categories));
+  };
+
+  if (reorderMode) {
+    return <ReorderMode {...props} exitReorderMode={onReorder} />;
+  }
+
+  return (
+    <div>
+      <CategoryActions>
+        <Button color="muted" size="small" onClick={() => createCategory()}>
+          Create New <GoPlus />
+        </Button>
+        <Button color="muted" size="small" onClick={() => setReorderMode(true)}>
+          Change Order <CgReorder />
+        </Button>
+      </CategoryActions>
+      {sortBy(props.guild.data.categories, ['position', 'id']).map((category, idx) => (
+        <CategoryContainer key={idx}>
+          <EditorCategory
+            category={category}
+            title={category.name}
+            unselectedRoles={unselectedRoles}
+            roles={
+              category.roles
+                .map((role) => props.guild.roles.find((r) => r.id === role))
+                .filter((r) => r !== undefined) as Role[]
+            }
+            onChange={updateSingleCategory}
+          />
+        </CategoryContainer>
+      ))}
+    </div>
+  );
+};
+
+const ReorderMode = (
+  props: Props & { exitReorderMode: (final: Category[] | null) => void }
+) => {
+  const [categories, setCategories] = React.useState(props.guild.data.categories);
+
+  React.useEffect(() => {
+    setCategories(props.guild.data.categories);
+  }, [props.guild.data.categories]);
+
+  const handleReorder = (category: Category, direction: 'up' | 'down') => () => {
+    const newCategories = [...categories];
+    const index = newCategories.findIndex((c) => c.id === category.id);
+    const newIndex = direction === 'up' ? index - 1 : index + 1;
+
+    if (newIndex < 0 || newIndex > newCategories.length - 1) {
+      return;
+    }
+
+    newCategories.splice(index, 1);
+    newCategories.splice(newIndex, 0, category);
+    setCategories(forceOrder(newCategories));
+  };
+
+  const handleDrop = (dropEvent: DropResult) => {
+    const newCategories = [...categories];
+    const { source, destination } = dropEvent;
+
+    if (!destination || source.index === destination.index) {
+      return;
+    }
+
+    newCategories.splice(source.index, 1);
+    newCategories.splice(destination.index, 0, categories[source.index]);
+    setCategories(forceOrder(newCategories));
+  };
+
+  return (
+    <div>
+      <CategoryActions right>
+        <Button color="muted" size="small" onClick={() => props.exitReorderMode(null)}>
+          Cancel
+        </Button>
+        <Button
+          color="primary"
+          size="small"
+          onClick={() => props.exitReorderMode(categories)}
+        >
+          <BreakpointText small="Save" large="Save Order" /> <GoCheck />
+        </Button>
+      </CategoryActions>
+      <DragDropContext onDragEnd={handleDrop}>
+        <Droppable droppableId="categories">
+          {(provided, snapshot) => (
+            <div ref={provided.innerRef} {...provided.droppableProps}>
+              {sortBy(categories, ['position', 'id']).map((category, idx) => (
+                <Draggable key={category.id} index={idx} draggableId={category.id}>
+                  {(provided, snapshot) => (
+                    <ReorderCategoryContainer
+                      ref={provided.innerRef}
+                      {...provided.draggableProps}
+                    >
+                      <ReorderButton
+                        data-tip="Drag to reorder"
+                        style={{ cursor: 'grab' }}
+                        {...provided.dragHandleProps}
+                      >
+                        <GoGrabber />
+                      </ReorderButton>
+                      <FaderOpacity isVisible={idx !== 0}>
+                        <ReorderButton
+                          onClick={handleReorder(category, 'up')}
+                          data-tip="Move up"
+                        >
+                          <GoArrowUp />
+                        </ReorderButton>
+                      </FaderOpacity>
+                      <FaderOpacity isVisible={categories.length - 1 !== idx}>
+                        <ReorderButton
+                          onClick={handleReorder(category, 'down')}
+                          data-tip="Move down"
+                        >
+                          <GoArrowDown />
+                        </ReorderButton>
+                      </FaderOpacity>
+                      <LargeText>{category.name}</LargeText>
+                    </ReorderCategoryContainer>
+                  )}
+                </Draggable>
+              ))}
+              {provided.placeholder}
+            </div>
+          )}
+        </Droppable>
+      </DragDropContext>
+    </div>
+  );
+};
--- a/packages/design-system/organisms/server-category-editor/index.ts
+++ b/packages/design-system/organisms/server-category-editor/index.ts
@ -0,0 +1 @@
+export * from './ServerCategoryEditor';
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@ -13,6 +13,7 @@
    "ksuid": "^2.0.0",
    "lodash": "^4.17.21",
    "react": "^17.0.2",
+    "react-beautiful-dnd": "^13.1.0",
    "react-custom-scrollbars": "^4.2.1",
    "react-dom": "^17.0.2",
    "react-helmet": "^6.1.0",
@ -24,23 +25,24 @@
  },
  "devDependencies": {
    "@icons/material": "^0.4.1",
-    "@storybook/addon-actions": "^6.3.2",
-    "@storybook/addon-essentials": "^6.3.2",
-    "@storybook/addon-links": "^6.3.2",
-    "@storybook/addons": "^6.3.2",
-    "@storybook/react": "^6.3.2",
-    "@storybook/theming": "^6.3.2",
+    "@storybook/addon-actions": "^6.3.3",
+    "@storybook/addon-essentials": "^6.3.3",
+    "@storybook/addon-links": "^6.3.3",
+    "@storybook/addons": "^6.3.3",
+    "@storybook/react": "^6.3.3",
+    "@storybook/theming": "^6.3.3",
    "@types/chroma-js": "^2.1.3",
    "@types/deep-equal": "^1.0.1",
-    "@types/node": "^15.12.5",
-    "@types/react": "^17.0.11",
-    "@types/react-custom-scrollbars": "^4.0.7",
-    "@types/react-dom": "^17.0.8",
-    "@types/react-helmet": "^6.1.1",
-    "@types/styled-components": "^5.1.10",
+    "@types/node": "^16.0.1",
+    "@types/react": "^17.0.14",
+    "@types/react-beautiful-dnd": "^13.1.1",
+    "@types/react-custom-scrollbars": "^4.0.8",
+    "@types/react-dom": "^17.0.9",
+    "@types/react-helmet": "^6.1.2",
+    "@types/styled-components": "^5.1.11",
    "babel-loader": "8.1.0",
    "babel-plugin-styled-components": "^1.13.1",
    "tslint": "^6.1.3",
-    "typescript": "^4.3.4"
+    "typescript": "^4.3.5"
  }
 }
--- a/packages/design-system/templates/editor/Editor.stories.tsx
+++ b/packages/design-system/templates/editor/Editor.stories.tsx
@ -1,8 +1,18 @@
+import ReactTooltip from 'react-tooltip';
+import { BreakpointsProvider } from '../../atoms/breakpoints';
 import { guildEnum, mastheadSlugs, user } from '../../fixtures/storyData';
 import { EditorTemplate } from './Editor';
 export default {
  title: 'Templates/Server Editor',
  component: EditorTemplate,
+  decorators: [
+    (story) => (
+      <BreakpointsProvider>
+        {story()}
+        <ReactTooltip />
+      </BreakpointsProvider>
+    ),
+  ],
  args: {
    guilds: mastheadSlugs,
    user: user,
--- a/packages/design-system/templates/editor/Editor.tsx
+++ b/packages/design-system/templates/editor/Editor.tsx
@ -10,7 +10,7 @@ export const EditorTemplate = (
  const { guild, onCategoryChange, onMessageChange, onGuildChange, ...appShellProps } =
    props;
  return (
-    <AppShell {...appShellProps} activeGuildId={guild.id}>
+    <AppShell {...appShellProps} activeGuildId={guild.id} small double>
      <EditorShell guild={guild} onGuildChange={onGuildChange} />
    </AppShell>
  );
--- a/packages/web/package.json
+++ b/packages/web/package.json
@ -16,20 +16,20 @@
    "react-dom": "^17.0.2",
    "react-helmet": "^6.1.0",
    "react-scripts": "4.0.3",
-    "typescript": "^4.3.4",
-    "web-vitals": "^2.0.1"
+    "typescript": "^4.3.5",
+    "web-vitals": "^2.1.0"
  },
  "devDependencies": {
-    "@craco/craco": "^6.1.2",
+    "@craco/craco": "^6.2.0",
    "@roleypoly/types": "*",
    "@testing-library/jest-dom": "^5.14.1",
    "@testing-library/react": "^12.0.0",
    "@testing-library/user-event": "^13.1.9",
-    "@types/jest": "^26.0.23",
-    "@types/node": "^15.12.5",
-    "@types/react": "^17.0.11",
-    "@types/react-dom": "^17.0.8",
-    "@types/react-helmet": "^6.1.1",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^16.0.1",
+    "@types/react": "^17.0.14",
+    "@types/react-dom": "^17.0.9",
+    "@types/react-helmet": "^6.1.2",
    "babel-loader": "8.1.0",
    "cross-env": "7.0.3",
    "ts-loader": "^8.3.0",
--- a/packages/web/src/pages/editor.tsx
+++ b/packages/web/src/pages/editor.tsx
@ -1,4 +1,4 @@
-import { Redirect } from '@reach/router';
+import { navigate, Redirect } from '@reach/router';
 import { EditorTemplate } from '@roleypoly/design-system/templates/editor';
 import { GenericLoadingTemplate } from '@roleypoly/design-system/templates/generic-loading';
 import {
@ -87,6 +87,8 @@ const Editor = (props: EditorProps) => {
      setGuild(guild);
      setPending(false);
    }
+
+    navigate(`/s/${props.serverID}`);
  };

  return (
--- a/yarn.lock
+++ b/yarn.lock