todo_rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7249c867c2b38ebe0db142c5a2f40a34a31a3037
-  data.tar.gz: 7c3491e2863c5d9413ec9862b51e08fed86ed120
+  metadata.gz: 81f8c3b611c471c16db356c1dcaf711c1e7e4753
+  data.tar.gz: 119bd8c8b0521e17d44d10471a98a95f54e14e04
 SHA512:
-  metadata.gz: 40b9a85972ff97896d2e8f7855f7d21170058eb1f50e360362c0670cd3134a026f37dceb087838bb90ba1b60b43632ddee15a483980b760eabacc3c9c976209d
-  data.tar.gz: d649be7a191c8846a3fe8a96b293ec9d48bd72a690c96108834365173a3bd6066c49c0a343f56895f6f332937a235dc4439e7448f1dde7ff7f190bf5b45f8a9d
+  metadata.gz: 202c885cdfb56d42ea6d127d81b4ebfb7174f85930cb532d2da739481b563a91aa0c0691e98368e93c5e62d8051053c16102fe8e92d81f1ad3f497f9d227203c
+  data.tar.gz: ff1c6d54bdb7d5092f6d706b86a1fc1b6145429d1365b05bafb9689d0f3a41a83cfd414540a14f05043e55c03098e8263836b8621c2acaa7a88790314cd1ce7b

data/app/assets/javascripts/todo_rails/controllers/todoCtrl.coffee

