Skip to content

Archive boards #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 15 commits into from
Jun 8, 2017
Merged

Archive boards #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8c04ea8
Archive boards
juliusknorr May 4, 2017
90eb9ce
Fix unit tests for board archiving
juliusknorr May 17, 2017
247b4dd
Fix getting permissions and active indicator
juliusknorr May 17, 2017
2c63bfb
Keep deleted boards for a while and delete with cron
juliusknorr May 17, 2017
f7b69d9
Fix varius small issues
juliusknorr May 18, 2017
06e41f5
Add unit tests
juliusknorr May 28, 2017
f5dc4ac
Fix missing card actions
juliusknorr May 28, 2017
c758637
Fix stateParam changes
juliusknorr May 28, 2017
57f74c9
Fix adding new boards in the sidebar
juliusknorr May 28, 2017
19a9080
Add more unit testing
juliusknorr May 28, 2017
4623688
Fix codacy errors
juliusknorr May 28, 2017
3062c82
Allow force delete to have a clean test env after creating boards
juliusknorr May 28, 2017
727a335
fixed_context_menu_position
artemanufrij May 29, 2017
034ac5e
add_delete_menu_in_default_view
artemanufrij May 29, 2017
68b2025
Some minor fixes
juliusknorr Jun 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pipeline:
matrix:
TESTS: syntax-php7.0
php5.6:
image: nextcloudci/php5.6:php5.6-3
image: nextcloudci/php5.6:php5.6-7
environment:
- APP_NAME=deck
- CORE_BRANCH=master
Expand All @@ -93,7 +93,7 @@ pipeline:
matrix:
TESTS: php5.6
php7.0:
image: nextcloudci/php7.0:php7.0-7
image: nextcloudci/php7.0:php7.0-8
environment:
- APP_NAME=deck
- CORE_BRANCH=master
Expand Down Expand Up @@ -170,4 +170,4 @@ matrix:
- TESTS: jsbuild
- TESTS: integration

branches: [ master, stable* ]

8 changes: 8 additions & 0 deletions appinfo/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@
<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>
</declaration>
</table>
<table>
Expand Down
5 changes: 4 additions & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
💥 This is still alpha software: it may not be stable enough for production!

