Move Angular components and tests to `src/sidebar/components`

This makes the dir name match the type of object these modules export.

src/sidebar/app.js

@@ -136,26 +136,26 @@ module.exports = angular.module('h', [
   .directive('hypothesisApp', require('./directive/app'))
 
   // UI components
-  .component('annotation', require('./directive/annotation').component)
-  .component('annotationShareDialog', require('./directive/annotation-share-dialog'))
-  .component('annotationThread', require('./directive/annotation-thread'))
-  .component('dropdownMenuBtn', require('./directive/dropdown-menu-btn'))
-  .component('helpLink', require('./directive/help-link'))
-  .component('helpPanel', require('./directive/help-panel'))
-  .component('loggedoutMessage', require('./directive/loggedout-message'))
-  .component('loginControl', require('./directive/login-control'))
-  .component('loginForm', require('./directive/login-form').component)
-  .component('publishAnnotationBtn', require('./directive/publish-annotation-btn'))
-  .component('searchInput', require('./directive/search-input'))
-  .component('searchStatusBar', require('./directive/search-status-bar'))
-  .component('selectionTabs', require('./directive/selection-tabs'))
-  .component('sidebarTutorial', require('./directive/sidebar-tutorial').component)
-  .component('shareDialog', require('./directive/share-dialog'))
-  .component('sortDropdown', require('./directive/sort-dropdown'))
-  .component('svgIcon', require('./directive/svg-icon'))
-  .component('tagEditor', require('./directive/tag-editor'))
-  .component('threadList', require('./directive/thread-list'))
-  .component('timestamp', require('./directive/timestamp'))
+  .component('annotation', require('./components/annotation').component)
+  .component('annotationShareDialog', require('./components/annotation-share-dialog'))
+  .component('annotationThread', require('./components/annotation-thread'))
+  .component('dropdownMenuBtn', require('./components/dropdown-menu-btn'))
+  .component('helpLink', require('./components/help-link'))
+  .component('helpPanel', require('./components/help-panel'))
+  .component('loggedoutMessage', require('./components/loggedout-message'))
+  .component('loginControl', require('./components/login-control'))
+  .component('loginForm', require('./components/login-form').component)
+  .component('publishAnnotationBtn', require('./components/publish-annotation-btn'))
+  .component('searchInput', require('./components/search-input'))
+  .component('searchStatusBar', require('./components/search-status-bar'))
+  .component('selectionTabs', require('./components/selection-tabs'))
+  .component('sidebarTutorial', require('./components/sidebar-tutorial').component)
+  .component('shareDialog', require('./components/share-dialog'))
+  .component('sortDropdown', require('./components/sort-dropdown'))
+  .component('svgIcon', require('./components/svg-icon'))
+  .component('tagEditor', require('./components/tag-editor'))
+  .component('threadList', require('./components/thread-list'))
+  .component('timestamp', require('./components/timestamp'))
 
   // These should use `component()` but will require some changes.
   .directive('groupList', require('./directive/group-list').directive)

src/sidebar/directive/test/annotation-share-dialog-test.js → src/sidebar/components/test/annotation-share-dialog-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('annotationShareDialog', function () {
   var element;

src/sidebar/directive/test/annotation-test.js → src/sidebar/components/test/annotation-test.js

@@ -7,7 +7,7 @@ var proxyquire = require('proxyquire');
 var events = require('../../events');
 var fixtures = require('../../test/annotation-fixtures');
 var testUtil = require('../../../shared/test/util');
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 var inject = angular.mock.inject;
 

src/sidebar/directive/test/annotation-thread-test.js → src/sidebar/components/test/annotation-thread-test.js

@@ -3,7 +3,7 @@
 var angular = require('angular');
 
 var annotationThread = require('../annotation-thread');
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 function PageObject(element) {
   this.annotations = function () {

src/sidebar/directive/test/login-control-test.js → src/sidebar/components/test/login-control-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 function PageObject(element) {
   this.unknownLoginText = function () {

src/sidebar/test/login-form-test.coffee → src/sidebar/components/test/login-form-test.coffee

@@ -27,7 +27,7 @@ describe 'loginForm.Controller', ->
 
   before ->
     angular.module('h', [])
-    .controller('loginFormController', require('../directive/login-form').Controller)
+    .controller('loginFormController', require('../login-form').Controller)
 
   beforeEach module('h')
 

src/sidebar/directive/test/publish-annotation-btn-test.js → src/sidebar/components/test/publish-annotation-btn-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 var fakeStorage = {};
 var fakeLocalStorage = {

src/sidebar/directive/test/search-input-test.js → src/sidebar/components/test/search-input-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('searchInput', function () {
   var fakeHttp;

src/sidebar/directive/test/search-status-bar-test.js → src/sidebar/components/test/search-status-bar-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('searchStatusBar', function () {
   before(function () {

src/sidebar/directive/test/selection-tabs-test.js → src/sidebar/components/test/selection-tabs-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('selectionTabs', function () {
   before(function () {

src/sidebar/directive/test/share-dialog-test.js → src/sidebar/components/test/share-dialog-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('shareDialog', function () {
   var fakeAnnotationUI;

src/sidebar/directive/test/sort-dropdown-test.js → src/sidebar/components/test/sort-dropdown-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('sortDropdown', function () {
   before(function () {

src/sidebar/directive/test/svg-icon-test.js → src/sidebar/components/test/svg-icon-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('svgIcon', function () {
   before(function () {

src/sidebar/directive/test/tag-editor-test.js → src/sidebar/components/test/tag-editor-test.js

@@ -2,7 +2,7 @@
 
 var angular = require('angular');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('tagEditor', function () {
   var fakeTags;

src/sidebar/directive/test/thread-list-test.js → src/sidebar/components/test/thread-list-test.js

@@ -8,7 +8,7 @@ var immutable = require('seamless-immutable');
 
 var events = require('../../events');
 var threadList = require('../thread-list');
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 var annotFixtures = immutable({
   annotation: {$tag: 't1', id: '1', text: 'text'},

src/sidebar/directive/test/timestamp-test.js → src/sidebar/components/test/timestamp-test.js

@@ -3,7 +3,7 @@
 var angular = require('angular');
 var escapeStringRegexp = require('escape-string-regexp');
 
-var util = require('./util');
+var util = require('../../directive/test/util');
 
 describe('timestamp', function () {
   var clock;