@@ -4,13 +4,27 @@
 
 
 angular.module('todoRails.controllers').controller 'todoCtrl', [
-  '$scope', 'Restangular'
-  ($scope, Restangular) ->
+  '$scope', 'Restangular', '$mdDialog',
+  ($scope, Restangular, $mdDialog) ->
     todos = Restangular.all('tasks')
 
     $scope.saveTodo = (todo) ->
       todo.save()
 
+    $scope.deleteItem = (todo, ev) ->
+      confirm = $mdDialog.confirm()
+      .parent(angular.element(document.body))
+      .title('Вы действительно хотите удалить запись?')
+      .ariaLabel('Вы действительно хотите удалить запись')
+      .ok('Да')
+      .cancel('Отмена')
+      .targetEvent(ev)
+
+      $mdDialog.show(confirm).then ->
+        todo.archieved = true
+        todo.save()
+        $scope.reload()
+
     $scope.reload = ->
       $scope.todos = todos.getList().$object
 
@@ -18,7 +32,6 @@ angular.module('todoRails.controllers').controller 'todoCtrl', [
 
     $scope.addTodo = ->
       todo =
-
         title: $scope.todoText
         completed: false
       todos.post todo
@@ -28,6 +41,11 @@ angular.module('todoRails.controllers').controller 'todoCtrl', [
     $scope.remaining = ->
       count = 0
       angular.forEach $scope.todos, (todo) ->
-        count += if todo.completed then 0 else 1
+        count += if todo.completed || todo.archieved then 0 else 1
+      count
+    $scope.count = ->
+      count = 0
+      angular.forEach $scope.todos, (todo) ->
+        count += if todo.archieved then 0 else 1
       count
 ]

data/app/assets/stylesheets/todo_rails/application.css.scss

@@ -4,210 +4,174 @@
 
 @import url(http://fonts.googleapis.com/css?family=Roboto:400,300,400italic,500,700&subset=latin,cyrillic);
 
-
 html,
-body
-{
-    font-family: 'Roboto', sans-serif;
-    font-size: 14px;
-
-    height: 100%;
-    margin: 0;
-    padding: 0;
+body {
+  font-family: 'Roboto', sans-serif;
+  font-size: 14px;
+  height: 100%;
+  margin: 0;
+  padding: 0;
 }
-ul
-{
-    list-style: none;
-}
-
-/* Toolbar area */
-
-.menu
-{
-    position: absolute;
-    top: 0;
-    left: 0;
 
-    width: 36px;
-    height: 38px;
-    margin: 16px;
-
-    border: none;
-    background-color: transparent;
+ul {
+  list-style: none;
 }
 
-md-toolbar h1
-{
-    position: relative;
+/* Toolbar area */
 
-    margin: auto;
+.menu {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 36px;
+  height: 38px;
+  margin: 16px;
+  border: none;
+  background-color: transparent;
 }
 
-@media (min-width: 800px)
-{
-    #mainBody
-    {
-        width: 800px;
-    }
+md-toolbar h1 {
+  position: relative;
+  margin: auto;
 }
 
-@media (max-width: 799px)
-{
-    #mainBody
-    {
-        width: 100%;
-    }
+@media (min-width: 800px) {
+  #mainBody {
+    width: 800px;
+  }
 }
-#mainBody
-{
-    min-width: 340px;
-}
-
 
-md-content
-{
+@media (max-width: 799px) {
+  #mainBody {
     width: 100%;
+  }
 }
-.listHeader
-{
-    color: grey;
+
+#mainBody {
+  min-width: 340px;
 }
-/* Sidenav area */
 
-md-list .md-button
-{
-    font-weight: 500;
+md-content {
+  width: 100%;
+}
 
-    width: 100%;
+.listHeader {
+  color: grey;
+}
 
-    text-align: left;
+/* Sidenav area */
 
-    color: inherit;
-}
-md-list .md-button.selected
-{
-    color: #03a9f4;
+md-list .md-button {
+  font-weight: 500;
+  width: 100%;
+  text-align: left;
+  color: inherit;
 }
 
-md-sidenav  md-list
-{
-    padding: 0 0 8px 0;
+md-list .md-button.selected {
+  color: #03a9f4;
 }
 
+md-sidenav md-list {
+  padding: 0 0 8px 0;
+}
 
 /* Primary content area */
 
-#content
-{
-    overflow: hidden;
+#content {
+  overflow: hidden;
 }
 
-#content
-{
-    padding-top: 5px;
-    padding-right: 40px;
-    padding-left: 40px;
+#content {
+  padding-top: 5px;
+  padding-right: 40px;
+  padding-left: 40px;
 }
 
-#content .md-button.share
-{
-    position: absolute;
-    top: 10px;
-    right: 25px;
-
-    width: 48px;
-    height: 48px;
-    margin: 8px auto 16px 0;
-
-    border: none;
-    background-color: transparent;
+#content .md-button.share {
+  position: absolute;
+  top: 10px;
+  right: 25px;
+  width: 48px;
+  height: 48px;
+  margin: 8px auto 16px 0;
+  border: none;
+  background-color: transparent;
 }
 
-#content md-icon.avatar
-{
-    margin-top: 10px;
+#content md-icon.avatar {
+  margin-top: 10px;
 }
 
-#content .md-button.share > md-icon
-{
-    width: 36px;
-    height: 36px;
-
-    fill: black;
+#content .md-button.share > md-icon {
+  width: 36px;
+  height: 36px;
+  fill: black;
 }
 
-md-button.menuBtn > md-icon
-{
-    width: 24px;
-    height: 24px;
-
-    fill: white;
+md-button.menuBtn > md-icon {
+  width: 24px;
+  height: 24px;
+  fill: white;
 }
 
-#content .md-button.share:active > md-icon
-{
-    padding: 4px;
-
-    transition: all 100ms ease-out 30ms;
-
-    border-radius: 75%;
-    background-color: #dadada;
+#content .md-button.share:active > md-icon {
+  padding: 4px;
+  transition: all 100ms ease-out 30ms;
+  border-radius: 75%;
+  background-color: #dadada;
 }
 
-#content img
-{
-    display: block;
-
-    max-width: 500px;
-    height: auto;
+#content img {
+  display: block;
+  max-width: 500px;
+  height: auto;
 }
 
 /* Utils */
 
-.content-wrapper
-{
-    position: relative;
+.content-wrapper {
+  position: relative;
 }
 
 /* Typography support coming in 0.8.0 */
 
-md-toolbar h1
-{
-    font-size: 1.250em;
-    font-weight: 400;
+md-toolbar h1 {
+  font-size: 1.250em;
+  font-weight: 400;
 }
 
-.avatar
-{
-    position: relative;
-
-    display: inline-block;
-    overflow: hidden;
-    zoom: .70;
-
-    width: 128px;
-    height: 128px;
-    margin: 0;
-
-    -webkit-transform: scale(.70);
-       -moz-transform: scale(.70);
-            transform: translateZ(0);
-    vertical-align: middle;
-
-    border: 1px solid #ddd;
-    border-radius: 50%;
+.avatar {
+  position: relative;
+  display: inline-block;
+  overflow: hidden;
+  zoom: .70;
+  width: 128px;
+  height: 128px;
+  margin: 0;
+  -webkit-transform: scale(0.7);
+  -moz-transform: scale(0.7);
+  transform: translateZ(0);
+  vertical-align: middle;
+  border: 1px solid #ddd;
+  border-radius: 50%;
 }
 
-
-md-bottom-sheet  md-icon
-{
-    margin-right: 20px;
+.done-true {
+  text-decoration: line-through;
+  color: #808080;
 }
 
-span.name
-{
-    font-size: 1.1em;
-    font-weight: bold;
+md-bottom-sheet md-icon {
+  margin-right: 20px;
+}
 
-    padding-left: 5px;
+span.name {
+  font-size: 1.1em;
+  font-weight: bold;
+  padding-left: 5px;
 }
+
+md-list .md-button.text-center {
+  text-align: center;
+}

data/app/controllers/todo_rails/tasks_controller.rb

@@ -29,7 +29,7 @@ module TodoRails
     # PATCH/PUT /tasks/1
     def update
       if @task.update(task_params)
-        head :no_content
+        render json: @task
       else
         render json: @task.errors, status: :unprocessable_entity
       end
@@ -49,7 +49,7 @@ module TodoRails
 
       # Only allow a trusted parameter "white list" through.
       def task_params
-        params.permit(:title, :completed, :row_order, :priority, :comment)
+        params.permit(:title, :completed, :row_order, :priority, :comment, :archieved)
       end
   end
 end

data/app/views/todo_rails/index/index.haml

@@ -10,6 +10,10 @@
             +
     %div
       .listHeader{ flex: '', layout: '', 'layout-align' => 'end end' }= @config['remaining_label']
-      %ul
-        %li{ 'ng-repeat' => 'todo in todos' }
-          %md-checkbox{ 'aria-label' => 'Todo Checkbox', 'ng-model' => 'todo.completed', 'ng-change' => 'saveTodo(todo)' } {{todo.title}}
+      %md-list
+        %md-list-item{ 'ng-repeat' => 'todo in todos | filter:{"archieved":  false}:true' }
+          %md-checkbox{ 'aria-label' => 'Todo Checkbox', 'ng-model' => 'todo.completed', 'ng-change' => 'saveTodo(todo)'}
+          %p{class: "done-{{todo.completed}}"} {{todo.title}}
+          .md-secondary
+            %md-button.md-raised.md-warn.text-center{'ng-click' => 'deleteItem(todo, $event)'} x
+          %md-divider{ 'ng-if' => '!$last' }

data/db/migrate/20150729191440_add_archieved_to_tasl.rb

@@ -0,0 +1,5 @@
+class AddArchievedToTasl < ActiveRecord::Migration
+  def change
+    add_column :todo_rails_tasks, :archieved, :boolean, null: false, default: false
+  end
+end

data/lib/todo_rails/engine.rb

@@ -2,7 +2,10 @@ module TodoRails
   class Engine < ::Rails::Engine
 
     require 'bower-rails'
-
+    require 'haml'
+    require 'haml-rails'
+    require 'sass-rails'
+    require 'coffee-rails'
 
     isolate_namespace TodoRails
 

data/lib/todo_rails/version.rb

@@ -1,3 +1,3 @@
 module TodoRails
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/dummy/config/todo-rails.yml

@@ -0,0 +1,3 @@
+title: 'TODO'
+add_label: 'Add tasks'
+remaining_label: '{{remaining()}} of {{count()}} remaining'

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150729111534) do
+ActiveRecord::Schema.define(version: 20150729191440) do
 
   create_table "todo_rails_tasks", force: :cascade do |t|
     t.string   "title"
@@ -19,8 +19,9 @@ ActiveRecord::Schema.define(version: 20150729111534) do
     t.integer  "row_order"
     t.integer  "priority"
     t.text     "comment"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
+    t.boolean  "archieved",  default: false, null: false
   end
 
 end