Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts

@@ -140,7 +140,7 @@ export class AppWindow {
     }
   }
 
-  public load(): void {
+  public load(hashUrl?: string): void {
     let startLoad = 0;
 
     this.window.webContents.once(
@@ -176,7 +176,7 @@ export class AppWindow {
         isMainFrame: boolean
       ) => {
         if ('ERR_FILE_NOT_FOUND' === errorDescription) {
-          this.load();
+          this.load(url.parse(validatedURL).hash);
           return;
         }
         log.error(
@@ -187,6 +187,7 @@ export class AppWindow {
           validatedURL,
           isMainFrame
         );
+
         this.window.webContents.openDevTools();
       }
     );
@@ -204,7 +205,8 @@ export class AppWindow {
             'ucap-webmessenger-app/index.html'
           ),
           protocol: 'file:',
-          slashes: true
+          slashes: true,
+          hash: hashUrl
         })
       );
     }

projects/ucap-webmessenger-app/src/app/app-routing.module.ts

@@ -29,7 +29,9 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { enableTracing: false })],
+  imports: [
+    RouterModule.forRoot(routes, { useHash: true, enableTracing: false })
+  ],
   exports: [RouterModule]
 })
 export class AppRoutingModule {}

projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.html

@@ -59,6 +59,7 @@
       <span class="number">{{ userInfo.employeeNum }}</span>
     </mat-card-title>
     <mat-card-subtitle>
+      <span class="company">{{ userInfo.companyName | ucapStringEmptycheck }}</span>
       <span class="deptName">{{ userInfo | ucapTranslate: 'deptName' }}</span>
       <span class="grade">{{ userInfo | ucapTranslate: 'grade' }}</span>
     </mat-card-subtitle>
@@ -177,6 +178,14 @@
         <dt class="division">{{ 'profile.fieldCompany' | translate }}</dt>
         <dd>{{ userInfo.companyName | ucapStringEmptycheck }}</dd>
       </li>
+      <li class="deptName">
+        <dt class="division">{{ 'search.fieldDeptartment' | translate }}</dt>
+        <dd>{{ userInfo | ucapTranslate: 'deptName' }}</dd>
+      </li>
+      <li class="grade">
+        <dt class="division">{{ 'search.fieldGrade' | translate }}</dt>
+        <dd>{{ userInfo | ucapTranslate: 'grade' }}</dd>
+      </li>
       <li>
         <dt class="division">
           {{ 'profile.fieldResponsibilities' | translate }}

projects/ucap-webmessenger-ui-profile/src/lib/components/profile.component.scss

@@ -120,9 +120,11 @@ $login-max-height: 800px;
       flex-flow: column;
       span {
         @include ellipsis(1);
-        &.deptName {
+        font-size: 1em;
-          font-size: 1.2em;
+        margin-bottom: 8px;
-          line-height: 1.4em;
+        &.company {
+          font-weight: 600;
+          font-size: 1.1em;
         }
       }
     }
@@ -170,13 +172,15 @@ $login-max-height: 800px;
     ul {
       display: flex;
       flex-flow: column;
+      height: calc(100% - 80px);
+      overflow-y: auto;
       li {
         display: flex;
         flex-direction: row;
-        height: 30px;
+        height: 26px;
         align-items: center;
         flex-flow: row;
-        margin-bottom: 14px;
+        margin-bottom: 10px;
         dt {
           width: 100px;
           font-weight: 800;
@@ -224,16 +228,16 @@ $login-max-height: 800px;
 ::ng-deep .userInfo-call {
   position: relative;
   display: flex;
-  flex: 0 0 auto;
+  flex: 0 0 26px;
-  width: 34px;
+  width: 26x;
-  height: 34px;
+  height: 26px;
-  line-height: 34px;
+  line-height: 26px;
   justify-content: center;
   justify-items: center;
   .mat-button-wrapper {
     padding: 0;
-    width: 20px;
+    width: 18px;
-    height: 20px;
+    height: 18px;
     justify-content: center;
     text-align: center;
     svg {
@@ -252,8 +256,9 @@ $login-max-height: 800px;
     &.mat-mini-fab {
       position: relative;
       display: flex;
-      width: 40px;
+      width: 36px;
-      height: 40px;
+      height: 36px;
+      flex: 0 0 36px;
       //line-height: 40px;
       .mat-button-wrapper {
         padding: 0;