Skip to content
This repository has been archived by the owner on Oct 11, 2021. It is now read-only.

Commit

Permalink
v 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
TimoStahl committed Oct 13, 2015
1 parent 03367ab commit 67143de
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 56 deletions.
12 changes: 6 additions & 6 deletions src/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"tests"
],
"dependencies": {
"angular-material-icons": "~0.5.0",
"angular-material-icons": "~0.6.0",
"angular-base64": "~2.0.5",
"angular-material": "~0.10.0",
"angular-route": "~1.4.2",
"angular": "~1.4.2",
"angular-translate": "~2.7.2",
"angular-translate-loader-static-files": "~2.7.2"
"angular-material": "~0.11.2",
"angular-route": "~1.4.7",
"angular": "~1.4.7",
"angular-translate": "~2.8.1",
"angular-translate-loader-static-files": "~2.8.1"
}
}
6 changes: 2 additions & 4 deletions src/css/style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Chrome Extension*/
body {
/* Chrome Extension */
body, html {
min-width:600px;
}

Expand Down Expand Up @@ -99,5 +99,3 @@ md-toolbar {
line-height: 1.6em;
color: rgba(0,0,0,0.54);
}


22 changes: 15 additions & 7 deletions src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ angular.module('Kanboard')
})
.determinePreferredLanguage()
.fallbackLanguage('en')
.useSanitizeValueStrategy('escape')
.useStaticFilesLoader({
prefix: 'translation/',
suffix: '.json'
Expand Down Expand Up @@ -179,6 +180,7 @@ angular.module('Kanboard')
.factory('dataFactory', ['$base64', '$http', function($base64, $http) {

var dataFactory = {};
var request;

dataFactory.getEndpoints = function() {
var items = localStorage.getItem("endpoints");
Expand Down Expand Up @@ -261,36 +263,42 @@ angular.module('Kanboard')
dataFactory.getProjects = function(api_id) {
var api_config = this.getEndpoints()[api_id - 1];
if (api_config.user == 'jsonrpc') {
var request = '{"jsonrpc": "2.0", "method": "getAllProjects", "id": ' + api_id + '}';
request = '{"jsonrpc": "2.0", "method": "getAllProjects", "id": ' + api_id + '}';
}
else {
var request = '{"jsonrpc": "2.0", "method": "getMyProjectsList", "id": ' + api_id + '}';
request = '{"jsonrpc": "2.0", "method": "getMyProjects", "id": ' + api_id + '}';
}
return $http.post(this.getBaseUrl(api_id) + '?getAllProjects', request, this.createConfig(api_id));
};

dataFactory.getBoard = function(api_id, projectid) {
var request = '{"jsonrpc": "2.0", "method": "getBoard", "id": ' + api_id + ',"params": { "project_id": ' + projectid + ' }}';
request = '{"jsonrpc": "2.0", "method": "getBoard", "id": ' + api_id + ',"params": { "project_id": ' + projectid + ' }}';
return $http.post(this.getBaseUrl(api_id) + '?getBoard', request, this.createConfig(api_id));
};

dataFactory.getProjectById = function(api_id, projectid) {
var request = '{"jsonrpc": "2.0", "method": "getProjectById", "id": ' + api_id + ',"params": { "project_id": ' + projectid + ' }}';
request = '{"jsonrpc": "2.0", "method": "getProjectById", "id": ' + api_id + ',"params": { "project_id": ' + projectid + ' }}';
return $http.post(this.getBaseUrl(api_id) + '?getProjectById', request, this.createConfig(api_id));
};

dataFactory.getTaskById = function(api_id, taskid) {
var request = '{"jsonrpc": "2.0", "method": "getTask", "id": ' + api_id + ',"params": { "task_id": ' + taskid + ' }}';
request = '{"jsonrpc": "2.0", "method": "getTask", "id": ' + api_id + ',"params": { "task_id": ' + taskid + ' }}';
return $http.post(this.getBaseUrl(api_id) + '?getTask', request, this.createConfig(api_id));
};

dataFactory.getOverdueTasks = function(api_id) {
var request = '{"jsonrpc": "2.0", "method": "getOverdueTasks", "id": ' + api_id + '}';
var api_config = this.getEndpoints()[api_id - 1];
if (api_config.user == 'jsonrpc') {
request = '{"jsonrpc": "2.0", "method": "getOverdueTasks", "id": ' + api_id + '}';
}
else {
request = '{"jsonrpc": "2.0", "method": "getMyOverdueTasks", "id": ' + api_id + '}';
}
return $http.post(this.getBaseUrl(api_id) + '?getOverdueTasks', request, this.createConfig(api_id));
};

dataFactory.getProjectActivity = function(api_id, project_id) {
var request = '{"jsonrpc": "2.0", "method": "getProjectActivity", "id": ' + api_id + ',"params": { "project_id": ' + project_id + ' }}';
request = '{"jsonrpc": "2.0", "method": "getProjectActivity", "id": ' + api_id + ',"params": { "project_id": ' + project_id + ' }}';
return $http.post(this.getBaseUrl(api_id) + '?getProjectActivity', request, this.createConfig(api_id));
};

Expand Down
3 changes: 0 additions & 3 deletions src/js/controllers/SettingsEndpointCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ angular.module('KanboardCtrl')
$scope.endpoint = new Object();
$scope.edit = false;
}

$scope.endpoint.user = "jsonrpc";

$scope.save = function() {
$scope.endpoint.user = "jsonrpc";
if ($scope.endpoint.id >= 0) {
items = dataFactory.getEndpoints();
items[$scope.endpoint.id] = $scope.endpoint;
Expand Down
2 changes: 1 addition & 1 deletion src/js/loader.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

angular.module('KanboardCtrl', []);
angular.module('Kanboard', ['ngRoute', 'ngMaterial', 'ngMdIcons', 'base64', 'pascalprecht.translate', 'KanboardCtrl']);
angular.module('Kanboard', ['ngRoute','ngAnimate', 'ngMaterial', 'ngMdIcons', 'base64', 'pascalprecht.translate', 'KanboardCtrl']);
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "__MSG_chrome_extension_name__",
"description": "__MSG_chrome_extension_description__",
"version": "0.1.2",
"version": "0.1.3",
"author": "Timo Litzbarski",
"default_locale": "en",
"browser_action": {
Expand Down
2 changes: 1 addition & 1 deletion src/translation/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"cant_access_api": "kein Zugriff",
"add endpoint": "Endpunkt hinzufügen",
"edit endpoint": "Endpunkt bearbeiten",
"no_overdue_in": "Keine überfälligen Aufgaben in",
"no_overdue": "Keine überfälligen Aufgaben",
"overdue": "Überfällig",
"activities": "Aktivitäten",
"Remember last page on close and reopen on startup.": "Bei Start der App, die zuletzt besuchte Seite laden.",
Expand Down
2 changes: 1 addition & 1 deletion src/translation/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"cant_access_api": "Can't access projects",
"add endpoint": "add endpoint",
"edit endpoint": "edit endpoint",
"no_overdue_in": "no overdue tasks in",
"no_overdue": "no overdue tasks",
"overdue": "Overdue",
"activities": "Activities",
"Remember last page on close and reopen on startup.": "Remember last page on close and reopen on startup.",
Expand Down
2 changes: 1 addition & 1 deletion src/view/board_activity.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h1 class="md-title">{{ 'activities' | translate }}: {{project.name}}</h1>
<span flex></span>
<ng-md-icon icon="alarm" ng-click="$navigation.board_overdue(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="explore" ng-click="$navigation.board(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="view_module" ng-click="$navigation.board(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="open_in_browser" ng-click="$navigation.extern_url(project.url.board)"></ng-md-icon>
</md-toolbar>

Expand Down
4 changes: 2 additions & 2 deletions src/view/board_overdue.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<h1 class="md-title">{{ 'overdue' | translate }}: {{project.name}}</h1>
<span flex></span>
<ng-md-icon icon="history" ng-click="$navigation.board_activity(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="explore" ng-click="$navigation.board(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="view_module" ng-click="$navigation.board(api_id,project.id)"></ng-md-icon>
<ng-md-icon icon="open_in_browser" ng-click="$navigation.extern_url(project.url.board)"></ng-md-icon>
</md-toolbar>
<div>
<div ng-hide="tasks.length > 0" class="info">
{{ 'no_overdue_in' | translate }} "{{project_name}}"
{{ 'no_overdue' | translate }}
</div>

<span ng-repeat="task in tasks" ng-include="'view/task_box.html'">
Expand Down
41 changes: 20 additions & 21 deletions src/view/menu.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<md-button class="md-icon-button" ng-click="$navigation.back()">
<ng-md-icon icon="undo"></ng-md-icon>
<md-button aria-label="{{ 'back' | translate }}" class="md-icon-button" ng-click="$navigation.back()">
<ng-md-icon icon="undo"></ng-md-icon>
</md-button>

<md-menu>
<md-button aria-label="Open interactions menu" class="md-icon-button" ng-click="$mdOpenMenu()">
<ng-md-icon icon="menu"></ng-md-icon>
<md-button aria-label="Open interactions menu" class="md-icon-button" ng-click="$mdOpenMenu($event)">
<ng-md-icon icon="menu"></ng-md-icon>
</md-button>
<md-menu-content>
<md-menu-item>
<md-button ng-click="$navigation.home()">
<ng-md-icon icon="list"></ng-md-icon>
{{ 'projectlist' | translate }}
</md-button>
<md-menu-content width="4">
<md-menu-item>
<md-button ng-click="$navigation.home()">
<ng-md-icon icon="list"></ng-md-icon>
{{ 'projectlist' | translate }}
</md-button>
</a>
</md-menu-item>
<md-menu-item>
<md-button ng-click="$navigation.settings()">
<ng-md-icon icon="settings"></ng-md-icon>
{{ 'settings' | translate }}
</md-button>
</a>
</md-menu-item>
</md-menu-content>
</md-menu>
</md-menu-item>
<md-menu-item>
<md-button ng-click="$navigation.settings()">
<ng-md-icon icon="settings"></ng-md-icon>
{{ 'settings' | translate }}
</md-button>
</md-menu-item>
</md-menu-content>
</md-menu>
8 changes: 4 additions & 4 deletions src/view/project_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ <h1 class="md-title">{{ 'projects' | translate }}</h1>
<div ng-hide="ep.projects.length > 0" class="warning">{{ 'cant_access_api' | translate }}</div>
<md-list-item ng-repeat-end class="md-2-line" ng-repeat="project in ep.projects | filter:projectList.search | orderBy:'name'">
<!--<img ng-src="{{item.face}}?{{$index}}" class="md-avatar" alt="{{item.who}}" />-->
<ng-md-icon icon="view_module" class="md-avatar"></ng-md-icon>
<ng-md-icon icon="view_module" class="md-avatar" ng-click="$navigation.board(ep.id,project.id)"></ng-md-icon>
<div class="md-list-item-text" ng-click="$navigation.board(ep.id,project.id)">
<h3>{{project.name}}</h3>
<p>{{project.description}}</p>
</div>
<!--<md-button class="md-fab md-mini md-primary" ng-href="#/{{ep.id}}/board/show/{{project.id}}">
<ng-md-icon icon="explore"></ng-md-icon>
</md-button>-->
<md-button class="md-fab md-mini md-primary" ng-click="$navigation.board_overdue(ep.id,project.id)">
<md-button class="md-fab md-mini md-primary" aria-label="{{ 'overdue' | translate }}" ng-click="$navigation.board_overdue(ep.id,project.id)">
<ng-md-icon icon="alarm"></ng-md-icon>
</md-button>
<md-button class="md-fab md-mini md-primary" ng-click="$navigation.board_activity(ep.id,project.id)">
<md-button class="md-fab md-mini md-primary" aria-label="{{ 'activities' | translate }}" ng-click="$navigation.board_activity(ep.id,project.id)">
<ng-md-icon icon="history"></ng-md-icon>
</md-button>
<md-button class="md-fab md-mini md-primary" ng-click="$navigation.extern_url(project.url.board)">
<md-button class="md-fab md-mini md-primary" aria-label="{{ 'browser' | translate }}" ng-click="$navigation.extern_url(project.url.board)">
<ng-md-icon icon="open_in_browser"></ng-md-icon>
</md-button>
</md-list-item>
Expand Down
6 changes: 3 additions & 3 deletions src/view/settings.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<md-toolbar layout="row"><span ng-include="'view/menu.html'"></span>
<h1 class="md-title">{{ 'settings' | translate }}</h1>
<span flex></span>
<md-button class="" ng-click="$navigation.settings_endpoint(-1)">
<md-button aria-label="{{ 'add' | translate }}" ng-click="$navigation.settings_endpoint(-1)">
<ng-md-icon icon="add_circle"></ng-md-icon> {{ 'add' | translate }}
</md-button>
</md-toolbar>
Expand All @@ -15,10 +15,10 @@ <h1 class="md-title">{{ 'settings' | translate }}</h1>
<h3>{{endpoint.name}}</h3>
<p>{{endpoint.url}}</p>
</div>
<md-button class="md-fab md-mini md-primary" ng-click="$navigation.settings_endpoint(endpoint.id)">
<md-button class="md-fab md-mini md-primary" aria-label="{{ 'edit' | translate }}" ng-click="$navigation.settings_endpoint(endpoint.id)">
<ng-md-icon icon="mode_edit"></ng-md-icon>
</md-button>
<md-button class="md-fab md-mini md-primary" ng-click="showDeleteConfirm($event,endpoint)">
<md-button class="md-fab md-mini md-primary" aria-label="{{ 'delete' | translate }}" ng-click="showDeleteConfirm($event,endpoint)">
<ng-md-icon icon="delete"></ng-md-icon>
</md-button>
</md-list-item>
Expand Down
2 changes: 1 addition & 1 deletion src/view/settings_endpoint.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 class="md-title">
</md-input-container>
<md-input-container flex>
<label>{{ 'user' | translate }}</label>
<input ng-model="endpoint.user" readonly required>
<input ng-model="endpoint.user" required>
</md-input-container>
<md-input-container flex>
<label>{{ 'token' | translate }}</label>
Expand Down

0 comments on commit 67143de

Please sign in to comment.