Skip to content

Commit

Permalink
Merge pull request #33 from Ho-Wan/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ho-wan authored Feb 3, 2019
2 parents 71692bf + 7915753 commit 7644983
Show file tree
Hide file tree
Showing 5 changed files with 209 additions and 68 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## 0.5.0 (03 Feb 2019)
- Enable Archive card functionality.
- Allow user to remove themself from card.
- Can update title and description of card (edit from current value).

## 0.4.0 (02 Feb 2019)
- Add user to card, add description to card functionality
- **WARNING** - Edit description will overwrite the existing description
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
Welcome to Trello Viewer for VS Code! This extension provides the following features:

- Browse Trello boards, lists and cards in the side bar.
- Add new cards, add user to card, add description to card.
- Add cards or archive existing card
- Add and remove user to card.
- Edit title and description of card.
- View selected card using the markdown previewer and open to the side.
- See formatted checklists and cover image for the card.
- Assign a favourite list to easily access cards.
Expand All @@ -25,7 +27,7 @@ Welcome to Trello Viewer for VS Code! This extension provides the following feat
- Login to trello at https://trello.com/login
- Get API key at https://trello.com/app-key
- Set credentials by clicking the key icon in the left Side Bar or running command "Trello Viewer: Authenticate".
- After entering API key, a new page should open in browser to get a readonly API token.
- After entering API key, a new page should open in browser to get an API token.
- Alternatively, use the command "Trello Viewer: Set Credentials" and follow instructions from Trello to manually generate a token.

## Tree View
Expand All @@ -40,7 +42,7 @@ Welcome to Trello Viewer for VS Code! This extension provides the following feat
- Clicking on the 'star' icon to the right of a list assigns this as your "favourite list", shown in the lower part of the side bar.
- Clicking on the icons in the side bar runs various commands, such as setting credentials, removing credentials, showing saved info, and refreshing views.
- Click the 'plus' icon to add a card to the selected list.
- Right click on a card to see options for card, such as assigning a user and editing the description.
- Right click on a card to see options for card, such as assigning a user, editing the title or description, and archive card.

## Trello Card Markdown Preview

Expand All @@ -52,9 +54,9 @@ Main functionality is provided using the VS code interface in the left Side Bar.

Command | Description
--- | ---
```Trello Viewer: Authenticate``` | Set user Trello API key and token.
```Trello Viewer: Set Credentials``` | Set user Trello API key and token manually.
```Trello Viewer: Refresh``` | Refresh the main Trello tree view.
```Trello Viewer: Reset Credentials``` | Removes saved credentials.
```Trello Viewer: Reset Credentials``` | Resets saved credentials.

## Extension Settings

