Skip to content

Commit 346f0ad

Browse files
committed
Handle no organizational login case
1 parent 646ac30 commit 346f0ad

4 files changed

Lines changed: 22 additions & 11 deletions

File tree

client/imports/account/login.component.html

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="tuxlab-login" fxLayout="row" fxLayoutAlign="center center">
2-
<div class="page">
2+
<div class="page" fxLayout="column" fxLayoutAlign="center center">
33
<h1> Login </h1>
44

55
<form #f="ngForm" (ngSubmit)="login(f.value)">
@@ -36,14 +36,17 @@ <h1> Login </h1>
3636
</md-list>
3737
</form>
3838

39-
<!-- Divider -->
40-
<md-divider></md-divider>
41-
42-
<!-- 3rd Party Logins -->
43-
<h2> Organization Login <h2>
44-
<div fxLayout fxLayoutAlign="center">
45-
<button md-raised-button *ngIf="google" (click)="LoginWithGoogle()"><md-icon>account_balance</md-icon>Google Login</button>
46-
</div>
39+
<!-- Selectively Display Organization -->
40+
<ng-container *ngIf="google">
41+
<!-- Divider -->
42+
<md-divider></md-divider>
43+
44+
<!-- 3rd Party Logins -->
45+
<h2> Organization Login <h2>
46+
<div fxLayout fxLayoutAlign="center">
47+
<button md-raised-button *ngIf="google" (click)="LoginWithGoogle()"><md-icon>account_balance</md-icon>Google Login</button>
48+
</div>
49+
</ng-container>
4750

4851
</div>
4952
</div>

client/imports/account/login.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ div.tuxlab-login{
77
div.page {
88
width: 100%;
99
height: 100%;
10-
max-width: 600px;
10+
max-width: 600px !important;
1111
max-height: 600px;
1212

1313
background-color: #fff;

client/imports/app.theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import '~@angular/material/theming';
1+
@import '../../node_modules/@angular/material/theming';
22
// Plus imports for other components in your app.
33

44
// Include the common styles for Angular Material. We include this here so that you only

server/index.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as _ from "lodash";
12
import { Meteor } from 'meteor/meteor';
23

34
import SetupAuthentication from "./imports/service/auth";
@@ -7,3 +8,10 @@ import { DefaultFixtures } from "../imports/test/fixtures";
78
Meteor.startup(() => {
89
SetupAuthentication();
910
})
11+
12+
// Enable Fixtures if Defined
13+
if(_.has(process.env, "TUXLAB_FIXTURES") &&
14+
typeof process.env["TUXLAB_FIXTURES"] === "string" &&
15+
process.env["TUXLAB_FIXTURES"].toUpperCase() === "TRUE"){
16+
new DefaultFixtures();
17+
}

0 commit comments

Comments
 (0)