From df246af3bbf2ad1786ef31a9fce13364143f6937 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Wed, 20 May 2020 23:35:39 -0400
Subject: [PATCH] fix: remove makefile + update nvmrc version

---
 .nvmrc                                       |  2 +-
 Makefile                                     | 59 --------------------
 client/components/admin/admin-extensions.vue |  2 +-
 server/graph/schemas/comment.graphql         | 31 +++++++++-
 4 files changed, 32 insertions(+), 62 deletions(-)
 delete mode 100644 Makefile

diff --git a/.nvmrc b/.nvmrc
index f0da0944..0c6886ca 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v10.16.0
+v12.16.3
diff --git a/Makefile b/Makefile
deleted file mode 100644
index eacb617f..00000000
--- a/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-SHELL := /bin/bash
-DEVDB := postgres
-
-start: ## Start Wiki.js in production mode
-	node wiki start
-
-stop: ## Stop Wiki.js
-	node wiki stop
-
-restart: ## Restart Wiki.js
-	node wiki restart
-
-dev-up: ## Start Wiki.js in development mode
-	node wiki dev
-
-build: ## Build Wiki.js client assets
-	webpack --profile --config dev/webpack/webpack.prod.js
-
-watch: ## Watch client files and rebuild assets on changes
-	webpack --config dev/webpack/webpack.dev.js
-
-test: ## Run code linting tests
-	eslint --format codeframe --ext .js,.vue .
-	pug-lint server/views && jest
-
-docker-dev-up: ## Run dockerized dev environment
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . up -d --remove-orphans
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec wiki yarn dev
-
-docker-dev-down: ## Shutdown dockerized dev environment
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . down --remove-orphans
-
-docker-dev-rebuild: ## Rebuild dockerized dev image
-	rm -rf ./node_modules
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . build --no-cache --force-rm
-
-docker-dev-clean: ## Clean DB and data folders
-	rm -rf ./data
-	[[ "${DEVDB}" == "postgres" ]] && docker-compose -f ./dev/docker-postgres/docker-compose.yml -p wiki --project-directory . exec db psql --dbname=wiki --username=wikijs --command='DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public' || true
-	[[ "${DEVDB}" == "mysql" || "${DEVDB}" == "mariadb" ]] && docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec db mysql -uroot -p'wikijsrocks' -e 'DROP SCHEMA IF EXISTS wiki; CREATE SCHEMA wiki;' || true
-	[[ "${DEVDB}" == "mssql" ]] && docker-compose -f ./dev/docker-mssql/docker-compose.yml -p wiki --project-directory . exec db /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'W1kiJSR0cks!' -Q 'DROP DATABASE IF EXISTS wiki; CREATE DATABASE wiki;' || true
-	[[ "${DEVDB}" == "sqlite" ]] && docker-compose -f ./dev/docker-sqlite/docker-compose.yml -p wiki --project-directory . exec wiki rm -rf /wiki/db.sqlite || true
-
-docker-dev-bash: ## Rebuild dockerized dev image
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . exec wiki bash
-
-docker-build: ## Run assets generation build in docker
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . run wiki yarn build
-	docker-compose -f ./dev/docker-${DEVDB}/docker-compose.yml -p wiki --project-directory . down
-
-help: ## Display help
-	@echo ''
-	@echo -e 'usage: \033[1mmake [command] [args...]\033[0m'
-	@echo ''
-	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
-	@echo ''
-
-.PHONY: clean logs
-.DEFAULT_GOAL := help
diff --git a/client/components/admin/admin-extensions.vue b/client/components/admin/admin-extensions.vue
index 76fc0198..1e0fdfa2 100644
--- a/client/components/admin/admin-extensions.vue
+++ b/client/components/admin/admin-extensions.vue
@@ -25,7 +25,7 @@
                         .body-2 {{ext.description}}
                         v-divider.my-4
                         .body-2
-                          strong.mr-2 This extensions is
+                          strong.mr-2 This extension is
                           v-chip.mr-2(v-if='ext.isCompatible', label, outlined, small, color='success') compatible
                           v-chip.mr-2(v-else, label, small, color='error') not compatible
                           strong with your host.
diff --git a/server/graph/schemas/comment.graphql b/server/graph/schemas/comment.graphql
index 216623e8..f3f41c87 100644
--- a/server/graph/schemas/comment.graphql
+++ b/server/graph/schemas/comment.graphql
@@ -16,6 +16,14 @@ extend type Mutation {
 
 type CommentQuery {
   providers: [CommentProvider] @auth(requires: ["manage:system"])
+
+  list(
+    pageId: Int!
+  ): [CommentPost]! @auth(requires: ["read:comments", "manage:system"])
+
+  single(
+    id: Int!
+  ): CommentPost @auth(requires: ["read:comments", "manage:system"])
 }
 
 # -----------------------------------------------
@@ -27,7 +35,16 @@ type CommentMutation {
     providers: [CommentProviderInput]
   ): DefaultResponse @auth(requires: ["manage:system"])
 
-  rebuildIndex: DefaultResponse @auth(requires: ["manage:system"])
+  create(
+    pageId: Int!
+    replyTo: Int
+    content: String!
+  ): DefaultResponse @auth(requires: ["write:comments", "manage:system"])
+
+  update(
+    id: Int!
+    content: String!
+  ): DefaultResponse @auth(requires: ["write:comments", "manage:comments", "manage:system"])
 }
 
 # -----------------------------------------------
@@ -50,3 +67,15 @@ input CommentProviderInput {
   key: String!
   config: [KeyValuePairInput]
 }
+
+type CommentPost {
+  id: Int!
+  content: String!
+  render: String!
+  authorId: Int!
+  authorName: String!
+  authorEmail: String! @auth(requires: ["manage:system"])
+  authorIP: String! @auth(requires: ["manage:system"])
+  createdAt: Date!
+  updatedAt: Date!
+}