Merge branch 'feat/dev' of katelynne/JhipsterGroupProject-Server into master

src/main/resources/config/application.yml

@@ -66,7 +66,10 @@ spring:
         properties:
             hibernate.jdbc.time_zone: UTC
         hibernate:
+<<<<<<< HEAD
+=======
             ddl-auto: none
+>>>>>>> e643360c0b2a6c07e30a791e98c6c624e8cc0a81
             naming:
                 physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
                 implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy

src/main/webapp/app/entities/user-profile/user-profile.component.html

@@ -1,15 +1,57 @@
-<div>
-    <h2 id="page-heading">
-        <span jhiTranslate="zipConnectApp.userProfile.home.title">User Profiles</span>
-        <button id="jh-create-entity" class="btn btn-primary float-right jh-create-entity create-user-profile" [routerLink]="['/user-profile/new']">
-            <fa-icon [icon]="'plus'"></fa-icon>
-            <span  jhiTranslate="zipConnectApp.userProfile.home.createLabel">
-            Create new User Profile
-            </span>
-        </button>
-    </h2>
+<div class="container" *ngFor="let userProfile of userProfiles ;trackBy: trackId">
+    <br/>
+        <h1>{{userProfile.firstName}} {{userProfile.lastName}}<span class="badge badge-warning">4.2</span></h1>
+    <br/>
+    <!--<h2 id="page-heading">-->
+        <!--<span jhiTranslate="zipConnectApp.userProfile.home.title">User Profiles</span>-->
+
+        <!--<button id="jh-create-entity" class="btn btn-primary float-right jh-create-entity create-user-profile" [routerLink]="['/user-profile/new']">-->
+            <!--<fa-icon [icon]="'plus'"></fa-icon>-->
+            <!--<span  jhiTranslate="zipConnectApp.userProfile.home.createLabel">-->
+            <!--Create new User Profile-->
+            <!--</span>-->
+        <!--</button>-->
+    <!--</h2>-->
+
+    <jhi-post></jhi-post>
+    <jhi-post-detail></jhi-post-detail>
     <jhi-alert></jhi-alert>
+    <jhi-newsfeed></jhi-newsfeed>
     <br/>
+
+
+    <div class="container">
+        <div class="card" style="width: 18rem;">
+            <img class="card-img-top" src="" alt="Card image cap">
+            <div class="card-body">
+                <p class="card-text"><span>{{userProfile.firstName}}</span></p>
+            </div>
+        </div>
+    </div>
+
+
+
+<div class="container" *ngFor="let userProfile of userProfiles ;trackBy: trackId">
+    <div class="card" style="width: 18rem;">
+        <!--<a [routerLink]="['/user-profile', userProfile.id, 'view' ]">{{userProfile.id}}</a>-->
+        <div class="card-header">
+            MY STACK
+        </div>
+        <ul class="list-group list-group-flush">
+            <li class="list-group-item">{{userProfile.userStack}}</li>
+            <li class="list-group-item">{{userProfile.userStack}}</li>
+            <li class="list-group-item">{{userProfile.userStack}}</li>
+        </ul>
+    </div>
+</div>
+
+    <!--<div class="container" *ngFor="let userProfile of userProfiles ;trackBy: trackId">-->
+        <!--<div class="col-md-6">-->
+            <!---->
+        <!--</div>-->
+    <!--</div>-->
+
+
     <div class="table-responsive" *ngIf="userProfiles">
         <table class="table table-striped">
             <thead>

src/main/webapp/app/entities/user-profile/user-profile.module.ts

@@ -1,6 +1,6 @@
 import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { RouterModule } from '@angular/router';
-
+import { NewsfeedComponent } from 'app/newsfeed/newsfeed.component';
 import { ZipConnectSharedModule } from 'app/shared';
 import { ZipConnectAdminModule } from 'app/admin/admin.module';
 import {
@@ -22,7 +22,8 @@ const ENTITY_STATES = [...userProfileRoute, ...userProfilePopupRoute];
         UserProfileDetailComponent,
         UserProfileUpdateComponent,
         UserProfileDeleteDialogComponent,
-        UserProfileDeletePopupComponent
+        UserProfileDeletePopupComponent,
+        NewsfeedComponent
     ],
     entryComponents: [UserProfileComponent, UserProfileUpdateComponent, UserProfileDeleteDialogComponent, UserProfileDeletePopupComponent],
     schemas: [CUSTOM_ELEMENTS_SCHEMA]

src/main/webapp/app/home/home.component.html

