Commit 4b747ea2 authored by Barbora Kompisova's avatar Barbora Kompisova
Browse files

fixes for MR#2

parent a293811f

src/app/auth/auth.component.html

+5 −11
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ 


          <div style="color: #000" class="login-pf-page-footer">

            <ul class="login-pf-page-footer-links list-unstyled">

              <li><a href="#">Terms of Use</a></li>

              <li><a href="#">Help</a></li>

              <li><a href="#">Privacy Policy</a></li>

              <!-- TODO: add links -->

              <li><a style="display: none" href="#">Terms of Use</a></li>

              <li><a style="display: none" href="#">Help</a></li>

              <li><a style="display: none" href="#">Privacy Policy</a></li>

            </ul>

          </div>

        </div>
@@ -28,14 +29,7 @@ 
          </ul>

          <div id="my-tab-content" class="tab-content">

            <div class="tab-pane active" id="tab-gitlab">

              <div class="row page-center">

                <div class="col-md-2 col-md-offset-4 align-middle">

                  <button style="margin: 20px" (click)="doGitlabLogin()" class="btn">

                    <i style="margin-right: 20px" class="fab fa-gitlab"></i>

                    <span class="">Sign in with Gitlab</span>

                  </button>

                </div>

              </div>

              <app-gitlab-login></app-gitlab-login>

            </div>

            <div class="tab-pane" id="tab-basic">

              <app-basic-login></app-basic-login>

src/app/auth/auth.component.ts

+0 −6
Original line number Diff line number Diff line
@@ -8,15 +8,9 @@ import { environment } from '../../environments/environment'; 
})

export class AuthComponent implements OnInit {



  backendUrl = environment.baseUrl + '/api/v1.0/oauth/login';





  constructor() { }



  ngOnInit() {

  }



  doGitlabLogin() {

    window.location.href = this.backendUrl;

  }

}

src/app/auth/auth.module.ts

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import { AuthService } from '../services/auth.service'; 
import { GitlabOauthResultComponent } from './gitlab-oauth-result/gitlab-oauth-result.component';

import { CookieService } from 'ngx-cookie-service';

import {FlashMessagesModule} from 'angular2-flash-messages';

import { GitlabLoginComponent } from './gitlab-login/gitlab-login.component';



@NgModule({

  imports: [
@@ -17,7 +18,8 @@ import {FlashMessagesModule} from 'angular2-flash-messages'; 
  declarations: [

    BasicLoginComponent,

    AuthComponent,

    GitlabOauthResultComponent

    GitlabOauthResultComponent,

    GitlabLoginComponent

  ],

  exports: [

    BasicLoginComponent,

src/app/auth/gitlab-login/gitlab-login.component.html

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<div class="row page-center">

  <div class="col-md-2 col-md-offset-4 align-middle">

    <button style="margin: 20px" (click)="doGitlabLogin()" class="btn">

      <i style="margin-right: 20px" class="fab fa-gitlab"></i>

      <span class="">Sign in with Gitlab</span>

    </button>

  </div>

</div>

src/app/auth/gitlab-login/gitlab-login.component.scss

0 → 100644
+0 −0

Empty file added.