Bump version to 0.2.6

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.drone.yml

@@ -5,10 +5,10 @@ clone:
 
 pipeline:
   check-app-compatbility:
-    image: nextcloudci/php7.0:php7.0-17
+    image: nextcloudci/php5.6:php5.6-3
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -22,108 +22,57 @@ pipeline:
     when:
       matrix:
         TESTS: check-app-compatbility
-  check-app-compatbility-14:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      # Code checker
-      - ./occ app:check-code $APP_NAME -c strong-comparison
-      - ./occ app:check-code $APP_NAME -c deprecation
-      - cd apps/$APP_NAME/
-    when:
-      matrix:
-        TESTS: check-app-compatbility-14
-  check-app-compatbility-13:
-    image: nextcloudci/php7.0:php7.0-17
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable13
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      # Code checker
-      - ./occ app:check-code $APP_NAME -c strong-comparison
-      - ./occ app:check-code $APP_NAME -c deprecation
-      - cd apps/$APP_NAME/
-    when:
-      matrix:
-        TESTS: check-app-compatbility-13
   signed-off-check:
-    image: nextcloudci/php7.0:php7.0-17
+    image: nextcloudci/php7.0:php7.0-2
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
-      - wget https://raw.githubusercontent.com/nextcloud/server/master/build/signed-off-checker.php
-      - php ./signed-off-checker.php
-    secrets: [ github_token ]
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server
+      - php ./build/signed-off-checker.php
     when:
       matrix:
         TESTS: signed-off-check
   syntax-php5.6:
-    image: nextcloudci/php5.6:php5.6-8
+    image: nextcloudci/php5.6:php5.6-3
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable13
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server
       - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+      - ./lib/composer/bin/parallel-lint --exclude build/.phan/ --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
     when:
       matrix:
         TESTS: syntax-php5.6
   syntax-php7.0:
-    image: nextcloudci/php7.0:php7.0-17
+    image: nextcloudci/php7.0:php7.0-2
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
+      # Pre-setup steps
+      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
+      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
+      - cd ../server
       - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+      - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .
     when:
       matrix:
         TESTS: syntax-php7.0
-  syntax-php7.1:
-    image: nextcloudci/php7.1:php7.1-15
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php7.1
-  syntax-php7.2:
-    image: nextcloudci/php7.2:php7.2-9
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
-    when:
-      matrix:
-        TESTS: syntax-php7.2
   php5.6:
-    image: nextcloudci/php5.6:php5.6-8
+    image: nextcloudci/php5.6:php5.6-7
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable13
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       - apt update && apt-get -y install php5-xdebug
@@ -134,17 +83,22 @@ pipeline:
       - cd ../server/
       - ./occ app:enable $APP_NAME
       - cd apps/$APP_NAME
-      - composer install
+
       - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
       - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
+
+      # Create coverage report
+      - wget https://codecov.io/bash -O codecov.sh
+      - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t f6375299-4832-487e-b831-091772ab0384; fi"
+      - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t f6375299-4832-487e-b831-091772ab0384; fi"
     when:
       matrix:
         TESTS: php5.6
   php7.0:
-    image: nextcloudci/php7.0:php7.0-17
+    image: nextcloudci/php7.0:php7.0-8
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -154,55 +108,35 @@ pipeline:
       - php occ app:enable deck
       - cd apps/$APP_NAME
       # Run phpunit tests
-      - composer install
       - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
       - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
     when:
       matrix:
         TESTS: php7.0
   php7.1:
-    image: nextcloudci/php7.1:php7.1-15
+    image: nextcloudci/php7.1:php7.1-11
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
+      - yum -y install wget
       - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
       - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
       - cd ../server/
       - php occ app:enable deck
       - cd apps/$APP_NAME
-      - composer install
       - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
       - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
     when:
       matrix:
         TESTS: php7.1
-  php7.2:
-    image: nextcloudci/php7.2:php7.2-9
-    environment:
-      - APP_NAME=deck
-      - CORE_BRANCH=stable14
-      - DB=sqlite
-    commands:
-      # Pre-setup steps
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server/
-      - php occ app:enable deck
-      - cd apps/$APP_NAME
-      - composer install
-      - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
-      - phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
-    when:
-      matrix:
-        TESTS: php7.2
   integration:
-    image: nextcloudci/integration-php7.0:integration-php7.0-6
+    image: nextcloudci/integration-php7.0:integration-php7.0-3
     environment:
       - APP_NAME=deck
-      - CORE_BRANCH=stable14
+      - CORE_BRANCH=master
       - DB=sqlite
     commands:
       # Pre-setup steps
@@ -216,37 +150,27 @@ pipeline:
     when:
       matrix:
         TESTS: integration
-  eslint:
-    image: nextcloudci/eslint:eslint-1
-    commands:
-      - ./run-eslint.sh
-    when:
-      matrix:
-        TESTS: eslint
   jsbuild:
     image: mhart/alpine-node:6.8.0
     commands:
-      - apk add --no-cache make
-      - make build-js
+      - apk add --no-cache git
+      - cd js
+      - npm install --deps
+      - ./node_modules/.bin/bower --allow-root install
     when:
       matrix:
         TESTS: jsbuild
 matrix:
   include:
-    - TESTS: check-app-compatbility-13
-    - TESTS: check-app-compatbility-14
+    - TESTS: check-app-compatbility
     - TESTS: signed-off-check
     - TESTS: syntax-php5.6
     - TESTS: syntax-php7.0
-    - TESTS: syntax-php7.1
-    - TESTS: syntax-php7.2
     - TESTS: php5.6
     - TESTS: php7.0
     - TESTS: php7.1
-    - TESTS: php7.2
-    - TESTS: eslint
     - TESTS: jsbuild
-    #- TESTS: integration
+    - TESTS: integration
 
 branches: [ master, stable* ]
 

.eslintignore

@@ -1,9 +0,0 @@
-/js/tests/*
-/js/vendor/*
-/js/legacy/*
-/js/node_modules/*
-/js/public/*
-/karma.conf.js
-/tests/*
-/l10n/*
-

.eslintrc.yml

@@ -1,43 +0,0 @@
-root: true
-
-extends:
-  - eslint:recommended
-
-env:
-  browser: true
-  amd: true
-  es6: true
-
-globals:
-  global: false
-  app: false
-  angular: false
-  $: false
-  escapeHTML: false
-  OC: false
-  OCA: false
-  t: false
-  oc_current_user: false
-  oc_requesttoken: false
-  Clipboard: false
-  oc_defaults: false
-
-parserOptions:
-  ecmaVersion: 6
-  sourceType: "module"
-
-rules:
-  curly: error
-  eqeqeq: ["error", "smart"]
-  guard-for-in: error
-  no-console: off
-  no-fallthrough: error
-  no-mixed-spaces-and-tabs: error
-  no-unused-vars: warn
-  no-useless-escape: warn
-  no-use-before-define: error
-  semi: ["error", "always"]
-  indent:
-    - error
-    - tab
-    - SwitchCase: 1

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**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 solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/pull_request_template.md

@@ -1,17 +0,0 @@
-
-* Resolves: # <!-- related github issue -->
-* Target version: master 
-
-### Summary
-
-
-### TODO
-
-- [ ] ...
-
-### Checklist
-
-- [ ] Code is properly formatted
-- [ ] Sign-off message is added to all commits
-- [ ] Tests (unit, integration, api and/or acceptance) are included
-- [ ] Documentation (manuals or wiki) has been updated or is not required

.gitignore

@@ -1,10 +1,9 @@
 js/node_modules/*
 js/vendor/
 js/public/
-js/build/
+js/package-lock.json
 build/
 css/style.css
-css/vendor.css
 tests/integration/vendor/
 tests/integration/composer.lock
 vendor/

.travis.yml

@@ -1,35 +1,36 @@
 language: php
+dist: trusty
+sudo: required
 services:
     - mysql
 php:
-    - 7.0
-    - 7.1
-    - 7.2
+    - 5.6
+    - 7
 env:
-    - CORE_BRANCH=stable14 DB=mysql
+    matrix:
+        - CORE_BRANCH=master DB=mysql
+        - CORE_BRANCH=stable12 DB=mysql 
+        - CORE_BRANCH=stable11 DB=mysql 
 
 before_install:
     - wget https://phar.phpunit.de/phpunit-5.7.phar
     - chmod +x phpunit-5.7.phar
     - mkdir bin
-    - mv phpunit-5.7.phar bin/phpunit
+    - sudo mv phpunit-5.7.phar bin/phpunit
     - export PATH="$PWD/bin:$PATH"
     - phpunit --version
     - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
     - bash ./before_install.sh deck $CORE_BRANCH $DB
     - cd ../server
     - ./occ app:enable deck
+    - php -S localhost:8080 &
 
 before_script:
     - cd apps/deck
 
 script:
-    - composer install
     - make test-unit
 
-after_success:
-    - bash <(curl -s https://codecov.io/bash)
-
 after_failure:
     - cat ../../data/nextcloud.log
 

CHANGELOG.md

@@ -1,79 +1,6 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## 0.5.0 - unreleased
-
-### Added
-
-- Activity stream for board and cards
-- Comments on cards
-- Use users locale format on date picker
-- Compact display mode
-- Card title inline editing
-- REST API
-- Empty content view for board lists
-- Undo for card and stack deletion
-- Show tag name on board
-- Notify users about card assignments
-- Add shortcut to assign a card to yourself
-- Improved view for printing
-
-### Fixed
-
-- Accesibility improvements
-- Don't allow empty card titles
-
-## 0.4.0 - 2018-07-11
-
-### Added
-
-- Attach files to cards
-- Embed attachments into the card description
-- Color picker to use any color value for board and labels
-- Support for checkboxes inside the description
-- occ command to export user data as JSON
-
-### Fixed
-
-- Improve frontend data management
-- Fix bug the user list being empty on some occasions
-
-## 0.3.0 - 2018-01-12
-
-### Added
-- Allow to assign users to cards
-- Emit notifications for overdue cards
-- Emit notifications if boards gets shared to a user
-- Add support for Nextcloud 13
-- Simplify layout for cleaner user experience
-- Add contacts menu to avatars
-- Automatically save card description on inactivity
-
-
-### Fixed
-- Fix card dragging behaviour
-- Fix scrolling and dragging on mobile
-- Various fixes when data is not syncronized between different views
-- Improved performance
-- Update document title when renaming a board
-- Automatically chose the least used color
-- Improve accessibility
-- Fix issue when assigning labels after creating them
-- Allow to save tag changes with enter
-- Fix bug when removing labels changed the color of the remaining ones
-- Fix issues with auto saving of card descriptions
-
-
-## 0.2.8 - 2017-11-26
-
-### Fixed
-- Drop support for NC 13, since that will only be supported by the next version of Deck
-
-## 0.2.7 - 2017-11-10
-
-### Fixed
-- Fix bug that caused update to fail
-
 ## 0.2.6 - 2017-11-10
 
 ### Fixed

Makefile

@@ -12,30 +12,29 @@ sign_dir=$(build_dir)/sign
 cert_dir=$(HOME)/.nextcloud/certificates
 
 
-default: package 
+default: build
 
 clean-build:
 	rm -rf $(build_dir)
 
 clean-dist:
 	rm -rf js/node_modules
+	rm -rf js/vendor
 
-install-deps: install-deps-js
-	composer install
+install-deps:
+	cd js && npm install --deps
+	cd js && ./node_modules/.bin/bower install
 
-install-deps-js:
-	cd js && npm install
+build: build-js build-css
 
-build: install-deps build-js
+build-js: install-deps
+	cd js && ./node_modules/.bin/grunt build
 
-build-js: install-deps-js
-	cd js && npm run build 
-
-build-js-dev: install-deps
-	cd js && npm run dev
+build-css: install-deps
+	./js/node_modules/node-sass/bin/node-sass --output-style compressed css/legacy.scss css/style.css
 
 watch:
-	cd js && npm run watch
+	cd js && ./node_modules/.bin/grunt watch
 
 # appstore: clean install-deps
 appstore: clean-build build
@@ -63,7 +62,6 @@ appstore: clean-build build
 	--exclude="../$(app_name)/protractor\.*" \
 	--exclude="../$(app_name)/.*" \
 	--exclude="../$(app_name)/*.lock" \
-	--exclude="../$(app_name)/run-eslint.sh" \
 	--exclude="../$(app_name)/js/.*" \
 	--exclude="../$(app_name)/vendor" \
 	--exclude-vcs \
@@ -98,5 +96,3 @@ test-integration:
 test-js: install-deps
 	cd js && run test
 
-package:
-	krankerl package

README.md

@@ -1,6 +1,6 @@
 # Deck
 
-[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=master)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=master)](https://codecov.io/github/nextcloud/deck) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/e403f723f42a4abd93b2cfe36cbd7eee)](https://www.codacy.com/app/juliushaertl/deck?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/deck&utm_campaign=Badge_Grade) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=master) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck)
+[![Build Status](https://travis-ci.org/nextcloud/deck.svg?branch=master)](https://travis-ci.org/nextcloud/deck) [![CodeCov](https://codecov.io/github/nextcloud/deck/coverage.svg?branch=master)](https://codecov.io/github/nextcloud/deck) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/deck/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/deck/?branch=master) [![Dependency Status](https://www.versioneye.com/user/projects/58ad558f4ca76f004ed475b3/badge.svg?style=flat)](https://www.versioneye.com/user/projects/58ad558f4ca76f004ed475b3) [![#nextcloud-deck](https://img.shields.io/badge/IRC-%23nextcloud--deck%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-deck)
 
 
 Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.
@@ -9,17 +9,22 @@ Deck is a kanban style organization tool aimed at personal planning and project
 - :page_facing_up: Write down additional notes in markdown
 - :bookmark: Assign labels for even better organization
 - :busts_in_silhouette: Share with your team, friends or family
-- :paperclip: Attach files and embed them in your markdown description
-- :speech_balloon: Discuss with your team using comments
-- :zap: Keep track of changes in the activity stream
 - :rocket: Get your project organized
 
 
-![Deck - Manage cards on your board](https://download.bitgrid.net/nextcloud/deck/screenshots/Deck.png)
+![Deck - Manage cards on your board](https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Board.png)
+
+### Planned features
+
+- :file_folder: Attach files directly from your Nextcloud
+- :earth_africa: Share boards with the public
+- :calendar: Integration with Nextcloud calendar and other apps
+- :speech_balloon: Comments integration
+- :exclamation: Checkout the project milestones for more ...
 
 ## Installation/Update
 
-This app is supposed to work on the two latest Nextcloud versions.
+This app is supposed to work on Nextcloud version 11 or later.
 
 ### Install latest release
 
@@ -33,10 +38,10 @@ If you want to run the latest development version from git source, you need to c
 git clone https://github.com/nextcloud/deck.git
 cd deck
 make install-deps
-make build
+make
 ```
 
-Please make sure you have installed the following dependencies: `make, which, tar, npm, curl, composer`
+Please make sure you have installed the following dependencies: `make, which, tar, npm, curl`
 
 ### Install the nightly builds
 
@@ -50,7 +55,8 @@ Nothing to prepare, just dig into the code.
 
 ### JavaScript
 
-Deck requires running a `make build-js` to install npm dependencies and build the JavaScript code using webpack. While developing you can also use `make watch` to rebuild everytime the code changes.
+When `'debug'=>true` is set in your config.php files will get loaded automatically. Otherwise you need to ensure that `public/app.js` is generated by running `make` or `make watch` to regenerate it on every change.
+Make sure you have installed the dependencies with ```make install-deps```.
 
 ### Running tests
 You can use the provided Makefile to run all tests by using:

_config.yml

@@ -0,0 +1,2 @@
+theme: jekyll-theme-cayman
+site: https://deck-app.com

appinfo/app.php

@@ -21,13 +21,5 @@
  *
  */
 
-if ((@include_once __DIR__ . '/../vendor/autoload.php')===false) {
-	throw new Exception('Cannot include autoload. Did you run install dependencies using composer?');
-}
-
 $app = new \OCA\Deck\AppInfo\Application();
 $app->registerNavigationEntry();
-$app->registerNotifications();
-
-/** Load activity style global so it is availabile in the activity app as well */
-\OC_Util::addStyle('deck', 'activity');

appinfo/autoload.php

@@ -5,20 +5,20 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
 namespace OCA\Deck\AppInfo;
@@ -28,4 +28,4 @@ use OCP\AppFramework\App;
 /**
  * Additional autoloader registration, e.g. registering composer autoloaders
  */
-require_once __DIR__ . '/../vendor/autoload.php';
+// require_once __DIR__ . '/../vendor/autoload.php';

appinfo/database.xml

@@ -77,14 +77,6 @@
                 <length>8</length>
                 <notnull>false</notnull>
             </field>
-            <field>
-                <name>deleted_at</name>
-                <type>integer</type>
-                <default>0</default>
-                <length>8</length>
-                <notnull>false</notnull>
-                <unsigned>true</unsigned>
-            </field>
             <index>
                 <name>deck_stacks_board_id_index</name>
                 <field>
@@ -170,19 +162,6 @@
                 <type>timestamp</type>
                 <default>0</default>
             </field>
-            <field>
-                <name>notified</name>
-                <type>boolean</type>
-                <default>false</default>
-            </field>
-            <field>
-                <name>deleted_at</name>
-                <type>integer</type>
-                <default>0</default>
-                <length>8</length>
-                <notnull>false</notnull>
-                <unsigned>true</unsigned>
-            </field>
             <index>
                 <name>deck_cards_stack_id_index</name>
                 <field>
@@ -214,6 +193,12 @@
                 <autoincrement>1</autoincrement>
                 <length>4</length>
             </field>
+            <field>
+                <name>title</name>
+                <type>text</type>
+                <notnull>true</notnull>
+                <length>100</length>
+            </field>
             <field>
                 <name>card_id</name>
                 <type>integer</type>
@@ -228,12 +213,12 @@
             </field>
             <field>
                 <name>data</name>
-                <type>text</type>
+                <type>clob</type>
             </field>
             <field>
                 <name>last_modified</name>
                 <type>integer</type>
-                <default/>
+                <default></default>
                 <length>8</length>
                 <notnull>false</notnull>
                 <unsigned>true</unsigned>
@@ -241,21 +226,7 @@
             <field>
                 <name>created_at</name>
                 <type>integer</type>
-                <default/>
-                <length>8</length>
-                <notnull>false</notnull>
-                <unsigned>true</unsigned>
-            </field>
-            <field>
-                <name>created_by</name>
-                <type>text</type>
-                <notnull>true</notnull>
-                <length>64</length>
-            </field>
-            <field>
-                <name>deleted_at</name>
-                <type>integer</type>
-                <default>0</default>
+                <default></default>
                 <length>8</length>
                 <notnull>false</notnull>
                 <unsigned>true</unsigned>
@@ -340,44 +311,6 @@
             </index>
         </declaration>
     </table>
-    <table>
-        <name>*dbprefix*deck_assigned_users</name>
-        <declaration>
-            <field>
-                <name>id</name>
-                <type>integer</type>
-                <default>0</default>
-                <notnull>true</notnull>
-                <autoincrement>1</autoincrement>
-                <length>4</length>
-            </field>
-            <field>
-                <name>participant</name>
-                <type>text</type>
-                <notnull>true</notnull>
-                <length>64</length>
-            </field>
-            <field>
-                <name>card_id</name>
-                <type>integer</type>
-                <default>0</default>
-                <notnull>true</notnull>
-                <length>4</length>
-            </field>
-            <index>
-                <name>deck_assigned_users_idx_p</name>
-                <field>
-                    <name>participant</name>
-                </field>
-            </index>
-            <index>
-                <name>deck_assigned_users_idx_c</name>
-                <field>
-                    <name>card_id</name>
-                </field>
-            </index>
-        </declaration>
-    </table>
     <table>
         <name>*dbprefix*deck_board_acl</name>
         <declaration>

appinfo/info.xml

@@ -11,50 +11,30 @@
 - 📄 Write down additional notes in markdown
 - 🔖 Assign labels for even better organization
 - 👥 Share with your team, friends or family
-- 📎 Attach files and embed them in your markdown description
-- 💬 Discuss with your team using comments
-- ⚡ Keep track of changes in the activity stream
 - 🚀 Get your project organized
 
+💥 This is still alpha software: it may not be stable enough for production!
+
 </description>
-    <version>0.5.0-beta1</version>
+    <version>0.2.6</version>
     <licence>agpl</licence>
     <author>Julius Härtl</author>
     <namespace>Deck</namespace>
-    <types>
-        <logging/>
-    </types>
     <category>organization</category>
     <category>office</category>
-    <website>https://github.com/nextcloud/deck</website>
     <bugs>https://github.com/nextcloud/deck/issues</bugs>
     <repository type="git">https://github.com/nextcloud/deck.git</repository>
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Board.png</screenshot>
     <screenshot>https://download.bitgrid.net/nextcloud/deck/screenshots/Deck_Details.png</screenshot>
     <dependencies>
-        <nextcloud min-version="13" max-version="14" />
+        <nextcloud min-version="11" max-version="13" />
     </dependencies>
     <background-jobs>
         <job>OCA\Deck\Cron\DeleteCron</job>
-        <job>OCA\Deck\Cron\ScheduledNotifications</job>
     </background-jobs>
     <repair-steps>
         <post-migration>
             <step>OCA\Deck\Migration\UnknownUsers</step>
         </post-migration>
     </repair-steps>
-    <commands>
-        <command>OCA\Deck\Command\UserExport</command>
-    </commands>
-    <activity>
-        <settings>
-            <setting>OCA\Deck\Activity\Setting</setting>
-        </settings>
-        <filters>
-            <filter>OCA\Deck\Activity\Filter</filter>
-        </filters>
-        <providers>
-            <provider>OCA\Deck\Activity\DeckProvider</provider>
-        </providers>
-    </activity>
 </info>

appinfo/routes.php

@@ -3,23 +3,22 @@
  * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
  *
  * @author Julius Härtl <jus@bitgrid.net>
- * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
 return [
@@ -44,7 +43,6 @@ return [
 		['name' => 'stack#update', 'url' => '/stacks/{stackId}', 'verb' => 'PUT'],
 		['name' => 'stack#reorder', 'url' => '/stacks/{stackId}/reorder', 'verb' => 'PUT'],
 		['name' => 'stack#delete', 'url' => '/stacks/{stackId}', 'verb' => 'DELETE'],
-		['name' => 'stack#deleted', 'url' => '/{boardId}/stacks/deleted', 'verb' => 'GET'],
 		['name' => 'stack#archived', 'url' => '/stacks/{boardId}/archived', 'verb' => 'GET'],
 
 		// cards
@@ -52,68 +50,17 @@ return [
 		['name' => 'card#create', 'url' => '/cards', 'verb' => 'POST'],
 		['name' => 'card#update', 'url' => '/cards/{cardId}', 'verb' => 'PUT'],
 		['name' => 'card#delete', 'url' => '/cards/{cardId}', 'verb' => 'DELETE'],
-		['name' => 'card#deleted', 'url' => '/{boardId}/cards/deleted', 'verb' => 'GET'],
 		['name' => 'card#rename', 'url' => '/cards/{cardId}/rename', 'verb' => 'PUT'],
 		['name' => 'card#reorder', 'url' => '/cards/{cardId}/reorder', 'verb' => 'PUT'],
 		['name' => 'card#archive', 'url' => '/cards/{cardId}/archive', 'verb' => 'PUT'],
 		['name' => 'card#unarchive', 'url' => '/cards/{cardId}/unarchive', 'verb' => 'PUT'],
 		['name' => 'card#assignLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
 		['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
-		['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
-		['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/assign/{userId}', 'verb' => 'DELETE'],
-
-		['name' => 'attachment#getAll', 'url' => '/cards/{cardId}/attachments', 'verb' => 'GET'],
-		['name' => 'attachment#create', 'url' => '/cards/{cardId}/attachment', 'verb' => 'POST'],
-		['name' => 'attachment#display', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'GET'],
-		['name' => 'attachment#update', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'PUT'],
-		// also allow to use POST for updates so we can properly access files when using application/x-www-form-urlencoded
-		['name' => 'attachment#update', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'POST'],
-		['name' => 'attachment#delete', 'url' => '/cards/{cardId}/attachment/{attachmentId}', 'verb' => 'DELETE'],
-		['name' => 'attachment#restore', 'url' => '/cards/{cardId}/attachment/{attachmentId}/restore', 'verb' => 'GET'],
-
 
 		// labels
 		['name' => 'label#create', 'url' => '/labels', 'verb' => 'POST'],
 		['name' => 'label#update', 'url' => '/labels/{labelId}', 'verb' => 'PUT'],
 		['name' => 'label#delete', 'url' => '/labels/{labelId}', 'verb' => 'DELETE'],
 
-		// api
-		['name' => 'board_api#index', 'url' => '/api/v1.0/boards', 'verb' => 'GET'],
-		['name' => 'board_api#get', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'GET'],
-		['name' => 'board_api#create', 'url' => '/api/v1.0/boards', 'verb' => 'POST'],
-		['name' => 'board_api#delete', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'DELETE'],
-		['name' => 'board_api#update', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'PUT'],
-		['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/boards/{boardId}/undo_delete', 'verb' => 'POST'],
-		
-		['name' => 'stack_api#index', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'GET'],
-		['name' => 'stack_api#getArchived', 'url' => '/api/v1.0/boards/{boardId}/stacks/archived', 'verb' => 'GET'],
-		['name' => 'stack_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'GET'],
-		['name' => 'stack_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'POST'],
-		['name' => 'stack_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'PUT'],
-		['name' => 'stack_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}', 'verb' => 'DELETE'],
-
-		['name' => 'card_api#get', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'GET'],
-		['name' => 'card_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards', 'verb' => 'POST'],
-		['name' => 'card_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'PUT'],
-		['name' => 'card_api#assignLabel', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignLabel', 'verb' => 'PUT'],
-		['name' => 'card_api#removeLabel', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/removeLabel', 'verb' => 'PUT'],
-		['name' => 'card_api#assignUser', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignUser', 'verb' => 'PUT'],
-		['name' => 'card_api#unassignUser', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser', 'verb' => 'PUT'],
-		['name' => 'card_api#reorder', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder', 'verb' => 'PUT'],
-		['name' => 'card_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'DELETE'],
-
-		['name' => 'label_api#get', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'GET'],
-		['name' => 'label_api#create', 'url' => '/api/v1.0/boards/{boardId}/labels', 'verb' => 'POST'],
-		['name' => 'label_api#update', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'PUT'],
-		['name' => 'label_api#delete', 'url' => '/api/v1.0/boards/{boardId}/labels/{labelId}', 'verb' => 'DELETE'],
-
-		['name' => 'attachment_api#getAll', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'GET'],
-		['name' => 'attachment_api#display', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'GET'],
-		['name' => 'attachment_api#create', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments', 'verb' => 'POST'],
-		['name' => 'attachment_api#update', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'PUT'],
-		['name' => 'attachment_api#delete', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}', 'verb' => 'DELETE'],
-		['name' => 'attachment_api#restore', 'url' => '/api/v1.0/boards/{boardId}/stacks/{stackId}/cards/{cardId}/attachments/{attachmentId}/restore', 'verb' => 'PUT'],
-
-		['name' => 'board_api#preflighted_cors', 'url' => '/api/v1.0/{path}','verb' => 'OPTIONS', 'requirements' => ['path' => '.+']],
 	]
 ];

composer.json

@@ -1,19 +0,0 @@
-{
-    "name": "nextcloud/deck",
-    "type": "project",
-    "license": "AGPLv3",
-    "authors": [
-        {
-            "name": "Julius Härtl",
-            "email": "jus@bitgrid.net"
-        }
-    ],
-    "require": {
-        "cogpowered/finediff": "0.3.*"
-    },
-    "require-dev": {
-        "roave/security-advisories": "dev-master",
-        "christophwurst/nextcloud": "^14.0",
-        "jakub-onderka/php-parallel-lint": "^1.0.0"
-    }
-}

css/activity.css

@@ -1,23 +0,0 @@
-.activitymessage .visualdiff ins {
-	background-color: rgba(70, 186, 97, 0.2);
-	text-decoration: none;
-}
-
-.activitymessage .visualdiff del {
-	background-color: rgba(233, 50, 45, 0.2);
-	text-decoration: none;
-}
-
-.activityTabView .avatardiv-container {
-	display: inline-block;
-	bottom: -3px;
-	margin-left: 3px;
-}
-
-.activityTabView .avatar-name-wrapper {
-	font-weight: bold;
-}
-
-.activityTabView .activitysubject a {
-	font-weight: bold;
-}

css/animations.scss

@@ -1,43 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @author 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-.compact-item.ng-enter,
-.compact-item.ng-leave {
-  overflow: hidden;
-  transition: all 250ms linear;
-}
-
-.compact-item.ng-enter {
-  max-height: 0;
-
-  &.ng-enter-active {
-    max-height: 50px;
-  }
-}
-
-.compact-item.ng-leave {
-  max-height: 50px;
-
-  &.ng-leave-active {
-    max-height: 0;
-  }
-}

css/autocomplete.scss

@@ -1,77 +0,0 @@
-/**
- * based upon apps/comments/js/vendor/At.js/dist/css/jquery.atwho.css,
- * only changed colors and font-weight
- */
-
-.atwho-view {
-	position:absolute;
-	top: 0;
-	left: 0;
-	display: none;
-	margin-top: 18px;
-	background: var(--color-main-background);
-	color: var(--color-main-text);
-	border: 1px solid var(--color-border);
-	border-radius: var(--border-radius);
-	box-shadow: 0 0 5px var(--color-box-shadow);
-	min-width: 120px;
-	z-index: 11110 !important;
-}
-
-.atwho-view .atwho-header {
-	padding: 5px;
-	margin: 5px;
-	cursor: pointer;
-	border-bottom: solid 1px var(--color-border);
-	color: var(--color-main-text);
-	font-size: 11px;
-	font-weight: bold;
-}
-
-.atwho-view .atwho-header .small {
-	color: var(--color-main-text);
-	float: right;
-	padding-top: 2px;
-	margin-right: -5px;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-.atwho-view .atwho-header:hover {
-	cursor: default;
-}
-
-.atwho-view .cur {
-	background: var(--color-primary);
-	color: var(--color-primary-text);
-}
-.atwho-view .cur small {
-	color: var(--color-primary-text);
-}
-.atwho-view strong {
-	color: var(--color-main-text);
-	font-weight: normal;
-}
-.atwho-view .cur strong {
-	color: var(--color-primary-text);
-	font-weight: normal;
-}
-.atwho-view ul {
-	/* width: 100px; */
-	list-style:none;
-	padding:0;
-	margin:auto;
-	max-height: 200px;
-	overflow-y: auto;
-}
-.atwho-view ul li {
-	display: block;
-	padding: 5px 10px;
-	border-bottom: 1px solid var(--color-border);
-	cursor: pointer;
-}
-.atwho-view small {
-	font-size: smaller;
-	color: var(--color-main-text);
-	font-weight: normal;
-}

css/comp-13.scss

@@ -1,49 +0,0 @@
-#content-wrapper #content {
-	height: 100%;
-}
-#app-content {
-	flex-grow: 1;
-	height: 100%;
-
-	&.details-visible {
-		margin-right: 500px;
-	}
-}
-
-#app-sidebar {
-	right: -500px;
-	max-width: 100%;
-	width: 500px;
-	display:flex;
-	flex-direction: column;
-
-	&.details-visible {
-		right: 0;
-	}
-}
-
-#content[class*='app-'] * {
-	box-sizing: border-box;
-}
-
-body:not(.snapjs-left) {
-	.app-navigation-hide {
-		#app-content {
-			margin-left: 0 !important;
-		}
-		#app-navigation {
-			display: none;
-		}
-	}
-}
-
-#commentsTabView .newCommentForm .message {
-	width: 100%;
-	margin-left: 0;
-	padding-right: 0;
-	display: block;
-}
-
-#commentsTabView .comment {
-	margin-bottom: 0;
-}

css/comp-appnav.scss

@@ -1,113 +0,0 @@
-/*
- * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
- * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * Hotfix for support <NC13 with new app sidebar
- */
-#app-navigation {
-  .app-navigation-entry-menu.open {
-    ul li a {
-      background-position: 10px center;
-      padding: 0 10px 0 36px !important;
-    }
-  }
-  .app-navigation-entry-edit {
-    display: none;
-  }
-  .editing {
-    .app-navigation-entry-edit {
-      display: block;
-      position: absolute;
-      background: $color-main-background;
-      height: auto;
-      z-index: 250;
-    }
-  }
-}
-
-
-/**
- * copied styles from core/css/styles.scss
- * to have the same breadcrumb styling in NC12
- */
-.breadcrumb {
-  display: inline-flex;
-}
-div.crumb {
-  display: inline-flex;
-  background-repeat: no-repeat;
-  background-position: right center;
-  height: 44px;
-  background-size: auto 24px;
-  flex: 0 0 auto;
-  order: 1;
-  padding-right: 7px;
-  &.crumbmenu {
-    order: 2;
-    position: relative;
-    a {
-      opacity: 0.5
-    }
-  }
-  &.hidden {
-    display: none;
-    ~ .crumb {
-      order: 3;
-    }
-  }
-  > a,
-  > span {
-    position: relative;
-    padding: 12px;
-    opacity: 0.5;
-    top: 0 !important;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-    flex: 0 0 auto;
-    &.icon-home {
-      // Hide home text
-      text-indent: -9999px;
-    }
-  }
-  > a[class^='icon-'] {
-    padding: 0;
-    width: 44px;
-  }
-  &:not(:first-child) a {
-  }
-  &:last-child {
-    font-weight: 600;
-    margin-right: 10px;
-    // Allow multiple span next to the main 'a'
-    a ~ span {
-      padding-left: 0;
-    }
-  }
-  &:hover, &:focus, a:focus, &:active {
-    > a,
-    > span {
-      opacity: .7;
-    }
-  }
-}

css/compact-mode.scss

@@ -1,41 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @author 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-.compact-mode {
-  .card {
-    margin: $compact-board-item-margin;
-
-    &:last-child {
-      margin: $compact-board-last-item-margin;
-    }
-  }
-
-  .stack {
-    .as-sortable-placeholder {
-      margin: $compact-board-item-margin;
-
-      &:last-child {
-        margin: $compact-board-last-item-margin;
-      }
-    }
-  }
-}

css/icons.scss

@@ -1,54 +0,0 @@
-/**
- * Custom icons
- */
-.icon-deck {
-  background-image: url('../img/deck-dark.svg');
-}
-
-.icon-group {
-  background-image: url('../../../settings/img/users.svg');
-}
-
-.icon-help {
-  background-image: url('../../../settings/img/help.svg');
-}
-
-.icon-add-white {
-  background-image: url('../img/add-white.svg');
-}
-
-.icon-archive {
-  background-image: url('../img/archive.svg');
-}
-
-.icon-archive-white {
-  background-image: url('../img/archive-white.svg');
-}
-
-.icon-details {
-  background-image: url('../img/details.svg');
-}
-
-.icon-details-white {
-  background-image: url('../img/details-white.svg');
-}
-
-.icon-home {
-  background-image: url('../../../core/img/places/home.svg');
-}
-
-.icon-description {
-  background-image: url('../img/description.svg');
-}
-
-.icon-badge {
-  background-image: url('../img/calendar-dark.svg');
-}
-
-.icon-toggle-compact-collapsed {
-  background-image: url('../img/toggle_view_expand.svg');
-}
-
-.icon-toggle-compact-expanded {
-  background-image: url('../img/toggle_view_collapse.svg');
-}

css/legacy.scss

@@ -1,8 +1,7 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Ryan Fletcher <ryan.fletcher@codepassion.ca>
+/*
+ * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
  *
- * @author Ryan Fletcher <ryan.fletcher@codepassion.ca>
+ * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,16 +20,5 @@
  *
  */
 
-namespace OCA\Deck;
-
-use OCP\AppFramework\Http;
-class BadRequestException extends StatusException {
-
-	public function __construct($message) {
-		parent::__construct($message);
-	}
-
-	public function getStatus() {
-		return HTTP::STATUS_BAD_REQUEST;
-	}
-}
+@import '../../../core/css/variables.scss';
+@import 'style.scss';

css/print.scss

@@ -1,90 +0,0 @@
-@media print {
-	/* hide stuff */
-	#body-user {
-		#header,
-		div#app-navigation,
-		div.board-header-controls,
-		#app-navigation-toggle,
-		#app-navigation-toggle-custom,
-		div#controls.ng-scope div.crumb:not(.title),
-		div#controls.ng-scope div.crumb a.bullet,
-		a.ng-binding + a,
-		div.card.create,
-		button.card-options {
-			display: none !important;
-		}
-		#content {
-			margin: 0;
-			padding: 0;
-		}
-		#app-content {
-			margin: 0 !important;
-		}
-	}
-
-	div#app-navigation-toggle.icon-menu {
-		display:block;
-		width:0px;
-		height:0px;
-		background:none;
-	}
-
-	/* title */
-	div#controls.ng-scope {padding-left:20px;}
-	div#controls.ng-scope div.crumb.title {
-		display:inline;
-		font-size: 2em;
-		line-height:2.5em;
-		background:none;
-	}
-
-	div#controls.ng-scope div.crumb.title a.ng-binding {
-		color:#000;
-		opacity:1;
-	}
-
-	/*Due, assigned-users and description*/
-	div.card-controls {
-		flex-direction:row;
-		flex-wrap:wrap;
-	}
-	div.card-controls i.icon.icon-filetype-text {background:none;}
-	div.card-controls i.icon.icon-filetype-text:after {
-		content: attr(title);
-		display:block;
-		width:289px;
-		height:1.5em;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		white-space: nowrap;
-	}
-
-	span.due { }
-
-	div.card-assigned-users {
-		margin-right:10px;
-	}
-
-	ul.labels li.ng-scope span.ng-binding {
-		color:#000;
-		display:inline;
-		padding-left:5px;
-	}
-
-	/* Layout */
-	@page {
-		size: A4 landscape;
-		margin: 2cm;
-		}
-
-	div#innerBoard {
-		display:flex;
-		flex-wrap: wrap;
-	}
-
-	div.stack.ng-scope.as-sortable-item {border-right: 1px solid #000;}
-
-	div#innerBoard.ng-pristine.ng-untouched.ng-valid.ng-scope.ng-not-empty div.stack.ng-scope.as-sortable-item:nth-child(6n) {
-		page-break-after: always;
-	}
-}

img/calendar-dark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" version="1.1" height="32" viewbox="0 0 32 32"><path fill="#000" d="m8 2c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875a3.993 3.993 0 0 0 -3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16a3.993 3.993 0 0 0 -3 -3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2zm-4.906 10h19.812a0.09 0.09 0 0 1 0.094 0.094v9.812a0.09 0.09 0 0 1 -0.094 0.094h-19.812a0.09 0.09 0 0 1 -0.094 -0.094v-9.812a0.09 0.09 0 0 1 0.094 -0.094z"/></svg>

img/color_picker-dark.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 100 100"><path d="M91.645 8.355c-4.474-4.474-11.727-4.474-16.2 0l-13.5 13.501-3.727-3.727a5.015 5.015 0 1 0-7.093 7.093l3.727 3.727-41.51 41.508a11.411 11.411 0 0 0-3.329 7.324c-.073 1.087-.347 3.105-.675 5.292a1.748 1.748 0 0 1-.487.983l-3.105 3.106a2.546 2.546 0 0 0 0 3.6l3.493 3.493a2.546 2.546 0 0 0 3.6 0l3.106-3.105c.277-.275.622-.433.981-.486 2.187-.329 4.205-.602 5.293-.675a11.412 11.412 0 0 0 7.325-3.33l41.508-41.508 3.727 3.727a5.015 5.015 0 1 0 7.093-7.093L69.507 29.419l9.697 7.577 12.44-12.441c4.475-4.473 4.474-11.726.001-16.2zM65.051 42.749l-20.53 20.53a2.546 2.546 0 0 1-3.6 0l-3.27-3.27a2.545 2.545 0 0 0-3.599.001l-.616.616-.002-.002-14.728 14.727c-.337.337-.819.401-1.076.143s-.194-.74.143-1.076l23.841-23.841.004.004 15.633-15.633a2.546 2.546 0 0 1 3.6 0l4.2 4.201a2.546 2.546 0 0 1 0 3.6z"/></svg>

img/color_picker.svg

@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><path d="M91.645 8.355c-4.474-4.474-11.727-4.474-16.2 0l-13.5 13.501-3.727-3.727a5.015 5.015 0 1 0-7.093 7.093l3.727 3.727-41.51 41.508a11.411 11.411 0 0 0-3.329 7.324c-.073 1.087-.347 3.105-.675 5.292a1.748 1.748 0 0 1-.487.983l-3.105 3.106a2.546 2.546 0 0 0 0 3.6l3.493 3.493a2.546 2.546 0 0 0 3.6 0l3.106-3.105c.277-.275.622-.433.981-.486 2.187-.329 4.205-.602 5.293-.675a11.412 11.412 0 0 0 7.325-3.33l41.508-41.508 3.727 3.727a5.015 5.015 0 1 0 7.093-7.093L69.507 29.419l9.697 7.577 12.44-12.441c4.475-4.473 4.474-11.726.001-16.2zM65.051 42.749l-20.53 20.53a2.546 2.546 0 0 1-3.6 0l-3.27-3.27a2.545 2.545 0 0 0-3.599.001l-.616.616-.002-.002-14.728 14.727c-.337.337-.819.401-1.076.143s-.194-.74.143-1.076l23.841-23.841.004.004 15.633-15.633a2.546 2.546 0 0 1 3.6 0l4.2 4.201a2.546 2.546 0 0 1 0 3.6z" fill="#fff"/></svg>

img/description.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#000" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>

img/toggle_view_collapse.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -292.77)" display="none" stroke-width=".23666"><rect x=".28112" y="293.43" width="3.7042" height="1.1906" ry=".20225"/><rect x=".26458" y="295.15" width="3.7042" height="1.1906" ry=".20225"/></g><g transform="translate(0 -292.77)"><g transform="matrix(.040404 0 0 .040404 -3.0978 290.01)"><rect x="83.629" y="114.13" width="91.678" height="13.097" stroke-width="3.9049"/><path d="m155.25 81.388-26.194 26.194-26.194-26.154z" stroke-width="6.5484"/><path d="m155.25 159.97-26.194-26.194-26.194 26.154z" stroke-width="6.5484"/></g></g></svg>

img/toggle_view_expand.svg

@@ -1 +0,0 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -292.77)" display="none" stroke-width=".23666"><rect x=".28112" y="293.43" width="3.7042" height="1.1906" ry=".20225"/><rect x=".26458" y="295.15" width="3.7042" height="1.1906" ry=".20225"/></g><g transform="translate(0 -292.77)"><g transform="matrix(.040404 0 0 .040404 -3.0978 290.01)"><rect x="83.629" y="114.13" width="91.678" height="13.097" stroke-width="3.9049"/><path d="m155.25 107.58-26.194-26.194-26.194 26.154z" stroke-width="6.5484"/><path d="m155.25 133.78-26.194 26.194-26.194-26.154z" stroke-width="6.5484"/></g></g></svg>

issue_template.md

