@pareto-engineering/design-system 2.0.0-alpha.13 → 2.0.0-alpha.14

package/src/stories/a/Conversation.stories.jsx

@@ -25,7 +25,7 @@ export const Base = () => {
       from   :'theirs',
     },
     {
-      message:'Hi Humbl, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
+      message:'Hi Morgan! Here is the database we prepared for you.',
       sender :'CAMILLE',
       from   :'ours',
     },
@@ -34,6 +34,83 @@ export const Base = () => {
       sender :'HUMBL',
       from   :'theirs',
     },
+    {
+      message:'Hi Morgan! Here is the database we prepared for you.',
+      sender :'CAMILLE',
+      from   :'ours',
+    },
+  ]
+
+  return (
+    <Conversation>
+      {conversations.map((conversation) => (
+        <Conversation.Message key={conversation.message} {...conversation} />
+      ))}
+    </Conversation>
+  )
+}
+
+export const WithTriangle = () => {
+  const conversations = [
+    {
+      message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
+      sender :'HUMBL',
+      from   :'theirs',
+    },
+    {
+      message:'Hi Morgan! Here is the database we prepared for you.',
+      sender :'CAMILLE',
+      from   :'ours',
+    },
+    {
+      message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
+      sender :'HUMBL',
+      from   :'theirs',
+    },
+    {
+      message:'Hi Morgan! Here is the database we prepared for you.',
+      sender :'CAMILLE',
+      from   :'ours',
+    },
+  ]
+
+  return (
+    <Conversation
+      hasTriangle
+    >
+      {conversations.map((conversation) => (
+        <Conversation.Message key={conversation.message} {...conversation} />
+      ))}
+    </Conversation>
+  )
+}
+
+export const WithAttachment = () => {
+  const conversations = [
+    {
+      message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
+      sender :'HUMBL',
+      from   :'theirs',
+    },
+    {
+      message        :'Hi Morgan! Here is the database we prepared for you.',
+      sender         :'CAMILLE',
+      from           :'ours',
+      attachment     :'spreadsheet.xlsx',
+      attachmentColor:'main4',
+    },
+    {
+      message:'Hi Camille, please compile an assesment of top 5 firms/brand providers for the listed fields in the US.',
+      sender :'HUMBL',
+      from   :'theirs',
+    },
+    {
+      message        :'Hi Morgan! Here is the database we prepared for you.',
+      sender         :'CAMILLE',
+      from           :'ours',
+      attachment     :'spreadsheet.xlsx',
+      attachmentColor:'main4',
+    },
   ]
 
   return (

package/src/ui/a/BackgroundGradient/styles.scss

@@ -5,11 +5,11 @@
     position: absolute;
     top: 0;
     left: 0;
-    justify-content: var(--vertical-align);
     width: 100%;
     height: var(--gradient-height);
     background-image: linear-gradient(transparent, var(--y) 25%, var(--light-y) 75%, transparent);
-    opacity: .8;
+    opacity: .4;
+    z-index: -1;
 }
 
 

package/src/ui/a/Conversation/Conversation.jsx

@@ -28,19 +28,19 @@ const Conversation = ({
   ourColor,
   theirColor,
   children,
+  hasTriangle,
   // ...otherProps
 }) => {
   useLayoutEffect(() => {
     import('./styles.scss')
   }, [])
 
-  // const messageColors = { ours: color, theirs: 'main2' }
-
   return (
     <ConversationContext.Provider
       value={{
         ourColor,
         theirColor,
+        hasTriangle,
       }}
     >
       <div
@@ -76,11 +76,13 @@ Conversation.propTypes = {
   /**
    * The React-written, css properties for this element.
    */
-  style     :PropTypes.objectOf(PropTypes.string),
+  style:PropTypes.objectOf(PropTypes.string),
+
   /**
    * The base color to our messages component
    */
-  ourColor  :PropTypes.string,
+  ourColor:PropTypes.string,
+
   /**
    * The base color to their messages component
    */
@@ -94,12 +96,18 @@ Conversation.propTypes = {
    *  The children JSX
    */
   children       :PropTypes.node,
+
+  /**
+   * whether to add triangle to bubble chats
+   */
+  hasTriangle:PropTypes.bool,
 }
 
 Conversation.defaultProps = {
-  backgroundColor:'background',
-  ourColor       :'main2',
-  theirColor     :'background2',
+  backgroundColor:'background2',
+  ourColor       :'background1',
+  theirColor     :'background1',
+  hasTriangle    :'false',
 }
 
 Conversation.Message = Message

package/src/ui/a/Conversation/common/Message/Message.jsx

@@ -23,9 +23,12 @@ const Message = ({
   message,
   sender,
   from,
+  attachment,
+  attachmentIcon,
+  attachmentColor,
   // ...otherProps
 }) => {
-  const { ourColor, theirColor } = useConversation()
+  const { hasTriangle, ourColor, theirColor } = useConversation()
 
   return (
     <div
@@ -36,6 +39,8 @@ const Message = ({
         userClassName,
         `x-${from === 'ours' ? ourColor : theirColor}`,
         from === 'ours' && 'ours',
+        hasTriangle === true ? 'has-triangle' : '',
+        'v1',
       ]
         .filter((e) => e)
         .join(' ')}
@@ -49,11 +54,19 @@ const Message = ({
         <p>
           {message}
         </p>
+        {attachment
+      && (
+      <div className={`attachment y-${attachmentColor}`}>
+        <span className="f-icons">{attachmentIcon}</span>
+        <p className="ml-v">
+          {attachment}
+        </p>
+      </div>
+      )}
       </div>
     </div>
   )
 }
-
 Message.propTypes = {
   /**
    * The HTML id for this element
@@ -65,26 +78,46 @@ Message.propTypes = {
    */
   className:PropTypes.string,
 
+  /**
+   * The React-written, css properties for this element.
+   */
+  style:PropTypes.objectOf(PropTypes.string),
+
   /**
    * The message in the conversation
    */
   message:PropTypes.string.isRequired,
+
   /**
    * The sender of the message
    */
-  sender :PropTypes.string.isRequired,
+  sender:PropTypes.string.isRequired,
+
   /**
    * The owner of the message
    */
-  from   :PropTypes.oneOf(['ours', 'theirs']),
+  from:PropTypes.oneOf(['ours', 'theirs']),
+
   /**
-   * The React-written, css properties for this element.
+   * name of the attachment file
+   */
+  attachment:PropTypes.string,
+
+  /**
+   * source of the attachment icon
+   */
+  attachmentIcon:PropTypes.string,
+
+  /**
+   * background color of the attachment box
    */
-  style  :PropTypes.objectOf(PropTypes.string),
+  attachmentColor:PropTypes.string,
 }
 
 Message.defaultProps = {
-  from:'theirs',
+  from           :'theirs',
+  attachmentIcon :'A',
+  attachmentColor:'main4',
 }
 
 export default Message

package/src/ui/a/Conversation/styles.scss

@@ -1,4 +1,5 @@
 /* @pareto-engineering/generator-front 1.0.12 */
+
 @use "@pareto-engineering/bem";
 @use "@aztlan/stylebook/src/mixins";
 @use "@aztlan/stylebook/src/globals" as *;
@@ -8,47 +9,153 @@ $default-conversation-background: var(--y);
 $default-message-max-width: calc(100% - #{$default-padding});
 $default-message-min-width: 12em;
 $default-message-border: var(--theme-border);
+$triangle-border-size: 15px;
+$triangle-border-style: $triangle-border-size solid;
+$triangle-border-style-subtracted: ($triangle-border-size - 1px) solid;
+$triangle-border1: $triangle-border-style var(--paragraph);
+$triangle-border2: $triangle-border-style transparent;
+$triangle-border3: $triangle-border-style-subtracted var(--x);
+$triangle-border4: $triangle-border-style-subtracted transparent;
+$triangle-before-side:24px;
+$triangle-before-bottom:-30px;
+$triangle-after-bottom:-27px;
+$triangle-after-side:25px;
 
 .#{bem.$base}.conversation {
-    display: flex;
-    flex-direction: column;
-    background-color: $default-conversation-background;
-    padding: $default-padding;
+  background-color: $default-conversation-background;
+  border-radius: var(--theme-border-radius);
+  display: flex;
+  flex-direction: column;
+  padding: $default-padding;
+
+  >:not(:last-child) {
+    margin-bottom: $default-padding;
+  }
+
+  // >:nth-child(1) {
+  // animation-delay: 1s;
+  // }
+  // >:nth-child(2) {
+  // animation-delay: 3s;
+  // }
+
+  .#{bem.$base}.message {
+    align-self: flex-start;
+    background-color: var(--x);
+    //  animation: fadeIn 1s ease-in both;
+    border: $default-message-border;
     border-radius: var(--theme-border-radius);
+    max-width: $default-message-max-width;
+    min-width: $default-message-min-width;
+    padding: $default-padding;
+    position: relative;
 
-    >:not(:last-child) {
-        margin-bottom: $default-padding;
-    }
+    .#{bem.$element-content} {
+      display: flex;
+      flex-direction: column;
+
+      >p {
+        color: var(--on-x);
+      }
+
+      .sender {
+        font-weight: 800;
+        margin-bottom: .5em;
+      }
 
-    .#{bem.$base}.message {
-        min-width: $default-message-min-width;
-        max-width: $default-message-max-width;
-        padding: $default-padding;
-        border-radius: var(--theme-border-radius);
-        background-color: var(--x);
-        align-self: flex-start;
-        border: $default-message-border;
-
-        .#{bem.$element-content} {
-            display: flex;
-            flex-direction: column;
-
-            >p {
-                color: var(--on-x);
-            }
-
-            .sender {
-                font-weight: 800;
-                margin-bottom: .5em;
-            }
+      .attachment {
+        align-self: baseline;
+        background-color: var(--y);
+        display: flex;
+        flex-direction: row;
+        padding: .5em 1em;
+
+        > p {
+          margin-bottom: 0;
         }
-    }
 
-    .#{bem.$base}.ours {
-        align-self: flex-end;
+        > img {
+          width: 40px;
+        }
+      }
+    }
+    &.#{bem.$base}.ours {
+      align-self: flex-end;
     }
 
-}
+    &.has-triangle {
+      ::before {
+        border-bottom: $triangle-border2;
+        border-left: $triangle-border2;
+        border-right: $triangle-border1;
+        border-top: $triangle-border1;
+        bottom: $triangle-before-bottom;
+        content: "";
+        height: 0;
+        position: absolute;
+        right: $triangle-before-side;
+        width: 0;
+      }
+
+      ::after {
+        border-bottom: $triangle-border4;
+        border-left: $triangle-border4;
+        border-right: $triangle-border3;
+        border-top: $triangle-border3;
+        bottom: $triangle-after-bottom;
+        content: "";
+        height: 0;
+        position: absolute;
+        right: $triangle-after-side;
+        width: 0;
+      }
+
+      &:not(.ours) {
+        ::before {
+          border-bottom: $triangle-border2;
+          border-left: $triangle-border1;
+          border-right: $triangle-border2;
+          border-top: $triangle-border1;
+          bottom: $triangle-before-bottom;
+          content: "";
+          height: 0;
+          left: $triangle-before-side;
+          position: absolute;
+          width: 0;
+        }
 
+        ::after {
+          border-bottom: $triangle-border4;
+          border-left: $triangle-border3;
+          border-right: $triangle-border4;
+          border-top: $triangle-border3;
+          bottom: $triangle-after-bottom;
+          content: "";
+          height: 0;
+          left: $triangle-after-side;
+          position: absolute;
+          width: 0;
+        }
+      }
+    }
 
+    // mobile style
+    @include mixins.media($to:$sm-md) {
+      .message {
+        margin-top: 2em;
+      }
+    }
+  }
+}
 
+//@keyframes fadeIn {
+//  from {
+//    opacity: 0;
+//    transform: translate3d(0, 50%, 0);
+//  }
+//
+//  to {
+//    opacity: 1;
+//    transform: translate3d(0, 0, 0);
+//  }
+//}

package/src/ui/b/Button/styles.scss

@@ -13,24 +13,23 @@ $default-margin:.5em;
   border: transparent;
   border-radius: var(--theme-border-radius);
   color: var(--on-x, var(--on-#{$default-color}));
+  display: inline-flex;
   font-weight: 600;
+  font-family: var(--theme-default-paragraph);
+  justify-content: space-between;
   padding: $default-padding;
   transition: all .25s;
 
-  &.arrow-right{
+  &.arrow-right {
     &::after {
-      content: "L";
-      font-family: "icons";
-      vertical-align: middle;
+      content: "-->";
       margin-left: $default-margin;
     }
   }
 
-  &.arrow-left{
+  &.arrow-left {
     &::before {
-      content: "H";
-      font-family: "icons";
-      vertical-align: middle;
+      content: "<--";
       margin-right: $default-margin;
     }
   }
@@ -41,6 +40,7 @@ $default-margin:.5em;
     &:hover {
       background: var(--light-x, var(--light-#{$default-color}));
     }
+
     &:focus {
       background: var(--dark-x, var(--dark-#{$default-color}));
     }
@@ -58,7 +58,7 @@ $default-margin:.5em;
 
     &:hover,
     &:focus,
-    &:disabled{
+    &:disabled {
       background: transparent;
     }
 
@@ -74,7 +74,7 @@ $default-margin:.5em;
       }
     }
 
-    &:disabled{
+    &:disabled {
       border: 1px solid var(--x, var(--#{$default-color}));
       color: var(--x, var(--#{$default-color}));
     }
@@ -83,8 +83,8 @@ $default-margin:.5em;
   &.#{bem.$modifier-simple} {
     background: transparent;
     border: 1px solid transparent;
-    padding: 0;
     color: var(--x, var(--#{$default-color}));
+    padding: 0;
 
     &:disabled,
     &:hover,
@@ -93,13 +93,13 @@ $default-margin:.5em;
     }
 
     &:not(:disabled) {
-       &:hover {
-         color: var(--light-x, var(--light-#{$default-color}));
-       }
+      &:hover {
+        color: var(--light-x, var(--light-#{$default-color}));
+      }
 
-       &:focus {
-         color: var(--dark-x, var(--dark-#{$default-color}));
-       }
+      &:focus {
+        color: var(--dark-x, var(--dark-#{$default-color}));
+      }
     }
 
     &:disabled {