Merge pull request RocketChat#6 from tomermoshe/feat/refactor-chat-he…

…ader Feat/refactor chat header
kamilkisiela · Jun 1, 2017 · 67f7cc9 · 67f7cc9
2 parents d4e244c + 5a98377
commit 67f7cc9
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/src/app/chat/channel-item/channel-item.component.scss b/src/app/chat/channel-item/channel-item.component.scss
@@ -23,6 +23,7 @@
   display: flex;
   justify-content: space-around;
   align-items: center;
+  cursor: pointer;
 }
 
 .hide-channel-icon, .exit-channel-icon {

diff --git a/src/app/chat/chat-routing.module.ts b/src/app/chat/chat-routing.module.ts
@@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { WelcomePageComponent } from './welcome-page/welcome-page.component';
 import { AuthGuard } from '../shared/services/auth-guard.service';
 import { MainPageComponent } from './main-page/main-page.component';
-import { ChatViewComponent } from './chat-view/channel-chat.component';
+import { ChatViewComponent } from './chat-view/chat-view.component';
 
 const routes: Routes = [{
   path : 'main', component : MainPageComponent, canActivate : [AuthGuard], canActivateChild : [AuthGuard],

diff --git a/...hat/chat-view/channel-chat.component.html → ...p/chat/chat-view/chat-view.component.html b/...hat/chat-view/channel-chat.component.html → ...p/chat/chat-view/chat-view.component.html
diff --git a/...hat/chat-view/channel-chat.component.scss → ...p/chat/chat-view/chat-view.component.scss b/...hat/chat-view/channel-chat.component.scss → ...p/chat/chat-view/chat-view.component.scss
diff --git a/.../chat/chat-view/channel-chat.component.ts → ...app/chat/chat-view/chat-view.component.ts b/.../chat/chat-view/channel-chat.component.ts → ...app/chat/chat-view/chat-view.component.ts
diff --git a/src/app/chat/chat.module.ts b/src/app/chat/chat.module.ts
@@ -7,7 +7,7 @@ import { WelcomePageComponent } from './welcome-page/welcome-page.component';
 import { SharedModule } from '../shared/shared.module';
 import { MainPageComponent } from './main-page/main-page.component';
 import { ChannelItemComponent } from './channel-item/channel-item.component';
-import { ChatViewComponent } from './chat-view/channel-chat.component';
+import { ChatViewComponent } from './chat-view/chat-view.component';
 
 @NgModule({
   imports: [
@@ -21,6 +21,6 @@ import { ChatViewComponent } from './chat-view/channel-chat.component';
     WelcomePageComponent,
     ChatMessageComponent,
     ChannelItemComponent,
-  ]
+  ],
 })
 export class ChatModule { }
diff --git a/src/app/chat/welcome-page/welcome-page.component.html b/src/app/chat/welcome-page/welcome-page.component.html
@@ -19,14 +19,13 @@ <h4>Join the Community</h4>
     <p>Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our
       trello board.</p>
     <nav>
-      <a ion-button color="light" target="_blank" href="https://twitter.com/RocketChatApp"><span>Twitter</span></a>
+      <a ion-button color="light" target="_blank"
+         href="https://twitter.com/RocketChatApp"><span>Twitter</span></a>
       <a ion-button color="light" target="_blank"
          href="https://www.facebook.com/RocketChatApp"><span>Facebook</span></a>
       <a ion-button color="light" target="_blank" href="https://plus.google.com/+RocketChatApp"><span>Google Plus</span></a>
       <a ion-button color="light" target="_blank" href="https://github.com/RocketChat/Rocket.Chat"><span>Github</span></a>
       <a ion-button color="light" target="_blank" href="https://www.linkedin.com/company/rocket-chat"><span>LinkedIn</span></a>
     </nav>
   </div>
-
-
 </ion-content>