diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 5de81bc..8b13789 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -1,16 +1 @@ -window.app = angular.module('nGmail', ['ngRoute', 'ngSanitize', 'ngResource']) - -app.config ($routeProvider)-> - $routeProvider - .when '/inbox', - templateUrl: 'partials/threads.html' - controller: 'ThreadsController' - .when '/threads/:id', - templateUrl: 'partials/thread.html' - controller: 'ThreadController' - .otherwise - redirectTo: '/inbox' - -app.run ($rootScope)-> - $rootScope.current_user = currentUser \ No newline at end of file diff --git a/app/coffee/controllers.coffee b/app/coffee/controllers.coffee index b6b40c4..8b13789 100644 --- a/app/coffee/controllers.coffee +++ b/app/coffee/controllers.coffee @@ -1,12 +1 @@ -app.controller 'ThreadsController', ($scope, Thread)-> - $scope.threads = Thread.query() - -app.controller 'ThreadController', ($scope, $routeParams, Thread)-> - $scope.thread = Thread.get { id: $routeParams.id }, (thread)-> - $scope.lastMessage = thread.messages[thread.messages.length-1] - $scope.lastMessage.active = true - - $scope.toggleActive = (message)-> - unless message == $scope.lastMessage - message.active = !message.active diff --git a/app/coffee/directives.coffee b/app/coffee/directives.coffee index 81a22dd..8b13789 100644 --- a/app/coffee/directives.coffee +++ b/app/coffee/directives.coffee @@ -1,21 +1 @@ -app.directive 'stopEvent', -> - restrict: 'A' - link: (scope, element, attr)-> - element.bind 'click', (e)-> - e.preventDefault() - e.stopPropagation() - -app.directive "dropDown", -> - restrict: 'E' - link: (scope, element, attrs, dropdownCtrl)-> - dropdownCtrl.init element - controller: -> - @init = (element)-> - element.bind 'click', @toggle - - @toggle = (event)-> - event.preventDefault() - angular.element(this).toggleClass 'active' - - return this diff --git a/app/coffee/filters.coffee b/app/coffee/filters.coffee index 0ef3022..8b13789 100644 --- a/app/coffee/filters.coffee +++ b/app/coffee/filters.coffee @@ -1,40 +1 @@ -app.filter 'smartDate', ($filter)-> - $dateFilter = $filter('date') - - (date)-> - oneDayAgo = Date.now() - 86400000 - if date < oneDayAgo - $dateFilter(date, "MMM dd") - else - $dateFilter(date, "h:mm a") - - -app.filter 'timeAgo', ($filter)-> - units = [ - { name: "second", limit: 60, in_seconds: 1 }, - { name: "minute", limit: 3600, in_seconds: 60 }, - { name: "hour", limit: 86400, in_seconds: 3600 }, - { name: "day", limit: 604800, in_seconds: 86400 }, - { name: "week", limit: 2629743, in_seconds: 604800 }, - { name: "month", limit: 31556926, in_seconds: 2629743 }, - { name: "year", limit: null, in_seconds: 31556926 } - ] - - (date)-> - diff = (Date.now() - date)/1000 - return "just now" if diff < 5 - - for unit in units - if diff < unit.limit || !unit.limit - diff = Math.floor(diff / unit.in_seconds) - return "#{diff} #{unit.name}#{ 's' if diff > 1 } ago" - -app.filter 'smartName', -> - (person, fullName=true)-> - if currentUser.email == person.email - 'me' - else if fullName - "#{person.first_name} #{person.last_name}".trim() - else - person.first_name diff --git a/app/coffee/modules.coffee b/app/coffee/modules.coffee deleted file mode 100644 index 8b13789..0000000 --- a/app/coffee/modules.coffee +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/coffee/services.coffee b/app/coffee/services.coffee index ee4cf89..8b13789 100644 --- a/app/coffee/services.coffee +++ b/app/coffee/services.coffee @@ -1,7 +1 @@ -app.factory 'Thread', ($resource)-> - $resource '/api/threads/:id.json', {}, - query: - method: 'GET' - params: { id: 'index' } - isArray: true diff --git a/app/images/icons/checkmark-partial.png b/app/images/icons/checkmark-partial.png new file mode 100644 index 0000000..0105a93 Binary files /dev/null and b/app/images/icons/checkmark-partial.png differ diff --git a/app/images/icons/next.png b/app/images/icons/next.png new file mode 100644 index 0000000..baa3469 Binary files /dev/null and b/app/images/icons/next.png differ diff --git a/app/images/icons/prev.png b/app/images/icons/prev.png new file mode 100644 index 0000000..0a6e0df Binary files /dev/null and b/app/images/icons/prev.png differ diff --git a/app/index.html b/app/index.html index 8d32c34..950df73 100644 --- a/app/index.html +++ b/app/index.html @@ -1,5 +1,5 @@ - + Codestin Search App @@ -10,14 +10,14 @@
- - + +
- +
@@ -51,38 +55,171 @@

nGmail

-
-