@@ -1,41 +1,90 @@
-<div class="row">
-    <div class="col-md-3">
-        <span class="hipster img-fluid rounded"></span>
+
+    <!--<div class="container-fluid ">-->
+        <!--<img src="../../content/images/Herbacious.png" class="img-fluid" alt="Responsive image">-->
+        <!--&lt;!&ndash;<span class="hipster img-fluid"></span>&ndash;&gt;-->
+    <!--</div>-->
+
+
+
+<div class="col-md-12">
+    <div class="row">
+        <div class="col-md-12">
+            <img src="../../content/images/laser.png" class="img-fluid" alt="Responsive image">
+        </div>
     </div>
-    <div class="col-md-9">
-        <h1 class="display-4" jhiTranslate="home.title">Welcome, Java Hipster!</h1>
-        <p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>
-
-        <div [ngSwitch]="isAuthenticated()">
-            <div class="alert alert-success" *ngSwitchCase="true">
-                <span id="home-logged-message" *ngIf="account" jhiTranslate="home.logged.message"
-                    translateValues="{username: '{{account.login}}'}"> You are logged in as user "{{account.login}}". </span>
-            </div>
+</div>
 
-            <div class="alert alert-warning" *ngSwitchCase="false">
-                <span jhiTranslate="global.messages.info.authenticated.prefix">If you want to </span>
-                <a class="alert-link" (click)="login()" jhiTranslate="global.messages.info.authenticated.link">sign in</a><span jhiTranslate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
-            </div>
-            <div class="alert alert-warning" *ngSwitchCase="false">
+    <!--Jumbotron option-->
+    <!--<div class="card bg-dark text-white">-->
+        <!--<img class="card-img" src="../../content/images/background.png" alt="Card image">-->
+        <!--<div class="card-img-overlay">-->
+            <!--<div class="jumbotron">-->
+                <!--<h1 class="display-4">Zip CONNECT</h1>-->
+                <!--<p class="lead">This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>-->
+                <!--<hr class="my-4">-->
+                <!--<p>It uses utility classes for typography and spacing to space content out within the larger container.</p>-->
+                <!--<button type="button" class="btn btn-warning"><a class="button" (click)="login()">Sign in</a></button>-->
+            <!--</div>-->
+        <!--</div>-->
+    <!--</div>-->
+
+    <!--<div class="row">-->
+        <!--<div class="col-sm-6">-->
+            <!--<div class="card text-white bg-dark mb-3" style="max-width: 20rem;">-->
+                <!--<div class="card-header"></div>-->
+                <!--<div class="card-body">-->
+                    <!--<h4 class="card-title">Dark card title</h4>-->
+                    <!--<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>-->
+                    <!--<button type="button" class="btn btn-warning"><a class="button" (click)="login()">Sign in</a></button>-->
+                    <!--&lt;!&ndash;<button type="button" class="btn btn-warning"><a class="button" routerLink="register">Register a new account</a></button>&ndash;&gt;-->
+                <!--</div>-->
+            <!--</div>-->
+                <!--<div class="col-sm-6">-->
+                    <!--<div class="card text-white bg-dark mb-3" style="max-width: 20rem;">-->
+                        <!--<div class="card-header"></div>-->
+                        <!--<div class="card-body">-->
+                            <!--<h4 class="card-title">Dark card title</h4>-->
+                            <!--<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>-->
+                            <!--<button type="button" class="btn btn-warning"><a class="button" (click)="login()">Sign in</a></button>-->
+                            <!--&lt;!&ndash;<button type="button" class="btn btn-warning"><a class="button" routerLink="register">Register a new account</a></button>&ndash;&gt;-->
+                        <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+        <!--</div>-->
+        <!--<h1 class="display-4" jhiTranslate="home.title">Welcome, Java Hipster!</h1>-->
+        <!--<h1 class="display-4">ZipConnect!</h1>-->
+        <!--<p class="lead" jhiTranslate="home.subtitle">This is your homepage</p>-->
+
+        <div class="container" [ngSwitch]="isAuthenticated()">
+            <!--<div class="alert alert-success" *ngSwitchCase="true">-->
+                <!--<span id="home-logged-message" *ngIf="account" jhiTranslate="home.logged.message"-->
+                    <!--translateValues="{username: '{{account.login}}'}"> You are logged in as user "{{account.login}}". </span>-->
+            <!--</div>-->
+
+            <!--<div class="alert alert-warning" *ngSwitchCase="false">-->
+                <!--<span jhiTranslate="global.messages.info.authenticated.prefix">If you want to </span>-->
+                <!--<a class="alert-link" (click)="login()" jhiTranslate="global.messages.info.authenticated.link">sign in</a><span jhiTranslate="global.messages.info.authenticated.suffix">, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>-->
+            <!--</div>-->
+            <div class="alert alert-light" *ngSwitchCase="false">
                 <span jhiTranslate="global.messages.info.register.noaccount">You don't have an account yet?</span>&nbsp;
                 <a class="alert-link" routerLink="register" jhiTranslate="global.messages.info.register.link">Register a new account</a>
             </div>
         </div>
 
