From 76e9dc15a1455f79c1a7eac53e8e64d83f1601bb Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Tue, 31 Jan 2017 16:16:48 +0100
Subject: [PATCH] Update Makefile, use tabs and remove duplicate js

---
 Makefile                    |   9 +-
 lib/Service/CardService.php | 204 ++++++++++++++++++------------------
 templates/main.php          |   2 -
 3 files changed, 106 insertions(+), 109 deletions(-)

diff --git a/Makefile b/Makefile
index 9a569d348..8858a0b2c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ sign_dir=$(build_dir)/sign
 cert_dir=$(HOME)/.nextcloud/certificates
 
 
-all: appstore
+default: build
 
 clean-build:
 	rm -rf $(build_dir)
@@ -21,10 +21,6 @@ clean-dist:
 	rm -rf js/node_modules
 	rm -rf js/vendor
 
-install-npm-deps-dev:
-	cd js && npm install --deps
-	cd js && bower install
-
 install-deps:
 	cd js && npm install --deps
 	cd js && bower install
@@ -34,6 +30,9 @@ build: build-js
 build-js:
 	$(MAKE) -C js build
 
+watch:
+	$(make) -C js watch
+
 # appstore: clean install-deps
 appstore: clean-build build
 	rm -rf $(appstore_build_directory)
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 59529d629..bc7437c5b 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -32,121 +32,121 @@ use OCA\Deck\Db\StackMapper;
 
 class CardService {
 
-    private $cardMapper;
+	private $cardMapper;
 
-    public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) {
-        $this->cardMapper = $cardMapper;
-        $this->stackMapper = $stackMapper;
-        $this->permissionService = $permissionService;
-    }
+	public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) {
+		$this->cardMapper = $cardMapper;
+		$this->stackMapper = $stackMapper;
+		$this->permissionService = $permissionService;
+	}
 
-    public function find($cardId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
-        return $this->cardMapper->find($cardId);
-    }
+	public function find($cardId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
+		return $this->cardMapper->find($cardId);
+	}
 
-    /**
-     * @param integer $order
-     */
-    public function create($title, $stackId, $type, $order, $owner) {
-        $this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
-        $card = new Card();
-        $card->setTitle($title);
-        $card->setStackId($stackId);
-        $card->setType($type);
-        $card->setOrder($order);
-        $card->setOwner($owner);
-        return $this->cardMapper->insert($card);
+	/**
+	 * @param integer $order
+	 */
+	public function create($title, $stackId, $type, $order, $owner) {
+		$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
+		$card = new Card();
+		$card->setTitle($title);
+		$card->setStackId($stackId);
+		$card->setType($type);
+		$card->setOrder($order);
+		$card->setOwner($owner);
+		return $this->cardMapper->insert($card);
 
-    }
+	}
 
-    public function delete($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        return $this->cardMapper->delete($this->cardMapper->find($id));
-    }
+	public function delete($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		return $this->cardMapper->delete($this->cardMapper->find($id));
+	}
 
-    public function update($id, $title, $stackId, $type, $order, $description, $owner) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $card->setTitle($title);
-        $card->setStackId($stackId);
-        $card->setType($type);
-        $card->setOrder($order);
-        $card->setOwner($owner);
-        $card->setDescription($description);
-        return $this->cardMapper->update($card);
-    }
+	public function update($id, $title, $stackId, $type, $order, $description, $owner) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$card->setTitle($title);
+		$card->setStackId($stackId);
+		$card->setType($type);
+		$card->setOrder($order);
+		$card->setOwner($owner);
+		$card->setDescription($description);
+		return $this->cardMapper->update($card);
+	}
 
-    public function rename($id, $title) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $card->setTitle($title);
-        return $this->cardMapper->update($card);
-    }
+	public function rename($id, $title) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$card->setTitle($title);
+		return $this->cardMapper->update($card);
+	}
 
-    public function reorder($id, $stackId, $order) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $cards = $this->cardMapper->findAll($stackId);
-        $result = [];
-        $i = 0;
-        foreach ($cards as $card) {
-            if ($card->getArchived()) {
-                throw new CardArchivedException();
-            }
-            if ($card->id === $id) {
-                $card->setOrder($order);
-                $card->setLastModified(time());
-            }
+	public function reorder($id, $stackId, $order) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$cards = $this->cardMapper->findAll($stackId);
+		$result = [];
+		$i = 0;
+		foreach ($cards as $card) {
+			if ($card->getArchived()) {
+				throw new CardArchivedException();
+			}
+			if ($card->id === $id) {
+				$card->setOrder($order);
+				$card->setLastModified(time());
+			}
 
-            if ($i === $order) {
-                            $i++;
-            }
+			if ($i === $order) {
+				$i++;
+			}
 
-            if ($card->id !== $id) {
-                $card->setOrder($i++);
-            }
-            $this->cardMapper->update($card);
-            $result[$card->getOrder()] = $card;
-        }
+			if ($card->id !== $id) {
+				$card->setOrder($i++);
+			}
+			$this->cardMapper->update($card);
+			$result[$card->getOrder()] = $card;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function archive($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        $card->setArchived(true);
-        return $this->cardMapper->update($card);
-    }
+	public function archive($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		$card->setArchived(true);
+		return $this->cardMapper->update($card);
+	}
 
-    public function unarchive($id) {
-        $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($id);
-        $card->setArchived(false);
-        return $this->cardMapper->update($card);
-    }
+	public function unarchive($id) {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($id);
+		$card->setArchived(false);
+		return $this->cardMapper->update($card);
+	}
 
-    public function assignLabel($cardId, $labelId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($cardId);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $this->cardMapper->assignLabel($cardId, $labelId);
-    }
+	public function assignLabel($cardId, $labelId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($cardId);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$this->cardMapper->assignLabel($cardId, $labelId);
+	}
 
-    public function removeLabel($cardId, $labelId) {
-        $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
-        $card = $this->cardMapper->find($cardId);
-        if ($card->getArchived()) {
-            throw new CardArchivedException();
-        }
-        $this->cardMapper->removeLabel($cardId, $labelId);
-    }
+	public function removeLabel($cardId, $labelId) {
+		$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
+		$card = $this->cardMapper->find($cardId);
+		if ($card->getArchived()) {
+			throw new CardArchivedException();
+		}
+		$this->cardMapper->removeLabel($cardId, $labelId);
+	}
 }
\ No newline at end of file
diff --git a/templates/main.php b/templates/main.php
index c8ec1e169..6479519f4 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -24,8 +24,6 @@
 use OCP\Util;
 
 Util::addStyle('deck', 'style');
-Util::addStyle('deck', '../js/vendor/ng-sortable/dist/ng-sortable.min');
-Util::addStyle('deck', '../js/vendor/angular-ui-select/dist/select.min');
 Util::addScript('deck', 'vendor/angular/angular.min');
 Util::addScript('deck', 'vendor/angular-route/angular-route.min');
 Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min');