Merge branch 'master' of laurengreen/JhipsterGroupProject-Client into master

webapp/app/entities/user-profile/user-profile-update.component.html

@@ -38,20 +38,6 @@
                     </select>
                 </div>
                 <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.cohort" for="field_cohort">Cohort</label>
-                    <select class="form-control" id="field_cohort" name="cohort" [(ngModel)]="userProfile.cohort">
-                        <option [ngValue]="null"></option>
-                        <option [ngValue]="cohortOption.id === userProfile.cohort?.id ? userProfile.cohort : cohortOption" *ngFor="let cohortOption of cohorts; trackBy: trackCohortById">{{cohortOption.id}}</option>
-                    </select>
-                </div>
-                <div class="form-group">
-                    <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
-                    <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer">
-                        <option [ngValue]="null"></option>
-                        <option [ngValue]="employerOption.id === userProfile.employer?.id ? userProfile.employer : employerOption" *ngFor="let employerOption of employers; trackBy: trackEmployerById">{{employerOption.id}}</option>
-                    </select>
-                </div>
-                <div class="form-group">
                     <label class="form-control-label" jhiTranslate="zipConnectApp.userProfile.employer" for="field_employer">Employer</label>
                     <select class="form-control" id="field_employer" name="employer" [(ngModel)]="userProfile.employer" >
                         <option [ngValue]="null"></option>

webapp/app/entities/user-profile/user-profile-update.component.ts

@@ -26,10 +26,6 @@ export class UserProfileUpdateComponent implements OnInit {
 
     employers: IEmployer[];
 
-    employers: IEmployer[];
-
-    cohorts: ICohort[];
-
     constructor(
         private jhiAlertService: JhiAlertService,
         private userProfileService: UserProfileService,

webapp/app/shared/model/cohort.model.ts

@@ -5,5 +5,5 @@ export interface ICohort {
 }
 
 export class Cohort implements ICohort {
-    constructor(public id?: number, public cohortId?: number, public gradDate?: string) {}
+    constructor(public id?: number, public gradDate?: string) {}
 }

webapp/app/shared/model/employer.model.ts

@@ -7,5 +7,5 @@ export interface IEmployer {
 }
 
 export class Employer implements IEmployer {
-    constructor(public id?: number, public employerId?: number, public companyName?: string, public city?: string, public state?: string) {}
+    constructor(public id?: number, public companyName?: string, public city?: string, public state?: string) {}
 }

webapp/app/shared/model/post.model.ts

@@ -4,24 +4,20 @@ import { IPrivacy } from 'app/shared/model//privacy.model';
 
 export interface IPost {
     id?: number;
-    postId?: number;
     timestamp?: Moment;
     content?: string;
     likes?: string;
     poster?: IUser;
     privacySetting?: IPrivacy;
-    poster?: IUser;
 }
 
 export class Post implements IPost {
     constructor(
         public id?: number,
-        public postId?: number,
         public timestamp?: Moment,
         public content?: string,
         public likes?: string,
         public poster?: IUser,
-        public privacySetting?: IPrivacy,
-        public poster?: IUser
+        public privacySetting?: IPrivacy
     ) {}
 }

webapp/app/shared/model/privacy.model.ts

@@ -7,13 +7,7 @@ export interface IPrivacy {
 }
 
 export class Privacy implements IPrivacy {
-    constructor(
-        public id?: number,
-        public privacyId?: number,
-        public publicView?: boolean,
-        public cohortView?: boolean,
-        public employerView?: boolean
-    ) {
+    constructor(public id?: number, public publicView?: boolean, public cohortView?: boolean, public employerView?: boolean) {
         this.publicView = this.publicView || false;
         this.cohortView = this.cohortView || false;
         this.employerView = this.employerView || false;

webapp/app/shared/model/user-profile.model.ts

@@ -4,28 +4,22 @@ import { IEmployer } from 'app/shared/model//employer.model';
 
 export interface IUserProfile {
     id?: number;
-    profileId?: number;
     firstName?: string;
     lastName?: string;
     userStack?: string;
     user?: IUser;
     cohort?: ICohort;
     employer?: IEmployer;
-    employer?: IEmployer;
-    cohort?: ICohort;
 }
 
 export class UserProfile implements IUserProfile {
     constructor(
         public id?: number,
-        public profileId?: number,
         public firstName?: string,
         public lastName?: string,
         public userStack?: string,
         public user?: IUser,
         public cohort?: ICohort,
-        public employer?: IEmployer,
-        public employer?: IEmployer,
-        public cohort?: ICohort
+        public employer?: IEmployer
     ) {}
 }

webapp/i18n/en/global.json

@@ -1,8 +1,7 @@
 {
     "global": {
         "title": "ZipConnect",
-        "browsehappy":
-            "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
+        "browsehappy": "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/?locale=en\">upgrade your browser</a> to improve your experience.",
         "menu": {
             "home": "Home",
             "jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@@ -56,8 +55,7 @@
                 "authenticated": {
                     "prefix": "If you want to ",
                     "link": "sign in",
-                    "suffix":
-                        ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
+                    "suffix": ", you can try the default accounts:<br/>- Administrator (login=\"admin\" and password=\"admin\") <br/>- User (login=\"user\" and password=\"user\")."
                 },
                 "register": {
                     "noaccount": "You don't have an account yet?",

webapp/i18n/es/global.json

@@ -1,8 +1,7 @@
 {
     "global": {
         "title": "ZipConnect",
-        "browsehappy":
-            "Está usando un navegador <strong>no actualizado</strong>. Por favor, <a href=\"http://browsehappy.com/?locale=en\">actualice su navegador</a> para mejorar su experiencia.",
+        "browsehappy": "Está usando un navegador <strong>no actualizado</strong>. Por favor, <a href=\"http://browsehappy.com/?locale=en\">actualice su navegador</a> para mejorar su experiencia.",
         "menu": {
             "home": "Inicio",
             "jhipster-needle-menu-add-element": "JHipster will add additional menu entries here (do not translate!)",
@@ -56,8 +55,7 @@
                 "authenticated": {
                     "prefix": "Si desea ",
                     "link": "iniciar una sesión",
-                    "suffix":
-                        ", puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\")."
+                    "suffix": ", puede intentar con las cuentas predeterminadas:<br/>- Administrator (usuario=\"admin\" y contraseña=\"admin\") <br/>- Usuario (usuario=\"user\" y contraseña=\"user\")."
                 },
                 "register": {
                     "noaccount": "¿No tienes una cuenta todavía?",