Skip to content

Commit f131525

Browse files
felipekmfelipekm
committed
Merge pull request #14 from felipekm/v0.2.0
V0.2.0
2 parents 4d72602 + ff86706 commit f131525

18 files changed

+517
-216
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea
22
node_modules
3-
app/lib
3+
app/lib
4+
www

‎README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,32 @@ Involved Techs
1313
* Javascript
1414
* AngularJS
1515
* TopCoat.io
16+
* Gulp
1617

1718
Packages
1819
========
1920
* NodeJS
2021
* Bower
22+
23+
========
24+
The MIT License (MIT)
25+
26+
Copyright (c) 2014 Felipe Kautzmann
27+
28+
Permission is hereby granted, free of charge, to any person obtaining a copy
29+
of this software and associated documentation files (the "Software"), to deal
30+
in the Software without restriction, including without limitation the rights
31+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
32+
copies of the Software, and to permit persons to whom the Software is
33+
furnished to do so, subject to the following conditions:
34+
35+
The above copyright notice and this permission notice shall be included in all
36+
copies or substantial portions of the Software.
37+
38+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
39+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
40+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
41+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
42+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
43+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
44+
SOFTWARE.

‎app/manifest.webapp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.1.1",
2+
"version": "0.2.0",
33
"name": "FastToDo",
44
"launch_path": "/src/index.html",
55
"description": "A very fast way to organize daily tasks",

‎app/src/css/styles.css

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
-moz-user-select: none;
66
-ms-user-select: none;
77
user-select: none;
8-
cursor: w-resize;
8+
cursor: pointer;
99
}
1010

1111
.cssFade {
1212
transition: 0.5s linear all;
1313
opacity: 1;
1414
}
15+
16+
textarea {
17+
resize: none;
18+
}
19+
1520
.cssFade.ng-hide {
1621
opacity: 0;
1722
}
@@ -91,12 +96,20 @@
9196
line-height: 50px;
9297
}
9398

94-
.search-bar {
99+
.todo-form {
100+
padding: 10px;
95101
}
96102

97-
.search-bar input {
103+
.todo-form input {
98104
width: 100%;
99-
height: 80px;
105+
height: 55px;
106+
}
107+
108+
.todo-form textarea {
109+
margin-top:5px;
110+
width: 100%;
111+
height: 290px;
112+
line-height: 30px;
100113
}
101114

102115
.listSwitcher {
@@ -135,4 +148,12 @@
135148
font-weight: 500;
136149
padding: 0px;
137150
line-height: 1em;
151+
}
152+
153+
.chars-remaining {
154+
font-family: "trebuchet ms";
155+
float: right;
156+
font-size: 8pt;
157+
margin-top: -3%;
158+
color: #e5e9e8;
138159
}

‎app/src/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" type="text/css" href="css/styles.css">
1313
</head>
1414

15-
<body data-ng-controller="rootController">
15+
<body data-ng-controller="RootController">
1616

1717
<!-- CONTENT -->
1818
<div ng-view data-ng-class="{'animate-slide': isLayoutAnimated}" class="full">
@@ -31,6 +31,7 @@
3131
<script type="text/javascript" src="js/controllers/rootController.js"></script>
3232
<script type="text/javascript" src="js/controllers/homeController.js"></script>
3333
<script type="text/javascript" src="js/controllers/aboutController.js"></script>
34+
<script type="text/javascript" src="js/controllers/todoController.js"></script>
3435
<script type="text/javascript" src="js/directives/focusMe.js"></script>
3536
<script type="text/javascript" src="js/directives/enter.js"></script>
3637
<script type="text/javascript" src="js/services/storageFactory.js"></script>

‎app/src/js/app.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
// config time
1818
app.config(["$routeProvider", "$httpProvider", function AppConfig($routeProvider, $httpProvider) {
1919

20-
$routeProvider.when("/home", { templateUrl: "partials/home.html", controller: "homeController"});
21-
$routeProvider.when("/about", { templateUrl: "partials/templates/about.html", controller: "aboutController"});
22-
$routeProvider.when("/details", { templateUrl: "partials/templates/details.html", controller: "detailsController"});
20+
$routeProvider.when("/home", { templateUrl: "partials/home.html", controller: "HomeController"});
21+
$routeProvider.when("/about", { templateUrl: "partials/templates/about.html", controller: "AboutController"});
22+
$routeProvider.when("/todo", { templateUrl: "partials/templates/todo.html", controller: "ToDoController"});
2323

2424
$routeProvider.otherwise({ redirectTo: "/home" });
2525

‎app/src/js/controllers/aboutController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*global angular, console, confirm*/
22

3-
angular.module("FastToDo").controller("aboutController", function HomeController($scope) {
3+
angular.module("FastToDo").controller("AboutController", function AboutController ($scope) {
44
'use strict';
55

66
$scope.back = function back() {

‎app/src/js/controllers/headerController.js

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*global angular, console, confirm*/
2+
3+
angular.module('FastToDo').controller('HeaderController', [
4+
'todoService',
5+
function HeaderController($scope, todoService) {
6+
'use strict';
7+
8+
$scope.isAddMode = false;
9+
$scope.isAddMode = false;
10+
$scope.isDeleteMode = false;
11+
$scope.headerTitle = 'Fast ToDo';
12+
13+
$scope.save = function (item) {
14+
if (item.title && item.description) {
15+
todoService.save(item);
16+
}
17+
};
18+
19+
}]);

0 commit comments

Comments
 (0)