Expand Down
72 changes: 52 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-trello-viewer",
"displayName": "Trello Viewer",
"description": "View Trello cards in VS Code, browse user's boards and lists.",
"version": "0.4.0",
"version": "0.5.0",
"publisher": "Ho-Wan",
"author": {
"name": "Ho-Wan To",
Expand Down Expand Up @@ -38,25 +38,24 @@
"icon": "images/trello-viewer-icon.png",
"contributes": {
"commands": [
{
"command": "trelloViewer.test",
"title": "Trello Viewer: Check Key and Token"
},
{
"command": "trelloViewer.authenticate",
"title": "Trello Viewer: Authenticate",
"title": "Authenticate",
"category": "Trello Viewer",
"icon": {
"light": "images/light/key.svg",
"dark": "images/dark/key.svg"
}
},
{
"command": "trelloViewer.setCredentials",
"title": "Trello Viewer: Set Credentials"
"title": "Trello Viewer: Set Credentials",
"category": "Trello Viewer"
},
{
"command": "trelloViewer.resetCredentials",
"title": "Trello Viewer: Reset Credentials",
"category": "Trello Viewer",
"icon": {
"light": "images/light/x.svg",
"dark": "images/dark/x.svg"
Expand All @@ -65,6 +64,7 @@
{
"command": "trelloViewer.showTrelloInfo",
"title": "Trello Viewer: Show Saved Credentials",
"category": "Trello Viewer",
"icon": {
"light": "images/light/eye.svg",
"dark": "images/dark/eye.svg"
Expand All @@ -73,6 +73,7 @@
{
"command": "trelloViewer.refresh",
"title": "Trello Viewer: Refresh",
"category": "Trello Viewer",
"icon": {
"light": "images/light/refresh.svg",
"dark": "images/dark/refresh.svg"
Expand All @@ -81,6 +82,7 @@
{
"command": "trelloViewer.refreshFavoriteList",
"title": "Trello Viewer: Refresh Favorite List",
"category": "Trello Viewer",
"icon": {
"light": "images/light/refresh.svg",
"dark": "images/dark/refresh.svg"
Expand All @@ -97,6 +99,7 @@
{
"command": "trelloViewer.setFavoriteListByClick",
"title": "Trello Viewer: Set as favorite list",
"category": "Trello Viewer",
"icon": {
"light": "images/light/star.svg",
"dark": "images/dark/star.svg"
Expand All @@ -105,18 +108,36 @@
{
"command": "trelloViewer.addCard",
"title": "Add Card",
"category": "Trello Viewer",
"icon": {
"light": "images/light/plus.svg",
"dark": "images/dark/plus.svg"
}
},
{
"command": "trelloViewer.addUserToCard",
"title": "Add user to card"
"command": "trelloViewer.editCardTitle",
"title": "Edit title of card",
"category": "Trello Viewer"
},
{
"command": "trelloViewer.editCardDescription",
"title": "Edit description of card"
"title": "Edit description of card",
"category": "Trello Viewer"
},
{
"command": "trelloViewer.addUserToCard",
"title": "Add user to card",
"category": "Trello Viewer"
},
{
"command": "trelloViewer.removeUserFromCard",
"title": "Remove user from card",
"category": "Trello Viewer"
},
{
"command": "trelloViewer.archiveCard",
"title": "Archive Card",
"category": "Trello Viewer"
}
],
"configuration": {
Expand Down Expand Up @@ -150,9 +171,21 @@
"command": "trelloViewer.addUserToCard",
"when": "false"
},
{
"command": "trelloViewer.removeUserFromCard",
"when": "false"
},
{
"command": "trelloViewer.editCardTitle",
"when": "false"
},
{
"command": "trelloViewer.editCardDescription",
"when": "false"
},
{
"command": "trelloViewer.archiveCard",
"when": "false"
}
],
"view/title": [
Expand Down Expand Up @@ -195,29 +228,28 @@
},
{
"command": "trelloViewer.addCard",
"when": "view == trelloTreeView && viewItem == list",
"when": "viewItem == list",
"group": "inline@4"
},
{
"command": "trelloViewer.addCard",
"when": "view == trelloViewFavoriteList && viewItem == list",
"group": "inline@4"
"command": "trelloViewer.archiveCard",
"when": "viewItem == card"
},
{
"command": "trelloViewer.addUserToCard",
"when": "view == trelloTreeView && viewItem == card"
"when": "viewItem == card"
},
{
"command": "trelloViewer.addUserToCard",
"when": "view == trelloViewFavoriteList && viewItem == card"
"command": "trelloViewer.removeUserFromCard",
"when": "viewItem == card"
},
{
"command": "trelloViewer.editCardDescription",
"when": "view == trelloTreeView && viewItem == card"
"command": "trelloViewer.editCardTitle",
"when": "viewItem == card"
},
{
"command": "trelloViewer.editCardDescription",
"when": "view == trelloViewFavoriteList && viewItem == card"
"when": "viewItem == card"
}
]
},
Expand Down
18 changes: 13 additions & 5 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import * as vscode from "vscode";
import { TrelloUtils, removeTempTrelloFile } from "./trello/TrelloUtils";
import { TrelloTreeView } from "./trello/TrelloTreeView";
import { TrelloViewFavoriteList } from "./trello/TrelloViewFavoriteList";
import { TrelloCard, TrelloList } from "./trello/trelloComponents";
import { TrelloCard } from "./trello/trelloComponents";
import { TrelloItem } from "./trello/TrelloItem";

export function activate(context: vscode.ExtensionContext) {
const trello = new TrelloUtils(context);
Expand All @@ -19,14 +20,21 @@ export function activate(context: vscode.ExtensionContext) {
vscode.commands.registerCommand("trelloViewer.resetCredentials", () => trello.resetCredentials());
vscode.commands.registerCommand("trelloViewer.showTrelloInfo", () => trello.showTrelloInfo());
vscode.commands.registerCommand("trelloViewer.resetFavoriteList", () => trello.resetFavoriteList());
vscode.commands.registerCommand("trelloViewer.setFavoriteListByClick", (list: TrelloList) =>
vscode.commands.registerCommand("trelloViewer.setFavoriteListByClick", (list: TrelloItem) =>
trello.setFavoriteListByClick(list)
);

vscode.commands.registerCommand("trelloViewer.addCard", (list: TrelloList) => trello.addCardToList(list));
vscode.commands.registerCommand("trelloViewer.addUserToCard", (card: TrelloCard) => trello.addUserToCard(card));
vscode.commands.registerCommand("trelloViewer.addCard", (list: TrelloItem) => trello.addCardToList(list));
vscode.commands.registerCommand("trelloViewer.archiveCard", (card: TrelloItem) => trello.archiveCard(card));
vscode.commands.registerCommand("trelloViewer.addUserToCard", (card: TrelloItem) => trello.addUserToCard(card));
vscode.commands.registerCommand("trelloViewer.removeUserFromCard", (card: TrelloItem) =>
trello.removeUserFromCard(card)
);

vscode.commands.registerCommand("trelloViewer.editCardDescription", (card: TrelloCard) =>
vscode.commands.registerCommand("trelloViewer.editCardTitle", (card: TrelloItem) =>
trello.editTitle(card)
);
vscode.commands.registerCommand("trelloViewer.editCardDescription", (card: TrelloItem) =>
trello.editDescription(card)
);

Expand Down
Loading

0 comments on commit 7644983

Please sign in to comment.