Merge branch 'master' of github.com:Human-Connection/Human-Connection into 399-user-profile-image-uploads

.github/ISSUE_TEMPLATE.md

@@ -5,7 +5,7 @@ before submitting a new issue. Following one of the issue templates will ensure
 Thanks!
 -->
 
-## Issue
+## 💬 Issue
 <!-- Describe your Issue in detail. -->
 
 <!-- Attach screenshots and drawings if needed. -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,8 @@
 ---
 name: 🐛 Bug report
 about: Create a report to help us improve
-
+labels: bug
+title: 🐛 [Bug] 
 ---
 
 ## :bug: Bugreport

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +1,12 @@
 ---
 name: 🚀 Feature request
 about: Suggest an idea for this project
-
+labels: feature
+title: 🚀 [Feature] 
 ---
 
 ## :rocket: Feature
-<!-- Describe the Feature. -->
+<!-- Describe the Feature. Use Screenshots if possible. -->
-
-
-### 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 prefered solution and alternatives you've considered
-<!-- A clear and concise description of what you want to happen.
-Are there any alternative solutions or features you've considered? -->
-
 
 ### Design & Layout
 <!-- Attach Screenshots and Drawings. -->

.github/ISSUE_TEMPLATE/question.md

@@ -1,6 +1,8 @@
 ---
 name: 💬 Question
 about: If you need help understanding HumanConnection.
+labels: question
+title: 💬 [Question] 
 ---
 <!-- Chat with Team HumanConnection -->
 <!-- If you need an answer right away, visit the HumanConnection Discord:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,27 +1,12 @@
-## Pullrequest
+## 🍰 Pullrequest
-<!-- Describe the Pullrequest. -->
+<!-- Describe the Pullrequest. Use Screenshots if possible. -->
 
 ### Issues
 <!-- Which Issues does this fix, which are related?
 - fixes #XXX
 - relates #XXX
 -->
-- [X] None
+- None
-
-### Checklist
-<!-- Anything important to be thought of when deploying?
-- [ ] Env-Variables adjustment needed
-- [ ] Breaking/critical change
--->
-- [X] None
-
-### How2Test
-<!-- Give a detailed description how to test your PR and confirm it is working as expected. -->
-<!-- Maintainers will check the Tests
-- [ ] Test1
-- [ ] Test2
--->
-- [X] None
 
 ### Todo
 <!-- In case some parts are still missing, list them here. -->

package.json