</description>
<version>0.1.4.1</version>
<version>0.1.4.2</version>
<licence>agpl</licence>
<author>Julius Härtl</author>
<namespace>Deck</namespace>
Expand All @@ -30,6 +30,9 @@
<dependencies>
<nextcloud min-version="11" max-version="13" />
</dependencies>
<background-jobs>
<job>OCA\Deck\Cron\DeleteCron</job>
</background-jobs>
<repair-steps>
<post-migration>
<step>OCA\Deck\Migration\UnknownUsers</step>
Expand Down
1 change: 1 addition & 0 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
['name' => 'board#read', 'url' => '/boards/{boardId}', 'verb' => 'GET'],
['name' => 'board#update', 'url' => '/boards/{boardId}', 'verb' => 'PUT'],
['name' => 'board#delete', 'url' => '/boards/{boardId}', 'verb' => 'DELETE'],
['name' => 'board#deleteUndo', 'url' => '/boards/{boardId}/deleteUndo', 'verb' => 'POST'],
['name' => 'board#getUserPermissions', 'url' => '/boards/{boardId}/permissions', 'verb' => 'GET'],
['name' => 'board#addAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'POST'],
['name' => 'board#updateAcl', 'url' => '/boards/{boardId}/acl', 'verb' => 'PUT'],
Expand Down
76 changes: 62 additions & 14 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ button.button-inline:hover {
* Navigation sidebar
*/

.app-navigation-entry-menu ul {
flex-direction: row;
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to @jancborchardt icons should be stacked vertically (with a label next to them):

#121 (comment)

}

.app-navigation-entry-utils-menu-button {
display: block !important;
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can safely be deleted

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

.app-navigation-entry-utils-menu-share {
display: flex !important;
padding: 14px;
Expand Down Expand Up @@ -318,9 +326,9 @@ button.button-inline:hover {
.popovermenu {
z-index: 999;
opacity: 1;
margin-top: 25px;
margin-right: 3px;
display: block;
margin-top: 25px;
margin-right: 0px;
}

.popovermenu.hidden {
Expand Down Expand Up @@ -614,23 +622,30 @@ button.button-inline:hover {

.colorselect {
overflow: hidden;
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a case where this container overflows?

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, i think that is a leftover from using floats before using flexbox with this PR.

clear: both;
padding-top: 4px;
padding-left: 4px;
border-radius:3px;
flex-direction: row;
min-width: 240px;
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can it be larger anyway? Maybe width: 100%; would make more sense here.

Edit: It can, in the table. However, the question then is should it really grow? Setting a fixed width at 240px and removing flex-grow on line 720 would make both colorlists equal in size.

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure about that, since we have 2 places with different width using this.

2017-06-08-230340_1155x200_scrot

height: 34px;
display: flex;
margin: 3px 3px 3px 0;
}

.colorselect .color {
opacity: 0.7;
width: 27px;
height: 27px;
float: left;
margin-right: 2px;
height: 100%;
flex-grow: 1;
border: none;
}

.colorselect .selected {
background-image: url(../../../core/img/actions/checkmark.svg);
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It owuld be better to move his to a new class icon-selected or icon-checkmark. Then it can be reused. Also, next two lines could be removed.

P.S. do we need ../../..? on my setup(s), url(/core/img/actions/checkmarks.svg) works fine.

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/core/ will not work on setups where nextcloud is running inside of a subdirectory, so the ../../../ are needed.

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but classes like icon-selected and icon-selected-dark makes sense.

background-position: center center;
background-repeat: no-repeat;
opacity: 1.0;
border: 1px solid #333333;
}

.colorselect .dark.selected {
background-image: url(../../../core/img/actions/checkmark-white.svg);
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

}

.labels .colorselect {
Expand Down Expand Up @@ -662,6 +677,16 @@ button.button-inline:hover {
cursor: pointer;
display: block;
}
#boardlist .app-popover-menu-utils {
width: 30px;
display: inline;
position: relative;
}

.popovermenu ul {
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This style already exists in core css that is served alongside, so perhaps it;s not needed?

.bubble ul, .app-navigation-entry-menu ul, .popovermenu ul {
    display: flex !important;
    flex-direction: column;
}

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 But i need to check that.

display: flex !important;
flex-direction: column;
}

#boardlist td {
padding: 10px;
Expand All @@ -680,15 +705,34 @@ button.button-inline:hover {

.cell-board-title {
width: 50%;
}

#boardlist tr.deleted td * {
Copy link
Contributor

@pixelipo pixelipo Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not just change the opacity of the whole row with #boardlist tr.deleted { ?

Copy link
Member Author

@juliusknorr juliusknorr Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will also change the opacity of the border that separates the lines, that looked a bit odd. 😉

opacity: 0.5;
}

#boardlist .colorselect,
#boardlist input {
float: left;
#boardlist td form {
display: flex;
width: 100%;
}

#boardlist td .colorselect {
flex-grow: 1;
}

#boardlist .colorselect {
#boardlist td input[type=text] {
flex-grow: 2;
}

#boardlist td input[type=submit] {
width: 32px;
}

#boardlist td .app-popover-menu-utils {
float: right;
}

#boardlist .popovermenu {
margin-top: 5px;
}

Expand Down Expand Up @@ -925,6 +969,10 @@ button.button-inline:hover {
* Custom icons
*/

.icon-deck {
background-image: url(../img/deck.svg);
}

.icon-group {
background-image: url('../../../settings/img/users.svg');
}
Expand Down
1 change: 1 addition & 0 deletions img/deck.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 16 additions & 12 deletions js/app/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,40 @@ app.config(function ($provide, $routeProvider, $interpolateProvider, $httpProvid
});
markdownItConverterProvider.use(markdownitLinkTarget);

$urlRouterProvider.otherwise("/");
$urlRouterProvider.otherwise('/');

$stateProvider
.state('list', {
url: "/",
templateUrl: "/boardlist.mainView.html",
controller: 'ListController'
url: '/:filter',
templateUrl: '/boardlist.mainView.html',
controller: 'ListController',
reloadOnSearch: false,
params: {
filter: { value: '', dynamic: true }
}
})
.state('board', {
url: "/board/:boardId/:filter",
templateUrl: "/board.html",
url: '/board/:boardId/:filter',
templateUrl: '/board.html',
controller: 'BoardController',
params: {
filter: { value: '', dynamic: true }
}
})
.state('board.detail', {
url: "/detail/",
url: '/detail/',
reloadOnSearch : false,
views: {
"sidebarView": {
templateUrl: "/board.sidebarView.html"
'sidebarView': {
templateUrl: '/board.sidebarView.html'
}
}
})
.state('board.card', {
url: "/card/:cardId",
url: '/card/:cardId',
views: {
"sidebarView": {
templateUrl: "/card.sidebarView.html",
'sidebarView': {
templateUrl: '/card.sidebarView.html',
controller: 'CardController'
}
}
Expand Down
11 changes: 7 additions & 4 deletions js/app/Run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@
*
*/

app.run(function ($document, $rootScope, $transitions) {
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$) {
BoardService.unsetCurrrent();
});
$transitions.onEnter({to: 'board.card'}, function ($state, $transition$) {
$rootScope.sidebar.show = true;
});
Expand All @@ -40,9 +46,6 @@ app.run(function ($document, $rootScope, $transitions) {
$transitions.onExit({from: 'board.detail'}, function ($state) {
$rootScope.sidebar.show = false;
});
$transitions.onEnter({to: 'board.archive'}, function ($state) {
//BoardController.loadArchived();
});

$('link[rel="shortcut icon"]').attr(
'href',
Expand Down
3 changes: 1 addition & 2 deletions js/controller/BoardController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
}
};
$scope.checkCanEdit = function () {
return !$scope.archived;
return !BoardService.getCurrent().archived;
};

// filter cards here, as ng-sortable will not work nicely with html-inline filters
Expand Down Expand Up @@ -114,7 +114,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St

// Handle initial Loading
BoardService.fetchOne($scope.id).then(function (data) {
BoardService.getPermissions();
$scope.statusservice.releaseWaiting();
}, function (error) {
$scope.statusservice.setError('Error occured', error);
Expand Down
5 changes: 3 additions & 2 deletions js/controller/CardController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ app.controller('CardController', function ($scope, $rootScope, $routeParams, $lo
}
};
$scope.cardEditDescriptionShow = function($event) {
if(BoardService.isArchived() || CardService.getCurrent().archived) {
return false;
}
var node = $event.target.nodeName;
console.log($event);
console.log(BoardService);
if($scope.card.archived || !$scope.boardservice.canEdit()) {
console.log(node);
} else {
Expand Down
Loading