Removing new user component, and allowing automatic login. Change som…

…e styling.

Fixes #205

ui/src/app/app.module.ts

@@ -25,8 +25,7 @@ import {
   FooterComponent,
   MarkdownEditComponent,
   OnboardAlertComponent,
-  LoginModalComponent,
-  NewUserModalComponent
+  LoginModalComponent
 } from './components';
 import {
   MomentPipe,
@@ -75,7 +74,6 @@ window['imagesLoaded'] = require('imagesloaded');
     MarkdownEditComponent,
     OnboardAlertComponent,
     LoginModalComponent,
-    NewUserModalComponent,
 
     // Pipes
     MomentPipe,

ui/src/app/components/discussion-card/discussion-card.component.html

@@ -3,24 +3,23 @@
   <div *ngIf="!discussion.deleted">
     <div *ngIf="!editing">
       <div class="row">
-        <div class="px-1 col-sm-1 col-1 text-center vote-width">
-          <ng-template #voteTemplate>
-            <div [innerHtml]="voteHtml()"></div>
-          </ng-template>
-          <div class="fa fa-fw fa-arrow-up vote-thumb" [class.pointer]="!this.isCreator" [class.text-success]="discussion.userRank > 50"
-            (click)="upvote()" placement="right" [tooltip]="voteTemplate" container="body"></div>
-          <div class="pointer vote-number" placement="bottom" placement="right" [class.pointer]="!this.isCreator"
-            [tooltip]="voteTemplate" container="body" (click)="toggleShowVoteSlider()">{{avgVote()}}</div>
-          <div class="fa fa-fw fa-arrow-down vote-thumb" [class.pointer]="!this.isCreator" [class.text-danger]="voteExists() && discussion.userRank < 50"
-            (click)="downvote()" placement="right" [tooltip]="voteTemplate" container="body"></div>
+        <ng-template #voteTemplate>
+          <div [innerHtml]="voteHtml()"></div>
+        </ng-template>
+        <div class="px-1 col-sm-1 col-1 text-center vote-width" [class.disabled-pointer]="this.isCreator" [class.pointer]="!this.isCreator" placement="right" [tooltip]="voteTemplate" container="body">
+          <div class="fa fa-fw fa-arrow-up vote-thumb" [class.text-success]="discussion.userRank > 50"
+            (click)="upvote()"></div>
+          <div class="vote-number" (click)="toggleShowVoteSlider()">{{avgVote()}}</div>
+          <div class="fa fa-fw fa-arrow-down vote-thumb" [class.text-danger]="voteExists() && discussion.userRank < 50"
+            (click)="downvote()"></div>
         </div>
         <div *ngIf="hasImage()" [ngClass]="{'col-sm-1 col-11': !isCard(),
         'col-sm-11': isCard()}">
           <div [innerHTML]="discussion.link | markdown:true"></div>
         </div>
         <div [ngClass]="{'col-sm-10': hasImage() && !isCard(),
-          'col-sm-12': isCard() ,
-         'col-sm-11': !hasImage() && !isCard()}">
+          'col-sm-12': hasImage() && isCard(),
+          'col-sm-11': !hasImage()}">
           <div [ngClass]="{
         'card-body-no-bottom': isCard()}">
             <h5 [class.card-title]="isCard()" class="card-body-no-bottom">

ui/src/app/components/index.ts

@@ -14,5 +14,4 @@ export * from './sidebar';
 export * from './tag';
 export * from './user';
 export * from './onboard-alert';
-export * from './login-modal';
-export * from './new-user-modal';
+export * from './login-modal';

ui/src/app/components/login-modal/login-modal.component.ts

@@ -21,6 +21,7 @@ export class LoginModalComponent implements OnInit {
   public login: Login = {};
 
   @ViewChild('loginModal') private loginModal: ModalDirective;
+  @Input() show: boolean;
   @Output() hideEvent = new EventEmitter();
 
   constructor(public userService: UserService,
@@ -32,11 +33,15 @@ export class LoginModalComponent implements OnInit {
 
     this.loginModal.onShown.subscribe(() => document.getElementById("login-input").focus());
 
-    setTimeout(() => {
-      this.loginModal.show();
-      // document.getElementById("login-input").focus()
-    }, 100);
+    // Create a new user if there is none
+    if (this.userService.getUser() == null) {
+      this.createNewUser();
+    }
+
+  }
 
+  ngOnChanges() {
+    this.showModal();
   }
 
   signupSubmit() {
@@ -72,10 +77,31 @@ export class LoginModalComponent implements OnInit {
         });
   }
 
+  showModal() {
+    if (this.show) {
+      this.loginModal.show();
+      this.show = false;
+    }
+  }
+
   hiddenEvent() {
     this.hideEvent.next(true);
   }
 
+  createNewUser() {
+    let obs: Observable<string> = this.userService.createAnonymousUser();
+    obs.subscribe(rJWT => {
+      Tools.createCookie('jwt', rJWT, 9999);
+      this.userService.setUserFromCookie();
+    },
+      error => {
+        console.error(error);
+        this.toasterService.pop("error", error._body);
+      });
+  }
+
+
+
 }
 
 interface Signup {

ui/src/app/components/navbar/navbar.component.html

@@ -98,5 +98,4 @@ <h6 class="dropdown-header">Messages
     </ul>
   </div>
 </nav>
-<app-new-user-modal></app-new-user-modal>
-<app-login-modal *ngIf="showLoginModal" (hideEvent)="hiddenEvent()"></app-login-modal>
+<app-login-modal [show]="showLoginModal" (hideEvent)="hiddenEvent()"></app-login-modal>

ui/src/app/styles/extras.scss

@@ -2,6 +2,10 @@
   cursor: pointer;
 }
 
+.disabled-pointer {
+  cursor: not-allowed;
+}
+
 .link-unstyled, .link-unstyled:link {
   color: inherit;
   text-decoration: inherit;