feat: add pre commit hook to lint frontend & fix warnings

refactor: update project name in tmuxinator
2020-08-23 17:27:32 -05:00 · 2020-08-23 15:38:20 -05:00
125 changed files with 1355 additions and 9096 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-custom: ['https://paypal.me/jordanthedev', 'https://www.buymeacoffee.com/jordanknott']
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,28 +0,0 @@
---
-name: Bug report
-about: Create a report to help improve Taskcafe
-title: ""
-labels: ""
-assignees: ""
---
-
-**Describe the bug**
-A clear and concise description of what the bug is with steps to reproduce the issue.
-
-**Expected behavior**
-What did you expect to happen?
-
-**Screenshots / Live demo link**
-If applicable, add screenshots to help explain your problem.
-
-**Additional context**
-Add any other context about the problem here.
-
-<!--
-
-Please read the contributing guide before working on any new pull requests!
-
-If you would like to ask a question regarding a possible bug or feature request, please
-join the Taskcafe discord - https://discord.gg/JkQDruh
-
-->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,30 +0,0 @@
---
-name: Feature request
-about: Create a feature request to help improve Taskcafe
-title: ""
-labels: ""
-assignees: ""
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
-
-<!--
-
-Be aware, not all feature requests will get accepted.
-
-Please read the contributing guide before working on any new pull requests!
-
-If you would like to ask a question regarding a possible bug or feature request, please
-join the Taskcafe discord - https://discord.gg/JkQDruh
-
-->
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,19 +0,0 @@
-* **Please check if the PR fulfills these requirements**
- [ ] You have read the contribution guidelines [guidelines](https://github.com/JordanKnott/taskcafe/blob/master/CONTRIBUTING.md)
- [ ] The commit message follows our [guidelines](https://github.com/JordanKnott/taskcafe/blob/master/CONTRIBUTING.md#git-commit-message-style)
- [ ] Docs have been added / updated (for bug fixes / features)
-
-
-* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
-
-
-* **What is the current behavior?** (You can also link to an open issue here)
-
-
-* **What is the new behavior (if this is a feature change)?**
-
-
-* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
-
-
-* **Other information**:
--- a/.github/taskcafe-full.png
+++ b/.github/taskcafe-full.png
--- a/.github/taskcafe-full.svg
+++ b/.github/taskcafe-full.svg
@@ -7,16 +7,16 @@
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   height="350"
-   width="1100"
-   sodipodi:docname="taskcafe-full.svg"
-   id="svg951"
-   version="1.1"
-   viewBox="0 0 1100 350"
-   inkscape:export-filename="/home/jordan/Projects/project-citadel/.github/taskcafe-full.png"
+   inkscape:export-ydpi="96"
   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+   inkscape:export-filename="/home/jordan/Projects/project-citadel/.github/taskcafe-full.png"
+   viewBox="0 0 1100 350"
+   version="1.1"
+   id="svg951"
+   sodipodi:docname="taskcafe-full.svg"
+   width="1100"
+   height="350"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
  <metadata
     id="metadata957">
    <rdf:RDF>
@@ -25,92 +25,81 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs955">
    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       lpeversion="1"
-       is_visible="true"
+       effect="bspline"
       id="path-effect2633"
-       effect="bspline" />
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
    <inkscape:path-effect
-       effect="bspline"
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       lpeversion="1"
+       is_visible="true"
       id="path-effect2614"
-       is_visible="true"
-       lpeversion="1"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
+       effect="bspline" />
    <inkscape:path-effect
-       effect="bspline"
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       lpeversion="1"
+       is_visible="true"
       id="path-effect2500"
-       is_visible="true"
-       lpeversion="1"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
+       effect="bspline" />
    <inkscape:path-effect
-       effect="bspline"
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       lpeversion="1"
+       is_visible="true"
       id="path-effect2491"
-       is_visible="true"
-       lpeversion="1"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
+       effect="bspline" />
    <inkscape:path-effect
-       effect="bspline"
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       lpeversion="1"
+       is_visible="true"
       id="path-effect1706"
-       is_visible="true"
-       lpeversion="1"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
+       effect="bspline" />
    <inkscape:path-effect
-       effect="bspline"
+       only_selected="false"
+       apply_with_weight="true"
+       apply_no_weight="true"
+       helper_size="0"
+       steps="2"
+       weight="33.333333"
+       lpeversion="1"
+       is_visible="true"
       id="path-effect1697"
-       is_visible="true"
-       lpeversion="1"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       only_selected="false"
-       apply_with_weight="true"
-       apply_no_weight="true"
-       helper_size="0"
-       steps="2"
-       weight="33.333333"
-       lpeversion="1"
-       is_visible="true"
-       id="path-effect917"
       effect="bspline" />
    <inkscape:path-effect
       effect="bspline"
-       id="path-effect950"
+       id="path-effect917"
       is_visible="true"
       lpeversion="1"
       weight="33.333333"
@@ -128,141 +117,144 @@
       weight="33.333333"
       lpeversion="1"
       is_visible="true"
-       id="path-effect969"
+       id="path-effect950"
       effect="bspline" />
+    <inkscape:path-effect
+       effect="bspline"
+       id="path-effect969"
+       is_visible="true"
+       lpeversion="1"
+       weight="33.333333"
+       steps="2"
+       helper_size="0"
+       apply_no_weight="true"
+       apply_with_weight="true"
+       only_selected="false" />
  </defs>
  <sodipodi:namedview
-     inkscape:current-layer="g2585"
-     inkscape:window-maximized="1"
-     inkscape:window-y="-18"
-     inkscape:window-x="0"
-     inkscape:cy="250.95495"
-     inkscape:cx="534.60693"
-     inkscape:zoom="0.85624204"
-     units="px"
-     showgrid="false"
-     id="namedview953"
-     inkscape:window-height="1032"
-     inkscape:window-width="1920"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
+     inkscape:document-rotation="0"
     pagecolor="#ffffff"
-     inkscape:document-rotation="0" />
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1032"
+     id="namedview953"
+     showgrid="false"
+     units="px"
+     inkscape:zoom="1.2109091"
+     inkscape:cx="550"
+     inkscape:cy="241.06607"
+     inkscape:window-x="0"
+     inkscape:window-y="-18"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2585" />
  <g
-     transform="matrix(7.6408653,0,0,7.6408653,40.593299,-53.251254)"
-     id="g974">
+     id="g974"
+     transform="matrix(7.6408653,0,0,7.6408653,40.593299,-53.251254)">
    <g
-       transform="matrix(0.21947908,0,0,0.21947908,-1.6240521,6.1742219)"
-       id="g1721">
+       id="g1721"
+       transform="matrix(0.21947908,0,0,0.21947908,-1.6240521,6.1742219)">
      <g
-         id="g2454"
-         transform="translate(0,-133.87521)">
+         transform="translate(0,-133.87521)"
+         id="g2454">
        <g
-           id="g2554"
-           transform="translate(-35.365658,-44.89936)">
+           transform="translate(-35.365658,-44.89936)"
+           id="g2554">
          <g
-             id="g2433"
-             transform="translate(0,107.63572)">
+             transform="translate(0,107.63572)"
+             id="g2433">
            <g
-               id="g2439"
-               transform="translate(0.82337254,1.4684449)">
+               transform="translate(0.82337254,1.4684449)"
+               id="g2439">
              <g
                 id="g2472">
                <g
-                   id="g2585"
-                   transform="translate(0,-15.084391)">
+                   transform="translate(0,-15.084391)"
+                   id="g2585">
                  <g
-                     transform="translate(1.0665725)"
-                     id="g4610">
+                     id="g2427"
+                     transform="matrix(1.9229347,0,0,1.9229347,9.8747364,70.748305)">
+                    <path
+                       transform="matrix(0.13087523,0,0,0.13087523,-5.3126573,6.9692701)"
+                       style="fill:#7367f0;fill-opacity:1;stroke-width:0.399296"
+                       d="m 372.01783,403.60348 c -54.69036,0 -99.02539,44.33501 -99.02539,99.02537 0,54.69035 44.33503,99.02537 99.02539,99.02537 54.69036,0 99.02538,-44.33502 99.02538,-99.02537 0,-54.69036 -44.33502,-99.02538 -99.02538,-99.02537 z m 0,19.16619 c 44.13497,0 79.85917,35.71742 79.85917,79.85918 0,44.13497 -35.71741,79.85919 -79.85917,79.85919 -44.13497,0 -79.85918,-35.71742 -79.85918,-79.85919 0,-44.13498 35.71742,-79.85918 79.85918,-79.85918 m 55.98288,52.01507 -8.99853,-9.0712 c -1.86352,-1.87869 -4.89736,-1.89107 -6.77605,-0.0272 L 355.78487,521.674 331.91016,497.60565 c -1.86352,-1.87869 -4.89736,-1.89107 -6.77605,-0.0275 l -9.07159,8.99853 c -1.8787,1.86352 -1.89108,4.89736 -0.0272,6.77646 l 36.24849,36.54196 c 1.86352,1.87869 4.89736,1.89107 6.77605,0.0272 l 68.9141,-68.36106 c 1.87828,-1.86392 1.89025,-4.89778 0.0268,-6.77646 z"
+                       id="path1636" />
                    <g
-                       id="g2560"
-                       transform="translate(-28.409706,-8.3958791)">
-                      <text
-                         xml:space="preserve"
-                         style="font-size:124.328px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans';letter-spacing:0px;word-spacing:0px;opacity:0.99;stroke-width:0.690712"
-                         x="196.89775"
-                         y="235.17853"
-                         id="text852"><tspan
-                           sodipodi:role="line"
-                           id="tspan850"
-                           x="196.89775"
-                           y="235.17853"
-                           style="font-size:124.328px;fill:#10163a;fill-opacity:1;stroke-width:0.690712">Taskcafé</tspan></text>
-                      <text
-                         xml:space="preserve"
-                         style="font-size:22.6594px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans';letter-spacing:0px;word-spacing:0px;opacity:0.99;stroke-width:0.596299"
-                         x="223.15549"
-                         y="261.83273"
-                         id="text856"><tspan
-                           sodipodi:role="line"
-                           id="tspan854"
-                           x="223.15549"
-                           y="261.83273"
-                           style="font-size:22.6594px;fill:#262c49;fill-opacity:1;stroke-width:0.596299">An open source project management tool</tspan></text>
-                    </g>
-                    <g
-                       id="g4591"
-                       transform="matrix(0.63214637,0,0,0.63214637,34.070751,71.061726)">
+                       transform="translate(-0.16733365,0.61658838)"
+                       id="g2513">
+                      <path
+                         d="m 274.76901,687.50206 h 187.88752 c 51.86479,0 93.94376,-42.07897 93.94376,-93.94375 h 31.31459 c 69.08781,0 125.25834,-56.17055 125.25834,-125.25835 0,-69.08781 -56.17053,-125.25834 -125.25834,-125.25834 H 204.31119 c -13.01512,0 -23.48594,10.47081 -23.48594,23.48593 v 227.03076 c 0,51.86478 42.07898,93.94375 93.94376,93.94375 z M 587.91488,405.67079 c 34.54391,0 62.62917,28.08527 62.62917,62.62917 0,34.5439 -28.08526,62.62917 -62.62917,62.62917 H 556.60029 V 405.67079 Z m 46.6783,375.77503 H 134.14696 c -46.580452,0 -59.693435,-62.62917 -35.228913,-62.62917 H 669.72424 c 24.46452,0 11.54725,62.62917 -35.13106,62.62917 z"
+                         id="path949"
+                         style="fill:#10163a;fill-opacity:1;stroke-width:0.978574"
+                         transform="matrix(0.13087523,0,0,0.13087523,-5.3126573,6.9692701)" />
                      <g
-                         transform="matrix(1.9229347,0,0,1.9229347,9.8747364,70.748305)"
-                         id="g2427">
-                        <path
-                           id="path1636"
-                           d="m 372.01783,403.60348 c -54.69036,0 -99.02539,44.33501 -99.02539,99.02537 0,54.69035 44.33503,99.02537 99.02539,99.02537 54.69036,0 99.02538,-44.33502 99.02538,-99.02537 0,-54.69036 -44.33502,-99.02538 -99.02538,-99.02537 z m 0,19.16619 c 44.13497,0 79.85917,35.71742 79.85917,79.85918 0,44.13497 -35.71741,79.85919 -79.85917,79.85919 -44.13497,0 -79.85918,-35.71742 -79.85918,-79.85919 0,-44.13498 35.71742,-79.85918 79.85918,-79.85918 m 55.98288,52.01507 -8.99853,-9.0712 c -1.86352,-1.87869 -4.89736,-1.89107 -6.77605,-0.0272 L 355.78487,521.674 331.91016,497.60565 c -1.86352,-1.87869 -4.89736,-1.89107 -6.77605,-0.0275 l -9.07159,8.99853 c -1.8787,1.86352 -1.89108,4.89736 -0.0272,6.77646 l 36.24849,36.54196 c 1.86352,1.87869 4.89736,1.89107 6.77605,0.0272 l 68.9141,-68.36106 c 1.87828,-1.86392 1.89025,-4.89778 0.0268,-6.77646 z"
-                           style="fill:#7367f0;fill-opacity:1;stroke-width:0.399296"
-                           transform="matrix(0.13087523,0,0,0.13087523,-5.3126573,6.9692701)" />
+                         style="stroke:#10163a;stroke-width:0.999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                         id="g1711"
+                         transform="translate(-0.91048867,42.172992)">
                        <g
-                           id="g2513"
-                           transform="translate(-0.16733365,0.61658838)">
-                          <path
-                             transform="matrix(0.13087523,0,0,0.13087523,-5.3126573,6.9692701)"
-                             style="fill:#10163a;fill-opacity:1;stroke-width:0.978574"
-                             id="path949"
-                             d="m 274.76901,687.50206 h 187.88752 c 51.86479,0 93.94376,-42.07897 93.94376,-93.94375 h 31.31459 c 69.08781,0 125.25834,-56.17055 125.25834,-125.25835 0,-69.08781 -56.17053,-125.25834 -125.25834,-125.25834 H 204.31119 c -13.01512,0 -23.48594,10.47081 -23.48594,23.48593 v 227.03076 c 0,51.86478 42.07898,93.94375 93.94376,93.94375 z M 587.91488,405.67079 c 34.54391,0 62.62917,28.08527 62.62917,62.62917 0,34.5439 -28.08526,62.62917 -62.62917,62.62917 H 556.60029 V 405.67079 Z m 46.6783,375.77503 H 134.14696 c -46.580452,0 -59.693435,-62.62917 -35.228913,-62.62917 H 669.72424 c 24.46452,0 11.54725,62.62917 -35.13106,62.62917 z" />
+                           id="g2505"
+                           transform="translate(0.09191978,50.168306)">
                          <g
-                             transform="translate(-0.91048867,42.172992)"
-                             id="g1711"
-                             style="stroke:#10163a;stroke-width:0.999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-                            <g
-                               transform="translate(0.09191978,50.168306)"
-                               id="g2505">
-                              <g
-                                 id="g2638"
-                                 transform="translate(-0.68526563,40.225035)">
-                                <path
-                                   inkscape:path-effect="#path-effect917"
-                                   inkscape:original-d="m 34.769434,-84.879608 c -1.48426,-1.560661 -2.968784,-3.006405 -4.453574,-4.510003 1.631212,-1.019797 3.262093,-2.039821 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.54119 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.14299 -11.422003,-4.71488 3.923669,-2.33269 7.846916,-4.66554 11.769976,-6.99871 -2.86505,-1.8909 -5.730251,-3.78199 -8.595774,-5.67338"
-                                   id="path915"
-                                   d="m 34.769434,-84.879608 c -1.513055,-1.532226 -2.968787,-3.006403 -2.895671,-4.268256 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985679,-3.166058 1.805573,-4.837199 -1.180106,-1.671141 -4.987365,-3.242735 -4.929449,-5.195115 0.05792,-1.95238 3.981161,-4.28523 4.510279,-6.39714 0.529119,-2.11191 -2.336082,-4.003 -5.201646,-5.89433"
-                                   style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-                                <path
-                                   style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                                   d="m 45.467515,-84.87961 c -1.513055,-1.532226 -2.968786,-3.006402 -2.895671,-4.268255 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985679,-3.166058 1.805573,-4.837199 -1.180106,-1.671141 -4.987365,-3.242734 -4.929449,-5.195114 0.05792,-1.95238 3.981165,-4.28524 4.510282,-6.39714 0.529116,-2.11191 -2.336085,-4.003 -5.201649,-5.89433"
-                                   id="path915-9"
-                                   inkscape:original-d="m 45.467515,-84.87961 c -1.48426,-1.56066 -2.968784,-3.006404 -4.453574,-4.510002 1.631212,-1.019797 3.262093,-2.039821 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.54119 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.142989 -11.422003,-4.714879 3.923669,-2.33269 7.846916,-4.66555 11.769976,-6.99871 -2.86505,-1.8909 -5.730251,-3.78199 -8.595774,-5.67338"
-                                   inkscape:path-effect="#path-effect2614" />
-                                <path
-                                   inkscape:path-effect="#path-effect2633"
-                                   inkscape:original-d="m 56.1656,-84.87961 c -1.48426,-1.560662 -2.968784,-3.006405 -4.453574,-4.510004 1.631212,-1.019796 3.262093,-2.03982 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.541189 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.142987 -11.422003,-4.714877 3.923669,-2.33269 7.846916,-4.66555 11.769976,-6.99872 -2.86505,-1.89089 -5.730251,-3.78198 -8.595774,-5.67337"
-                                   id="path915-9-0"
-                                   d="m 56.1656,-84.87961 c -1.513055,-1.532227 -2.968786,-3.006403 -2.895671,-4.268257 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985678,-3.166057 1.805572,-4.837198 -1.180105,-1.671141 -4.987363,-3.242733 -4.929448,-5.195113 0.05792,-1.95238 3.981162,-4.28524 4.510282,-6.39715 0.529119,-2.11191 -2.336084,-4.00299 -5.201649,-5.89432"
-                                   style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-                              </g>
-                            </g>
+                             transform="translate(-0.68526563,40.225035)"
+                             id="g2638">
+                            <path
+                               style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                               d="m 34.769434,-84.879608 c -1.513055,-1.532226 -2.968787,-3.006403 -2.895671,-4.268256 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985679,-3.166058 1.805573,-4.837199 -1.180106,-1.671141 -4.987365,-3.242735 -4.929449,-5.195115 0.05792,-1.95238 3.981161,-4.28523 4.510279,-6.39714 0.529119,-2.11191 -2.336082,-4.003 -5.201646,-5.89433"
+                               id="path915"
+                               inkscape:original-d="m 34.769434,-84.879608 c -1.48426,-1.560661 -2.968784,-3.006405 -4.453574,-4.510003 1.631212,-1.019797 3.262093,-2.039821 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.54119 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.14299 -11.422003,-4.71488 3.923669,-2.33269 7.846916,-4.66554 11.769976,-6.99871 -2.86505,-1.8909 -5.730251,-3.78199 -8.595774,-5.67338"
+                               inkscape:path-effect="#path-effect917" />
+                            <path
+                               inkscape:path-effect="#path-effect2614"
+                               inkscape:original-d="m 45.467515,-84.87961 c -1.48426,-1.56066 -2.968784,-3.006404 -4.453574,-4.510002 1.631212,-1.019797 3.262093,-2.039821 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.54119 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.142989 -11.422003,-4.714879 3.923669,-2.33269 7.846916,-4.66555 11.769976,-6.99871 -2.86505,-1.8909 -5.730251,-3.78199 -8.595774,-5.67338"
+                               id="path915-9"
+                               d="m 45.467515,-84.87961 c -1.513055,-1.532226 -2.968786,-3.006402 -2.895671,-4.268255 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985679,-3.166058 1.805573,-4.837199 -1.180106,-1.671141 -4.987365,-3.242734 -4.929449,-5.195114 0.05792,-1.95238 3.981165,-4.28524 4.510282,-6.39714 0.529116,-2.11191 -2.336085,-4.003 -5.201649,-5.89433"
+                               style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+                            <path
+                               style="fill:none;stroke:#10163a;stroke-width:3.10099;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                               d="m 56.1656,-84.87961 c -1.513055,-1.532227 -2.968786,-3.006403 -2.895671,-4.268257 0.07312,-1.261854 1.703997,-2.281876 3.242849,-3.677242 1.538852,-1.395366 2.985678,-3.166057 1.805572,-4.837198 -1.180105,-1.671141 -4.987363,-3.242733 -4.929448,-5.195113 0.05792,-1.95238 3.981162,-4.28524 4.510282,-6.39715 0.529119,-2.11191 -2.336084,-4.00299 -5.201649,-5.89432"
+                               id="path915-9-0"
+                               inkscape:original-d="m 56.1656,-84.87961 c -1.48426,-1.560662 -2.968784,-3.006405 -4.453574,-4.510004 1.631212,-1.019796 3.262093,-2.03982 4.892743,-3.060127 1.447149,-1.770498 2.893976,-3.541189 4.340567,-5.312182 -3.807146,-1.571393 -7.614404,-3.142987 -11.422003,-4.714877 3.923669,-2.33269 7.846916,-4.66555 11.769976,-6.99872 -2.86505,-1.89089 -5.730251,-3.78198 -8.595774,-5.67337"
+                               inkscape:path-effect="#path-effect2633" />
                          </g>
                        </g>
                      </g>
-                      <path
-                         id="path2782"
-                         d="m 93.574758,186.094 c -13.47814,0 -24.40427,10.92613 -24.40427,24.40428 0,13.47814 10.92613,24.40427 24.40427,24.40427 13.478152,0 24.404282,-10.92613 24.404282,-24.40427 0,-13.47815 -10.92613,-24.40428 -24.404282,-24.40428 z m 0,4.72341 c 10.876832,0 19.680872,8.80236 19.680872,19.68087 0,10.87683 -8.80236,19.68086 -19.680872,19.68086 -10.876819,0 -19.680863,-8.80236 -19.680863,-19.68086 0,-10.87684 8.802364,-19.68087 19.680863,-19.68087 m 13.796692,12.81883 -2.21764,-2.23554 c -0.45925,-0.463 -1.20693,-0.46604 -1.66993,-0.007 l -13.909644,13.79786 -5.883794,-5.93153 c -0.459258,-0.46298 -1.206929,-0.46603 -1.669926,-0.007 l -2.235645,2.21764 c -0.462989,0.45926 -0.466044,1.20693 -0.0068,1.67002 l 8.933241,9.00557 c 0.459258,0.46299 1.206929,0.46605 1.669926,0.007 l 16.983502,-16.84721 c 0.4629,-0.45935 0.46585,-1.20702 0.007,-1.67002 z"
-                         style="fill:#7367f0;fill-opacity:1;stroke-width:0.0984039" />
                    </g>
                  </g>
+                  <g
+                     id="g2560"
+                     transform="translate(0,15.33842)">
+                    <text
+                       xml:space="preserve"
+                       style="font-size:124.328px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans';letter-spacing:0px;word-spacing:0px;opacity:0.99;stroke-width:0.690712"
+                       x="196.89775"
+                       y="235.17853"
+                       id="text852"><tspan
+                         sodipodi:role="line"
+                         id="tspan850"
+                         x="196.89775"
+                         y="235.17853"
+                         style="font-size:124.328px;fill:#10163a;fill-opacity:1;stroke-width:0.690712">Taskcafé</tspan></text>
+                    <text
+                       xml:space="preserve"
+                       style="font-size:22.6594px;line-height:1.25;font-family:'Fira Sans';-inkscape-font-specification:'Fira Sans';letter-spacing:0px;word-spacing:0px;opacity:0.99;stroke-width:0.596299"
+                       x="223.15549"
+                       y="261.83273"
+                       id="text856"><tspan
+                         sodipodi:role="line"
+                         id="tspan854"
+                         x="223.15549"
+                         y="261.83273"
+                         style="font-size:22.6594px;fill:#262c49;fill-opacity:1;stroke-width:0.596299">An open source project management tool</tspan></text>
+                  </g>
+                  <path
+                     style="fill:#7367f0;fill-opacity:1;stroke-width:0.0984039"
+                     d="m 93.574758,186.094 c -13.47814,0 -24.40427,10.92613 -24.40427,24.40428 0,13.47814 10.92613,24.40427 24.40427,24.40427 13.478152,0 24.404282,-10.92613 24.404282,-24.40427 0,-13.47815 -10.92613,-24.40428 -24.404282,-24.40428 z m 0,4.72341 c 10.876832,0 19.680872,8.80236 19.680872,19.68087 0,10.87683 -8.80236,19.68086 -19.680872,19.68086 -10.876819,0 -19.680863,-8.80236 -19.680863,-19.68086 0,-10.87684 8.802364,-19.68087 19.680863,-19.68087 m 13.796692,12.81883 -2.21764,-2.23554 c -0.45925,-0.463 -1.20693,-0.46604 -1.66993,-0.007 l -13.909644,13.79786 -5.883794,-5.93153 c -0.459258,-0.46298 -1.206929,-0.46603 -1.669926,-0.007 l -2.235645,2.21764 c -0.462989,0.45926 -0.466044,1.20693 -0.0068,1.67002 l 8.933241,9.00557 c 0.459258,0.46299 1.206929,0.46605 1.669926,0.007 l 16.983502,-16.84721 c 0.4629,-0.45935 0.46585,-1.20702 0.007,-1.67002 z"
+                     id="path2782" />
                </g>
              </g>
            </g>
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,10 +3,11 @@ repos:
  hooks:
    - id: eslint
      name: eslint
-      entry: scripts/lint.sh
+      entry: go run cmd/mage/main.go frontend:lint
      language: system
      files: \.[jt]sx?$  # *.js, *.jsx, *.ts and *.tsx
      types: [file]
+      pass_filenames: false
 - hooks:
  - id: check-yaml
  - id: end-of-file-fixer
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,27 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-### Added
- Task sorting & filtering
- Redesigned the Task Details UI
- Implement task group actions (duplicate/delete all tasks/sort)
-
-### Fixed
- removed CORS middleware to fix security issue
- Added 3 retries with backoff to initial database connection [(#47)](https://github.com/JordanKnott/taskcafe/issues/47)
- Can now actually set a due date
-
-## [0.1.1] - 2020-08-21
-
-### Fixed
- fix panic(nil) when loading config if config file actually exists
-
-## [0.1.0] - 2020-08-21
-
-### Added
- first "stable" alpha release
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,13 +4,8 @@ Thanks for wanting to contribute to Taskcafe!

 ### Where do I go from here?

-So you want to contribute to Taskcafe? Great!
-
-If you have noticed a bug or want to add a new feature, please [create an issue](https://github.com/JordanKnott/taskcafe/issues/new/choose) for it before starting any work on a pull request.
-
-Alternatively you can join the [Taskcafe discord](https://discord.gg/JkQDruh) and ask in the #questions channel.
-
-After the bug is validated or the feature is accepted by a project maintainer, the next step is to fork the repository!
+If you have noticed a bug or have a feature request, make one! If best to get confirmation
+of your bug or feature before starting work on a pull request.

 ### Fork & create a branch

--- a/README.md
+++ b/README.md
@@ -1,35 +1,24 @@
-<p align="center">
- <img width="450px" src="./.github/taskcafe-full.png" align="center" alt="Taskcafe logo" />
-</p>
-<p align="center">
-  <a href="https://discord.gg/JkQDruh">
-    <img alt="Discord" src="https://img.shields.io/discord/745396499613220955" />
-  </a>
-  <a href="https://github.com/JordanKnott/taskcafe/releases">
-    <img alt="Releases" src="https://img.shields.io/github/v/release/JordanKnott/taskcafe" />
-  </a>
-  <a href="https://hub.docker.com/repository/docker/taskcafe/taskcafe">
-    <img alt="Dockerhub" src="https://img.shields.io/docker/v/taskcafe/taskcafe?label=docker" />
-  </a>
-  <a href="https://goreportcard.com/report/github.com/JordanKnott/taskcafe">
-    <img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/JordanKnott/taskcafe" />
-  </a>
-</p>
-<p align="center">
-Was this project useful? Please consider <a href="https://www.buymeacoffee.com/jordanknott">donating</a> to help me improve it!
-</p>
+![Taskcafe](./.github/taskcafe-full.png)

-**Please note that this project is still in active development. Some options may not work yet! For updates on development, join the Discord server**
+[![Discord](https://img.shields.io/discord/745396499613220955)](https://discord.gg/JkQDruh)
+[![Releases](https://img.shields.io/github/v/release/JordanKnott/taskcafe)](https://github.com/JordanKnott/taskcafe/releases)
+[![Dockerhub](https://img.shields.io/docker/v/taskcafe/taskcafe?label=docker)](https://hub.docker.com/repository/docker/taskcafe/taskcafe)
+[![Go Report Card](https://goreportcard.com/badge/github.com/JordanKnott/taskcafe)](https://goreportcard.com/report/github.com/JordanKnott/taskcafe)
+
+
+## Overview

 ![Taskcafe](./.github/taskcafe_preview.png)

+A free & open source alternative project management tool.
+
+**Please note that this project is still in active development. Some options may not work yet!**
 ## Features

 Currently Taskcafe only offers basic task tracking through a Kanban board.

 Currently you can do the following to tasks:

- Task sorting & filtering
 - Add colors & named labels
 - Add due dates
 - Descriptions written in Markdown
@@ -92,7 +81,6 @@ The newly created `taskcafe` binary can be found in the __dist__ folder.

 It contains everything neccessary to run except the config file. An example config file can be found in `conf/app.example.toml`.

-For more information on configuration, please read the [wiki](https://github.com/JordanKnott/taskcafe/wiki/Configuration).
 The config will need to be copied to a `conf/app.toml` in the same place the binary is.

 Make sure to fill out the database section of the config in order to connect it to your database.
@@ -101,8 +89,6 @@ Then run the database migrations with `taskcafe migrate`.

 Now you can run the web interface by running `taskcafe web`.

-[A more detailed guide for installing on Ubuntu/Debian](https://github.com/JordanKnott/taskcafe/wiki/Installation-(ubuntu-debian))
-
 ## How is this different from X (Trello, NextCloud, etc)?

 One of the primary goals of Taskcafe is to provide a project management tool that I personally enjoy using for my
--- a/conf/taskcafe.example.toml
+++ b/conf/taskcafe.example.toml
@@ -1,5 +1,5 @@
 [general]
-hostname = '0.0.0.0:3333'
+host = '0.0.0.0:3333'

 [email_notifications]
 enabled = true
--- a/frontend/.eslintrc.json
+++ b/frontend/.eslintrc.json
@@ -30,7 +30,6 @@
    "@typescript-eslint/no-explicit-any": "off",
    "@typescript-eslint/no-unused-vars": "off",
    "react/jsx-filename-extension": [2, { "extensions": [".js", ".jsx", ".ts", ".tsx"] }],
-    "no-case-declarations": "off",
    "react/prop-types": 0,
    "react/jsx-props-no-spreading": "off",
    "no-param-reassign": "off",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,6 +6,14 @@
    "@apollo/client": "^3.0.0-rc.8",
    "@apollo/react-common": "^3.1.4",
    "@apollo/react-hooks": "^3.1.3",
+    "@fortawesome/fontawesome-svg-core": "^1.2.27",
+    "@fortawesome/free-brands-svg-icons": "^5.12.1",
+    "@fortawesome/free-regular-svg-icons": "^5.12.1",
+    "@fortawesome/free-solid-svg-icons": "^5.12.1",
+    "@fortawesome/react-fontawesome": "^0.1.8",
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
    "@types/axios": "^0.14.0",
    "@types/color": "^3.0.1",
    "@types/date-fns": "^2.6.0",
@@ -20,7 +28,6 @@
    "@types/react-router": "^5.1.4",
    "@types/react-router-dom": "^5.1.3",
    "@types/react-select": "^3.0.13",
-    "@types/react-timeago": "^4.1.1",
    "@types/styled-components": "^5.0.0",
    "apollo-cache-inmemory": "^1.6.5",
    "apollo-client": "^2.6.8",
@@ -52,9 +59,6 @@
    "react-router-dom": "^5.1.2",
    "react-scripts": "3.4.0",
    "react-select": "^3.1.0",
-    "rich-markdown-editor": "^10.6.5",
-    "react-timeago": "^4.4.0",
-    "react-toastify": "^6.0.8",
    "styled-components": "^5.0.1",
    "typescript": "~3.7.2"
  },
@@ -91,10 +95,10 @@
    "@graphql-codegen/typescript-operations": "^1.13.2",
    "@graphql-codegen/typescript-react-apollo": "^1.13.2",
    "@storybook/addon-actions": "^5.3.13",
+    "@storybook/addon-links": "^5.3.13",
    "@storybook/addon-backgrounds": "^5.3.17",
    "@storybook/addon-docs": "^5.3.17",
    "@storybook/addon-knobs": "^5.3.17",
-    "@storybook/addon-links": "^5.3.13",
    "@storybook/addon-storysource": "^5.3.17",
    "@storybook/addon-viewport": "^5.3.17",
    "@storybook/addons": "^5.3.13",
--- a/frontend/src/Admin/index.tsx
+++ b/frontend/src/Admin/index.tsx
@@ -171,7 +171,7 @@ const AddUserPopup: React.FC<AddUserPopupProps> = ({ onAddUser }) => {

 const AdminRoute = () => {
  useEffect(() => {
-    document.title = 'Admin | Taskcafé';
+    document.title = 'Taskcafé | Admin';
  }, []);
  const { loading, data } = useUsersQuery();
  const { showPopup, hidePopup } = usePopup();
--- a/frontend/src/App/TopNavbar.tsx
+++ b/frontend/src/App/TopNavbar.tsx
@@ -7,7 +7,7 @@ import { useHistory } from 'react-router';
 import { PermissionLevel, PermissionObjectType, useCurrentUser } from 'App/context';
 import {
  RoleCode,
-  useTopNavbarQuery,
+  useMeQuery,
  useDeleteProjectMutation,
  useGetProjectsQuery,
  GetProjectsDocument,
@@ -19,7 +19,6 @@ import { Link } from 'react-router-dom';
 import MiniProfile from 'shared/components/MiniProfile';
 import cache from 'App/cache';
 import NOOP from 'shared/utils/noop';
-import NotificationPopup, { NotificationItem } from 'shared/components/NotifcationPopup';

 const TeamContainer = styled.div`
  display: flex;
@@ -198,7 +197,7 @@ export const ProjectPopup: React.FC<ProjectPopupProps> = ({ history, name, proje
      <Popup title={null} tab={0}>
        <ProjectSettings
          onDeleteProject={() => {
-            setTab(1, { width: 300 });
+            setTab(1, 300);
          }}
        />
      </Popup>
@@ -251,7 +250,7 @@ const GlobalTopNavbar: React.FC<GlobalTopNavbarProps> = ({
  onRemoveFromBoard,
 }) => {
  const { user, setUserRoles, setUser } = useCurrentUser();
-  const { loading, data } = useTopNavbarQuery({
+  const { data } = useMeQuery({
    onCompleted: response => {
      if (user && user.roles) {
        setUserRoles({
@@ -301,31 +300,13 @@ const GlobalTopNavbar: React.FC<GlobalTopNavbarProps> = ({
          }}
        />
      </Popup>,
-      { width: 195 },
+      195,
    );
  };

  const onOpenSettings = ($target: React.RefObject<HTMLElement>) => {
    if (popupContent) {
-      showPopup($target, popupContent, { width: 185 });
-    }
-  };
-
-  const onNotificationClick = ($target: React.RefObject<HTMLElement>) => {
-    if (data) {
-      showPopup(
-        $target,
-        <NotificationPopup>
-          {data.notifications.map(notification => (
-            <NotificationItem
-              title={notification.entity.name}
-              description={`${notification.actor.name} added you as a meber to the task "${notification.entity.name}"`}
-              createdAt={notification.createdAt}
-            />
-          ))}
-        </NotificationPopup>,
-        { width: 415, borders: false, diamondColor: '#7367f0' },
-      );
+      showPopup($target, popupContent, 185);
    }
  };

@@ -385,7 +366,7 @@ const GlobalTopNavbar: React.FC<GlobalTopNavbarProps> = ({
        onInviteUser={onInviteUser}
        onChangeRole={onChangeRole}
        onChangeProjectOwner={onChangeProjectOwner}
-        onNotificationClick={onNotificationClick}
+        onNotificationClick={NOOP}
        onSetTab={onSetTab}
        onRemoveFromBoard={onRemoveFromBoard}
        onDashboardClick={() => {
--- a/frontend/src/App/index.tsx
+++ b/frontend/src/App/index.tsx
@@ -3,7 +3,6 @@ import jwtDecode from 'jwt-decode';
 import { createBrowserHistory } from 'history';
 import { Router } from 'react-router';
 import { PopupProvider } from 'shared/components/PopupMenu';
-import { ToastContainer } from 'react-toastify';
 import { setAccessToken } from 'shared/utils/accessToken';
 import styled, { ThemeProvider } from 'styled-components';
 import NormalizeStyles from './NormalizeStyles';
@@ -12,39 +11,6 @@ import theme from './ThemeStyles';
 import Routes from './Routes';
 import { UserContext, CurrentUserRaw, CurrentUserRoles, PermissionLevel, PermissionObjectType } from './context';

-import 'react-toastify/dist/ReactToastify.css';
-
-const StyledContainer = styled(ToastContainer).attrs({
-  // custom props
-})`
-  .Toastify__toast-container {
-  }
-  .Toastify__toast {
-    padding: 5px;
-    margin-left: 5px;
-    margin-right: 5px;
-    border-radius: 10px;
-    background: #7367f0;
-    color: #fff;
-  }
-  .Toastify__toast--error {
-    background: rgba(${props => props.theme.colors.danger});
-  }
-  .Toastify__toast--warning {
-    background: rgba(${props => props.theme.colors.warning});
-  }
-  .Toastify__toast--success {
-    background: rgba(${props => props.theme.colors.success});
-  }
-  .Toastify__toast-body {
-  }
-  .Toastify__progress-bar {
-  }
-  .Toastify__close-button {
-    display: none;
-  }
-`;
-
 const history = createBrowserHistory();
 type RefreshTokenResponse = {
  accessToken: string;
@@ -106,18 +72,6 @@ const App = () => {
              )}
            </PopupProvider>
          </Router>
-          <StyledContainer
-            position="bottom-right"
-            autoClose={5000}
-            hideProgressBar
-            newestOnTop
-            closeOnClick
-            rtl={false}
-            pauseOnFocusLoss
-            draggable
-            pauseOnHover
-            limit={5}
-          />
        </ThemeProvider>
      </UserContext.Provider>
    </>
--- a/frontend/src/Install/index.tsx
+++ b/frontend/src/Install/index.tsx
@@ -59,7 +59,7 @@ const Install = () => {
                  } else {
                    const response: RefreshTokenResponse = await x.data;
                    const { accessToken: newToken, isInstalled } = response;
-                    const claims: JWTToken = jwtDecode(newToken);
+                    const claims: JWTToken = jwtDecode(accessToken);
                    const currentUser = {
                      id: claims.userId,
                      roles: {
@@ -69,7 +69,7 @@ const Install = () => {
                      },
                    };
                    setUser(currentUser);
-                    setAccessToken(newToken);
+                    setAccessToken(accessToken);
                    if (!isInstalled) {
                      history.replace('/install');
                    }
--- a/frontend/src/Profile/index.tsx
+++ b/frontend/src/Profile/index.tsx
@@ -3,32 +3,15 @@ import styled from 'styled-components/macro';
 import GlobalTopNavbar from 'App/TopNavbar';
 import { getAccessToken } from 'shared/utils/accessToken';
 import Settings from 'shared/components/Settings';
-import {
-  useMeQuery,
-  useClearProfileAvatarMutation,
-  useUpdateUserPasswordMutation,
-  useUpdateUserInfoMutation,
-  MeQuery,
-  MeDocument,
-} from 'shared/generated/graphql';
+import { useMeQuery, useClearProfileAvatarMutation, useUpdateUserPasswordMutation } from 'shared/generated/graphql';
 import axios from 'axios';
 import { useCurrentUser } from 'App/context';
 import NOOP from 'shared/utils/noop';
-import { toast } from 'react-toastify';
-import updateApolloCache from 'shared/utils/cache';
-import produce from 'immer';
-
-const MainContent = styled.div`
-  padding: 0 0 50px 80px;
-  height: 100%;
-  background: #262c49;
-`;

 const Projects = () => {
  const $fileUpload = useRef<HTMLInputElement>(null);
  const [clearProfileAvatar] = useClearProfileAvatarMutation();
  const { user } = useCurrentUser();
-  const [updateUserInfo] = useUpdateUserInfoMutation();
  const [updateUserPassword] = useUpdateUserPasswordMutation();
  const { loading, data, refetch } = useMeQuery();
  useEffect(() => {
@@ -76,14 +59,6 @@ const Projects = () => {
          }}
          onResetPassword={(password, done) => {
            updateUserPassword({ variables: { userID: user.id, password } });
-            toast('Password was changed!');
-            done();
-          }}
-          onChangeUserInfo={(d, done) => {
-            updateUserInfo({
-              variables: { name: d.full_name, bio: d.bio, email: d.email, initials: d.initials },
-            });
-            toast('User info was saved!');
            done();
          }}
          onProfileAvatarRemove={() => {
--- a/frontend/src/Projects/Project/Board/FilterMeta.tsx
+++ b/frontend/src/Projects/Project/Board/FilterMeta.tsx
@@ -1,324 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import styled, { css } from 'styled-components';
-import { Checkmark, User, Calendar, Tags, Clock } from 'shared/icons';
-import { TaskMetaFilters, TaskMeta, TaskMetaMatch, DueDateFilterType } from 'shared/components/Lists';
-import Input from 'shared/components/ControlledInput';
-import { Popup, usePopup } from 'shared/components/PopupMenu';
-import produce from 'immer';
-import moment from 'moment';
-import { mixin } from 'shared/utils/styles';
-import Member from 'shared/components/Member';
-
-const FilterMember = styled(Member)`
-  margin: 2px 0;
-  &:hover {
-    cursor: pointer;
-    background: rgba(${props => props.theme.colors.primary});
-  }
-`;
-
-export const Labels = styled.ul`
-  list-style: none;
-  margin: 0 8px;
-  padding: 0;
-  margin-bottom: 8px;
-`;
-
-export const Label = styled.li`
-  position: relative;
-`;
-
-export const CardLabel = styled.span<{ active: boolean; color: string }>`
-  ${props =>
-    props.active &&
-    css`
-      margin-left: 4px;
-      box-shadow: -8px 0 ${mixin.darken(props.color, 0.12)};
-      border-radius: 3px;
-    `}
-
-  cursor: pointer;
-  font-weight: 700;
-  margin: 0 0 4px;
-  min-height: 20px;
-  padding: 6px 12px;
-  position: relative;
-  transition: padding 85ms, margin 85ms, box-shadow 85ms;
-  background-color: ${props => props.color};
-  color: #fff;
-  display: block;
-  max-width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  min-height: 31px;
-`;
-
-export const ActionsList = styled.ul`
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const ActionItem = styled.li`
-  position: relative;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  &:hover {
-    background: rgb(115, 103, 240);
-  }
-`;
-
-export const ActionTitle = styled.span`
-  margin-left: 20px;
-`;
-
-const ActionItemSeparator = styled.li`
-  color: rgba(${props => props.theme.colors.text.primary}, 0.4);
-  font-size: 12px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.75rem;
-  padding-bottom: 0.25rem;
-`;
-
-const ActiveIcon = styled(Checkmark)`
-  position: absolute;
-  right: 4px;
-`;
-
-const ItemIcon = styled.div`
-  position: absolute;
-`;
-
-const TaskNameInput = styled(Input)`
-  margin: 0;
-`;
-
-const ActionItemLine = styled.div`
-  height: 1px;
-  border-top: 1px solid #414561;
-  margin: 0.25rem !important;
-`;
-
-type FilterMetaProps = {
-  filters: TaskMetaFilters;
-  userID: string;
-  labels: React.RefObject<Array<ProjectLabel>>;
-  members: React.RefObject<Array<TaskUser>>;
-  onChangeTaskMetaFilter: (filters: TaskMetaFilters) => void;
-};
-
-const FilterMeta: React.FC<FilterMetaProps> = ({ filters, onChangeTaskMetaFilter, userID, labels, members }) => {
-  const [currentFilters, setFilters] = useState(filters);
-  const [nameFilter, setNameFilter] = useState(filters.taskName ? filters.taskName.name : '');
-  const [currentLabel, setCurrentLabel] = useState('');
-
-  const handleSetFilters = (f: TaskMetaFilters) => {
-    setFilters(f);
-    onChangeTaskMetaFilter(f);
-  };
-
-  const handleNameChange = (nFilter: string) => {
-    handleSetFilters(
-      produce(currentFilters, draftFilters => {
-        draftFilters.taskName = nFilter !== '' ? { name: nFilter } : null;
-      }),
-    );
-    setNameFilter(nFilter);
-  };
-
-  const { setTab } = usePopup();
-
-  const handleSetDueDate = (filterType: DueDateFilterType, label: string) => {
-    handleSetFilters(
-      produce(currentFilters, draftFilters => {
-        if (draftFilters.dueDate && draftFilters.dueDate.type === filterType) {
-          draftFilters.dueDate = null;
-        } else {
-          draftFilters.dueDate = {
-            label,
-            type: filterType,
-          };
-        }
-      }),
-    );
-  };
-
-  return (
-    <>
-      <Popup tab={0} title={null}>
-        <ActionsList>
-          <TaskNameInput
-            width="100%"
-            onChange={e => handleNameChange(e.currentTarget.value)}
-            value={nameFilter}
-            variant="alternate"
-            placeholder="Task name..."
-          />
-          <ActionItemSeparator>QUICK ADD</ActionItemSeparator>
-          <ActionItem
-            onClick={() => {
-              handleSetFilters(
-                produce(currentFilters, draftFilters => {
-                  if (members.current) {
-                    const member = members.current.find(m => m.id === userID);
-                    const draftMember = draftFilters.members.find(m => m.id === userID);
-                    if (member && !draftMember) {
-                      draftFilters.members.push({ id: userID, username: member.username ? member.username : '' });
-                    } else {
-                      draftFilters.members = draftFilters.members.filter(m => m.id !== userID);
-                    }
-                  }
-                }),
-              );
-            }}
-          >
-            <ItemIcon>
-              <User width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>Just my tasks</ActionTitle>
-            {currentFilters.members.find(m => m.id === userID) && <ActiveIcon width={12} height={12} />}
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.THIS_WEEK, 'Due this week')}>
-            <ItemIcon>
-              <Calendar width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>Due this week</ActionTitle>
-            {currentFilters.dueDate && currentFilters.dueDate.type === DueDateFilterType.THIS_WEEK && (
-              <ActiveIcon width={12} height={12} />
-            )}
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.NEXT_WEEK, 'Due next week')}>
-            <ItemIcon>
-              <Calendar width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>Due next week</ActionTitle>
-            {currentFilters.dueDate && currentFilters.dueDate.type === DueDateFilterType.NEXT_WEEK && (
-              <ActiveIcon width={12} height={12} />
-            )}
-          </ActionItem>
-          <ActionItemLine />
-          <ActionItem onClick={() => setTab(1)}>
-            <ItemIcon>
-              <Tags width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>By Label</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => setTab(2)}>
-            <ItemIcon>
-              <User width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>By Member</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => setTab(3)}>
-            <ItemIcon>
-              <Clock width={12} height={12} />
-            </ItemIcon>
-            <ActionTitle>By Due Date</ActionTitle>
-          </ActionItem>
-        </ActionsList>
-      </Popup>
-      <Popup tab={1} title="By Labels">
-        <Labels>
-          {labels.current &&
-            labels.current
-              // .filter(label => '' === '' || (label.name && label.name.toLowerCase().startsWith(''.toLowerCase())))
-              .map(label => (
-                <Label key={label.id}>
-                  <CardLabel
-                    key={label.id}
-                    color={label.labelColor.colorHex}
-                    active={currentLabel === label.id}
-                    onMouseEnter={() => {
-                      setCurrentLabel(label.id);
-                    }}
-                    onClick={() => {
-                      handleSetFilters(
-                        produce(currentFilters, draftFilters => {
-                          if (draftFilters.labels.find(l => l.id === label.id)) {
-                            draftFilters.labels = draftFilters.labels.filter(l => l.id !== label.id);
-                          } else {
-                            draftFilters.labels.push({
-                              id: label.id,
-                              name: label.name ?? '',
-                              color: label.labelColor.colorHex,
-                            });
-                          }
-                        }),
-                      );
-                    }}
-                  >
-                    {label.name}
-                  </CardLabel>
-                </Label>
-              ))}
-        </Labels>
-      </Popup>
-      <Popup tab={2} title="By Member">
-        <ActionsList>
-          {members.current &&
-            members.current.map(member => (
-              <FilterMember
-                key={member.id}
-                member={member}
-                showName
-                onCardMemberClick={() => {
-                  handleSetFilters(
-                    produce(currentFilters, draftFilters => {
-                      if (draftFilters.members.find(m => m.id === member.id)) {
-                        draftFilters.members = draftFilters.members.filter(m => m.id !== member.id);
-                      } else {
-                        draftFilters.members.push({ id: member.id, username: member.username ?? '' });
-                      }
-                    }),
-                  );
-                }}
-              />
-            ))}
-        </ActionsList>
-      </Popup>
-      <Popup tab={3} title="By Due Date">
-        <ActionsList>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.TODAY, 'Today')}>
-            <ActionTitle>Today</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.THIS_WEEK, 'Due this week')}>
-            <ActionTitle>This week</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.NEXT_WEEK, 'Due next week')}>
-            <ActionTitle>Next week</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.OVERDUE, 'Overdue')}>
-            <ActionTitle>Overdue</ActionTitle>
-          </ActionItem>
-          <ActionItemLine />
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.TOMORROW, 'In the next day')}>
-            <ActionTitle>In the next day</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.ONE_WEEK, 'In the next week')}>
-            <ActionTitle>In the next week</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.TWO_WEEKS, 'In the next two weeks')}>
-            <ActionTitle>In the next two weeks</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.THREE_WEEKS, 'In the next three weeks')}>
-            <ActionTitle>In the next three weeks</ActionTitle>
-          </ActionItem>
-          <ActionItem onClick={() => handleSetDueDate(DueDateFilterType.NO_DUE_DATE, 'Has no due date')}>
-            <ActionTitle>Has no due date</ActionTitle>
-          </ActionItem>
-        </ActionsList>
-      </Popup>
-    </>
-  );
-};
-
-export default FilterMeta;
--- a/frontend/src/Projects/Project/Board/FilterStatus.tsx
+++ b/frontend/src/Projects/Project/Board/FilterStatus.tsx
@@ -1,149 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-import { Checkmark } from 'shared/icons';
-import { TaskStatusFilter, TaskStatus, TaskSince } from 'shared/components/Lists';
-
-export const ActionsList = styled.ul`
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const ActionExtraMenuContainer = styled.div`
-  visibility: hidden;
-  position: absolute;
-  left: 100%;
-  top: -4px;
-  padding-left: 2px;
-  width: 100%;
-`;
-
-export const ActionItem = styled.li`
-  position: relative;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  &:hover {
-    background: rgb(115, 103, 240);
-  }
-  &:hover ${ActionExtraMenuContainer} {
-    visibility: visible;
-  }
-`;
-
-export const ActionTitle = styled.span`
-  margin-left: 20px;
-`;
-
-export const ActionExtraMenu = styled.ul`
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-direction: column;
-
-  padding: 5px;
-  padding-top: 8px;
-  border-radius: 5px;
-  box-shadow: 0 5px 25px 0 rgba(0, 0, 0, 0.1);
-
-  color: #c2c6dc;
-  background: #262c49;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-color: #414561;
-`;
-
-export const ActionExtraMenuItem = styled.li`
-  position: relative;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  &:hover {
-    background: rgb(115, 103, 240);
-  }
-`;
-const ActionExtraMenuSeparator = styled.li`
-  color: rgba(${props => props.theme.colors.text.primary}, 0.4);
-  font-size: 12px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.25rem;
-  padding-bottom: 0.25rem;
-`;
-
-const ActiveIcon = styled(Checkmark)`
-  position: absolute;
-`;
-
-type FilterStatusProps = {
-  filter: TaskStatusFilter;
-  onChangeTaskStatusFilter: (filter: TaskStatusFilter) => void;
-};
-
-const FilterStatus: React.FC<FilterStatusProps> = ({ filter, onChangeTaskStatusFilter }) => {
-  const [currentFilter, setFilter] = useState(filter);
-  const handleFilterChange = (f: TaskStatusFilter) => {
-    setFilter(f);
-    onChangeTaskStatusFilter(f);
-  };
-  const handleCompleteClick = (s: TaskSince) => {
-    handleFilterChange({ status: TaskStatus.COMPLETE, since: s });
-  };
-  return (
-    <ActionsList>
-      <ActionItem onClick={() => handleFilterChange({ status: TaskStatus.INCOMPLETE, since: TaskSince.ALL })}>
-        {currentFilter.status === TaskStatus.INCOMPLETE && <ActiveIcon width={12} height={12} />}
-        <ActionTitle>Incomplete Tasks</ActionTitle>
-      </ActionItem>
-      <ActionItem>
-        {currentFilter.status === TaskStatus.COMPLETE && <ActiveIcon width={12} height={12} />}
-        <ActionTitle>Compelete Tasks</ActionTitle>
-        <ActionExtraMenuContainer>
-          <ActionExtraMenu>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.ALL)}>
-              {currentFilter.since === TaskSince.ALL && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>All completed tasks</ActionTitle>
-            </ActionExtraMenuItem>
-            <ActionExtraMenuSeparator>Marked complete since</ActionExtraMenuSeparator>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.TODAY)}>
-              {currentFilter.since === TaskSince.TODAY && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>Today</ActionTitle>
-            </ActionExtraMenuItem>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.YESTERDAY)}>
-              {currentFilter.since === TaskSince.YESTERDAY && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>Yesterday</ActionTitle>
-            </ActionExtraMenuItem>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.ONE_WEEK)}>
-              {currentFilter.since === TaskSince.ONE_WEEK && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>1 week</ActionTitle>
-            </ActionExtraMenuItem>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.TWO_WEEKS)}>
-              {currentFilter.since === TaskSince.TWO_WEEKS && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>2 weeks</ActionTitle>
-            </ActionExtraMenuItem>
-            <ActionExtraMenuItem onClick={() => handleCompleteClick(TaskSince.THREE_WEEKS)}>
-              {currentFilter.since === TaskSince.THREE_WEEKS && <ActiveIcon width={12} height={12} />}
-              <ActionTitle>3 weeks</ActionTitle>
-            </ActionExtraMenuItem>
-          </ActionExtraMenu>
-        </ActionExtraMenuContainer>
-      </ActionItem>
-      <ActionItem onClick={() => handleFilterChange({ status: TaskStatus.ALL, since: TaskSince.ALL })}>
-        {currentFilter.status === TaskStatus.ALL && <ActiveIcon width={12} height={12} />}
-        <ActionTitle>All Tasks</ActionTitle>
-      </ActionItem>
-    </ActionsList>
-  );
-};
-
-export default FilterStatus;
--- a/frontend/src/Projects/Project/Board/SortPopup.tsx
+++ b/frontend/src/Projects/Project/Board/SortPopup.tsx
@@ -1,80 +0,0 @@
-import React, { useState } from 'react';
-import styled from 'styled-components';
-import { TaskSorting, TaskSortingType, TaskSortingDirection } from 'shared/utils/sorting';
-
-export const ActionsList = styled.ul`
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const ActionItem = styled.li`
-  position: relative;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-  &:hover {
-    background: rgb(115, 103, 240);
-  }
-`;
-
-export const ActionTitle = styled.span`
-  margin-left: 20px;
-`;
-
-const ActionItemSeparator = styled.li`
-  color: rgba(${props => props.theme.colors.text.primary}, 0.4);
-  font-size: 12px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 0.75rem;
-  padding-bottom: 0.25rem;
-`;
-
-type SortPopupProps = {
-  sorting: TaskSorting;
-  onChangeTaskSorting: (taskSorting: TaskSorting) => void;
-};
-
-const SortPopup: React.FC<SortPopupProps> = ({ sorting, onChangeTaskSorting }) => {
-  const [currentSorting, setSorting] = useState(sorting);
-  const handleSetSorting = (s: TaskSorting) => {
-    setSorting(s);
-    onChangeTaskSorting(s);
-  };
-  return (
-    <ActionsList>
-      <ActionItem onClick={() => handleSetSorting({ type: TaskSortingType.NONE, direction: TaskSortingDirection.ASC })}>
-        <ActionTitle>None</ActionTitle>
-      </ActionItem>
-      <ActionItem
-        onClick={() => handleSetSorting({ type: TaskSortingType.DUE_DATE, direction: TaskSortingDirection.ASC })}
-      >
-        <ActionTitle>Due date</ActionTitle>
-      </ActionItem>
-      <ActionItem
-        onClick={() => handleSetSorting({ type: TaskSortingType.MEMBERS, direction: TaskSortingDirection.ASC })}
-      >
-        <ActionTitle>Members</ActionTitle>
-      </ActionItem>
-      <ActionItem
-        onClick={() => handleSetSorting({ type: TaskSortingType.LABELS, direction: TaskSortingDirection.ASC })}
-      >
-        <ActionTitle>Labels</ActionTitle>
-      </ActionItem>
-      <ActionItem
-        onClick={() => handleSetSorting({ type: TaskSortingType.TASK_TITLE, direction: TaskSortingDirection.ASC })}
-      >
-        <ActionTitle>Task title</ActionTitle>
-      </ActionItem>
-    </ActionsList>
-  );
-};
-
-export default SortPopup;
--- a/frontend/src/Projects/Project/Board/index.tsx
+++ b/frontend/src/Projects/Project/Board/index.tsx
@@ -8,7 +8,6 @@ import {
  useSetTaskCompleteMutation,
  useToggleTaskLabelMutation,
  useFindProjectQuery,
-  useSortTaskGroupMutation,
  useUpdateTaskGroupNameMutation,
  useUpdateTaskNameMutation,
  useCreateTaskMutation,
@@ -22,101 +21,18 @@ import {
  useUnassignTaskMutation,
  useUpdateTaskDueDateMutation,
  FindProjectQuery,
-  useDuplicateTaskGroupMutation,
-  DuplicateTaskGroupMutation,
-  DuplicateTaskGroupDocument,
-  useDeleteTaskGroupTasksMutation,
 } from 'shared/generated/graphql';

 import QuickCardEditor from 'shared/components/QuickCardEditor';
 import ListActions from 'shared/components/ListActions';
 import MemberManager from 'shared/components/MemberManager';
-import SimpleLists, {
-  TaskStatus,
-  TaskSince,
-  TaskStatusFilter,
-  TaskMeta,
-  TaskMetaMatch,
-  TaskMetaFilters,
-} from 'shared/components/Lists';
-import { TaskSorting, TaskSortingType, TaskSortingDirection, sortTasks } from 'shared/utils/sorting';
+import SimpleLists from 'shared/components/Lists';
 import produce from 'immer';
 import MiniProfile from 'shared/components/MiniProfile';
 import DueDateManager from 'shared/components/DueDateManager';
 import EmptyBoard from 'shared/components/EmptyBoard';
 import NOOP from 'shared/utils/noop';
 import LabelManagerEditor from 'Projects/Project/LabelManagerEditor';
-import Chip from 'shared/components/Chip';
-import { toast } from 'react-toastify';
-import { useCurrentUser } from 'App/context';
-import FilterStatus from './FilterStatus';
-import FilterMeta from './FilterMeta';
-import SortPopup from './SortPopup';
-
-const FilterChip = styled(Chip)`
-  margin-right: 4px;
-`;
-
-type MetaFilterCloseFn = (meta: TaskMeta, key: string) => void;
-
-const renderTaskSortingLabel = (sorting: TaskSorting) => {
-  if (sorting.type === TaskSortingType.TASK_TITLE) {
-    return 'Sort: Card title';
-  }
-  if (sorting.type === TaskSortingType.MEMBERS) {
-    return 'Sort: Members';
-  }
-  if (sorting.type === TaskSortingType.DUE_DATE) {
-    return 'Sort: Due Date';
-  }
-  if (sorting.type === TaskSortingType.LABELS) {
-    return 'Sort: Labels';
-  }
-  return 'Sort';
-};
-
-const renderMetaFilters = (filters: TaskMetaFilters, onClose: MetaFilterCloseFn) => {
-  const filterChips = [];
-  if (filters.taskName) {
-    filterChips.push(
-      <FilterChip
-        key="task-name"
-        label={`Title: ${filters.taskName.name}`}
-        onClose={() => onClose(TaskMeta.TITLE, 'task-name')}
-      />,
-    );
-  }
-
-  if (filters.dueDate) {
-    filterChips.push(
-      <FilterChip
-        key="due-date"
-        label={filters.dueDate.label}
-        onClose={() => onClose(TaskMeta.DUE_DATE, 'due-date')}
-      />,
-    );
-  }
-  for (const memberFilter of filters.members) {
-    filterChips.push(
-      <FilterChip
-        key={`member-${memberFilter.id}`}
-        label={`Member: ${memberFilter.username}`}
-        onClose={() => onClose(TaskMeta.MEMBER, memberFilter.id)}
-      />,
-    );
-  }
-  for (const labelFilter of filters.labels) {
-    filterChips.push(
-      <FilterChip
-        key={`label-${labelFilter.id}`}
-        label={labelFilter.name === '' ? 'Label' : `Label: ${labelFilter.name}`}
-        color={labelFilter.color}
-        onClose={() => onClose(TaskMeta.LABEL, labelFilter.id)}
-      />,
-    );
-  }
-  return filterChips;
-};

 const ProjectBar = styled.div`
  display: flex;
@@ -131,14 +47,14 @@ const ProjectActions = styled.div`
  align-items: center;
 `;

-const ProjectActionWrapper = styled.div<{ disabled?: boolean }>`
+const ProjectAction = styled.div<{ disabled?: boolean }>`
  cursor: pointer;
  display: flex;
  align-items: center;
  font-size: 15px;
  color: rgba(${props => props.theme.colors.text.primary});

-  &:not(:last-of-type) {
+  &:not(:last-child) {
    margin-right: 16px;
  }

@@ -158,25 +74,6 @@ const ProjectActionText = styled.span`
  padding-left: 4px;
 `;

-type ProjectActionProps = {
-  onClick?: (target: React.RefObject<HTMLElement>) => void;
-  disabled?: boolean;
-};
-
-const ProjectAction: React.FC<ProjectActionProps> = ({ onClick, disabled = false, children }) => {
-  const $container = useRef<HTMLDivElement>(null);
-  const handleClick = () => {
-    if (onClick) {
-      onClick($container);
-    }
-  };
-  return (
-    <ProjectActionWrapper ref={$container} onClick={handleClick} disabled={disabled}>
-      {children}
-    </ProjectActionWrapper>
-  );
-};
-
 interface QuickCardEditorState {
  isOpen: boolean;
  target: React.RefObject<HTMLElement> | null;
@@ -202,18 +99,18 @@ export const BoardLoading = () => {
    <>
      <ProjectBar>
        <ProjectActions>
-          <ProjectAction>
+          <ProjectAction disabled>
            <CheckCircle width={13} height={13} />
            <ProjectActionText>All Tasks</ProjectActionText>
          </ProjectAction>
-          <ProjectAction>
-            <Sort width={13} height={13} />
-            <ProjectActionText>Sort</ProjectActionText>
-          </ProjectAction>
-          <ProjectAction>
+          <ProjectAction disabled>
            <Filter width={13} height={13} />
            <ProjectActionText>Filter</ProjectActionText>
          </ProjectAction>
+          <ProjectAction disabled>
+            <Sort width={13} height={13} />
+            <ProjectActionText>Sort</ProjectActionText>
+          </ProjectAction>
        </ProjectActions>
        <ProjectActions>
          <ProjectAction>
@@ -235,43 +132,17 @@ export const BoardLoading = () => {
  );
 };

-const initTaskStatusFilter: TaskStatusFilter = {
-  status: TaskStatus.ALL,
-  since: TaskSince.ALL,
-};
-
-const initTaskMetaFilters: TaskMetaFilters = {
-  match: TaskMetaMatch.MATCH_ANY,
-  dueDate: null,
-  taskName: null,
-  labels: [],
-  members: [],
-};
-
-const initTaskSorting: TaskSorting = {
-  type: TaskSortingType.NONE,
-  direction: TaskSortingDirection.ASC,
-};
-
 const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick, cardLabelVariant }) => {
  const [assignTask] = useAssignTaskMutation();
  const [unassignTask] = useUnassignTaskMutation();
+  const $labelsRef = useRef<HTMLDivElement>(null);
  const match = useRouteMatch();
  const labelsRef = useRef<Array<ProjectLabel>>([]);
-  const membersRef = useRef<Array<TaskUser>>([]);
  const { showPopup, hidePopup } = usePopup();
  const taskLabelsRef = useRef<Array<TaskLabel>>([]);
  const [quickCardEditor, setQuickCardEditor] = useState(initialQuickCardEditorState);
  const [updateTaskGroupLocation] = useUpdateTaskGroupLocationMutation({});
-  const [taskStatusFilter, setTaskStatusFilter] = useState(initTaskStatusFilter);
-  const [taskMetaFilters, setTaskMetaFilters] = useState(initTaskMetaFilters);
-  const [taskSorting, setTaskSorting] = useState(initTaskSorting);
  const history = useHistory();
-  const [sortTaskGroup] = useSortTaskGroupMutation({
-    onCompleted: () => {
-      toast('List was sorted');
-    },
-  });
  const [deleteTaskGroup] = useDeleteTaskGroupMutation({
    update: (client, deletedTaskGroupData) => {
      updateApolloCache<FindProjectQuery>(
@@ -324,36 +195,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
  const { loading, data } = useFindProjectQuery({
    variables: { projectID },
  });
-  const [deleteTaskGroupTasks] = useDeleteTaskGroupTasksMutation({
-    update: (client, resp) =>
-      updateApolloCache<FindProjectQuery>(
-        client,
-        FindProjectDocument,
-        cache =>
-          produce(cache, draftCache => {
-            const idx = cache.findProject.taskGroups.findIndex(
-              t => t.id === resp.data.deleteTaskGroupTasks.taskGroupID,
-            );
-            if (idx !== -1) {
-              draftCache.findProject.taskGroups[idx].tasks = [];
-            }
-          }),
-        { projectID },
-      ),
-  });
-  const [duplicateTaskGroup] = useDuplicateTaskGroupMutation({
-    update: (client, resp) => {
-      updateApolloCache<FindProjectQuery>(
-        client,
-        FindProjectDocument,
-        cache =>
-          produce(cache, draftCache => {
-            draftCache.findProject.taskGroups.push(resp.data.duplicateTaskGroup.taskGroup);
-          }),
-        { projectID },
-      );
-    },
-  });

  const [updateTaskDueDate] = useUpdateTaskDueDateMutation();
  const [setTaskComplete] = useSetTaskCompleteMutation();
@@ -384,7 +225,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
      );
    },
  });
-  const { user } = useCurrentUser();
  const [deleteTask] = useDeleteTaskMutation();
  const [toggleTaskLabel] = useToggleTaskLabelMutation({
    onCompleted: newTaskLabel => {
@@ -414,7 +254,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
              id: `${Math.round(Math.random() * -1000000)}`,
              name,
              complete: false,
-              completedAt: null,
              taskGroup: {
                __typename: 'TaskGroup',
                id: taskGroup.id,
@@ -451,18 +290,8 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
  if (loading) {
    return <BoardLoading />;
  }
-  const getTaskStatusFilterLabel = (filter: TaskStatusFilter) => {
-    if (filter.status === TaskStatus.COMPLETE) {
-      return 'Complete';
-    }
-    if (filter.status === TaskStatus.INCOMPLETE) {
-      return 'Incomplete';
-    }
-    return 'All Tasks';
-  };
-  if (data && user) {
+  if (data) {
    labelsRef.current = data.findProject.labels;
-    membersRef.current = data.findProject.members;
    const onQuickEditorOpen = ($target: React.RefObject<HTMLElement>, taskID: string, taskGroupID: string) => {
      const taskGroup = data.findProject.taskGroups.find(t => t.id === taskGroupID);
      const currentTask = taskGroup ? taskGroup.tasks.find(t => t.id === taskID) : null;
@@ -486,84 +315,23 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
      <>
        <ProjectBar>
          <ProjectActions>
-            <ProjectAction
-              onClick={target => {
-                showPopup(
-                  target,
-                  <Popup tab={0} title={null}>
-                    <FilterStatus
-                      filter={taskStatusFilter}
-                      onChangeTaskStatusFilter={filter => {
-                        setTaskStatusFilter(filter);
-                        hidePopup();
-                      }}
-                    />
-                  </Popup>,
-                  { width: 185 },
-                );
-              }}
-            >
+            <ProjectAction disabled>
              <CheckCircle width={13} height={13} />
-              <ProjectActionText>{getTaskStatusFilterLabel(taskStatusFilter)}</ProjectActionText>
+              <ProjectActionText>All Tasks</ProjectActionText>
            </ProjectAction>
-            <ProjectAction
-              onClick={target => {
-                showPopup(
-                  target,
-                  <Popup tab={0} title={null}>
-                    <SortPopup
-                      sorting={taskSorting}
-                      onChangeTaskSorting={sorting => {
-                        setTaskSorting(sorting);
-                      }}
-                    />
-                  </Popup>,
-                  { width: 185 },
-                );
-              }}
-            >
-              <Sort width={13} height={13} />
-              <ProjectActionText>{renderTaskSortingLabel(taskSorting)}</ProjectActionText>
-            </ProjectAction>
-            <ProjectAction
-              onClick={target => {
-                showPopup(
-                  target,
-                  <FilterMeta
-                    filters={taskMetaFilters}
-                    onChangeTaskMetaFilter={filter => {
-                      setTaskMetaFilters(filter);
-                    }}
-                    userID={user?.id}
-                    labels={labelsRef}
-                    members={membersRef}
-                  />,
-                  { width: 200 },
-                );
-              }}
-            >
+            <ProjectAction disabled>
              <Filter width={13} height={13} />
              <ProjectActionText>Filter</ProjectActionText>
            </ProjectAction>
-            {renderMetaFilters(taskMetaFilters, (meta, id) => {
-              setTaskMetaFilters(
-                produce(taskMetaFilters, draftFilters => {
-                  if (meta === TaskMeta.MEMBER) {
-                    draftFilters.members = draftFilters.members.filter(m => m.id !== id);
-                  } else if (meta === TaskMeta.LABEL) {
-                    draftFilters.labels = draftFilters.labels.filter(m => m.id !== id);
-                  } else if (meta === TaskMeta.TITLE) {
-                    draftFilters.taskName = null;
-                  } else if (meta === TaskMeta.DUE_DATE) {
-                    draftFilters.dueDate = null;
-                  }
-                }),
-              );
-            })}
+            <ProjectAction disabled>
+              <Sort width={13} height={13} />
+              <ProjectActionText>Sort</ProjectActionText>
+            </ProjectAction>
          </ProjectActions>
          <ProjectActions>
            <ProjectAction
-              onClick={$labelsRef => {
+              ref={$labelsRef}
+              onClick={() => {
                showPopup(
                  $labelsRef,
                  <LabelManagerEditor
@@ -636,9 +404,6 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
            });
          }}
          taskGroups={data.findProject.taskGroups}
-          taskStatusFilter={taskStatusFilter}
-          taskMetaFilters={taskMetaFilters}
-          taskSorting={taskSorting}
          onCreateTask={onCreateTask}
          onCreateTaskGroup={onCreateList}
          onCardMemberClick={($targetRef, _taskID, memberID) => {
@@ -663,44 +428,15 @@ const ProjectBoard: React.FC<ProjectBoardProps> = ({ projectID, onCardLabelClick
          onExtraMenuOpen={(taskGroupID: string, $targetRef: any) => {
            showPopup(
              $targetRef,
-              <ListActions
-                taskGroupID={taskGroupID}
-                onDeleteTaskGroupTasks={() => {
-                  deleteTaskGroupTasks({ variables: { taskGroupID } });
-                  hidePopup();
-                }}
-                onSortTaskGroup={taskSort => {
-                  const taskGroup = data.findProject.taskGroups.find(t => t.id === taskGroupID);
-                  if (taskGroup) {
-                    const tasks: Array<{ taskID: string; position: number }> = taskGroup.tasks
-                      .sort((a, b) => sortTasks(a, b, taskSort))
-                      .reduce((prevTasks: Array<{ taskID: string; position: number }>, t, idx) => {
-                        prevTasks.push({ taskID: t.id, position: (idx + 1) * 2048 });
-                        return tasks;
-                      }, []);
-                    sortTaskGroup({ variables: { taskGroupID, tasks } });
+              <Popup title="List actions" tab={0} onClose={() => hidePopup()}>
+                <ListActions
+                  taskGroupID={taskGroupID}
+                  onArchiveTaskGroup={tgID => {
+                    deleteTaskGroup({ variables: { taskGroupID: tgID } });
                    hidePopup();
-                  }
-                }}
-                onDuplicateTaskGroup={newName => {
-                  const idx = data.findProject.taskGroups.findIndex(t => t.id === taskGroupID);
-                  if (idx !== -1) {
-                    const taskGroups = data.findProject.taskGroups.sort((a, b) => a.position - b.position);
-                    const prevPos = taskGroups[idx].position;
-                    const next = taskGroups[idx + 1];
-                    let newPos = prevPos * 2;
-                    if (next) {
-                      newPos = (prevPos + next.position) / 2.0;
-                    }
-                    duplicateTaskGroup({ variables: { projectID, taskGroupID, name: newName, position: newPos } });
-                    hidePopup();
-                  }
-                }}
-                onArchiveTaskGroup={tgID => {
-                  deleteTaskGroup({ variables: { taskGroupID: tgID } });
-                  hidePopup();
-                }}
-              />,
+                  }}
+                />
+              </Popup>,
            );
          }}
        />
--- a/frontend/src/Projects/Project/Details/index.tsx
+++ b/frontend/src/Projects/Project/Details/index.tsx
@@ -290,22 +290,21 @@ const Details: React.FC<DetailsProps> = ({
    },
  });
  if (loading) {
-    return null;
+    return <div>loading</div>;
  }
  if (!data) {
-    return null;
+    return <div>loading</div>;
  }
  return (
    <>
      <Modal
-        width={1070}
+        width={768}
        onClose={() => {
          history.push(projectURL);
        }}
        renderContent={() => {
          return (
            <TaskDetails
-              me={data.me.user}
              task={data.findTask}
              onChecklistDrop={checklist => {
                updateTaskChecklistLocation({
@@ -501,7 +500,6 @@ const Details: React.FC<DetailsProps> = ({
                      onCancel={NOOP}
                    />
                  </Popup>,
-                  { showDiamond: false, targetPadding: '0' },
                );
              }}
            />
--- a/frontend/src/Projects/Project/index.tsx
+++ b/frontend/src/Projects/Project/index.tsx
@@ -270,17 +270,7 @@ const Project = () => {
                updateTaskName({ variables: { taskID: updatedTask.id, name: newName } });
              }}
              onTaskDescriptionChange={(updatedTask, newDescription) => {
-                updateTaskDescription({
-                  variables: { taskID: updatedTask.id, description: newDescription },
-                  optimisticResponse: {
-                    __typename: 'Mutation',
-                    updateTaskDescription: {
-                      __typename: 'Task',
-                      id: updatedTask.id,
-                      description: newDescription,
-                    },
-                  },
-                });
+                updateTaskDescription({ variables: { taskID: updatedTask.id, description: newDescription } });
              }}
              onDeleteTask={deletedTask => {
                deleteTask({ variables: { taskID: deletedTask.id } });
--- a/frontend/src/Projects/index.tsx
+++ b/frontend/src/Projects/index.tsx
@@ -8,8 +8,6 @@ import {
  useCreateProjectMutation,
  GetProjectsDocument,
  GetProjectsQuery,
-  MeQuery,
-  MeDocument,
 } from 'shared/generated/graphql';

 import { Link } from 'react-router-dom';
@@ -262,7 +260,11 @@ const Projects = () => {
    },
  });
  if (loading) {
-    return <GlobalTopNavbar onSaveProjectName={NOOP} projectID={null} name={null} />;
+    return (
+      <>
+        <span>loading</span>
+      </>
+    );
  }

  const colors = ['#e362e3', '#7a6ff0', '#37c5ab', '#aa62e3', '#e8384f'];
--- a/frontend/src/Teams/index.tsx
+++ b/frontend/src/Teams/index.tsx
@@ -57,7 +57,7 @@ export const TeamPopup: React.FC<TeamPopupProps> = ({ history, name, teamID }) =
      <Popup title={null} tab={0}>
        <TeamSettings
          onDeleteTeam={() => {
-            setTab(1, { width: 340 });
+            setTab(1, 340);
          }}
        />
      </Popup>
@@ -85,30 +85,18 @@ type TeamsRouteProps = {
 const Teams = () => {
  const { teamID } = useParams<TeamsRouteProps>();
  const history = useHistory();
-  const { loading, data } = useGetTeamQuery({
-    variables: { teamID },
-    onCompleted: resp => {
-      document.title = `${resp.findTeam.name} | Taskcafé`;
-    },
-  });
+  const { loading, data } = useGetTeamQuery({ variables: { teamID } });
  const { user } = useCurrentUser();
  const [currentTab, setCurrentTab] = useState(0);
  const match = useRouteMatch();
+  useEffect(() => {
+    document.title = 'Teams | Taskcafé';
+  }, []);
  if (loading) {
    return (
-      <GlobalTopNavbar
-        menuType={[
-          { name: 'Projects', link: `${match.url}` },
-          { name: 'Members', link: `${match.url}/members` },
-        ]}
-        currentTab={currentTab}
-        onSetTab={tab => {
-          setCurrentTab(tab);
-        }}
-        onSaveProjectName={NOOP}
-        projectID={null}
-        name={null}
-      />
+      <>
+        <span>loading</span>
+      </>
    );
  }
  if (data && user) {
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -8,7 +8,6 @@ import { HttpLink } from 'apollo-link-http';
 import { onError } from 'apollo-link-error';
 import { enableMapSet } from 'immer';
 import { ApolloLink, Observable, fromPromise } from 'apollo-link';
-import moment from 'moment';
 import { getAccessToken, getNewToken, setAccessToken } from 'shared/utils/accessToken';
 import cache from './App/cache';
 import App from './App';
@@ -16,13 +15,6 @@ import App from './App';
 // https://able.bio/AnasT/apollo-graphql-async-access-token-refresh--470t1c8
 enableMapSet();

-moment.updateLocale('en', {
-  week: {
-    dow: 1, // First day of week is Monday
-    doy: 7, // First week of year must contain 1 January (7 + 1 - 1)
-  },
-});
-
 let forward$;
 let isRefreshing = false;
 let pendingRequests: any = [];
--- a/frontend/src/shared/components/AddList/index.tsx
+++ b/frontend/src/shared/components/AddList/index.tsx
@@ -16,12 +16,11 @@ import {
 } from './Styles';

 type NameEditorProps = {
-  buttonLabel?: string;
  onSave: (listName: string) => void;
  onCancel: () => void;
 };

-export const NameEditor: React.FC<NameEditorProps> = ({ onSave: handleSave, onCancel, buttonLabel = 'Save' }) => {
+const NameEditor: React.FC<NameEditorProps> = ({ onSave, onCancel }) => {
  const $editorRef = useRef<HTMLTextAreaElement>(null);
  const [listName, setListName] = useState('');
  useEffect(() => {
@@ -29,11 +28,6 @@ export const NameEditor: React.FC<NameEditorProps> = ({ onSave: handleSave, onCa
      $editorRef.current.focus();
    }
  });
-  const onSave = (newName: string) => {
-    if (newName.replace(/\s+/g, '') !== '') {
-      handleSave(newName);
-    }
-  };
  const onKeyDown = (e: React.KeyboardEvent) => {
    if (e.key === 'Enter') {
      e.preventDefault();
@@ -66,7 +60,7 @@ export const NameEditor: React.FC<NameEditorProps> = ({ onSave: handleSave, onCa
            }
          }}
        >
-          {buttonLabel}
+          Save
        </AddListButton>
        <CancelAdd onClick={() => onCancel()}>
          <Cross width={16} height={16} />
@@ -104,7 +98,7 @@ const AddList: React.FC<AddListProps> = ({ onSave }) => {
        ) : (
          <Placeholder>
            <AddIconWrapper>
-              <Plus width={12} height={12} />
+              <Plus size={12} color="#c2c6dc" />
            </AddIconWrapper>
            Add another list
          </Placeholder>
--- a/frontend/src/shared/components/Admin/index.tsx
+++ b/frontend/src/shared/components/Admin/index.tsx
@@ -430,7 +430,6 @@ const TabNavItem = styled.li`
  display: block;
  position: relative;
 `;
-
 const TabNavItemButton = styled.button<{ active: boolean }>`
  cursor: pointer;
  display: flex;
@@ -451,10 +450,6 @@ const TabNavItemButton = styled.button<{ active: boolean }>`
    fill: rgba(115, 103, 240);
  }
 `;
-const TabItemUser = styled(User)<{ active: boolean }>`
-fill: ${props => (props.active ? 'rgba(115, 103, 240)' : '#c2c6dc')}
-stroke: ${props => (props.active ? 'rgba(115, 103, 240)' : '#c2c6dc')}
-`;

 const TabNavItemSpan = styled.span`
  text-align: left;
@@ -517,7 +512,7 @@ const NavItem: React.FC<NavItemProps> = ({ active, name, tab, onClick }) => {
      }}
    >
      <TabNavItemButton active={active}>
-        <TabItemUser width={14} height={14} active={active} />
+        <User size={14} color={active ? 'rgba(115, 103, 240)' : '#c2c6dc'} />
        <TabNavItemSpan>{name}</TabNavItemSpan>
      </TabNavItemButton>
    </TabNavItem>
@@ -557,7 +552,6 @@ const Admin: React.FC<AdminProps> = ({
        <TabNavContent>
          {items.map((item, idx) => (
            <NavItem
-              key={item.name}
              onClick={(tab, top) => {
                if ($tabNav && $tabNav.current) {
                  const pos = $tabNav.current.getBoundingClientRect();
--- a/frontend/src/shared/components/Button/index.tsx
+++ b/frontend/src/shared/components/Button/index.tsx
@@ -1,7 +1,7 @@
 import React, { useRef } from 'react';
 import styled, { css } from 'styled-components/macro';

-const Text = styled.span<{ fontSize: string; justifyTextContent: string; hasIcon?: boolean }>`
+const Text = styled.span<{ fontSize: string; justifyTextContent: string }>`
  position: relative;
  display: flex;
  align-items: center;
@@ -9,11 +9,6 @@ const Text = styled.span<{ fontSize: string; justifyTextContent: string; hasIcon
  transition: all 0.2s ease;
  font-size: ${props => props.fontSize};
  color: rgba(${props => props.theme.colors.text.secondary});
-  ${props =>
-    props.hasIcon &&
-    css`
-      padding-left: 4px;
-    `}
 `;

 const Base = styled.button<{ color: string; disabled: boolean }>`
@@ -23,8 +18,6 @@ const Base = styled.button<{ color: string; disabled: boolean }>`
  cursor: pointer;
  padding: 0.75rem 2rem;
  border-radius: ${props => props.theme.borderRadius.alternate};
-  display: flex;
-  align-items: center;

  ${props =>
    props.disabled &&
@@ -41,28 +34,16 @@ const Filled = styled(Base)`
    box-shadow: 0 8px 25px -8px rgba(${props => props.theme.colors[props.color]});
  }
 `;
-const Outline = styled(Base)<{ invert: boolean }>`
+const Outline = styled(Base)`
  border: 1px solid rgba(${props => props.theme.colors[props.color]});
  background: transparent;
-  ${props =>
-    props.invert
-      ? css`
-          background: rgba(${props.theme.colors[props.color]});
-          & ${Text} {
-            color: rgba(${props.theme.colors.text.secondary});
-          }
-          &:hover {
-            background: rgba(${props.theme.colors[props.color]}, 0.8);
-          }
-        `
-      : css`
-          & ${Text} {
-            color: rgba(${props.theme.colors[props.color]});
-          }
-          &:hover {
-            background: rgba(${props.theme.colors[props.color]}, 0.08);
-          }
-        `}
+  & ${Text} {
+    color: rgba(${props => props.theme.colors[props.color]});
+  }
+
+  &:hover {
+    background: rgba(${props => props.theme.colors[props.color]}, 0.08);
+  }
 `;

 const Flat = styled(Base)`
@@ -129,8 +110,6 @@ type ButtonProps = {
  color?: 'primary' | 'danger' | 'success' | 'warning' | 'dark';
  disabled?: boolean;
  type?: 'button' | 'submit';
-  icon?: JSX.Element;
-  invert?: boolean;
  className?: string;
  onClick?: ($target: React.RefObject<HTMLButtonElement>) => void;
  justifyTextContent?: string;
@@ -139,12 +118,10 @@ type ButtonProps = {
 const Button: React.FC<ButtonProps> = ({
  disabled = false,
  fontSize = '14px',
-  invert = false,
  color = 'primary',
  variant = 'filled',
  type = 'button',
  justifyTextContent = 'center',
-  icon,
  onClick,
  className,
  children,
@@ -159,8 +136,7 @@ const Button: React.FC<ButtonProps> = ({
    case 'filled':
      return (
        <Filled ref={$button} type={type} onClick={handleClick} className={className} disabled={disabled} color={color}>
-          {icon && icon}
-          <Text hasIcon={typeof icon !== 'undefined'} justifyTextContent={justifyTextContent} fontSize={fontSize}>
+          <Text justifyTextContent={justifyTextContent} fontSize={fontSize}>
            {children}
          </Text>
        </Filled>
@@ -169,7 +145,6 @@ const Button: React.FC<ButtonProps> = ({
      return (
        <Outline
          ref={$button}
-          invert={invert}
          type={type}
          onClick={handleClick}
          className={className}
--- a/frontend/src/shared/components/Card/Styles.ts
+++ b/frontend/src/shared/components/Card/Styles.ts
@@ -1,7 +1,9 @@
 import styled, { css, keyframes } from 'styled-components';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { mixin } from 'shared/utils/styles';
 import TextareaAutosize from 'react-autosize-textarea';
-import { CheckCircle, CheckSquareOutline, Clock } from 'shared/icons';
+import { CheckCircle, CheckSquareOutline } from 'shared/icons';
+import { RefObject } from 'react';
 import TaskAssignee from 'shared/components/TaskAssignee';

 export const CardMember = styled(TaskAssignee)<{ zIndex: number }>`
@@ -18,9 +20,7 @@ export const ChecklistIcon = styled(CheckSquareOutline)<{ color: 'success' | 'no
      stroke: rgba(${props.theme.colors.success});
    `}
 `;
-export const ClockIcon = styled(Clock)<{ color: string }>`
-  fill: ${props => props.color};
-`;
+export const ClockIcon = styled(FontAwesomeIcon)``;

 export const EditorTextarea = styled(TextareaAutosize)`
  overflow: hidden;
@@ -147,11 +147,6 @@ export const ListCardLabelText = styled.span`
  line-height: 16px;
 `;

-export const ListCardLabelsWrapper = styled.div`
-  overflow: auto;
-  position: relative;
-`;
-
 export const ListCardLabel = styled.span<{ variant: 'small' | 'large' }>`
  ${props =>
    props.variant === 'small'
@@ -183,6 +178,8 @@ export const ListCardLabel = styled.span<{ variant: 'small' | 'large' }>`
 `;

 export const ListCardLabels = styled.div<{ toggleLabels: boolean; toggleDirection: 'expand' | 'shrink' }>`
+  overflow: auto;
+  position: relative;
  &:hover {
    opacity: 0.8;
  }
--- a/frontend/src/shared/components/Card/index.tsx
+++ b/frontend/src/shared/components/Card/index.tsx
@@ -1,5 +1,7 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { Pencil, Eye, List } from 'shared/icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faPencilAlt, faList } from '@fortawesome/free-solid-svg-icons';
+import { faClock, faEye } from '@fortawesome/free-regular-svg-icons';
 import {
  EditorTextarea,
  CardMember,
@@ -18,7 +20,6 @@ import {
  ListCardLabels,
  ListCardLabel,
  ListCardLabelText,
-  ListCardLabelsWrapper,
  ListCardOperation,
  CardTitle,
  CardMembers,
@@ -153,42 +154,39 @@ const Card = React.forwardRef(
                }
              }}
            >
-              <Pencil width={8} height={8} />
+              <FontAwesomeIcon onClick={onOperationClick} color="#c2c6dc" size="xs" icon={faPencilAlt} />
            </ListCardOperation>
          )}
          <ListCardDetails complete={complete ?? false}>
-            {labels && labels.length !== 0 && (
-              <ListCardLabelsWrapper>
-                <ListCardLabels
-                  toggleLabels={toggleLabels}
-                  toggleDirection={toggleDirection}
-                  onClick={e => {
-                    e.stopPropagation();
-                    if (onCardLabelClick) {
-                      onCardLabelClick();
-                    }
-                  }}
-                >
-                  {labels
-                    .slice()
-                    .sort((a, b) => a.labelColor.position - b.labelColor.position)
-                    .map(label => (
-                      <ListCardLabel
-                        onAnimationEnd={() => {
-                          if (setToggleLabels) {
-                            setToggleLabels(false);
-                          }
-                        }}
-                        variant={labelVariant ?? 'large'}
-                        color={label.labelColor.colorHex}
-                        key={label.id}
-                      >
-                        <ListCardLabelText>{label.name}</ListCardLabelText>
-                      </ListCardLabel>
-                    ))}
-                </ListCardLabels>
-              </ListCardLabelsWrapper>
-            )}
+            <ListCardLabels
+              toggleLabels={toggleLabels}
+              toggleDirection={toggleDirection}
+              onClick={e => {
+                e.stopPropagation();
+                if (onCardLabelClick) {
+                  onCardLabelClick();
+                }
+              }}
+            >
+              {labels &&
+                labels
+                  .slice()
+                  .sort((a, b) => a.labelColor.position - b.labelColor.position)
+                  .map(label => (
+                    <ListCardLabel
+                      onAnimationEnd={() => {
+                        if (setToggleLabels) {
+                          setToggleLabels(false);
+                        }
+                      }}
+                      variant={labelVariant ?? 'large'}
+                      color={label.labelColor.colorHex}
+                      key={label.id}
+                    >
+                      <ListCardLabelText>{label.name}</ListCardLabelText>
+                    </ListCardLabel>
+                  ))}
+            </ListCardLabels>
            {editable ? (
              <EditorContent>
                {complete && <CompleteIcon width={16} height={16} />}
@@ -216,18 +214,18 @@ const Card = React.forwardRef(
            <ListCardBadges>
              {watched && (
                <ListCardBadge>
-                  <Eye width={8} height={8} />
+                  <FontAwesomeIcon color="#6b778c" icon={faEye} size="xs" />
                </ListCardBadge>
              )}
              {dueDate && (
                <DueDateCardBadge isPastDue={dueDate.isPastDue}>
-                  <ClockIcon color={dueDate.isPastDue ? '#fff' : '#6b778c'} width={8} height={8} />
+                  <ClockIcon color={dueDate.isPastDue ? '#fff' : '#6b778c'} icon={faClock} size="xs" />
                  <ListCardBadgeText>{dueDate.formattedDate}</ListCardBadgeText>
                </DueDateCardBadge>
              )}
              {description && (
                <DescriptionBadge>
-                  <List width={8} height={8} />
+                  <FontAwesomeIcon color="#6b778c" icon={faList} size="xs" />
                </DescriptionBadge>
              )}
              {checklists && (
--- a/frontend/src/shared/components/CardComposer/Styles.ts
+++ b/frontend/src/shared/components/CardComposer/Styles.ts
@@ -1,15 +1,15 @@
 import styled from 'styled-components';
 import Button from 'shared/components/Button';
 import TextareaAutosize from 'react-autosize-textarea';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { mixin } from 'shared/utils/styles';

-export const CancelIconWrapper = styled.div`
+export const CancelIcon = styled(FontAwesomeIcon)`
  opacity: 0.8;
  cursor: pointer;
  font-size: 1.25em;
  padding-left: 5px;
 `;
-
 export const CardComposerWrapper = styled.div<{ isOpen: boolean }>`
  padding-bottom: 8px;
  display: ${props => (props.isOpen ? 'flex' : 'none')};
--- a/frontend/src/shared/components/CardComposer/index.tsx
+++ b/frontend/src/shared/components/CardComposer/index.tsx
@@ -1,12 +1,12 @@
 import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import useOnEscapeKeyDown from 'shared/hooks/onEscapeKeyDown';
+import { faTimes } from '@fortawesome/free-solid-svg-icons';
 import useOnOutsideClick from 'shared/hooks/onOutsideClick';
-import { Cross } from 'shared/icons';

 import {
  CardComposerWrapper,
-  CancelIconWrapper,
+  CancelIcon,
  AddCardButton,
  ComposerControls,
  ComposerControlsSaveSection,
@@ -52,9 +52,7 @@ const CardComposer = ({ isOpen, onCreateCard, onClose }: Props) => {
          >
            Add Card
          </AddCardButton>
-          <CancelIconWrapper onClick={() => onClose()}>
-            <Cross width={12} height={12} />
-          </CancelIconWrapper>
+          <CancelIcon onClick={onClose} icon={faTimes} color="#42526e" />
        </ComposerControlsSaveSection>
        <ComposerControlsActionsSection />
      </ComposerControls>
--- a/frontend/src/shared/components/Checklist/index.tsx
+++ b/frontend/src/shared/components/Checklist/index.tsx
@@ -25,7 +25,7 @@ const WindowTitle = styled.div`

 const WindowTitleIcon = styled(CheckSquareOutline)`
  top: 10px;
-  left: -32px;
+  left: -40px;
  position: absolute;
 `;

--- a/frontend/src/shared/components/Chip/index.tsx
+++ b/frontend/src/shared/components/Chip/index.tsx
@@ -1,71 +0,0 @@
-import React from 'react';
-import styled, { css } from 'styled-components';
-import { Cross } from 'shared/icons';
-
-const LabelText = styled.span`
-  margin-left: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: rgba(${props => props.theme.colors.text.primary});
-`;
-
-const Container = styled.div<{ color?: string }>`
-  min-height: 26px;
-  min-width: 26px;
-  font-size: 0.8rem;
-  border-radius: 20px;
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  ${props =>
-    props.color
-      ? css`
-          background: ${props.color};
-          & ${LabelText} {
-            color: rgba(${props.theme.colors.text.secondary});
-          }
-        `
-      : css`
-          background: rgba(${props.theme.colors.bg.primary});
-        `}
-`;
-
-const CloseButton = styled.button`
-  cursor: pointer;
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  margin: 0 4px;
-  background: rgba(0, 0, 0, 0.15);
-  &:hover {
-    background: rgba(0, 0, 0, 0.25);
-  }
-`;
-
-type ChipProps = {
-  label: string;
-  onClose?: () => void;
-  color?: string;
-  className?: string;
-};
-
-const Chip: React.FC<ChipProps> = ({ label, onClose, color, className }) => {
-  return (
-    <Container className={className} color={color}>
-      <LabelText>{label}</LabelText>
-      {onClose && (
-        <CloseButton onClick={() => onClose()}>
-          <Cross width={12} height={12} />
-        </CloseButton>
-      )}
-    </Container>
-  );
-};
-
-export default Chip;
--- a/frontend/src/shared/components/ControlledInput/Input.stories.tsx
+++ b/frontend/src/shared/components/ControlledInput/Input.stories.tsx
@@ -35,7 +35,7 @@ export const Default = () => {
        <Wrapper>
          <Input label="Label placeholder" />
          <Input width="100%" placeholder="Placeholder" />
-          <Input icon={<User width={20} height={20} />} width="100%" placeholder="Placeholder" />
+          <Input icon={<User size={20} />} width="100%" placeholder="Placeholder" />
        </Wrapper>
      </ThemeProvider>
    </>
--- a/frontend/src/shared/components/DropdownMenu/index.tsx
+++ b/frontend/src/shared/components/DropdownMenu/index.tsx
@@ -18,7 +18,7 @@ const DropdownMenu: React.FC<DropdownMenuProps> = ({ left, top, onLogout, onClos
    <Container ref={$containerRef} left={left} top={top}>
      <Wrapper>
        <ActionItem onClick={onAdminConsole}>
-          <User width={16} height={16} />
+          <User size={16} color="#c2c6dc" />
          <ActionTitle>Profile</ActionTitle>
        </ActionItem>
        <Separator />
@@ -54,7 +54,7 @@ const ProfileMenu: React.FC<ProfileMenuProps> = ({ showAdminConsole, onAdminCons
        </>
      )}
      <ActionItem onClick={onProfile}>
-        <User width={16} height={16} />
+        <User size={16} color="#c2c6dc" />
        <ActionTitle>Profile</ActionTitle>
      </ActionItem>
      <ActionsList>
--- a/frontend/src/shared/components/DueDateManager/index.tsx
+++ b/frontend/src/shared/components/DueDateManager/index.tsx
@@ -111,14 +111,18 @@ const HeaderActions = styled.div`

 const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange, onRemoveDueDate, onCancel }) => {
  const now = moment();
-  const { register, handleSubmit, errors, setValue, setError, formState, control } = useForm<DueDateFormData>();
+  const [textStartDate, setTextStartDate] = useState(now.format('YYYY-MM-DD'));
  const [startDate, setStartDate] = useState(new Date());
-
  useEffect(() => {
-    const newDate = moment(startDate).format('YYYY-MM-DD');
-    setValue('endDate', newDate);
+    setTextStartDate(moment(startDate).format('YYYY-MM-DD'));
  }, [startDate]);

+  const [textEndTime, setTextEndTime] = useState(now.format('h:mm A'));
+  const [endTime, setEndTime] = useState(now.toDate());
+  useEffect(() => {
+    setTextEndTime(moment(endTime).format('h:mm A'));
+  }, [endTime]);
+
  const years = _.range(2010, getYear(new Date()) + 10, 1);
  const months = [
    'January',
@@ -134,8 +138,9 @@ const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange,
    'November',
    'December',
  ];
+  const { register, handleSubmit, errors, setValue, setError, formState, control } = useForm<DueDateFormData>();
  const saveDueDate = (data: any) => {
-    const newDate = moment(`${data.endDate} ${moment(data.endTime).format('h:mm A')}`, 'YYYY-MM-DD h:mm A');
+    const newDate = moment(`${data.endDate} ${data.endTime}`, 'YYYY-MM-DD h:mm A');
    if (newDate.isValid()) {
      onDueDateChange(task, newDate.toDate());
    }
@@ -144,12 +149,11 @@ const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange,
    return (
      <DueDateInput
        id="endTime"
-        value={value}
        name="endTime"
        ref={$ref}
        width="100%"
        variant="alternate"
-        label="Time"
+        label="Date"
        onClick={onClick}
      />
    );
@@ -164,7 +168,7 @@ const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange,
            width="100%"
            variant="alternate"
            label="Date"
-            defaultValue={now.format('YYYY-MM-DD')}
+            defaultValue={textStartDate}
            ref={register({
              required: 'End date is required.',
            })}
@@ -173,7 +177,6 @@ const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange,
        <FormField>
          <Controller
            control={control}
-            defaultValue={now.toDate()}
            name="endTime"
            render={({ onChange, onBlur, value }) => (
              <DatePicker
@@ -241,9 +244,7 @@ const DueDateManager: React.FC<DueDateManagerProps> = ({ task, onDueDateChange,
            selected={startDate}
            inline
            onChange={date => {
-              if (date) {
-                setStartDate(date);
-              }
+              setStartDate(date ?? new Date());
            }}
          />
        </DueDatePickerWrapper>
--- a/frontend/src/shared/components/Input/Input.stories.tsx
+++ b/frontend/src/shared/components/Input/Input.stories.tsx
@@ -35,7 +35,7 @@ export const Default = () => {
        <Wrapper>
          <Input label="Label placeholder" />
          <Input width="100%" placeholder="Placeholder" />
-          <Input icon={<User width={20} height={20} />} width="100%" placeholder="Placeholder" />
+          <Input icon={<User size={20} />} width="100%" placeholder="Placeholder" />
        </Wrapper>
      </ThemeProvider>
    </>
--- a/frontend/src/shared/components/Input/index.tsx
+++ b/frontend/src/shared/components/Input/index.tsx
@@ -78,7 +78,6 @@ const Icon = styled.div`

 type InputProps = {
  variant?: 'normal' | 'alternate';
-  disabled?: boolean;
  label?: string;
  width?: string;
  floatingLabel?: boolean;
@@ -92,7 +91,6 @@ type InputProps = {
  name?: string;
  className?: string;
  defaultValue?: string;
-  value?: string;
  onClick?: (e: React.MouseEvent<HTMLInputElement>) => void;
 };

@@ -117,7 +115,6 @@ function useCombinedRefs(...refs: any) {
 const Input = React.forwardRef(
  (
    {
-      disabled = false,
      width = 'auto',
      variant = 'normal',
      type = 'text',
@@ -132,7 +129,6 @@ const Input = React.forwardRef(
      onClick,
      floatingLabel,
      defaultValue,
-      value,
      id,
    }: InputProps,
    $ref: any,
@@ -162,7 +158,6 @@ const Input = React.forwardRef(
          onChange={e => {
            setHasValue((e.currentTarget.value !== '' || floatingLabel) ?? false);
          }}
-          disabled={disabled}
          hasValue={hasValue}
          ref={combinedRef}
          id={id}
@@ -171,7 +166,6 @@ const Input = React.forwardRef(
          onClick={onClick}
          autoComplete={autocomplete ? 'on' : 'off'}
          defaultValue={defaultValue}
-          value={value}
          hasIcon={typeof icon !== 'undefined'}
          width={width}
          placeholder={placeholder}
--- a/frontend/src/shared/components/List/index.tsx
+++ b/frontend/src/shared/components/List/index.tsx
@@ -102,7 +102,7 @@ const List = React.forwardRef(
          {children && children}
          <AddCardContainer hidden={isComposerOpen}>
            <AddCardButton onClick={() => onOpenComposer(id)}>
-              <Plus width={12} height={12} />
+              <Plus size={12} color="#c2c6dc" />
              <AddCardButtonText>Add another card</AddCardButtonText>
            </AddCardButton>
          </AddCardContainer>
--- a/frontend/src/shared/components/ListActions/ListActions.stories.tsx
+++ b/frontend/src/shared/components/ListActions/ListActions.stories.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import ListActions from '.';
+
+export default {
+  component: ListActions,
+  title: 'ListActions',
+  parameters: {
+    backgrounds: [
+      { name: 'white', value: '#ffffff', default: true },
+      { name: 'gray', value: '#f8f8f8' },
+    ],
+  },
+};
+
+export const Default = () => {
+  return <ListActions taskGroupID="1" onArchiveTaskGroup={action('on archive task group')} />;
+};
--- a/frontend/src/shared/components/ListActions/index.tsx
+++ b/frontend/src/shared/components/ListActions/index.tsx
@@ -1,100 +1,50 @@
 import React from 'react';
-import { usePopup, Popup } from 'shared/components/PopupMenu';
-import { NameEditor } from 'shared/components/AddList';
-import NOOP from 'shared/utils/noop';
-import styled from 'styled-components';
-import { TaskSorting, TaskSortingDirection, TaskSortingType } from 'shared/utils/sorting';
 import { InnerContent, ListActionsWrapper, ListActionItemWrapper, ListActionItem, ListSeparator } from './Styles';

-const CopyWrapper = styled.div`
-  margin: 0 12px;
-`;
-
 type Props = {
  taskGroupID: string;
-  onDuplicateTaskGroup: (newTaskGroupName: string) => void;
-  onDeleteTaskGroupTasks: () => void;
-  onArchiveTaskGroup: (taskGroupID: string) => void;
-  onSortTaskGroup: (taskSorting: TaskSorting) => void;
-};

-const LabelManager: React.FC<Props> = ({
-  taskGroupID,
-  onDeleteTaskGroupTasks,
-  onDuplicateTaskGroup,
-  onArchiveTaskGroup,
-  onSortTaskGroup,
-}) => {
-  const { setTab } = usePopup();
+  onArchiveTaskGroup: (taskGroupID: string) => void;
+};
+const LabelManager: React.FC<Props> = ({ taskGroupID, onArchiveTaskGroup }) => {
  return (
-    <>
-      <Popup tab={0} title={null}>
-        <InnerContent>
-          <ListActionsWrapper>
-            <ListActionItemWrapper onClick={() => setTab(1)}>
-              <ListActionItem>Duplicate</ListActionItem>
-            </ListActionItemWrapper>
-            <ListActionItemWrapper onClick={() => setTab(2)}>
-              <ListActionItem>Sort</ListActionItem>
-            </ListActionItemWrapper>
-          </ListActionsWrapper>
-          <ListSeparator />
-          <ListActionsWrapper>
-            <ListActionItemWrapper onClick={() => onDeleteTaskGroupTasks()}>
-              <ListActionItem>Delete All Tasks</ListActionItem>
-            </ListActionItemWrapper>
-          </ListActionsWrapper>
-          <ListSeparator />
-          <ListActionsWrapper>
-            <ListActionItemWrapper onClick={() => onArchiveTaskGroup(taskGroupID)}>
-              <ListActionItem>Delete</ListActionItem>
-            </ListActionItemWrapper>
-          </ListActionsWrapper>
-        </InnerContent>
-      </Popup>
-      <Popup tab={1} title="Copy list" onClose={NOOP}>
-        <CopyWrapper>
-          <NameEditor
-            onCancel={NOOP}
-            onSave={listName => {
-              onDuplicateTaskGroup(listName);
-            }}
-            buttonLabel="Duplicate"
-          />
-        </CopyWrapper>
-      </Popup>
-      <Popup tab={2} title="Sort list" onClose={NOOP}>
-        <InnerContent>
-          <ListActionsWrapper>
-            <ListActionItemWrapper
-              onClick={() => onSortTaskGroup({ type: TaskSortingType.TASK_TITLE, direction: TaskSortingDirection.ASC })}
-            >
-              <ListActionItem>Task title</ListActionItem>
-            </ListActionItemWrapper>
-            <ListActionItemWrapper
-              onClick={() => onSortTaskGroup({ type: TaskSortingType.TASK_TITLE, direction: TaskSortingDirection.ASC })}
-            >
-              <ListActionItem>Due date</ListActionItem>
-            </ListActionItemWrapper>
-            <ListActionItemWrapper
-              onClick={() => onSortTaskGroup({ type: TaskSortingType.COMPLETE, direction: TaskSortingDirection.ASC })}
-            >
-              <ListActionItem>Complete</ListActionItem>
-            </ListActionItemWrapper>
-            <ListActionItemWrapper
-              onClick={() => onSortTaskGroup({ type: TaskSortingType.LABELS, direction: TaskSortingDirection.ASC })}
-            >
-              <ListActionItem>Labels</ListActionItem>
-            </ListActionItemWrapper>
-            <ListActionItemWrapper
-              onClick={() => onSortTaskGroup({ type: TaskSortingType.MEMBERS, direction: TaskSortingDirection.ASC })}
-            >
-              <ListActionItem>Members</ListActionItem>
-            </ListActionItemWrapper>
-          </ListActionsWrapper>
-        </InnerContent>
-      </Popup>
-    </>
+    <InnerContent>
+      <ListActionsWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Add card...</ListActionItem>
+        </ListActionItemWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Copy List...</ListActionItem>
+        </ListActionItemWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Move card...</ListActionItem>
+        </ListActionItemWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Watch</ListActionItem>
+        </ListActionItemWrapper>
+      </ListActionsWrapper>
+      <ListSeparator />
+      <ListActionsWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Sort By...</ListActionItem>
+        </ListActionItemWrapper>
+      </ListActionsWrapper>
+      <ListSeparator />
+      <ListActionsWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Move All Cards in This List...</ListActionItem>
+        </ListActionItemWrapper>
+        <ListActionItemWrapper>
+          <ListActionItem>Archive All Cards in This List...</ListActionItem>
+        </ListActionItemWrapper>
+      </ListActionsWrapper>
+      <ListSeparator />
+      <ListActionsWrapper>
+        <ListActionItemWrapper onClick={() => onArchiveTaskGroup(taskGroupID)}>
+          <ListActionItem>Archive This List</ListActionItem>
+        </ListActionItemWrapper>
+      </ListActionsWrapper>
+    </InnerContent>
  );
 };
 export default LabelManager;
--- a/frontend/src/shared/components/Lists/Styles.ts
+++ b/frontend/src/shared/components/Lists/Styles.ts
@@ -4,8 +4,10 @@ export const Container = styled.div`
  flex: 1;
  user-select: none;
  white-space: nowrap;
+  margin-bottom: 8px;
  overflow-x: auto;
  overflow-y: hidden;
+  padding-bottom: 8px;

  ::-webkit-scrollbar {
    height: 10px;
@@ -33,9 +35,10 @@ export const BoardWrapper = styled.div`

  user-select: none;
  white-space: nowrap;
+  margin-bottom: 8px;
  overflow-x: auto;
  overflow-y: hidden;
-  padding-bottom: 4px;
+  padding-bottom: 8px;
  position: absolute;
  top: 0;
  right: 0;
--- a/frontend/src/shared/components/Lists/index.tsx
+++ b/frontend/src/shared/components/Lists/index.tsx
@@ -11,131 +11,8 @@ import {
  getAfterDropDraggableList,
 } from 'shared/utils/draggables';
 import moment from 'moment';
-import { TaskSorting, TaskSortingType, TaskSortingDirection, sortTasks } from 'shared/utils/sorting';

 import { Container, BoardContainer, BoardWrapper } from './Styles';
-import shouldMetaFilter from './metaFilter';
-
-export enum TaskMeta {
-  NONE,
-  TITLE,
-  MEMBER,
-  LABEL,
-  DUE_DATE,
-}
-
-export enum TaskMetaMatch {
-  MATCH_ANY,
-  MATCH_ALL,
-}
-
-export enum TaskStatus {
-  ALL,
-  COMPLETE,
-  INCOMPLETE,
-}
-
-export enum TaskSince {
-  ALL,
-  TODAY,
-  YESTERDAY,
-  ONE_WEEK,
-  TWO_WEEKS,
-  THREE_WEEKS,
-}
-
-export type TaskStatusFilter = {
-  status: TaskStatus;
-  since: TaskSince;
-};
-
-export interface TaskMetaFilterName {
-  meta: TaskMeta;
-  value?: string | moment.Moment | null;
-  id?: string | null;
-}
-
-export type TaskNameMetaFilter = {
-  name: string;
-};
-
-export enum DueDateFilterType {
-  TODAY,
-  TOMORROW,
-  THIS_WEEK,
-  NEXT_WEEK,
-  ONE_WEEK,
-  TWO_WEEKS,
-  THREE_WEEKS,
-  OVERDUE,
-  NO_DUE_DATE,
-}
-
-export type DueDateMetaFilter = {
-  type: DueDateFilterType;
-  label: string;
-};
-
-export type MemberMetaFilter = {
-  id: string;
-  username: string;
-};
-
-export type LabelMetaFilter = {
-  id: string;
-  name: string;
-  color: string;
-};
-
-export type TaskMetaFilters = {
-  match: TaskMetaMatch;
-  dueDate: DueDateMetaFilter | null;
-  taskName: TaskNameMetaFilter | null;
-  members: Array<MemberMetaFilter>;
-  labels: Array<LabelMetaFilter>;
-};
-
-function shouldStatusFilter(task: Task, filter: TaskStatusFilter) {
-  if (filter.status === TaskStatus.ALL) {
-    return true;
-  }
-
-  if (filter.status === TaskStatus.INCOMPLETE && task.complete === false) {
-    return true;
-  }
-  if (filter.status === TaskStatus.COMPLETE && task.completedAt && task.complete === true) {
-    const completedAt = moment(task.completedAt);
-    const REFERENCE = moment(); // fixed just for testing, use moment();
-    switch (filter.since) {
-      case TaskSince.TODAY:
-        const TODAY = REFERENCE.clone().startOf('day');
-        return completedAt.isSame(TODAY, 'd');
-      case TaskSince.YESTERDAY:
-        const YESTERDAY = REFERENCE.clone()
-          .subtract(1, 'days')
-          .startOf('day');
-        return completedAt.isSameOrAfter(YESTERDAY, 'd');
-      case TaskSince.ONE_WEEK:
-        const ONE_WEEK = REFERENCE.clone()
-          .subtract(7, 'days')
-          .startOf('day');
-        return completedAt.isSameOrAfter(ONE_WEEK, 'd');
-      case TaskSince.TWO_WEEKS:
-        const TWO_WEEKS = REFERENCE.clone()
-          .subtract(14, 'days')
-          .startOf('day');
-        return completedAt.isSameOrAfter(TWO_WEEKS, 'd');
-      case TaskSince.THREE_WEEKS:
-        const THREE_WEEKS = REFERENCE.clone()
-          .subtract(21, 'days')
-          .startOf('day');
-        return completedAt.isSameOrAfter(THREE_WEEKS, 'd');
-      default:
-        return true;
-    }
-  }
-  return false;
-}

 interface SimpleProps {
  taskGroups: Array<TaskGroup>;
@@ -151,29 +28,8 @@ interface SimpleProps {
  onCardMemberClick: OnCardMemberClick;
  onCardLabelClick: () => void;
  cardLabelVariant: CardLabelVariant;
-  taskStatusFilter?: TaskStatusFilter;
-  taskMetaFilters?: TaskMetaFilters;
-  taskSorting?: TaskSorting;
 }

-const initTaskStatusFilter: TaskStatusFilter = {
-  status: TaskStatus.ALL,
-  since: TaskSince.ALL,
-};
-
-const initTaskMetaFilters: TaskMetaFilters = {
-  match: TaskMetaMatch.MATCH_ANY,
-  dueDate: null,
-  taskName: null,
-  labels: [],
-  members: [],
-};
-
-const initTaskSorting: TaskSorting = {
-  type: TaskSortingType.NONE,
-  direction: TaskSortingDirection.ASC,
-};
-
 const SimpleLists: React.FC<SimpleProps> = ({
  taskGroups,
  onTaskDrop,
@@ -187,9 +43,6 @@ const SimpleLists: React.FC<SimpleProps> = ({
  cardLabelVariant,
  onExtraMenuOpen,
  onCardMemberClick,
-  taskStatusFilter = initTaskStatusFilter,
-  taskMetaFilters = initTaskMetaFilters,
-  taskSorting = initTaskSorting,
 }) => {
  const onDragEnd = ({ draggableId, source, destination, type }: DropResult) => {
    if (typeof destination === 'undefined') return;
@@ -311,18 +164,10 @@ const SimpleLists: React.FC<SimpleProps> = ({
                                <ListCards ref={columnDropProvided.innerRef} {...columnDropProvided.droppableProps}>
                                  {taskGroup.tasks
                                    .slice()
-                                    .filter(t => shouldStatusFilter(t, taskStatusFilter))
-                                    .filter(t => shouldMetaFilter(t, taskMetaFilters))
                                    .sort((a: any, b: any) => a.position - b.position)
-                                    .sort((a: any, b: any) => sortTasks(a, b, taskSorting))
                                    .map((task: Task, taskIndex: any) => {
                                      return (
-                                        <Draggable
-                                          key={task.id}
-                                          draggableId={task.id}
-                                          index={taskIndex}
-                                          isDragDisabled={taskSorting.type !== TaskSortingType.NONE}
-                                        >
+                                        <Draggable key={task.id} draggableId={task.id} index={taskIndex}>
                                          {taskProvided => {
                                            return (
                                              <Card
--- a/frontend/src/shared/components/Lists/metaFilter.ts
+++ b/frontend/src/shared/components/Lists/metaFilter.ts
@@ -1,132 +0,0 @@
-import { TaskMetaFilters, DueDateFilterType } from 'shared/components/Lists';
-import moment from 'moment';
-
-enum ShouldFilter {
-  NO_FILTER,
-  VALID,
-  NOT_VALID,
-}
-
-function shouldFilter(cond: boolean) {
-  return cond ? ShouldFilter.VALID : ShouldFilter.NOT_VALID;
-}
-
-export default function shouldMetaFilter(task: Task, filters: TaskMetaFilters) {
-  let isFiltered = ShouldFilter.NO_FILTER;
-  if (filters.taskName) {
-    isFiltered = shouldFilter(task.name.toLowerCase().startsWith(filters.taskName.name.toLowerCase()));
-  }
-  if (filters.dueDate) {
-    if (isFiltered === ShouldFilter.NO_FILTER) {
-      isFiltered = ShouldFilter.NOT_VALID;
-    }
-    if (filters.dueDate.type === DueDateFilterType.NO_DUE_DATE) {
-      isFiltered = shouldFilter(!(task.dueDate && task.dueDate !== null));
-    }
-    if (task.dueDate) {
-      const taskDueDate = moment(task.dueDate);
-      const today = moment();
-      let start;
-      let end;
-      switch (filters.dueDate.type) {
-        case DueDateFilterType.OVERDUE:
-          isFiltered = shouldFilter(taskDueDate.isBefore(today));
-          break;
-        case DueDateFilterType.TODAY:
-          isFiltered = shouldFilter(taskDueDate.isSame(today, 'day'));
-          break;
-        case DueDateFilterType.TOMORROW:
-          isFiltered = shouldFilter(
-            taskDueDate.isBefore(
-              today
-                .clone()
-                .add(1, 'days')
-                .endOf('day'),
-            ),
-          );
-          break;
-        case DueDateFilterType.THIS_WEEK:
-          start = today
-            .clone()
-            .weekday(0)
-            .startOf('day');
-          end = today
-            .clone()
-            .weekday(6)
-            .endOf('day');
-          isFiltered = shouldFilter(taskDueDate.isBetween(start, end));
-          break;
-        case DueDateFilterType.NEXT_WEEK:
-          start = today
-            .clone()
-            .weekday(0)
-            .add(7, 'days')
-            .startOf('day');
-          end = today
-            .clone()
-            .weekday(6)
-            .add(7, 'days')
-            .endOf('day');
-          isFiltered = shouldFilter(taskDueDate.isBetween(start, end));
-          break;
-        case DueDateFilterType.ONE_WEEK:
-          start = today.clone().startOf('day');
-          end = today
-            .clone()
-            .add(7, 'days')
-            .endOf('day');
-          isFiltered = shouldFilter(taskDueDate.isBetween(start, end));
-          break;
-        case DueDateFilterType.TWO_WEEKS:
-          start = today.clone().startOf('day');
-          end = today
-            .clone()
-            .add(14, 'days')
-            .endOf('day');
-          isFiltered = shouldFilter(taskDueDate.isBetween(start, end));
-          break;
-        case DueDateFilterType.THREE_WEEKS:
-          start = today.clone().startOf('day');
-          end = today
-            .clone()
-            .add(21, 'days')
-            .endOf('day');
-          isFiltered = shouldFilter(taskDueDate.isBetween(start, end));
-          break;
-        default:
-          isFiltered = ShouldFilter.NOT_VALID;
-      }
-    }
-  }
-  if (filters.members.length !== 0) {
-    if (isFiltered === ShouldFilter.NO_FILTER) {
-      isFiltered = ShouldFilter.NOT_VALID;
-    }
-    for (const member of filters.members) {
-      if (task.assigned) {
-        if (task.assigned.findIndex(m => m.id === member.id) !== -1) {
-          isFiltered = ShouldFilter.VALID;
-        }
-      }
-    }
-  }
-  if (filters.labels.length !== 0) {
-    if (isFiltered === ShouldFilter.NO_FILTER) {
-      isFiltered = ShouldFilter.NOT_VALID;
-    }
-    for (const label of filters.labels) {
-      if (task.labels) {
-        if (task.labels.findIndex(m => m.projectLabel.id === label.id) !== -1) {
-          isFiltered = ShouldFilter.VALID;
-        }
-      }
-    }
-  }
-  if (isFiltered === ShouldFilter.NO_FILTER) {
-    return true;
-  }
-  if (isFiltered === ShouldFilter.VALID) {
-    return true;
-  }
-  return false;
-}
--- a/frontend/src/shared/components/Login/index.tsx
+++ b/frontend/src/shared/components/Login/index.tsx
@@ -53,7 +53,7 @@ const Login = ({ onSubmit }: LoginProps) => {
                  ref={register({ required: 'Username is required' })}
                />
                <FormIcon>
-                  <User width={20} height={20} />
+                  <User color="#c2c6dc" size={20} />
                </FormIcon>
              </FormLabel>
              {errors.username && <FormError>{errors.username.message}</FormError>}
--- a/frontend/src/shared/components/Member/index.tsx
+++ b/frontend/src/shared/components/Member/index.tsx
@@ -44,7 +44,6 @@ type MemberProps = {
  showName?: boolean;
  className?: string;
  showCheckmark?: boolean;
-  size?: number;
 };

 const CardMemberWrapper = styled.div<{ ref: any }>`
@@ -64,7 +63,6 @@ const Member: React.FC<MemberProps> = ({
  showName,
  showCheckmark = false,
  className,
-  size = 28,
 }) => {
  const $targetRef = useRef<HTMLDivElement>();
  return (
@@ -79,7 +77,7 @@ const Member: React.FC<MemberProps> = ({
        }
      }}
    >
-      <TaskAssignee onMemberProfile={NOOP} size={32} member={member} />
+      <TaskAssignee onMemberProfile={NOOP} size={28} member={member} />
      {showName && <CardMemberName>{member.fullName}</CardMemberName>}
      {showCheckmark && <CardCheckmark width={12} height={12} />}
    </CardMemberWrapper>
--- a/frontend/src/shared/components/Modal/Styles.ts
+++ b/frontend/src/shared/components/Modal/Styles.ts
@@ -15,20 +15,18 @@ export const ScrollOverlay = styled.div`
 export const ClickableOverlay = styled.div`
  min-height: 100%;
  background: rgba(0, 0, 0, 0.4);
+  display: flex;
+  justify-content: center;
 `;

-export const StyledModal = styled.div<{ width: number; height: number }>`
+export const StyledModal = styled.div<{ width: number }>`
+  display: inline-block;
  position: relative;
-  width: ${props => props.width}px;
-  height: ${props => props.height}px;
-  left: 0;
-  right: 0;
-  top: 48px;
-  bottom: 16px;
-  margin: auto;
-
+  margin: 48px 0 80px;
+  width: 100%;
  background: #262c49;
+  max-width: ${props => props.width}px;
  vertical-align: middle;
-  border-radius: 6px;
+  border-radius: 3px;
  ${mixin.boxShadowMedium}
 `;
--- a/frontend/src/shared/components/Modal/index.tsx
+++ b/frontend/src/shared/components/Modal/index.tsx
@@ -1,10 +1,9 @@
-import React, { useRef, useEffect, useState } from 'react';
+import React, { useRef } from 'react';
 import ReactDOM from 'react-dom';
+
 import useOnOutsideClick from 'shared/hooks/onOutsideClick';
 import useOnEscapeKeyDown from 'shared/hooks/onEscapeKeyDown';
-import useWindowSize from 'shared/hooks/useWindowSize';
-import styled from 'styled-components';
-import { Cross } from 'shared/icons';
+
 import { ScrollOverlay, ClickableOverlay, StyledModal } from './Styles';

 const $root: HTMLElement = document.getElementById('root')!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
@@ -15,50 +14,21 @@ type ModalProps = {
  renderContent: () => JSX.Element;
 };

-function getAdjustedHeight(height: number) {
-  if (height >= 900) {
-    return height - 150;
-  }
-  if (height >= 800) {
-    return height - 125;
-  }
-  return height - 70;
-}
-
-const CloseIcon = styled(Cross)`
-  position: absolute;
-  top: 16px;
-  right: -32px;
-  cursor: pointer;
-  fill: rgba(${props => props.theme.colors.text.primary});
-  &:hover {
-    fill: rgba(${props => props.theme.colors.text.secondary});
-  }
-`;
-
-const InnerModal: React.FC<ModalProps> = ({ width, onClose: tellParentToClose, renderContent }) => {
+const Modal: React.FC<ModalProps> = ({ width, onClose: tellParentToClose, renderContent }) => {
  const $modalRef = useRef<HTMLDivElement>(null);
  const $clickableOverlayRef = useRef<HTMLDivElement>(null);
-  const [_width, height] = useWindowSize();

  useOnOutsideClick($modalRef, true, tellParentToClose, $clickableOverlayRef);
  useOnEscapeKeyDown(true, tellParentToClose);

-  return (
+  return ReactDOM.createPortal(
    <ScrollOverlay>
      <ClickableOverlay ref={$clickableOverlayRef}>
-        <StyledModal width={width} height={getAdjustedHeight(height)} ref={$modalRef}>
+        <StyledModal width={width} ref={$modalRef}>
          {renderContent()}
-          <CloseIcon onClick={() => tellParentToClose()} width={20} height={20} />
        </StyledModal>
      </ClickableOverlay>
-    </ScrollOverlay>
-  );
-};
-
-const Modal: React.FC<ModalProps> = ({ width, onClose: tellParentToClose, renderContent }) => {
-  return ReactDOM.createPortal(
-    <InnerModal width={width} onClose={tellParentToClose} renderContent={renderContent} />,
+    </ScrollOverlay>,
    $root,
  );
 };
--- a/frontend/src/shared/components/NotifcationPopup/index.tsx
+++ b/frontend/src/shared/components/NotifcationPopup/index.tsx
@@ -1,111 +0,0 @@
-import React from 'react';
-import styled from 'styled-components';
-import TimeAgo from 'react-timeago';
-
-import { Popup } from 'shared/components/PopupMenu';
-
-const ItemWrapper = styled.div`
-  cursor: pointer;
-  border-bottom: 1px solid #414561;
-  padding-left: 1rem;
-  padding-right: 1rem;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  justify-content: space-between;
-  display: flex;
-
-  &:hover {
-    background: #10163a;
-  }
-`;
-const ItemWrapperContent = styled.div`
-  display: flex;
-  align-items: flex-start;
-`;
-
-const ItemIconContainer = styled.span`
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-`;
-
-const ItemTextContainer = styled.div`
-  margin-left: 0.5rem;
-  margin-right: 0.5rem;
-`;
-
-const ItemTextTitle = styled.span`
-  font-weight: 500;
-  display: block;
-  color: rgba(${props => props.theme.colors.primary});
-  font-size: 14px;
-`;
-const ItemTextDesc = styled.span`
-  font-size: 12px;
-`;
-
-const ItemTimeAgo = styled.span`
-  margin-top: 0.25rem;
-  white-space: nowrap;
-  font-size: 11px;
-`;
-
-type NotificationItemProps = {
-  title: string;
-  description: string;
-  createdAt: string;
-};
-
-export const NotificationItem: React.FC<NotificationItemProps> = ({ title, description, createdAt }) => {
-  return (
-    <ItemWrapper>
-      <ItemWrapperContent>
-        <ItemIconContainer />
-        <ItemTextContainer>
-          <ItemTextTitle>{title}</ItemTextTitle>
-          <ItemTextDesc>{description}</ItemTextDesc>
-        </ItemTextContainer>
-      </ItemWrapperContent>
-      <TimeAgo date={createdAt} component={ItemTimeAgo} />
-    </ItemWrapper>
-  );
-};
-
-const NotificationHeader = styled.div`
-  padding: 0.75rem;
-  text-align: center;
-  border-top-left-radius: 6px;
-  border-top-right-radius: 6px;
-  background: rgba(${props => props.theme.colors.primary});
-`;
-
-const NotificationHeaderTitle = styled.span`
-  font-size: 14px;
-  color: rgba(${props => props.theme.colors.text.secondary});
-`;
-
-const NotificationFooter = styled.div`
-  cursor: pointer;
-  padding: 0.5rem;
-  text-align: center;
-  color: rgba(${props => props.theme.colors.primary});
-  &:hover {
-    background: #10163a;
-  }
-  border-bottom-left-radius: 6px;
-  border-bottom-right-radius: 6px;
-`;
-
-const NotificationPopup: React.FC = ({ children }) => {
-  return (
-    <Popup title={null} tab={0} borders={false} padding={false}>
-      <NotificationHeader>
-        <NotificationHeaderTitle>Notifications</NotificationHeaderTitle>
-      </NotificationHeader>
-      <ul>{children}</ul>
-      <NotificationFooter>View All</NotificationFooter>
-    </Popup>
-  );
-};
-
-export default NotificationPopup;
--- a/frontend/src/shared/components/PopupMenu/Styles.ts
+++ b/frontend/src/shared/components/PopupMenu/Styles.ts
@@ -5,7 +5,6 @@ import ControlledInput from 'shared/components/ControlledInput';
 export const Container = styled.div<{
  invertY: boolean;
  invert: boolean;
-  targetPadding: string;
  top: number;
  left: number;
  ref: any;
@@ -16,7 +15,7 @@ export const Container = styled.div<{
  display: block;
  position: absolute;
  width: ${props => props.width}px;
-  padding-top: ${props => props.targetPadding};
+  padding-top: 10px;
  height: auto;
  z-index: 40000;
  ${props =>
@@ -29,18 +28,14 @@ export const Container = styled.div<{
    css`
      top: auto;
      padding-top: 0;
-      padding-bottom: ${props.targetPadding};
+      padding-bottom: 10px;
      bottom: ${props.top}px;
    `}
 `;

-export const Wrapper = styled.div<{ padding: boolean; borders: boolean }>`
-  ${props =>
-    props.padding &&
-    css`
-      padding: 5px;
-      padding-top: 8px;
-    `}
+export const Wrapper = styled.div`
+  padding: 5px;
+  padding-top: 8px;
  border-radius: 5px;
  box-shadow: 0 5px 25px 0 rgba(0, 0, 0, 0.1);
  position: relative;
@@ -48,12 +43,8 @@ export const Wrapper = styled.div<{ padding: boolean; borders: boolean }>`

  color: #c2c6dc;
  background: #262c49;
-  ${props =>
-    props.borders &&
-    css`
-      border: 1px solid rgba(0, 0, 0, 0.1);
-      border-color: #414561;
-    `}
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  border-color: #414561;
 `;

 export const Header = styled.div`
@@ -335,7 +326,7 @@ export const PreviousButton = styled.div`
  cursor: pointer;
 `;

-export const ContainerDiamond = styled.div<{ borders: boolean; color: string; invert: boolean; invertY: boolean }>`
+export const ContainerDiamond = styled.div<{ invert: boolean; invertY: boolean }>`
  ${props => (props.invert ? 'right: 10px; ' : 'left: 15px;')}
  position: absolute;
  width: 10px;
@@ -356,10 +347,6 @@ export const ContainerDiamond = styled.div<{ borders: boolean; color: string; in
  transform: rotate(45deg) translate(-7px);
  z-index: 10;

-  background: ${props => props.color};
-  ${props =>
-    props.borders &&
-    css`
-      border-color: #414561;
-    `}
+  background: #262c49;
+  border-color: #414561;
 `;
--- a/frontend/src/shared/components/PopupMenu/index.tsx
+++ b/frontend/src/shared/components/PopupMenu/index.tsx
@@ -15,37 +15,9 @@ import {
  Wrapper,
 } from './Styles';

-function getPopupOptions(options?: PopupOptions) {
-  const popupOptions = {
-    borders: true,
-    diamondColor: '#262c49',
-    targetPadding: '10px',
-    showDiamond: true,
-    width: 316,
-  };
-  if (options) {
-    if (options.borders) {
-      popupOptions.borders = options.borders;
-    }
-    if (options.width) {
-      popupOptions.width = options.width;
-    }
-    if (options.targetPadding) {
-      popupOptions.targetPadding = options.targetPadding;
-    }
-    if (typeof options.showDiamond !== 'undefined' && options.showDiamond !== null) {
-      popupOptions.showDiamond = options.showDiamond;
-    }
-    if (options.diamondColor) {
-      popupOptions.diamondColor = options.diamondColor;
-    }
-  }
-  return popupOptions;
-}
-
 type PopupContextState = {
-  show: (target: RefObject<HTMLElement>, content: JSX.Element, options?: PopupOptions) => void;
-  setTab: (newTab: number, options?: PopupOptions) => void;
+  show: (target: RefObject<HTMLElement>, content: JSX.Element, width?: string | number) => void;
+  setTab: (newTab: number, width?: number | string) => void;
  getCurrentTab: () => number;
  hide: () => void;
 };
@@ -54,44 +26,23 @@ type PopupProps = {
  title: string | null;
  onClose?: () => void;
  tab: number;
-  padding?: boolean;
-  borders?: boolean;
-  diamondColor?: string;
 };

 type PopupContainerProps = {
  top: number;
  left: number;
  invert: boolean;
-  targetPadding: string;
  invertY: boolean;
  onClose: () => void;
  width?: string | number;
 };

-const PopupContainer: React.FC<PopupContainerProps> = ({
-  width,
-  top,
-  left,
-  onClose,
-  children,
-  invert,
-  invertY,
-  targetPadding,
-}) => {
+const PopupContainer: React.FC<PopupContainerProps> = ({ width, top, left, onClose, children, invert, invertY }) => {
  const $containerRef = useRef<HTMLDivElement>(null);
  const [currentTop, setCurrentTop] = useState(top);
  useOnOutsideClick($containerRef, true, onClose, null);
  return (
-    <Container
-      targetPadding={targetPadding}
-      width={width ?? 316}
-      left={left}
-      top={currentTop}
-      ref={$containerRef}
-      invert={invert}
-      invertY={invertY}
-    >
+    <Container width={width ?? 316} left={left} top={currentTop} ref={$containerRef} invert={invert} invertY={invertY}>
      {children}
    </Container>
  );
@@ -122,28 +73,13 @@ type PopupState = {
  currentTab: number;
  previousTab: number;
  content: JSX.Element | null;
-  options: PopupOptionsInternal | null;
+  width?: string | number;
 };

 const { Provider, Consumer } = PopupContext;

 const canUseDOM = !!(typeof window !== 'undefined' && window.document && window.document.createElement);

-type PopupOptionsInternal = {
-  width: number;
-  borders: boolean;
-  targetPadding: string;
-  diamondColor: string;
-  showDiamond: boolean;
-};
-
-type PopupOptions = {
-  targetPadding?: string | null;
-  showDiamond?: boolean | null;
-  width?: number | null;
-  borders?: boolean | null;
-  diamondColor?: string | null;
-};
 const defaultState = {
  isOpen: false,
  left: 0,
@@ -153,12 +89,11 @@ const defaultState = {
  currentTab: 0,
  previousTab: 0,
  content: null,
-  options: null,
 };

 export const PopupProvider: React.FC = ({ children }) => {
  const [currentState, setState] = useState<PopupState>(defaultState);
-  const show = (target: RefObject<HTMLElement>, content: JSX.Element, options?: PopupOptions) => {
+  const show = (target: RefObject<HTMLElement>, content: JSX.Element, width?: number | string) => {
    if (target && target.current) {
      const bounds = target.current.getBoundingClientRect();
      let top = bounds.top + bounds.height;
@@ -167,7 +102,6 @@ export const PopupProvider: React.FC = ({ children }) => {
        top = window.innerHeight - bounds.top;
        invertY = true;
      }
-      const popupOptions = getPopupOptions(options);
      if (bounds.left + 304 + 30 > window.innerWidth) {
        setState({
          isOpen: true,
@@ -178,7 +112,7 @@ export const PopupProvider: React.FC = ({ children }) => {
          currentTab: 0,
          previousTab: 0,
          content,
-          options: popupOptions,
+          width: width ?? 316,
        });
      } else {
        setState({
@@ -190,7 +124,7 @@ export const PopupProvider: React.FC = ({ children }) => {
          currentTab: 0,
          previousTab: 0,
          content,
-          options: popupOptions,
+          width: width ?? 316,
        });
      }
    }
@@ -205,21 +139,20 @@ export const PopupProvider: React.FC = ({ children }) => {
      currentTab: 0,
      previousTab: 0,
      content: null,
-      options: null,
    });
  };
  const portalTarget = canUseDOM ? document.body : null; // appease flow

-  const setTab = (newTab: number, options?: PopupOptions) => {
-    setState((prevState: PopupState) =>
-      produce(prevState, draftState => {
-        draftState.previousTab = currentState.currentTab;
-        draftState.currentTab = newTab;
-        if (options) {
-          draftState.options = getPopupOptions(options);
-        }
-      }),
-    );
+  const setTab = (newTab: number, width?: number | string) => {
+    const newWidth = width ?? currentState.width;
+    setState((prevState: PopupState) => {
+      return {
+        ...prevState,
+        previousTab: currentState.currentTab,
+        currentTab: newTab,
+        width: newWidth,
+      };
+    });
  };

  const getCurrentTab = () => {
@@ -230,26 +163,17 @@ export const PopupProvider: React.FC = ({ children }) => {
    <Provider value={{ hide, show, setTab, getCurrentTab }}>
      {portalTarget &&
        currentState.isOpen &&
-        currentState.options &&
        createPortal(
          <PopupContainer
            invertY={currentState.invertY}
            invert={currentState.invert}
            top={currentState.top}
-            targetPadding={currentState.options.targetPadding}
            left={currentState.left}
            onClose={() => setState(defaultState)}
-            width={currentState.options.width}
+            width={currentState.width ?? 316}
          >
            {currentState.content}
-            {currentState.options.showDiamond && (
-              <ContainerDiamond
-                color={currentState.options.diamondColor}
-                borders={currentState.options.borders}
-                invertY={currentState.invertY}
-                invert={currentState.invert}
-              />
-            )}
+            <ContainerDiamond invertY={currentState.invertY} invert={currentState.invert} />
          </PopupContainer>,
          portalTarget,
        )}
@@ -273,16 +197,8 @@ const PopupMenu: React.FC<Props> = ({ width, title, top, left, onClose, noHeader
  useOnOutsideClick($containerRef, true, onClose, null);

  return (
-    <Container
-      targetPadding="10px"
-      invertY={false}
-      width={width ?? 316}
-      invert={false}
-      left={left}
-      top={top}
-      ref={$containerRef}
-    >
-      <Wrapper padding borders>
+    <Container invertY={false} width={width ?? 316} invert={false} left={left} top={top} ref={$containerRef}>
+      <Wrapper>
        {onPrevious && (
          <PreviousButton onClick={onPrevious}>
            <AngleLeft color="#c2c6dc" />
@@ -306,7 +222,7 @@ const PopupMenu: React.FC<Props> = ({ width, title, top, left, onClose, noHeader
  );
 };

-export const Popup: React.FC<PopupProps> = ({ borders = true, padding = true, title, onClose, tab, children }) => {
+export const Popup: React.FC<PopupProps> = ({ title, onClose, tab, children }) => {
  const { getCurrentTab, setTab } = usePopup();
  if (getCurrentTab() !== tab) {
    return null;
@@ -314,7 +230,7 @@ export const Popup: React.FC<PopupProps> = ({ borders = true, padding = true, ti

  return (
    <>
-      <Wrapper borders={borders} padding={padding}>
+      <Wrapper>
        {tab > 0 && (
          <PreviousButton
            onClick={() => {
--- a/frontend/src/shared/components/ProjectGridItem/index.tsx
+++ b/frontend/src/shared/components/ProjectGridItem/index.tsx
@@ -13,7 +13,7 @@ export const AddProjectItem: React.FC<AddProjectItemProps> = ({ onAddProject })
        onAddProject();
      }}
    >
-      <Plus width={12} height={12} />
+      <Plus size={20} color="#c2c6dc" />
      <AddProjectLabel>New Project</AddProjectLabel>
    </AddProjectWrapper>
  );
--- a/frontend/src/shared/components/Register/index.tsx
+++ b/frontend/src/shared/components/Register/index.tsx
@@ -55,7 +55,7 @@ const Register = ({ onSubmit }: RegisterProps) => {
                  ref={register({ required: 'Full name is required' })}
                />
                <FormIcon>
-                  <User width={20} height={20} />
+                  <User color="#c2c6dc" size={20} />
                </FormIcon>
              </FormLabel>
              {errors.username && <FormError>{errors.username.message}</FormError>}
@@ -68,7 +68,7 @@ const Register = ({ onSubmit }: RegisterProps) => {
                  ref={register({ required: 'Username is required' })}
                />
                <FormIcon>
-                  <User width={20} height={20} />
+                  <User color="#c2c6dc" size={20} />
                </FormIcon>
              </FormLabel>
              {errors.username && <FormError>{errors.username.message}</FormError>}
@@ -84,7 +84,7 @@ const Register = ({ onSubmit }: RegisterProps) => {
                  })}
                />
                <FormIcon>
-                  <User width={20} height={20} />
+                  <User color="#c2c6dc" size={20} />
                </FormIcon>
              </FormLabel>
              {errors.email && <FormError>{errors.email.message}</FormError>}
@@ -103,7 +103,7 @@ const Register = ({ onSubmit }: RegisterProps) => {
                  })}
                />
                <FormIcon>
-                  <User width={20} height={20} />
+                  <User color="#c2c6dc" size={20} />
                </FormIcon>
              </FormLabel>
              {errors.initials && <FormError>{errors.initials.message}</FormError>}
--- a/frontend/src/shared/components/Settings/Settings.stories.tsx
+++ b/frontend/src/shared/components/Settings/Settings.stories.tsx
@@ -27,7 +27,6 @@ export const Default = () => {
      <BaseStyles />
      <Settings
        profile={profile}
-        onChangeUserInfo={action('change user info')}
        onResetPassword={action('reset password')}
        onProfileAvatarRemove={action('remove')}
        onProfileAvatarChange={action('profile avatar change')}
--- a/frontend/src/shared/components/Settings/index.tsx
+++ b/frontend/src/shared/components/Settings/index.tsx
@@ -10,11 +10,6 @@ const PasswordInput = styled(Input)`
  margin-bottom: 0;
 `;

-const UserInfoInput = styled(Input)`
-  margin-top: 30px;
-  margin-bottom: 0;
-`;
-
 const FormError = styled.span`
  font-size: 12px;
  color: rgba(${props => props.theme.colors.warning});
@@ -223,7 +218,7 @@ const NavItem: React.FC<NavItemProps> = ({ active, name, tab, onClick }) => {
      }}
    >
      <TabNavItemButton active={active}>
-        <User width={20} height={20} />
+        <User size={14} color={active ? 'rgba(115, 103, 240)' : '#c2c6dc'} />
        <TabNavItemSpan>{name}</TabNavItemSpan>
      </TabNavItemButton>
    </TabNavItem>
@@ -245,7 +240,6 @@ const SaveButton = styled(Button)`
 type SettingsProps = {
  onProfileAvatarChange: () => void;
  onProfileAvatarRemove: () => void;
-  onChangeUserInfo: (data: UserInfoData, done: () => void) => void;
  onResetPassword: (password: string, done: () => void) => void;
  profile: TaskUser;
 };
@@ -306,93 +300,9 @@ const ResetPasswordTab: React.FC<ResetPasswordTabProps> = ({ onResetPassword })
  );
 };

-type UserInfoData = {
-  full_name: string;
-  bio: string;
-  initials: string;
-  email: string;
-};
-type UserInfoTabProps = {
-  profile: TaskUser;
-  onProfileAvatarChange: () => void;
-  onProfileAvatarRemove: () => void;
-  onChangeUserInfo: (data: UserInfoData, done: () => void) => void;
-};
-
-const EMAIL_PATTERN = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i;
-const INITIALS_PATTERN = /^[a-zA-Z]{2,3}$/i;
-
-const UserInfoTab: React.FC<UserInfoTabProps> = ({
-  profile,
-  onProfileAvatarRemove,
-  onProfileAvatarChange,
-  onChangeUserInfo,
-}) => {
-  const [active, setActive] = useState(true);
-  const { register, handleSubmit, errors } = useForm<UserInfoData>();
-  const done = () => {
-    setActive(true);
-  };
-  return (
-    <>
-      <AvatarSettings
-        onProfileAvatarRemove={onProfileAvatarRemove}
-        onProfileAvatarChange={onProfileAvatarChange}
-        profile={profile.profileIcon}
-      />
-      <form
-        onSubmit={handleSubmit(data => {
-          setActive(false);
-          onChangeUserInfo(data, done);
-        })}
-      >
-        <UserInfoInput
-          ref={register({ required: 'Full name is required' })}
-          name="full_name"
-          defaultValue={profile.fullName}
-          width="100%"
-          label="Name"
-        />
-        {errors.full_name && <FormError>{errors.full_name.message}</FormError>}
-        <UserInfoInput
-          defaultValue={profile.profileIcon && profile.profileIcon.initials ? profile.profileIcon.initials : ''}
-          ref={register({
-            required: 'Initials is required',
-            pattern: { value: INITIALS_PATTERN, message: 'Intials must be between two to four characters' },
-          })}
-          name="initials"
-          width="100%"
-          label="Initials "
-        />
-        {errors.initials && <FormError>{errors.initials.message}</FormError>}
-        <UserInfoInput disabled defaultValue={profile.username ?? ''} width="100%" label="Username " />
-        <UserInfoInput
-          width="100%"
-          name="email"
-          ref={register({
-            required: 'Email is required',
-            pattern: { value: EMAIL_PATTERN, message: 'Must be a valid email' },
-          })}
-          defaultValue={profile.email ?? ''}
-          label="Email"
-        />
-        {errors.email && <FormError>{errors.email.message}</FormError>}
-        <UserInfoInput width="100%" name="bio" ref={register()} defaultValue={profile.bio ?? ''} label="Bio" />
-        {errors.bio && <FormError>{errors.bio.message}</FormError>}
-        <SettingActions>
-          <SaveButton disabled={!active} type="submit">
-            Save Change
-          </SaveButton>
-        </SettingActions>
-      </form>
-    </>
-  );
-};
-
 const Settings: React.FC<SettingsProps> = ({
  onProfileAvatarRemove,
  onProfileAvatarChange,
-  onChangeUserInfo,
  onResetPassword,
  profile,
 }) => {
@@ -405,7 +315,6 @@ const Settings: React.FC<SettingsProps> = ({
        <TabNavContent>
          {items.map((item, idx) => (
            <NavItem
-              key={item.name}
              onClick={(tab, top) => {
                if ($tabNav && $tabNav.current) {
                  const pos = $tabNav.current.getBoundingClientRect();
@@ -423,12 +332,23 @@ const Settings: React.FC<SettingsProps> = ({
      </TabNav>
      <TabContentWrapper>
        <Tab tab={0} currentTab={currentTab}>
-          <UserInfoTab
-            onProfileAvatarChange={onProfileAvatarChange}
+          <AvatarSettings
            onProfileAvatarRemove={onProfileAvatarRemove}
-            profile={profile}
-            onChangeUserInfo={onChangeUserInfo}
+            onProfileAvatarChange={onProfileAvatarChange}
+            profile={profile.profileIcon}
          />
+          <Input defaultValue={profile.fullName} width="100%" label="Name" />
+          <Input
+            defaultValue={profile.profileIcon && profile.profileIcon.initials ? profile.profileIcon.initials : ''}
+            width="100%"
+            label="Initials "
+          />
+          <Input defaultValue={profile.username ?? ''} width="100%" label="Username " />
+          <Input width="100%" label="Email" />
+          <Input width="100%" label="Bio" />
+          <SettingActions>
+            <SaveButton>Save Change</SaveButton>
+          </SettingActions>
        </Tab>
        <Tab tab={1} currentTab={currentTab}>
          <ResetPasswordTab onResetPassword={onResetPassword} />
--- a/frontend/src/shared/components/TaskDetails/Styles.ts
+++ b/frontend/src/shared/components/TaskDetails/Styles.ts
@@ -1,365 +1,288 @@
-import styled, { css } from 'styled-components';
-import TextareaAutosize from 'react-autosize-textarea';
+import styled from 'styled-components';
+import TextareaAutosize from 'react-autosize-textarea/lib';
 import { mixin } from 'shared/utils/styles';
 import Button from 'shared/components/Button';
 import TaskAssignee from 'shared/components/TaskAssignee';
-import { User, Trash, Paperclip } from 'shared/icons';
-import Member from 'shared/components/Member';

-export const Container = styled.div`
-  display: flex;
-  height: 100%;
-`;
-
-export const LeftSidebar = styled.div`
+export const TaskHeader = styled.div`
+  padding: 21px 30px 0px;
+  margin-right: 70px;
  display: flex;
  flex-direction: column;
-  width: 300px;
-  background: #222740;
 `;

-export const MarkCompleteButton = styled.button<{ invert: boolean }>`
-  padding: 4px 8px;
+export const TaskMeta = styled.div`
  position: relative;
-  border: none;
  cursor: pointer;
-  border-radius: ${props => props.theme.borderRadius.alternate};
+  font-size: 14px;
  display: flex;
  align-items: center;
-  background: transparent;
-  & span {
-    margin-left: 4px;
-  }
-  ${props =>
-    props.invert
-      ? css`
-          background: rgba(${props.theme.colors.success});
-          & svg {
-            fill: rgba(${props.theme.colors.text.secondary});
-          }
-          & span {
-            color: rgba(${props.theme.colors.text.secondary});
-          }
-          &:hover {
-            background: rgba(${props.theme.colors.success}, 0.8);
-          }
-        `
-      : css`
-          background: none;
-          border: 1px solid rgba(${props.theme.colors.text.secondary});
-          & svg {
-            fill: rgba(${props.theme.colors.text.secondary});
-          }
-          & span {
-            color: rgba(${props.theme.colors.text.secondary});
-          }
-          &:hover {
-            background: rgba(${props.theme.colors.success}, 0.08);
-            border: 1px solid rgba(${props.theme.colors.success});
-          }
-          &:hover svg {
-            fill: rgba(${props.theme.colors.success});
-          }
-          &:hover span {
-            color: rgba(${props.theme.colors.success});
-          }
-        `}
+  border-radius: 4px;
 `;

-export const LeftSidebarContent = styled.div`
-  padding-top: 32px;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const LeftSidebarSection = styled.div`
-  display: flex;
-  flex-direction: column;
-  padding-left: 32px;
-  padding-right: 32px;
-  padding-bottom: 16px;
-  border-bottom: 1px solid #414561;
-`;
-
-export const SidebarTitle = styled.div`
-  font-size: 12px;
-  min-height: 24px;
-  margin-left: 8px;
-  color: rgba(${props => props.theme.colors.text.primary}, 0.75);
-  padding-top: 4px;
-  letter-spacing: 0.5px;
-  text-transform: uppercase;
-`;
-
-export const SidebarButton = styled.div`
+export const TaskGroupLabel = styled.span`
+  color: #c2c6dc;
  font-size: 14px;
-  color: rgba(${props => props.theme.colors.text.primary});
-  min-height: 32px;
-  width: 100%;
+`;
+export const TaskGroupLabelName = styled.span`
+  color: #c2c6dc;
+  text-decoration: underline;
+  font-size: 14px;
+`;

-  padding: 9px 8px 7px 8px;
-  border-color: transparent;
-  border-radius: 6px;
-  border-width: 1px;
-  border-style: solid;
+export const TaskActions = styled.div`
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 21px 18px 0px;
+  display: flex;
+  align-items: center;
+`;

-  display: inline-block;
-  outline: 0;
+export const TaskAction = styled.button`
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 32px;
  cursor: pointer;
-  &:hover {
-    border-color: #414561;
-  }
+  padding: 0px 9px;
 `;

-export const SidebarButtonText = styled.span`
-  min-height: 16px;
-  flex: 1 1 auto;
+export const TaskDetailsWrapper = styled.div`
  display: flex;
-  justify-content: flex-start;
+  padding: 0px 16px 60px;
 `;

-export const ContentContainer = styled.div`
-  display: flex;
-  flex-direction: column;
+export const TaskDetailsContent = styled.div`
  flex: 1;
-  padding-top: 32px;
-  overflow: auto;
+  padding-right: 8px;
 `;

-export const HeaderContainer = styled.div`
-  flex: 0 0 auto;
-  padding: 0px 32px 0px 24px;
-`;
-
-export const HeaderInnerContainer = styled.div`
-  display: flex;
-  justify-content: space-between;
-  margin: 0 0 0 0;
-  padding: 0 0 0 4px;
-`;
-
-export const HeaderLeft = styled.div`
-  display: flex;
-  justify-content: flex-start;
+export const TaskDetailsSidebar = styled.div`
+  width: 168px;
+  padding-left: 8px;
 `;

 export const TaskDetailsTitleWrapper = styled.div`
  width: 100%;
-  margin: 8px 0 4px 0;
+  margin: 0 0 0 -8px;
  display: inline-block;
 `;

 export const TaskDetailsTitle = styled(TextareaAutosize)`
-  padding: 9px 8px 7px 8px;
-  border-color: transparent;
-  border-radius: 6px;
-  border-width: 1px;
-  border-style: solid;
-  width: 100%;
-  color: #c2c6dc;
-  display: inline-block;
-  outline: 0;
+  line-height: 1.28;
+  resize: none;
+  box-shadow: transparent 0px 0px 0px 1px;
  font-size: 24px;
  font-weight: 700;
-  background: none;
-
-  &:hover {
-    border-color: #414561;
-  }
-
-  &:focus {
-    border-color: rgba(${props => props.theme.colors.primary});
-  }
-`;
-
-export const DueDateTitle = styled.div`
-  font-size: 12px;
-  min-height: 24px;
-  margin-left: 8px;
-  color: rgba(${props => props.theme.colors.text.primary}, 0.75);
-  padding-top: 8px;
-  letter-spacing: 0.5px;
-  text-transform: uppercase;
-`;
-
-export const AssignedUsersSection = styled.div`
-  padding-left: 32px;
-  padding-right: 32px;
-  padding-top: 24px;
-  padding-bottom: 24px;
-  border-bottom: 1px solid #414561;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const AssignUserIcon = styled.div`
-  cursor: pointer;
-  height: 32px;
-  width: 32px;
-  position: relative;
-  border-radius: 50%;
-  border: 1px dashed #414561;
-  margin-right: 8px;
-  display: flex;
-  flex-shrink: 0;
-  justify-content: center;
-  align-items: center;
-  &:hover {
-    border: 1px solid rgba(${props => props.theme.colors.text.secondary}, 0.75);
-  }
-  &:hover svg {
-    fill: rgba(${props => props.theme.colors.text.secondary}, 0.75);
-  }
-`;
-
-export const AssignUsersButton = styled.div`
-  cursor: pointer;
-  display: inline-flex;
-  flex: 1 1 auto;
-  height: 40px;
-  padding: 4px 16px 4px 8px;
-  margin-left: -1px;
-  border-radius: 6px;
-  align-items: center;
-  border: 1px solid transparent;
-  &:hover {
-    border: 1px solid ${mixin.darken('#414561', 0.15)};
-  }
-  &:hover ${AssignUserIcon} {
-    border: 1px solid #414561;
-  }
-`;
-
-export const AssignUserLabel = styled.span`
-  flex: 1 1 auto;
-  line-height: 15px;
-  color: rgba(${props => props.theme.colors.text.primary}, 0.75);
-`;
-
-export const ExtraActionsSection = styled.div`
-  padding-left: 32px;
-  padding-right: 32px;
-  padding-top: 24px;
-  display: flex;
-  flex-direction: column;
-`;
-
-export const ActionButtonsTitle = styled.h3`
-  color: rgba(${props => props.theme.colors.text.primary});
-  font-size: 12px;
-  font-weight: 500;
-  letter-spacing: 0.04em;
-`;
-
-export const ActionButton = styled(Button)`
-  margin-top: 8px;
-  margin-left: -10px;
-  padding: 8px 16px;
-  background: rgba(${props => props.theme.colors.bg.primary}, 0.5);
-  text-align: left;
-  transition: transform 0.2s ease;
-  & span {
-    justify-content: flex-start;
-  }
-  &:hover {
-    box-shadow: none;
-    transform: translateX(4px);
-    background: rgba(${props => props.theme.colors.bg.primary}, 0.75);
-  }
-`;
-
-export const HeaderRight = styled.div`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`;
-
-export const HeaderActionIcon = styled.div`
-  padding: 4px 4px 4px 4px;
-  margin: 0 4px 0 4px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  cursor: pointer;
-  svg {
-    fill: rgba(${props => props.theme.colors.text.primary}, 0.75);
-  }
-  &:hover svg {
-    fill: rgba(${props => props.theme.colors.primary});
-  }
-`;
-
-export const EditorContainer = styled.div`
-  margin-left: 32px;
-  margin-right: 32px;
-
-  padding: 9px 8px 7px 8px;
-  border-color: transparent;
-  border-radius: 6px;
+  padding: 4px;
+  background: #262c49;
  border-width: 1px;
  border-style: solid;
-  outline: 0;
-  background: none;
+  border-color: transparent;
+  border-image: initial;
+  transition: background 0.1s ease 0s;
+  overflow-y: hidden;
+  width: 100%;
+  color: #c2c6dc;
+  &:focus {
+    box-shadow: rgb(115, 103, 240) 0px 0px 0px 1px;
+    background: ${mixin.darken('#262c49', 0.15)};
+  }
+`;
+
+export const TaskDetailsLabel = styled.div`
+  padding: 24px 0px 12px;
+  font-size: 15px;
+  font-weight: 600;
+  color: #c2c6dc;
+`;
+
+export const TaskDetailsAddDetailsButton = styled.div`
+  background: ${mixin.darken('#262c49', 0.15)};
+  box-shadow: none;
+  border: none;
+  border-radius: 3px;
+  display: block;
+  min-height: 56px;
+  padding: 8px 12px;
+  text-decoration: none;
+  font-size: 14px;
+  cursor: pointer;
+  color: #c2c6dc;
+  &:hover {
+    background: ${mixin.darken('#262c49', 0.25)};
+    box-shadow: none;
+    border: none;
+  }
+`;
+
+export const TaskDetailsEditorWrapper = styled.div`
+  display: block;
+  padding-bottom: 9px;
+  z-index: 50;
+  width: 100%;
+`;
+
+export const TaskDetailsEditor = styled(TextareaAutosize)`
+  width: 100%;
+  min-height: 108px;
+  color: #c2c6dc;
+  background: #262c49;
+  box-shadow: rgb(115, 103, 240) 0px 0px 0px 1px;
+  border-radius: 3px;
+  line-height: 20px;
+  padding: 8px 12px;
+  outline: none;
+  border: none;
+
+  &:focus {
+    box-shadow: rgb(115, 103, 240) 0px 0px 0px 1px;
+    background: ${mixin.darken('#262c49', 0.05)};
+  }
+`;
+
+export const TaskDetailsMarkdown = styled.div`
+  width: 100%;
+  cursor: pointer;
+  color: #c2c6dc;
+
+  h1 {
+    font-size: 24px;
+    font-weight: 600;
+    line-height: 28px;
+    margin: 0 0 12px;
+  }
+
+  h2 {
+    font-weight: 600;
+    font-size: 20px;
+    line-height: 24px;
+    margin: 16px 0 8px;
+  }
+
+  p {
+    margin: 0 0 8px;
+  }
+
+  strong {
+    font-weight: 700;
+  }

  ul {
-    list-style-type: disc;
+    margin: 8px 0;
  }

-  ul.checkbox_list input[type='checkbox'] {
-    border-radius: 6px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #414561;
+  ul > li {
+    margin: 8px 8px 8px 24px;
+    list-style: disc;
+  }
+
+  p a {
+    color: rgba(${props => props.theme.colors.primary});
  }
 `;

-export const InnerContentContainer = styled.div`
-  overflow: auto;
-  position: relative;
-`;
-
-export const DescriptionContainer = styled.div`
-  position: relative;
+export const TaskDetailsControls = styled.div`
+  clear: both;
+  margin-top: 8px;
  display: flex;
-  flex-direction: column;
 `;

-export const DescriptionActionButton = styled(Button)`
-  padding: 8px 16px;
+export const ConfirmSave = styled(Button)`
+  padding: 6px 12px;
+  border-radius: 3px;
+  margin-right: 6px;
 `;

-export const Labels = styled.div`
+export const CancelEdit = styled.div`
  display: flex;
-  padding-left: 9px;
-  margin: 0 0 8px 0;
+  align-items: center;
+  justify-content: center;
+  height: 32px;
+  width: 32px;
+  cursor: pointer;
 `;

-export const MetaDetail = styled.div`
+export const TaskDetailSectionTitle = styled.div`
+  text-transform: uppercase;
+  color: #c2c6dc;
+  font-size: 12.5px;
+  font-weight: 600;
+  margin: 24px 0px 5px;
+`;
+
+export const TaskDetailAssignees = styled.div`
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+`;
+
+export const TaskDetailAssignee = styled.div`
+  &:hover {
+    opacity: 0.8;
+  }
+  margin-right: 4px;
+`;
+
+export const ProfileIcon = styled.div`
+  width: 32px;
+  height: 32px;
+  border-radius: 9999px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  font-weight: 700;
+  background: rgb(115, 103, 240);
+  cursor: pointer;
+`;
+
+export const TaskDetailsAddMemberIcon = styled.div`
+  float: left;
+  height: 32px;
+  width: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 100%;
+  background: ${mixin.darken('#262c49', 0.15)};
+  cursor: pointer;
+  &:hover {
+    opacity: 0.8;
+  }
+`;
+
+export const TaskDetailLabels = styled.div`
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+`;
+
+export const TaskDetailLabel = styled.div<{ color: string }>`
+  &:hover {
+    opacity: 0.8;
+  }
+  background-color: ${props => props.color};
+  color: #fff;
+
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+
+  border-radius: 3px;
+  box-sizing: border-box;
  display: block;
  float: left;
-  margin: 0 16px 8px 0;
-  max-width: 100%;
+  font-weight: 600;
+  height: 32px;
+  line-height: 32px;
+  margin: 0 4px 4px 0;
+  min-width: 40px;
+  padding: 0 12px;
+  width: auto;
 `;

-export const MetaDetailTitle = styled.h3`
-  color: rgba(${props => props.theme.colors.text.primary});
-  font-size: 12px;
-  font-weight: 500;
-  letter-spacing: 0.04em;
-  margin-top: 16px;
-  text-transform: uppercase;
-  display: block;
-  line-height: 20px;
-  margin: 0 8px 4px 0;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-`;
-
-export const MetaDetailContent = styled.div`
-  display: flex;
-`;
 export const TaskDetailsAddLabel = styled.div`
  border-radius: 3px;
  background: ${mixin.darken('#262c49', 0.15)};
@@ -384,231 +307,90 @@ export const TaskDetailsAddLabelIcon = styled.div`
  }
 `;

-export const ChecklistSection = styled.div`
-  margin-top: 8px;
-  padding: 0 24px;
+export const NoDueDateLabel = styled.span`
+  color: rgb(137, 147, 164);
+  font-size: 14px;
+  cursor: pointer;
 `;

-export const TaskDetailLabel = styled.div<{ color: string }>`
-  &:hover {
-    opacity: 0.8;
-  }
-  background-color: ${props => props.color};
-  color: #fff;
+export const UnassignedLabel = styled.div`
+  color: rgb(137, 147, 164);
+  font-size: 14px;
  cursor: pointer;
  display: flex;
  align-items: center;
-  border-radius: 3px;
-  box-sizing: border-box;
-  display: block;
-  float: left;
-  font-weight: 600;
  height: 32px;
-  line-height: 32px;
-  margin: 0 4px 0 0;
-  min-width: 40px;
-  padding: 0 12px;
-  width: auto;
 `;

-export const MemberList = styled.div`
-  display: flex;
-  align-items: center;
-  padding: 4px 16px 4px 8px;
-  margin-left: -1px;
-`;
-
-export const TaskMember = styled(TaskAssignee)`
-  margin-right: 4px;
-`;
-
-export const ActionButtonIcon = styled.div``;
-
-export const EditorActions = styled.div`
-  display: flex;
-  align-items: center;
-
-  margin-left: 32px;
-  margin-right: 32px;
-  padding: 9px 8px 7px 8px;
-`;
-
-export const CancelIcon = styled.div`
-  width: 32px;
-  height: 32p;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-left: 4px;
-`;
-
-export const TabBarSection = styled.div`
-  margin-top: 2px;
-  padding-left: 23px;
-  display: flex;
-  text-transform: uppercase;
-  min-height: 35px;
-  border-bottom: 1px solid #414561;
-`;
-
-export const TabBarItem = styled.div`
-  box-shadow: inset 0 -2px rgba(216, 93, 216);
-  padding: 12px 7px 14px 7px;
-  margin-bottom: -1px;
-  margin-right: 36px;
-  color: rgba(${props => props.theme.colors.text.primary});
-`;
-
-export const CommentContainer = styled.div`
-  flex: 0 0 auto;
-  margin-top: auto;
-  padding: 15px 26px;
-  background: #1f243e;
-`;
-
-export const CommentInnerWrapper = styled.div`
-  display: flex;
-  position: relative;
-`;
-
-export const CommentEditorContainer = styled.div`
-  flex: 1;
-  border-radius: 6px;
-  border: 1px solid #414561;
+export const ActionButtons = styled.div`
  display: flex;
  flex-direction: column;
 `;
-export const CommentProfile = styled(TaskAssignee)`
-  margin-right: 8px;
-  position: relative;
-  top: 0;
-  padding-top: 3px;
-  align-items: normal;
-`;

-export const CommentTextArea = styled(TextareaAutosize)`
-  width: 100%;
-  line-height: 28px;
-  padding: 4px 6px;
-  border-radius: 6px;
+export const ActionButtonsTitle = styled.h3`
  color: rgba(${props => props.theme.colors.text.primary});
-  background: #1f243e;
-  border: none;
-  transition: max-height 200ms, height 200ms, min-height 200ms;
-  min-height: 36px;
-  max-height: 36px;
-  &:not(:focus) {
-    height: 36px;
-  }
-  &:focus {
-    min-height: 80px;
-    max-height: none;
-    line-height: 20px;
-  }
-`;
-
-export const CommentEditorActions = styled.div<{ visible: boolean }>`
-  display: ${props => (props.visible ? 'flex' : 'none')};
-  align-items: center;
-  padding: 5px 5px 5px 9px;
-  border-top: 1px solid #414561;
-`;
-
-export const CommentEditorActionIcon = styled.div`
-  width: 32px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-`;
-
-export const CommentEditorSaveButton = styled(Button)`
-  margin-left: auto;
-  padding: 8px 16px;
-`;
-
-export const ActivitySection = styled.div`
-  overflow-x: hidden;
-
-  padding: 8px 26px;
-`;
-
-export const ActivityItem = styled.div`
-  padding: 8px 0;
-  position: relative;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  word-break: break-word;
-`;
-
-export const ActivityItemHeader = styled.div`
-  display: flex;
-`;
-export const ActivityItemHeaderUser = styled(TaskAssignee)`
-  margin-right: 4px;
-`;
-
-export const ActivityItemHeaderTitle = styled.div`
-  margin-left: 4px;
-  line-height: 18px;
-  display: flex;
-  align-items: center;
-`;
-
-export const ActivityItemHeaderTitleName = styled.span`
-  color: rgba(${props => props.theme.colors.text.primary});
-  font-weight: 500;
-`;
-
-export const ActivityItemTimestamp = styled.span<{ margin: number }>`
  font-size: 12px;
-  color: rgba(${props => props.theme.colors.text.primary}, 0.65);
-  margin-left: ${props => props.margin}px;
+  font-weight: 500;
+  letter-spacing: 0.04em;
 `;

-export const ActivityItemDetails = styled.div`
-  margin-left: 32px;
-`;
-
-export const ActivityItemComment = styled.div`
-  display: inline-flex;
-  border-radius: 3px;
-  ${mixin.boxShadowCard}
-  position: relative;
-  color: rgba(${props => props.theme.colors.text.primary});
-  padding: 8px 12px;
-  margin: 4px 0;
-  background-color: ${mixin.darken('#262c49', 0.1)};
-`;
-
-export const ActivityItemLog = styled.span`
-  margin-left: 2px;
-  color: rgba(${props => props.theme.colors.text.primary});
-`;
-
-export const ViewRawButton = styled.button`
-  border-radius: 3px;
-  padding: 8px 12px;
-  display: flex;
-  position: absolute;
-  right: 4px;
-  bottom: -24px;
-  cursor: pointer;
-  color: rgba(${props => props.theme.colors.text.primary}, 0.25);
+export const ActionButton = styled(Button)`
+  margin-top: 8px;
+  padding: 6px 12px;
+  background: rgba(${props => props.theme.colors.bg.primary}, 0.4);
+  text-align: left;
  &:hover {
-    color: rgba(${props => props.theme.colors.text.primary});
+    box-shadow: none;
+    background: rgba(${props => props.theme.colors.bg.primary}, 0.6);
  }
 `;

-export const TaskDetailsEditor = styled(TextareaAutosize)`
-  min-height: 108px;
-  color: #c2c6dc;
-  background: #262c49;
-  border-radius: 3px;
-  line-height: 20px;
-  margin-left: 32px;
-  margin-right: 32px;
-  padding: 9px 8px 7px 8px;
-  outline: none;
-  border: none;
+export const MetaDetails = styled.div`
+  margin-top: 8px;
+  display: flex;
+`;
+
+export const TaskDueDateButton = styled(Button)`
+  height: 32px;
+  padding: 6px 12px;
+  background: rgba(${props => props.theme.colors.bg.primary}, 0.4);
+  &:hover {
+    box-shadow: none;
+    background: rgba(${props => props.theme.colors.bg.primary}, 0.6);
+  }
+`;
+
+export const MetaDetail = styled.div`
+  display: block;
+  float: left;
+  margin: 0 16px 8px 0;
+  max-width: 100%;
+`;
+
+export const TaskDetailsSection = styled.div`
+  display: block;
+`;
+
+export const MetaDetailTitle = styled.h3`
+  color: rgba(${props => props.theme.colors.text.primary});
+  font-size: 12px;
+  font-weight: 500;
+  letter-spacing: 0.04em;
+  margin-top: 16px;
+  text-transform: uppercase;
+  display: block;
+  line-height: 20px;
+  margin: 0 8px 4px 0;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+`;
+
+export const TaskMember = styled(TaskAssignee)``;
+
+export const MetaDetailContent = styled.div`
+  display: flex;
+  & ${TaskMember} {
+    margin-right: 4px;
+  }
 `;
--- a/frontend/src/shared/components/TaskDetails/index.tsx
+++ b/frontend/src/shared/components/TaskDetails/index.tsx
@@ -1,78 +1,70 @@
-import React, { useState, useRef } from 'react';
-import {
-  Plus,
-  User,
-  Trash,
-  Paperclip,
-  Clone,
-  Share,
-  Tags,
-  Checkmark,
-  CheckSquareOutline,
-  At,
-  Smile,
-} from 'shared/icons';
-import Editor from 'rich-markdown-editor';
-import dark from 'shared/utils/editorTheme';
+import React, { useState, useRef, useEffect } from 'react';
+import { Bin, Cross, Plus } from 'shared/icons';
+import useOnOutsideClick from 'shared/hooks/onOutsideClick';
+import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';

-import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
+import {
+  isPositionChanged,
+  getSortedDraggables,
+  getNewDraggablePosition,
+  getAfterDropDraggableList,
+} from 'shared/utils/draggables';
+import { DragDropContext, Droppable, Draggable, DropResult } from 'react-beautiful-dnd';
+import TaskAssignee from 'shared/components/TaskAssignee';
 import moment from 'moment';

-import Task from 'shared/icons/Task';
 import {
-  TaskDetailLabel,
-  CommentContainer,
-  MetaDetailContent,
+  TaskMember,
+  NoDueDateLabel,
+  TaskDueDateButton,
+  UnassignedLabel,
+  TaskGroupLabel,
+  TaskGroupLabelName,
+  TaskDetailsSection,
+  TaskActions,
+  TaskDetailsAddLabel,
  TaskDetailsAddLabelIcon,
+  TaskAction,
+  TaskMeta,
+  ActionButtons,
  ActionButton,
-  AssignUserIcon,
-  AssignUserLabel,
-  AssignUsersButton,
-  AssignedUsersSection,
-  ViewRawButton,
-  DueDateTitle,
-  Container,
-  LeftSidebar,
-  ContentContainer,
-  LeftSidebarContent,
-  LeftSidebarSection,
-  SidebarTitle,
-  SidebarButton,
-  SidebarButtonText,
-  MarkCompleteButton,
-  HeaderContainer,
-  HeaderLeft,
-  HeaderInnerContainer,
+  ActionButtonsTitle,
+  TaskHeader,
+  ProfileIcon,
+  TaskDetailsContent,
+  TaskDetailsWrapper,
+  TaskDetailsSidebar,
  TaskDetailsTitleWrapper,
  TaskDetailsTitle,
-  ExtraActionsSection,
-  HeaderRight,
-  HeaderActionIcon,
-  EditorContainer,
-  InnerContentContainer,
-  DescriptionContainer,
-  Labels,
-  ChecklistSection,
-  MemberList,
-  TaskMember,
-  TabBarSection,
-  TabBarItem,
-  CommentTextArea,
-  CommentEditorContainer,
-  CommentEditorActions,
-  CommentEditorActionIcon,
-  CommentEditorSaveButton,
-  CommentProfile,
-  CommentInnerWrapper,
-  ActivitySection,
+  TaskDetailsLabel,
+  TaskDetailsAddDetailsButton,
  TaskDetailsEditor,
+  TaskDetailsEditorWrapper,
+  TaskDetailsMarkdown,
+  TaskDetailsControls,
+  ConfirmSave,
+  CancelEdit,
+  TaskDetailSectionTitle,
+  TaskDetailLabel,
+  TaskDetailLabels,
+  TaskDetailAssignee,
+  TaskDetailAssignees,
+  TaskDetailsAddMemberIcon,
+  MetaDetails,
+  MetaDetail,
+  MetaDetailTitle,
+  MetaDetailContent,
 } from './Styles';
 import Checklist, { ChecklistItem, ChecklistItems } from '../Checklist';
-import onDragEnd from './onDragEnd';

 const ChecklistContainer = styled.div``;

+type TaskContentProps = {
+  onEditContent: () => void;
+  description: string;
+};
+
 type TaskLabelProps = {
  label: TaskLabel;
  onClick: ($target: React.RefObject<HTMLElement>) => void;
@@ -93,15 +85,62 @@ const TaskLabelItem: React.FC<TaskLabelProps> = ({ label, onClick }) => {
  );
 };

+const TaskContent: React.FC<TaskContentProps> = ({ description, onEditContent }) => {
+  return description === '' ? (
+    <TaskDetailsAddDetailsButton onClick={onEditContent}>Add a more detailed description</TaskDetailsAddDetailsButton>
+  ) : (
+    <TaskDetailsMarkdown onClick={onEditContent}>
+      <ReactMarkdown source={description} />
+    </TaskDetailsMarkdown>
+  );
+};
+
 type DetailsEditorProps = {
  description: string;
  onTaskDescriptionChange: (newDescription: string) => void;
  onCancel: () => void;
 };

+const DetailsEditor: React.FC<DetailsEditorProps> = ({
+  description: initialDescription,
+  onTaskDescriptionChange,
+  onCancel,
+}) => {
+  const [description, setDescription] = useState(initialDescription);
+  const $editorWrapperRef = useRef<HTMLDivElement>(null);
+  const $editorRef = useRef<HTMLTextAreaElement>(null);
+  const handleOutsideClick = () => {
+    onTaskDescriptionChange(description);
+  };
+  useEffect(() => {
+    if ($editorRef && $editorRef.current) {
+      $editorRef.current.focus();
+      $editorRef.current.select();
+    }
+  }, []);
+
+  useOnOutsideClick($editorWrapperRef, true, handleOutsideClick, null);
+  return (
+    <TaskDetailsEditorWrapper ref={$editorWrapperRef}>
+      <TaskDetailsEditor
+        ref={$editorRef}
+        value={description}
+        onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => setDescription(e.currentTarget.value)}
+      />
+      <TaskDetailsControls>
+        <ConfirmSave variant="relief" onClick={handleOutsideClick}>
+          Save
+        </ConfirmSave>
+        <CancelEdit onClick={onCancel}>
+          <Plus size={16} color="#c2c6dc" />
+        </CancelEdit>
+      </TaskDetailsControls>
+    </TaskDetailsEditorWrapper>
+  );
+};
+
 type TaskDetailsProps = {
  task: Task;
-  me?: TaskUser | null;
  onTaskNameChange: (task: Task, newName: string) => void;
  onTaskDescriptionChange: (task: Task, newDescription: string) => void;
  onDeleteTask: (task: Task) => void;
@@ -123,7 +162,6 @@ type TaskDetailsProps = {
 };

 const TaskDetails: React.FC<TaskDetailsProps> = ({
-  me,
  task,
  onDeleteChecklist,
  onTaskNameChange,
@@ -144,205 +182,209 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
  onToggleChecklistItem,
  onMemberProfile,
 }) => {
+  const [editorOpen, setEditorOpen] = useState(false);
+  const [description, setDescription] = useState(task.description ?? '');
  const [taskName, setTaskName] = useState(task.name);
-  const [editTaskDescription, setEditTaskDescription] = useState(() => {
-    if (task.description) {
-      if (task.description.trim() === '' || task.description.trim() === '\\') {
-        return true;
-      }
-      return false;
-    }
-    return true;
-  });
-  const [saveTimeout, setSaveTimeout] = useState<any>(null);
-  const [showRaw, setShowRaw] = useState(false);
-  const [showCommentActions, setShowCommentActions] = useState(false);
-  const taskDescriptionRef = useRef(task.description ?? '');
-  const $noMemberBtn = useRef<HTMLDivElement>(null);
-  const $addMemberBtn = useRef<HTMLDivElement>(null);
-  const $dueDateBtn = useRef<HTMLDivElement>(null);
-
-  const saveDescription = () => {
-    onTaskDescriptionChange(task, taskDescriptionRef.current);
+  const handleClick = () => {
+    setEditorOpen(!editorOpen);
  };
-  return (
-    <Container>
-      <LeftSidebar>
-        <LeftSidebarContent>
-          <LeftSidebarSection>
-            <SidebarTitle>TASK GROUP</SidebarTitle>
-            <SidebarButton>
-              <SidebarButtonText>{task.taskGroup.name}</SidebarButtonText>
-            </SidebarButton>
-            <DueDateTitle>DUE DATE</DueDateTitle>
-            <SidebarButton
-              ref={$dueDateBtn}
-              onClick={() => {
-                onOpenDueDatePopop(task, $dueDateBtn);
-              }}
-            >
-              {task.dueDate ? (
-                <SidebarButtonText>{moment(task.dueDate).format('MMM D [at] h:mm A')}</SidebarButtonText>
-              ) : (
-                <SidebarButtonText>No due date</SidebarButtonText>
-              )}
-            </SidebarButton>
-          </LeftSidebarSection>
-          <AssignedUsersSection>
-            <DueDateTitle>MEMBERS</DueDateTitle>
-            {task.assigned && task.assigned.length !== 0 ? (
-              <MemberList>
-                {task.assigned.map(m => (
-                  <TaskMember
-                    key={m.id}
-                    member={m}
-                    size={32}
-                    onMemberProfile={$target => {
-                      onMemberProfile($target, m.id);
-                    }}
-                  />
-                ))}
-                <AssignUserIcon
-                  ref={$addMemberBtn}
-                  onClick={() => {
-                    onOpenAddMemberPopup(task, $addMemberBtn);
-                  }}
-                >
-                  <Plus width={16} height={16} />
-                </AssignUserIcon>
-              </MemberList>
-            ) : (
-              <AssignUsersButton
-                ref={$noMemberBtn}
-                onClick={() => {
-                  onOpenAddMemberPopup(task, $noMemberBtn);
-                }}
-              >
-                <AssignUserIcon>
-                  <User width={16} height={16} />
-                </AssignUserIcon>
-                <AssignUserLabel>No members</AssignUserLabel>
-              </AssignUsersButton>
-            )}
-          </AssignedUsersSection>
-          <ExtraActionsSection>
-            <DueDateTitle>ACTIONS</DueDateTitle>
-            <ActionButton
-              onClick={$target => {
-                onOpenAddLabelPopup(task, $target);
-              }}
-              icon={<Tags width={12} height={12} />}
-            >
-              Labels
-            </ActionButton>
-            <ActionButton
-              onClick={$target => {
-                onOpenAddChecklistPopup(task, $target);
-              }}
-              icon={<CheckSquareOutline width={12} height={12} />}
-            >
-              Checklist
-            </ActionButton>
-            <ActionButton>Cover</ActionButton>
-          </ExtraActionsSection>
-        </LeftSidebarContent>
-      </LeftSidebar>
-      <ContentContainer>
-        <HeaderContainer>
-          <HeaderInnerContainer>
-            <HeaderLeft>
-              <MarkCompleteButton
-                invert={task.complete ?? false}
-                onClick={() => {
-                  onToggleTaskComplete(task);
-                }}
-              >
-                <Checkmark width={8} height={8} />
-                <span>{task.complete ? 'Completed' : 'Mark complete'}</span>
-              </MarkCompleteButton>
-            </HeaderLeft>
-            <HeaderRight>
-              <HeaderActionIcon>
-                <Paperclip width={16} height={16} />
-              </HeaderActionIcon>
-              <HeaderActionIcon>
-                <Clone width={16} height={16} />
-              </HeaderActionIcon>
-              <HeaderActionIcon>
-                <Share width={16} height={16} />
-              </HeaderActionIcon>
-              <HeaderActionIcon onClick={() => onDeleteTask(task)}>
-                <Trash width={16} height={16} />
-              </HeaderActionIcon>
-            </HeaderRight>
-          </HeaderInnerContainer>
-          <TaskDetailsTitleWrapper>
-            <TaskDetailsTitle
-              value={taskName}
-              onChange={e => {
-                setTaskName(e.currentTarget.value);
-              }}
-              onBlur={() => {
-                if (taskName !== task.name) {
-                  onTaskNameChange(task, taskName);
-                }
-              }}
-            />
-          </TaskDetailsTitleWrapper>
-          <Labels>
-            {task.labels.length !== 0 && (
-              <MetaDetailContent>
-                {task.labels.map(label => {
-                  return (
-                    <TaskLabelItem
-                      key={label.projectLabel.id}
-                      label={label}
-                      onClick={$target => {
-                        onOpenAddLabelPopup(task, $target);
-                      }}
-                    />
-                  );
-                })}
-                <TaskDetailsAddLabelIcon>
-                  <Plus width={12} height={12} />
-                </TaskDetailsAddLabelIcon>
-              </MetaDetailContent>
-            )}
-          </Labels>
-        </HeaderContainer>
-        <InnerContentContainer>
-          <DescriptionContainer>
-            {showRaw ? (
-              <TaskDetailsEditor value={taskDescriptionRef.current} />
-            ) : (
-              <EditorContainer
-                onClick={e => {
-                  if (!editTaskDescription) {
-                    setEditTaskDescription(true);
-                  }
-                }}
-              >
-                <Editor
-                  defaultValue={task.description ?? ''}
-                  theme={dark}
-                  readOnly={!editTaskDescription}
-                  autoFocus
-                  onChange={value => {
-                    setSaveTimeout(() => {
-                      clearTimeout(saveTimeout);
-                      return setTimeout(saveDescription, 2000);
-                    });
-                    const text = value();
-                    taskDescriptionRef.current = text;
-                  }}
-                />
-              </EditorContainer>
-            )}
+  const handleDeleteTask = () => {
+    onDeleteTask(task);
+  };
+  const $title = useRef<HTMLTextAreaElement>(null);
+  const onKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      onTaskNameChange(task, taskName);
+      if ($title && $title.current) {
+        $title.current.blur();
+      }
+    }
+  };
+  const $unassignedRef = useRef<HTMLDivElement>(null);
+  const $addMemberRef = useRef<HTMLDivElement>(null);
+  const onUnassignedClick = () => {
+    onOpenAddMemberPopup(task, $unassignedRef);
+  };
+  const onAddMember = ($target: React.RefObject<HTMLElement>) => {
+    onOpenAddMemberPopup(task, $target);
+  };
+  const onAddChecklist = ($target: React.RefObject<HTMLElement>) => {
+    onOpenAddChecklistPopup(task, $target);
+  };
+  const $dueDateLabel = useRef<HTMLDivElement>(null);
+  const $addLabelRef = useRef<HTMLDivElement>(null);

-            <ViewRawButton onClick={() => setShowRaw(!showRaw)}>{showRaw ? 'Show editor' : 'Show raw'}</ViewRawButton>
-          </DescriptionContainer>
-          <ChecklistSection>
-            <DragDropContext onDragEnd={result => onDragEnd(result, task, onChecklistDrop, onChecklistItemDrop)}>
+  const onAddLabel = ($target: React.RefObject<HTMLElement>) => {
+    onOpenAddLabelPopup(task, $target);
+  };
+
+  const onDragEnd = ({ draggableId, source, destination, type }: DropResult) => {
+    if (typeof destination === 'undefined') return;
+    if (!isPositionChanged(source, destination)) return;
+
+    const isChecklist = type === 'checklist';
+    const isSameChecklist = destination.droppableId === source.droppableId;
+    let droppedDraggable: DraggableElement | null = null;
+    let beforeDropDraggables: Array<DraggableElement> | null = null;
+
+    if (!task.checklists) return;
+    if (isChecklist) {
+      const droppedGroup = task.checklists.find(taskGroup => taskGroup.id === draggableId);
+      if (droppedGroup) {
+        droppedDraggable = {
+          id: draggableId,
+          position: droppedGroup.position,
+        };
+        beforeDropDraggables = getSortedDraggables(
+          task.checklists.map(checklist => {
+            return { id: checklist.id, position: checklist.position };
+          }),
+        );
+        if (droppedDraggable === null || beforeDropDraggables === null) {
+          throw new Error('before drop draggables is null');
+        }
+        const afterDropDraggables = getAfterDropDraggableList(
+          beforeDropDraggables,
+          droppedDraggable,
+          isChecklist,
+          isSameChecklist,
+          destination,
+        );
+        const newPosition = getNewDraggablePosition(afterDropDraggables, destination.index);
+        onChecklistDrop({ ...droppedGroup, position: newPosition });
+      } else {
+        throw new Error('task group can not be found');
+      }
+    } else {
+      const targetChecklist = task.checklists.findIndex(
+        checklist => checklist.items.findIndex(item => item.id === draggableId) !== -1,
+      );
+      const droppedChecklistItem = task.checklists[targetChecklist].items.find(item => item.id === draggableId);
+
+      if (droppedChecklistItem) {
+        droppedDraggable = {
+          id: draggableId,
+          position: droppedChecklistItem.position,
+        };
+        beforeDropDraggables = getSortedDraggables(
+          task.checklists[targetChecklist].items.map(item => {
+            return { id: item.id, position: item.position };
+          }),
+        );
+        if (droppedDraggable === null || beforeDropDraggables === null) {
+          throw new Error('before drop draggables is null');
+        }
+        const afterDropDraggables = getAfterDropDraggableList(
+          beforeDropDraggables,
+          droppedDraggable,
+          isChecklist,
+          isSameChecklist,
+          destination,
+        );
+        const newPosition = getNewDraggablePosition(afterDropDraggables, destination.index);
+        const newItem = {
+          ...droppedChecklistItem,
+          position: newPosition,
+        };
+        onChecklistItemDrop(droppedChecklistItem.taskChecklistID, destination.droppableId, newItem);
+      }
+    }
+  };
+
+  return (
+    <>
+      <TaskActions>
+        <TaskAction onClick={handleDeleteTask}>
+          <Bin size={20} color="#c2c6dc" />
+        </TaskAction>
+        <TaskAction onClick={onCloseModal}>
+          <Cross width={16} height={16} />
+        </TaskAction>
+      </TaskActions>
+      <TaskHeader>
+        <TaskDetailsTitleWrapper>
+          <TaskDetailsTitle
+            ref={$title}
+            value={taskName}
+            onChange={(e: React.ChangeEvent<HTMLTextAreaElement>) => setTaskName(e.currentTarget.value)}
+            onKeyDown={onKeyDown}
+          />
+        </TaskDetailsTitleWrapper>
+        <TaskMeta>
+          {task.taskGroup.name && (
+            <TaskGroupLabel>
+              {`in list ${(<TaskGroupLabelName>{task.taskGroup.name}</TaskGroupLabelName>)}`}
+            </TaskGroupLabel>
+          )}
+        </TaskMeta>
+      </TaskHeader>
+      <TaskDetailsWrapper>
+        <TaskDetailsContent>
+          <MetaDetails>
+            {task.assigned && task.assigned.length !== 0 && (
+              <MetaDetail>
+                <MetaDetailTitle>MEMBERS</MetaDetailTitle>
+                <MetaDetailContent>
+                  {task.assigned &&
+                    task.assigned.map(member => (
+                      <TaskMember key={member.id} size={32} member={member} onMemberProfile={onMemberProfile} />
+                    ))}
+                  <TaskDetailsAddMemberIcon ref={$addMemberRef} onClick={() => onAddMember($addMemberRef)}>
+                    <Plus size={16} color="#c2c6dc" />
+                  </TaskDetailsAddMemberIcon>
+                </MetaDetailContent>
+              </MetaDetail>
+            )}
+            {task.labels.length !== 0 && (
+              <MetaDetail>
+                <MetaDetailTitle>LABELS</MetaDetailTitle>
+                <MetaDetailContent>
+                  {task.labels.map(label => {
+                    return (
+                      <TaskLabelItem
+                        key={label.projectLabel.id}
+                        label={label}
+                        onClick={$target => {
+                          onOpenAddLabelPopup(task, $target);
+                        }}
+                      />
+                    );
+                  })}
+                  <TaskDetailsAddLabelIcon ref={$addLabelRef} onClick={() => onAddLabel($addLabelRef)}>
+                    <Plus size={16} color="#c2c6dc" />
+                  </TaskDetailsAddLabelIcon>
+                </MetaDetailContent>
+              </MetaDetail>
+            )}
+            {task.dueDate && (
+              <MetaDetail>
+                <MetaDetailTitle>DUE DATE</MetaDetailTitle>
+                <MetaDetailContent>
+                  <TaskDueDateButton>{moment(task.dueDate).format('MMM D [at] h:mm A')}</TaskDueDateButton>
+                </MetaDetailContent>
+              </MetaDetail>
+            )}
+          </MetaDetails>
+
+          <TaskDetailsSection>
+            <TaskDetailsLabel>Description</TaskDetailsLabel>
+            {editorOpen ? (
+              <DetailsEditor
+                description={description}
+                onTaskDescriptionChange={newDescription => {
+                  setEditorOpen(false);
+                  setDescription(newDescription);
+                  onTaskDescriptionChange(task, newDescription);
+                }}
+                onCancel={() => {
+                  setEditorOpen(false);
+                }}
+              />
+            ) : (
+              <TaskContent description={description} onEditContent={handleClick} />
+            )}
+            <DragDropContext onDragEnd={onDragEnd}>
              <Droppable direction="vertical" type="checklist" droppableId="root">
                {dropProvided => (
                  <ChecklistContainer {...dropProvided.droppableProps} ref={dropProvided.innerRef}>
@@ -421,54 +463,32 @@ const TaskDetails: React.FC<TaskDetailsProps> = ({
                )}
              </Droppable>
            </DragDropContext>
-          </ChecklistSection>
-          <TabBarSection>
-            <TabBarItem>Activity</TabBarItem>
-          </TabBarSection>
-          <ActivitySection />
-        </InnerContentContainer>
-        <CommentContainer>
-          {me && (
-            <CommentInnerWrapper>
-              <CommentProfile
-                member={me}
-                size={32}
-                onMemberProfile={$target => {
-                  onMemberProfile($target, me.id);
-                }}
-              />
-              <CommentEditorContainer>
-                <CommentTextArea
-                  disabled
-                  placeholder="Write a comment..."
-                  onFocus={() => {
-                    setShowCommentActions(true);
-                  }}
-                  onBlur={() => {
-                    setShowCommentActions(false);
-                  }}
-                />
-                <CommentEditorActions visible={showCommentActions}>
-                  <CommentEditorActionIcon>
-                    <Paperclip width={12} height={12} />
-                  </CommentEditorActionIcon>
-                  <CommentEditorActionIcon>
-                    <At width={12} height={12} />
-                  </CommentEditorActionIcon>
-                  <CommentEditorActionIcon>
-                    <Smile width={12} height={12} />
-                  </CommentEditorActionIcon>
-                  <CommentEditorActionIcon>
-                    <Task width={12} height={12} />
-                  </CommentEditorActionIcon>
-                  <CommentEditorSaveButton>Save</CommentEditorSaveButton>
-                </CommentEditorActions>
-              </CommentEditorContainer>
-            </CommentInnerWrapper>
-          )}
-        </CommentContainer>
-      </ContentContainer>
-    </Container>
+          </TaskDetailsSection>
+        </TaskDetailsContent>
+        <TaskDetailsSidebar>
+          <ActionButtons>
+            <ActionButtonsTitle>ADD TO CARD</ActionButtonsTitle>
+            <ActionButton justifyTextContent="flex-start" onClick={() => onToggleTaskComplete(task)}>
+              {task.complete ? 'Mark Incomplete' : 'Mark Complete'}
+            </ActionButton>
+            <ActionButton justifyTextContent="flex-start" onClick={$target => onAddMember($target)}>
+              Members
+            </ActionButton>
+            <ActionButton justifyTextContent="flex-start" onClick={$target => onAddLabel($target)}>
+              Labels
+            </ActionButton>
+            <ActionButton justifyTextContent="flex-start" onClick={$target => onAddChecklist($target)}>
+              Checklist
+            </ActionButton>
+            <ActionButton justifyTextContent="flex-start" onClick={$target => onOpenDueDatePopop(task, $target)}>
+              Due Date
+            </ActionButton>
+            <ActionButton justifyTextContent="flex-start">Attachment</ActionButton>
+            <ActionButton justifyTextContent="flex-start">Cover</ActionButton>
+          </ActionButtons>
+        </TaskDetailsSidebar>
+      </TaskDetailsWrapper>
+    </>
  );
 };

--- a/frontend/src/shared/components/TaskDetails/onDragEnd.ts
+++ b/frontend/src/shared/components/TaskDetails/onDragEnd.ts
@@ -1,90 +0,0 @@
-import {
-  getSortedDraggables,
-  isPositionChanged,
-  getNewDraggablePosition,
-  getAfterDropDraggableList,
-} from 'shared/utils/draggables';
-import { DropResult } from 'react-beautiful-dnd';
-
-type OnChecklistDropFn = (checklist: TaskChecklist) => void;
-type OnChecklistItemDropFn = (prevChecklistID: string, checklistID: string, checklistItem: TaskChecklistItem) => void;
-
-const onDragEnd = (
-  { draggableId, source, destination, type }: DropResult,
-  task: Task,
-  onChecklistDrop: OnChecklistDropFn,
-  onChecklistItemDrop: OnChecklistItemDropFn,
-) => {
-  if (typeof destination === 'undefined') return;
-  if (!isPositionChanged(source, destination)) return;
-
-  const isChecklist = type === 'checklist';
-  const isSameChecklist = destination.droppableId === source.droppableId;
-  let droppedDraggable: DraggableElement | null = null;
-  let beforeDropDraggables: Array<DraggableElement> | null = null;
-
-  if (!task.checklists) return;
-  if (isChecklist) {
-    const droppedGroup = task.checklists.find(taskGroup => taskGroup.id === draggableId);
-    if (droppedGroup) {
-      droppedDraggable = {
-        id: draggableId,
-        position: droppedGroup.position,
-      };
-      beforeDropDraggables = getSortedDraggables(
-        task.checklists.map(checklist => {
-          return { id: checklist.id, position: checklist.position };
-        }),
-      );
-      if (droppedDraggable === null || beforeDropDraggables === null) {
-        throw new Error('before drop draggables is null');
-      }
-      const afterDropDraggables = getAfterDropDraggableList(
-        beforeDropDraggables,
-        droppedDraggable,
-        isChecklist,
-        isSameChecklist,
-        destination,
-      );
-      const newPosition = getNewDraggablePosition(afterDropDraggables, destination.index);
-      onChecklistDrop({ ...droppedGroup, position: newPosition });
-    } else {
-      throw new Error('task group can not be found');
-    }
-  } else {
-    const targetChecklist = task.checklists.findIndex(
-      checklist => checklist.items.findIndex(item => item.id === draggableId) !== -1,
-    );
-    const droppedChecklistItem = task.checklists[targetChecklist].items.find(item => item.id === draggableId);
-
-    if (droppedChecklistItem) {
-      droppedDraggable = {
-        id: draggableId,
-        position: droppedChecklistItem.position,
-      };
-      beforeDropDraggables = getSortedDraggables(
-        task.checklists[targetChecklist].items.map(item => {
-          return { id: item.id, position: item.position };
-        }),
-      );
-      if (droppedDraggable === null || beforeDropDraggables === null) {
-        throw new Error('before drop draggables is null');
-      }
-      const afterDropDraggables = getAfterDropDraggableList(
-        beforeDropDraggables,
-        droppedDraggable,
-        isChecklist,
-        isSameChecklist,
-        destination,
-      );
-      const newPosition = getNewDraggablePosition(afterDropDraggables, destination.index);
-      const newItem = {
-        ...droppedChecklistItem,
-        position: newPosition,
-      };
-      onChecklistItemDrop(droppedChecklistItem.taskChecklistID, destination.droppableId, newItem);
-    }
-  }
-};
-
-export default onDragEnd;
--- a/frontend/src/shared/components/TopNavbar/Styles.ts
+++ b/frontend/src/shared/components/TopNavbar/Styles.ts
@@ -5,7 +5,6 @@ import Button from 'shared/components/Button';
 import { Taskcafe } from 'shared/icons';
 import { NavLink, Link } from 'react-router-dom';
 import TaskAssignee from 'shared/components/TaskAssignee';
-import { useRef } from 'react';

 export const ProjectMember = styled(TaskAssignee)<{ zIndex: number }>`
  z-index: ${props => props.zIndex};
@@ -66,7 +65,7 @@ export const ProfileNameWrapper = styled.div`
  line-height: 1.25;
 `;

-export const IconContainerWrapper = styled.div<{ disabled?: boolean }>`
+export const IconContainer = styled.div<{ disabled?: boolean }>`
  margin-right: 20px;
  cursor: pointer;
  ${props =>
@@ -87,10 +86,7 @@ export const ProfileNameSecondary = styled.small`
  color: #c2c6dc;
 `;

-export const ProfileIcon = styled.div<{
-  bgColor: string | null;
-  backgroundURL: string | null;
-}>`
+export const ProfileIcon = styled.div<{ bgColor: string | null; backgroundURL: string | null }>`
  width: 40px;
  height: 40px;
  border-radius: 9999px;
@@ -251,8 +247,8 @@ export const NavSeparator = styled.div`
 export const LogoContainer = styled(Link)`
  display: block;
  left: 50%;
-  right: 50%;
  position: absolute;
+  transform: translateX(-50%);
  display: flex;
  align-items: center;
  justify-content: center;
--- a/frontend/src/shared/components/TopNavbar/index.tsx
+++ b/frontend/src/shared/components/TopNavbar/index.tsx
@@ -1,17 +1,19 @@
 import React, { useRef, useState, useEffect } from 'react';
 import { Home, Star, Bell, AngleDown, BarChart, CheckCircle } from 'shared/icons';
+import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import ProfileIcon from 'shared/components/ProfileIcon';
-import { usePopup } from 'shared/components/PopupMenu';
+import TaskAssignee from 'shared/components/TaskAssignee';
+import { usePopup, Popup } from 'shared/components/PopupMenu';
 import { RoleCode } from 'shared/generated/graphql';
-import NOOP from 'shared/utils/noop';
+import MiniProfile from 'shared/components/MiniProfile';
 import {
  TaskcafeLogo,
  TaskcafeTitle,
  ProjectFinder,
  LogoContainer,
  NavSeparator,
-  IconContainerWrapper,
+  IconContainer,
  ProjectNameTextarea,
  InviteButton,
  GlobalActions,
@@ -31,28 +33,6 @@ import {
  ProjectMembers,
 } from './Styles';

-type IconContainerProps = {
-  disabled?: boolean;
-  onClick?: ($target: React.RefObject<HTMLElement>) => void;
-};
-
-const IconContainer: React.FC<IconContainerProps> = ({ onClick, disabled = false, children }) => {
-  const $container = useRef<HTMLDivElement>(null);
-  return (
-    <IconContainerWrapper
-      ref={$container}
-      disabled={disabled}
-      onClick={() => {
-        if (onClick) {
-          onClick($container);
-        }
-      }}
-    >
-      {children}
-    </IconContainerWrapper>
-  );
-};
-
 const HomeDashboard = styled(Home)``;

 type ProjectHeadingProps = {
@@ -165,7 +145,7 @@ type NavBarProps = {
  onFavorite?: () => void;
  onProfileClick: ($target: React.RefObject<HTMLElement>) => void;
  onSaveName?: (name: string) => void;
-  onNotificationClick: ($target: React.RefObject<HTMLElement>) => void;
+  onNotificationClick: () => void;
  canEditProjectName?: boolean;
  canInviteUser?: boolean;
  onInviteUser?: ($target: React.RefObject<HTMLElement>) => void;
@@ -277,16 +257,16 @@ const NavBar: React.FC<NavBarProps> = ({
          <ProjectFinder onClick={onOpenProjectFinder} variant="gradient">
            Projects
          </ProjectFinder>
-          <IconContainer onClick={() => onDashboardClick()}>
+          <IconContainer onClick={onDashboardClick}>
            <HomeDashboard width={20} height={20} />
          </IconContainer>
-          <IconContainer disabled onClick={NOOP}>
+          <IconContainer disabled>
            <CheckCircle width={20} height={20} />
          </IconContainer>
-          <IconContainer disabled onClick={onNotificationClick}>
+          <IconContainer onClick={onNotificationClick}>
            <Bell color="#c2c6dc" size={20} />
          </IconContainer>
-          <IconContainer disabled onClick={NOOP}>
+          <IconContainer disabled>
            <BarChart width={20} height={20} />
          </IconContainer>

--- a/frontend/src/shared/generated/graphql.tsx
+++ b/frontend/src/shared/generated/graphql.tsx
@@ -105,7 +105,6 @@ export type UserAccount = {
  createdAt: Scalars['Time'];
  fullName: Scalars['String'];
  initials: Scalars['String'];
-  bio: Scalars['String'];
  role: Role;
  username: Scalars['String'];
  profileIcon: ProfileIcon;
@@ -163,7 +162,6 @@ export type Task = {
  description?: Maybe<Scalars['String']>;
  dueDate?: Maybe<Scalars['Time']>;
  complete: Scalars['Boolean'];
-  completedAt?: Maybe<Scalars['Time']>;
  assigned: Array<Member>;
  labels: Array<TaskLabel>;
  checklists: Array<TaskChecklist>;
@@ -214,18 +212,22 @@ export enum ObjectType {

 export type Query = {
   __typename?: 'Query';
+  organizations: Array<Organization>;
+  users: Array<UserAccount>;
+  findUser: UserAccount;
  findProject: Project;
  findTask: Task;
-  findTeam: Team;
-  findUser: UserAccount;
-  labelColors: Array<LabelColor>;
-  me: MePayload;
-  notifications: Array<Notification>;
-  organizations: Array<Organization>;
  projects: Array<Project>;
-  taskGroups: Array<TaskGroup>;
+  findTeam: Team;
  teams: Array<Team>;
-  users: Array<UserAccount>;
+  labelColors: Array<LabelColor>;
+  taskGroups: Array<TaskGroup>;
+  me: MePayload;
+};
+
+
+export type QueryFindUserArgs = {
+  input: FindUser;
 };


@@ -239,20 +241,15 @@ export type QueryFindTaskArgs = {
 };


-export type QueryFindTeamArgs = {
-  input: FindTeam;
-};
-
-
-export type QueryFindUserArgs = {
-  input: FindUser;
-};
-
-
 export type QueryProjectsArgs = {
  input?: Maybe<ProjectsFilter>;
 };

+
+export type QueryFindTeamArgs = {
+  input: FindTeam;
+};
+
 export type Mutation = {
   __typename?: 'Mutation';
  addTaskLabel: Task;
@@ -276,16 +273,13 @@ export type Mutation = {
  deleteTaskChecklist: DeleteTaskChecklistPayload;
  deleteTaskChecklistItem: DeleteTaskChecklistItemPayload;
  deleteTaskGroup: DeleteTaskGroupPayload;
-  deleteTaskGroupTasks: DeleteTaskGroupTasksPayload;
  deleteTeam: DeleteTeamPayload;
  deleteTeamMember: DeleteTeamMemberPayload;
  deleteUserAccount: DeleteUserAccountPayload;
-  duplicateTaskGroup: DuplicateTaskGroupPayload;
  logoutUser: Scalars['Boolean'];
  removeTaskLabel: Task;
  setTaskChecklistItemComplete: TaskChecklistItem;
  setTaskComplete: Task;
-  sortTaskGroup: SortTaskGroupPayload;
  toggleTaskLabel: ToggleTaskLabelPayload;
  unassignTask: Task;
  updateProjectLabel: ProjectLabel;
@@ -304,7 +298,6 @@ export type Mutation = {
  updateTaskLocation: UpdateTaskLocationPayload;
  updateTaskName: Task;
  updateTeamMemberRole: UpdateTeamMemberRolePayload;
-  updateUserInfo: UpdateUserInfoPayload;
  updateUserPassword: UpdateUserPasswordPayload;
  updateUserRole: UpdateUserRolePayload;
 };
@@ -410,11 +403,6 @@ export type MutationDeleteTaskGroupArgs = {
 };


-export type MutationDeleteTaskGroupTasksArgs = {
-  input: DeleteTaskGroupTasks;
-};
-
-
 export type MutationDeleteTeamArgs = {
  input: DeleteTeam;
 };
@@ -430,11 +418,6 @@ export type MutationDeleteUserAccountArgs = {
 };


-export type MutationDuplicateTaskGroupArgs = {
-  input: DuplicateTaskGroup;
-};
-
-
 export type MutationLogoutUserArgs = {
  input: LogoutUser;
 };
@@ -455,11 +438,6 @@ export type MutationSetTaskCompleteArgs = {
 };


-export type MutationSortTaskGroupArgs = {
-  input: SortTaskGroup;
-};
-
-
 export type MutationToggleTaskLabelArgs = {
  input: ToggleTaskLabelInput;
 };
@@ -550,11 +528,6 @@ export type MutationUpdateTeamMemberRoleArgs = {
 };


-export type MutationUpdateUserInfoArgs = {
-  input: UpdateUserInfo;
-};
-
-
 export type MutationUpdateUserPasswordArgs = {
  input: UpdateUserPassword;
 };
@@ -603,42 +576,6 @@ export type FindTeam = {
  teamID: Scalars['UUID'];
 };

-export enum EntityType {
-  Task = 'TASK'
-}
-
-export enum ActorType {
-  User = 'USER'
-}
-
-export enum ActionType {
-  TaskMemberAdded = 'TASK_MEMBER_ADDED'
-}
-
-export type NotificationActor = {
-   __typename?: 'NotificationActor';
-  id: Scalars['UUID'];
-  type: ActorType;
-  name: Scalars['String'];
-};
-
-export type NotificationEntity = {
-   __typename?: 'NotificationEntity';
-  id: Scalars['UUID'];
-  type: EntityType;
-  name: Scalars['String'];
-};
-
-export type Notification = {
-   __typename?: 'Notification';
-  id: Scalars['ID'];
-  entity: NotificationEntity;
-  actionType: ActionType;
-  actor: NotificationActor;
-  read: Scalars['Boolean'];
-  createdAt: Scalars['Time'];
-};
-
 export type NewProject = {
  userID: Scalars['UUID'];
  teamID: Scalars['UUID'];
@@ -848,44 +785,6 @@ export type DeleteTaskChecklistPayload = {
  taskChecklist: TaskChecklist;
 };

-export type DeleteTaskGroupTasks = {
-  taskGroupID: Scalars['UUID'];
-};
-
-export type DeleteTaskGroupTasksPayload = {
-   __typename?: 'DeleteTaskGroupTasksPayload';
-  taskGroupID: Scalars['UUID'];
-  tasks: Array<Scalars['UUID']>;
-};
-
-export type TaskPositionUpdate = {
-  taskID: Scalars['UUID'];
-  position: Scalars['Float'];
-};
-
-export type SortTaskGroupPayload = {
-   __typename?: 'SortTaskGroupPayload';
-  taskGroupID: Scalars['UUID'];
-  tasks: Array<Task>;
-};
-
-export type SortTaskGroup = {
-  taskGroupID: Scalars['UUID'];
-  tasks: Array<TaskPositionUpdate>;
-};
-
-export type DuplicateTaskGroup = {
-  projectID: Scalars['UUID'];
-  taskGroupID: Scalars['UUID'];
-  name: Scalars['String'];
-  position: Scalars['Float'];
-};
-
-export type DuplicateTaskGroupPayload = {
-   __typename?: 'DuplicateTaskGroupPayload';
-  taskGroup: TaskGroup;
-};
-
 export type NewTaskGroupLocation = {
  taskGroupID: Scalars['UUID'];
  position: Scalars['Float'];
@@ -986,18 +885,6 @@ export type UpdateTeamMemberRolePayload = {
  member: Member;
 };

-export type UpdateUserInfoPayload = {
-   __typename?: 'UpdateUserInfoPayload';
-  user: UserAccount;
-};
-
-export type UpdateUserInfo = {
-  name: Scalars['String'];
-  initials: Scalars['String'];
-  email: Scalars['String'];
-  bio: Scalars['String'];
-};
-
 export type UpdateUserPassword = {
  userID: Scalars['UUID'];
  password: Scalars['String'];
@@ -1264,7 +1151,7 @@ export type FindTaskQuery = (
    & Pick<Task, 'id' | 'name' | 'description' | 'dueDate' | 'position' | 'complete'>
    & { taskGroup: (
      { __typename?: 'TaskGroup' }
-      & Pick<TaskGroup, 'id' | 'name'>
+      & Pick<TaskGroup, 'id'>
    ), badges: (
      { __typename?: 'TaskBadges' }
      & { checklist?: Maybe<(
@@ -1297,22 +1184,12 @@ export type FindTaskQuery = (
        & Pick<ProfileIcon, 'url' | 'initials' | 'bgColor'>
      ) }
    )> }
-  ), me: (
-    { __typename?: 'MePayload' }
-    & { user: (
-      { __typename?: 'UserAccount' }
-      & Pick<UserAccount, 'id' | 'fullName'>
-      & { profileIcon: (
-        { __typename?: 'ProfileIcon' }
-        & Pick<ProfileIcon, 'initials' | 'bgColor' | 'url'>
-      ) }
-    ) }
  ) }
 );

 export type TaskFieldsFragment = (
  { __typename?: 'Task' }
-  & Pick<Task, 'id' | 'name' | 'description' | 'dueDate' | 'complete' | 'completedAt' | 'position'>
+  & Pick<Task, 'id' | 'name' | 'description' | 'dueDate' | 'complete' | 'position'>
  & { badges: (
    { __typename?: 'TaskBadges' }
    & { checklist?: Maybe<(
@@ -1373,7 +1250,7 @@ export type MeQuery = (
    { __typename?: 'MePayload' }
    & { user: (
      { __typename?: 'UserAccount' }
-      & Pick<UserAccount, 'id' | 'fullName' | 'username' | 'email' | 'bio'>
+      & Pick<UserAccount, 'id' | 'fullName'>
      & { profileIcon: (
        { __typename?: 'ProfileIcon' }
        & Pick<ProfileIcon, 'initials' | 'bgColor' | 'url'>
@@ -1650,60 +1527,6 @@ export type UpdateTaskChecklistNameMutation = (
  ) }
 );

-export type DeleteTaskGroupTasksMutationVariables = {
-  taskGroupID: Scalars['UUID'];
-};
-
-
-export type DeleteTaskGroupTasksMutation = (
-  { __typename?: 'Mutation' }
-  & { deleteTaskGroupTasks: (
-    { __typename?: 'DeleteTaskGroupTasksPayload' }
-    & Pick<DeleteTaskGroupTasksPayload, 'tasks' | 'taskGroupID'>
-  ) }
-);
-
-export type DuplicateTaskGroupMutationVariables = {
-  taskGroupID: Scalars['UUID'];
-  name: Scalars['String'];
-  position: Scalars['Float'];
-  projectID: Scalars['UUID'];
-};
-
-
-export type DuplicateTaskGroupMutation = (
-  { __typename?: 'Mutation' }
-  & { duplicateTaskGroup: (
-    { __typename?: 'DuplicateTaskGroupPayload' }
-    & { taskGroup: (
-      { __typename?: 'TaskGroup' }
-      & Pick<TaskGroup, 'id' | 'name' | 'position'>
-      & { tasks: Array<(
-        { __typename?: 'Task' }
-        & TaskFieldsFragment
-      )> }
-    ) }
-  ) }
-);
-
-export type SortTaskGroupMutationVariables = {
-  tasks: Array<TaskPositionUpdate>;
-  taskGroupID: Scalars['UUID'];
-};
-
-
-export type SortTaskGroupMutation = (
-  { __typename?: 'Mutation' }
-  & { sortTaskGroup: (
-    { __typename?: 'SortTaskGroupPayload' }
-    & Pick<SortTaskGroupPayload, 'taskGroupID'>
-    & { tasks: Array<(
-      { __typename?: 'Task' }
-      & Pick<Task, 'id' | 'position'>
-    )> }
-  ) }
-);
-
 export type UpdateTaskGroupNameMutationVariables = {
  taskGroupID: Scalars['UUID'];
  name: Scalars['String'];
@@ -1921,40 +1744,6 @@ export type ToggleTaskLabelMutation = (
  ) }
 );

-export type TopNavbarQueryVariables = {};
-
-
-export type TopNavbarQuery = (
-  { __typename?: 'Query' }
-  & { notifications: Array<(
-    { __typename?: 'Notification' }
-    & Pick<Notification, 'createdAt' | 'read' | 'id' | 'actionType'>
-    & { entity: (
-      { __typename?: 'NotificationEntity' }
-      & Pick<NotificationEntity, 'id' | 'type' | 'name'>
-    ), actor: (
-      { __typename?: 'NotificationActor' }
-      & Pick<NotificationActor, 'id' | 'type' | 'name'>
-    ) }
-  )>, me: (
-    { __typename?: 'MePayload' }
-    & { user: (
-      { __typename?: 'UserAccount' }
-      & Pick<UserAccount, 'id' | 'fullName'>
-      & { profileIcon: (
-        { __typename?: 'ProfileIcon' }
-        & Pick<ProfileIcon, 'initials' | 'bgColor' | 'url'>
-      ) }
-    ), teamRoles: Array<(
-      { __typename?: 'TeamRole' }
-      & Pick<TeamRole, 'teamID' | 'roleCode'>
-    )>, projectRoles: Array<(
-      { __typename?: 'ProjectRole' }
-      & Pick<ProjectRole, 'projectID' | 'roleCode'>
-    )> }
-  ) }
-);
-
 export type UnassignTaskMutationVariables = {
  taskID: Scalars['UUID'];
  userID: Scalars['UUID'];
@@ -2099,7 +1888,7 @@ export type CreateUserAccountMutation = (
  { __typename?: 'Mutation' }
  & { createUserAccount: (
    { __typename?: 'UserAccount' }
-    & Pick<UserAccount, 'id' | 'email' | 'fullName' | 'initials' | 'username' | 'bio'>
+    & Pick<UserAccount, 'id' | 'email' | 'fullName' | 'initials' | 'username'>
    & { profileIcon: (
      { __typename?: 'ProfileIcon' }
      & Pick<ProfileIcon, 'url' | 'initials' | 'bgColor'>
@@ -2146,29 +1935,6 @@ export type DeleteUserAccountMutation = (
  ) }
 );

-export type UpdateUserInfoMutationVariables = {
-  name: Scalars['String'];
-  initials: Scalars['String'];
-  email: Scalars['String'];
-  bio: Scalars['String'];
-};
-
-
-export type UpdateUserInfoMutation = (
-  { __typename?: 'Mutation' }
-  & { updateUserInfo: (
-    { __typename?: 'UpdateUserInfoPayload' }
-    & { user: (
-      { __typename?: 'UserAccount' }
-      & Pick<UserAccount, 'id' | 'email' | 'fullName' | 'bio'>
-      & { profileIcon: (
-        { __typename?: 'ProfileIcon' }
-        & Pick<ProfileIcon, 'initials'>
-      ) }
-    ) }
-  ) }
-);
-
 export type UpdateUserPasswordMutationVariables = {
  userID: Scalars['UUID'];
  password: Scalars['String'];
@@ -2247,7 +2013,6 @@ export const TaskFieldsFragmentDoc = gql`
  description
  dueDate
  complete
-  completedAt
  position
  badges {
    checklist {
@@ -2702,7 +2467,6 @@ export const FindTaskDocument = gql`
    complete
    taskGroup {
      id
-      name
    }
    badges {
      checklist {
@@ -2747,17 +2511,6 @@ export const FindTaskDocument = gql`
      }
    }
  }
-  me {
-    user {
-      id
-      fullName
-      profileIcon {
-        initials
-        bgColor
-        url
-      }
-    }
-  }
 }
    `;

@@ -2838,9 +2591,6 @@ export const MeDocument = gql`
    user {
      id
      fullName
-      username
-      email
-      bio
      profileIcon {
        initials
        bgColor
@@ -3448,118 +3198,6 @@ export function useUpdateTaskChecklistNameMutation(baseOptions?: ApolloReactHook
 export type UpdateTaskChecklistNameMutationHookResult = ReturnType<typeof useUpdateTaskChecklistNameMutation>;
 export type UpdateTaskChecklistNameMutationResult = ApolloReactCommon.MutationResult<UpdateTaskChecklistNameMutation>;
 export type UpdateTaskChecklistNameMutationOptions = ApolloReactCommon.BaseMutationOptions<UpdateTaskChecklistNameMutation, UpdateTaskChecklistNameMutationVariables>;
-export const DeleteTaskGroupTasksDocument = gql`
-    mutation deleteTaskGroupTasks($taskGroupID: UUID!) {
-  deleteTaskGroupTasks(input: {taskGroupID: $taskGroupID}) {
-    tasks
-    taskGroupID
-  }
-}
-    `;
-export type DeleteTaskGroupTasksMutationFn = ApolloReactCommon.MutationFunction<DeleteTaskGroupTasksMutation, DeleteTaskGroupTasksMutationVariables>;
-
-/**
- * __useDeleteTaskGroupTasksMutation__
- *
- * To run a mutation, you first call `useDeleteTaskGroupTasksMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useDeleteTaskGroupTasksMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [deleteTaskGroupTasksMutation, { data, loading, error }] = useDeleteTaskGroupTasksMutation({
- *   variables: {
- *      taskGroupID: // value for 'taskGroupID'
- *   },
- * });
- */
-export function useDeleteTaskGroupTasksMutation(baseOptions?: ApolloReactHooks.MutationHookOptions<DeleteTaskGroupTasksMutation, DeleteTaskGroupTasksMutationVariables>) {
-        return ApolloReactHooks.useMutation<DeleteTaskGroupTasksMutation, DeleteTaskGroupTasksMutationVariables>(DeleteTaskGroupTasksDocument, baseOptions);
-      }
-export type DeleteTaskGroupTasksMutationHookResult = ReturnType<typeof useDeleteTaskGroupTasksMutation>;
-export type DeleteTaskGroupTasksMutationResult = ApolloReactCommon.MutationResult<DeleteTaskGroupTasksMutation>;
-export type DeleteTaskGroupTasksMutationOptions = ApolloReactCommon.BaseMutationOptions<DeleteTaskGroupTasksMutation, DeleteTaskGroupTasksMutationVariables>;
-export const DuplicateTaskGroupDocument = gql`
-    mutation duplicateTaskGroup($taskGroupID: UUID!, $name: String!, $position: Float!, $projectID: UUID!) {
-  duplicateTaskGroup(input: {projectID: $projectID, taskGroupID: $taskGroupID, name: $name, position: $position}) {
-    taskGroup {
-      id
-      name
-      position
-      tasks {
-        ...TaskFields
-      }
-    }
-  }
-}
-    ${TaskFieldsFragmentDoc}`;
-export type DuplicateTaskGroupMutationFn = ApolloReactCommon.MutationFunction<DuplicateTaskGroupMutation, DuplicateTaskGroupMutationVariables>;
-
-/**
- * __useDuplicateTaskGroupMutation__
- *
- * To run a mutation, you first call `useDuplicateTaskGroupMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useDuplicateTaskGroupMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [duplicateTaskGroupMutation, { data, loading, error }] = useDuplicateTaskGroupMutation({
- *   variables: {
- *      taskGroupID: // value for 'taskGroupID'
- *      name: // value for 'name'
- *      position: // value for 'position'
- *      projectID: // value for 'projectID'
- *   },
- * });
- */
-export function useDuplicateTaskGroupMutation(baseOptions?: ApolloReactHooks.MutationHookOptions<DuplicateTaskGroupMutation, DuplicateTaskGroupMutationVariables>) {
-        return ApolloReactHooks.useMutation<DuplicateTaskGroupMutation, DuplicateTaskGroupMutationVariables>(DuplicateTaskGroupDocument, baseOptions);
-      }
-export type DuplicateTaskGroupMutationHookResult = ReturnType<typeof useDuplicateTaskGroupMutation>;
-export type DuplicateTaskGroupMutationResult = ApolloReactCommon.MutationResult<DuplicateTaskGroupMutation>;
-export type DuplicateTaskGroupMutationOptions = ApolloReactCommon.BaseMutationOptions<DuplicateTaskGroupMutation, DuplicateTaskGroupMutationVariables>;
-export const SortTaskGroupDocument = gql`
-    mutation sortTaskGroup($tasks: [TaskPositionUpdate!]!, $taskGroupID: UUID!) {
-  sortTaskGroup(input: {taskGroupID: $taskGroupID, tasks: $tasks}) {
-    taskGroupID
-    tasks {
-      id
-      position
-    }
-  }
-}
-    `;
-export type SortTaskGroupMutationFn = ApolloReactCommon.MutationFunction<SortTaskGroupMutation, SortTaskGroupMutationVariables>;
-
-/**
- * __useSortTaskGroupMutation__
- *
- * To run a mutation, you first call `useSortTaskGroupMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useSortTaskGroupMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [sortTaskGroupMutation, { data, loading, error }] = useSortTaskGroupMutation({
- *   variables: {
- *      tasks: // value for 'tasks'
- *      taskGroupID: // value for 'taskGroupID'
- *   },
- * });
- */
-export function useSortTaskGroupMutation(baseOptions?: ApolloReactHooks.MutationHookOptions<SortTaskGroupMutation, SortTaskGroupMutationVariables>) {
-        return ApolloReactHooks.useMutation<SortTaskGroupMutation, SortTaskGroupMutationVariables>(SortTaskGroupDocument, baseOptions);
-      }
-export type SortTaskGroupMutationHookResult = ReturnType<typeof useSortTaskGroupMutation>;
-export type SortTaskGroupMutationResult = ApolloReactCommon.MutationResult<SortTaskGroupMutation>;
-export type SortTaskGroupMutationOptions = ApolloReactCommon.BaseMutationOptions<SortTaskGroupMutation, SortTaskGroupMutationVariables>;
 export const UpdateTaskGroupNameDocument = gql`
    mutation updateTaskGroupName($taskGroupID: UUID!, $name: String!) {
  updateTaskGroupName(input: {taskGroupID: $taskGroupID, name: $name}) {
@@ -3952,70 +3590,6 @@ export function useToggleTaskLabelMutation(baseOptions?: ApolloReactHooks.Mutati
 export type ToggleTaskLabelMutationHookResult = ReturnType<typeof useToggleTaskLabelMutation>;
 export type ToggleTaskLabelMutationResult = ApolloReactCommon.MutationResult<ToggleTaskLabelMutation>;
 export type ToggleTaskLabelMutationOptions = ApolloReactCommon.BaseMutationOptions<ToggleTaskLabelMutation, ToggleTaskLabelMutationVariables>;
-export const TopNavbarDocument = gql`
-    query topNavbar {
-  notifications {
-    createdAt
-    read
-    id
-    entity {
-      id
-      type
-      name
-    }
-    actor {
-      id
-      type
-      name
-    }
-    actionType
-  }
-  me {
-    user {
-      id
-      fullName
-      profileIcon {
-        initials
-        bgColor
-        url
-      }
-    }
-    teamRoles {
-      teamID
-      roleCode
-    }
-    projectRoles {
-      projectID
-      roleCode
-    }
-  }
-}
-    `;
-
-/**
- * __useTopNavbarQuery__
- *
- * To run a query within a React component, call `useTopNavbarQuery` and pass it any options that fit your needs.
- * When your component renders, `useTopNavbarQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useTopNavbarQuery({
- *   variables: {
- *   },
- * });
- */
-export function useTopNavbarQuery(baseOptions?: ApolloReactHooks.QueryHookOptions<TopNavbarQuery, TopNavbarQueryVariables>) {
-        return ApolloReactHooks.useQuery<TopNavbarQuery, TopNavbarQueryVariables>(TopNavbarDocument, baseOptions);
-      }
-export function useTopNavbarLazyQuery(baseOptions?: ApolloReactHooks.LazyQueryHookOptions<TopNavbarQuery, TopNavbarQueryVariables>) {
-          return ApolloReactHooks.useLazyQuery<TopNavbarQuery, TopNavbarQueryVariables>(TopNavbarDocument, baseOptions);
-        }
-export type TopNavbarQueryHookResult = ReturnType<typeof useTopNavbarQuery>;
-export type TopNavbarLazyQueryHookResult = ReturnType<typeof useTopNavbarLazyQuery>;
-export type TopNavbarQueryResult = ApolloReactCommon.QueryResult<TopNavbarQuery, TopNavbarQueryVariables>;
 export const UnassignTaskDocument = gql`
    mutation unassignTask($taskID: UUID!, $userID: UUID!) {
  unassignTask(input: {taskID: $taskID, userID: $userID}) {
@@ -4317,7 +3891,6 @@ export const CreateUserAccountDocument = gql`
    fullName
    initials
    username
-    bio
    profileIcon {
      url
      initials
@@ -4416,49 +3989,6 @@ export function useDeleteUserAccountMutation(baseOptions?: ApolloReactHooks.Muta
 export type DeleteUserAccountMutationHookResult = ReturnType<typeof useDeleteUserAccountMutation>;
 export type DeleteUserAccountMutationResult = ApolloReactCommon.MutationResult<DeleteUserAccountMutation>;
 export type DeleteUserAccountMutationOptions = ApolloReactCommon.BaseMutationOptions<DeleteUserAccountMutation, DeleteUserAccountMutationVariables>;
-export const UpdateUserInfoDocument = gql`
-    mutation updateUserInfo($name: String!, $initials: String!, $email: String!, $bio: String!) {
-  updateUserInfo(input: {name: $name, initials: $initials, email: $email, bio: $bio}) {
-    user {
-      id
-      email
-      fullName
-      bio
-      profileIcon {
-        initials
-      }
-    }
-  }
-}
-    `;
-export type UpdateUserInfoMutationFn = ApolloReactCommon.MutationFunction<UpdateUserInfoMutation, UpdateUserInfoMutationVariables>;
-
-/**
- * __useUpdateUserInfoMutation__
- *
- * To run a mutation, you first call `useUpdateUserInfoMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useUpdateUserInfoMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [updateUserInfoMutation, { data, loading, error }] = useUpdateUserInfoMutation({
- *   variables: {
- *      name: // value for 'name'
- *      initials: // value for 'initials'
- *      email: // value for 'email'
- *      bio: // value for 'bio'
- *   },
- * });
- */
-export function useUpdateUserInfoMutation(baseOptions?: ApolloReactHooks.MutationHookOptions<UpdateUserInfoMutation, UpdateUserInfoMutationVariables>) {
-        return ApolloReactHooks.useMutation<UpdateUserInfoMutation, UpdateUserInfoMutationVariables>(UpdateUserInfoDocument, baseOptions);
-      }
-export type UpdateUserInfoMutationHookResult = ReturnType<typeof useUpdateUserInfoMutation>;
-export type UpdateUserInfoMutationResult = ApolloReactCommon.MutationResult<UpdateUserInfoMutation>;
-export type UpdateUserInfoMutationOptions = ApolloReactCommon.BaseMutationOptions<UpdateUserInfoMutation, UpdateUserInfoMutationVariables>;
 export const UpdateUserPasswordDocument = gql`
    mutation updateUserPassword($userID: UUID!, $password: String!) {
  updateUserPassword(input: {userID: $userID, password: $password}) {
--- a/frontend/src/shared/graphql/findTask.graphqls
+++ b/frontend/src/shared/graphql/findTask.graphqls
@@ -8,7 +8,6 @@ query findTask($taskID: UUID!) {
    complete
    taskGroup {
      id
-      name
    }
    badges {
      checklist {
@@ -53,15 +52,4 @@ query findTask($taskID: UUID!) {
      }
    }
  }
-  me {
-    user {
-      id
-      fullName
-      profileIcon {
-        initials
-        bgColor
-        url
-      }
-    }
-  }
 }
--- a/frontend/src/shared/graphql/fragments/task.ts
+++ b/frontend/src/shared/graphql/fragments/task.ts
@@ -7,7 +7,6 @@ const TASK_FRAGMENT = gql`
    description
    dueDate
    complete
-    completedAt
    position
    badges {
      checklist {
--- a/frontend/src/shared/graphql/me.graphqls
+++ b/frontend/src/shared/graphql/me.graphqls
@@ -3,9 +3,6 @@ query me {
    user {
      id
      fullName
-      username
-      email
-      bio
      profileIcon {
        initials
        bgColor
--- a/frontend/src/shared/graphql/taskGroup/deleteTaskGroupTasks.ts
+++ b/frontend/src/shared/graphql/taskGroup/deleteTaskGroupTasks.ts
@@ -1,10 +0,0 @@
-import gql from 'graphql-tag';
-
-const DELETE_TASK_GROUP_TASKS_MUTATION = gql`
-  mutation deleteTaskGroupTasks($taskGroupID: UUID!) {
-    deleteTaskGroupTasks(input: { taskGroupID: $taskGroupID }) {
-      tasks
-      taskGroupID
-    }
-  }
-`;
--- a/frontend/src/shared/graphql/taskGroup/duplicateTaskGroup.ts
+++ b/frontend/src/shared/graphql/taskGroup/duplicateTaskGroup.ts
@@ -1,26 +0,0 @@
-import gql from 'graphql-tag';
-import TASK_FRAGMENT from '../fragments/task';
-
-const DUPLICATE_TASK_GROUP_MUTATION = gql`
-mutation duplicateTaskGroup($taskGroupID: UUID!, $name: String!, $position: Float!, $projectID: UUID!) {
-  duplicateTaskGroup(
-  input: {
-    projectID: $projectID
-    taskGroupID: $taskGroupID
-    name: $name
-    position: $position
-  }
-  ) {
-    taskGroup {
-      id
-      name
-      position
-      tasks {
-        ...TaskFields
-      }
-    }
-  }
-
-  ${TASK_FRAGMENT}
-}
-`;
--- a/frontend/src/shared/graphql/taskGroup/sortTaskGroup.ts
+++ b/frontend/src/shared/graphql/taskGroup/sortTaskGroup.ts
@@ -1,13 +0,0 @@
-import gql from 'graphql-tag';
-
-const SORT_TASK_GROUP_MUTATION = gql`
-  mutation sortTaskGroup($tasks: [TaskPositionUpdate!]!, $taskGroupID: UUID!) {
-    sortTaskGroup(input: { taskGroupID: $taskGroupID, tasks: $tasks }) {
-      taskGroupID
-      tasks {
-        id
-        position
-      }
-    }
-  }
-`;
--- a/frontend/src/shared/graphql/topNavbar.ts
+++ b/frontend/src/shared/graphql/topNavbar.ts
@@ -1,43 +0,0 @@
-import gql from 'graphql-tag';
-
-export const TOP_NAVBAR_QUERY = gql`
-  query topNavbar {
-    notifications {
-      createdAt
-      read
-      id
-      entity {
-        id
-        type
-        name
-      }
-      actor {
-        id
-        type
-        name
-      }
-      actionType
-    }
-    me {
-      user {
-        id
-        fullName
-        profileIcon {
-          initials
-          bgColor
-          url
-        }
-      }
-      teamRoles {
-        teamID
-        roleCode
-      }
-      projectRoles {
-        projectID
-        roleCode
-      }
-    }
-  }
-`;
-
-export default TOP_NAVBAR_QUERY;
--- a/frontend/src/shared/graphql/user/createUser.ts
+++ b/frontend/src/shared/graphql/user/createUser.ts
@@ -24,7 +24,6 @@ export const CREATE_USER_MUTATION = gql`
      fullName
      initials
      username
-      bio
      profileIcon {
        url
        initials
--- a/frontend/src/shared/graphql/user/updateUserInfo.ts
+++ b/frontend/src/shared/graphql/user/updateUserInfo.ts
@@ -1,19 +0,0 @@
-import gql from 'graphql-tag';
-
-export const UPDATE_USER_INFO_MUTATION = gql`
-  mutation updateUserInfo($name: String!, $initials: String!, $email: String!, $bio: String!) {
-    updateUserInfo(input: { name: $name, initials: $initials, email: $email, bio: $bio }) {
-      user {
-        id
-        email
-        fullName
-        bio
-        profileIcon {
-          initials
-        }
-      }
-    }
-  }
-`;
-
-export default UPDATE_USER_INFO_MUTATION;
--- a/frontend/src/shared/hooks/useWindowSize.ts
+++ b/frontend/src/shared/hooks/useWindowSize.ts
@@ -1,14 +0,0 @@
-import { useLayoutEffect, useState } from 'react';
-
-export default function useWindowSize() {
-  const [size, setSize] = useState([0, 0]);
-  useLayoutEffect(() => {
-    function updateSize() {
-      setSize([window.innerWidth, window.innerHeight]);
-    }
-    window.addEventListener('resize', updateSize);
-    updateSize();
-    return () => window.removeEventListener('resize', updateSize);
-  }, []);
-  return size;
-}
--- a/frontend/src/shared/icons/At.tsx
+++ b/frontend/src/shared/icons/At.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const At: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
-      <path d="M256 8C118.941 8 8 118.919 8 256c0 137.059 110.919 248 248 248 48.154 0 95.342-14.14 135.408-40.223 12.005-7.815 14.625-24.288 5.552-35.372l-10.177-12.433c-7.671-9.371-21.179-11.667-31.373-5.129C325.92 429.757 291.314 440 256 440c-101.458 0-184-82.542-184-184S154.542 72 256 72c100.139 0 184 57.619 184 160 0 38.786-21.093 79.742-58.17 83.693-17.349-.454-16.91-12.857-13.476-30.024l23.433-121.11C394.653 149.75 383.308 136 368.225 136h-44.981a13.518 13.518 0 0 0-13.432 11.993l-.01.092c-14.697-17.901-40.448-21.775-59.971-21.775-74.58 0-137.831 62.234-137.831 151.46 0 65.303 36.785 105.87 96 105.87 26.984 0 57.369-15.637 74.991-38.333 9.522 34.104 40.613 34.103 70.71 34.103C462.609 379.41 504 307.798 504 232 504 95.653 394.023 8 256 8zm-21.68 304.43c-22.249 0-36.07-15.623-36.07-40.771 0-44.993 30.779-72.729 58.63-72.729 22.292 0 35.601 15.241 35.601 40.77 0 45.061-33.875 72.73-58.161 72.73z" />
-    </Icon>
-  );
-};
-
-export default At;
--- a/frontend/src/shared/icons/Calendar.tsx
+++ b/frontend/src/shared/icons/Calendar.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Calender: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 448 512">
-      <path d="M400 64h-48V12c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v52H160V12c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v52H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V112c0-26.5-21.5-48-48-48zm-6 400H54c-3.3 0-6-2.7-6-6V160h352v298c0 3.3-2.7 6-6 6z" />
-    </Icon>
-  );
-};
-
-export default Calender;
--- a/frontend/src/shared/icons/Clone.tsx
+++ b/frontend/src/shared/icons/Clone.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Clone: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
-      <path d="M464 0c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48H176c-26.51 0-48-21.49-48-48V48c0-26.51 21.49-48 48-48h288M176 416c-44.112 0-80-35.888-80-80V128H48c-26.51 0-48 21.49-48 48v288c0 26.51 21.49 48 48 48h288c26.51 0 48-21.49 48-48v-48H176z" />
-    </Icon>
-  );
-};
-
-export default Clone;
--- a/frontend/src/shared/icons/Eye.tsx
+++ b/frontend/src/shared/icons/Eye.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Eye: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 576 512">
-      <path d="M288 144a110.94 110.94 0 0 0-31.24 5 55.4 55.4 0 0 1 7.24 27 56 56 0 0 1-56 56 55.4 55.4 0 0 1-27-7.24A111.71 111.71 0 1 0 288 144zm284.52 97.4C518.29 135.59 410.93 64 288 64S57.68 135.64 3.48 241.41a32.35 32.35 0 0 0 0 29.19C57.71 376.41 165.07 448 288 448s230.32-71.64 284.52-177.41a32.35 32.35 0 0 0 0-29.19zM288 400c-98.65 0-189.09-55-237.93-144C98.91 167 189.34 112 288 112s189.09 55 237.93 144C477.1 345 386.66 400 288 400z" />
-    </Icon>
-  );
-};
-
-export default Eye;
--- a/frontend/src/shared/icons/List.tsx
+++ b/frontend/src/shared/icons/List.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const List: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
-      <path d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z" />
-    </Icon>
-  );
-};
-
-export default List;
--- a/frontend/src/shared/icons/Paperclip.tsx
+++ b/frontend/src/shared/icons/Paperclip.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Paperclip: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 448 512">
-      <path d="M43.246 466.142c-58.43-60.289-57.341-157.511 1.386-217.581L254.392 34c44.316-45.332 116.351-45.336 160.671 0 43.89 44.894 43.943 117.329 0 162.276L232.214 383.128c-29.855 30.537-78.633 30.111-107.982-.998-28.275-29.97-27.368-77.473 1.452-106.953l143.743-146.835c6.182-6.314 16.312-6.422 22.626-.241l22.861 22.379c6.315 6.182 6.422 16.312.241 22.626L171.427 319.927c-4.932 5.045-5.236 13.428-.648 18.292 4.372 4.634 11.245 4.711 15.688.165l182.849-186.851c19.613-20.062 19.613-52.725-.011-72.798-19.189-19.627-49.957-19.637-69.154 0L90.39 293.295c-34.763 35.56-35.299 93.12-1.191 128.313 34.01 35.093 88.985 35.137 123.058.286l172.06-175.999c6.177-6.319 16.307-6.433 22.626-.256l22.877 22.364c6.319 6.177 6.434 16.307.256 22.626l-172.06 175.998c-59.576 60.938-155.943 60.216-214.77-.485z" />
-    </Icon>
-  );
-};
-
-export default Paperclip;
--- a/frontend/src/shared/icons/Plus.tsx
+++ b/frontend/src/shared/icons/Plus.tsx
@@ -1,12 +1,21 @@
 import React from 'react';
-import Icon, { IconProps } from './Icon';

-const Plus: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
+type Props = {
+  size: number | string;
+  color: string;
+};
+
+const Plus = ({ size, color }: Props) => {
  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 448 512">
-      <path d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z" />
-    </Icon>
+    <svg fill={color} xmlns="http://www.w3.org/2000/svg" width={size} height={size} viewBox="0 0 16 16">
+      <path d="M15.5 6h-5.5v-5.5c0-0.276-0.224-0.5-0.5-0.5h-3c-0.276 0-0.5 0.224-0.5 0.5v5.5h-5.5c-0.276 0-0.5 0.224-0.5 0.5v3c0 0.276 0.224 0.5 0.5 0.5h5.5v5.5c0 0.276 0.224 0.5 0.5 0.5h3c0.276 0 0.5-0.224 0.5-0.5v-5.5h5.5c0.276 0 0.5-0.224 0.5-0.5v-3c0-0.276-0.224-0.5-0.5-0.5z" />
+    </svg>
  );
 };

+Plus.defaultProps = {
+  size: 16,
+  color: '#000',
+};
+
 export default Plus;
--- a/frontend/src/shared/icons/Share.tsx
+++ b/frontend/src/shared/icons/Share.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Share: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
-      <path d="M503.691 189.836L327.687 37.851C312.281 24.546 288 35.347 288 56.015v80.053C127.371 137.907 0 170.1 0 322.326c0 61.441 39.581 122.309 83.333 154.132 13.653 9.931 33.111-2.533 28.077-18.631C66.066 312.814 132.917 274.316 288 272.085V360c0 20.7 24.3 31.453 39.687 18.164l176.004-152c11.071-9.562 11.086-26.753 0-36.328z" />
-    </Icon>
-  );
-};
-
-export default Share;
--- a/frontend/src/shared/icons/Smile.tsx
+++ b/frontend/src/shared/icons/Smile.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Smile: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 496 512">
-      <path d="M248 8C111 8 0 119 0 256s111 248 248 248 248-111 248-248S385 8 248 8zm0 448c-110.3 0-200-89.7-200-200S137.7 56 248 56s200 89.7 200 200-89.7 200-200 200zm-80-216c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm160 0c17.7 0 32-14.3 32-32s-14.3-32-32-32-32 14.3-32 32 14.3 32 32 32zm4 72.6c-20.8 25-51.5 39.4-84 39.4s-63.2-14.3-84-39.4c-8.5-10.2-23.7-11.5-33.8-3.1-10.2 8.5-11.5 23.6-3.1 33.8 30 36 74.1 56.6 120.9 56.6s90.9-20.6 120.9-56.6c8.5-10.2 7.1-25.3-3.1-33.8-10.1-8.4-25.3-7.1-33.8 3.1z" />
-    </Icon>
-  );
-};
-
-export default Smile;
--- a/frontend/src/shared/icons/Task.tsx
+++ b/frontend/src/shared/icons/Task.tsx
@@ -1,12 +0,0 @@
-import React from 'react';
-import Icon, { IconProps } from './Icon';
-
-const Task: React.FC<IconProps> = ({ width = '16px', height = '16px', className }) => {
-  return (
-    <Icon width={width} height={height} className={className} viewBox="0 0 512 512">
-      <path d="M139.61 35.5a12 12 0 0 0-17 0L58.93 98.81l-22.7-22.12a12 12 0 0 0-17 0L3.53 92.41a12 12 0 0 0 0 17l47.59 47.4a12.78 12.78 0 0 0 17.61 0l15.59-15.62L156.52 69a12.09 12.09 0 0 0 .09-17zm0 159.19a12 12 0 0 0-17 0l-63.68 63.72-22.7-22.1a12 12 0 0 0-17 0L3.53 252a12 12 0 0 0 0 17L51 316.5a12.77 12.77 0 0 0 17.6 0l15.7-15.69 72.2-72.22a12 12 0 0 0 .09-16.9zM64 368c-26.49 0-48.59 21.5-48.59 48S37.53 464 64 464a48 48 0 0 0 0-96zm432 16H208a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h288a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H208a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h288a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H208a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h288a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z" />
-    </Icon>
-  );
-};
-
-export default Task;
--- a/frontend/src/shared/icons/User.tsx
+++ b/frontend/src/shared/icons/User.tsx
@@ -1,12 +1,21 @@
 import React from 'react';
-import Icon, { IconProps } from './Icon';

-const User: React.FC<IconProps> = ({ width = '16px', height = '16px', className, onClick }) => {
+type Props = {
+  size: number | string;
+  color: string;
+};
+
+const User = ({ size, color }: Props) => {
  return (
-    <Icon onClick={onClick} width={width} height={height} className={className} viewBox="0 0 448 512">
-      <path d="M313.6 304c-28.7 0-42.5 16-89.6 16-47.1 0-60.8-16-89.6-16C60.2 304 0 364.2 0 438.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-25.6c0-74.2-60.2-134.4-134.4-134.4zM400 464H48v-25.6c0-47.6 38.8-86.4 86.4-86.4 14.6 0 38.3 16 89.6 16 51.7 0 74.9-16 89.6-16 47.6 0 86.4 38.8 86.4 86.4V464zM224 288c79.5 0 144-64.5 144-144S303.5 0 224 0 80 64.5 80 144s64.5 144 144 144zm0-240c52.9 0 96 43.1 96 96s-43.1 96-96 96-96-43.1-96-96 43.1-96 96-96z" />
-    </Icon>
+    <svg fill={color} xmlns="http://www.w3.org/2000/svg" width={size} height={size} viewBox="0 0 16 16">
+      <path d="M9 11.041v-0.825c1.102-0.621 2-2.168 2-3.716 0-2.485 0-4.5-3-4.5s-3 2.015-3 4.5c0 1.548 0.898 3.095 2 3.716v0.825c-3.392 0.277-6 1.944-6 3.959h14c0-2.015-2.608-3.682-6-3.959z" />
+    </svg>
  );
 };

+User.defaultProps = {
+  size: 16,
+  color: '#000',
+};
+
 export default User;
--- a/frontend/src/shared/icons/index.ts
+++ b/frontend/src/shared/icons/index.ts
@@ -1,17 +1,8 @@
 import Cross from './Cross';
 import Cog from './Cog';
-import Eye from './Eye';
-import List from './List';
-import At from './At';
-import Task from './Task';
-import Smile from './Smile';
-import Paperclip from './Paperclip';
-import Calendar from './Calendar';
-import Clone from './Clone';
 import Sort from './Sort';
 import Filter from './Filter';
 import DoubleChevronUp from './DoubleChevronUp';
-import Share from './Share';
 import Crown from './Crown';
 import BarChart from './BarChart';
 import UserPlus from './UserPlus';
@@ -77,16 +68,8 @@ export {
  Square,
  Filter,
  Sort,
-  At,
-  Smile,
  DoubleChevronUp,
  UserPlus,
  Crown,
  ToggleOn,
-  Calendar,
-  Clone,
-  Paperclip,
-  Share,
-  Eye,
-  List,
 };
--- a/frontend/src/shared/utils/accessToken.ts
+++ b/frontend/src/shared/utils/accessToken.ts
@@ -1,7 +1,6 @@
 let accessToken = '';

 export function setAccessToken(newToken: string) {
-  console.log(newToken);
  accessToken = newToken;
 }
 export function getAccessToken() {
--- a/frontend/src/shared/utils/editorTheme.ts
+++ b/frontend/src/shared/utils/editorTheme.ts
@@ -1,86 +0,0 @@
-import theme from 'App/ThemeStyles';
-
-const colors = {
-  almostBlack: '#181A1B',
-  lightBlack: '#2F3336',
-  almostWhite: '#E6E6E6',
-  white: '#FFF',
-  white10: 'rgba(255, 255, 255, 0.1)',
-  black: '#000',
-  black10: 'rgba(0, 0, 0, 0.1)',
-  primary: '#1AB6FF',
-  greyLight: '#F4F7FA',
-  grey: '#E8EBED',
-  greyMid: '#C5CCD3',
-  greyDark: '#DAE1E9',
-};
-
-export const base = {
-  ...colors,
-  fontFamily: "'Droid Sans', sans-serif",
-  fontFamilyMono: "'SFMono-Regular',Consolas,'Liberation Mono', Menlo, Courier,monospace",
-  fontWeight: 400,
-  zIndex: 10000,
-  link: colors.primary,
-  placeholder: '#B1BECC',
-  textSecondary: '#4E5C6E',
-  textLight: colors.white,
-  textHighlight: '#b3e7ff',
-  selected: colors.primary,
-  codeComment: '#6a737d',
-  codePunctuation: '#5e6687',
-  codeNumber: '#d73a49',
-  codeProperty: '#c08b30',
-  codeTag: '#3d8fd1',
-  codeString: '#032f62',
-  codeSelector: '#6679cc',
-  codeAttr: '#c76b29',
-  codeEntity: '#22a2c9',
-  codeKeyword: '#d73a49',
-  codeFunction: '#6f42c1',
-  codeStatement: '#22a2c9',
-  codePlaceholder: '#3d8fd1',
-  codeInserted: '#202746',
-  codeImportant: '#c94922',
-
-  blockToolbarBackground: colors.white,
-  blockToolbarTrigger: colors.greyMid,
-  blockToolbarTriggerIcon: colors.white,
-  blockToolbarItem: colors.almostBlack,
-  blockToolbarText: colors.almostBlack,
-  blockToolbarHoverBackground: colors.greyLight,
-  blockToolbarDivider: colors.greyMid,
-
-  noticeInfoBackground: '#F5BE31',
-  noticeInfoText: colors.almostBlack,
-  noticeTipBackground: '#9E5CF7',
-  noticeTipText: colors.white,
-  noticeWarningBackground: '#FF5C80',
-  noticeWarningText: colors.white,
-};
-export const dark = {
-  ...base,
-  background: 'transparent',
-  text: `rgba(${theme.colors.text.primary})`,
-  code: `rgba(${theme.colors.text.primary})`,
-  cursor: `rgba(${theme.colors.text.primary})`,
-  divider: '#4E5C6E',
-  placeholder: '#52657A',
-
-  toolbarBackground: colors.white,
-  toolbarInput: colors.black10,
-  toolbarItem: colors.lightBlack,
-
-  tableDivider: colors.lightBlack,
-  tableSelected: colors.primary,
-  tableSelectedBackground: '#002333',
-
-  quote: colors.greyDark,
-  codeBackground: colors.black,
-  codeBorder: colors.lightBlack,
-  codeString: '#3d8fd1',
-  horizontalRule: colors.lightBlack,
-  imageErrorBackground: 'rgba(0, 0, 0, 0.5)',
-};
-
-export default dark;
--- a/frontend/src/shared/utils/sorting.ts
+++ b/frontend/src/shared/utils/sorting.ts
@@ -1,132 +0,0 @@
-import moment from 'moment';
-
-export enum TaskSortingType {
-  NONE,
-  COMPLETE,
-  DUE_DATE,
-  MEMBERS,
-  LABELS,
-  TASK_TITLE,
-}
-
-export enum TaskSortingDirection {
-  ASC,
-  DESC,
-}
-
-export type TaskSorting = {
-  type: TaskSortingType;
-  direction: TaskSortingDirection;
-};
-
-export function sortString(a: string, b: string) {
-  if (a < b) {
-    return -1;
-  }
-  if (a > b) {
-    return 1;
-  }
-  return 0;
-}
-
-export function sortTasks(a: Task, b: Task, taskSorting: TaskSorting) {
-  if (taskSorting.type === TaskSortingType.TASK_TITLE) {
-    if (a.name < b.name) {
-      return -1;
-    }
-    if (a.name > b.name) {
-      return 1;
-    }
-    return 0;
-  }
-  if (taskSorting.type === TaskSortingType.DUE_DATE) {
-    if (a.dueDate && !b.dueDate) {
-      return -1;
-    }
-    if (b.dueDate && !a.dueDate) {
-      return 1;
-    }
-    return moment(a.dueDate).diff(moment(b.dueDate));
-  }
-  if (taskSorting.type === TaskSortingType.COMPLETE) {
-    if (a.complete && !b.complete) {
-      return -1;
-    }
-    if (b.complete && !a.complete) {
-      return 1;
-    }
-    return 0;
-  }
-  if (taskSorting.type === TaskSortingType.LABELS) {
-    // sorts non-empty labels by name, then by empty label color name
-    let aLabels = [];
-    let bLabels = [];
-    let aLabelsEmpty = [];
-    let bLabelsEmpty = [];
-    if (a.labels) {
-      for (const aLabel of a.labels) {
-        if (aLabel.projectLabel.name && aLabel.projectLabel.name !== '') {
-          aLabels.push(aLabel.projectLabel.name);
-        } else {
-          aLabelsEmpty.push(aLabel.projectLabel.labelColor.name);
-        }
-      }
-    }
-    if (b.labels) {
-      for (const bLabel of b.labels) {
-        if (bLabel.projectLabel.name && bLabel.projectLabel.name !== '') {
-          bLabels.push(bLabel.projectLabel.name);
-        } else {
-          bLabelsEmpty.push(bLabel.projectLabel.labelColor.name);
-        }
-      }
-    }
-    aLabels = aLabels.sort((aLabel, bLabel) => sortString(aLabel, bLabel));
-    bLabels = bLabels.sort((aLabel, bLabel) => sortString(aLabel, bLabel));
-    aLabelsEmpty = aLabelsEmpty.sort((aLabel, bLabel) => sortString(aLabel, bLabel));
-    bLabelsEmpty = bLabelsEmpty.sort((aLabel, bLabel) => sortString(aLabel, bLabel));
-    if (aLabelsEmpty.length !== 0 || bLabelsEmpty.length !== 0) {
-      if (aLabelsEmpty.length > bLabelsEmpty.length) {
-        if (bLabels.length !== 0) {
-          return 1;
-        }
-        return -1;
-      }
-    }
-    if (aLabels.length < bLabels.length) {
-      return 1;
-    }
-    if (aLabels.length > bLabels.length) {
-      return -1;
-    }
-    return 0;
-  }
-  if (taskSorting.type === TaskSortingType.MEMBERS) {
-    let aMembers = [];
-    let bMembers = [];
-    if (a.assigned) {
-      for (const aMember of a.assigned) {
-        if (aMember.fullName) {
-          aMembers.push(aMember.fullName);
-        }
-      }
-    }
-    if (b.assigned) {
-      for (const bMember of b.assigned) {
-        if (bMember.fullName) {
-          bMembers.push(bMember.fullName);
-        }
-      }
-    }
-    aMembers = aMembers.sort((aMember, bMember) => sortString(aMember, bMember));
-    bMembers = bMembers.sort((aMember, bMember) => sortString(aMember, bMember));
-    if (aMembers.length < bMembers.length) {
-      return 1;
-    }
-    if (aMembers.length > bMembers.length) {
-      return -1;
-    }
-    return 0;
-  }
-  return 0;
-}
--- a/frontend/src/taskcafe.d.ts
+++ b/frontend/src/taskcafe.d.ts
@@ -46,8 +46,6 @@ type OwnedList = {
 type TaskUser = {
  id: string;
  fullName: string;
-  email?: string;
-  bio?: string;
  profileIcon: ProfileIcon;
  username?: string;
  role?: Role;
--- a/frontend/src/types.d.ts
+++ b/frontend/src/types.d.ts
@@ -64,7 +64,6 @@ type Task = {
  position: number;
  dueDate?: string;
  complete?: boolean;
-  completedAt?: string | null;
  labels: TaskLabel[];
  description?: string | null;
  assigned?: Array<TaskUser>;
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -12,7 +12,6 @@
    "allowSyntheticDefaultImports": true,
    "strict": true,
    "forceConsistentCasingInFileNames": true,
-    "downlevelIteration": true,
    "module": "esnext",
    "moduleResolution": "node",
    "resolveJsonModule": true,
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1534,13 +1534,6 @@
  dependencies:
    "@emotion/memoize" "0.7.4"

-"@emotion/is-prop-valid@^0.8.8":
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
-  integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
-  dependencies:
-    "@emotion/memoize" "0.7.4"
-
 "@emotion/memoize@0.7.4":
  version "0.7.4"
  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
@@ -3290,13 +3283,6 @@
  dependencies:
    "@types/react" "*"

-"@types/react-timeago@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@types/react-timeago/-/react-timeago-4.1.1.tgz#14c24cb8c1299379d9c2941ca3373f849d8bc78a"
-  integrity sha512-Rokr09qNqkKXpKwrDVYzGz/mGlmgX5ZdxAJToUehMyRHXEwtXUUNaAZur5RoZ5JtukBwXKzDevS72Axtjm+yKg==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-transition-group@*":
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
@@ -3651,6 +3637,13 @@
    text-table "^0.2.0"
    webpack-log "^1.1.2"

+"@welldone-software/why-did-you-render@^4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@welldone-software/why-did-you-render/-/why-did-you-render-4.2.2.tgz#720128a4f626997ece1ac455a7b13f9ef10dae0a"
+  integrity sha512-v08t2WXFQdnxkPodXzbPeho3FwgrlwzjwxasN+8A1LSZnkcxJpYvOF8/z+OySqehC44JT6oPB1KEnBVMrebHdw==
+  dependencies:
+    lodash "^4"
+
 "@wry/context@^0.4.0":
  version "0.4.4"
  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz#e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8"
@@ -3767,6 +3760,18 @@ adjust-sourcemap-loader@2.0.0:
    object-path "0.11.4"
    regex-parser "2.2.10"

+ag-grid-community@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-23.2.0.tgz#889f52e8eb91c167c2ac7477938cbf498a54f67c"
+  integrity sha512-aG7Ghfu79HeqOCd50GhFSeZUX1Tw9BVUX1VKMuglkAcwYPTQjuYvYT7QVQB5FGzfFjcVq4a1QFfcgdoAcZYJIA==
+
+ag-grid-react@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-23.2.0.tgz#00a54cb4e83c0d35a49c202e5833e3bb20d8cfa8"
+  integrity sha512-lDGV+WX0Nj5biNOJRSErFehXG+nqkbuXPMS7YJxEDWJLJxtOF0INP5sL6dtxV12j/XHqXa+M2CgQBXZWZq+EWg==
+  dependencies:
+    prop-types "^15.6.2"
+
 agent-base@4, agent-base@^4.3.0:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -5847,11 +5852,6 @@ compression@^1.7.4:
    safe-buffer "5.1.2"
    vary "~1.1.2"

-compute-scroll-into-view@^1.0.14:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.14.tgz#80e3ebb25d6aa89f42e533956cb4b16a04cfe759"
-  integrity sha512-mKDjINe3tc6hGelUMNDzuhorIUZ7kS7BwyY0r2wQd2HOH2tRuJykiC06iSEX8y1TuhNzvz4GcJnK16mM2J1NMQ==
-
 computed-style@~0.1.3:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/computed-style/-/computed-style-0.1.4.tgz#7f344fd8584b2e425bedca4a1afc0e300bb05d74"
@@ -7003,11 +7003,6 @@ entities@^2.0.0:
  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==

-entities@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
-  integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
-
 env-ci@^2.1.0:
  version "2.6.0"
  resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-2.6.0.tgz#3fc46537c972b4d3ab5f0b82d07dfc1491297662"
@@ -10469,13 +10464,6 @@ lines-and-columns@^1.1.6:
  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=

-linkify-it@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
-  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
-  dependencies:
-    uc.micro "^1.0.1"
-
 listr-silent-renderer@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
@@ -10696,7 +10684,7 @@ lodash.xorby@^4.7.0:
  resolved "https://registry.yarnpkg.com/lodash.xorby/-/lodash.xorby-4.7.0.tgz#9c19a6f9f063a6eb53dd03c1b6871799801463d7"
  integrity sha1-nBmm+fBjputT3QPBtocXmYAUY9c=

-lodash@4.17.15, "lodash@>=3.5 <5", lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5:
+lodash@4.17.15, "lodash@>=3.5 <5", lodash@^4, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5:
  version "4.17.15"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -10852,27 +10840,6 @@ markdown-escapes@^1.0.0:
  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
  integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==

-markdown-it-container@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b"
-  integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==
-
-markdown-it-mark@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-mark/-/markdown-it-mark-3.0.0.tgz#27c3e39ef3cc310b2dde5375082c9fa912983cda"
-  integrity sha512-HqMWeKfMMOu4zBO0emmxsoMWmbf2cPKZY1wP6FsTbKmicFfp5y4L3KXAsNeO1rM6NTJVOrNlLKMPjWzriBGspw==
-
-markdown-it@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
-  integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
-  dependencies:
-    argparse "^1.0.7"
-    entities "~2.0.0"
-    linkify-it "^2.0.0"
-    mdurl "^1.0.1"
-    uc.micro "^1.0.5"
-
 markdown-to-jsx@^6.9.1, markdown-to-jsx@^6.9.3:
  version "6.11.0"
  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.0.tgz#a2e3f2bc781c3402d8bb0f8e0a12a186474623b0"
@@ -11750,11 +11717,6 @@ optionator@^0.8.1, optionator@^0.8.3:
    type-check "~0.3.2"
    word-wrap "~1.2.3"

-orderedmap@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789"
-  integrity sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ==
-
 original@^1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -11788,11 +11750,6 @@ os-tmpdir@~1.0.2:
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

-outline-icons@^1.21.0-3:
-  version "1.21.0-6"
-  resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.21.0-6.tgz#bbf63fe6cc88ca2fe391e6ba6cc8b62a948607e3"
-  integrity sha512-iEVK2zTEZ3sLFLsko/V6z3AEiM2EAjEUyLIOzAT2cqRglIbaIWdyitotKVMb2hWZo66bSvHxA/Rdvv51sw5RhA==
-
 p-defer@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -13009,13 +12966,6 @@ prisma-yml@1.34.10:
    scuid "^1.0.2"
    yaml-ast-parser "^0.0.40"

-prismjs@^1.19.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
-  integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
-  optionalDependencies:
-    clipboard "^2.0.0"
-
 prismjs@^1.8.4:
  version "1.19.0"
  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc"
@@ -13121,129 +13071,6 @@ property-information@^5.0.0, property-information@^5.3.0:
  dependencies:
    xtend "^4.0.0"

-prosemirror-commands@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.4.tgz#991563e67623acab4f8c510fad1570f8b4693780"
-  integrity sha512-kj4Qi+8h3EpJtZuuEDwZ9h2/QNGWDsIX/CzjmClxi9GhxWyBUMVUvIFk0mgdqHyX20lLeGmOpc0TLA5aPzgpWg==
-  dependencies:
-    prosemirror-model "^1.0.0"
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.0.0"
-
-prosemirror-dropcursor@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d"
-  integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw==
-  dependencies:
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.1.0"
-    prosemirror-view "^1.1.0"
-
-prosemirror-gapcursor@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"
-  integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w==
-  dependencies:
-    prosemirror-keymap "^1.0.0"
-    prosemirror-model "^1.0.0"
-    prosemirror-state "^1.0.0"
-    prosemirror-view "^1.0.0"
-
-prosemirror-history@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"
-  integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg==
-  dependencies:
-    prosemirror-state "^1.2.2"
-    prosemirror-transform "^1.0.0"
-    rope-sequence "^1.3.0"
-
-prosemirror-inputrules@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012"
-  integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g==
-  dependencies:
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.0.0"
-
-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz#8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"
-  integrity sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg==
-  dependencies:
-    prosemirror-state "^1.0.0"
-    w3c-keyname "^2.2.0"
-
-prosemirror-markdown@^1.4.4:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.5.0.tgz#1c0129640c33e23217fbf80ebb24486a40a759c1"
-  integrity sha512-ugTyZfTu1l2E3EI6+DwD917mz2Sk5E4R01Nh67yMffGg4S9ZetC81g1VIKGCaak4jnoP4BMUIOUJyXAS6xFLaA==
-  dependencies:
-    markdown-it "^10.0.0"
-    prosemirror-model "^1.0.0"
-
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.10.0, prosemirror-model@^1.8.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.0.tgz#dc36cdb3ad6442b9f6325c7d89170c624f9dc520"
-  integrity sha512-GqoAz/mIYjdv8gVYJ8mWFKpHoTxn/lXq4tXJ6bTVxs+rem2LzMYXrNVXfucGtfsgqsJlRIgng/ByG9j7Q8XDrg==
-  dependencies:
-    orderedmap "^1.1.0"
-
-prosemirror-schema-list@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1"
-  integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw==
-  dependencies:
-    prosemirror-model "^1.0.0"
-    prosemirror-transform "^1.0.0"
-
-prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c"
-  integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w==
-  dependencies:
-    prosemirror-model "^1.0.0"
-    prosemirror-transform "^1.0.0"
-
-prosemirror-tables@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e"
-  integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA==
-  dependencies:
-    prosemirror-keymap "^1.1.2"
-    prosemirror-model "^1.8.1"
-    prosemirror-state "^1.3.1"
-    prosemirror-transform "^1.2.1"
-    prosemirror-view "^1.13.3"
-
-prosemirror-transform@1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.5.tgz#7a3e2c61fcdbaf1d0844a2a3bc34fc3524e9809c"
-  integrity sha512-eqeIaxWtUfOnpA1ERrXCuSIMzqIJtL9Qrs5uJMCjY5RMSaH5o4pc390SAjn/IDPeIlw6auh0hCCXs3wRvGnQug==
-  dependencies:
-    prosemirror-model "^1.0.0"
-
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.8.tgz#4b86544fa43637fe381549fb7b019f4fb71fe65c"
-  integrity sha512-hKqceqv9ZmMQXNQkhFjr0KFGPvkhygaWND+uIM0GxRpALrKfxP97SsgHTBs3OpJhDmh5N+mB4D/CksB291Eavg==
-  dependencies:
-    prosemirror-model "^1.0.0"
-
-prosemirror-utils@^0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973"
-  integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==
-
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.14.11:
-  version "1.15.5"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.5.tgz#02f447bfb938995b6e26c9376c36d03e8714fcb4"
-  integrity sha512-VpAP/Rh7a4l1udpR3lEym2FlTD93JZjWChHYgzLgiBI6alOapG4GEsyAEq0l8eUJd9Ujf55+5dlEuItxI3a9Mw==
-  dependencies:
-    prosemirror-model "^1.1.0"
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.1.0"
-
 proxy-addr@~2.0.5:
  version "2.0.5"
  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
@@ -13812,11 +13639,6 @@ react-markdown@^4.3.1:
    unist-util-visit "^1.3.0"
    xtend "^4.0.1"

-react-medium-image-zoom@^3.0.16:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-3.1.2.tgz#5ac4441f1d424bd9680a25bfc2591be3d7704a42"
-  integrity sha512-werjufn5o4ytdyvJNzfqXCilovDhMyREH0qeJhCjV5brNAyfV7anZmvpFc3FApbuVXwBkzHMuQkV2z/GyEQatg==
-
 react-onclickoutside@^6.9.0:
  version "6.9.0"
  resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz#a54bc317ae8cf6131a5d78acea55a11067f37a1f"
@@ -13843,13 +13665,6 @@ react-popper@^1.3.4, react-popper@^1.3.6:
    typed-styles "^0.0.7"
    warning "^4.0.2"

-react-portal@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.2.1.tgz#12c1599238c06fb08a9800f3070bea2a3f78b1a6"
-  integrity sha512-fE9kOBagwmTXZ3YGRYb4gcMy+kSA+yLO0xnPankjRlfBv4uCpFXqKPfkpsGQQR15wkZ9EssnvTOl1yMzbkxhPQ==
-  dependencies:
-    prop-types "^15.5.8"
-
 react-redux@^7.1.1:
  version "7.2.0"
  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
@@ -13993,20 +13808,6 @@ react-textarea-autosize@^7.1.0:
    "@babel/runtime" "^7.1.2"
    prop-types "^15.6.0"

-react-timeago@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/react-timeago/-/react-timeago-4.4.0.tgz#4520dd9ba63551afc4d709819f52b14b9343ba2b"
-  integrity sha512-Zj8RchTqZEH27LAANemzMR2RpotbP2aMd+UIajfYMZ9KW4dMcViUVKzC7YmqfiqlFfz8B0bjDw2xUBjmcxDngA==
-
-react-toastify@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-6.0.8.tgz#84625d81d0fd01902a7f4c6f317eb074cb3bba67"
-  integrity sha512-NSqCNwv+C4IfR+c92PFZiNyeBwOJvigrP2bcRi2f6Hg3WqcHhEHOknbSQOs9QDFuqUjmK3SOrdvScQ3z63ifXg==
-  dependencies:
-    classnames "^2.2.6"
-    prop-types "^15.7.2"
-    react-transition-group "^4.4.1"
-
 react-transition-group@^4.3.0:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
@@ -14017,16 +13818,6 @@ react-transition-group@^4.3.0:
    loose-envify "^1.4.0"
    prop-types "^15.6.2"

-react-transition-group@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
-  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
 react@^16.12.0, react@^16.8.3:
  version "16.12.0"
  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
@@ -14199,7 +13990,7 @@ redux@^4.0.4:
    loose-envify "^1.4.0"
    symbol-observable "^1.2.0"

-refractor@^2.10.1, refractor@^2.4.1:
+refractor@^2.4.1:
  version "2.10.1"
  resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.10.1.tgz#166c32f114ed16fd96190ad21d5193d3afc7d34e"
  integrity sha512-Xh9o7hQiQlDbxo5/XkOX6H+x/q8rmlmZKr97Ie1Q8ZM32IRRd3B/UxuA/yXDW79DBSXGWxm2yRTbcTVmAciJRw==
@@ -14683,39 +14474,6 @@ rgba-regex@^1.0.0:
  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=

-rich-markdown-editor@^10.6.5:
-  version "10.6.5"
-  resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-10.6.5.tgz#b74ae2e7d05eaa3c8ef34744e5cb0ed2dbdb0958"
-  integrity sha512-C/C+6L7BTXC4zSHgOYMljOQ3CvFt8zNCT829woKBHcDWSnXiUzpjgZZ4qEeNRlh/XJmqeFZYfqY+OzIMsVP2+Q==
-  dependencies:
-    copy-to-clipboard "^3.0.8"
-    lodash "^4.17.11"
-    markdown-it-container "^3.0.0"
-    markdown-it-mark "^3.0.0"
-    outline-icons "^1.21.0-3"
-    prismjs "^1.19.0"
-    prosemirror-commands "^1.1.4"
-    prosemirror-dropcursor "^1.3.2"
-    prosemirror-gapcursor "^1.1.5"
-    prosemirror-history "^1.1.3"
-    prosemirror-inputrules "^1.1.2"
-    prosemirror-keymap "^1.1.4"
-    prosemirror-markdown "^1.4.4"
-    prosemirror-model "^1.10.0"
-    prosemirror-schema-list "^1.1.2"
-    prosemirror-state "^1.3.3"
-    prosemirror-tables "^1.0.0"
-    prosemirror-transform "1.2.5"
-    prosemirror-utils "^0.9.6"
-    prosemirror-view "^1.14.11"
-    react-medium-image-zoom "^3.0.16"
-    react-portal "^4.2.1"
-    refractor "^2.10.1"
-    slugify "^1.4.0"
-    smooth-scroll-into-view-if-needed "^1.1.27"
-    styled-components "^5.1.0"
-    typescript "3.7.5"
-
 right-align@^0.1.1:
  version "0.1.3"
  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -14745,11 +14503,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
    hash-base "^3.0.0"
    inherits "^2.0.1"

-rope-sequence@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b"
-  integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg==
-
 rsvp@^4.8.4:
  version "4.8.5"
  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -14890,13 +14643,6 @@ schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6
    ajv "^6.10.2"
    ajv-keywords "^3.4.1"

-scroll-into-view-if-needed@^2.2.25:
-  version "2.2.25"
-  resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.25.tgz#117b7bc7c61bc7a2b7872a0984bc73a19bc6e961"
-  integrity sha512-C8RKJPq9lK7eubwGpLbUkw3lklcG3Ndjmea2PyauzrA0i4DPlzAmVMGxaZrBFqCrVLfvJmP80IyHnv4jxvg1OQ==
-  dependencies:
-    compute-scroll-into-view "^1.0.14"
-
 scuid@^1.0.2:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab"
@@ -15191,18 +14937,6 @@ slice-ansi@^2.1.0:
    astral-regex "^1.0.0"
    is-fullwidth-code-point "^2.0.0"

-slugify@^1.4.0:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.5.tgz#a7517acf5f4c02a4df41e735354b660a4ed1efcf"
-  integrity sha512-WpECLAgYaxHoEAJ8Q1Lo8HOs1ngn7LN7QjXgOLbmmfkcWvosyk4ZTXkTzKyhngK640USTZUlgoQJfED1kz5fnQ==
-
-smooth-scroll-into-view-if-needed@^1.1.27:
-  version "1.1.28"
-  resolved "https://registry.yarnpkg.com/smooth-scroll-into-view-if-needed/-/smooth-scroll-into-view-if-needed-1.1.28.tgz#70591d6723aa747114e0c0348379f8739701e4ba"
-  integrity sha512-VBxjAYySCfPix8JaiYKB+Rr4+1tFJ+aJ80caiVmsEA1cgQ3G/aFEfIRSpabJfX5o3FGm3IEttBLebe0uNtgURw==
-  dependencies:
-    scroll-into-view-if-needed "^2.2.25"
-
 snapdragon-node@^2.0.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -15745,22 +15479,6 @@ styled-components@^5.0.1:
    shallowequal "^1.1.0"
    supports-color "^5.5.0"

-styled-components@^5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d"
-  integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.8"
-    "@emotion/stylis" "^0.8.4"
-    "@emotion/unitless" "^0.7.4"
-    babel-plugin-styled-components ">= 1"
-    css-to-react-native "^3.0.0"
-    hoist-non-react-statics "^3.0.0"
-    shallowequal "^1.1.0"
-    supports-color "^5.5.0"
-
 stylehacks@^4.0.0:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -16258,7 +15976,7 @@ typedarray@^0.0.6:
  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

-typescript@3.7.5, typescript@~3.7.2:
+typescript@~3.7.2:
  version "3.7.5"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
@@ -16268,11 +15986,6 @@ ua-parser-js@^0.7.18:
  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
  integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==

-uc.micro@^1.0.1, uc.micro@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
-
 uglify-js@^2.6.1:
  version "2.8.29"
  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -16806,11 +16519,6 @@ w3c-hr-time@^1.0.1:
  dependencies:
    browser-process-hrtime "^0.1.2"

-w3c-keyname@^2.2.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b"
-  integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==
-
 w3c-xmlserializer@^1.1.2:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794"
--- a/go.mod
+++ b/go.mod
@@ -4,10 +4,11 @@ go 1.13

 require (
 	github.com/99designs/gqlgen v0.11.3
-	github.com/RichardKnop/machinery v1.9.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-chi/chi v3.3.2+incompatible
+	github.com/go-chi/cors v1.0.0
 	github.com/golang-migrate/migrate/v4 v4.11.0
+	github.com/golang/protobuf v1.3.4 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/lib/pq v1.3.0
@@ -20,5 +21,11 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.4.0
 	github.com/vektah/gqlparser/v2 v2.0.1
-	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
+	golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073
+	golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
+	golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	golang.org/x/tools v0.0.0-20200303165918-5bcca83a7881 // indirect
+	google.golang.org/genproto v0.0.0-20200303153909-beee998c1893 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -10,35 +10,18 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0 h1:MZQCQQaRwOrAcuKjiHWHrgKykt4fZyuwF2dtiG3fGW8=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU=
-cloud.google.com/go v0.61.0 h1:NLQf5e1OMspfNT1RAHOB3ublr1TW3YTXO8OiWwVjK2U=
-cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0 h1:xE3CPsOgttP4ACBePh79zTKALtXwn/Edhcr16R5hMWU=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
 cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.5.0 h1:9cH52jizPUVSSrSe+J16RC9wB0QI7i/cfuCm5UUCcIk=
-cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w=
 cloud.google.com/go/spanner v1.2.0/go.mod h1:LfwGAsK42Yz8IeLsd/oagGFBqTXt3xVWtm8/KD2vrEI=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0 h1:RPUcBvDeYgQFMfQu1eBMq6piD1SXmLH+vK3qjewZPus=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/99designs/gqlgen v0.11.3 h1:oFSxl1DFS9X///uHV3y6CEfpcXWrDUxVblR4Xib2bs4=
 github.com/99designs/gqlgen v0.11.3/go.mod h1:RgX5GRRdDWNkh4pBrdzNpNPFVsdoUFY2+adM6nb1N+4=
@@ -48,19 +31,10 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
-github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs=
-github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60=
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae h1:DcFpTQBYQ9Ct2d6sC7ol0/ynxc2pO1cpGUM+f4t5adg=
-github.com/RichardKnop/logging v0.0.0-20190827224416-1a693bdd4fae/go.mod h1:rJJ84PyA/Wlmw1hO+xTzV2wsSUon6J5ktg0g8BF2PuU=
-github.com/RichardKnop/machinery v1.9.1 h1:Q4WInk0OWGMbXDH3Q8dm8uadN5Wcyquc+7IcM4p9ECs=
-github.com/RichardKnop/machinery v1.9.1/go.mod h1:ww7OQ0FxPS39PqWsJyqKCatZTQ/o8hsiKGAa7m0BtYY=
-github.com/RichardKnop/redsync v1.2.0 h1:gK35hR3zZkQigHKm8wOGb9MpJ9BsrW6MzxezwjTcHP0=
-github.com/RichardKnop/redsync v1.2.0/go.mod h1:9b8nBGAX3bE2uCfJGSnsDvF23mKyHTZzmvmj5FH3Tp0=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
@@ -75,26 +49,18 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.33.6 h1:YLoUeMSx05kHwhS+HLDSpdYYpPzJMyp6hn1cWsJ6a+U=
-github.com/aws/aws-sdk-go v1.33.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg=
-github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k=
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/containerd/containerd v1.3.3 h1:LoIzb5y9x5l8VKAlyrbusNPXqBY0+kviRloxFUMFwKc=
@@ -116,8 +82,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9 h1:h2Ul3Ym2iVZWMQGYmulVUJ4LSkBm1erp9mUkPwtMoLg=
-github.com/dgryski/go-rendezvous v0.0.0-20200624174652-8d2f3be8b2d9/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c h1:TUuUh0Xgj97tLMNtWtNvI9mIV6isjEb9lBMNv+77IGM=
 github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
@@ -137,9 +101,7 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -147,47 +109,20 @@ github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-chi/chi v3.3.2+incompatible h1:uQNcQN3NsV1j4ANsPh42P4ew4t6rnRbJb8frvpp31qQ=
 github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/go-chi/cors v1.0.0 h1:e6x8k7uWbUwYs+aXDoiUzeQFT6l0cygBYyNhD7/1Tg0=
+github.com/go-chi/cors v1.0.0/go.mod h1:K2Yje0VW/SJzxiyMYu6iPQYa7hMjQX2i/F491VChg1I=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o=
-github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-redis/redis/v8 v8.0.0-beta.6 h1:QeXAkG9L5cWJA+eJTBvhkftE7dwpJ0gbMYeBE2NxXS4=
-github.com/go-redis/redis/v8 v8.0.0-beta.6/go.mod h1:g79Vpae8JMzg5qjk8BiwU9tK+HmU3iDVyS4UAJLFycI=
 github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
 github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
 github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -208,29 +143,16 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k=
-github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -238,24 +160,14 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -319,27 +231,17 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
-github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I=
-github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
@@ -362,9 +264,7 @@ github.com/magefile/mage v1.9.0 h1:t3AU2wNwehMCW97vuqQLtw6puppWXHO+O2MHo5a50XE=
 github.com/magefile/mage v1.9.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007 h1:reVOUXwnhsYv/8UqjvhrMOu5CNT9UapHFLbQ2JcXsmg=
 github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
@@ -383,7 +283,6 @@ github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047 h1:zCoDWFD5
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -393,23 +292,15 @@ github.com/neo4j/neo4j-go-driver v1.7.4/go.mod h1:aPO0vVr+WnhEJne+FgFjfsjzAnssPF
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
-github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
-github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
 github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -437,8 +328,6 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -457,18 +346,15 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0 h1:JJV9CsgM9EC9w2iVkwuz+sMx8yRFe89PJRUrv6hPCIA=
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
@@ -479,8 +365,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
-github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -489,17 +373,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM=
-github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e h1:+w0Zm/9gaWpEAyDlU1eKOuk5twTjAjuevXqcJJw8hrg=
@@ -509,31 +385,20 @@ github.com/vektah/gqlparser/v2 v2.0.1/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4Xk
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.3.5 h1:S0ZOruh4YGHjD7JoN7mIsTrNjnQbOjrmgrx6l6pZN7I=
-go.mongodb.org/mongo-driver v1.3.5/go.mod h1:Ual6Gkco7ZGQw8wE1t4tLnvBsf6yVSM60qW6TgOeJ5c=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=
-go.opentelemetry.io/otel v0.8.0 h1:he/8j/EBlKjENVtDvFalawIUcQ+1E3uHRsvJZWLIa7M=
-go.opentelemetry.io/otel v0.8.0/go.mod h1:ckxzUEfk7tAkTwEMVdkllBM+YOfE/K9iwg6zYntFYSg=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -543,18 +408,13 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -565,9 +425,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200213203834-85f925bdd4d0/go.mod h1:IX6Eufr4L0ErOUlzqX/aFlHqsiKZRbV42Kb69e9VsTE=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20200513190911-00229845015e h1:rMqLP+9XLy+LdbCXHjJHAmTfXCr93W7oruWA6Hq1Alc=
-golang.org/x/exp v0.0.0-20200513190911-00229845015e/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -579,8 +436,6 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -589,8 +444,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -606,28 +459,15 @@ golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -639,13 +479,9 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -657,17 +493,14 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -675,20 +508,9 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtD
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -700,8 +522,6 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -712,15 +532,11 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -733,7 +549,6 @@ golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589 h1:rjUrONFu4kLchcZTfp3/96bR8bW8dIa8uz3cR5n0cgM=
@@ -742,24 +557,11 @@ golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200128002243-345141a36859/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200213224642-88e652f7a869/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200715235423-130c9f19d3fe h1:q+DqTBqwpg3C8p5kTZ0WSLOmLxH57dKhWAieWmuFv7M=
-golang.org/x/tools v0.0.0-20200715235423-130c9f19d3fe/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200303165918-5bcca83a7881 h1:6bcQ/hWOMu5dXxMPcdxhx5uOoQBkeleqvbGdt4lh8hg=
+golang.org/x/tools v0.0.0-20200303165918-5bcca83a7881/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -775,14 +577,6 @@ google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -790,8 +584,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -801,7 +593,6 @@ google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRn
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
@@ -809,49 +600,19 @@ google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvx
 google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200715011427-11fb19a81f2c h1:6DWnZZ6EY/59QRRQttZKiktVL23UuQYs7uy75MhhLRM=
-google.golang.org/genproto v0.0.0-20200715011427-11fb19a81f2c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200303153909-beee998c1893 h1:OTjq5CN+5TpMIvzqxSFCjbBX3jNKjX0XOPi4SdBxQU8=
+google.golang.org/genproto v0.0.0-20200303153909-beee998c1893/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -873,8 +634,6 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -883,8 +642,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg=
 modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8=
 modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw=
--- a/internal/commands/commands.go
+++ b/internal/commands/commands.go
@@ -67,6 +67,6 @@ func initConfig() {
 // Execute the root cobra command
 func Execute() {
 	rootCmd.SetVersionTemplate(versionTemplate)
-	rootCmd.AddCommand(newWebCmd(), newMigrateCmd(), newTokenCmd(), newWorkerCmd())
+	rootCmd.AddCommand(newWebCmd(), newMigrateCmd(), newTokenCmd())
 	rootCmd.Execute()
 }
--- a/internal/commands/web.go
+++ b/internal/commands/web.go
@@ -36,24 +36,14 @@ func newWebCmd() *cobra.Command {
 				viper.GetString("database.host"),
 				viper.GetString("database.name"),
 			)
-			var db *sqlx.DB
-			var err error
-			retryNumber := 0
-			for i := 0; retryNumber <= 3; i++ {
-				retryNumber++
-				db, err = sqlx.Connect("postgres", connection)
-				if err == nil {
-					break
-				}
-				retryDuration := time.Duration(i*2) * time.Second
-				log.WithFields(log.Fields{"retryNumber": retryNumber, "retryDuration": retryDuration}).WithError(err).Error("issue connecting to database, retrying")
-				time.Sleep(retryDuration)
+			db, err := sqlx.Connect("postgres", connection)
+			if err != nil {
+				log.Panic(err)
 			}
 			db.SetMaxOpenConns(25)
 			db.SetMaxIdleConns(25)
 			db.SetConnMaxLifetime(5 * time.Minute)
 			defer db.Close()
-
 			if viper.GetBool("migrate") {
 				log.Info("running auto schema migrations")
 				if err = runMigration(db); err != nil {
@@ -75,9 +65,6 @@ func newWebCmd() *cobra.Command {
 	viper.SetDefault("database.name", "taskcafe")
 	viper.SetDefault("database.user", "taskcafe")
 	viper.SetDefault("database.password", "taskcafe_test")
-
-	viper.SetDefault("queue.broker", "amqp://guest:guest@localhost:5672/")
-	viper.SetDefault("queue.store", "memcache://localhost:11211")
 	return cc
 }

--- a/internal/commands/worker.go
+++ b/internal/commands/worker.go
@@ -1,83 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"time"
-
-	"github.com/RichardKnop/machinery/v1"
-	"github.com/RichardKnop/machinery/v1/config"
-	queueLog "github.com/RichardKnop/machinery/v1/log"
-	"github.com/jmoiron/sqlx"
-	repo "github.com/jordanknott/taskcafe/internal/db"
-	"github.com/jordanknott/taskcafe/internal/notification"
-	log "github.com/sirupsen/logrus"
-)
-
-func newWorkerCmd() *cobra.Command {
-	cc := &cobra.Command{
-		Use:   "worker",
-		Short: "Run the task queue worker",
-		Long:  "Run the task queue worker",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			Formatter := new(log.TextFormatter)
-			Formatter.TimestampFormat = "02-01-2006 15:04:05"
-			Formatter.FullTimestamp = true
-			log.SetFormatter(Formatter)
-			log.SetLevel(log.InfoLevel)
-
-			connection := fmt.Sprintf("user=%s password=%s host=%s dbname=%s sslmode=disable",
-				viper.GetString("database.user"),
-				viper.GetString("database.password"),
-				viper.GetString("database.host"),
-				viper.GetString("database.name"),
-			)
-			db, err := sqlx.Connect("postgres", connection)
-			if err != nil {
-				log.Panic(err)
-			}
-			db.SetMaxOpenConns(25)
-			db.SetMaxIdleConns(25)
-			db.SetConnMaxLifetime(5 * time.Minute)
-			defer db.Close()
-
-			var cnf = &config.Config{
-				Broker:        viper.GetString("queue.broker"),
-				DefaultQueue:  "machinery_tasks",
-				ResultBackend: viper.GetString("queue.store"),
-				AMQP: &config.AMQPConfig{
-					Exchange:     "machinery_exchange",
-					ExchangeType: "direct",
-					BindingKey:   "machinery_task",
-				},
-			}
-
-			log.Info("starting task queue server instance")
-			server, err := machinery.NewServer(cnf)
-			if err != nil {
-				// do something with the error
-			}
-			queueLog.Set(&notification.MachineryLogger{})
-			repo := *repo.NewRepository(db)
-			notification.RegisterTasks(server, repo)
-
-			worker := server.NewWorker("taskcafe_worker", 10)
-			log.Info("starting task queue worker")
-			err = worker.Launch()
-			if err != nil {
-				log.WithError(err).Error("error while launching ")
-				return err
-			}
-			return nil
-		},
-	}
-	viper.SetDefault("database.host", "127.0.0.1")
-	viper.SetDefault("database.name", "taskcafe")
-	viper.SetDefault("database.user", "taskcafe")
-	viper.SetDefault("database.password", "taskcafe_test")
-
-	viper.SetDefault("queue.broker", "amqp://guest:guest@localhost:5672/")
-	viper.SetDefault("queue.store", "memcache://localhost:11211")
-	return cc
-}
--- a/internal/db/models.go
+++ b/internal/db/models.go
@@ -16,22 +16,6 @@ type LabelColor struct {
 	Name         string    `json:"name"`
 }

-type Notification struct {
-	NotificationID       uuid.UUID `json:"notification_id"`
-	NotificationObjectID uuid.UUID `json:"notification_object_id"`
-	NotifierID           uuid.UUID `json:"notifier_id"`
-	Read                 bool      `json:"read"`
-}
-
-type NotificationObject struct {
-	NotificationObjectID uuid.UUID `json:"notification_object_id"`
-	EntityID             uuid.UUID `json:"entity_id"`
-	ActionType           int32     `json:"action_type"`
-	ActorID              uuid.UUID `json:"actor_id"`
-	EntityType           int32     `json:"entity_type"`
-	CreatedOn            time.Time `json:"created_on"`
-}
-
 type Organization struct {
 	OrganizationID uuid.UUID `json:"organization_id"`
 	CreatedAt      time.Time `json:"created_at"`
@@ -88,7 +72,6 @@ type Task struct {
 	Description sql.NullString `json:"description"`
 	DueDate     sql.NullTime   `json:"due_date"`
 	Complete    bool           `json:"complete"`
-	CompletedAt sql.NullTime   `json:"completed_at"`
 }

 type TaskAssigned struct {
@@ -157,5 +140,4 @@ type UserAccount struct {
 	Initials         string         `json:"initials"`
 	ProfileAvatarUrl sql.NullString `json:"profile_avatar_url"`
 	RoleCode         string         `json:"role_code"`
-	Bio              string         `json:"bio"`
 }
--- a/internal/db/notification.sql.go
+++ b/internal/db/notification.sql.go
@@ -1,177 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-// source: notification.sql
-
-package db
-
-import (
-	"context"
-	"time"
-
-	"github.com/google/uuid"
-)
-
-const createNotification = `-- name: CreateNotification :one
-INSERT INTO notification(notification_object_id, notifier_id)
-  VALUES ($1, $2) RETURNING notification_id, notification_object_id, notifier_id, read
-`
-
-type CreateNotificationParams struct {
-	NotificationObjectID uuid.UUID `json:"notification_object_id"`
-	NotifierID           uuid.UUID `json:"notifier_id"`
-}
-
-func (q *Queries) CreateNotification(ctx context.Context, arg CreateNotificationParams) (Notification, error) {
-	row := q.db.QueryRowContext(ctx, createNotification, arg.NotificationObjectID, arg.NotifierID)
-	var i Notification
-	err := row.Scan(
-		&i.NotificationID,
-		&i.NotificationObjectID,
-		&i.NotifierID,
-		&i.Read,
-	)
-	return i, err
-}
-
-const createNotificationObject = `-- name: CreateNotificationObject :one
-INSERT INTO notification_object(entity_type, action_type, entity_id, created_on, actor_id)
-  VALUES ($1, $2, $3, $4, $5) RETURNING notification_object_id, entity_id, action_type, actor_id, entity_type, created_on
-`
-
-type CreateNotificationObjectParams struct {
-	EntityType int32     `json:"entity_type"`
-	ActionType int32     `json:"action_type"`
-	EntityID   uuid.UUID `json:"entity_id"`
-	CreatedOn  time.Time `json:"created_on"`
-	ActorID    uuid.UUID `json:"actor_id"`
-}
-
-func (q *Queries) CreateNotificationObject(ctx context.Context, arg CreateNotificationObjectParams) (NotificationObject, error) {
-	row := q.db.QueryRowContext(ctx, createNotificationObject,
-		arg.EntityType,
-		arg.ActionType,
-		arg.EntityID,
-		arg.CreatedOn,
-		arg.ActorID,
-	)
-	var i NotificationObject
-	err := row.Scan(
-		&i.NotificationObjectID,
-		&i.EntityID,
-		&i.ActionType,
-		&i.ActorID,
-		&i.EntityType,
-		&i.CreatedOn,
-	)
-	return i, err
-}
-
-const getAllNotificationsForUserID = `-- name: GetAllNotificationsForUserID :many
-SELECT n.notification_id, n.notification_object_id, n.notifier_id, n.read FROM notification as n
-INNER JOIN notification_object as no ON no.notification_object_id = n.notification_object_id
-WHERE n.notifier_id = $1 ORDER BY no.created_on DESC
-`
-
-func (q *Queries) GetAllNotificationsForUserID(ctx context.Context, notifierID uuid.UUID) ([]Notification, error) {
-	rows, err := q.db.QueryContext(ctx, getAllNotificationsForUserID, notifierID)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var items []Notification
-	for rows.Next() {
-		var i Notification
-		if err := rows.Scan(
-			&i.NotificationID,
-			&i.NotificationObjectID,
-			&i.NotifierID,
-			&i.Read,
-		); err != nil {
-			return nil, err
-		}
-		items = append(items, i)
-	}
-	if err := rows.Close(); err != nil {
-		return nil, err
-	}
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-	return items, nil
-}
-
-const getEntityForNotificationID = `-- name: GetEntityForNotificationID :one
-SELECT no.created_on, no.entity_id, no.entity_type, no.action_type, no.actor_id FROM notification as n
-  INNER JOIN notification_object as no ON no.notification_object_id = n.notification_object_id
-WHERE n.notification_id = $1
-`
-
-type GetEntityForNotificationIDRow struct {
-	CreatedOn  time.Time `json:"created_on"`
-	EntityID   uuid.UUID `json:"entity_id"`
-	EntityType int32     `json:"entity_type"`
-	ActionType int32     `json:"action_type"`
-	ActorID    uuid.UUID `json:"actor_id"`
-}
-
-func (q *Queries) GetEntityForNotificationID(ctx context.Context, notificationID uuid.UUID) (GetEntityForNotificationIDRow, error) {
-	row := q.db.QueryRowContext(ctx, getEntityForNotificationID, notificationID)
-	var i GetEntityForNotificationIDRow
-	err := row.Scan(
-		&i.CreatedOn,
-		&i.EntityID,
-		&i.EntityType,
-		&i.ActionType,
-		&i.ActorID,
-	)
-	return i, err
-}
-
-const getEntityIDForNotificationID = `-- name: GetEntityIDForNotificationID :one
-SELECT no.entity_id FROM notification as n
-  INNER JOIN notification_object as no ON no.notification_object_id = n.notification_object_id
-WHERE n.notification_id = $1
-`
-
-func (q *Queries) GetEntityIDForNotificationID(ctx context.Context, notificationID uuid.UUID) (uuid.UUID, error) {
-	row := q.db.QueryRowContext(ctx, getEntityIDForNotificationID, notificationID)
-	var entity_id uuid.UUID
-	err := row.Scan(&entity_id)
-	return entity_id, err
-}
-
-const getNotificationForNotificationID = `-- name: GetNotificationForNotificationID :one
-SELECT n.notification_id, n.notification_object_id, n.notifier_id, n.read, no.notification_object_id, no.entity_id, no.action_type, no.actor_id, no.entity_type, no.created_on FROM notification as n
-  INNER JOIN notification_object as no ON no.notification_object_id = n.notification_object_id
-WHERE n.notification_id = $1
-`
-
-type GetNotificationForNotificationIDRow struct {
-	NotificationID         uuid.UUID `json:"notification_id"`
-	NotificationObjectID   uuid.UUID `json:"notification_object_id"`
-	NotifierID             uuid.UUID `json:"notifier_id"`
-	Read                   bool      `json:"read"`
-	NotificationObjectID_2 uuid.UUID `json:"notification_object_id_2"`
-	EntityID               uuid.UUID `json:"entity_id"`
-	ActionType             int32     `json:"action_type"`
-	ActorID                uuid.UUID `json:"actor_id"`
-	EntityType             int32     `json:"entity_type"`
-	CreatedOn              time.Time `json:"created_on"`
-}
-
-func (q *Queries) GetNotificationForNotificationID(ctx context.Context, notificationID uuid.UUID) (GetNotificationForNotificationIDRow, error) {
-	row := q.db.QueryRowContext(ctx, getNotificationForNotificationID, notificationID)
-	var i GetNotificationForNotificationIDRow
-	err := row.Scan(
-		&i.NotificationID,
-		&i.NotificationObjectID,
-		&i.NotifierID,
-		&i.Read,
-		&i.NotificationObjectID_2,
-		&i.EntityID,
-		&i.ActionType,
-		&i.ActorID,
-		&i.EntityType,
-		&i.CreatedOn,
-	)
-	return i, err
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jordan Knott	9214508ca2	feat: add pre commit hook to lint frontend & fix warnings	2020-08-23 17:27:32 -05:00
Jordan Knott	b6194d552f	refactor: update project name in tmuxinator	2020-08-23 15:38:20 -05:00