ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update Makefile, use tabs and remove duplicate js

Browse Source
This commit is contained in:
Julius Haertl
2017-01-31 16:16:48 +01:00
parent be6a2f72dc
commit 76e9dc15a1
3 changed files with 106 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -12,7 +12,7 @@ sign_dir=$(build_dir)/sign
cert_dir=$(HOME)/.nextcloud/certificates cert_dir=$(HOME)/.nextcloud/certificates
all: appstore default: build
clean-build: clean-build:
rm -rf $(build_dir) rm -rf $(build_dir)
@@ -21,10 +21,6 @@ clean-dist:
rm -rf js/node_modules rm -rf js/node_modules
rm -rf js/vendor rm -rf js/vendor
install-npm-deps-dev:
cd js && npm install --deps
cd js && bower install
install-deps: install-deps:
cd js && npm install --deps cd js && npm install --deps
cd js && bower install cd js && bower install
@@ -34,6 +30,9 @@ build: build-js
build-js: build-js:
$(MAKE) -C js build $(MAKE) -C js build
watch:
$(make) -C js watch
# appstore: clean install-deps # appstore: clean install-deps
appstore: clean-build build appstore: clean-build build
rm -rf $(appstore_build_directory) rm -rf $(appstore_build_directory)

204
lib/Service/CardService.php
View File

@@ -32,121 +32,121 @@ use OCA\Deck\Db\StackMapper;
class CardService { class CardService {
private $cardMapper; private $cardMapper;
public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) { public function __construct(CardMapper $cardMapper, StackMapper $stackMapper, PermissionService $permissionService) {
$this->cardMapper = $cardMapper; $this->cardMapper = $cardMapper;
$this->stackMapper = $stackMapper; $this->stackMapper = $stackMapper;
$this->permissionService = $permissionService; $this->permissionService = $permissionService;
} }
public function find($cardId) { public function find($cardId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ); $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
return $this->cardMapper->find($cardId); return $this->cardMapper->find($cardId);
} }
/** /**
* @param integer $order * @param integer $order
*/ */
public function create($title, $stackId, $type, $order, $owner) { public function create($title, $stackId, $type, $order, $owner) {
$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
$card = new Card(); $card = new Card();
$card->setTitle($title); $card->setTitle($title);
$card->setStackId($stackId); $card->setStackId($stackId);
$card->setType($type); $card->setType($type);
$card->setOrder($order); $card->setOrder($order);
$card->setOwner($owner); $card->setOwner($owner);
return $this->cardMapper->insert($card); return $this->cardMapper->insert($card);
} }
public function delete($id) { public function delete($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
return $this->cardMapper->delete($this->cardMapper->find($id)); return $this->cardMapper->delete($this->cardMapper->find($id));
} }
public function update($id, $title, $stackId, $type, $order, $description, $owner) { public function update($id, $title, $stackId, $type, $order, $description, $owner) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
if ($card->getArchived()) { if ($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
} }
$card->setTitle($title); $card->setTitle($title);
$card->setStackId($stackId); $card->setStackId($stackId);
$card->setType($type); $card->setType($type);
$card->setOrder($order); $card->setOrder($order);
$card->setOwner($owner); $card->setOwner($owner);
$card->setDescription($description); $card->setDescription($description);
return $this->cardMapper->update($card); return $this->cardMapper->update($card);
} }
public function rename($id, $title) { public function rename($id, $title) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
if ($card->getArchived()) { if ($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
} }
$card->setTitle($title); $card->setTitle($title);
return $this->cardMapper->update($card); return $this->cardMapper->update($card);
} }
public function reorder($id, $stackId, $order) { public function reorder($id, $stackId, $order) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$cards = $this->cardMapper->findAll($stackId); $cards = $this->cardMapper->findAll($stackId);
$result = []; $result = [];
$i = 0; $i = 0;
foreach ($cards as $card) { foreach ($cards as $card) {
if ($card->getArchived()) { if ($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
} }
if ($card->id === $id) { if ($card->id === $id) {
$card->setOrder($order); $card->setOrder($order);
$card->setLastModified(time()); $card->setLastModified(time());
} }
if ($i === $order) { if ($i === $order) {
$i++; $i++;
} }
if ($card->id !== $id) { if ($card->id !== $id) {
$card->setOrder($i++); $card->setOrder($i++);
} }
$this->cardMapper->update($card); $this->cardMapper->update($card);
$result[$card->getOrder()] = $card; $result[$card->getOrder()] = $card;
} }
return $result; return $result;
} }
public function archive($id) { public function archive($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setArchived(true); $card->setArchived(true);
return $this->cardMapper->update($card); return $this->cardMapper->update($card);
} }
public function unarchive($id) { public function unarchive($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
$card->setArchived(false); $card->setArchived(false);
return $this->cardMapper->update($card); return $this->cardMapper->update($card);
} }
public function assignLabel($cardId, $labelId) { public function assignLabel($cardId, $labelId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($cardId); $card = $this->cardMapper->find($cardId);
if ($card->getArchived()) { if ($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
} }
$this->cardMapper->assignLabel($cardId, $labelId); $this->cardMapper->assignLabel($cardId, $labelId);
} }
public function removeLabel($cardId, $labelId) { public function removeLabel($cardId, $labelId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT); $this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($cardId); $card = $this->cardMapper->find($cardId);
if ($card->getArchived()) { if ($card->getArchived()) {
throw new CardArchivedException(); throw new CardArchivedException();
} }
$this->cardMapper->removeLabel($cardId, $labelId); $this->cardMapper->removeLabel($cardId, $labelId);
} }
} }

2
templates/main.php
View File

@@ -24,8 +24,6 @@
use OCP\Util; use OCP\Util;
Util::addStyle('deck', 'style'); 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/angular.min');
Util::addScript('deck', 'vendor/angular-route/angular-route.min'); Util::addScript('deck', 'vendor/angular-route/angular-route.min');
Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min'); Util::addScript('deck', 'vendor/angular-sanitize/angular-sanitize.min');