Merge branch 'main' of github.com:hcengineering/anticrm into main

Signed-off-by: Andrey Platov <andrey@hardcoreeng.com>

packages/theme/styles/_layouts.scss

@@ -79,6 +79,10 @@ table {
 // }
 
 /* Common */
+* {
+  --modal-padding: 1.5rem;
+}
+
 .flex { display: flex; }
 .flex-nowrap {
   display: flex;
@@ -122,6 +126,35 @@ table {
   flex-direction: column;
   align-items: stretch;
 }
+
+.abs-lt-content {
+  position: absolute;
+  top: var(--modal-padding);
+  left: var(--modal-padding);
+}
+.abs-rt-content {
+  position: absolute;
+  top: var(--modal-padding);
+  right: var(--modal-padding);
+}
+.abs-lb-content {
+  position: absolute;
+  bottom: var(--modal-padding);
+  left: var(--modal-padding);
+}
+.abs-rb-content {
+  position: absolute;
+  bottom: var(--modal-padding);
+  right: var(--modal-padding);
+}
+.abs-full-content {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+
 .h-full { height: 100%; }
 .square-36 { width: 2.25rem; height: 2.25rem; }
 

packages/ui/src/components/Popup.svelte

@@ -81,7 +81,7 @@
     position: fixed;
     background-color: transparent;
     filter: drop-shadow(0 1.5rem 4rem rgba(0, 0, 0, .35));
-    z-index: 1001;
+    z-index: 501;
   }
   .modal-overlay {
     position: fixed;
@@ -90,6 +90,6 @@
     width: 100%;
     height: 100%;
     background: transparent;
-    z-index: 1000;
+    z-index: 500;
   }
 </style>

packages/ui/src/index.ts

@@ -53,6 +53,7 @@ export { default as Popup } from './components/Popup.svelte'
 export { default as CircleButton } from './components/CircleButton.svelte'
 
 export { default as IconAdd } from './components/icons/Add.svelte'
+export { default as IconClose } from './components/icons/Close.svelte'
 export { default as IconSearch } from './components/icons/Search.svelte'
 export { default as IconToDo } from './components/icons/ToDo.svelte'
 export { default as IconComments } from './components/icons/Comments.svelte'

plugins/recruit-resources/src/components/AvatarEditor.svelte

@@ -0,0 +1,112 @@
+<!--
+// Copyright © 2020, 2021 Anticrm Platform Contributors.
+// Copyright © 2021 Hardcore Engineering Inc.
+// 
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
+<script lang="ts">
+  import type { IntlString } from '@anticrm/platform'
+  import { createEventDispatcher } from 'svelte'
+  import { Label, Button, Grid, IconClose } from '@anticrm/ui'
+
+  import Avatar from '../../img/avatar.png'
+
+  export let label: IntlString
+  export let okAction: () => void
+
+  const dispatch = createEventDispatcher()
+</script>
+
+<div class="dialog-container">
+  <div class="abs-lt-content label">
+    <Label {label} />
+  </div>
+  <div class="abs-rt-content tool" on:click={() => { dispatch('close') }}>
+    <IconClose size={'small'} />
+  </div>
+
+  <div class="avatar">
+    <img src={Avatar} />
+  </div>
+
+  <div class="abs-lb-content actions">
+    <Grid columnGap={.5}>
+      <Button label={'Edit'} />
+      <Button label={'Delete'} />
+    </Grid>
+  </div>
+  <div class="abs-rb-content">
+    <Button label={'Save'} />
+  </div>
+</div>
+
+<style lang="scss">
+  .dialog-container {
+    position: relative;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 40rem;
+    height: 23.75rem;
+    background-color: var(--theme-bg-color);
+    border-radius: 1.25rem;
+    filter: drop-shadow(0 0 4rem rgba(0, 0, 0, .35));
+
+    .label {
+      font-weight: 500;
+      font-size: 1rem;
+      color: var(--theme-caption-color);
+      user-select: none;
+    }
+
+    .avatar {
+      position: relative;
+      width: 13.75rem;
+      height: 13.75rem;
+      background-color: #fff;
+      border-radius: 50%;
+      overflow: hidden;
+
+      &::after, &::before {
+        content: '';
+        position: absolute;
+        z-index: 1;
+      }
+      &::after {
+        top: .65rem;
+        left: .65rem;
+        bottom: .65rem;
+        right: .65rem;
+        border: 1px solid rgba(255, 255, 255, .6);
+        border-radius: 50%;
+      }
+      &::before {
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        width: 13.75rem;
+        height: 13.75rem;
+        background-color: rgba(255, 255, 255, .2);
+        clip-path: path('M110,0C49.2,0,0,49.2,0,110c0,60.8,49.2,110,110,110s110-49.2,110-110C220,49.2,170.8,0,110,0z M110,212 C53.7,212,8,166.3,8,110C8,53.7,53.7,8,110,8s102,45.7,102,102C212,166.3,166.3,212,110,212z');
+        filter: blur(3px);
+      }
+    }
+
+    .tool {
+      opacity: .4;
+      cursor: pointer;
+      &:hover { opacity: 1; }
+    }
+  }
+</style>

plugins/recruit-resources/src/components/DialogHeader.svelte

@@ -21,7 +21,8 @@
   import login from '@anticrm/login'
   import { createQuery, getClient } from '@anticrm/presentation'
 
-  import { EditBox, Button, CircleButton, Grid, Label } from '@anticrm/ui'
+  import { EditBox, Button, CircleButton, Grid, Label, showModal } from '@anticrm/ui'
+  import AvatarEditor from './AvatarEditor.svelte'
   import FileUpload from './icons/FileUpload.svelte'
   import Edit from './icons/Edit.svelte'
   import Twitter from './icons/Twitter.svelte'
@@ -93,24 +94,23 @@
     on:dragleave={ () => { dragover = false } }
     on:drop|preventDefault|stopPropagation={drop}>
   <div class="flex-row-center main-content">
-    <div class="avatar"><User /></div>
+    <div class="avatar" on:click|stopPropagation={() => showModal(AvatarEditor, { label: 'Profile photo' })}><User /></div>
     <div class="flex-col">
       <div class="name">
         <EditBox placeholder="John" bind:value={firstName}/>
         <EditBox placeholder="Appleseed" bind:value={lastName}/>
       </div>
-      <!-- <div class="name"><EditBox placeholder="John"/>&nbsp;<EditBox placeholder="Appleseed"/></div> -->
       <div class="title"><EditBox placeholder="Los Angeles" bind:value={city}/></div>
     </div>
   </div>
-  <div class="lb-content">
+  <div class="abs-lb-content">
     <Button label={'Upload resume'} {loading} icon={FileUpload} size={'small'} transparent primary on:click={() => { inputFile.click() }}/>
     <input bind:this={inputFile} type="file" name="file" id="file" style="display: none" on:change={fileSelected}/>
   </div>
-  <div class="rb-content">
+  <div class="abs-rb-content">
     <Button label={'Save'} size={'small'} transparent />
   </div>
-  <div class="rt-content">
+  <div class="abs-rt-content">
     <Grid column={2} columnGap={.5}>
       <CircleButton icon={Twitter} label={'Twitter'} />
       <CircleButton icon={Edit} label={'Edit'} />
@@ -121,9 +121,6 @@
 <style lang="scss">
   .header {
     position: relative;
-    // display: flex;
-    // justify-content: center;
-    // align-items: center;
     padding: 1.5rem 1.5rem 0;
     width: 37.5rem;
     min-height: 15rem;
@@ -150,6 +147,7 @@
         background-color: rgba(255, 255, 255, .2);
         backdrop-filter: blur(3px);
         box-shadow: 0 1.5rem 3rem rgba(0, 0, 0, .3);
+        cursor: pointer;
       }
       .name {
         display: flex;
@@ -171,21 +169,5 @@
         color: rgba(255, 255, 255, .6);
       }
     }
-
-    .lb-content {
-      position: absolute;
-      left: 1.5rem;
-      bottom: 1.5rem;
-    }
-    .rb-content {
-      position: absolute;
-      right: 1.5rem;
-      bottom: 1.5rem;
-    }
-    .rt-content {
-      position: absolute;
-      top: 1.5rem;
-      right: 1.5rem;
-    }
   }
 </style>

plugins/workbench-resources/src/components/Modal.svelte

@@ -62,7 +62,7 @@
   }
   @keyframes showOverlay {
     from { backdrop-filter: blur(0px); }
-    to { backdrop-filter: blur(3px); }
+    to { backdrop-filter: blur(1px); }
   }
   .modal {
     position: fixed;
@@ -72,7 +72,7 @@
   }
   .modal-overlay {
     z-index: 1000;
-    background: rgba(0, 0, 0, 0.2);
+    background: rgba(0, 0, 0, .5);
     position: fixed;
     top: 0;
     left: 0;