Merge pull request #53 from NordyVlasman/develop

NordyVlasman · Jun 20, 2021 · 802c0c9 · 802c0c9 · vercel · Jun 20, 2021
2 parents 2f04b02 + bd054c0
commit 802c0c9
Show file tree

Hide file tree

Showing 40 changed files with 52 additions and 195 deletions.
diff --git a/.env.example b/.env.example
@@ -0,0 +1,2 @@
+BASE_URL=
+SENTRY_DSN=
diff --git a/assets/README.md b/assets/README.md
diff --git a/components/Logo.vue b/components/Logo.vue
diff --git a/components/README.md b/components/README.md
diff --git a/components/Block.vue → components/post/BlockRenderer.vue b/components/Block.vue → components/post/BlockRenderer.vue
diff --git a/components/PostCard.vue → components/post/PostCard.vue b/components/PostCard.vue → components/post/PostCard.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import SkillTag from '~/components/SkillTag'
+import SkillTag from '~/components/skill/SkillTag'
 
 export default {
   components: { SkillTag },

diff --git a/components/SkillTag.vue → components/skill/SkillTag.vue b/components/SkillTag.vue → components/skill/SkillTag.vue
diff --git a/graphql/login.gql → graphql/auth/login.gql b/graphql/login.gql → graphql/auth/login.gql
diff --git a/graphql/register.gql → graphql/auth/register.gql b/graphql/register.gql → graphql/auth/register.gql
diff --git a/graphql/createCommentMutation.gql → graphql/comment/createCommentMutation.gql b/graphql/createCommentMutation.gql → graphql/comment/createCommentMutation.gql
diff --git a/graphql/upvoteCommentMutation.gql → graphql/comment/upvoteCommentMutation.gql b/graphql/upvoteCommentMutation.gql → graphql/comment/upvoteCommentMutation.gql
diff --git a/graphql/createPost.gql → graphql/post/createPost.gql b/graphql/createPost.gql → graphql/post/createPost.gql
diff --git a/graphql/dislikePost.gql → graphql/post/dislikePost.gql b/graphql/dislikePost.gql → graphql/post/dislikePost.gql
diff --git a/graphql/likePost.gql → graphql/post/likePost.gql b/graphql/likePost.gql → graphql/post/likePost.gql
diff --git a/graphql/post.gql → graphql/post/post.gql b/graphql/post.gql → graphql/post/post.gql
diff --git a/graphql/posts.gql → graphql/post/posts.gql b/graphql/posts.gql → graphql/post/posts.gql
diff --git a/graphql/getProductsForDropdown.gql → graphql/product/getProductsForDropdown.gql b/graphql/getProductsForDropdown.gql → graphql/product/getProductsForDropdown.gql
diff --git a/graphql/getSkillForDropdown.gql → graphql/skill/getSkillForDropdown.gql b/graphql/getSkillForDropdown.gql → graphql/skill/getSkillForDropdown.gql
diff --git a/graphql/getUser.gql → graphql/user/getUser.gql b/graphql/getUser.gql → graphql/user/getUser.gql
diff --git a/graphql/roles.gql → graphql/user/roles.gql b/graphql/roles.gql → graphql/user/roles.gql
diff --git a/graphql/users.gql → graphql/user/users.gql b/graphql/users.gql → graphql/user/users.gql
diff --git a/layouts/README.md b/layouts/README.md
diff --git a/middleware/README.md b/middleware/README.md
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -26,9 +26,7 @@ export default {
     '@nuxtjs/moment',
   ],
 
-  modules: ['@nuxtjs/axios', '@nuxtjs/pwa', '@nuxtjs/apollo', '@nuxtjs/sentry'],
-
-  axios: {},
+  modules: ['@nuxtjs/pwa', '@nuxtjs/apollo', '@nuxtjs/sentry'],
 
   loading: {
     color: 'black',
@@ -52,11 +50,7 @@ export default {
   },
 
   sentry: {
-    dsn: 'https://[email protected]/5803851',
-    config: {
-      // Add native Sentry config here
-      // https://docs.sentry.io/platforms/javascript/guides/vue/configuration/options/
-    },
+    dsn: process.env.SENTRY_DSN,
   },
 
   pwa: {

diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
     "jest": "^26.6.3",
     "postcss": "^8.2.8",
     "prettier": "^2.2.1",
-    "vue-jest": "^3.0.4"
+    "vue-jest": "^3.0.4",
+    "vuex": "^3.6.2"
   }
 }
diff --git a/pages/README.md b/pages/README.md
diff --git a/pages/auth/login.vue b/pages/auth/login.vue
@@ -23,9 +23,7 @@
               rounded-md
               shadow-sm
               appearance-none
-              focus:outline-none
-              focus:ring-gray-900
-              focus:border-gray-900
+              focus:outline-none focus:ring-gray-900 focus:border-gray-900
               sm:text-sm
             "
           />
@@ -54,9 +52,7 @@
               rounded-md
               shadow-sm
               appearance-none
-              focus:outline-none
-              focus:ring-gray-900
-              focus:border-gray-900
+              focus:outline-none focus:ring-gray-900 focus:border-gray-900
               sm:text-sm
             "
           />
@@ -107,7 +103,9 @@
             shadow-sm
             hover:bg-gray-700
             focus:outline-none
-            focus:ring-2 focus:ring-offset-2 focus:ring-gray-900
+            focus:ring-2
+            focus:ring-offset-2
+            focus:ring-gray-900
           "
           @click="login"
         >
@@ -118,7 +116,7 @@
   </div>
 </template>
 <script>
-import LoginMutation from '@/graphql/login.gql'
+import LoginMutation from '@/graphql/auth/login.gql'
 
 export default {
   layout: 'auth',

diff --git a/pages/auth/register.vue b/pages/auth/register.vue
@@ -148,8 +148,8 @@
   </div>
 </template>
 <script>
-import RolesQuery from '@/graphql/roles.gql'
-import RegisterMutation from '@/graphql/register.gql'
+import RolesQuery from '@/graphql/user/roles.gql'
+import RegisterMutation from '@/graphql/auth/register.gql'
 
 export default {
   layout: 'auth',

diff --git a/pages/index.vue b/pages/index.vue
@@ -18,12 +18,12 @@
 
 <script>
 import { mapState } from 'vuex'
-import PostCard from '~/components/PostCard'
+import PostCard from '~/components/post/PostCard'
 
 export default {
   components: { PostCard },
   middleware: 'authenticated',
-  async fetch({ store, params }) {
+  async fetch({ store }) {
     await store.dispatch('post/FETCH_POSTS')
   },
   computed: {

diff --git a/pages/post/_slug.vue b/pages/post/_slug.vue
@@ -212,18 +212,17 @@
 
 <script>
 import { mapState } from 'vuex'
-import LikeMutation from '@/graphql/likePost.gql'
-import DislikeMutation from '@/graphql/dislikePost.gql'
-import UpvoteCommentMutation from '@/graphql/upvoteCommentMutation.gql'
-import CommentMutation from '@/graphql/createCommentMutation.gql'
+import LikeMutation from '@/graphql/post/likePost.gql'
+import DislikeMutation from '@/graphql/post/dislikePost.gql'
+import UpvoteCommentMutation from '@/graphql/comment/upvoteCommentMutation.gql'
+import CommentMutation from '@/graphql/comment/createCommentMutation.gql'
 import HeartIcon from '~/components/HeartIcon'
 import UpvoteIcon from '~/components/UpvoteIcon'
 import DownvoteIcon from '~/components/DownvoteIcon'
-import BlockRenderer from '~/components/Block'
-import SkillTag from '~/components/SkillTag'
+import BlockRenderer from '~/components/post/BlockRenderer'
+import SkillTag from '~/components/skill/SkillTag'
 
 export default {
-  // eslint-disable-next-line vue/no-unused-components
   components: { BlockRenderer, HeartIcon, UpvoteIcon, DownvoteIcon, SkillTag },
   data() {
     return {

diff --git a/pages/post/create.vue b/pages/post/create.vue
@@ -80,6 +80,7 @@
                             <img
                               v-if="image"
                               :src="image"
+                              alt="cover"
                               class="
                                 filter
                                 group
@@ -88,10 +89,8 @@
                                 z-0
                                 cursor-pointer
                               "
-                              placeholder="Verwijderen"
                               @click="image = null"
                             />
-                            <!--                            <div class="absolute inset-0 bg-cover bg-center z-0 filter hover:blur-sm" style="background-image: url('https://upload.wikimedia.org/wikipedia/en/3/3c/JumanjiTheNextLevelTeaserPoster.jpg')"></div>-->
                           </div>
                           <div v-if="!image" class="space-y-1 text-center">
                             <div
@@ -120,10 +119,10 @@
                                   focus-within:ring-indigo-500
                                 "
                               >
-                                <div class="flex items-center gap-x-1.5">
+                                <span class="flex items-center gap-x-1.5">
                                   <UploadIcon />
                                   <span>Upload cover afbeelding</span>
-                                </div>
+                                </span>
                                 <input
                                   id="file-upload"
                                   name="file-upload"
@@ -201,7 +200,7 @@
                             :max="3"
                             :options="options.map((option) => option.id)"
                             :custom-label="
-                              (opt) => options.find((x) => x.id == opt).name
+                              (opt) => options.find((x) => x.id === opt).name
                             "
                             :taggable="true"
                           ></multiselect>
@@ -234,7 +233,7 @@
                             :options="productOptions.map((option) => option.id)"
                             :custom-label="
                               (opt) =>
-                                productOptions.find((x) => x.id == opt).name
+                                productOptions.find((x) => x.id === opt).name
                             "
                             :taggable="true"
                           ></multiselect>
@@ -312,8 +311,8 @@
   </div>
 </template>
 <script>
-import SkillQuery from '@/graphql/getSkillForDropdown.gql'
-import ProductQuery from '@/graphql/getProductsForDropdown.gql'
+import SkillQuery from '@/graphql/skill/getSkillForDropdown.gql'
+import ProductQuery from '@/graphql/product/getProductsForDropdown.gql'
 import EditorJS from '@editorjs/editorjs'
 import Header from '@editorjs/header'
 import Paragraph from 'editorjs-paragraph-with-alignment'
@@ -429,7 +428,6 @@ export default {
       // eslint-disable-next-line no-undef
       editor.save().then((savedData) => {
         payload.body = JSON.stringify(savedData)
-        console.log(payload.body)
         payload.slug = this.slug
         this.$store.dispatch('post/CREATE_POST', payload).then(() => {
           this.$router.push('/')

diff --git a/pages/user/list.vue b/pages/user/list.vue
@@ -36,12 +36,12 @@
 
 <script>
 import { mapState } from 'vuex'
-import SkillTag from '~/components/SkillTag'
+import SkillTag from '~/components/skill/SkillTag'
 
 export default {
   components: { SkillTag },
   middleware: 'authenticated',
-  async fetch({ store, params }) {
+  async fetch({ store }) {
     await store.dispatch('user/FETCH_USERS')
   },
   computed: {

diff --git a/pages/user/profile.vue b/pages/user/profile.vue
@@ -1,7 +1,10 @@
 <template>
-
+  <div class="mt-1">
+    <h1 class="text-2xl font-light text-black dark:text-gray-300">
+      <span class="font-bold">Sorry!</span> Deze pagina is nog niet klaar
+    </h1>
+  </div>
 </template>
-
 <script>
-
-</script>
+export default {}
+</script>
diff --git a/pages/user/settings.vue b/pages/user/settings.vue
@@ -1,13 +1,10 @@
 <template>
-	<div>
-
-	</div>
+  <div class="mt-1">
+    <h1 class="text-2xl font-light text-black dark:text-gray-300">
+      <span class="font-bold">Sorry!</span> Deze pagina is nog niet klaar
+    </h1>
+  </div>
 </template>
-
 <script>
-
-export default {
-
-}
-
-</script>
+export default {}
+</script>
diff --git a/plugins/README.md b/plugins/README.md