@@ -21,7 +21,7 @@
   "devDependencies": {
     "codecov": "^3.5.0",
     "cross-env": "^5.2.0",
-    "cypress": "^3.2.0",
+    "cypress": "^3.3.0",
     "cypress-cucumber-preprocessor": "^1.11.2",
     "cypress-plugin-retries": "^1.2.1",
     "dotenv": "^8.0.0",

webapp/components/Category/index.vue

@@ -13,7 +13,7 @@ export default {
   name: 'HcCategory',
   props: {
     icon: { type: String, required: true },
-    name: { type: String, required: true }
+    name: { type: String, default: '' }
   }
 }
 </script>

webapp/components/PostCard/index.vue

@@ -1,73 +1,76 @@
 <template>
   <ds-card
-    :header="post.title"
     :image="post.image"
     :class="{'post-card': true, 'disabled-content': post.disabled}"
   >
+    <!-- Post Link Target -->
     <nuxt-link
       class="post-link"
       :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
     >
       {{ post.title }}
     </nuxt-link>
-    <!-- eslint-disable vue/no-v-html -->
+    <ds-space margin-bottom="small" />
-    <!-- TODO: replace editor content with tiptap render view -->
+    <!-- Username, Image & Date of Post -->
-    <ds-space margin-bottom="large">
+    <div>
-      <div
-        class="hc-editor-content"
-        v-html="excerpt"
-      />
-    </ds-space>
-    <!-- eslint-enable vue/no-v-html -->
-    <ds-space>
-      <ds-text
-        v-if="post.createdAt"
-        align="right"
-        size="small"
-        color="soft"
-      >
-        {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
-      </ds-text>
-    </ds-space>
-    <ds-space
-      margin="small"
-      style="position: absolute; bottom: 44px;"
-    >
-      <!-- TODO: find better solution for rendering errors -->
       <no-ssr>
         <hc-user
           :user="post.author"
           :trunc="35"
+          :date-time="post.createdAt"
         />
       </no-ssr>
-    </ds-space>
+      <hc-ribbon :text="$t('post.name')" />
+    </div>
+    <ds-space margin-bottom="small" />
+    <!-- Post Title -->
+    <ds-heading
+      tag="h3"
+      no-margin
+    >
+      {{ post.title }}
+    </ds-heading>
+    <ds-space margin-bottom="small" />
+    <!-- Post Content Excerpt -->
+    <!-- eslint-disable vue/no-v-html -->
+    <!-- TODO: replace editor content with tiptap render view -->
+    <div
+      class="hc-editor-content"
+      v-html="excerpt"
+    />
+    <!-- eslint-enable vue/no-v-html -->
+    <!-- Footer o the Post -->
     <template slot="footer">
       <div style="display: inline-block; opacity: .5;">
-        <ds-icon
+        <!-- Categories -->
+        <hc-category
           v-for="category in post.categories"
           :key="category.id"
           v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
-          :name="category.icon"
+          :icon="category.icon"
-        />&nbsp;
+        />
       </div>
-      <div style="display: inline-block; float: right">
+      <no-ssr>
-        <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
+        <div style="display: inline-block; float: right">
-          <ds-icon name="bullhorn" />
+          <!-- Shouts Count -->
-          <small>{{ post.shoutedCount }}</small>
+          <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
-        </span>
+            <ds-icon name="bullhorn" />
-        &nbsp;
+            <small>{{ post.shoutedCount }}</small>
-        <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
+          </span>
-          <ds-icon name="comments" />
+          &nbsp;
-          <small>{{ post.commentsCount }}</small>
+          <!-- Comments Count -->
-        </span>
+          <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
-        <no-ssr>
+            <ds-icon name="comments" />
+            <small>{{ post.commentsCount }}</small>
+          </span>
+          <!-- Menu -->
           <content-menu
             resource-type="contribution"
             :resource="post"
             :is-owner="isAuthor"
           />
-        </no-ssr>
+        </div>
-      </div>
+      </no-ssr>
     </template>
   </ds-card>
 </template>
@@ -75,13 +78,17 @@
 <script>
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
-import { randomBytes } from 'crypto'
+import HcCategory from '~/components/Category'
+import HcRibbon from '~/components/Ribbon'
+// import { randomBytes } from 'crypto'
 import { mapGetters } from 'vuex'
 
 export default {
   name: 'HcPostCard',
   components: {
     HcUser,
+    HcCategory,
+    HcRibbon,
     ContentMenu
   },
   props: {

webapp/components/Ribbon/index.spec.js

@@ -0,0 +1,37 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import Ribbon from './index'
+
+const localVue = createLocalVue()
+
+describe('Ribbon', () => {
+  let text
+
+  let Wrapper = () => {
+    return shallowMount(Ribbon, {
+      localVue,
+      propsData: {
+        text
+      }
+    })
+  }
+
+  describe('given String for Text', () => {
+    beforeEach(() => {
+      text = 'Peter Pan'
+    })
+
+    it('shows Text', () => {
+      expect(Wrapper().text()).toContain('Peter Pan')
+    })
+  })
+
+  describe('given no String for Text', () => {
+    beforeEach(() => {
+      text = undefined
+    })
+
+    it('shows empty Text', () => {
+      expect(Wrapper().text()).toContain('')
+    })
+  })
+})

webapp/components/Ribbon/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="ribbon">
+    <small>{{ text }}</small>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HcRibbon',
+  props: {
+    text: {
+      type: String,
+      default: ''
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.ribbon {
+  $card-shadow: 0px 12px 26px -4px rgba(0, 0, 0, 0.1);
+  //position: absolute;
+  position: relative;
+  right: -31px;
+  top: -31px;
+
+  font-size: 0.9em;
+  font-weight: bold;
+  padding: 6px 6px;
+  color: #fff;
+  background-color: $background-color-secondary-active;
+  float: right;
+  border-radius: 2px 0 0 2px;
+  box-shadow: $card-shadow;
+  z-index: 11;
+  // border:           1px solid #ccc;
+  &:before {
+    content: ' ';
+    position: absolute;
+    width: 0;
+    height: 0;
+    right: 0;
+    bottom: -6px;
+    border-width: 3px 4px 3px 3px;
+    border-style: solid;
+    border-color: $background-color-secondary transparent transparent
+      $background-color-secondary;
+  }
+}
+</style>

webapp/components/User/index.vue

@@ -55,7 +55,7 @@
             style="display: inline;"
           >
             <ds-text
-              align="right"
+              align="left"
               size="small"
               color="soft"
             >

webapp/locales/de.json

@@ -135,6 +135,14 @@
     "takeAction": {
       "name": "Aktiv werden"
     },
+    "delete": {
+      "submit": "Löschen",
+      "cancel": "Abbrechen",
+      "success": "Beitrag erfolgreich gelöscht",
+      "title": "Beitrag löschen",
+      "type": "Beitrag",
+      "message": "Möchtest Du wirklich den Beitrag \"<b>{name}</b>\" löschen?"
+    },
     "comment": {
       "submit": "Kommentiere",
       "submitted": "Kommentar Gesendet"

webapp/package.json

@@ -70,8 +70,8 @@
     "nuxt-env": "~0.1.0",
     "stack-utils": "^1.0.2",
     "string-hash": "^1.1.3",
-    "tiptap": "1.19.3",
+    "tiptap": "1.19.8",
-    "tiptap-extensions": "1.19.4",
+    "tiptap-extensions": "1.19.8",
     "v-tooltip": "~2.0.2",
     "vue-count-to": "~1.0.13",
     "vue-izitoast": "1.1.2",

webapp/pages/post/_id/_slug/index.vue

@@ -70,30 +70,6 @@
         :is-shouted="post.shoutedByCurrentUser"
         :post-id="post.id"
       />
-      <!-- Categories -->
-      <ds-icon
-        v-for="category in post.categories"
-        :key="category.id"
-        v-tooltip="{content: category.name, placement: 'top-start', delay: { show: 300 }}"
-        :name="category.icon"
-        size="large"
-      />&nbsp;
-      <ds-space margin-bottom="small" />
-      <!-- Tags -->
-      <template v-if="post.tags && post.tags.length">
-        <ds-space margin="xx-small" />
-        <div class="tags">
-          <ds-icon name="tags" />
-          <ds-tag
-            v-for="tag in post.tags"
-            :key="tag.id"
-          >
-            <ds-icon name="tag" />
-            {{ tag.name }}
-          </ds-tag>
-        </div>
-      </template>
-      <ds-space margin="small" />
       <!-- Comments -->
       <ds-section slot="footer">
         <hc-comment-list :post="post" />

webapp/yarn.lock

@@ -8784,10 +8784,10 @@ prosemirror-history@^1.0.4:
     prosemirror-transform "^1.0.0"
     rope-sequence "^1.2.0"
 
-prosemirror-inputrules@^1.0.2:
+prosemirror-inputrules@^1.0.4:
-  version "1.0.2"
+  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.2.tgz#3e53af6ea3738fd36e1fe3aff5f57d0b395baa6b"
+  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz#8ae84d9c147abb448b86063ff422e801c4b1658d"
-  integrity sha512-TQc+uPF7Zw9efcQCN8eRRtX0tvUk1ArQshKwSs3nmBQA0IU3qs8jsfrduocwAlf3FPHaJifre8D2fJH4yDOx3A==
+  integrity sha512-RhuBghqUgYWm8ai/P+k1lMl1ZGvt6Cs3Xeur8oN0L1Yy+Z5GmsTp3fT8RVl+vJeGkItEAxAit9Qh7yZxixX7rA==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
@@ -8846,10 +8846,15 @@ prosemirror-utils@^0.8.1:
   resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.1.tgz#a9cb9f5ce292dc20c21ec996af02879651395a65"
   integrity sha512-u1tCdkj4I5T7sBmL6IvBAnH8p0a//vJ2N3g7pVKbfxPVDQ7gcC9UibbPijpvhb6PALxX/oeccvo+PJXHm6j4vA==
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.5:
+prosemirror-utils@^0.8.2:
-  version "1.9.5"
+  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.5.tgz#4c707c144bdd4d5209e5e92697108b854e0a2138"
+  resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.2.tgz#e0e4a47cd45b1cff3d84464446d9f92adf4a558b"
-  integrity sha512-062RMNDpof3SHgfTbJS6pVycdEaVgP1IGqdVLangZb0iwgb7yNZ8C5BPG+Is8GoEk3H5d9uZ0c6FskAA08gR3g==
+  integrity sha512-jNIj3/eREx4x2FU6pFEUDmdVmtoRBuLA6JTjgNum/84Nf+Ns+Y9l0Q//R8EL/Qm/5J5xTg5/s+hmQkXaHY+ilA==
+
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.6:
+  version "1.9.6"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.6.tgz#8bf508b0e2d176cb7a80a2a7882d3cb3749ab4e9"
+  integrity sha512-b4yBGeq9jvmW+rvC48fjHL4+9zyT/6NSuaACT4bcL8LuLHYzb6KSSZaZ5v27oUPt2DXIYv3Nl/YoUxJa7r8ciA==
   dependencies:
     prosemirror-model "^1.1.0"
     prosemirror-state "^1.0.0"
@@ -10299,22 +10304,24 @@ tippy.js@^4.3.1:
   dependencies:
     popper.js "^1.14.7"
 
-tiptap-commands@^1.10.3:
+tiptap-commands@^1.10.4, tiptap-commands@^1.10.5:
-  version "1.10.3"
+  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.3.tgz#e251712a2ee06ae50595196d7f6a51881da2d0e3"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.5.tgz#e897b59debdddcbc20f8289c92f9e39c5d22e19a"
-  integrity sha512-qsbRr39439ZrEFJ2C9fvwnC7u9e+eWBFkb28wgRKTe5AQVlKxXA6+MF8Zm6Goz/2wxrkj2ECGf2a3rlYWRDE2Q==
+  integrity sha512-4OTdcf8IIDyd/CrRvJLfQpYaw+SGIuUJmwDDpxNCbcqnpHFsO1IkWdmV3loRab6Adg1UBNxeUKA8//nzpdJcUQ==
   dependencies:
     prosemirror-commands "^1.0.8"
-    prosemirror-inputrules "^1.0.2"
+    prosemirror-inputrules "^1.0.4"
     prosemirror-model "^1.7.0"
     prosemirror-schema-list "^1.0.3"
     prosemirror-state "^1.2.3"
-    tiptap-utils "^1.5.2"
+    prosemirror-tables "^0.8.0"
+    prosemirror-utils "^0.8.2"
+    tiptap-utils "^1.5.3"
 
-tiptap-extensions@1.19.4:
+tiptap-extensions@1.19.8:
-  version "1.19.4"
+  version "1.19.8"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.4.tgz#8b0deb0d7262899efe001b72b4f0ac11c6b72bcd"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.8.tgz#06ef310a08ad658db63b78947c9dd072ec5ca008"
-  integrity sha512-JXryshgHgT4jxjaOpvUg+qjExNan+5t3PkIJgvduCBI4v31Qs6U+LoLJHpRj4OgvVHzmwOXgwXYeIsyMBIw9nw==
+  integrity sha512-5bwqeBJtXqK1zpKiXQK72j2tblsT9NB4KEtQCLhY8M4MsSWd+H7JXfxci+R8HWO2SqnOQwd6GvuyPsq9h7cQQg==
   dependencies:
     lowlight "^1.11.0"
     prosemirror-collab "^1.1.1"
@@ -10324,35 +10331,35 @@ tiptap-extensions@1.19.4:
     prosemirror-tables "^0.8.0"
     prosemirror-transform "^1.1.3"
     prosemirror-utils "^0.8.1"
-    prosemirror-view "^1.9.5"
+    prosemirror-view "^1.9.6"
-    tiptap "^1.19.3"
+    tiptap "^1.19.7"
-    tiptap-commands "^1.10.3"
+    tiptap-commands "^1.10.4"
 
-tiptap-utils@^1.5.2:
+tiptap-utils@^1.5.3:
-  version "1.5.2"
+  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.5.2.tgz#6a2c459c4bcc2c3f4d14c31601cc41fe49b88311"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.5.3.tgz#7d4518a84eb6bfb10c98b19c901ca59123865f61"
-  integrity sha512-Upw5ImtgzkrcNnKh6T+IwER8HZWOkposST5GnT07AjnyKddbn2yYCH9xxSODzao66pu0PhlwSoCR+9mXs3Tb6Q==
+  integrity sha512-025uF1acJ7jLuA9dnKIxp8TQelyQ0uJqtT1jlziT8UslwZT5pKzwDsNkadFbnEBp6O9wfLZH0TuUtAUDmuq0VA==
   dependencies:
     prosemirror-model "^1.7.0"
     prosemirror-state "^1.2.3"
     prosemirror-tables "^0.8.0"
-    prosemirror-utils "^0.8.1"
+    prosemirror-utils "^0.8.2"
 
-tiptap@1.19.3, tiptap@^1.19.3:
+tiptap@1.19.8, tiptap@^1.19.7:
-  version "1.19.3"
+  version "1.19.8"
-  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.3.tgz#7deaab8099fa40e845b2fecab7eb15f42b54add1"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.8.tgz#9f140e3a533667e381701235fde672b7117e39a2"
-  integrity sha512-4QlYLgf8+KcXn2zyw4cc61aB6KM2b3Fb06HgrEFKyjxIuqFsNo4LsELnkr7uYI0huJuW/H1+gbZUnesJxfhOHw==
+  integrity sha512-cVxPaIBcNYDu1IsHrBUsMi8bRonRVLOG6XsnlmSy7/O/Ce5Ne4xuGaMEw5D+foShLcx5q8ldIKhLACZfnnJm7Q==
   dependencies:
     prosemirror-commands "^1.0.8"
     prosemirror-dropcursor "^1.1.1"
     prosemirror-gapcursor "^1.0.3"
-    prosemirror-inputrules "^1.0.2"
+    prosemirror-inputrules "^1.0.4"
     prosemirror-keymap "^1.0.1"
     prosemirror-model "^1.7.0"
     prosemirror-state "^1.2.3"
-    prosemirror-view "^1.9.5"
+    prosemirror-view "^1.9.6"
-    tiptap-commands "^1.10.3"
+    tiptap-commands "^1.10.5"
-    tiptap-utils "^1.5.2"
+    tiptap-utils "^1.5.3"
 
 tmp@^0.0.33:
   version "0.0.33"

yarn.lock

@@ -832,6 +832,11 @@ aproba@^1.0.3:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+arch@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
+  integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -951,12 +956,12 @@ async-each@^1.0.0, async-each@^1.0.1:
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
   integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
 
-async@2.4.0:
+async@2.6.1:
-  version "2.4.0"
+  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.0.tgz#4990200f18ea5b837c2cc4f8c031a6985c385611"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
-    lodash "^4.14.0"
+    lodash "^4.17.10"
 
 asynckit@^0.4.0:
   version "0.4.0"
@@ -1815,25 +1820,26 @@ cypress-plugin-retries@^1.2.1:
   resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.2.1.tgz#0ae296e41c00c1aa1c2da83750e84c8a684e1c6b"
   integrity sha512-iZ00NmeVfHleZ6fcDvzoUr2vPpCm+fzqzHpUF5ceY0PEJRs8BzdmIN/4AVUwLTDYdb3F1B8qK+s3GSoGe2WPQQ==
 
-cypress@^3.2.0:
+cypress@^3.3.0:
-  version "3.2.0"
+  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.2.0.tgz#c2d5befd5077dab6fb52ad70721e0868ac057001"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.3.0.tgz#d8bc261a8ae2444bde7c9a70e077236f91b897bc"
-  integrity sha512-PN0wz6x634QyNL56/voTzJoeScDfwtecvSfFTHfv5MkHuECVSR4VQcEZTvYtKWln3CMBMUkWbBKPIwwu2+a/kw==
+  integrity sha512-v/zMPfGe8NdMUUQRx3QyfYbZoIBxJMAFvRzwpTtctq0L01YRFSGQ4exAUbjGvUyhSJk4j6kR29HetIb29TMxXw==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"
+    arch "2.1.1"
     bluebird "3.5.0"
     cachedir "1.3.0"
     chalk "2.4.2"
     check-more-types "2.24.0"
     commander "2.15.1"
     common-tags "1.8.0"
-    debug "3.1.0"
+    debug "3.2.6"
     execa "0.10.0"
     executable "4.1.1"
     extract-zip "1.6.7"
     fs-extra "4.0.1"
-    getos "3.1.0"
+    getos "3.1.1"
     glob "7.1.3"
     is-ci "1.2.1"
     is-installed-globally "0.1.0"
@@ -1847,7 +1853,7 @@ cypress@^3.2.0:
     request "2.88.0"
     request-progress "0.4.0"
     supports-color "5.5.0"
-    tmp "0.0.33"
+    tmp "0.1.0"
     url "0.11.0"
     yauzl "2.10.0"
 
@@ -1887,12 +1893,12 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0:
+debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
-  version "3.1.0"
+  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
-    ms "2.0.0"
+    ms "^2.1.1"
 
 debug@4.0.1:
   version "4.0.1"
@@ -1901,13 +1907,6 @@ debug@4.0.1:
   dependencies:
     ms "^2.1.1"
 
-debug@^3.0.1, debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -2472,12 +2471,12 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getos@3.1.0:
+getos@3.1.1:
-  version "3.1.0"
+  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.0.tgz#db3aa4df15a3295557ce5e81aa9e3e5cdfaa6567"
+  resolved "https://registry.yarnpkg.com/getos/-/getos-3.1.1.tgz#967a813cceafee0156b0483f7cffa5b3eff029c5"
-  integrity sha512-i9vrxtDu5DlLVFcrbqUqGWYlZN/zZ4pGMICCAcZoYsX3JA54nYp8r5EThw5K+m2q3wszkx4Th746JstspB0H4Q==
+  integrity sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==
   dependencies:
-    async "2.4.0"
+    async "2.6.1"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -3260,7 +3259,7 @@ lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash@4.17.11, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
+lodash@4.17.11, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
@@ -3743,7 +3742,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -4223,7 +4222,7 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rimraf@^2.6.1:
+rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
@@ -4735,12 +4734,12 @@ title-case@^2.1.1:
     no-case "^2.2.0"
     upper-case "^1.0.3"
 
-tmp@0.0.33:
+tmp@0.1.0:
-  version "0.0.33"
+  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
   dependencies:
-    os-tmpdir "~1.0.2"
+    rimraf "^2.6.3"
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"