-        <p jhiTranslate="home.question">
-            If you have any question on JHipster:
-        </p>
-
-        <ul>
-            <li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener" jhiTranslate="home.link.homepage">JHipster homepage</a></li>
-            <li><a href="http://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener" jhiTranslate="home.link.stackoverflow">JHipster on Stack Overflow</a></li>
-            <li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener" jhiTranslate="home.link.bugtracker">JHipster bug tracker</a></li>
-            <li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.link.chat">JHipster public chat room</a></li>
-            <li><a href="https://twitter.com/java_hipster" target="_blank" rel="noopener" jhiTranslate="home.link.follow">follow @java_hipster on Twitter</a></li>
-        </ul>
-
-        <p>
-            <span jhiTranslate="home.like">If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.github">GitHub</a>!
-        </p>
-    </div>
-</div>
+        <!--<p jhiTranslate="home.question">-->
+            <!--If you have any question on JHipster:-->
+        <!--</p>-->
+
+        <!--<ul>-->
+            <!--<li><a href="https://www.jhipster.tech/" target="_blank" rel="noopener" jhiTranslate="home.link.homepage">JHipster homepage</a></li>-->
+            <!--<li><a href="http://stackoverflow.com/tags/jhipster/info" target="_blank" rel="noopener" jhiTranslate="home.link.stackoverflow">JHipster on Stack Overflow</a></li>-->
+            <!--<li><a href="https://github.com/jhipster/generator-jhipster/issues?state=open" target="_blank" rel="noopener" jhiTranslate="home.link.bugtracker">JHipster bug tracker</a></li>-->
+            <!--<li><a href="https://gitter.im/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.link.chat">JHipster public chat room</a></li>-->
+            <!--<li><a href="https://twitter.com/java_hipster" target="_blank" rel="noopener" jhiTranslate="home.link.follow">follow @java_hipster on Twitter</a></li>-->
+        <!--</ul>-->
+
+        <!--<p>-->
+            <!--<span jhiTranslate="home.like">If you like JHipster, don't forget to give us a star on</span> <a href="https://github.com/jhipster/generator-jhipster" target="_blank" rel="noopener" jhiTranslate="home.github">GitHub</a>!-->
+        <!--</p>-->
+    <!--</div>-->
+

src/main/webapp/app/home/home.scss

@@ -1,15 +1,35 @@
 /* ==========================================================================
 Main page styles
 ========================================================================== */
+.img-fluid {
+    max-width: 100%;
+    height: auto;
+}
+//
+//.container-fluid {
+//    max-width: 100%;
+//    height: auto;
+//}
 