@@ -1,97 +1,79 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Client details:**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
- - Device: [e.g. iPhone6, desktop]
-
-<details>
-<summary>Server details</summary>
-<!--
-You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
--->
-
-**Operating system**:
-
-**Web server:**
-
-**Database:**
-
-**PHP version:**
-
-**Nextcloud version:** (see Nextcloud admin page)
-
-**Where did you install Nextcloud from:**
-
-**Signing status:**
-
-```
-Login as admin user into your Nextcloud and access
-http://example.com/index.php/settings/integrity/failed
-paste the results here.
-```
-
-**List of activated apps:**
-
-```
-If you have access to your command line run e.g.:
-sudo -u www-data php occ app:list
-from within your Nextcloud installation folder
-```
-
-**Nextcloud configuration:**
-
-```
-If you have access to your command line run e.g.:
-sudo -u www-data php occ config:list system
-from within your Nextcloud installation folder
-
-or
-
-Insert your config.php content here
-Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
-```
-
-**Are you using an external user-backend, if yes which one:** LDAP/ActiveDirectory/Webdav/...
-
-</details>
-
-<details>
-<summary>Logs</summary>
-
-#### Nextcloud log (data/nextcloud.log)
-```
-Insert your Nextcloud log here
-```
-
-#### Browser log
-```
-Insert your browser log here, this could for example include:
-
-a) The javascript console log
-b) The network log
-c) ...
-```
-
-</details>
+### Steps to reproduce
+1.
+2.
+3.
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
+
+### Server configuration
+<!--
+You can use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+-->
+
+**Operating system**:
+
+**Web server:**
+
+**Database:**
+
+**PHP version:**
+
+**Nextcloud version:** (see Nextcloud admin page)
+
+**Where did you install Nextcloud from:**
+
+**Signing status:**
+
+```
+Login as admin user into your Nextcloud and access
+http://example.com/index.php/settings/integrity/failed
+paste the results here.
+```
+
+**List of activated apps:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ app:list
+from within your Nextcloud installation folder
+```
+
+**Nextcloud configuration:**
+
+```
+If you have access to your command line run e.g.:
+sudo -u www-data php occ config:list system
+from within your Nextcloud installation folder
+
+or
+
+Insert your config.php content here
+Make sure to remove all sensitive content such as passwords. (e.g. database password, passwordsalt, secret, smtp password, …)
+```
+
+**Are you using an external user-backend, if yes which one:** LDAP/ActiveDirectory/Webdav/...
+
+### Client configuration
+**Browser:**
+
+**Operating system:**
+
+### Logs
+
+#### Nextcloud log (data/nextcloud.log)
+```
+Insert your Nextcloud log here
+```
+
+#### Browser log
+```
+Insert your browser log here, this could for example include:
+
+a) The javascript console log
+b) The network log
+c) ...
+```

js/.bowerrc

@@ -0,0 +1,3 @@
+{
+    "directory": "vendor"
+}

js/Gruntfile.js

@@ -0,0 +1,123 @@
+/*
+ * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
+ *
+ * @author Julius Härtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *  
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *  
+ */
+
+
+module.exports = function(grunt) {
+  'use strict';
+
+	grunt.loadNpmTasks('grunt-contrib-concat');
+	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-contrib-jshint');
+	grunt.loadNpmTasks('grunt-wrap');
+	grunt.loadNpmTasks('grunt-karma');
+	grunt.loadNpmTasks('grunt-phpunit');
+
+	grunt.initConfig({
+
+		meta: {
+			pkg: grunt.file.readJSON('package.json'),
+			version: '<%= meta.pkg.version %>',
+			configJS: 'config/',
+      buildJS: [
+					'app/**/*.js',
+					'controller/**/*.js',
+					'filters/**/*.js',
+					'directive/**/*.js',
+					'service/**/*.js'
+      ],
+			productionJS: 'public/',
+			testsJS: '../tests/js/'
+		},
+
+		concat: {
+			options: {
+				stripBanners: true
+			},
+			dist: {
+				src: ['<%= meta.buildJS %>'],
+				dest: '<%= meta.productionJS %>app.js'
+			}
+		},
+
+		wrap: {
+			app: {
+				src: ['<%= meta.productionJS %>app.js'],
+				dest: '<%= meta.productionJS %>app.js',
+				option: {
+					wrapper: [
+						'(function(angular, $, oc_requesttoken, undefined){\n\n\'use strict\';\n\n',
+						'\n})(angular, jQuery, oc_requesttoken);'
+					]
+				}
+			}
+		},
+
+		jshint: {
+			files: [
+				'Gruntfile.js',
+				'<%= meta.buildJS %>**/*.js',
+				'<%= meta.testsJS %>**/*.js'
+			],
+			options: {
+				jshintrc: '.jshintrc',
+				reporter: require('jshint-stylish')
+			}
+		},
+
+		watch: {
+			concat: {
+				files: ['<%=meta.buildJS%>'],
+				options: {
+					livereload: true
+				},
+				tasks: ['build']
+			}
+		},
+
+		phpunit: {
+			classes: {
+				dir: '../tests/unit'
+			},
+			options: {
+				bootstrap: '../tests/bootstrap.php',
+				colors: true
+			}
+		},
+
+		karma: {
+			unit: {
+				configFile: '<%= meta.testsJS %>config/karma.js'
+			},
+			continuous: {
+				configFile: '<%= meta.testsJS %>config/karma.js',
+				browsers: ['Firefox'],
+				singleRun: true,
+				reporters: ['progress']
+			}
+		},
+	});
+
+	// make tasks available under simpler commands
+	grunt.registerTask('build', ['jshint', 'concat', 'wrap']);
+	grunt.registerTask('js-unit', ['karma:continuous']);
+
+};

js/app/App.js

@@ -4,25 +4,22 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
-/* global angular */
-
-
 angular.module('markdown', [])
 	.provider('markdown', [function () {
 		var opts = {};
@@ -41,24 +38,13 @@ angular.module('markdown', [])
 		};
 	}]);
 
-import uirouter from '@uirouter/angularjs';
-import ngsanitize from 'angular-sanitize';
-import angularuiselect from 'ui-select';
-import ngsortable from 'ng-sortable';
-import md from 'angular-markdown-it';
-import nganimate from 'angular-animate';
-import 'angular-file-upload';
-import ngInfiniteScroll from 'ng-infinite-scroll';
-import '../legacy/jquery.atwho.min';
-import '../legacy/jquery.caret.min';
-
 var app = angular.module('Deck', [
-	ngsanitize,
-	uirouter,
-	angularuiselect,
-	ngsortable, md, nganimate,
-	'angularFileUpload',
-	ngInfiniteScroll
+	'ngRoute',
+	'ngSanitize',
+	'ui.router',
+	'ui.select',
+	'as.sortable',
+	'mdMarkdownIt',
+	'ngAnimate'
 ]);
 
-export default app;

js/app/Config.js

@@ -20,98 +20,57 @@
  *  
  */
 
-/* global app oc_requesttoken markdownitLinkTarget */
+app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
+    'use strict';
+    $httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
 
-import app from './App.js';
-import md from 'angular-markdown-it';
-import markdownitLinkTarget from 'markdown-it-link-target';
-import markdownitCheckbox from 'legacy/markdown-it-checkbox.js';
+    $compileProvider.debugInfoEnabled(true);
 
-app.config(function ($provide, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
-	'use strict';
-	$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
+    markdownItConverterProvider.config({
+        breaks: true,
+        linkify: true,
+        xhtmlOut: true
+    });
+    markdownItConverterProvider.use(markdownitLinkTarget);
 
+    $urlRouterProvider.otherwise('/');
 
-	$compileProvider.debugInfoEnabled(true);
-	// This should fix adding "unsafe:" prefix to ui-select href links containing javascript
-	// inline JS is blocked by CSP anyway and filtered out by our markdown renderer as well
-	$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|javascript):/);
-
-	markdownItConverterProvider.config({
-		breaks: true,
-		linkify: true,
-		xhtmlOut: true
-	});
-	markdownItConverterProvider.use(markdownitLinkTarget).use(markdownitCheckbox);
-
-	$urlRouterProvider.otherwise('/');
-
-	$stateProvider
-		.state('list', {
-			url: '/:filter',
-			templateUrl: '/boardlist.mainView.html',
-			controller: 'ListController',
+    $stateProvider
+        .state('list', {
+            url: '/:filter',
+            templateUrl: '/boardlist.mainView.html',
+            controller: 'ListController',
 			reloadOnSearch: false,
 			params: {
-				filter: {value: '', dynamic: true}
-			}
+				filter: { value: '', dynamic: true }
+            }
 		})
-		.state('board', {
-			url: '/board/:boardId/:filter',
-			templateUrl: '/board.html',
-			controller: 'BoardController',
-			params: {
-				filter: {value: '', dynamic: true}
-			}
-		})
-		.state('board.detail', {
-			url: '/detail/',
-			reloadOnSearch: false,
-			params: {
-				tab: {value: 0, dynamic: true},
-			},
-			views: {
-				'sidebarView@': {
-					templateUrl: '/board.sidebarView.html',
-					controller: 'BoardController'
+        .state('board', {
+            url: '/board/:boardId/:filter',
+            templateUrl: '/board.html',
+            controller: 'BoardController',
+            params: {
+                filter: { value: '', dynamic: true }
+            }
+        })
+        .state('board.detail', {
+            url: '/detail/',
+            reloadOnSearch : false,
+            views: {
+                'sidebarView': {
+                    templateUrl: '/board.sidebarView.html'
 				}
-			}
+            }
 		})
-		.state('board.card', {
-			url: '/card/:cardId',
-			params: {
-				tab: {value: 0, dynamic: true},
-			},
-			views: {
-				'sidebarView@': {
-					templateUrl: '/card.sidebarView.html',
-					controller: 'CardController'
-				}
-			}
-		});
+        .state('board.card', {
+            url: '/card/:cardId',
+            views: {
+                'sidebarView': {
+                    templateUrl: '/card.sidebarView.html',
+                    controller: 'CardController'
+                }
+            }
+        });
 
-	$provide.decorator('nvFileOverDirective', function ($delegate) {
-		var directive = $delegate[0],
-			link = directive.link;
 
-		directive.compile = function () {
-			return function (scope, element, attrs) {
-				var overClass = attrs.overClass || 'nv-file-over';
-				link.apply(this, arguments);
-				let counter = 0;
-				element.on('dragenter', function (event) {
-					counter++;
-				});
-				element.on('dragleave', function (event) {
-					counter--;
-					if (counter <= 0) {
-						$('.' + overClass).removeClass(overClass);
-					}
-				});
-			};
-		};
-
-		return $delegate;
-	});
-
-});
+});

js/app/Run.js

@@ -4,61 +4,73 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
-import app from './App.js';
 
-/* global Snap */
 app.run(function ($document, $rootScope, $transitions, BoardService) {
-	'use strict';
-
-	$document.click(function (event) {
-		$rootScope.$broadcast('documentClicked', event);
-	});
-	$transitions.onEnter({from: 'list'}, function ($state, $transition$) {
-		BoardService.unsetCurrrent();
-	});
-	$transitions.onEnter({to: 'list'}, function ($state, $transition$) {
+    'use strict';
+    $document.click(function (event) {
+        $rootScope.$broadcast('documentClicked', event);
+    });
+    $transitions.onEnter({from: 'list'}, function($state, $transition$) {
+        BoardService.unsetCurrrent();
+    });
+	$transitions.onEnter({to: 'list'}, function($state, $transition$) {
 		BoardService.unsetCurrrent();
 		document.title = "Deck - " + oc_defaults.name;
 	});
-	$transitions.onEnter({to: 'board.card'}, function ($state, $transition$) {
-		$rootScope.sidebar.show = true;
-	});
-	$transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) {
-		$rootScope.sidebar.show = true;
-	});
-	$transitions.onEnter({to: 'board'}, function ($state) {
-		$rootScope.sidebar.show = false;
-	});
-	$transitions.onExit({from: 'board.card'}, function ($state) {
-		$rootScope.sidebar.show = false;
-	});
-	$transitions.onExit({from: 'board.detail'}, function ($state) {
-		$rootScope.sidebar.show = false;
-	});
+    $transitions.onEnter({to: 'board.card'}, function ($state, $transition$) {
+        $rootScope.sidebar.show = true;
+    });
+    $transitions.onEnter({to: 'board.detail'}, function ($state, $transition$) {
+        $rootScope.sidebar.show = true;
+    });
+    $transitions.onEnter({to: 'board'}, function ($state) {
+        $rootScope.sidebar.show = false;
+    });
+    $transitions.onExit({from: 'board.card'}, function ($state) {
+        $rootScope.sidebar.show = false;
+    });
+    $transitions.onExit({from: 'board.detail'}, function ($state) {
+        $rootScope.sidebar.show = false;
+    });
 
-	$('link[rel="shortcut icon"]').attr(
-		'href',
-		OC.filePath('deck', 'img', 'app-512.png')
-	);
+    $('link[rel="shortcut icon"]').attr(
+        'href',
+        OC.filePath('deck', 'img', 'app-512.png')
+    );
 
-	// Select all elements with data-toggle="tooltips" in the document
-	$('body').tooltip({
-		selector: '[data-toggle="tooltip"]'
-	});
+    $('#app-navigation-toggle').off('click');
+    // App sidebar on mobile
+    var snapper = new Snap({
+        element: document.getElementById('app-content'),
+        disable: 'right',
+        maxPosition: 250,
+        touchToDrag: false
+    });
 
+    $('#app-navigation-toggle').click(function(){
+        if($(window).width() > 768) {
+            $('#app-navigation').toggle('hidden');
+        } else {
+            if(snapper.state().state === 'left'){
+                snapper.close();
+            } else {
+                snapper.open('left');
+            }
+        }
+    });
 });

js/bower.json

@@ -0,0 +1,29 @@
+{
+  "name": "deck",
+  "version": "0.0.1",
+  "dependencies": {
+    "angular": "~1.6.1",
+    "angular-route": "~1.6.1",
+    "angular-mocks": "~1.6.1",
+    "angular-sanitize": "~1.6.1",
+    "angular-animate": "~1.6.1",
+    "ng-sortable": "1.3.8",
+    "jquery": "3.2.x",
+    "es6-shim": "~0.*",
+    "js-url": "~2.*",
+    "angular-ui-select": "~0.19.6",
+    "angular-markdown-it": "~0.6.1",
+    "angular-ui-router": "~1.0.0",
+    "markdown-it-link-target": "~1.0.1",
+    "jquery-timepicker": "883bb2cd94"
+  },
+  "license": "AGPL-3.0",
+  "private": true,
+  "ignore": [
+    "'**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}

js/controller/ActivityController.js

@@ -1,326 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/* global OC OCA OCP t escapeHTML */
-
-import CommentCollection from '../legacy/commentcollection';
-import CommentModel from '../legacy/commentmodel';
-
-class ActivityController {
-	constructor ($scope, CardService, ActivityService, BoardService) {
-		'ngInject';
-		this.cardservice = CardService;
-		this.boardservice = BoardService;
-		this.activityservice = ActivityService;
-		this.$scope = $scope;
-		this.type = '';
-		this.loading = false;
-		this.status = {
-			commentCreateLoading: false
-		};
-		this.$scope.newComment = '';
-
-		this.currentUser = OC.getCurrentUser();
-
-		const self = this;
-		this.$scope.$watch(function () {
-			return self.element.id;
-		}, function (params) {
-			if (self.getData(self.element.id).length === 0) {
-				if (self.type === 'deck_card') {
-					self.activityservice.loadComments(self.element.id);
-				}
-				self.loading = true;
-				self.fetchUntilResults();
-			}
-			self.activityservice.fetchNewerActivities(self.type, self.element.id).then(function () {});
-			if (self.type === 'deck_card') {
-				self.cardservice.getCurrent().commentsUnread = 0;
-			}
-		}, true);
-
-		let $target = $('.newCommentForm .message');
-		this.applyAtWho($target);
-
-		this.activityservice.subscribe(this.$scope, function() {
-			self.$scope.$apply();
-		});
-	}
-
-	applyAtWho($target) {
-		const self = this;
-		if (!$target) {
-			return;
-		}
-		$target.atwho({
-			at: '@',
-			callbacks: {
-				remoteFilter: function(query, callback) {
-					let uids = self.boardservice.getUsers();
-					uids = uids.filter((x) => x.uid.toLowerCase().includes(query.toLowerCase()) || x.displayname.toLowerCase().includes(query.toLowerCase()));
-					callback(uids);
-				},
-				highlighter: function (li) {
-					// misuse the highlighter callback to instead of
-					// highlighting loads the avatars.
-					var $li = $(li);
-					$li.find('.avatar').avatar(undefined, 32);
-					return $li;
-				},
-				sorter: function (q, items) { return items; }
-			},
-			displayTpl: function (item) {
-				return '<li>' +
-					'<span class="avatar-name-wrapper">' +
-					'<span class="avatar" ' +
-					'data-username="' + escapeHTML(item.uid) + '" ' + // for avatars
-					'data-user="' + escapeHTML(item.uid) + '" ' + // for contactsmenu
-					'data-user-display-name="' + escapeHTML(item.displayname) + '">' +
-					'</span>' +
-					'<strong>' + escapeHTML(item.displayname) + '</strong>' +
-					'</span></li>';
-			},
-			insertTpl: function (item) {
-				return '' +
-					'<span class="avatar-name-wrapper">' +
-					'<span class="avatar" ' +
-					'data-username="' + escapeHTML(item.uid) + '" ' + // for avatars
-					'data-user="' + escapeHTML(item.uid) + '" ' + // for contactsmenu
-					'data-user-display-name="' + escapeHTML(item.displayname) + '">' +
-					'</span>' +
-					'<strong>' + escapeHTML(item.displayname) + '</strong>' +
-					'</span>';
-			},
-			searchKey: 'displayname'
-		});
-		$target.on('inserted.atwho', function (je, $el) {
-			$(je.target).find(
-				'span[data-username="' + $el.find('[data-username]').data('username') + '"]'
-			).avatar(undefined, 16);
-		});
-		$target.on('shown.atwho', function (je) {
-			$target.find('.avatar').avatar(undefined, 16);
-		});
-	}
-
-	commentBodyToPlain(content) {
-		let $comment = $('<div/>').html(content);
-		$comment.find('.avatar-name-wrapper').each(function () {
-			var $this = $(this);
-			var $inserted = $this.parent();
-			$inserted.html('@' + $this.find('.avatar').data('username'));
-		});
-		$comment.html(OCP.Comments.richToPlain($comment.html()));
-		$comment.html($comment.html().replace(/<br\s*[\/]?>/gi, '\n'));
-		return $comment.text();
-	}
-
-	static _composeHTMLMention(uid, displayName) {
-		var avatar = '' +
-			'<span class="avatar" data-username="' + escapeHTML(uid) + '" data-user="' + escapeHTML(uid) + '" ng-attr-size="16" ' +
-			'ng-attr-user="' + escapeHTML(uid) + '" ' +
-			'ng-attr-displayname="' + escapeHTML(displayName) + '" ng-attr-contactsmenu="true">' +
-			'</span>';
-
-		var isCurrentUser = (uid === OC.getCurrentUser().uid);
-
-		return '' +
-			'<span class="atwho-inserted" contenteditable="false">' +
-			'<span class="avatar-name-wrapper' + (isCurrentUser ? ' currentUser' : '') + '">' +
-			avatar +
-			'<strong>' + escapeHTML(displayName) + '</strong>' +
-			'</span>' +
-			'</span>';
-	}
-
-	formatMessage(activity) {
-		let message = activity.message;
-		let mentions = activity.commentModel.get('mentions');
-		const editMode = false;
-		message = escapeHTML(message).replace(/\n/g, '<br/>');
-
-		for(var i in mentions) {
-			if(!mentions.hasOwnProperty(i)) {
-				return;
-			}
-			var mention = '@' + mentions[i].mentionId;
-			// escape possible regex characters in the name
-			mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-
-			const displayName = ActivityController._composeHTMLMention(mentions[i].mentionId, mentions[i].mentionDisplayName);
-			// replace every mention either at the start of the input or after a whitespace
-			// followed by a non-word character.
-			message = message.replace(new RegExp('(^|\\s)(' + mention + ')\\b', 'g'),
-				function(match, p1) {
-					// to  get number of whitespaces (0 vs 1) right
-					return p1+displayName;
-				}
-			);
-
-		}
-		if(editMode !== true) {
-			message = OCP.Comments.plainToRich(message);
-		}
-		return message;
-	}
-
-	postComment() {
-		const self = this;
-		this.status.commentCreateLoading = true;
-
-		let content = this.commentBodyToPlain(self.$scope.newComment);
-		if (content.length < 1) {
-			self.status.commentCreateLoading = false;
-			OC.Notification.showTemporary(t('deck', 'Please provide a content for your comment.'));
-			return;
-		}
-		var model = this.activityservice.commentCollection.create({
-			actorId: OC.getCurrentUser().uid,
-			actorDisplayName: OC.getCurrentUser().displayName,
-			actorType: 'users',
-			verb: 'comment',
-			message: content,
-			creationDateTime: (new Date()).toUTCString()
-		}, {
-			at: 0,
-			// wait for real creation before adding
-			wait: true,
-			success: function() {
-				self.$scope.newComment = '';
-				self.activityservice.fetchNewerActivities(self.type, self.element.id).then(function () {});
-				self.status.commentCreateLoading = false;
-			},
-			error: function() {
-				self.status.commentCreateLoading = false;
-				OC.Notification.showTemporary(t('deck', 'Posting the comment failed.'));
-			}
-		});
-	}
-
-	updateComment(item) {
-		item.commentEdit = this.formatMessage(item);
-		let $target = $('.newCommentForm .message');
-		this.applyAtWho($target);
-		/** Workaround to trigger avatar rendering after the view has been updated */
-		window.setTimeout(function () {
-			$target.find('.avatar').avatar(undefined, 16);
-		}, 0);
-	}
-
-	editComment(item) {
-		const self = this;
-		let content = this.commentBodyToPlain(item.commentEdit);
-		if (content.length < 1) {
-			OC.Notification.showTemporary(t('deck', 'Please provide a content for your comment.'));
-			return;
-		}
-		/** We need to save the model and afterwards run a fetch to update the mentions
-		 * and call apply to propagate the changes to angular
-		 */
-		item.commentModel.on('sync', function() {
-			item.commentModel.off('sync');
-			item.commentModel.fetch({
-				success: function() {
-					self.$scope.$apply();
-				}
-			});
-		});
-		item.commentModel.save({
-			message: content,
-		});
-		item.message = content;
-		item.commentEdit = undefined;
-	}
-
-	deleteComment(item) {
-		item.commentModel.destroy();
-		item.deleted = true;
-		item.commentModel = undefined;
-		item.message = t('deck', 'The comment has been deleted');
-	}
-
-	getData(id) {
-		return this.activityservice.getData(this.type, id);
-	}
-
-	parseMessage(subject, parameters) {
-		OCA.Activity.RichObjectStringParser._userLocalTemplate = '<span class="avatar-name-wrapper"><avatar ng-attr-contactsmenu ng-attr-tooltip ng-attr-user="{{ id }}" ng-attr-displayname="{{name}}" ng-attr-size="16"></avatar> {{ name }}</span>';
-		return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters);
-	}
-
-	fetchUntilResults () {
-		const self = this;
-		let dataLengthBefore = self.getData(self.element.id).length;
-		let _executeFetch = function() {
-			let promise = self.activityservice.fetchMoreActivities(self.type, self.element.id);
-			promise.then(function (data) {
-				let dataLengthAfter = self.getData(self.element.id).length;
-				if (data !== null && (dataLengthAfter <= dataLengthBefore || dataLengthAfter < self.activityservice.RESULT_PER_PAGE)) {
-					_executeFetch();
-				} else {
-					self.loading = false;
-				}
-			}, function () {
-				self.loading = false;
-				self.$scope.$apply();
-			});
-
-		};
-		_executeFetch();
-	}
-
-	getComments() {
-		return this.activityservice.comments;
-	}
-
-	getActivityStream() {
-		let activities = this.activityservice.getData(this.type, this.element.id);
-		return activities;
-	}
-
-	page() {
-		if (!this.activityservice.since[this.type][this.element.id].finished) {
-			this.loading = true;
-			this.fetchUntilResults();
-		} else {
-			this.loading = false;
-		}
-	}
-
-	loadingNewer() {
-		return this.activityservice.runningNewer;
-	}
-
-	t(text) {
-		return t('deck', text);
-	}
-}
-
-let activityComponent = {
-	templateUrl: OC.linkTo('deck', 'templates/part.card.activity.html'),
-	controller: ActivityController,
-	bindings: {
-		type: '@',
-		element: '='
-	}
-};
-export default activityComponent;

js/controller/AppController.js

@@ -4,41 +4,26 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
-import app from '../app/App.js';
-
-/** global: OC */
-app.controller('AppController', function ($scope, $location, $http, $log, $rootScope, $attrs) {
-	$rootScope.sidebar = {
-		show: false
-	};
-	$scope.sidebar = $rootScope.sidebar;
-	$scope.user = oc_current_user;
-	$rootScope.config = JSON.parse($attrs.config);
-
-	$rootScope.compactMode = localStorage.getItem('deck.compactMode') === 'true';
-
-	$scope.appNavigationHide = false;
-
-	$scope.toggleSidebar = function() {
-		if ($(window).width() > 768) {
-			$scope.appNavigationHide = !$scope.appNavigationHide;
-			console.log($scope.appNavigationHide);
-		}
-	};
-});
+app.controller('AppController', function ($scope, $location, $http, $route, $log, $rootScope, $stateParams) {
+    $rootScope.sidebar = {
+        show: false
+    };
+    $scope.sidebar = $rootScope.sidebar;
+    $scope.user = oc_current_user;
+});

js/controller/AttachmentController.js

@@ -1,78 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *  
- */
-
-/* global OC */
-
-class AttachmentListController {
-	constructor ($scope, CardService, FileService) {
-		'ngInject';
-		this.cardservice = CardService;
-		this.fileservice = FileService;
-		this.attachments = CardService.getCurrent().attachments;
-	}
-
-	mimetypeForAttachment(attachment) {
-		let url = OC.MimeType.getIconUrl(attachment.extendedData.mimetype);
-		let styles = {
-			'background-image': `url("${url}")`,
-		};
-		return styles;
-	}
-
-	attachmentUrl(attachment) {
-		let cardId = this.cardservice.getCurrent().id;
-		let attachmentId = attachment.id;
-		return OC.generateUrl(`/apps/deck/cards/${cardId}/attachment/${attachmentId}`);
-	}
-
-	getAttachmentMarkdown(attachment) {
-		const inlineMimetypes = ['image/png', 'image/jpg', 'image/jpeg'];
-		let url = this.attachmentUrl(attachment);
-		let filename = attachment.data;
-		let insertText = `[📎 ${filename}](${url})`;
-		if (inlineMimetypes.indexOf(attachment.extendedData.mimetype) > -1) {
-			insertText = `![📎 ${filename}](${url})`;
-		}
-		return insertText;
-	}
-
-	select(attachment) {
-		this.onSelect({attachment: this.getAttachmentMarkdown(attachment)});
-	}
-
-	abort() {
-		this.onAbort();
-	}
-
-}
-
-let attachmentListComponent = {
-	templateUrl: '/card.attachments.html',
-	controller: AttachmentListController,
-	bindings: {
-		isFileSelector: '<',
-		attachments: '=',
-		onSelect: '&',
-		onAbort: '&'
-	}
-};
-export default attachmentListComponent;

js/controller/BoardController.js

@@ -4,25 +4,23 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
-import app from '../app/App.js';
-/* global oc_defaults OC OCP OCA */
-app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter, FileService) {
+app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions, $filter) {
 
 	$scope.sidebar = $rootScope.sidebar;
 
@@ -31,134 +29,58 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		addCard: [],
 	};
 	$scope.newLabel = {};
+	$scope.status.boardtab = $stateParams.detailTab;
 
-	$scope.OC = OC;
 	$scope.stackservice = StackService;
 	$scope.boardservice = BoardService;
 	$scope.cardservice = CardService;
 	$scope.statusservice = StatusService.getInstance();
 	$scope.labelservice = LabelService;
 	$scope.defaultColors = ['31CC7C', '317CCC', 'FF7A66', 'F1DB50', '7C31CC', 'CC317C', '3A3B3D', 'CACBCD'];
-	$scope.board = BoardService.getCurrent();
-	$scope.uploader = FileService.uploader;
-
-	$scope.startTitleEdit = function(card) {
-		card.renameTitle = card.title;
-		card.status = card.status || {};
-		card.status.editCard = true;
-	};
-
-	$scope.finishTitleEdit = function(card) {
-		var newTitle;
-		if (!card.renameTitle || !card.renameTitle.trim()) {
-			newTitle = '';
-		} else {
-			newTitle = card.renameTitle.trim();
-		}
-
-		if (newTitle === card.title) {
-			// title unchanged
-			card.status.editCard = false;
-			delete card.renameTitle;
-		} else if (newTitle !== '') {
-			// title changed
-			card.title = newTitle;
-			CardService.update(card).then(function (data) {
-				card.status.editCard = false;
-				delete card.renameTitle;
-			});
-		} else {
-			// empty title
-			card.status.editCard = false;
-			delete card.renameTitle;
-		}
-	};
-
-	$scope.$watch(function() {
-		return $state.current;
-	}, function(currentState) {
-		if(currentState.name === 'board.detail') {
-			CardService.fetchDeleted($scope.id);
-			StackService.fetchDeleted($scope.id);
-		}
-	});
-
-	// workaround for $stateParams changes not being propagated
-	$scope.$watch(function() {
-		return $state.params;
-	}, function (params) {
-		$scope.params = params;
-	}, true);
-	$scope.params = $state.params;
-
-	/**
-	 * Check for markdown checkboxes in description to render the counter
-	 *
-	 * This should probably be moved to the backend at some point
-	 *
-	 * @param text
-	 * @returns array of [finished, total] checkboxes
-	 */
-	$scope.getCheckboxes = function(text) {
-		const regTotal = /\[(X|\s|\_|\-)\]\s(.*)/ig;
-		const regFinished = /\[(X|\_|\-)\]\s(.*)/ig;
-		return [
-			((text || '').match(regFinished) || []).length,
-			((text || '').match(regTotal) || []).length
-		];
-	};
 
 	$scope.search = function (searchText) {
 		$scope.searchText = searchText;
 		$scope.refreshData();
 	};
 
-	$scope.$watch(function () {
-		if (typeof BoardService.getCurrent() !== 'undefined') {
-			return BoardService.getCurrent().title;
+	$scope.board = BoardService.getCurrent();
+	StackService.clear(); //FIXME: Is this still needed?
+	$scope.setPageTitle = function() {
+		if(BoardService.getCurrent()) {
+			document.title = BoardService.getCurrent().title + " | Deck - " + oc_defaults.name;
 		} else {
-			return null;
+			document.title = "Deck - " + oc_defaults.name;
 		}
-	}, function () {
-		$scope.setPageTitle();
+	};
+	$scope.statusservice.retainWaiting();
+	$scope.statusservice.retainWaiting();
+
+	// FIXME: ugly solution for archive
+	$scope.$state = $stateParams;
+	$scope.filter = $stateParams.filter;
+	$scope.$watch('$state.filter', function (name) {
+		$scope.filter = name;
 	});
-	$scope.setPageTitle = function () {
-		if (BoardService.getCurrent()) {
-			document.title = BoardService.getCurrent().title + ' | Deck - ' + oc_defaults.name;
-		} else {
-			document.title = 'Deck - ' + oc_defaults.name;
-		}
-	};
-
-	$scope.statusservice.retainWaiting();
-	$scope.statusservice.retainWaiting();
-
-	// handle filter parameter for switching between archived/unarchived cards
 	$scope.switchFilter = function (filter) {
-		$state.go('.', {filter: filter});
+		$state.go('.', {filter: filter}, {notify: false});
+		$scope.filter = filter;
 	};
-	$scope.$watch(function() {
-		return $scope.params.filter;
-	}, function (filter) {
-		if (filter === 'archive') {
+	$scope.$watch('filter', function (name) {
+		if (name === "archive") {
 			$scope.loadArchived();
 		} else {
 			$scope.loadDefault();
 		}
 	});
 
-	$scope.toggleCompactMode = function() {
-		$rootScope.compactMode = !$rootScope.compactMode;
-		localStorage.setItem('deck.compactMode', JSON.stringify($rootScope.compactMode));
-	};
 
 	$scope.stacksData = StackService;
 	$scope.stacks = [];
-	$scope.$watch('stacksData', function () {
+	$scope.$watch('stacksData', function (value) {
 		$scope.refreshData();
 	}, true);
 	$scope.refreshData = function () {
-		if ($scope.params.filter === 'archive') {
+		if ($scope.filter === "archive") {
 			$scope.filterData('-lastModified', $scope.searchText);
 		} else {
 			$scope.filterData('order', $scope.searchText);
@@ -170,9 +92,8 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 
 	// filter cards here, as ng-sortable will not work nicely with html-inline filters
 	$scope.filterData = function (order, text) {
-		if ($scope.stacks === undefined) {
+		if ($scope.stacks === undefined)
 			return;
-		}
 		angular.copy(StackService.getData(), $scope.stacks);
 		$scope.stacks = $filter('orderBy')($scope.stacks, 'order');
 		angular.forEach($scope.stacks, function (value, key) {
@@ -216,101 +137,30 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 	// Create a new Stack
 	$scope.createStack = function () {
 		StackService.create($scope.newStack).then(function (data) {
-			$scope.newStack.title = '';
+			$scope.newStack.title = "";
 		});
 	};
 
 	$scope.createCard = function (stack, title) {
-		if (this['addCardForm' + stack].$valid) {
-			var newCard = {
-				'title': title,
-				'stackId': stack,
-				'type': 'plain'
-			};
-			CardService.create(newCard).then(function (data) {
-				$scope.stackservice.addCard(data);
-				$scope.newCard.title = '';
-			});
-		}
-	};
-
-	$scope.stackDelete = function (stack) {
-		$scope.stackservice.delete(stack.id);
-	};
-
-	$scope.stackUndoDelete = function (deletedStack) {
-		return StackService.undoDelete(deletedStack);
+		var newCard = {
+			'title': title,
+			'stackId': stack,
+			'type': 'plain'
+		};
+		CardService.create(newCard).then(function (data) {
+			$scope.stackservice.addCard(data);
+			$scope.newCard.title = "";
+		});
 	};
 
 	$scope.cardDelete = function (card) {
-		CardService.delete(card.id).then(function () {
-			StackService.removeCard(card);
-		});
+		CardService.delete(card.id);
+		StackService.removeCard(card);
 	};
-
-	$scope.cardOrCardAndStackUndoDelete = function (deletedCard) {
-		var associatedDeletedStack = $scope.stackservice.deleted[deletedCard.stackId];
-		if(associatedDeletedStack !== undefined) {
-			$scope.cardAndStackUndoDeleteAskForConfirmation(deletedCard, associatedDeletedStack);
-		} else {
-			$scope.cardUndoDelete(deletedCard);
-		}
-	};
-
-	$scope.cardAndStackUndoDeleteAskForConfirmation = function(deletedCard, associatedDeletedStack) {
-		OC.dialogs.confirm(
-			t('deck', 'The associated stack is deleted as well, it will be restored as well.'),
-			t('deck', 'Restore associated stack'),
-			function(state) {
-				if (state) {
-					$scope.cardAndStackUndoDelete(deletedCard, associatedDeletedStack);
-				}
-			}
-		);
-	};
-
-	$scope.cardAndStackUndoDelete = function(deletedCard, associatedDeletedStack) {
-		$scope.stackUndoDelete(associatedDeletedStack).then(function() {
-			$scope.cardUndoDelete(deletedCard);
-		});
-	};
-
-	$scope.cardUndoDelete = function(deletedCard) {
-		CardService.undoDelete(deletedCard).then(function() {
-			StackService.addCard(deletedCard);
-		});
-	};
-
 	$scope.cardArchive = function (card) {
 		CardService.archive(card);
 		StackService.removeCard(card);
 	};
-
-	$scope.isCurrentUserAssigned = function (card) {
-		if (! CardService.get(card.id).assignedUsers) {
-			return false;
-		}
-		var userList = CardService.get(card.id).assignedUsers.filter(function (obj) {
-			return obj.participant.uid === OC.getCurrentUser().uid;
-		});
-		return userList.length === 1;
-	};
-
-	$scope.cardAssignToMe = function (card) {
-		CardService.assignUser(card, OC.getCurrentUser().uid)
-			.then(
-				function() {StackService.updateCard(card);}
-			);
-		// TODO: remove this jquery call. Fix and use appPopoverMenuUtils instead
-		$('.popovermenu').addClass('hidden');
-	};
-
-	$scope.cardUnassignFromMe = function (card) {
-		CardService.unassignUser(card, OC.getCurrentUser().uid);
-		StackService.updateCard(card);
-		// TODO: remove this jquery call.Fix and use appPopoverMenuUtils instead
-		$('.popovermenu').addClass('hidden');
-	};
 	$scope.cardUnarchive = function (card) {
 		CardService.unarchive(card);
 		StackService.removeCard(card);
@@ -323,15 +173,12 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		BoardService.getCurrent().labels.splice(i, 1);
 		// TODO: remove from cards
 	};
-
 	$scope.labelCreate = function (label) {
 		label.boardId = $scope.id;
-		LabelService.create(label).then(function (data) {
-			$scope.newStack.title = '';
-			BoardService.getCurrent().labels.push(data);
-			$scope.status.createLabel = false;
-			$scope.newLabel = {};
-		});
+		LabelService.create(label);
+		BoardService.getCurrent().labels.push(label);
+		$scope.status.createLabel = false;
+		$scope.newLabel = {};
 	};
 	$scope.labelUpdate = function (label) {
 		label.edit = false;
@@ -343,31 +190,13 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		BoardService.addAcl(sharee);
 		$scope.status.addSharee = null;
 	};
-
 	$scope.aclDelete = function (acl) {
-		BoardService.deleteAcl(acl).then(function(data) {
-			$scope.loadDefault();
-			$scope.refreshData();
-		});
+		BoardService.deleteAcl(acl);
 	};
-
 	$scope.aclUpdate = function (acl) {
 		BoardService.updateAcl(acl);
 	};
 
-	$scope.aclTypeString = function (acl) {
-		if (typeof acl === 'undefined') {
-			return '';
-		}
-		switch (acl.type) {
-			case OC.Share.SHARE_TYPE_USER:
-				return 'user';
-			case OC.Share.SHARE_TYPE_GROUP:
-				return 'group';
-			default:
-				return '';
-		}
-	};
 
 	// settings for card sorting
 	$scope.sortOptions = {
@@ -398,26 +227,26 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 				$scope.refreshData();
 			});
 		},
-		scrollableContainer: '#innerBoard',
+		scrollableContainer: '#board',
 		containerPositioning: 'relative',
-		containment: '#innerBoard',
+		containment: '#board',
 		longTouch: true,
 		// auto scroll on drag
 		dragMove: function (itemPosition, containment, eventObj) {
 			if (eventObj) {
-				var container = $('#board');
+				var container = $("#board");
 				var offset = container.offset();
 				var targetX = eventObj.pageX - (offset.left || container.scrollLeft());
 				var targetY = eventObj.pageY - (offset.top || container.scrollTop());
 				if (targetX < offset.left) {
-					container.scrollLeft(container.scrollLeft() - 25);
+					container.scrollLeft(container.scrollLeft() - 50);
 				} else if (targetX > container.width()) {
-					container.scrollLeft(container.scrollLeft() + 25);
+					container.scrollLeft(container.scrollLeft() + 50);
 				}
 				if (targetY < offset.top) {
-					container.scrollTop(container.scrollTop() - 25);
+					container.scrollTop(container.scrollTop() - 50);
 				} else if (targetY > container.height()) {
-					container.scrollTop(container.scrollTop() + 25);
+					container.scrollTop(container.scrollTop() + 50);
 				}
 			}
 		},
@@ -437,10 +266,11 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		},
 		scrollableContainer: '#board',
 		containerPositioning: 'relative',
-		containment: '#innerBoard',
+		containment: '#board',
+		longTouch: true,
 		dragMove: function (itemPosition, containment, eventObj) {
 			if (eventObj) {
-				var container = $('#board');
+				var container = $("#board");
 				var offset = container.offset();
 				var targetX = eventObj.pageX - (offset.left || container.scrollLeft());
 				var targetY = eventObj.pageY - (offset.top || container.scrollTop());
@@ -461,34 +291,4 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		}
 	};
 
-	$scope.labelStyle = function (color) {
-		return {
-			'background-color': '#' + color,
-			'color': $filter('textColorFilter')(color)
-		};
-	};
-
-	$scope.colorValue = function(color) {
-		const re = /^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/;
-		if (re.test(color)) {
-			return color;
-		}
-		return '';
-	};
-
-	$scope.attachmentCount = function(card) {
-		if (Array.isArray(card.attachments)) {
-			return card.attachments.filter((obj) => obj.deletedAt === 0).length;
-		}
-		return card.attachmentCount;
-	};
-
-	$scope.unreadCommentCount = function(card) {
-		return card.commentsUnread;
-	};
-
-	$scope.isTimelineEnabled = function() {
-		return OCP.Comments && OCA.Activity;
-	};
-
 });

js/controller/CardController.js

@@ -4,211 +4,85 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
 
-/* global app moment angular OC OCP OCA */
-import app from '../app/App.js';
+/* global app */
+/* global moment */
 
-app.controller('CardController', function ($scope, $rootScope, $sce, $location, $stateParams, $state, $interval, $timeout, $filter, BoardService, CardService, StackService, StatusService, markdownItConverter, FileService) {
+app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, BoardService, CardService, StackService, StatusService) {
 	$scope.sidebar = $rootScope.sidebar;
-	$scope.status = {
-		renameTitle: '',
-		lastEdit: 0,
-		lastSave: Date.now()
-	};
+	$scope.status = {};
 
 	$scope.cardservice = CardService;
-	$scope.fileservice = FileService;
 	$scope.cardId = $stateParams.cardId;
 
 	$scope.statusservice = StatusService.getInstance();
 	$scope.boardservice = BoardService;
 
-	$scope.isArray = angular.isArray;
-	// workaround for $stateParams changes not being propagated
-	$scope.$watch(function() {
-		return $state.params;
-	}, function (params) {
-		$scope.params = params;
-		$scope.fileservice.reset();
-	}, true);
-	$scope.params = $state.params;
-
-	$scope.addAttachmentToDescription = function(insertText) {
-		let el = document.querySelectorAll('textarea')[0];
-		let start = el.selectionStart;
-		let end = el.selectionEnd;
-		let text = $scope.status.edit.description || '';
-		let before = text.substring(0, start);
-		let after = text.substring(end, text.length);
-		let newText = before + '\n' + insertText + '\n' + after;
-		$scope.status.edit.description = newText;
-		el.selectionStart = el.selectionEnd = start + newText.length;
-		el.focus();
-		$scope.status.continueEdit = false;
-		$scope.cardEditDescriptionChanged();
-		$scope.status.selectAttachment = false;
-	};
-
-	$scope.abortAttachmentSelection = function() {
-		$scope.status.continueEdit = false;
-		$scope.status.selectAttachment = false;
-		let el = document.querySelectorAll('textarea')[0];
-		el.focus();
-	};
-
 	$scope.statusservice.retainWaiting();
 
-	$scope.description = function() {
-		return $scope.rendered;
-	};
-
-	$scope.updateMarkdown = function(content) {
-		// only trust the html from markdown-it-checkbox
-		$scope.rendered = $sce.trustAsHtml(markdownItConverter.render(content || ''));
-	};
-
 	CardService.fetchOne($scope.cardId).then(function (data) {
 		$scope.statusservice.releaseWaiting();
 		$scope.archived = CardService.getCurrent().archived;
-		$scope.updateMarkdown(CardService.getCurrent().description);
 	}, function (error) {
 	});
 
 	$scope.cardRenameShow = function () {
-		if ($scope.archived || !BoardService.canEdit()) {
+		if ($scope.archived || !BoardService.canEdit())
 			return false;
-		} else {
-			$scope.status.renameTitle = CardService.getCurrent().title;
+		else {
 			$scope.status.cardRename = true;
 		}
 	};
-
-	$scope.toggleCheckbox = function (id) {
-		$('#markdown input[type=checkbox]').attr('disabled', true);
-		$scope.status.edit = angular.copy(CardService.getCurrent());
-		var reg = /\[(X|\s|\_|\-)\]\s(.*)/ig;
-		var nth = 0;
-		$scope.status.edit.description = $scope.status.edit.description.replace(reg, function (match, i, original) {
-			var result = match;
-			if (nth++ === id) {
-				if (match.match(/^\[\s\]/i)) {
-					result = match.replace(/\[\s\]/i, '[x]');
-				}
-				if (match.match(/^\[x\]/i)) {
-					result = match.replace(/\[x\]/i, '[ ]');
-				}
-				return result;
-			}
-			return match;
-		});
-		CardService.update($scope.status.edit).then(function (data) {
-			var header = $('.section-header-tabbed .tabDetails');
-			header.find('.save-indicator.unsaved').hide();
-			header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
-		});
-		$('#markdown input[type=checkbox]').removeAttr('disabled');
-
-	};
-	$scope.clickCardDescription = function ($event) {
-		var checkboxId = $($event.target).data('id');
-		if ($event.target.tagName === 'LABEL') {
-			$scope.toggleCheckbox(checkboxId);
-			return;
-		}
-		if ($event.target.tagName === 'INPUT') {
-			$scope.toggleCheckbox(checkboxId);
-			return;
-		}
+	$scope.cardEditDescriptionShow = function ($event) {
 		if (BoardService.isArchived() || CardService.getCurrent().archived) {
 			return false;
 		}
+		var node = $event.target.nodeName;
 		if ($scope.card.archived || !$scope.boardservice.canEdit()) {
-			return false;
+			console.log(node);
+		} else {
+			console.log("edit");
+			$scope.status.cardEditDescription = true;
 		}
-		$scope.status.cardEditDescription = true;
-		$scope.status.edit = angular.copy(CardService.getCurrent());
-		return true;
+		console.log($scope.status.canEditDescription);
 	};
-	$scope.cardEditDescriptionChanged = function ($event) {
-		$scope.status.lastEdit = Date.now();
-		var header = $('.section-header-tabbed .tabDetails');
-		header.find('.save-indicator.unsaved').show();
-		header.find('.save-indicator.saved').hide();
-	};
-	$interval(function() {
-		var currentTime = Date.now();
-		var timeSinceEdit = currentTime-$scope.status.lastEdit;
-		if (timeSinceEdit > 1000 && $scope.status.lastEdit > $scope.status.lastSave && !$scope.status.saving) {
-			$scope.status.lastSave = currentTime;
-			$scope.status.saving = true;
-			var header = $('.section-header-tabbed .tabDetails');
-			header.find('.save-indicator.unsaved').fadeIn(500);
-			CardService.update($scope.status.edit).then(function (data) {
-				var header = $('.section-header-tabbed .tabDetails');
-				header.find('.save-indicator.unsaved').hide();
-				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
-				$scope.status.saving = false;
-			});
-		}
-	}, 500, 0, false);
-
 	// handle rename to update information on the board as well
 	$scope.cardRename = function (card) {
-		var newTitle;
-		if (!$scope.status.renameTitle || !$scope.status.renameTitle.trim()) {
-			newTitle = '';
-		} else {
-			newTitle = $scope.status.renameTitle.trim();
-		}
-
-		if (newTitle === card.title) {
-			// title unchanged
+		CardService.rename(card).then(function (data) {
+			StackService.updateCard(card);
 			$scope.status.renameCard = false;
-		} else if (newTitle !== '') {
-			// title changed
-			card.title = newTitle;
-			CardService.rename(card).then(function (data) {
-				$scope.status.renameCard = false;
-			});
-		} else {
-			// empty title
-			$scope.status.renameTitle = card.title;
-			$scope.status.renameCard = false;
-		}
+		});
 	};
 	$scope.cardUpdate = function (card) {
-		CardService.update(card).then(function (data) {
+		CardService.update(CardService.getCurrent()).then(function (data) {
 			$scope.status.cardEditDescription = false;
-			$scope.updateMarkdown($scope.status.edit.description);
-			var header = $('.section-header-tabbed .tabDetails');
-			header.find('.save-indicator.unsaved').hide();
-			header.find('.save-indicator.saved').fadeIn(500).fadeOut(1000);
+			$('#card-description').find('.save-indicator').fadeIn(500).fadeOut(1000);
 		});
 	};
 
 	$scope.labelAssign = function (element, model) {
-		CardService.assignLabel($scope.cardId, element.id).then(function (data) {
-		});
+		CardService.assignLabel($scope.cardId, element.id);
+		var card = CardService.getCurrent();
+		StackService.updateCard(card);
 	};
 
 	$scope.labelRemove = function (element, model) {
-		CardService.removeLabel($scope.cardId, element.id).then(function (data) {
-		});
+		CardService.removeLabel($scope.cardId, element.id)
 	};
 
 	$scope.setDuedate = function (duedate) {
@@ -222,6 +96,7 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		newDate.year(duedate.year());
 		element.duedate = newDate.toISOString();
 		CardService.update(element);
+		StackService.updateCard(element);
 	};
 	$scope.setDuedateTime = function (time) {
 		var element = CardService.getCurrent();
@@ -233,53 +108,13 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		newDate.minute(time.minute());
 		element.duedate = newDate.toISOString();
 		CardService.update(element);
+		StackService.updateCard(element);
 	};
 
 	$scope.resetDuedate = function () {
 		var element = CardService.getCurrent();
 		element.duedate = null;
 		CardService.update(element);
+		StackService.updateCard(element);
 	};
-
-	/**
-	 * Show ui-select field when clicking the add button
-	 */
-	$scope.toggleAssignUser = function() {
-		$scope.status.showAssignUser = !$scope.status.showAssignUser;
-		if ($scope.status.showAssignUser === true) {
-			$timeout(function () {
-				$('#assignUserSelect').find('a').click();
-			});
-		}
-	};
-
-	/**
-	 * Hide ui-select when select list is closed
-	 */
-	$scope.assingUserOpenClose = function(isOpen) {
-		$scope.status.showAssignUser = isOpen;
-	};
-
-	$scope.addAssignedUser = function(item) {
-		CardService.assignUser(CardService.getCurrent(), item.uid).then(function (data) {
-		});
-		$scope.status.showAssignUser = false;
-	};
-
-	$scope.removeAssignedUser = function(uid) {
-		CardService.unassignUser(CardService.getCurrent(), uid).then(function (data) {
-		});
-	};
-
-	$scope.labelStyle = function (color) {
-		return {
-			'background-color': '#' + color,
-			'color': $filter('textColorFilter')(color)
-		};
-	};
-
-	$scope.isTimelineEnabled = function() {
-		return OCP.Comments && OCA.Activity;
-	};
-
 });

js/controller/ColorPickerController.js

@@ -1,44 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Oskar Kurz <oskar.kurz@gmail.com>
- *
- * @author Oskar Kurz <oskar.kurz@gmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import app from '../app/App.js';
-
-/* global oc_defaults OC */
-app.controller('ColorPickerController', ['$scope', function ($scope) {
-	$scope.hashedColor = '';
-
-	$scope.setColor = function (object, color) {
-		object.color = color;
-		object.hashedColor = '#' + color;
-
-		return object;
-	};
-
-	$scope.setHashedColor = function (object) {
-		object.color = object.hashedColor.substr(1);
-		return object;
-	};
-
-	$scope.getCustomBackground = function (color) {
-		return {'background-color': color};
-	};
-}]);

js/controller/ListController.js

@@ -22,29 +22,7 @@
 
 /* global app angular */
 
-var ListController = function ($scope, $location, $filter, BoardService, $element, $timeout, $stateParams, $state, StatusService) {
-
-	function calculateNewColor() {
-		var boards = BoardService.getAll();
-		var boardKeys = Object.keys(boards);
-		var colorOccurrences = [];
-
-		for (var i = 0; i < $scope.colors.length; i++) {
-			colorOccurrences.push(0);
-		}
-
-		for (var j = 0; j < boardKeys.length; j++) {
-			var key = boardKeys[j];
-			var board = boards[key];
-
-			if (board && $scope.colors.indexOf(board.color) !== -1) {
-				colorOccurrences[$scope.colors.indexOf(board.color)]++;
-			}
-		}
-
-		return $scope.colors[colorOccurrences.indexOf(Math.min.apply(Math, colorOccurrences))];
-	}
-
+app.controller('ListController', function ($scope, $location, $filter, BoardService, $element, $timeout, $stateParams, $state) {
 	$scope.boards = [];
 	$scope.newBoard = {};
 	$scope.status = {
@@ -54,73 +32,44 @@ var ListController = function ($scope, $location, $filter, BoardService, $elemen
 	};
 	$scope.colors = ['0082c9', '00c9c6','00c906', 'c92b00', 'F1DB50', '7C31CC', '3A3B3D', 'CACBCD'];
 	$scope.boardservice = BoardService;
+	$scope.newBoard.color = $scope.colors[0];
 	$scope.updatingBoard = null;
 
-	var filterData = function () {
-		if($element.attr('id') === 'app-navigation') {
-			$scope.boardservice.sidebar = $scope.boardservice.getData();
-			$scope.boardservice.sidebar = $filter('orderBy')($scope.boardservice.sidebar, 'title');
-			$scope.boardservice.sidebar = $filter('cardFilter')($scope.boardservice.sidebar, {archived: false});
-		} else {
-			$scope.boardservice.sorted = $scope.boardservice.getData();
-			if ($scope.status.filter === 'archived') {
-				var filter = {};
-				filter[$scope.status.filter] = true;
-				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, filter);
-			} else if ($scope.status.filter === 'shared') {
-				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
-				$scope.boardservice.sorted = $filter('boardFilterAcl')($scope.boardservice.sorted);
-			} else {
-				$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
-			}
-			$scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, ['deletedAt', 'title']);
-		}
-	};
-
-	var finishedLoading = function() {
-		filterData();
-		$scope.newBoard.color = calculateNewColor();
-	};
-
-	var initialize = function () {
-		$scope.statusservice = StatusService.listStatus;
-
-		if($element.attr('id') === 'app-navigation') {
-			$scope.statusservice.retainWaiting();
-			BoardService.fetchAll().then(function(data) {
-				finishedLoading();
-				$scope.statusservice.releaseWaiting();
-				BoardService.loaded = true;
-			}, function (error) {
-				$scope.statusservice.setError('Error occured', error);
-			});
-		} else {
-			/* initialize main list controller when board list is loaded */
-			var boardDataWatch = $scope.$watch(function () {
-				return $scope.boardservice.loaded;
-			}, function () {
-				if (BoardService.loaded === true) {
-					boardDataWatch();
-					finishedLoading();
-				}
-			});
-		}
-
-		$scope.$watch(function () {
-			return $scope.boardservice.data;
-		}, function () {
-			filterData();
-		}, true);
-
-		/* Watch for board filter change */
-		$scope.$watchCollection(function(){
-			return $state.params;
-		}, function(){
-			$scope.status.filter = $state.params.filter;
-			filterData();
+	// FIXME: not nice, but we want to load this only once
+	if($element.attr('id') === 'app-navigation') {
+		BoardService.fetchAll().then(function(data) {
+			$scope.filterData();
+		}, function (error) {
+			// TODO: show error when loading fails
 		});
+	}
+
+	$scope.filterData = function () {
+		angular.copy($scope.boardservice.getData(), $scope.boardservice.sorted);
+		angular.copy($scope.boardservice.sorted, $scope.boardservice.sidebar);
+		$scope.boardservice.sidebar = $filter('orderBy')($scope.boardservice.sidebar, 'title');
+		$scope.boardservice.sidebar = $filter('cardFilter')($scope.boardservice.sidebar, {archived: false});
+
+		if ($scope.status.filter === 'archived') {
+			var filter = {};
+			filter[$scope.status.filter] = true;
+			$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, filter);
+		} else if ($scope.status.filter === 'shared') {
+			$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
+			$scope.boardservice.sorted = $filter('boardFilterAcl')($scope.boardservice.sorted);
+		} else {
+			$scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false});
+		}
+		$scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, ['deletedAt', 'title']);
 	};
-	initialize();
+
+	$scope.$watchCollection(function(){
+		return $state.params;
+	}, function(){
+		$scope.status.filter = $state.params.filter;
+		$scope.filterData();
+	});
+
 
 	$scope.selectColor = function(color) {
 		$scope.newBoard.color = color;
@@ -141,9 +90,9 @@ var ListController = function ($scope, $location, $filter, BoardService, $elemen
 		BoardService.create($scope.newBoard)
 			.then(function (response) {
 				$scope.newBoard = {};
-				$scope.newBoard.color = calculateNewColor();
+				$scope.newBoard.color = $scope.colors[0];
 				$scope.status.addBoard=false;
-				filterData();
+				$scope.filterData();
 			}, function(error) {
 				$scope.status.createBoard = 'Unable to insert board: ' + error.message;
 			});
@@ -151,48 +100,47 @@ var ListController = function ($scope, $location, $filter, BoardService, $elemen
 
 	$scope.boardUpdate = function(board) {
 		BoardService.update(board).then(function(data) {
+			$scope.filterData();
 			board.status.edit = false;
-			filterData();
 		});
 	};
 
 	$scope.boardUpdateBegin = function(board) {
-		$scope.updatingBoard = angular.copy(board);
+		$scope.updatingBoard = board;
 	};
 
 	$scope.boardUpdateReset = function(board) {
 		board.title = $scope.updatingBoard.title;
 		board.color = $scope.updatingBoard.color;
-		filterData();
+		$scope.filterData();
 		board.status.edit = false;
 	};
 
 	$scope.boardArchive = function (board) {
 		board.archived = true;
 		BoardService.update(board).then(function(data) {
-			filterData();
+			$scope.filterData();
 		});
 	};
 
 	$scope.boardUnarchive = function (board) {
 		board.archived = false;
 		BoardService.update(board).then(function(data) {
-			filterData();
+			$scope.filterData();
 		});
 	};
 
 	$scope.boardDelete = function(board) {
 		BoardService.delete(board.id).then(function (data) {
-			filterData();
+			$scope.filterData();
 		});
 	};
 
 	$scope.boardDeleteUndo = function (board) {
 		BoardService.deleteUndo(board.id).then(function (data) {
-			filterData();
+			$scope.filterData();
 		});
 	};
 
-};
+});
 
-export default ListController;

js/directive/appPopoverMenuUtils.js

@@ -19,30 +19,31 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import app from '../app/App.js';
 
 app.directive('appPopoverMenuUtils', function () {
-	'use strict';
-	return {
-		restrict: 'C',
-		link: function (scope, elm) {
-			var menu = elm.find('.popovermenu');
-			var button = elm.find('button');
-			button.click(function (e) {
-				var popovermenus = $('.popovermenu');
-				var shouldShow = menu.hasClass('hidden');
-				popovermenus.addClass('hidden');
-				if (shouldShow) {
-					menu.toggleClass('hidden');
-				}
+    'use strict';
+    return {
+        restrict: 'C',
+        link: function (scope, elm) {
+            var menu = elm.find('.popovermenu');
+            var button = elm.find('button');
+            button.click(function (e) {
+                $('.popovermenu').addClass('hidden');
+                menu.toggleClass('hidden');
+                if(!menu.hasClass('hidden')) {
+                    button.css('display','block');
+                } else {
+                    button.css('display','');
+                }
 				e.stopPropagation();
 			});
-			scope.$on('documentClicked', function (scope, event) {
-				/* prevent closing popover if target has no-close class */
-				if (event.target !== button && !$(event.target).hasClass('no-close')) {
-					menu.addClass('hidden');
-				}
-			});
-		}
-	};
+            scope.$on('documentClicked', function (scope, event) {
+                /* prevent closing popover if target has no-close class */
+                if (event.target !== button && !$(event.target).hasClass('no-close')) {
+                    menu.addClass('hidden');
+                }
+                button.css('display','');
+            });
+        }
+    };
 });

js/directive/appnavigationentryutils.js

@@ -20,28 +20,27 @@
  *
  */
 
-import app from '../app/App.js';
 // OwnCloud Click Handling
 // https://doc.owncloud.org/server/8.0/developer_manual/app/css.html
 app.directive('appNavigationEntryUtils', function () {
-	'use strict';
-	return {
-		restrict: 'C',
-		link: function (scope, elm) {
+    'use strict';
+    return {
+        restrict: 'C',
+        link: function (scope, elm) {
 
-			var menu = elm.siblings('.app-navigation-entry-menu');
-			var button = $(elm)
-				.find('.app-navigation-entry-utils-menu-button button');
+            var menu = elm.siblings('.app-navigation-entry-menu');
+            var button = $(elm)
+                .find('.app-navigation-entry-utils-menu-button button');
 
-			button.click(function () {
-				menu.toggleClass('open');
-			});
-			scope.$on('documentClicked', function (scope, event) {
-				if (event.target !== button[0]) {
-					menu.removeClass('open');
-				}
-			});
-		}
-	};
+            button.click(function () {
+                menu.toggleClass('open');
+            });
+            scope.$on('documentClicked', function (scope, event) {
+                if (event.target !== button[0]) {
+                    menu.removeClass('open');
+                }
+            });
+        }
+    };
 });
 

js/directive/autofocusoninsert.js

@@ -19,11 +19,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.directive('autofocusOnInsert', function () {
-	'use strict';
-	return function (scope, elm) {
-		elm.focus();
-	};
+    'use strict';
+    return function (scope, elm) {
+        elm.focus();
+    };
 });

js/directive/avatar.js

@@ -4,52 +4,33 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
-import app from '../app/App.js';
 
 app.directive('avatar', function() {
 	'use strict';
 	return {
-		restrict: 'AEC',
-		transclude: true,
-		replace: true,
-		template: '<div class="avatardiv-container"><div class="avatardiv" data-toggle="tooltip" ng-transclude></div></div>',
-		scope: { attr: '=' },
+		restrict: 'A',
+		scope: true,
 		link: function(scope, element, attr){
-			scope.uid = attr.displayname;
-			scope.displayname = attr.displayname;
-			scope.size = attr.size;
-			if (typeof scope.size === 'undefined') {
-				scope.size = 32;
-			}
-			var value = attr.user;
-			var avatardiv = $(element).find('.avatardiv');
-			if(typeof attr.contactsmenu !== 'undefined' && attr.contactsmenu !== 'false') {
-				avatardiv.contactsMenu(value, 0, $(element));
-				avatardiv.addClass('has-contactsmenu');
-			}
-			if(typeof attr.tooltip !== 'undefined' && attr.tooltip !== 'false') {
-				$(element).tooltip({
-					title: scope.displayname,
-					placement: 'top'
-				});
-			}
-			avatardiv.avatar(value, scope.size, false, false, false, attr.displayname);
-		},
-		controller: function () {}
+			attr.$observe('displayname', function(value){
+				if(value!==undefined) {
+					$(element).avatar(value, 32);
+				}
+			});
+		}
 	};
-});
+});

js/directive/bindHtmlCompile.js

@@ -1,38 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-import app from '../app/App.js';
-
-app.directive('bindHtmlCompile', function ($compile) {
-	'use strict';
-
-	return {
-		restrict: 'A',
-		link: function (scope, element, attrs) {
-			scope.$watch(function () {
-				return scope.$eval(attrs.bindHtmlCompile);
-			}, function (value) {
-				element.html(value);
-				$compile(element.contents())(scope);
-			});
-		}
-	};
-});

js/directive/contactsmenudelete.js

@@ -1,42 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-import app from '../app/App.js';
-
-app.directive('contactsmenudelete', function() {
-	'use strict';
-	return {
-		restrict: 'A',
-		priority: 1,
-		link: function(scope, element, attr){
-			var user = attr.user;
-			var menu = $(element).parent().find('.contactsmenu-popover');
-			if (oc_current_user === user) {
-				menu.children(':first').remove();
-			}
-			var menuEntry = $('<li><a><span class="icon icon-delete"></span><span>' + t('deck', 'Remove user from card') + '</span></a></li>');
-			menuEntry.on('click', function () {
-				scope.removeAssignedUser(user);
-			});
-			$(menu).append(menuEntry);
-		}
-	};
-});

js/directive/contenteditable.js

@@ -1,59 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import app from '../app/App';
-
-app.directive('ngContenteditable', function($compile) {
-	return {
-		require: 'ngModel',
-		restrict: 'A',
-		scope: {
-			submit: '&ngSubmit'
-		},
-		link: function(scope, element, attrs, ngModel) {
-
-			//read the text typed in the div (syncing model with the view)
-			function read() {
-				ngModel.$setViewValue(element.html());
-			}
-
-			//render the data now in your model into your view
-			//$render is invoked when the modelvalue differs from the viewvalue
-			//see documentation: https://docs.angularjs.org/api/ng/type/ngModel.NgModelController#
-			ngModel.$render = function() {
-				element.html(ngModel.$viewValue || '');
-			};
-
-			//do this whenever someone starts typing
-			element.bind('blur keyup change', function(event) {
-				scope.$apply(read);
-			});
-
-			element.bind('keydown', function(event) {
-				if(event.which === 13 && event.shiftKey) {
-					scope.submit();
-				}
-			});
-
-		}
-	};
-});

js/directive/datepicker.js

@@ -19,7 +19,6 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import app from '../app/App.js';
 
 /* global app */
 /* gloabl t */
@@ -30,10 +29,9 @@ app.directive('datepicker', function () {
 	return {
 		link: function (scope, elm, attr) {
 			return elm.datepicker({
-				dateFormat: moment.localeData().longDateFormat('L').replace('YYYY', 'YY').toLowerCase(),
+				dateFormat: 'yy-mm-dd',
 				onSelect: function(date, inst) {
-					var selectedDate = $(this).datepicker('getDate');
-					scope.setDuedate(moment(selectedDate));
+					scope.setDuedate(moment(date));
 					scope.$apply();
 				},
 				beforeShow: function(input, inst) {

js/directive/elastic.js

@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 // original idea from blockloop: http://stackoverflow.com/a/24090733
 app.directive('elastic', [

js/directive/search.js

@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.directive('search', function ($document, $location) {
 	'use strict';

js/directive/timepicker.js

@@ -19,9 +19,6 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-import app from '../app/App.js';
-import '../legacy/jquery.ui.timepicker.js';
-import 'legacy/jquery.ui.timepicker.css';
 
 /* global app */
 /* global t */
@@ -32,7 +29,7 @@ app.directive('timepicker', function() {
 	return {
 		restrict: 'A',
 		link: function(scope, elm, attr) {
-			return $(elm).timepicker({
+			return elm.timepicker({
 				onSelect: function(date, inst) {
 					scope.setDuedateTime(moment('2000-01-01 ' + date));
 					scope.$apply();

js/filters/boardFilterAcl.js

@@ -19,10 +19,9 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.filter('boardFilterAcl', function() {
-	return function(boards) {
+    return function(boards) {
 		var _result = [];
 		angular.forEach(boards, function(board){
 			if(board.acl !== null && Object.keys(board.acl).length > 0) {
@@ -30,5 +29,5 @@ app.filter('boardFilterAcl', function() {
 			}
 		});
 		return _result;
-	};
+    };
 });

js/filters/bytesFilter.js

@@ -1,37 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import app from '../app/App.js';
-
-app.filter('bytes', function () {
-	return function (bytes, precision) {
-		if (isNaN(parseFloat(bytes, 10)) || !isFinite(bytes)) {
-			return '-';
-		}
-		if (typeof precision === 'undefined') {
-			precision = 2;
-		}
-		var units = ['bytes', 'KB', 'MB', 'GB', 'TB', 'PB'],
-			number = Math.floor(Math.log(bytes) / Math.log(1024));
-		return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) +  ' ' + units[number];
-	};
-});

js/filters/cardFilter.js

@@ -19,12 +19,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 // usage | cardFilter({ member: 'admin'})
 
 app.filter('cardFilter', function() {
-	return function(cards, rules) {
+    return function(cards, rules) {
 		var _result = [];
 		angular.forEach(cards, function(card){
 			var _card = card;
@@ -36,5 +35,5 @@ app.filter('cardFilter', function() {
 			});
 		});
 		return _result;
-	};
+    };
 });

js/filters/cardSearchFilter.js

@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.filter('cardSearchFilter', function() {
 	return function(cards, searchString) {

js/filters/dateFilters.js

@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 /* global app */
 /* global OC */
@@ -28,29 +27,28 @@ import app from '../app/App.js';
 app.filter('relativeDateFilter', function() {
 	return function (timestamp) {
 		return OC.Util.relativeModifiedDate(timestamp*1000);
-	};
+	}
 });
 
 app.filter('relativeDateFilterString', function() {
 	return function (date) {
 		return OC.Util.relativeModifiedDate(Date.parse(date));
-	};
+	}
 });
 
 app.filter('dateToTimestamp', function() {
 	return function (date) {
 		return Date.parse(date);
-	};
+	}
 });
 
 app.filter('parseDate', function() {
 	return function (date) {
 		if(moment(date).isValid()) {
-			var dateFormat = moment.localeData().longDateFormat('L');
-			return moment(date).format(dateFormat);
+			return moment(date).format('YYYY-MM-DD');
 		}
 		return '';
-	};
+	}
 });
 
 app.filter('parseTime', function() {
@@ -59,5 +57,5 @@ app.filter('parseTime', function() {
 			return moment(date).format('HH:mm');
 		}
 		return '';
-	};
+	}
 });

js/filters/iconWhiteFilter.js

@@ -19,9 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
-app.filter('iconWhiteFilter', function () {
+app.filter('iconWhiteFilter', function() {
 	return function (hex) {
 		// RGB2HLS by Garry Tan
 		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
@@ -31,37 +30,36 @@ app.filter('iconWhiteFilter', function () {
 			g: parseInt(result[2], 16),
 			b: parseInt(result[3], 16)
 		} : null;
-		if (result === null) {
-			return '';
-		}
-		var r = color.r / 255;
-		var g = color.g / 255;
-		var b = color.b / 255;
-		var max = Math.max(r, g, b), min = Math.min(r, g, b);
-		var h, s, l = (max + min) / 2;
+		if(result !== null) {
+			var r = color.r/255;
+			var g = color.g/255;
+			var b = color.b/255;
+			var max = Math.max(r, g, b), min = Math.min(r, g, b);
+			var h, s, l = (max + min) / 2;
 
-		if (max === min) {
-			h = s = 0; // achromatic
-		} else {
-			var d = max - min;
-			s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-			switch (max) {
-				case r:
-					h = (g - b) / d + (g < b ? 6 : 0);
-					break;
-				case g:
-					h = (b - r) / d + 2;
-					break;
-				case b:
-					h = (r - g) / d + 4;
-					break;
+			if(max == min){
+				h = s = 0; // achromatic
+			}else{
+				var d = max - min;
+				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+				switch(max){
+					case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+					case g: h = (b - r) / d + 2; break;
+					case b: h = (r - g) / d + 4; break;
+				}
+				h /= 6;
 			}
-			h /= 6;
-		}
-		if (l < 0.5) {
-			return '-white';
+			// TODO: Maybe just darken/lighten the color
+			if(l<0.5) {
+				return "-white";
+			} else {
+				return "";
+			}
+			//var rgba = "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
+			//return rgba;
 		} else {
-			return '';
+			return "";
 		}
-	};
+
+	}
 });

js/filters/lightenColorFilter.js

@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.filter('lightenColorFilter', function() {
 	return function (hex) {
@@ -30,9 +29,9 @@ app.filter('lightenColorFilter', function() {
 			b: parseInt(result[3], 16)
 		} : null;
 		if (result !== null) {
-			return 'rgba(' + color.r + ',' + color.g + ',' + color.b + ',0.7)';
+			return "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
 		} else {
-			return '#' + hex;
+			return "#" + hex;
 		}
-	};
-});
+	}
+});

js/filters/orderObjectBy.js

@@ -19,18 +19,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
 app.filter('orderObjectBy', function(){
 	return function(input, attribute) {
-		if (!angular.isObject(input)) {
-			return input;
-		}
+		if (!angular.isObject(input)) return input;
 		var array = [];
 		for(var objectKey in input) {
-			if ({}.hasOwnProperty.call(input, objectKey)) {
-				array.push(input[objectKey]);
-			}
+			array.push(input[objectKey]);
 		}
 
 		array.sort(function(a, b){
@@ -39,5 +34,5 @@ app.filter('orderObjectBy', function(){
 			return a < b;
 		});
 		return array;
-	};
+	}
 });

js/filters/textColorFilter.js

@@ -19,9 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
-app.filter('textColorFilter', function () {
+app.filter('textColorFilter', function() {
 	return function (hex) {
 		// RGB2HLS by Garry Tan
 		// http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
@@ -31,39 +30,33 @@ app.filter('textColorFilter', function () {
 			g: parseInt(result[2], 16),
 			b: parseInt(result[3], 16)
 		} : null;
-		if (result !== null) {
-			var r = color.r / 255;
-			var g = color.g / 255;
-			var b = color.b / 255;
+		if(result !== null) {
+			var r = color.r/255;
+			var g = color.g/255;
+			var b = color.b/255;
 			var max = Math.max(r, g, b), min = Math.min(r, g, b);
 			var h, s, l = (max + min) / 2;
 
-			if (max === min) {
+			if(max == min){
 				h = s = 0; // achromatic
-			} else {
+			}else{
 				var d = max - min;
 				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-				switch (max) {
-					case r:
-						h = (g - b) / d + (g < b ? 6 : 0);
-						break;
-					case g:
-						h = (b - r) / d + 2;
-						break;
-					case b:
-						h = (r - g) / d + 4;
-						break;
+				switch(max){
+					case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+					case g: h = (b - r) / d + 2; break;
+					case b: h = (r - g) / d + 4; break;
 				}
 				h /= 6;
 			}
-			if (l < 0.5) {
-				return '#ffffff';
+			if(l<0.5) {
+				return "#ffffff";
 			} else {
-				return '#000000';
+				return "#000000";
 			}
 		} else {
-			return '#000000';
+			return "#000000";
 		}
 
-	};
+	}
 });

js/filters/withoutAssignedUsers.js

@@ -1,46 +0,0 @@
-/*
- * @copyright Copyright (c) 2017 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program. If not, see <http://www.gnu.org/licenses/>.
- *  
- */
-import app from '../app/App.js';
-
-/* global app */
-/* global angular */
-
-/*
- * Remove all assignedUsers from users list
- */
-app.filter('withoutAssignedUsers', function () {
-	return function (users, assignedUsers) {
-		var _result = [];
-		angular.forEach(users, function (user) {
-			var _found = false;
-			angular.forEach(assignedUsers, function (assignedUser) {
-				if (assignedUser.participant.uid === user.uid) {
-					_found = true;
-				}
-			});
-			if (_found === false) {
-				_result.push(user);
-			}
-		});
-		return _result;
-	};
-});

js/init.js

@@ -1,30 +0,0 @@
-'use strict';
-
-// used for building a vendor stylesheet
-import 'ng-sortable/dist/ng-sortable.css';
-
-import angular from 'angular';
-import markdownit from 'markdown-it';
-global.markdownit = markdownit;
-
-import app from './app/App.js';
-import './app/Config.js';
-import './app/Run.js';
-
-
-import ListController from 'controller/ListController.js';
-import attachmentListComponent from './controller/AttachmentController.js';
-import activityComponent from './controller/ActivityController.js';
-
-app.controller('ListController', ListController);
-app.component('attachmentListComponent', attachmentListComponent);
-app.component('activityComponent', activityComponent);
-
-
-// require all the js files from subdirectories
-var context = require.context('.', true, /(controller|service|filters|directive)\/(.*)\.js$/);
-
-context.keys().forEach(function (key) {
-	context(key);
-});
-

js/legacy/commentcollection.js

@@ -1,161 +0,0 @@
-/**
- * @licence
- */
-
-import CommentModel from './commentmodel.js';
-import CommentSummaryModel from './commentsummarymodel.js';
-
-/**
- * @class CommentCollection
- * @classdesc
- *
- * Collection of comments assigned to a file
- *
- */
-var CommentCollection = OC.Backbone.Collection.extend(
-	/** @lends OCA.AnnouncementCenter.Comments.CommentCollection.prototype */ {
-
-	sync: OC.Backbone.davSync,
-
-	model: CommentModel,
-
-	/**
-	 * Object type
-	 *
-	 * @type string
-	 */
-	_objectType: 'deckCard',
-
-	/**
-	 * Object id
-	 *
-	 * @type string
-	 */
-	_objectId: null,
-
-	/**
-	 * True if there are no more page results left to fetch
-	 *
-	 * @type bool
-	 */
-	_endReached: false,
-
-	/**
-	 * Number of comments to fetch per page
-	 *
-	 * @type int
-	 */
-	_limit : 5,
-
-	/**
-	 * Initializes the collection
-	 *
-	 * @param {string} [options.objectType] object type
-	 * @param {string} [options.objectId] object id
-	 */
-	initialize: function(models, options) {
-		options = options || {};
-		if (options.objectType) {
-			this._objectType = options.objectType;
-		}
-		if (options.objectId) {
-			this._objectId = options.objectId;
-		}
-	},
-
-	url: function() {
-		return OC.linkToRemote('dav') + '/comments/' +
-			encodeURIComponent(this._objectType) + '/' +
-			encodeURIComponent(this._objectId) + '/';
-	},
-
-	setObjectId: function(objectId) {
-		this._objectId = objectId;
-	},
-
-	hasMoreResults: function() {
-		return !this._endReached;
-	},
-
-	reset: function() {
-		this._endReached = false;
-		this._summaryModel = null;
-		return OC.Backbone.Collection.prototype.reset.apply(this, arguments);
-	},
-
-	/**
-	 * Fetch the next set of results
-	 */
-	fetchNext: function(options) {
-		var self = this;
-		if (!this.hasMoreResults()) {
-			return null;
-		}
-
-		var body = '<?xml version="1.0" encoding="utf-8" ?>\n' +
-			'<oc:filter-comments xmlns:D="DAV:" xmlns:oc="http://owncloud.org/ns">\n' +
-			// load one more so we know there is more
-			'    <oc:limit>' + (this._limit + 1) + '</oc:limit>\n' +
-			'    <oc:offset>' + this.length + '</oc:offset>\n' +
-			'</oc:filter-comments>\n';
-
-		options = options || {};
-		var success = options.success;
-		options = _.extend({
-			remove: false,
-			parse: true,
-			data: body,
-			davProperties: CommentCollection.prototype.model.prototype.davProperties,
-			success: function(resp) {
-				if (resp.length <= self._limit) {
-					// no new entries, end reached
-					self._endReached = true;
-				} else {
-					// remove last entry, for next page load
-					resp = _.initial(resp);
-				}
-				if (!self.set(resp, options)) {
-					return false;
-				}
-				if (success) {
-					success.apply(null, arguments);
-				}
-				self.trigger('sync', 'REPORT', self, options);
-			}
-		}, options);
-
-		return this.sync('REPORT', this, options);
-	},
-
-	/**
-	 * Returns the matching summary model
-	 *
-	 * @return {OCA.AnnouncementCenter.Comments.CommentSummaryModel} summary model
-	 */
-	getSummaryModel: function() {
-		if (!this._summaryModel) {
-			this._summaryModel = new CommentSummaryModel({
-				id: this._objectId,
-				objectType: this._objectType
-			});
-		}
-		return this._summaryModel;
-	},
-
-	/**
-	 * Updates the read marker for this comment thread
-	 *
-	 * @param {Date} [date] optional date, defaults to now
-	 * @param {Object} [options] backbone options
-	 */
-	updateReadMarker: function(date, options) {
-		options = options || {};
-
-		return this.getSummaryModel().save({
-			readMarker: (date || new Date()).toUTCString()
-		}, options);
-	}
-});
-
-export default CommentCollection;
-

js/legacy/commentmodel.js

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2016
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-var NS_OWNCLOUD = 'http://owncloud.org/ns';
-/**
- * @class CommentModel
- * @classdesc
- *
- * Comment
- *
- */
-var CommentModel = OC.Backbone.Model.extend(
-	/** @lends OCA.Comments.CommentModel.prototype */ {
-	sync: OC.Backbone.davSync,
-
-	/**
-	 * Object type
-	 *
-	 * @type string
-	 */
-	_objectType: 'deckCard',
-
-	/**
-	 * Object id
-	 *
-	 * @type string
-	 */
-	_objectId: null,
-
-	initialize: function(model, options) {
-		options = options || {};
-		if (options.objectType) {
-			this._objectType = options.objectType;
-		}
-		if (options.objectId) {
-			this._objectId = options.objectId;
-		}
-	},
-
-	defaults: {
-		actorType: 'users',
-		objectType: 'deckCard'
-	},
-
-	davProperties: {
-		'id': '{' + NS_OWNCLOUD + '}id',
-		'message': '{' + NS_OWNCLOUD + '}message',
-		'actorType': '{' + NS_OWNCLOUD + '}actorType',
-		'actorId': '{' + NS_OWNCLOUD + '}actorId',
-		'actorDisplayName': '{' + NS_OWNCLOUD + '}actorDisplayName',
-		'creationDateTime': '{' + NS_OWNCLOUD + '}creationDateTime',
-		'objectType': '{' + NS_OWNCLOUD + '}objectType',
-		'objectId': '{' + NS_OWNCLOUD + '}objectId',
-		'isUnread': '{' + NS_OWNCLOUD + '}isUnread',
-		'mentions': '{' + NS_OWNCLOUD + '}mentions'
-	},
-
-	parse: function(data) {
-		return {
-			id: data.id,
-			message: data.message,
-			actorType: data.actorType,
-			actorId: data.actorId,
-			actorDisplayName: data.actorDisplayName,
-			creationDateTime: data.creationDateTime,
-			objectType: data.objectType,
-			objectId: data.objectId,
-			isUnread: (data.isUnread === 'true'),
-			mentions: this._parseMentions(data.mentions)
-		};
-	},
-
-	_parseMentions: function(mentions) {
-		if(_.isUndefined(mentions)) {
-			return {};
-		}
-		var result = {};
-		for(var i in mentions) {
-			var mention = mentions[i];
-			if(_.isUndefined(mention.localName) || mention.localName !== 'mention') {
-				continue;
-			}
-			result[i] = {};
-			for (var child = mention.firstChild; child; child = child.nextSibling) {
-				if(_.isUndefined(child.localName) || !child.localName.startsWith('mention')) {
-					continue;
-				}
-				result[i][child.localName] = child.textContent;
-			}
-		}
-		return result;
-	},
-
-	url: function() {
-		let baseUrl;
-		if (typeof this.collection === 'undefined') {
-			baseUrl = OC.linkToRemote('dav') + '/comments/' +
-				encodeURIComponent(this.get('objectType')) + '/' +
-				encodeURIComponent(this.get('objectId')) + '/';
-		} else {
-			baseUrl = this.collection.url();
-		}
-		if (typeof this.get('id') !== 'undefined') {
-			return baseUrl + this.get('id');
-		} else {
-			return baseUrl;
-		}
-	}
-});
-
-export default CommentModel;
-

js/legacy/commentsummarymodel.js

@@ -1,54 +0,0 @@
-
-var NS_OWNCLOUD = 'http://owncloud.org/ns';
-/**
- * @class OCA.AnnouncementCenter.Comments.CommentSummaryModel
- * @classdesc
- *
- * Model containing summary information related to comments
- * like the read marker.
- *
- */
-var CommentSummaryModel = OC.Backbone.Model.extend(
-	/** @lends OCA.AnnouncementCenter.Comments.CommentSummaryModel.prototype */ {
-	sync: OC.Backbone.davSync,
-
-	/**
-	 * Object type
-	 *
-	 * @type string
-	 */
-	_objectType: 'deckCard',
-
-	/**
-	 * Object id
-	 *
-	 * @type string
-	 */
-	_objectId: null,
-
-	davProperties: {
-		'readMarker': '{' + NS_OWNCLOUD + '}readMarker'
-	},
-
-	/**
-	 * Initializes the summary model
-	 *
-	 * @param {string} [options.objectType] object type
-	 * @param {string} [options.objectId] object id
-	 */
-	initialize: function(attrs, options) {
-		options = options || {};
-		if (options.objectType) {
-			this._objectType = options.objectType;
-		}
-	},
-
-	url: function() {
-		return OC.linkToRemote('dav') + '/comments/' +
-			encodeURIComponent(this._objectType) + '/' +
-			encodeURIComponent(this.id) + '/';
-	}
-});
-
-export default CommentSummaryModel;
-

js/legacy/jquery.caret.min.js

@@ -1,561 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-(function($, undefined) {
-
-	var _input = document.createElement('input');
-
-	var _support = {
-		setSelectionRange: ('setSelectionRange' in _input) || ('selectionStart' in _input),
-		createTextRange: ('createTextRange' in _input) || ('selection' in document)
-	};
-
-	var _rNewlineIE = /\r\n/g,
-		_rCarriageReturn = /\r/g;
-
-	var _getValue = function(input) {
-		if (typeof(input.value) !== 'undefined') {
-			return input.value;
-		}
-		return $(input).text();
-	};
-
-	var _setValue = function(input, value) {
-		if (typeof(input.value) !== 'undefined') {
-			input.value = value;
-		} else {
-			$(input).text(value);
-		}
-	};
-
-	var _getIndex = function(input, pos) {
-		var norm = _getValue(input).replace(_rCarriageReturn, '');
-		var len = norm.length;
-
-		if (typeof(pos) === 'undefined') {
-			pos = len;
-		}
-
-		pos = Math.floor(pos);
-
-		// Negative index counts backward from the end of the input/textarea's value
-		if (pos < 0) {
-			pos = len + pos;
-		}
-
-		// Enforce boundaries
-		if (pos < 0) { pos = 0; }
-		if (pos > len) { pos = len; }
-
-		return pos;
-	};
-
-	var _hasAttr = function(input, attrName) {
-		return input.hasAttribute ? input.hasAttribute(attrName) : (typeof(input[attrName]) !== 'undefined');
-	};
-
-	/**
-	 * @class
-	 * @constructor
-	 */
-	var Range = function(start, end, length, text) {
-		this.start = start || 0;
-		this.end = end || 0;
-		this.length = length || 0;
-		this.text = text || '';
-	};
-
-	Range.prototype.toString = function() {
-		return JSON.stringify(this, null, '    ');
-	};
-
-	var _getCaretW3 = function(input) {
-		return input.selectionStart;
-	};
-
-	/**
-	 * @see http://stackoverflow.com/q/6943000/467582
-	 */
-	var _getCaretIE = function(input) {
-		var caret, range, textInputRange, rawValue, len, endRange;
-
-		// Yeah, you have to focus twice for IE 7 and 8.  *cries*
-		input.focus();
-		input.focus();
-
-		range = document.selection.createRange();
-
-		if (range && range.parentElement() === input) {
-			rawValue = _getValue(input);
-
-			len = rawValue.length;
-
-			// Create a working TextRange that lives only in the input
-			textInputRange = input.createTextRange();
-			textInputRange.moveToBookmark(range.getBookmark());
-
-			// Check if the start and end of the selection are at the very end
-			// of the input, since moveStart/moveEnd doesn't return what we want
-			// in those cases
-			endRange = input.createTextRange();
-			endRange.collapse(false);
-
-			if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) {
-				caret = rawValue.replace(_rNewlineIE, '\n').length;
-			} else {
-				caret = -textInputRange.moveStart("character", -len);
-			}
-
-			return caret;
-		}
-
-		// NOTE: This occurs when you highlight part of a textarea and then click in the middle of the highlighted portion in IE 6-10.
-		//       There doesn't appear to be anything we can do about it.
-//        alert("Your browser is incredibly stupid.  I don't know what else to say.");
-//        alert(range + '\n\n' + range.parentElement().tagName + '#' + range.parentElement().id);
-
-		return 0;
-	};
-
-	/**
-	 * Gets the position of the caret in the given input.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @returns {Number}
-	 * @see http://stackoverflow.com/questions/263743/how-to-get-cursor-position-in-textarea/263796#263796
-	 */
-	var _getCaret = function(input) {
-		if (!input) {
-			return undefined;
-		}
-
-		// Mozilla, et al.
-		if (_support.setSelectionRange) {
-			return _getCaretW3(input);
-		}
-		// IE
-		else if (_support.createTextRange) {
-			return _getCaretIE(input);
-		}
-
-		return undefined;
-	};
-
-	var _setCaretW3 = function(input, pos) {
-		input.setSelectionRange(pos, pos);
-	};
-
-	var _setCaretIE = function(input, pos) {
-		var range = input.createTextRange();
-		range.move('character', pos);
-		range.select();
-	};
-
-	/**
-	 * Sets the position of the caret in the given input.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @param {Number} pos
-	 * @see http://parentnode.org/javascript/working-with-the-cursor-position/
-	 */
-	var _setCaret = function(input, pos) {
-		input.focus();
-
-		pos = _getIndex(input, pos);
-
-		// Mozilla, et al.
-		if (_support.setSelectionRange) {
-			_setCaretW3(input, pos);
-		}
-		// IE
-		else if (_support.createTextRange) {
-			_setCaretIE(input, pos);
-		}
-	};
-
-	/**
-	 * Inserts the specified text at the current caret position in the given input.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @param {String} text
-	 * @see http://parentnode.org/javascript/working-with-the-cursor-position/
-	 */
-	var _insertAtCaret = function(input, text) {
-		var curPos = _getCaret(input);
-
-		var oldValueNorm = _getValue(input).replace(_rCarriageReturn, '');
-
-		var newLength = +(curPos + text.length + (oldValueNorm.length - curPos));
-		var maxLength = +input.getAttribute('maxlength');
-
-		if(_hasAttr(input, 'maxlength') && newLength > maxLength) {
-			var delta = text.length - (newLength - maxLength);
-			text = text.substr(0, delta);
-		}
-
-		_setValue(input, oldValueNorm.substr(0, curPos) + text + oldValueNorm.substr(curPos));
-
-		_setCaret(input, curPos + text.length);
-	};
-
-	var _getInputRangeW3 = function(input) {
-		var range = new Range();
-
-		range.start = input.selectionStart;
-		range.end = input.selectionEnd;
-
-		var min = Math.min(range.start, range.end);
-		var max = Math.max(range.start, range.end);
-
-		range.length = max - min;
-		range.text = _getValue(input).substring(min, max);
-
-		return range;
-	};
-
-	/** @see http://stackoverflow.com/a/3648244/467582 */
-	var _getInputRangeIE = function(input) {
-		var range = new Range();
-
-		input.focus();
-
-		var selection = document.selection.createRange();
-
-		if (selection && selection.parentElement() === input) {
-			var len, normalizedValue, textInputRange, endRange, start = 0, end = 0;
-			var rawValue = _getValue(input);
-
-			len = rawValue.length;
-			normalizedValue = rawValue.replace(/\r\n/g, "\n");
-
-			// Create a working TextRange that lives only in the input
-			textInputRange = input.createTextRange();
-			textInputRange.moveToBookmark(selection.getBookmark());
-
-			// Check if the start and end of the selection are at the very end
-			// of the input, since moveStart/moveEnd doesn't return what we want
-			// in those cases
-			endRange = input.createTextRange();
-			endRange.collapse(false);
-
-			if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) {
-				start = end = len;
-			} else {
-				start = -textInputRange.moveStart("character", -len);
-				start += normalizedValue.slice(0, start).split("\n").length - 1;
-
-				if (textInputRange.compareEndPoints("EndToEnd", endRange) > -1) {
-					end = len;
-				} else {
-					end = -textInputRange.moveEnd("character", -len);
-					end += normalizedValue.slice(0, end).split("\n").length - 1;
-				}
-			}
-
-			/// normalize newlines
-			start -= (rawValue.substring(0, start).split('\r\n').length - 1);
-			end -= (rawValue.substring(0, end).split('\r\n').length - 1);
-			/// normalize newlines
-
-			range.start = start;
-			range.end = end;
-			range.length = range.end - range.start;
-			range.text = normalizedValue.substr(range.start, range.length);
-		}
-
-		return range;
-	};
-
-	/**
-	 * Gets the selected text range of the given input.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @returns {Range}
-	 * @see http://stackoverflow.com/a/263796/467582
-	 * @see http://stackoverflow.com/a/2966703/467582
-	 */
-	var _getInputRange = function(input) {
-		if (!input) {
-			return undefined;
-		}
-
-		// Mozilla, et al.
-		if (_support.setSelectionRange) {
-			return _getInputRangeW3(input);
-		}
-		// IE
-		else if (_support.createTextRange) {
-			return _getInputRangeIE(input);
-		}
-
-		return undefined;
-	};
-
-	var _setInputRangeW3 = function(input, startPos, endPos) {
-		input.setSelectionRange(startPos, endPos);
-	};
-
-	var _setInputRangeIE = function(input, startPos, endPos) {
-		var tr = input.createTextRange();
-		tr.moveEnd('textedit', -1);
-		tr.moveStart('character', startPos);
-		tr.moveEnd('character', endPos - startPos);
-		tr.select();
-	};
-
-	/**
-	 * Sets the selected text range of (i.e., highlights text in) the given input.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @param {Number} startPos Zero-based index
-	 * @param {Number} endPos Zero-based index
-	 * @see http://parentnode.org/javascript/working-with-the-cursor-position/
-	 * @see http://stackoverflow.com/a/2966703/467582
-	 */
-	var _setInputRange = function(input, startPos, endPos) {
-		startPos = _getIndex(input, startPos);
-		endPos = _getIndex(input, endPos);
-
-		// Mozilla, et al.
-		if (_support.setSelectionRange) {
-			_setInputRangeW3(input, startPos, endPos);
-		}
-		// IE
-		else if (_support.createTextRange) {
-			_setInputRangeIE(input, startPos, endPos);
-		}
-	};
-
-	/**
-	 * Replaces the currently selected text with the given string.
-	 * @param {HTMLInputElement|HTMLTextAreaElement} input input or textarea element
-	 * @param {String} text New text that will replace the currently selected text.
-	 * @see http://parentnode.org/javascript/working-with-the-cursor-position/
-	 */
-	var _replaceInputRange = function(input, text) {
-		var $input = $(input);
-
-		var oldValue = $input.val();
-		var selection = _getInputRange(input);
-
-		var newLength = +(selection.start + text.length + (oldValue.length - selection.end));
-		var maxLength = +$input.attr('maxlength');
-
-		if($input.is('[maxlength]') && newLength > maxLength) {
-			var delta = text.length - (newLength - maxLength);
-			text = text.substr(0, delta);
-		}
-
-		// Now that we know what the user selected, we can replace it
-		var startText = oldValue.substr(0, selection.start);
-		var endText = oldValue.substr(selection.end);
-
-		$input.val(startText + text + endText);
-
-		// Reset the selection
-		var startPos = selection.start;
-		var endPos = startPos + text.length;
-
-		_setInputRange(input, selection.length ? startPos : endPos, endPos);
-	};
-
-	var _selectAllW3 = function(elem) {
-		var selection = window.getSelection();
-		var range = document.createRange();
-		range.selectNodeContents(elem);
-		selection.removeAllRanges();
-		selection.addRange(range);
-	};
-
-	var _selectAllIE = function(elem) {
-		var range = document.body.createTextRange();
-		range.moveToElementText(elem);
-		range.select();
-	};
-
-	/**
-	 * Select all text in the given element.
-	 * @param {HTMLElement} elem Any block or inline element other than a form element.
-	 */
-	var _selectAll = function(elem) {
-		var $elem = $(elem);
-		if ($elem.is('input, textarea') || elem.select) {
-			$elem.select();
-			return;
-		}
-
-		// Mozilla, et al.
-		if (_support.setSelectionRange) {
-			_selectAllW3(elem);
-		}
-		// IE
-		else if (_support.createTextRange) {
-			_selectAllIE(elem);
-		}
-	};
-
-	var _deselectAll = function() {
-		if (document.selection) {
-			document.selection.empty();
-		}
-		else if (window.getSelection) {
-			window.getSelection().removeAllRanges();
-		}
-	};
-
-	$.extend($.fn, {
-
-		/**
-		 * Gets or sets the position of the caret or inserts text at the current caret position in an input or textarea element.
-		 * @returns {Number|jQuery} The current caret position if invoked as a getter (with no arguments)
-		 * or this jQuery object if invoked as a setter or inserter.
-		 * @see http://web.archive.org/web/20080704185920/http://parentnode.org/javascript/working-with-the-cursor-position/
-		 * @since 1.0.0
-		 * @example
-		 * <pre>
-		 *    // Get position
-		 *    var pos = $('input:first').caret();
-		 * </pre>
-		 * @example
-		 * <pre>
-		 *    // Set position
-		 *    $('input:first').caret(15);
-		 *    $('input:first').caret(-3);
-		 * </pre>
-		 * @example
-		 * <pre>
-		 *    // Insert text at current position
-		 *    $('input:first').caret('Some text');
-		 * </pre>
-		 */
-		caret: function() {
-			var $inputs = this.filter('input, textarea');
-
-			// getCaret()
-			if (arguments.length === 0) {
-				var input = $inputs.get(0);
-				return _getCaret(input);
-			}
-			// setCaret(position)
-			else if (typeof arguments[0] === 'number') {
-				var pos = arguments[0];
-				$inputs.each(function(_i, input) {
-					_setCaret(input, pos);
-				});
-			}
-			// insertAtCaret(text)
-			else {
-				var text = arguments[0];
-				$inputs.each(function(_i, input) {
-					_insertAtCaret(input, text);
-				});
-			}
-
-			return this;
-		},
-
-		/**
-		 * Gets or sets the selection range or replaces the currently selected text in an input or textarea element.
-		 * @returns {Range|jQuery} The current selection range if invoked as a getter (with no arguments)
-		 * or this jQuery object if invoked as a setter or replacer.
-		 * @see http://stackoverflow.com/a/2966703/467582
-		 * @since 1.0.0
-		 * @example
-		 * <pre>
-		 *    // Get selection range
-		 *    var range = $('input:first').range();
-		 * </pre>
-		 * @example
-		 * <pre>
-		 *    // Set selection range
-		 *    $('input:first').range(15);
-		 *    $('input:first').range(15, 20);
-		 *    $('input:first').range(-3);
-		 *    $('input:first').range(-8, -3);
-		 * </pre>
-		 * @example
-		 * <pre>
-		 *    // Replace the currently selected text
-		 *    $('input:first').range('Replacement text');
-		 * </pre>
-		 */
-		range: function() {
-			var $inputs = this.filter('input, textarea');
-
-			// getRange() = { start: pos, end: pos }
-			if (arguments.length === 0) {
-				var input = $inputs.get(0);
-				return _getInputRange(input);
-			}
-			// setRange(startPos, endPos)
-			else if (typeof arguments[0] === 'number') {
-				var startPos = arguments[0];
-				var endPos = arguments[1];
-				$inputs.each(function(_i, input) {
-					_setInputRange(input, startPos, endPos);
-				});
-			}
-			// replaceRange(text)
-			else {
-				var text = arguments[0];
-				$inputs.each(function(_i, input) {
-					_replaceInputRange(input, text);
-				});
-			}
-
-			return this;
-		},
-
-		/**
-		 * Selects all text in each element of this jQuery object.
-		 * @returns {jQuery} This jQuery object
-		 * @see http://stackoverflow.com/a/11128179/467582
-		 * @since 1.5.0
-		 * @example
-		 * <pre>
-		 *     // Select the contents of span elements when clicked
-		 *     $('span').on('click', function() { $(this).highlight(); });
-		 * </pre>
-		 */
-		selectAll: function() {
-			return this.each(function(_i, elem) {
-				_selectAll(elem);
-			});
-		}
-
-	});
-
-	$.extend($, {
-		/**
-		 * Deselects all text on the page.
-		 * @returns {jQuery} The jQuery function
-		 * @since 1.5.0
-		 * @example
-		 * <pre>
-		 *     // Select some text
-		 *     $('span').selectAll();
-		 *
-		 *     // Deselect the text
-		 *     $.deselectAll();
-		 * </pre>
-		 */
-		deselectAll: function() {
-			_deselectAll();
-			return this;
-		}
-	});
-
-}(window.jQuery || window.Zepto || window.$));

js/legacy/jquery.ui.timepicker.css

@@ -1,57 +0,0 @@
-/*
- * Timepicker stylesheet
- * Highly inspired from datepicker
- * FG - Nov 2010 - Web3R 
- *
- * version 0.0.3 : Fixed some settings, more dynamic
- * version 0.0.4 : Removed width:100% on tables
- * version 0.1.1 : set width 0 on tables to fix an ie6 bug
- */
-
-.ui-timepicker-inline { display: inline; }
-
-#ui-timepicker-div { padding: 0.2em; }
-.ui-timepicker-table { display: inline-table; width: 0; }
-.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; }
-
-.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em;  }
-
-.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; }
-.ui-timepicker-table td { padding: 0.1em; width: 2.2em; }
-.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; }
-
-/* span for disabled cells */
-.ui-timepicker-table td span {
-	display:block;
-    padding:0.2em 0.3em 0.2em 0.5em;
-    width: 1.2em;
-
-    text-align:right;
-    text-decoration:none;
-}
-/* anchors for clickable cells */
-.ui-timepicker-table td a {
-    display:block;
-    padding:0.2em 0.3em 0.2em 0.5em;
-    width: 1.2em;
-    cursor: pointer;
-    text-align:right;
-    text-decoration:none;
-}
-
-
-/* buttons and button pane styling */
-.ui-timepicker .ui-timepicker-buttonpane {
-    background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0;
-}
-.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-/* The close button */
-.ui-timepicker .ui-timepicker-close { float: right }
-
-/* the now button */
-.ui-timepicker .ui-timepicker-now { float: left; }
-
-/* the deselect button */
-.ui-timepicker .ui-timepicker-deselect { float: left; }
-
-

js/legacy/markdown-it-checkbox.js

@@ -1,114 +0,0 @@
-/**
- * Original source code from https://github.com/mcecot/markdown-it-checkbox
- * © 2015 Markus Cecot
- * licenced under MIT
- * https://github.com/mcecot/markdown-it-checkbox/blob/master/LICENSE
- */
-var checkboxReplace;
-
-checkboxReplace = function(md, options, Token) {
-  "use strict";
-  var arrayReplaceAt, createTokens, defaults, lastId, pattern, splitTextToken;
-  arrayReplaceAt = md.utils.arrayReplaceAt;
-  lastId = 0;
-  defaults = {
-    divWrap: false,
-    divClass: 'checkbox',
-    idPrefix: 'checkbox'
-  };
-  options = Object.assign(defaults, options);
-  pattern = /\[(X|\s|\_|\-)\]\s(.*)/i;
-  createTokens = function(checked, label, Token) {
-    var id, idNumeric, nodes, token;
-    nodes = [];
-
-    /**
-     * <div class="checkbox">
-     */
-    if (options.divWrap) {
-      token = new Token("checkbox_open", "div", 1);
-      token.attrs = [["class", options.divClass]];
-      nodes.push(token);
-    }
-
-    /**
-     * <input type="checkbox" id="checkbox{n}" checked="true">
-     */
-    id = options.idPrefix + lastId;
-    idNumeric = lastId;
-    lastId += 1;
-    token = new Token("checkbox_input", "input", 0);
-    token.attrs = [["type", "checkbox"], ["id", id], ["data-id", idNumeric]];
-    if (checked === true) {
-      token.attrs.push(["checked", "true"]);
-    }
-    nodes.push(token);
-
-    /**
-     * <label for="checkbox{n}">
-     */
-    token = new Token("label_open", "label", 1);
-    token.attrs = [["for", id], ["data-id", idNumeric]];
-    nodes.push(token);
-
-    /**
-     * content of label tag
-     */
-    token = new Token("text", "", 0);
-    token.content = label;
-    nodes.push(token);
-
-    /**
-     * closing tags
-     */
-    nodes.push(new Token("label_close", "label", -1));
-    if (options.divWrap) {
-      nodes.push(new Token("checkbox_close", "div", -1));
-    }
-    return nodes;
-  };
-  splitTextToken = function(original, Token) {
-    var checked, label, matches, text, value;
-    text = original.content;
-    matches = text.match(pattern);
-    if (matches === null) {
-      return original;
-    }
-    checked = false;
-    value = matches[1];
-    label = matches[2];
-    if (value === "X" || value === "x") {
-      checked = true;
-    }
-    return createTokens(checked, label, Token);
-  };
-  return function(state) {
-    lastId = 0;
-	var blockTokens, i, j, l, token, tokens;
-    blockTokens = state.tokens;
-    j = 0;
-    l = blockTokens.length;
-    while (j < l) {
-      if (blockTokens[j].type !== "inline") {
-        j++;
-        continue;
-      }
-      tokens = blockTokens[j].children;
-      i = tokens.length - 1;
-      while (i >= 0) {
-        token = tokens[i];
-        blockTokens[j].children = tokens = arrayReplaceAt(tokens, i, splitTextToken(token, state.Token));
-        i--;
-      }
-      j++;
-    }
-  };
-};
-
-
-/*global module */
-
-module.exports = function(md, options) {
-  "use strict";
-  md.core.ruler.push("checkbox", checkboxReplace(md, options));
-};

js/package.json

@@ -1,46 +1,29 @@
 {
   "name": "deck",
-  "description": "Frontend for the Nextcloud Deck app",
-  "repository": "https://github.com/nextcloud/deck",
   "version": "1.0.0",
   "main": "Gruntfile.js",
   "directories": {
     "test": "tests"
   },
-  "dependencies": {
-    "@uirouter/angularjs": "^1.0.20",
-    "angular": "^1.7.5",
-    "angular-animate": "^1.7.5",
-    "angular-file-upload": "^2.5.0",
-    "angular-markdown-it": "^0.6.1",
-    "angular-sanitize": "^1.7.5",
-    "babel-polyfill": "^6.26.0",
-    "markdown-it": "^8.4.2",
-    "markdown-it-link-target": "^1.0.2",
-    "ng-infinite-scroll": "^1.3.0",
-    "ng-sortable": "^1.3.8",
-    "ui-select": "^0.19.8"
-  },
+  "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.1.2",
-    "@babel/polyfill": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
-    "babel-loader": "^8.0.4",
-    "css-loader": "^1.0.0",
-    "karma": "^3.0.0",
-    "mini-css-extract-plugin": "^0.4.3",
-    "node-sass": "^4.9.3",
-    "webpack": "^4.20.2",
-    "webpack-cli": "^3.1.2",
-    "webpack-merge": "^4.1.4"
+    "bower": "^1.8.0",
+    "grunt": "^1.0.1",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-karma": "^2.0.0",
+    "grunt-phpunit": "^0.3.6",
+    "grunt-wrap": "^0.3.0",
+    "jshint-stylish": "^2.2.1",
+    "karma": "^1.4.1",
+    "node-sass": "^4.5.3"
   },
   "scripts": {
-    "build": "./node_modules/webpack-cli/bin/cli.js --mode production --config webpack.prod.config.js",
-    "dev": "./node_modules/webpack-cli/bin/cli.js --mode development --config webpack.dev.config.js",
-    "watch": "./node_modules/webpack-cli/bin/cli.js --mode development --config webpack.dev.config.js --watch",
     "test": "echo \"Warning: no test specified\" && exit 0"
   },
   "author": "",
   "license": "AGPL-3.0",
-  "keywords": []
+  "keywords": [],
+  "description": ""
 }

js/service/ActivityService.js

@@ -1,253 +0,0 @@
-/*
- * @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-import app from '../app/App.js';
-import CommentCollection from '../legacy/commentcollection';
-import CommentModel from '../legacy/commentmodel';
-
-const DECK_ACTIVITY_TYPE_BOARD = 'deck_board';
-const DECK_ACTIVITY_TYPE_CARD = 'deck_card';
-
-/* global OC oc_requesttoken */
-class ActivityService {
-
-	static get RESULT_PER_PAGE() { return 50; }
-
-	constructor ($rootScope, $filter, $http, $q) {
-		this.running = false;
-		this.runningNewer = false;
-		this.$filter = $filter;
-		this.$http = $http;
-		this.$q = $q;
-		this.$rootScope = $rootScope;
-		this.data = {};
-		this.data[DECK_ACTIVITY_TYPE_BOARD] = {};
-		this.data[DECK_ACTIVITY_TYPE_CARD] = {};
-		this.toEnhanceWithComments = [];
-		this.commentCollection = new CommentCollection();
-		this.commentCollection._limit = ActivityService.RESULT_PER_PAGE;
-		this.commentCollection.on('request', function() {
-		}, this);
-		this.commentCollection.on('sync', function(a) {
-			for (let index in this.toEnhanceWithComments) {
-				if (this.toEnhanceWithComments.hasOwnProperty(index)) {
-					let item = this.toEnhanceWithComments[index];
-					item.commentModel = this.commentCollection.get(item.subject_rich[1].comment);
-					if (typeof item.commentModel !== 'undefined') {
-						this.toEnhanceWithComments = this.toEnhanceWithComments.filter((entry) => entry.activity_id !== item.activity_id);
-					}
-				}
-			}
-			var firstUnread = this.commentCollection.findWhere({isUnread: true});
-			if (typeof firstUnread !== 'undefined') {
-				this.commentCollection.updateReadMarker();
-			}
-			this.notify();
-		}, this);
-		this.commentCollection.on('add', function(model, collection, options) {
-			// we need to update the model, because it consists of client data
-			// only, but the server might add meta data, e.g. about mentions
-			model.fetch();
-		}, this);
-		this.since = {
-			deck_card: {
-
-			},
-			deck_board: {
-
-			},
-		};
-	}
-
-	/**
-	 * We need a event here to properly update scope once the external data from
-	 * the comments backbone js code has changed
-	 */
-	subscribe(scope, callback) {
-		let handler = this.$rootScope.$on('notify-comment-update', callback);
-		scope.$on('$destroy', handler);
-	}
-
-	notify() {
-		this.$rootScope.$emit('notify-comment-update');
-	}
-
-	static getUrl(type, id, since) {
-		if (type === DECK_ACTIVITY_TYPE_CARD) {
-			return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'filter?format=json&object_type=deck_card&object_id=' + id + '&limit=' + this.RESULT_PER_PAGE + '&since=' + since;
-		}
-		if (type === DECK_ACTIVITY_TYPE_BOARD) {
-			return OC.linkToOCS('apps/activity/api/v2/activity', 2) + 'deck?format=json&limit=' + this.RESULT_PER_PAGE + '&since=' + since;
-		}
-	}
-
-	fetchCardActivities(type, id, since) {
-		this.running = true;
-
-		this.checkData(type, id);
-		const self = this;
-		return this.$http.get(ActivityService.getUrl(type, id, since)).then(function (response) {
-			const objects = response.data.ocs.data;
-
-			for (let index in objects) {
-				if (objects.hasOwnProperty(index)) {
-					let item = objects[index];
-					self.addItem(type, id, item);
-					if (item.activity_id > self.since[type][id].latest) {
-						self.since[type][id].latest = item.activity_id;
-					}
-				}
-			}
-			self.data[type][id].sort(function(a, b) {
-				return b.activity_id - a.activity_id;
-			});
-			self.since[type][id].oldest = response.headers('X-Activity-Last-Given');
-			self.running = false;
-			return response;
-		}, function (error) {
-			if (error.status === 304 || error.status === 404) {
-				self.since[type][id].finished = true;
-			}
-			self.running = false;
-		});
-	}
-
-	fetchMoreActivities(type, id, success) {
-		const self = this;
-		this.checkData(type, id);
-		if (this.running === true) {
-			return this.runningPromise;
-		}
-		if (!this.since[type][id].finished) {
-			this.runningPromise = this.fetchCardActivities(type, id, this.since[type][id].oldest);
-			this.runningPromise.then(function() {
-				if (type === 'deck_card') {
-					self.commentCollection.fetchNext();
-				}
-			});
-			return this.runningPromise;
-		}
-		return Promise.reject();
-	}
-	checkData(type, id) {
-		if (!Array.isArray(this.data[type][id])) {
-			this.data[type][id] = [];
-		}
-		if (typeof this.since[type][id] === 'undefined') {
-			this.since[type][id] = {
-				latest: -1,
-				oldestCatchedUp: false,
-				oldest: '0',
-				finished: false,
-			};
-		}
-	}
-
-	addItem(type, id, item) {
-		const self = this;
-		const existingEntry = this.data[type][id].findIndex((entry) => { return entry.activity_id === item.activity_id; });
-		if (existingEntry !== -1) {
-			return;
-		}
-		/** check if the fetched item from all deck activities is actually related */
-		const isUnrelatedBoard = (item.object_type === DECK_ACTIVITY_TYPE_BOARD && item.object_id !== id);
-		const isUnrelatedCard = (item.object_type === DECK_ACTIVITY_TYPE_CARD && item.subject_rich[1].board && item.subject_rich[1].board.id !== id);
-		if (type === DECK_ACTIVITY_TYPE_BOARD && (isUnrelatedBoard || isUnrelatedCard)) {
-			return;
-		}
-		item.timestamp = new Date(item.datetime).getTime();
-		item.type = 'activity';
-		if (item.subject_rich[1].comment) {
-			item.type = 'comment';
-			item.commentModel = this.commentCollection.get(item.subject_rich[1].comment);
-			if (typeof item.commentModel === 'undefined') {
-				this.toEnhanceWithComments.push(item);
-			}
-		}
-
-		this.data[type][id].push(item);
-	}
-
-	/**
-	 * Fetch newer activities starting from the latest ones that are in cache
-	 *
-	 * @param type
-	 * @param id
-	 */
-	fetchNewerActivities(type, id) {
-		if (this.since[type][id].latest === 0) {
-			return Promise.resolve();
-		}
-		let self = this;
-		return this.fetchNewer(type, id).then(function() {
-			return self.fetchNewerActivities(type, id);
-		});
-	}
-
-	fetchNewer(type, id) {
-		const deferred = this.$q.defer();
-		this.running = true;
-		this.runningNewer = true;
-		const self = this;
-		this.$http.get(ActivityService.getUrl(type, id, this.since[type][id].latest) + '&sort=asc').then(function (response) {
-			let objects = response.data.ocs.data;
-
-			let data = [];
-			for (let index in objects) {
-				if (objects.hasOwnProperty(index)) {
-					let item = objects[index];
-					self.addItem(type, id, item);
-				}
-			}
-			self.data[type][id].sort(function(a, b) {
-				return b.activity_id - a.activity_id;
-			});
-			self.since[type][id].latest = response.headers('X-Activity-Last-Given');
-			self.data[type][id] = data.concat(self.data[type][id]);
-			self.running = false;
-			self.runningNewer = false;
-			deferred.resolve(objects);
-		}, function (error) {
-			self.runningNewer = false;
-			self.running = false;
-		});
-		return deferred.promise;
-	}
-
-	getData(type, id) {
-		if (!Array.isArray(this.data[type][id])) {
-			return [];
-		}
-		return this.data[type][id];
-	}
-
-	loadComments(id) {
-		this.commentCollection.reset();
-		this.commentCollection.setObjectId(id);
-	}
-
-}
-
-app.service('ActivityService', ActivityService);
-
-export default ActivityService;
-export {DECK_ACTIVITY_TYPE_BOARD, DECK_ACTIVITY_TYPE_CARD};

js/service/ApiService.js

@@ -4,228 +4,168 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
-import app from '../app/App.js';
-/** global: oc_defaults */
-app.factory('ApiService', function ($http, $q) {
-	var ApiService = function (http, endpoint) {
-		// Consider renaming endpoint to resource
-		this.endpoint = endpoint;
-		this.baseUrl = this.generateUrl(this.endpoint);
-		this.http = http;
-		this.q = $q;
-		this.data = {};
-		this.deleted = {};
-		this.id = null;
-		this.sorted = [];
-	};
 
-	ApiService.prototype.generateUrl = function(path) {
-		return OC.generateUrl('/apps/deck/' + path);
-	};
+app.factory('ApiService', function($http, $q){
+    var ApiService = function(http, endpoint) {
+        this.endpoint = endpoint;
+        this.baseUrl = OC.generateUrl('/apps/deck/' + endpoint);
+        this.http = http;
+        this.q = $q;
+        this.data = {};
+        this.id = null;
+        this.sorted = [];
+    };
 
-	ApiService.prototype.tryAllThenDeleted = function(id) {
-		let object = this.data[id];
-		if (object === undefined) {
-			object = this.deleted[id];
-		}
-		return object;
-	};
+    ApiService.prototype.fetchAll = function(){
+        var deferred = $q.defer();
+        var self = this;
+        $http.get(this.baseUrl).then(function (response) {
+            var objects = response.data;
+            objects.forEach(function (obj) {
+                self.data[obj.id] = obj;
+            });
+            deferred.resolve(self.data);
+        }, function (error) {
+            deferred.reject('Fetching ' + self.endpoint + ' failed');
+        });
+        return deferred.promise;
+    };
 
-	ApiService.prototype.fetchAll = function () {
-		var deferred = $q.defer();
-		var self = this;
-		$http.get(this.baseUrl).then(function (response) {
-			var objects = response.data;
-			objects.forEach(function (obj) {
-				self.data[obj.id] = obj;
-			});
-			deferred.resolve(self.data);
-		}, function (error) {
-			deferred.reject('Fetching ' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
-	};
+    ApiService.prototype.fetchOne = function (id) {
 
-	ApiService.prototype.fetchDeleted = function (scopeId) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.get(this.generateUrl(scopeId + '/' + this.endpoint + '/deleted')).then(function (response) {
-			var objects = response.data;
-			objects.forEach(function (obj) {
-				if(self.deleted[obj.id] !== undefined) {
-					return;
-				}
+        this.id = id;
+        var deferred = $q.defer();
 
-				self.deleted[obj.id] = obj;
+        if(id===undefined) {
+            return deferred.promise;
+        }
 
-				if(self.afterFetch !== undefined) {
-					self.afterFetch(obj);
-				}
-			});
-			deferred.resolve(objects);
-		}, function (error) {
-			deferred.reject('Fetching ' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
-	};
+        var self = this;
+        $http.get(this.baseUrl + '/' + id).then(function (response) {
+            data = response.data;
+            if(self.data[data.id]===undefined) {
+                self.data[data.id] = response.data;
+            }
+            $.each(response.data, function(key, value) {
+                self.data[data.id][key] = value;
+            });
+            deferred.resolve(response.data);
 
+        }, function (error) {
+            deferred.reject('Fetching ' + self.endpoint + ' failed');
+        });
+        return deferred.promise;
+    };
 
-	ApiService.prototype.fetchOne = function (id) {
+    ApiService.prototype.create = function (entity) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.post(this.baseUrl, entity).then(function (response) {
+            self.add(response.data);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Fetching' + self.endpoint + ' failed');
+        });
+        return deferred.promise;
+    };
 
-		this.id = id;
-		var deferred = $q.defer();
+    ApiService.prototype.update = function (entity) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl + '/' + entity.id, entity).then(function (response) {
+            self.add(response.data);
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Updating ' + self.endpoint + ' failed');
+        });
+        return deferred.promise;
 
-		if (id === undefined) {
-			return deferred.promise;
-		}
+    };
 
-		var self = this;
-		$http.get(this.baseUrl + '/' + id).then(function (response) {
-			var data = response.data;
-			if (self.data[data.id] === undefined) {
-				self.data[data.id] = response.data;
-			}
-			$.each(response.data, function (key, value) {
-				self.data[data.id][key] = value;
-			});
-			deferred.resolve(response.data);
+    ApiService.prototype.delete = function (id) {
+        var deferred = $q.defer();
+        var self = this;
 
-		}, function (error) {
-			deferred.reject('Fetching ' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
-	};
+        $http.delete(this.baseUrl + '/' + id).then(function (response) {
+            self.remove(id);
+            deferred.resolve(response.data);
 
-	ApiService.prototype.create = function (entity) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.post(this.baseUrl, entity).then(function (response) {
-			self.add(response.data);
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Fetching' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
-	};
+        }, function (error) {
+            deferred.reject('Deleting ' + self.endpoint + ' failed');
+        });
+        return deferred.promise;
 
-	ApiService.prototype.update = function (entity) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + entity.id, entity).then(function (response) {
-			self.add(response.data);
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Updating ' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
+    };
+    
 
-	};
+    // methods for managing data
+    ApiService.prototype.clear = function() {
+        this.data = {};
+    };
+    ApiService.prototype.add = function (entity) {
+        var element = this.data[entity.id];
+        if(element===undefined) {
+            this.data[entity.id] = entity;
+        } else {
+            Object.keys(entity).forEach(function (key) {
+                element[key] = entity[key];
+            });
+            element.status = {};
+        }
+    };
+    ApiService.prototype.remove = function(id) {
+        if (this.data[id] !== undefined) {
+            delete this.data[id];
+        }
+    };
+    ApiService.prototype.addAll = function (entities) {
+        var self = this;
+        angular.forEach(entities, function(entity) {
+            self.add(entity);
+        });
+    };
 
-	ApiService.prototype.delete = function (id) {
-		var deferred = $q.defer();
-		var self = this;
-
-		$http.delete(this.baseUrl + '/' + id).then(function (response) {
-			self.deleted[id] = self.data[id];
-			delete self.data[id];
-
-			let deletedAt = response.data.deletedAt;
-			if (deletedAt !== undefined) {
-				self.deleted[id].deletedAt = deletedAt;
-			}
-
-			deferred.resolve(response.data);
-
-		}, function (error) {
-			deferred.reject('Deleting ' + self.endpoint + ' failed');
-		});
-		return deferred.promise;
-	};
-
-	ApiService.prototype.undoDelete = function(entity) {
-		var self = this;
-		entity.deletedAt = 0;
-
-		var promise = this.update(entity);
-
-		promise.then(() => {
-			self.data[entity.id] = entity;
-			delete this.deleted[entity.id];
-		});
-
-		return promise;
-	};
-
-	// methods for managing data
-	ApiService.prototype.clear = function () {
-		this.data = {};
-	};
-
-	ApiService.prototype.add = function (entity) {
-		var element = this.data[entity.id];
-		if (element === undefined) {
-			this.data[entity.id] = entity;
-		} else {
-			Object.keys(entity).forEach(function (key) {
-				if (entity[key] !== null && element[key] !== entity[key]) {
-					element[key] = entity[key];
-				}
-			});
-			element.status = {};
-		}
-	};
-
-	ApiService.prototype.addAll = function (entities) {
-		var self = this;
-		angular.forEach(entities, function (entity) {
-			self.add(entity);
-		});
-	};
-
-	ApiService.prototype.getCurrent = function () {
-		return this.data[this.id];
-	};
+    ApiService.prototype.getCurrent = function () {
+        return this.data[this.id];
+    };
 
 	ApiService.prototype.unsetCurrrent = function () {
 		this.id = null;
 	};
 
 
-	ApiService.prototype.getData = function () {
-		return $.map(this.data, function (value, index) {
-			return [value];
-		});
-	};
 
-	ApiService.prototype.getAll = function () {
-		return this.data;
-	};
+	ApiService.prototype.getData = function() {
+        return $.map(this.data, function(value, index) {
+            return [value];
+        });
+    };
 
-	ApiService.prototype.get = function (id) {
-		return this.data[id];
-	};
+    ApiService.prototype.getAll = function () {
+        return this.data;
+    };
 
-	ApiService.prototype.getName = function () {
-		var funcNameRegex = /function (.{1,})\(/;
-		var results = (funcNameRegex).exec((this).constructor.toString());
-		return (results && results.length > 1) ? results[1] : '';
-	};
+    ApiService.prototype.getName = function() {
+        var funcNameRegex = /function (.{1,})\(/;
+        var results = (funcNameRegex).exec((this).constructor.toString());
+        return (results && results.length > 1) ? results[1] : "";
+    };
 
-	return ApiService;
+    return ApiService;
 
 });

js/service/BoardService.js

@@ -19,13 +19,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
-/* global app OC */
-app.factory('BoardService', function (ApiService, $http, $q) {
-	var BoardService = function ($http, ep, $q) {
-		ApiService.call(this, $http, ep, $q);
-	};
-	BoardService.prototype = angular.copy(ApiService.prototype);
+
+app.factory('BoardService', function(ApiService, $http, $q){
+    var BoardService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
+    };
+    BoardService.prototype = angular.copy(ApiService.prototype);
 
 	BoardService.prototype.delete = function (id) {
 		var deferred = $q.defer();
@@ -46,6 +45,7 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 		var _id = id;
 		$http.post(this.baseUrl + '/' + id + '/deleteUndo').then(function (response) {
 			self.data[_id].deletedAt = 0;
+			console.log(self.data[_id]);
 			deferred.resolve(response.data);
 		}, function (error) {
 			deferred.reject('Deleting ' + self.endpoint + ' failed');
@@ -77,12 +77,12 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 				}
 				self.sharees = [];
 
-				var users = response.ocs.data.exact.users.concat(response.ocs.data.users.slice(0, 4));
-				var groups = response.ocs.data.exact.groups.concat(response.ocs.data.groups.slice(0, 4));
+				var users = response.ocs.data.exact.users.concat(response.ocs.data.users);
+				var groups = response.ocs.data.exact.groups.concat(response.ocs.data.groups);
 
 				// filter out everyone who is already in the share list
 				angular.forEach(users, function (item) {
-					var acl = self.generateAcl(OC.Share.SHARE_TYPE_USER, item);
+					var acl = self.generateAcl('user', item);
 					var exists = false;
 					angular.forEach(self.getCurrent().acl, function (acl) {
 						if (acl.participant.primaryKey === item.value.shareWith) {
@@ -94,7 +94,7 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 					}
 				});
 				angular.forEach(groups, function (item) {
-					var acl = self.generateAcl(OC.Share.SHARE_TYPE_GROUP, item);
+					var acl = self.generateAcl('group', item);
 					var exists = false;
 					angular.forEach(self.getCurrent().acl, function (acl) {
 						if (acl.participant.primaryKey === item.value.shareWith) {
@@ -114,7 +114,7 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 		return deferred.promise;
 	};
 
-	BoardService.prototype.generateAcl = function (type, ocsItem) {
+	BoardService.prototype.generateAcl = function(type, ocsItem) {
 		return {
 			boardId: null,
 			id: null,
@@ -128,7 +128,7 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 			permissionManage: true,
 			permissionShare: true,
 			type: type
-		};
+		}
 	};
 
 	BoardService.prototype.addAcl = function (acl) {
@@ -141,11 +141,6 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 				board.acl = {};
 			}
 			board.acl[response.data.id] = response.data;
-			if (response.data.type === OC.Share.SHARE_TYPE_USER) {
-				self._updateUsers();
-			} else {
-				self.fetchOne(response.data.boardId);
-			}
 			deferred.resolve(response.data);
 		}, function (error) {
 			deferred.reject('Error creating ACL ' + _acl);
@@ -154,104 +149,74 @@ app.factory('BoardService', function (ApiService, $http, $q) {
 		return deferred.promise;
 	};
 
-	BoardService.prototype.deleteAcl = function (acl) {
-		var board = this.getCurrent();
-		var deferred = $q.defer();
-		var self = this;
-		$http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
-			delete board.acl[response.data.id];
-			if (response.data.type === OC.Share.SHARE_TYPE_USER) {
-				self._updateUsers();
-			} else {
-				self.fetchOne(response.data.boardId);
-			}
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error deleting ACL ' + acl.id);
-		});
-		acl = null;
-		return deferred.promise;
-	};
+    BoardService.prototype.deleteAcl = function(acl) {
+        var board = this.getCurrent();
+        var deferred = $q.defer();
+        var self = this;
+        $http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
+            delete board.acl[response.data.id];
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error deleting ACL ' + acl.id);
+        });
+        acl = null;
+        return deferred.promise;
+    };
 
-	BoardService.prototype.updateAcl = function (acl) {
-		var board = this.getCurrent();
-		var deferred = $q.defer();
-		var self = this;
-		var _acl = acl;
-		$http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
-			board.acl[_acl.id] = response.data;
-			if (response.data.type === OC.Share.SHARE_TYPE_USER) {
-				self._updateUsers();
-			} else {
-				self.fetchOne(response.data.boardId);
-			}
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error updating ACL ' + _acl);
-		});
-		acl = null;
-		return deferred.promise;
-	};
+    BoardService.prototype.updateAcl = function(acl) {
+        var board = this.getCurrent();
+        var deferred = $q.defer();
+        var self = this;
+        var _acl = acl;
+        $http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
+            board.acl[_acl.id] = response.data;
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error updating ACL ' + _acl);
+        });
+        acl = null;
+        return deferred.promise;
+    };
 
-	BoardService.prototype._updateUsers = function () {
-		if (!this.getCurrent() || !this.getCurrent().acl) {
-			return [];
-		}
+    BoardService.prototype.canRead = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_READ'];
+    };
 
-		this.getCurrent().users = [this.getCurrent().owner];
-		let self = this;
-		angular.forEach(this.getCurrent().acl, function(value, key) {
-			if (value.type === OC.Share.SHARE_TYPE_USER) {
-				self.getCurrent().users.push(value.participant);
-			}
-		});
-	};
+    BoardService.prototype.canEdit = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_EDIT'];
+    };
 
-	BoardService.prototype.getUsers = function () {
-		if (this.getCurrent() && !this.getCurrent().users) {
-			this._updateUsers();
-		}
-		return this.getCurrent().users;
-	};
-
-	BoardService.prototype.canRead = function () {
-		if (!this.getCurrent() || !this.getCurrent().permissions) {
-			return false;
-		}
-		return this.getCurrent().permissions['PERMISSION_READ'];
-	};
-
-	BoardService.prototype.canEdit = function () {
-		if (!this.getCurrent() || !this.getCurrent().permissions) {
-			return false;
-		}
-		return this.getCurrent().permissions['PERMISSION_EDIT'];
-	};
-
-	BoardService.prototype.canManage = function (board) {
-		if (board !== null && board !== undefined) {
+    BoardService.prototype.canManage = function(board) {
+    	if(board !== null && board !== undefined) {
 			return board.permissions['PERMISSION_MANAGE'];
 		}
-		if (!this.getCurrent() || !this.getCurrent().permissions) {
-			return false;
-		}
-		return this.getCurrent().permissions['PERMISSION_MANAGE'];
-	};
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_MANAGE'];
+    };
 
-	BoardService.prototype.canShare = function () {
-		if (!this.getCurrent() || !this.getCurrent().permissions) {
-			return false;
-		}
-		return this.getCurrent().permissions['PERMISSION_SHARE'];
-	};
+    BoardService.prototype.canShare = function() {
+        if(!this.getCurrent() || !this.getCurrent().permissions) {
+            return false;
+        }
+        return this.getCurrent().permissions['PERMISSION_SHARE'];
+    };
 
-	BoardService.prototype.isArchived = function () {
-		if (!this.getCurrent() || this.getCurrent().archived) {
+    BoardService.prototype.isArchived = function () {
+		if(!this.getCurrent() || this.getCurrent().archived) {
 			return true;
 		}
 		return false;
 	};
 
-	return new BoardService($http, 'boards', $q);
-
-});
+    service = new BoardService($http, 'boards', $q);
+    return service;
+    
+});

js/service/CardService.js

@@ -4,174 +4,98 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
-import app from '../app/App.js';
 
-app.factory('CardService', function (ApiService, $http, $q) {
-	var CardService = function ($http, ep, $q) {
-		ApiService.call(this, $http, ep, $q);
-	};
-	CardService.prototype = angular.copy(ApiService.prototype);
+app.factory('CardService', function(ApiService, $http, $q){
+    var CardService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
+    };
+    CardService.prototype = angular.copy(ApiService.prototype);
 
-	CardService.prototype.reorder = function (card, order) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + card.id + '/reorder', {
-			cardId: card.id,
-			order: order,
-			stackId: card.stackId
-		}).then(function (response) {
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
+    CardService.prototype.reorder = function(card, order) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl + '/' + card.id + '/reorder', {cardId: card.id, order: order, stackId: card.stackId}).then(function (response) {
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+    };
 
-	CardService.prototype.rename = function (card) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + card.id + '/rename', {
-			cardId: card.id,
-			title: card.title
-		}).then(function (response) {
-			self.data[card.id].title = card.title;
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while renaming ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
+    CardService.prototype.rename = function(card) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl + '/' + card.id + '/rename', {cardId: card.id, title: card.title}).then(function (response) {
+            self.data[card.id].title = card.title;
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while renaming ' + self.endpoint);
+        });
+        return deferred.promise;
+    };
 
-	CardService.prototype.assignLabel = function (card, label) {
-		var url = this.baseUrl + '/' + card + '/label/' + label;
-		var deferred = $q.defer();
-		var self = this;
-		$http.post(url).then(function (response) {
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
-	CardService.prototype.removeLabel = function (card, label) {
-		var url = this.baseUrl + '/' + card + '/label/' + label;
-		var deferred = $q.defer();
-		var self = this;
-		$http.delete(url).then(function (response) {
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
+    CardService.prototype.assignLabel = function(card, label) {
+        var url = this.baseUrl + '/' + card + '/label/' + label;
+        var deferred = $q.defer();
+        var self = this;
+        $http.post(url).then(function (response) {
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+    };
+    CardService.prototype.removeLabel = function(card, label) {
+        var url = this.baseUrl + '/' + card + '/label/' + label;
+        var deferred = $q.defer();
+        var self = this;
+        $http.delete(url).then(function (response) {
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
+    };
 
-	CardService.prototype.archive = function (card) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + card.id + '/archive', {}).then(function (response) {
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
+    CardService.prototype.archive = function (card) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl + '/' + card.id + '/archive', {}).then(function (response) {
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
 
-	};
+    };
 
-	CardService.prototype.unarchive = function (card) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + card.id + '/unarchive', {}).then(function (response) {
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
+    CardService.prototype.unarchive = function (card) {
+        var deferred = $q.defer();
+        var self = this;
+        $http.put(this.baseUrl + '/' + card.id + '/unarchive', {}).then(function (response) {
+            deferred.resolve(response.data);
+        }, function (error) {
+            deferred.reject('Error while update ' + self.endpoint);
+        });
+        return deferred.promise;
 
-	CardService.prototype.assignUser = function (card, user) {
-		var deferred = $q.defer();
-		var self = this;
-		if (self.get(card.id).assignedUsers === null) {
-			self.get(card.id).assignedUsers = [];
-		}
-		$http.post(this.baseUrl + '/' + card.id + '/assign', {'userId': user}).then(function (response) {
-			self.get(card.id).assignedUsers.push(response.data);
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
+    };
 
-	};
-
-	CardService.prototype.unassignUser = function (card, user) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.delete(this.baseUrl + '/' + card.id + '/assign/' + user, {}).then(function (response) {
-			self.get(card.id).assignedUsers = self.get(card.id).assignedUsers.filter(function (obj) {
-				return obj.participant.uid !== user;
-			});
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error while update ' + self.endpoint);
-		});
-		return deferred.promise;
-	};
-
-	CardService.prototype.attachmentRemove = function (attachment) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.delete(this.baseUrl + '/' + this.getCurrent().id + '/attachment/' + attachment.id, {}).then(function (response) {
-			if (response.data.deletedAt > 0) {
-				let currentAttachment = self.getCurrent().attachments.find(function (obj) {
-					if (obj.id === attachment.id) {
-						obj.deletedAt = response.data.deletedAt;
-					}
-				});
-
-			} else {
-				self.getCurrent().attachments = self.getCurrent().attachments.filter(function (obj) {
-					return obj.id !== attachment.id;
-				});
-			}
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error when removing the attachment');
-		});
-		return deferred.promise;
-	};
-
-	CardService.prototype.attachmentRemoveUndo = function (attachment) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.get(this.baseUrl + '/' + this.getCurrent().id + '/attachment/' + attachment.id + '/restore', {}).then(function (response) {
-			let currentAttachment = self.getCurrent().attachments.find(function (obj) {
-				if (obj.id === attachment.id) {
-					obj.deletedAt = response.data.deletedAt;
-				}
-			});
-			deferred.resolve(response.data);
-		}, function (error) {
-			deferred.reject('Error when restoring the attachment');
-		});
-		return deferred.promise;
-	};
-
-	var service = new CardService($http, 'cards', $q);
-	return service;
-});
+    service = new CardService($http, 'cards', $q);
+    return service;
+});

js/service/FileService.js

@@ -1,137 +0,0 @@
-/*
-* @copyright Copyright (c) 2018 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *  
- */
-
-import app from '../app/App.js';
-
-/* global OC oc_requesttoken */
-export default class FileService {
-
-	constructor (FileUploader, CardService, $rootScope, $filter) {
-		this.$filter = $filter;
-		this.uploader = new FileUploader();
-		this.cardservice = CardService;
-		this.uploader.onAfterAddingFile = this.onAfterAddingFile.bind(this);
-		this.uploader.onSuccessItem = this.onSuccessItem.bind(this);
-		this.uploader.onErrorItem = this.onErrorItem.bind(this);
-		this.uploader.onCancelItem = this.onCancelItem.bind(this);
-
-		this.maxUploadSize = $rootScope.config.maxUploadSize;
-		this.progress = [];
-		this.status = null;
-	}
-
-	reset () {
-		this.status = null;
-	}
-
-	runUpload (fileItem, attachmentId) {
-		this.status = null;
-		fileItem.url = OC.generateUrl('/apps/deck/cards/' + fileItem.cardId + '/attachment?type=deck_file');
-		if (typeof attachmentId !== 'undefined') {
-			fileItem.url = OC.generateUrl('/apps/deck/cards/' + fileItem.cardId + '/attachment/' + attachmentId + '?type=deck_file');
-		} else {
-			fileItem.formData = [
-				{
-					requesttoken: oc_requesttoken,
-					type: 'deck_file',
-				}
-			];
-		}
-		fileItem.headers = {requesttoken: oc_requesttoken};
-
-		this.uploader.uploadItem(fileItem);
-	}
-
-	onAfterAddingFile (fileItem) {
-		if (this.maxUploadSize > 0 && fileItem.file.size > this.maxUploadSize) {
-			this.status = {
-				error: t('deck', `Failed to upload {name}`, {name: fileItem.file.name}),
-				message: t('deck', 'Maximum file size of {size} exceeded', {size: this.$filter('bytes')(this.maxUploadSize)})
-			};
-			return;
-		}
-
-		// Fetch card details before trying to upload so we can detect filename collisions properly
-		let self = this;
-		this.progress.push(fileItem);
-		this.cardservice.fetchOne(fileItem.cardId).then(function (data) {
-			let attachments = self.cardservice.get(fileItem.cardId).attachments;
-			let existingFile = attachments.find((attachment) => {
-				return attachment.data === fileItem.file.name;
-			});
-			if (typeof existingFile !== 'undefined') {
-				OC.dialogs.confirm(
-					`A file with the name ${fileItem.file.name} already exists. Do you want to overwrite it?`,
-					'File already exists',
-					function (result) {
-						if (result) {
-							self.runUpload(fileItem, existingFile.id);
-						} else {
-							let fileName = existingFile.extendedData.info.filename;
-							let foundFilesMatching = attachments.filter((attachment) => {
-								return attachment.extendedData.info.extension === existingFile.extendedData.info.extension
-									&& attachment.extendedData.info.filename.startsWith(fileName);
-							});
-							let nextIndex = foundFilesMatching.length + 1;
-							fileItem.file.name = fileName + ' (' + nextIndex + ').' + existingFile.extendedData.info.extension;
-							self.runUpload(fileItem);
-						}
-					}
-				);
-			} else {
-				self.runUpload(fileItem);
-			}
-		}, function (error) {
-			this.progress = this.progress.filter((item) => (fileItem.file.name !== item.file.name));
-		});
-
-	}
-
-	onSuccessItem (item, response) {
-		let attachments = this.cardservice.get(item.cardId).attachments;
-		let index = attachments.indexOf(attachments.find((attachment) => attachment.id === response.id));
-		if (~index) {
-			attachments = attachments.splice(index, 1);
-		}
-		this.cardservice.get(item.cardId).attachments.push(response);
-		this.progress = this.progress.filter((fileItem) => (fileItem.file.name !== item.file.name));
-	}
-
-	onErrorItem (item, response) {
-		this.progress = this.progress.filter((fileItem) => (fileItem.file.name !== item.file.name));
-		this.status = {
-			error: t('deck', `Failed to upload:`) + ' ' + item.file.name,
-			message: response.message
-		};
-	}
-
-	onCancelItem (item) {
-		this.progress = this.progress.filter((fileItem) => (fileItem.file.name !== item.file.name));
-	}
-
-	getProgressItemsForCard (cardId) {
-		return this.progress.filter((fileItem) => (fileItem.cardId === cardId));
-	}
-
-}
-
-app.service('FileService', FileService);

js/service/LabelService.js

@@ -19,12 +19,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
-app.factory('LabelService', function (ApiService, $http, $q) {
-	var LabelService = function ($http, ep, $q) {
-		ApiService.call(this, $http, ep, $q);
-	};
-	LabelService.prototype = angular.copy(ApiService.prototype);
-	return new LabelService($http, 'labels', $q);
+app.factory('LabelService', function(ApiService, $http, $q){
+    var LabelService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
+    };
+    LabelService.prototype = angular.copy(ApiService.prototype);
+    service = new LabelService($http, 'labels', $q);
+    return service;
 });

js/service/StackService.js

@@ -4,83 +4,64 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *
+ *  
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ *  
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ *  
  */
-import app from '../app/App.js';
 
-/* global app angular */
-app.factory('StackService', function (ApiService, CardService, $http, $q) {
-	var StackService = function ($http, ep, $q) {
-		ApiService.call(this, $http, ep, $q);
-	};
-	StackService.prototype = angular.copy(ApiService.prototype);
+app.factory('StackService', function(ApiService, $http, $q){
+    var StackService = function($http, ep, $q) {
+        ApiService.call(this, $http, ep, $q);
+    };
+    StackService.prototype = angular.copy(ApiService.prototype);
+    StackService.prototype.fetchAll = function(boardId) {
+        var deferred = $q.defer();
+        var self=this;
+        $http.get(this.baseUrl +'/'+boardId).then(function (response) {
+            self.clear();
+            self.addAll(response.data);
+            deferred.resolve(self.data);
+        }, function (error) {
+            deferred.reject('Error while loading stacks');
+        });
+        return deferred.promise;
+    };
 
-	StackService.prototype.afterFetch = function(stack) {
-		CardService.addAll(stack.cards);
-	};
+    StackService.prototype.fetchArchived = function(boardId) {
+        var deferred = $q.defer();
+        var self=this;
+        $http.get(this.baseUrl +'/'+boardId+'/archived').then(function (response) {
+            self.clear();
+            self.addAll(response.data);
+            deferred.resolve(self.data);
+        }, function (error) {
+            deferred.reject('Error while loading stacks');
+        });
+        return deferred.promise;
+    };
 
-	StackService.prototype.fetchAll = function (boardId) {
+    StackService.prototype.addCard = function(entity) {
+        if(!this.data[entity.stackId].cards) {
+            this.data[entity.stackId].cards = [];
+        }
+        this.data[entity.stackId].cards.push(entity);
+    };
+
+	StackService.prototype.reorder = function(stack, order) {
 		var deferred = $q.defer();
 		var self = this;
-		$http.get(this.baseUrl + '/' + boardId).then(function (response) {
-			self.clear();
-			self.addAll(response.data);
-			// When loading a stack add cards to the CardService so we can fetch
-			// information from there. That way we don't need to refresh the whole
-			// stack data during digest if some value changes
-			angular.forEach(response.data, function (entity) {
-				CardService.addAll(entity.cards);
-			});
-			deferred.resolve(self.data);
-		}, function (error) {
-			deferred.reject('Error while loading stacks');
-		});
-		return deferred.promise;
-	};
-
-	StackService.prototype.fetchArchived = function (boardId) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.get(this.baseUrl + '/' + boardId + '/archived').then(function (response) {
-			self.clear();
-			self.addAll(response.data);
-			angular.forEach(response.data, function (entity) {
-				CardService.addAll(entity.cards);
-			});
-			deferred.resolve(self.data);
-		}, function (error) {
-			deferred.reject('Error while loading stacks');
-		});
-		return deferred.promise;
-	};
-
-	StackService.prototype.addCard = function (entity) {
-		if (!this.data[entity.stackId].cards) {
-			this.data[entity.stackId].cards = [];
-		}
-		this.data[entity.stackId].cards.push(entity);
-	};
-
-	StackService.prototype.reorder = function (stack, order) {
-		var deferred = $q.defer();
-		var self = this;
-		$http.put(this.baseUrl + '/' + stack.id + '/reorder', {
-			stackId: stack.id,
-			order: order
-		}).then(function (response) {
+		$http.put(this.baseUrl + '/' + stack.id + '/reorder', {stackId: stack.id, order: order}).then(function (response) {
 			angular.forEach(response.data, function (value, key) {
 				var id = value.id;
 				self.data[id].order = value.order;
@@ -92,48 +73,49 @@ app.factory('StackService', function (ApiService, CardService, $http, $q) {
 		return deferred.promise;
 	};
 
-	StackService.prototype.reorderCard = function (entity, order) {
-		// assign new order
-		for (var i = 0, j = 0; i < this.data[entity.stackId].cards.length; i++) {
-			if (this.data[entity.stackId].cards[i].id === entity.id) {
-				this.data[entity.stackId].cards[i].order = order;
-			}
-			if (j === order) {
-				j++;
-			}
-			if (this.data[entity.stackId].cards[i].id !== entity.id) {
-				this.data[entity.stackId].cards[i].order = j++;
-			}
-		}
-		// sort array by order
-		this.data[entity.stackId].cards.sort(function (a, b) {
-			if (a.order < b.order)
-			{return -1;}
-			if (a.order > b.order)
-			{return 1;}
-			return 0;
-		});
-	};
+    StackService.prototype.reorderCard = function(entity, order) {
+        // assign new order
+        for(var i=0, j=0;i<this.data[entity.stackId].cards.length;i++) {
+            if(this.data[entity.stackId].cards[i].id === entity.id) {
+                this.data[entity.stackId].cards[i].order = order;
+            }
+            if(j === order) {
+                j++;
+            }
+            if(this.data[entity.stackId].cards[i].id !== entity.id) {
+                this.data[entity.stackId].cards[i].order = j++;
+            }
+        }
+        // sort array by order
+        this.data[entity.stackId].cards.sort(function(a,b) {
+            if (a.order < b.order)
+                return -1;
+            if (a.order > b.order)
+                return 1;
+            return 0;
+        });
+    };
 
-	StackService.prototype.updateCard = function (entity) {
-		var self = this;
-		var cards = this.data[entity.stackId].cards;
-		for (var i = 0; i < cards.length; i++) {
-			if (cards[i].id === entity.id) {
-				cards[i] = entity;
-			}
-		}
-	};
-	StackService.prototype.removeCard = function (entity) {
-		var self = this;
-		var cards = this.data[entity.stackId].cards;
-		for (var i = 0; i < cards.length; i++) {
-			if (cards[i].id === entity.id) {
-				cards.splice(i, 1);
-			}
-		}
-	};
-
-	var service = new StackService($http, 'stacks', $q);
-	return service;
+    StackService.prototype.updateCard = function(entity) {
+        var self = this;
+        var cards = this.data[entity.stackId].cards;
+        for(var i=0;i<cards.length;i++) {
+            if(cards[i].id == entity.id) {
+                cards[i] = entity;
+            }
+        }
+    };
+    StackService.prototype.removeCard = function(entity) {
+        var self = this;
+        var cards = this.data[entity.stackId].cards;
+        for(var i=0;i<cards.length;i++) {
+            if(cards[i].id == entity.id) {
+                cards.splice(i, 1);
+            }
+        }
+    };
+    
+    service = new StackService($http, 'stacks', $q);
+    return service;
 });
+

js/service/StatusService.js

@@ -19,63 +19,59 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  
  */
-import app from '../app/App.js';
 
-app.factory('StatusService', function () {
-	// Status Helper
-	var StatusService = function () {
-		this.active = true;
-		this.icon = 'loading';
-		this.title = '';
-		this.text = '';
-		this.counter = 0;
-	};
+app.factory('StatusService', function(){
+    // Status Helper
+    var StatusService = function() {
+        this.active = true;
+        this.icon = 'loading';
+        this.title = '';
+        this.text = '';
+        this.counter = 0;
+    };
 
 
-	StatusService.prototype.setStatus = function ($icon, $title, $text) {
-		this.active = true;
-		this.icon = $icon;
-		this.title = $title;
-		this.text = $text;
-	};
+    StatusService.prototype.setStatus = function($icon, $title, $text) {
+        this.active = true;
+        this.icon = $icon;
+        this.title = $title;
+        this.text = $text;
+    };
 
-	StatusService.prototype.setError = function ($title, $text) {
-		this.active = true;
-		this.icon = 'error';
-		this.title = $title;
-		this.text = $text;
-		this.counter = 0;
-	};
+    StatusService.prototype.setError = function($title, $text) {
+        this.active = true;
+        this.icon = 'error';
+        this.title = $title;
+        this.text = $text;
+        this.counter = 0;
+    };
 
-	StatusService.prototype.releaseWaiting = function () {
-		if (this.counter > 0) {
-			this.counter--;
-		}
-		if (this.counter <= 0) {
-			this.active = false;
-			this.counter = 0;
-		}
-	};
+    StatusService.prototype.releaseWaiting = function() {
+        if(this.counter>0)
+            this.counter--;
+        if(this.counter<=0) {
+            this.active = false;
+            this.counter = 0;
+        }
+    };
 
-	StatusService.prototype.retainWaiting = function () {
-		this.active = true;
-		this.icon = 'loading';
-		this.title = '';
-		this.text = '';
-		this.counter++;
-	};
+    StatusService.prototype.retainWaiting = function() {
+        this.active = true;
+        this.icon = 'loading';
+        this.title = '';
+        this.text = '';
+        this.counter++;
+    };
 
-	StatusService.prototype.unsetStatus = function () {
-		this.active = false;
-	};
+    StatusService.prototype.unsetStatus = function() {
+        this.active = false;
+    };
 
-	return {
-		getInstance: function () {
-			return new StatusService();
-		},
-		/* Shared StatusService instance between both ListController instances */
-		listStatus: new StatusService()
-	};
+    return {
+        getInstance: function() {
+            return new StatusService();
+        }
+    }
 
 });
 

js/webpack.config.js

@@ -1,68 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-
-require('babel-polyfill');
-
-module.exports = {
-  node: {
-    fs: 'empty',
-  },
-  entry: {
-    deck: ['babel-polyfill', './init.js'],
-  },
-  output: {
-    filename: '[name].js',
-    path: __dirname + '/build'
-  },
-  resolve: {
-    modules: [path.resolve(__dirname), 'node_modules'],
-  },
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        query: {
-	  presets: ['@babel/preset-env'],
-        }
-      },
-      {
-        test: /\.css$/,
-        use: [
-          MiniCssExtractPlugin.loader,
-          'css-loader'
-        ]
-      }
-    ]
-  },
-  optimization: {
-    splitChunks: {
-      cacheGroups: {
-        /* separate vendor chunk for node_modules and legacy scripts */
-        commons: {
-          test: /[\\/]node_modules[\\/]/,
-          name: 'vendor',
-          chunks: 'all'
-        },
-        legacy: {
-          test: /[\\/]legacy[\\/]/,
-          name: 'vendor',
-          chunks: 'all'
-        }
-      }
-    }
-  },
-  /* use external jQuery from server */
-  externals: {
-    'jquery': 'jQuery'
-  },
-  plugins: [
-    new MiniCssExtractPlugin('[name].css'),
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery'
-    })
-  ]
-};

js/webpack.dev.config.js

@@ -1,6 +0,0 @@
-const merge = require('webpack-merge');
-const baseConfig = require('./webpack.config.js');
-
-module.exports = merge(baseConfig, {
-  mode: 'development'
-});

js/webpack.prod.config.js

@@ -1,15 +0,0 @@
-const webpack = require('webpack');
-const merge = require('webpack-merge');
-const baseConfig = require('./webpack.config.js');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-
-
-module.exports = merge(baseConfig, {
-  mode: 'production',
-  optimization: {
-    minimizer: [
-      new UglifyJsPlugin({
-        test: /(vendor\.js)+/i
-      })
-    ]
-  }});

krankerl.toml

@@ -1,37 +0,0 @@
-[package]
-exclude = [
-    "build/",
-    ".git",
-    "js/node_modules",
-    "js/tests",
-    "js/legacy",
-    "js/controller",
-    "js/directive",
-    "js/filters",
-    "js/service",
-    "js/bower.json",
-    "js/.bowerrc",
-    "js/.jshintrc",
-    "js/Gruntfile.js",
-    "js/package.json",
-    "js/package-lock.json",
-    "tests",
-    ".codecov.yml",
-    "composer.json",
-    "composer.lock",
-    "_config.yml",
-    ".drone.yml",
-    ".travis.yml",
-    ".eslintignore",
-    ".eslintrc.yml",
-    ".gitignore",
-    "issue_template.md",
-    "krankerl.toml",
-    "Makefile",
-    "run-eslint.sh"
-]
-
-before_cmds = [
-    'make clean-build',
-    'make build'
-]

l10n/.tx/config

@@ -3,7 +3,7 @@ host = https://www.transifex.com
 lang_map = bg_BG: bg, cs_CZ: cs, fi_FI: fi, hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja
 
 [nextcloud.deck]
-file_filter = translationfiles/<lang>/deck.po
-source_file = translationfiles/templates/deck.pot
+file_filter = <lang>/deck.po
+source_file = templates/deck.pot
 source_lang = en
 type = PO

l10n/ast.js

@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "deck",
+    {
+    "Hours" : "Hores",
+    "Minutes" : "Minutos",
+    "Finished" : "Finó",
+    "Action needed" : "Precísase aición",
+    "Later" : "Más sero",
+    "Deck" : "Deck",
+    "Show archived cards" : "Amosar tarxetes archivaes",
+    "Delete" : "Desaniciar",
+    "Tags" : "Etiquetes",
+    "Select users or groups to share with" : "Esbilla usuarios o grupos colos que compartir",
+    "No matching user or group found." : "Nun s'alcontró dengún usuariu o grupu que concasara.",
+    "Share" : "Compartir",
+    "Edit" : "Editar",
+    "Manage" : "Xestionar",
+    "Discard share" : "Escartar compartición",
+    "Title" : "Títulu",
+    "Members" : "Miembros",
+    "More actions" : "Más aiciones",
+    "by" : "por",
+    "Click to set" : "Primi p'afitar",
+    "Description" : "Descripción",
+    "Saved" : "Guardóse"
+},
+"nplurals=2; plural=(n != 1);");

l10n/ast.json

@@ -0,0 +1,25 @@
+{ "translations": {
+    "Hours" : "Hores",
+    "Minutes" : "Minutos",
+    "Finished" : "Finó",
+    "Action needed" : "Precísase aición",
+    "Later" : "Más sero",
+    "Deck" : "Deck",
+    "Show archived cards" : "Amosar tarxetes archivaes",
+    "Delete" : "Desaniciar",
+    "Tags" : "Etiquetes",
+    "Select users or groups to share with" : "Esbilla usuarios o grupos colos que compartir",
+    "No matching user or group found." : "Nun s'alcontró dengún usuariu o grupu que concasara.",
+    "Share" : "Compartir",
+    "Edit" : "Editar",
+    "Manage" : "Xestionar",
+    "Discard share" : "Escartar compartición",
+    "Title" : "Títulu",
+    "Members" : "Miembros",
+    "More actions" : "Más aiciones",
+    "by" : "por",
+    "Click to set" : "Primi p'afitar",
+    "Description" : "Descripción",
+    "Saved" : "Guardóse"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

l10n/bg.js

@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "deck",
+    {
+    "Finished" : "Завършен",
+    "To review" : "За преглед",
+    "Action needed" : "Необходимо е действие",
+    "Later" : "По-късно",
+    "Archive" : "Архивиране",
+    "Unarchive" : "Разархивиране",
+    "Delete" : "Изтриване",
+    "Sharing" : "Споделяне",
+    "Select users or groups to share with" : "Избор на потребители и групи за споделяне",
+    "No matching user or group found." : "Не са намерени съвпадащи потребители или групи",
+    "Share" : "Сподели",
+    "Edit" : "Редакция",
+    "Manage" : "Управление",
+    "Discard share" : "Отхвърляне на споделяне",
+    "Members" : "Членове",
+    "Modified:" : "Променен на:",
+    "Created:" : "Създаден на:",
+    "by" : "от",
+    "Saved" : "Запазено",
+    "Shared with you" : "Споделено с Вас"
+},
+"nplurals=2; plural=(n != 1);");

l10n/bg.json

@@ -0,0 +1,23 @@
+{ "translations": {
+    "Finished" : "Завършен",
+    "To review" : "За преглед",
+    "Action needed" : "Необходимо е действие",
+    "Later" : "По-късно",
+    "Archive" : "Архивиране",
+    "Unarchive" : "Разархивиране",
+    "Delete" : "Изтриване",
+    "Sharing" : "Споделяне",
+    "Select users or groups to share with" : "Избор на потребители и групи за споделяне",
+    "No matching user or group found." : "Не са намерени съвпадащи потребители или групи",
+    "Share" : "Сподели",
+    "Edit" : "Редакция",
+    "Manage" : "Управление",
+    "Discard share" : "Отхвърляне на споделяне",
+    "Members" : "Членове",
+    "Modified:" : "Променен на:",
+    "Created:" : "Създаден на:",
+    "by" : "от",
+    "Saved" : "Запазено",
+    "Shared with you" : "Споделено с Вас"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}

l10n/ca.js

@@ -1,54 +1,20 @@
 OC.L10N.register(
     "deck",
     {
-    "Remove user from card" : "Esborra usuari de la targeta",
-    "Hours" : "Hores",
-    "Minutes" : "Minuts",
-    "Deck" : "Coberta",
     "Finished" : "Acabat",
     "To review" : "Per revisar",
     "Action needed" : "Acció necessaria",
     "Later" : "Més tard",
-    "Add a new stack" : "Afegeix una nova pila",
-    "Show archived cards" : "Mostra les targetes arxivades",
-    "Hide archived cards" : "Amaga les targetes arxivades",
-    "Board details" : "Detalls de la junta",
-    "All Boards" : "Totes les juntes",
-    "Archived boards" : "Taulers arxivats",
     "Archive" : "Arxiu",
-    "Unarchive" : "Desbloquejar",
     "Delete" : "Esborra",
-    "Enter a card title" : "Introduïu un títol de la targeta",
     "Sharing" : "Compartir",
-    "Tags" : "Etiquetes",
-    "Select users or groups to share with" : "Seleccioneu usuaris o grups per compartir",
-    "No matching user or group found." : "No s'ha trobat cap usuari o grup coincident.",
     "Share" : "Comparteix",
     "Edit" : "Edita",
-    "Manage" : "Gestor",
-    "Discard share" : "Descarta la compartició",
-    "Create a new tag" : "Crea una nova etiqueta",
-    "Title" : "Title",
     "Members" : "Membres",
-    "More actions" : "Més accions",
-    "Edit board" : "Edita el tauler",
-    "Archive board" : "Arxiu",
-    "Unarchive board" : "Desbloquejar",
-    "Delete board" : "Eliminat",
-    "Create new board" : "Crear nova",
-    "New board title" : "Nou títol",
-    "by" : "per",
     "Modified:" : "Modificat:",
     "Created:" : "Creat:",
-    "Due date" : "Per la data",
-    "Click to set" : "Feu clic per configurar",
-    "Remove due date" : "Elimina la data de venciment",
-    "Description" : "Descripció",
+    "by" : "per",
     "Saved" : "Desat",
-    "Formatting help" : "Format d'ajuda",
-    "Add a card description…" : "Afegeix una descripció de la targeta ...",
-    "Shared boards" : "Taulers compartits",
-    "Move board to archive" : "Mou la placa a l'arxiu",
-    "Create a new board" : "Crear nova"
+    "Shared with you" : "Us han compartit"
 },
 "nplurals=2; plural=(n != 1);");

l10n/ca.json

@@ -1,52 +1,18 @@
 { "translations": {
-    "Remove user from card" : "Esborra usuari de la targeta",
-    "Hours" : "Hores",
-    "Minutes" : "Minuts",
-    "Deck" : "Coberta",
     "Finished" : "Acabat",
     "To review" : "Per revisar",
     "Action needed" : "Acció necessaria",
     "Later" : "Més tard",
-    "Add a new stack" : "Afegeix una nova pila",
-    "Show archived cards" : "Mostra les targetes arxivades",
-    "Hide archived cards" : "Amaga les targetes arxivades",
-    "Board details" : "Detalls de la junta",
-    "All Boards" : "Totes les juntes",
-    "Archived boards" : "Taulers arxivats",
     "Archive" : "Arxiu",
-    "Unarchive" : "Desbloquejar",
     "Delete" : "Esborra",
-    "Enter a card title" : "Introduïu un títol de la targeta",
     "Sharing" : "Compartir",
-    "Tags" : "Etiquetes",
-    "Select users or groups to share with" : "Seleccioneu usuaris o grups per compartir",
-    "No matching user or group found." : "No s'ha trobat cap usuari o grup coincident.",
     "Share" : "Comparteix",
     "Edit" : "Edita",
-    "Manage" : "Gestor",
-    "Discard share" : "Descarta la compartició",
-    "Create a new tag" : "Crea una nova etiqueta",
-    "Title" : "Title",
     "Members" : "Membres",
-    "More actions" : "Més accions",
-    "Edit board" : "Edita el tauler",
-    "Archive board" : "Arxiu",
-    "Unarchive board" : "Desbloquejar",
-    "Delete board" : "Eliminat",
-    "Create new board" : "Crear nova",
-    "New board title" : "Nou títol",
-    "by" : "per",
     "Modified:" : "Modificat:",
     "Created:" : "Creat:",
-    "Due date" : "Per la data",
-    "Click to set" : "Feu clic per configurar",
-    "Remove due date" : "Elimina la data de venciment",
-    "Description" : "Descripció",
+    "by" : "per",
     "Saved" : "Desat",
-    "Formatting help" : "Format d'ajuda",
-    "Add a card description…" : "Afegeix una descripció de la targeta ...",
-    "Shared boards" : "Taulers compartits",
-    "Move board to archive" : "Mou la placa a l'arxiu",
-    "Create a new board" : "Crear nova"
+    "Shared with you" : "Us han compartit"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/cs.js

@@ -1,140 +1,31 @@
 OC.L10N.register(
     "deck",
     {
-    "The associated stack is deleted as well, it will be restored as well." : "Související stack je také smazaný a bude také obnoven.",
-    "Restore associated stack" : "Obnovit související stack",
-    "Remove user from card" : "Odebrat uživatele z karty",
     "Hours" : "Hodiny",
     "Minutes" : "Minuty",
-    "Maximum file size of {size} exceeded" : "U souboru {size} překročena nejvyšší umožněná velikost",
-    "You have created a new board {board}" : "Vytvořili jste nástěnku {board}",
-    "{user} has created a new board {board}" : "{user} vytvořil(a) novou nástěnku {board}",
-    "You have deleted the board {board}" : "Smazali jste nástěnku {board}",
-    "{user} has deleted the board {board}" : "{user} smazal(a) nástěnku {board}",
-    "You have restored the board {board}" : "Obnovili jste nástěnku {board}",
-    "{user} has restored the board {board}" : "{user} obnovil(a) nástěnku {board}",
-    "You have shared the board {board} with {acl}" : "Nasdíleli jste nástěnku {board} s {acl}",
-    "{user} has shared the board {board} with {sharee}" : "{user} nasdílel(a) nástěnku {board} pro {sharee}",
-    "You have removed {acl} from the board {board}" : "Odebrali jste {acl} z nástěnky {board}",
-    "{user} has removed {acl} from the board {board}" : "{user} odebral(a) {acl} z nástěnky {board}",
-    "You have renamed the board {before} to {board}" : "Přejmenovali jste nástěnku {before} na {board}",
-    "{user} has has renamed the board {before} to {board}" : "{user} uživatel přejmenoval nástěnku {before} na {board}",
-    "You have archived the board {board}" : "Zaarchivovali jste nástěnku {board}",
-    "{user} has archived the board {before}" : "{user} zaarchivoval(a) nástěnku {before}",
-    "You have unarchived the board {board}" : "Zrušili jste archivaci nástěnky {board}",
-    "{user} has unarchived the board {before}" : "{user} zrušil(a) archivaci nástěnky {before}",
-    "You have created a new stack {stack} on {board}" : "Vytvořili jste nový stack {stack} na {board}",
-    "{user} has created a new stack {stack} on {board}" : "{user} vytvořil(a) nový stack {stack} na {board}",
-    "You have renamed a new stack {before} to {stack} on {board}" : "Přejmenovali jste nový stack {before} na {stack} na {board}",
-    "{user} has renamed a new stack {before} to {stack} on {board}" : "{user} přejmenoval(a) nový stack {before} na {stack} na {board}",
-    "You have deleted {stack} on {board}" : "Smazali jste {stack} na {board}",
-    "{user} has deleted {stack} on {board}" : "{user} smazal(a) {stack} na {board}",
-    "You have created {card} in {stack} on {board}" : "Vytvořili jste {card} v {stack} na {board}",
-    "{user} has created {card} in {stack} on {board}" : "{user} vytvořil(a) {card} v {stack} na {board}",
-    "You have deleted {card} in {stack} on {board}" : "Smazali jste {card} v {stack} na {board}",
-    "{user} has deleted {card} in {stack} on {board}" : "{user} smazal {card} v {stack} na {board}",
-    "You have renamed the card {before} to {card}" : "Přejmenovali jste kartu {before} na {card}",
-    "{user} has renamed the card {before} to {card}" : "{user} přejmenoval(a) {before} na {card}",
-    "You have added a description to {card} in {stack} on {board}" : "Přidali jste popis k {card} v {stack} na {board}",
-    "{user} has added a description to {card} in {stack} on {board}" : "{user} přidal(a) popis ke {card} v {stack} na {board}",
-    "You have updated the description of {card} in {stack} on {board}" : "Aktualizovali jste popis {card} v {stack} na {board}",
-    "{user} has updated the description {card} in {stack} on {board}" : "{user} aktualizoval(a) popis {card} v {stack} na {board}",
-    "You have archived {card} in {stack} on {board}" : "Zaarchivovali jste {card} v {stack} na {board}",
-    "{user} has archived {card} in {stack} on {board}" : "{user} zaarchivoval(a) {card} v {stack} na {board}",
-    "You have unarchived {card} in {stack} on {board}" : "Zrušili jste archivaci {card} v {stack} na {board}",
-    "{user} has unarchived {card} in {stack} on {board}" : "{user} zrušila archivaci {card} v {stack} na {board}",
-    "You have removed the due date of {card}" : "Odebrali jste termín {card}",
-    "{user} has removed the due date of {card}" : "{user} odebral(a) termín {card}",
-    "You have set the due date of {card} to {after}" : "Nastavili jste termín {card} na {after}",
-    "{user} has set the due date of {card} to {after}" : "{user} nastavil(a) termín {card} na {after}",
-    "You have updated the due date of {card} to {after}" : "Změnili jste termín {card} na {after}",
-    "{user} has updated the due date of {card} to {after}" : "{user} aktualizoval termín {card} na {after}",
-    "You have added the label {label} to {card} in {stack} on {board}" : "Přidali jste štítek {label} ke {card} v {stack} na {board}",
-    "{user} has added the label {label} to {card} in {stack} on {board}" : "{user} přidal(a) štítek {label} ke {card} v {stack} na {board}",
-    "You have removed the label {label} from {card} in {stack} on {board}" : "Odebrali jste štítek {label} z {card} v {stack} na {board}",
-    "{user} has removed the label {label} from {card} in {stack} on {board}" : "{user} odebral štítek {label} z {card} v {stack} na {board}",
-    "You have assigned {assigneduser} to {card} on {board}" : "Přiřadili jste {assigneduser} k {card} na {board}",
-    "{user} has assigned {assigneduser} to {card} on {board}" : "{user} přiřadil(a) {assigneduser} k {card} na {board}",
-    "You have unassigned {assigneduser} from {card} on {board}" : "Bylo zrušeno vaše přiřazení {assigneduser} k {card} na {board}",
-    "{user} has unassigned {assigneduser} from {card} on {board}" : "{user} přiřadil(a) {assigneduser} z {card} na {board}",
-    "You have moved the card {card} from {stackBefore} to {stack}" : "Přesunuli jste kartu {card} z {stackBefore} do {stack}",
-    "{user} has moved the card {card} from {stackBefore} to {stack}" : "{user} přesunul {card} z {stackBefore} do {stack}",
-    "You have added the attachment {attachment} to {card}" : "Přidali jste {attachment} do {card}",
-    "{user} has added the attachment {attachment} to {card}" : "{user} přidal(a) přílohu {attachment} k {card}",
-    "You have updated the attachment {attachment} on {card}" : "Aktualizovali jste přílohu {attachment} na {card}",
-    "{user} has updated the attachment {attachment} to {card}" : "{user} aktualizoval(a) přílohu {attachment} k {card}",
-    "You have deleted the attachment {attachment} from {card}" : "Smazali jste přílohu {attachment} z {card}",
-    "{user} has deleted the attachment {attachment} to {card}" : "{user} smazal(a) přílohu {attachment} k {card}",
-    "You have restored the attachment {attachment} to {card}" : "Obnovili jste přílohu {attachment} k {card}",
-    "{user} has restored the attachment {attachment} to {card}" : "{user} obnovil(a) přílohu {attachment} k {card}",
-    "Deck" : "Balík",
-    "Personal" : "Osobní",
-    "The card \"%s\" on \"%s\" has been assigned to you by %s." : "Kartu „%s“ na „%s“ vám přiřadil(a) %s.",
-    "{user} has assigned the card \"%s\" on \"%s\" to you." : "{user} vám přiřadil(a) kartu „%s“ na „%s“.",
-    "The card \"%s\" on \"%s\" has reached its due date." : "U karty \"%s\" z tabule \"%s\" nastalo plánované datum dokončení.",
-    "The board \"%s\" has been shared with you by %s." : "Tabule \"%s\" s vámi byla nasdílena uživatelem %s.",
-    "{user} has shared the board %s with you." : "{user} s vámi nasdílel tabuli %s.",
-    "No data was provided to create an attachment." : "Žádná data k vytvoření přílohy.",
     "Finished" : "Dokončeno",
     "To review" : "K revizi",
     "Action needed" : "Nutná akce",
     "Later" : "Později",
-    "To do" : "Udělat",
-    "Doing" : "Provádí se",
-    "Done" : "Hotovo",
-    "Example Task 3" : "Třetí úkol pro ukázku",
-    "Example Task 2" : "Druhý úkol pro ukázku",
-    "Example Task 1" : "První úkol pro ukázku",
-    "The file was uploaded" : "Soubor byl nahrán",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini" : "Nahrávaný soubor přesahuje nastavení upload_max_filesize v php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Nahrávaný soubor přesáhl svou velikostí hodnotu direktivy MAX_FILE_SIZE, určenou v HTML formuláři",
-    "The file was only partially uploaded" : "Soubor byl nahrán pouze z části",
-    "No file was uploaded" : "Nebyl nahrán žádný soubor",
-    "Missing a temporary folder" : "Chybí složka pro dočasné soubory",
-    "Could not write file to disk" : "Soubor se nedaří se zapsat na úložiště",
-    "A PHP extension stopped the file upload" : "PHP rozšíření zastavilo nahrávání souboru.",
-    "No file uploaded or file size exceeds maximum of %s" : "Nebyl nahrán žádný soubor nebo jeho velikost přesáhla %s",
-    "A kanban style project and personal management tool for Nextcloud" : "Nástroj pro projektový a osobní řízení ve stylu Kanban.",
-    "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 🚀 Get your project organized" : "Karty jsou nástroj zacílený na osobní nebo projektové plánování týmů v Kanban stylu, vestavěný v Nextcloud.\n\n\n- 📥 Zadávejte a uspořádávejte své úkoly do karet\n- 📄 Zapisujte si dodatečné poznámky \n- 🔖 Přiřazujte štítky pro ještě lepší organizaci\n- 👥 Sdílejte se svým týmem, přáteli nebo rodinou\n- 🚀 Dostaňte svůj projekt pod kontrolu",
+    "Deck" : "Balík",
     "Add a new stack" : "Přidat nový zásobník",
-    "Submit" : "Odeslat",
     "Show archived cards" : "Zobrazit archivované karty",
     "Hide archived cards" : "Skrýt archivované karty",
-    "Toggle compact mode" : "Vyp/zap. kompaktní režim",
-    "Board details" : "Podrobnosti o desce",
+    "Board details" : "Detaily desky",
     "All Boards" : "Všechny desky",
-    "Archived boards" : "Archivované desky",
-    "Share board" : "Sdílet nástěnku",
-    "Drop your files here to upload it to the card" : "Přetáhněte soubor sem, pokud jej chcete připojit ke kartě.",
-    "Add a new card" : "Přidat novou kartu",
-    "Actions" : "Akce",
-    "Assign to me" : "Přiřadit mě",
-    "Unassign from me" : "Zrušit přiřazení mě",
     "Archive" : "Archiv",
     "Unarchive" : "Zrušit archivování",
     "Delete" : "Smazat",
     "Enter a card title" : "Zadejte nadpis karty",
-    "Add card" : "Přidat kartu",
-    "Close" : "Zavřít",
     "Sharing" : "Sdílení",
     "Tags" : "Značky",
-    "Deleted Stacks" : "Smazané zásobníky",
-    "Deleted Cards" : "Smazané karty",
-    "Activity" : "Aktivita",
     "Select users or groups to share with" : "Vyberte uživatele nebo skupiny pro sdílení",
-    "Access for" : "Přístup pro",
     "No matching user or group found." : "Nevyhovuje žádný uživatel ani skupina",
-    "Loading" : "Načítání",
     "Share" : "Sdílet",
     "Edit" : "Upravit",
     "Manage" : "Spravovat",
     "Discard share" : "Zrušit sdílení",
-    "Update" : "Aktualizovat",
-    "Create" : "Vytvořit",
-    "Create a new tag" : "Vytvořit nový štítek",
-    "Status" : "Stav",
-    "No archived boards to display" : "Žádné archivované nástěnky k zobrazení",
-    "No shared boards to display" : "Žádné sdílené nástěnky k zobrazení",
+    "Create a new tag" : "Vytvořit novou značku",
     "Title" : "Název",
     "Members" : "Členové",
     "More actions" : "Více akcí",
@@ -142,38 +33,25 @@ OC.L10N.register(
     "Archive board" : "Archivovaná deska",
     "Unarchive board" : "Odarchivovat desku",
     "Delete board" : "Smazat desku",
-    "Reset" : "Obnovit",
-    "Undo board deletion - Otherwise the board will be deleted during the next cronjob run." : "Vrátit smazání tabule - Tabule bude jinak trvale odstraněna během příštího běhu cronjobu.",
-    "Create new board" : "Vytvořit novou desku",
+    "Create new board" : "VYtvořit ovou desku",
     "New board title" : "Nadpis nové desky",
-    "Select an attachment" : "Vybrat přílohu",
-    "Cancel upload" : "Zrušit nahrávání",
-    "by" : "od",
-    "Undo file deletion - Otherwise the file will be deleted during the next cronjob run." : "Vrátit smazání souboru – v opačném případě bude soubor trvale smazán při dalším běhu cronjobu.",
-    "Undo file deletion" : "Vzít zpět smazání souboru",
-    "Insert the file into the description" : "Vložte soubor do popisku.",
     "Modified:" : "Upraveno:",
     "Created:" : "Vytvořeno:",
-    "Choose a tag" : "Vyberte štítek",
-    "Add a tag" : "Přidat štítek",
-    "Select tags" : "Výběr štítků",
-    "Assign users" : "Přiřadit uživatele",
-    "Choose a user to assign" : "Zvolte uživatele kterého přiřadit",
-    "Assign this card to a user" : "Přiřadit kartu uživateli",
+    "by" : "od",
+    "Choose a label" : "Vybrat popisek",
+    "Add a label" : "Přidat popisek",
+    "Select labels…" : "Vybrat popisky...",
     "Due date" : "Termín",
     "Click to set" : "Klikněte pro výběr",
     "Remove due date" : "Odstranit termín",
     "Description" : "Popis",
-    "Attachments" : "Přílohy",
-    "Saved" : "Uloženo",
-    "Unsaved changes" : "Neuložené změny",
     "Formatting help" : "Nápověda k formátování",
-    "Upload attachment" : "Nahrát přílohu",
-    "Insert attachment" : "Vložit přílohu",
-    "Add a card description…" : "Přidat popis karty…",
+    "Saved" : "Uloženo",
+    "Add a card description…" : "Přidat popis karty...",
+    "Archived boards" : "Archivované desky",
     "Shared boards" : "Sdílené desky",
-    "View more" : "Ukázat více",
+    "Shared with you" : "Sdíleno s vámi",
     "Move board to archive" : "Přesunout desku do archivu",
     "Create a new board" : "Vytvořit novou desku"
 },
-"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");