-.hipster {
-    display: inline-block;
-    width: 347px;
-    height: 497px;
-    background: url('../../content/images/hipster.png') no-repeat center top;
-    background-size: contain;
+.no-padding {
+    padding-left: 0;
+    padding-right: 0;
+    align-items: center;
 }
 
+//.hipster {
+//    display: block;
+//    //width: 100%;
+//    background: url('../../content/images/Herbacious.png')no-repeat center top;
+//    background-size: cover;
+//}
+
+//.jumbotron {
+//    //background: rgb(255, 255, 255); /* This is for ie8 and below */
+//    background: rgba(255, 255, 255, 0.4);
+//    margin-top: 100px;
+//}
+
 /* wait autoprefixer update to allow simple generation of high pixel density media query */
 @media only screen and (-webkit-min-device-pixel-ratio: 2),
     only screen and (-moz-min-device-pixel-ratio: 2),
@@ -17,7 +37,8 @@ Main page styles
     only screen and (min-resolution: 192dpi),
     only screen and (min-resolution: 2dppx) {
     .hipster {
-        background: url('../../content/images/hipster2x.png') no-repeat center top;
-        background-size: contain;
+        background: url('../../content/images/Herbacious.png') no-repeat center;
+        background-size: cover;
+        //width: 100%;
     }
 }

src/main/webapp/app/layouts/footer/footer.component.html

@@ -1,3 +1,3 @@
-<div class="footer">
-    <p jhiTranslate="footer">This is your footer</p>
-</div>
+<!--<div class="footer">-->
+    <!--<p jhiTranslate="footer">This is your footer</p>-->
+<!--</div>-->

src/main/webapp/app/layouts/navbar/navbar.component.html

@@ -1,11 +1,12 @@
-<nav class="navbar navbar-dark navbar-expand-md jh-navbar">
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
     <div class="jh-logo-container float-left">
         <a class="jh-navbar-toggler d-lg-none float-right" href="javascript:void(0);" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation" (click)="toggleNavbar()">
             <fa-icon icon="bars"></fa-icon>
         </a>
         <a class="navbar-brand logo float-left" routerLink="/" (click)="collapseNavbar()">
             <span class="logo-img"></span>
-            <span jhiTranslate="global.title" class="navbar-title">ZipConnect</span> <span class="navbar-version">{{version}}</span>
+            <!--<span jhiTranslate="global.title" class="navbar-title">ZipConnect</span> <span class="navbar-version">{{version}}</span>-->
+            <!--<span jhiTranslate="global.title" class="navbar-title">ZipConnect</span>-->
         </a>
     </div>
     <div class="navbar-collapse collapse" id="navbarResponsive" [ngbCollapse]="isNavbarCollapsed" [ngSwitch]="isAuthenticated()">
@@ -13,7 +14,7 @@
             <li class="nav-item" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                 <a class="nav-link" routerLink="/" (click)="collapseNavbar()">
                     <span>
-                        <fa-icon icon="home"></fa-icon>
+                        <!--<fa-icon icon="home"></fa-icon>-->
                         <span jhiTranslate="global.menu.home">Home</span>
                     </span>
                 </a>
@@ -22,7 +23,7 @@
             <li *ngSwitchCase="true" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="entity-menu">
                     <span>
-                        <fa-icon icon="th-list"></fa-icon>
+                        <!--<fa-icon icon="th-list"></fa-icon>-->
                         <span jhiTranslate="global.menu.entities.main">
                             Entities
                         </span>
@@ -31,31 +32,31 @@
                 <ul class="dropdown-menu" ngbDropdownMenu>
                     <li>
                         <a class="dropdown-item" routerLink="user-profile" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
-                            <fa-icon icon="asterisk" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="asterisk" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.entities.userProfile">User Profile</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="cohort" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
-                            <fa-icon icon="asterisk" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="asterisk" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.entities.cohort">Cohort</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="employer" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
-                            <fa-icon icon="asterisk" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="asterisk" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.entities.employer">Employer</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="post" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
-                            <fa-icon icon="asterisk" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="asterisk" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.entities.post">Post</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="privacy" routerLinkActive="active" [routerLinkActiveOptions]="{ exact: true }" (click)="collapseNavbar()">
-                            <fa-icon icon="asterisk" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="asterisk" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.entities.privacy">Privacy</span>
                         </a>
                     </li>
@@ -65,57 +66,57 @@
             <li *jhiHasAnyAuthority="'ROLE_ADMIN'" ngbDropdown class="nav-item dropdown pointer" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="admin-menu">
                     <span>
-                        <fa-icon icon="user-plus"></fa-icon>
+                        <!--<fa-icon icon="user-plus"></fa-icon>-->
                         <span jhiTranslate="global.menu.admin.main">Administration</span>
                     </span>
                 </a>
                 <ul class="dropdown-menu" ngbDropdownMenu>
                     <li>
                         <a class="dropdown-item" routerLink="admin/user-management" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="user" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="user" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.userManagement">User management</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="admin/jhi-metrics" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="tachometer-alt" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="tachometer-alt" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.metrics">Metrics</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="admin/jhi-health" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="heart" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="heart" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.health">Health</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="admin/jhi-configuration" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="list" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="list" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.configuration">Configuration</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="admin/audits" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="bell" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="bell" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.audits">Audits</span>
                         </a>
                     </li>
                     <li>
                         <a class="dropdown-item" routerLink="admin/logs" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="tasks" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="tasks" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.logs">Logs</span>
                         </a>
                     </li>
                     <li *ngIf="swaggerEnabled">
                         <a class="dropdown-item" routerLink="admin/docs" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="book" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="book" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.apidocs">API</span>
                         </a>
                     </li>
                     <!-- jhipster-needle-add-element-to-admin-menu - JHipster will add entities to the admin menu here -->
                     <li *ngIf="!inProduction">
                         <a class="dropdown-item" href='./h2-console' target="_tab" (click)="collapseNavbar()">
-                            <fa-icon icon="hdd" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="hdd" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.admin.database">Database</span>
                         </a>
                     </li>
@@ -124,7 +125,7 @@
             <li ngbDropdown class="nav-item dropdown pointer" *ngIf="languages && languages.length > 1">
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="languagesnavBarDropdown">
                     <span>
-                        <fa-icon icon="flag"></fa-icon>
+                        <!--<fa-icon icon="flag"></fa-icon>-->
                         <span jhiTranslate="global.menu.language">Language</span>
                     </span>
                 </a>
@@ -137,7 +138,7 @@
             <li ngbDropdown class="nav-item dropdown pointer" placement="bottom-right" routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
                 <a class="nav-link dropdown-toggle" ngbDropdownToggle href="javascript:void(0);" id="account-menu">
                   <span *ngIf="!getImageUrl()">
-                    <fa-icon icon="user"></fa-icon>
+                    <!--<fa-icon icon="user"></fa-icon>-->
                     <span jhiTranslate="global.menu.account.main">
                       Account
                     </span>
@@ -149,36 +150,44 @@
                 <ul class="dropdown-menu" ngbDropdownMenu>
                     <li *ngSwitchCase="true">
                         <a class="dropdown-item" routerLink="settings" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="wrench" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="wrench" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.account.settings">Settings</span>
                         </a>
                     </li>
                     <li *ngSwitchCase="true">
                         <a class="dropdown-item" routerLink="password" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="clock" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="clock" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.account.password">Password</span>
                         </a>
                     </li>
                     <li *ngSwitchCase="true">
                         <a class="dropdown-item" (click)="logout()" id="logout">
-                            <fa-icon icon="sign-out-alt" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="sign-out-alt" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.account.logout">Sign out</span>
                         </a>
                     </li>
                     <li *ngSwitchCase="false">
                         <a class="dropdown-item" (click)="login()" id="login">
-                            <fa-icon icon="sign-in-alt" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="sign-in-alt" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.account.login">Sign in</span>
                         </a>
                     </li>
                     <li *ngSwitchCase="false">
                         <a class="dropdown-item" routerLink="register" routerLinkActive="active" (click)="collapseNavbar()">
-                            <fa-icon icon="user-plus" fixedWidth="true"></fa-icon>
+                            <!--<fa-icon icon="user-plus" fixedWidth="true"></fa-icon>-->
                             <span jhiTranslate="global.menu.account.register">Register</span>
                         </a>
                     </li>
                 </ul>
             </li>
+            <li>
+                <button type="button" class="btn btn-warning"><a class="button" (click)="login()">SIGN IN</a></button>
+            </li>
+            <!--<li><form class="form-inline my-2 my-lg-0">-->
+                <!--<input class="form-control mr-sm-2" type="text" placeholder="Search">-->
+                <!--<button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>-->
+            <!--</form>-->
+            <!--</li>-->
         </ul>
     </div>
 </nav>

src/main/webapp/app/layouts/navbar/navbar.scss

@@ -1,14 +1,16 @@
 /* ==========================================================================
 Navbar
 ========================================================================== */
-
+fa-icon {
+    color: #f2b352;
+}
 .navbar-version {
     font-size: 10px;
     color: #ccc;
 }
 
 .jh-navbar {
-    background-color: #353d47;
+    background-color: #000000;
     padding: 0.2em 1em;
     .profile-image {
         margin: -10px 0px;
@@ -68,10 +70,10 @@ Logo styles
         padding: 5px 15px;
         .logo-img {
             height: 45px;
-            width: 70px;
+            width: 75px;
             display: inline-block;
             vertical-align: middle;
-            background: url('../../../content/images/logo-jhipster.png') no-repeat center center;
+            //background: url('../../../content/images/favicon.png') no-repeat center center;
             background-size: contain;
         }
     }

src/main/webapp/app/newsfeed/newsfeed.component.html

@@ -1,3 +1,7 @@
-<p>
-  newsfeed works!
-</p>
+<!--<p>-->
+  <!--newsfeed works!-->
+<!--</p>-->
+
+<div class="col-md-6">
+    <p>newsfeed works!</p>
+</div>

src/main/webapp/content/scss/_bootstrap-variables.scss

@@ -1,19 +1,9 @@
-/*
-* Bootstrap overrides https://getbootstrap.com/docs/4.0/getting-started/theming/
-* All values defined in bootstrap source
-* https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss can be overwritten here
-* Make sure not to add !default to values here
-*/
-
-// Colors:
-// Grayscale and brand colors for use across Bootstrap.
-
-$primary: #3e8acc;
-$success: #28a745;
-$info: #17a2b8;
-$warning: #ffc107;
-$danger: #dc3545;
-
+$primary: #009688;
+$success: #4caf50;
+$info: #03a9f4;
+$warning: #ff5722;
+$danger: #f44336;
+$blue: #0275d8;
 // Options:
 // Quickly modify global styling by enabling or disabling optional features.
 $enable-rounded: true;
@@ -23,20 +13,21 @@ $enable-transitions: true;
 $enable-hover-media-query: false;
 $enable-grid-classes: true;
 $enable-print-styles: true;
-
 // Components:
 // Define common padding and border radius sizes and more.
-
 $border-radius: 0.15rem;
 $border-radius-lg: 0.125rem;
 $border-radius-sm: 0.1rem;
-
 // Body:
 // Settings for the `<body>` element.
-
-$body-bg: #e4e5e6;
-
+$body-bg: #fff;
 // Typography:
 // Font, line-height, and color for body text, headings, and more.
-
-$font-size-base: 1rem;
+$font-size-base: 0.9rem;
+$border-radius: 2px;
+$border-radius-sm: 1px;
+$font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif;
+$headings-font-weight: 300;
+$link-color: $primary;
+$input-focus-border-color: lighten($blue, 25%);
+$input-focus-box-shadow: none;

src/main/webapp/content/scss/global.scss

@@ -1,226 +1,227 @@
-@import 'bootstrap-variables';
-
-/* ==============================================================
-Bootstrap tweaks
-===============================================================*/
-
-body,
-h1,
-h2,
-h3,
-h4 {
-    font-weight: 300;
-}
-
-a {
-    color: #533f03;
-    font-weight: bold;
-}
-
-a:hover {
-    color: #533f03;
-    font-weight: bold;
-    /* make sure browsers use the pointer cursor for anchors, even with no href */
-    cursor: pointer;
-}
-
-/* ==========================================================================
-Browser Upgrade Prompt
-========================================================================== */
-.browserupgrade {
-    margin: 0.2em 0;
-    background: #ccc;
-    color: #000;
-    padding: 0.2em 0;
-}
-
-/* ==========================================================================
-Generic styles
-========================================================================== */
-
-/* Error highlight on input fields */
-.ng-valid[required],
-.ng-valid.required {
-    border-left: 5px solid green;
-}
-
-.ng-invalid:not(form) {
-    border-left: 5px solid red;
-}
-
-/* other generic styles */
-
-.jh-card {
-    padding: 1.5%;
-    margin-top: 20px;
-    border: none;
-}
-
-.error {
-    color: white;
-    background-color: red;
-}
-
-.pad {
-    padding: 10px;
-}
-
-.w-40 {
-    width: 40% !important;
-}
-
-.w-60 {
-    width: 60% !important;
-}
-
-.break {
-    white-space: normal;
-    word-break: break-all;
-}
-
-.readonly {
-    background-color: #eee;
-    opacity: 1;
-}
-
-.footer {
-    border-top: 1px solid rgba(0, 0, 0, 0.125);
-}
-
-.hand,
-[jhisortby] {
-    cursor: pointer;
-}
-
-/* ==========================================================================
-Custom alerts for notification
-========================================================================== */
-.alerts {
-    .alert {
-        text-overflow: ellipsis;
-        pre {
-            background: none;
-            border: none;
-            font: inherit;
-            color: inherit;
-            padding: 0;
-            margin: 0;
-        }
-        .popover pre {
-            font-size: 10px;
-        }
-    }
-    .toast {
-        position: fixed;
-        width: 100%;
-        &.left {
-            left: 5px;
-        }
-        &.right {
-            right: 5px;
-        }
-        &.top {
-            top: 55px;
-        }
-        &.bottom {
-            bottom: 55px;
-        }
-    }
-}
-
-@media screen and (min-width: 480px) {
-    .alerts .toast {
-        width: 50%;
-    }
-}
-
-/* ==========================================================================
-entity tables helpers
-========================================================================== */
-
-/* Remove Bootstrap padding from the element
-http://stackoverflow.com/questions/19562903/remove-padding-from-columns-in-bootstrap-3 */
-@mixin no-padding($side) {
-    @if $side == 'all' {
-        .no-padding {
-            padding: 0 !important;
-        }
-    } @else {
-        .no-padding-#{$side} {
-            padding-#{$side}: 0 !important;
-        }
-    }
-}
-@include no-padding('left');
-@include no-padding('right');
-@include no-padding('top');
-@include no-padding('bottom');
-@include no-padding('all');
-
-/* bootstrap 3 input-group 100% width
-http://stackoverflow.com/questions/23436430/bootstrap-3-input-group-100-width */
-.width-min {
-    width: 1% !important;
-}
-
-/* Makes toolbar not wrap on smaller screens
-http://www.sketchingwithcss.com/samplechapter/cheatsheet.html#right */
-.flex-btn-group-container {
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-direction: row;
-    flex-direction: row;
-    -webkit-justify-content: flex-end;
-    justify-content: flex-end;
-}
-
-/* ==========================================================================
-entity detail page css
-========================================================================== */
-.row.jh-entity-details > {
-    dd {
-        margin-bottom: 15px;
-    }
-}
-
-@media screen and (min-width: 768px) {
-    .row.jh-entity-details > {
-        dt {
-            margin-bottom: 15px;
-        }
-        dd {
-            border-bottom: 1px solid #eee;
-            padding-left: 180px;
-            margin-left: 0;
-        }
-    }
-}
-
-/* ==========================================================================
-ui bootstrap tweaks
-========================================================================== */
-.nav,
-.pagination,
-.carousel,
-.panel-title a {
-    cursor: pointer;
-}
-
-.datetime-picker-dropdown > li.date-picker-menu div > table .btn-default,
-.uib-datepicker-popup > li > div.uib-datepicker > table .btn-default {
-    border: 0;
-}
-
-.datetime-picker-dropdown > li.date-picker-menu div > table:focus,
-.uib-datepicker-popup > li > div.uib-datepicker > table:focus {
-    outline: none;
-}
-
-.thread-dump-modal-lock {
-    max-width: 450px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-
-/* jhipster-needle-scss-add-main JHipster will add new css style */
+////@import 'bootstrap-variables';
+////@import "~bootstrap/dist/css/bootstrap.min.css";
+//
+///* ==============================================================
+//Bootstrap tweaks
+//===============================================================*/
+//
+//body,
+//h1,
+//h2,
+//h3,
+//h4 {
+//    font-weight: 300;
+//}
+//
+//a {
+//    color: #533f03;
+//    font-weight: bold;
+//}
+//
+//a:hover {
+//    color: #533f03;
+//    font-weight: bold;
+//    /* make sure browsers use the pointer cursor for anchors, even with no href */
+//    cursor: pointer;
+//}
+//
+///* ==========================================================================
+//Browser Upgrade Prompt
+//========================================================================== */
+//.browserupgrade {
+//    margin: 0.2em 0;
+//    background: #ccc;
+//    color: #000;
+//    padding: 0.2em 0;
+//}
+//
+///* ==========================================================================
+//Generic styles
+//========================================================================== */
+//
+///* Error highlight on input fields */
+//.ng-valid[required],
+//.ng-valid.required {
+//    border-left: 5px solid green;
+//}
+//
+//.ng-invalid:not(form) {
+//    border-left: 5px solid red;
+//}
+//
+///* other generic styles */
+//
+//.jh-card {
+//    padding: 1.5%;
+//    margin-top: 20px;
+//    border: none;
+//}
+//
+//.error {
+//    color: white;
+//    background-color: red;
+//}
+//
+//.pad {
+//    padding: 10px;
+//}
+//
+//.w-40 {
+//    width: 40% !important;
+//}
+//
+//.w-60 {
+//    width: 60% !important;
+//}
+//
+//.break {
+//    white-space: normal;
+//    word-break: break-all;
+//}
+//
+//.readonly {
+//    background-color: #eee;
+//    opacity: 1;
+//}
+//
+//.footer {
+//    border-top: 1px solid rgba(0, 0, 0, 0.125);
+//}
+//
+//.hand,
+//[jhisortby] {
+//    cursor: pointer;
+//}
+//
+///* ==========================================================================
+//Custom alerts for notification
+//========================================================================== */
+//.alerts {
+//    .alert {
+//        text-overflow: ellipsis;
+//        pre {
+//            background: none;
+//            border: none;
+//            font: inherit;
+//            color: inherit;
+//            padding: 0;
+//            margin: 0;
+//        }
+//        .popover pre {
+//            font-size: 10px;
+//        }
+//    }
+//    .toast {
+//        position: fixed;
+//        width: 100%;
+//        &.left {
+//            left: 5px;
+//        }
+//        &.right {
+//            right: 5px;
+//        }
+//        &.top {
+//            top: 55px;
+//        }
+//        &.bottom {
+//            bottom: 55px;
+//        }
+//    }
+//}
+//
+//@media screen and (min-width: 480px) {
+//    .alerts .toast {
+//        width: 50%;
+//    }
+//}
+//
+///* ==========================================================================
+//entity tables helpers
+//========================================================================== */
+//
+///* Remove Bootstrap padding from the element
+//http://stackoverflow.com/questions/19562903/remove-padding-from-columns-in-bootstrap-3 */
+//@mixin no-padding($side) {
+//    @if $side == 'all' {
+//        .no-padding {
+//            padding: 0 !important;
+//        }
+//    } @else {
+//        .no-padding-#{$side} {
+//            padding-#{$side}: 0 !important;
+//        }
+//    }
+//}
+//@include no-padding('left');
+//@include no-padding('right');
+//@include no-padding('top');
+//@include no-padding('bottom');
+//@include no-padding('all');
+//
+///* bootstrap 3 input-group 100% width
+//http://stackoverflow.com/questions/23436430/bootstrap-3-input-group-100-width */
+//.width-min {
+//    width: 1% !important;
+//}
+//
+///* Makes toolbar not wrap on smaller screens
+//http://www.sketchingwithcss.com/samplechapter/cheatsheet.html#right */
+//.flex-btn-group-container {
+//    display: -webkit-flex;
+//    display: flex;
+//    -webkit-flex-direction: row;
+//    flex-direction: row;
+//    -webkit-justify-content: flex-end;
+//    justify-content: flex-end;
+//}
+//
+///* ==========================================================================
+//entity detail page css
+//========================================================================== */
+//.row.jh-entity-details > {
+//    dd {
+//        margin-bottom: 15px;
+//    }
+//}
+//
+//@media screen and (min-width: 768px) {
+//    .row.jh-entity-details > {
+//        dt {
+//            margin-bottom: 15px;
+//        }
+//        dd {
+//            border-bottom: 1px solid #eee;
+//            padding-left: 180px;
+//            margin-left: 0;
+//        }
+//    }
+//}
+//
+///* ==========================================================================
+//ui bootstrap tweaks
+//========================================================================== */
+//.nav,
+//.pagination,
+//.carousel,
+//.panel-title a {
+//    cursor: pointer;
+//}
+//
+//.datetime-picker-dropdown > li.date-picker-menu div > table .btn-default,
+//.uib-datepicker-popup > li > div.uib-datepicker > table .btn-default {
+//    border: 0;
+//}
+//
+//.datetime-picker-dropdown > li.date-picker-menu div > table:focus,
+//.uib-datepicker-popup > li > div.uib-datepicker > table:focus {
+//    outline: none;
+//}
+//
+//.thread-dump-modal-lock {
+//    max-width: 450px;
+//    overflow: hidden;
+//    text-overflow: ellipsis;
+//    white-space: nowrap;
+//}
+//
+///* jhipster-needle-scss-add-main JHipster will add new css style */

src/main/webapp/content/scss/vendor.scss

@@ -1,12 +1,12 @@
-/* after changing this file run 'npm run webpack:build' */
-
-/***************************
-put Sass variables here:
-eg $input-color: red;
-****************************/
-// Override Boostrap variables
-@import 'bootstrap-variables';
-// Import Bootstrap source files from node_modules
-@import '~bootstrap/scss/bootstrap';
-
-/* jhipster-needle-scss-add-vendor JHipster will add new css style */
+///* after changing this file run 'npm run webpack:build' */
+//
+///***************************
+//put Sass variables here:
+//eg $input-color: red;
+//****************************/
+//// Override Boostrap variables
+//@import 'bootstrap-variables';
+//// Import Bootstrap source files from node_modules
+//@import '~bootstrap/scss/bootstrap';
+//
+///* jhipster-needle-scss-add-vendor JHipster will add new css style */

src/main/webapp/index.html

@@ -11,7 +11,7 @@
     <meta name="theme-color" content="#000000">
     <link rel="shortcut icon" href="favicon.ico" />
     <link rel="manifest" href="manifest.webapp" />
-    <link rel="stylesheet" href="content/css/loading.css">
+    <link rel="stylesheet" href="https://bootswatch.com/4/lux/bootstrap.min.css">
     <!-- jhipster-needle-add-resources-to-root - JHipster will add new resources here -->
 </head>
 <body>