Merge pull request #639 from zarSou9/598-updated

Ticket #598 updated
StampyAI · Jun 4, 2024 · dc6a47c · dc6a47c
2 parents 23d78c4 + f8ee121
commit dc6a47c
Show file tree

Hide file tree

Showing 13 changed files with 3,894 additions and 19,102 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,7 @@
-semi: false
-singleQuote: true
-bracketSpacing: false
-printWidth: 100
-trailingComma: es5
+{
+    "semi": false,
+    "singleQuote": true,
+    "bracketSpacing": false,
+    "printWidth": 100,
+    "trailingComma": "es5"
+}
diff --git a/app/components/Article/article.css b/app/components/Article/article.css
@@ -160,12 +160,8 @@ article .footer-comtainer {
   align-items: center;
   margin-top: var(--spacing-56);
   margin-bottom: var(--spacing-24);
+  gap: var(--spacing-16);
 }
-
-article .footer-comtainer > * {
-  margin: var(--spacing-8, 8px);
-}
-
 article a.see-more:not(.visible) + div.see-more-contents {
   display: none;
 }

diff --git a/app/components/Article/index.tsx b/app/components/Article/index.tsx
@@ -4,7 +4,7 @@ import KeepGoing from '~/components/Article/KeepGoing'
 import CopyIcon from '~/components/icons-generated/Copy'
 import EditIcon from '~/components/icons-generated/Pencil'
 import Button, {CompositeButton} from '~/components/Button'
-import Feedback from '~/components/Feedback'
+import Feedback, {logFeedback} from '~/components/Feedback'
 import {tagUrl} from '~/routesMapper'
 import type {Glossary, Question, Banner as BannerType} from '~/server-utils/stampy'
 import Contents from './Contents'
@@ -24,19 +24,32 @@ const ArticleFooter = (question: Question) => {
     !isLoading(question) && (
       <div className="footer-comtainer padding-bottom-40">
         {date && <div className="grey"> {`Updated ${date}`}</div>}
-        <div className="flex-double">
+        <CompositeButton secondary>
           <Button
-            className="secondary"
+            secondary
             action={question.answerEditLink || ''}
-            tooltip="Suggest changes in Google Docs"
+            tooltip="Google Doc"
             props={{target: '_blank', rel: 'noopener noreferrer'}}
           >
-            <EditIcon className="no-fill" />
+            <EditIcon />
           </Button>
-        </div>
-        <span>Was this page helpful?</span>
-
-        <Feedback pageid={question.pageid} labels />
+        </CompositeButton>
+        <Feedback
+          showForm
+          pageid={question.pageid}
+          onSubmit={async (message: string, option?: string) =>
+            logFeedback({
+              message,
+              option,
+              type: 'bot',
+              question: question.title || '',
+              answer: question.text || '',
+            })
+          }
+          options={['Unclear', 'Too wordy', 'Confusing', 'Incorrect', 'Other']}
+          upHint="This page was helpful"
+          downHint="This page was unhelpful"
+        />
       </div>
     )
   )

diff --git a/app/components/Button/button.css b/app/components/Button/button.css
@@ -20,6 +20,15 @@
   letter-spacing: -0.16px;
 }
 
+.button-secondary {
+  position: relative;
+  padding: 0.25rem;
+  border-radius: var(--border-radius);
+  border-width: 0;
+  line-height: 0;
+  background: inherit;
+}
+
 /* style */
 
 .primary {
@@ -154,6 +163,22 @@
   border: 1px solid var(--colors-teal-200, #a6d9d7);
 }
 
+.button-secondary:hover .tool-tip-secondary {
+  opacity: 1;
+}
+
+.active path {
+  stroke: var(--colors-teal-600);
+}
+
+.active {
+  background-color: var(----colors-teal-50);
+}
+
+.inactive:hover {
+  background-color: var(--colors-light-grey);
+}
+
 /* #### Composite button #### */
 .composite-button {
   box-shadow: 0px var(--spacing-16) var(--spacing-40) 0px rgba(175, 183, 194, 0.2);
@@ -196,6 +221,20 @@
   border-width: 1px;
 }
 
+.composite-button-secondary {
+  display: flex;
+  border-style: solid;
+  border-color: var(--colors-cool-grey-200);
+  border-width: 1px;
+  border-radius: var(--border-radius);
+  justify-content: center;
+  align-items: center;
+  padding: 7px;
+  gap: var(--spacing-4);
+  min-width: min-content;
+  min-height: min-content;
+}
+
 .tooltip::after {
   content: attr(data-tooltip);
   position: absolute;
@@ -209,6 +248,22 @@
   font-size: 16px; /* hard to set via classes, what with this being a pseudoclass */
 }
 
+.tool-tip-secondary {
+  opacity: 0;
+  position: absolute;
+  top: -42px;
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: #1b2b3e;
+  font-size: 14px;
+  color: #f2f2f2;
+  padding: 5px 15px;
+  border-radius: var(--spacing-8);
+  white-space: nowrap;
+  pointer-events: none;
+  line-height: var(--spacing-32);
+}
+
 .button.full-width {
   width: 100%;
   height: 48px;

diff --git a/app/components/Button/index.tsx b/app/components/Button/index.tsx
@@ -8,15 +8,32 @@ type ButtonProps = {
   className?: string
   tooltip?: string
   disabled?: boolean
+  active?: boolean
+  secondary?: boolean
   props?: {[k: string]: any}
 }
-const Button = ({children, action, tooltip, className, disabled = false, props}: ButtonProps) => {
-  const classes = ['button', className, tooltip && 'tooltip'].filter((i) => i).join(' ')
+const Button = ({
+  children,
+  action,
+  secondary,
+  tooltip,
+  className,
+  disabled = false,
+  active = false,
+  props,
+}: ButtonProps) => {
+  const classes = [
+    (secondary && 'button-secondary') || 'button',
+    className,
+    tooltip && !secondary && 'tooltip',
+  ]
+    .filter((i) => i)
+    .join(' ')
   if (typeof action === 'string') {
     return (
       <Link
         to={action}
-        className={classes}
+        className={classes + ' ' + (secondary && (active ? 'active' : disabled ? '' : 'inactive'))}
         data-tooltip={tooltip}
         onClick={(e) => {
           if (disabled) {
@@ -26,28 +43,35 @@ const Button = ({children, action, tooltip, className, disabled = false, props}:
         {...props}
       >
         {children}
+        {secondary && tooltip && !disabled && <p className="tool-tip-secondary">{tooltip}</p>}
       </Link>
     )
   }
   return (
     <button
-      className={classes}
+      className={classes + ' ' + (secondary && (active ? 'active' : disabled ? '' : 'inactive'))}
       onClick={action}
       data-tooltip={tooltip}
       disabled={disabled}
       {...props}
     >
       {children}
+      {secondary && tooltip && !disabled && <p className="tool-tip-secondary">{tooltip}</p>}
     </button>
   )
 }
 
 export interface CompositeButtonProps {
   children: ReactNode
   className?: string
+  secondary?: boolean
 }
-export const CompositeButton = ({children, className}: CompositeButtonProps) => (
-  <div className={`composite-button ${className || ''}`}>{children}</div>
+export const CompositeButton = ({children, className = '', secondary}: CompositeButtonProps) => (
+  <div
+    className={`${(secondary ? 'composite-button-secondary' : 'composite-button') + ' ' + className}`}
+  >
+    {children}
+  </div>
 )
 
 export default Button
diff --git a/app/components/Feedback/Form.tsx b/app/components/Feedback/Form.tsx
@@ -1,30 +1,20 @@
-import {useEffect, useState} from 'react'
+import {useState} from 'react'
 import Button from '~/components/Button'
 import useOutsideOnClick from '~/hooks/useOnOutsideClick'
 import './feedback.css'
 
 export type FeedbackFormProps = {
   onSubmit?: (msg: string, option?: string) => Promise<any>
   onClose?: () => void
+  className?: string
   options?: string[]
 }
-const FeedbackForm = ({onSubmit, onClose, options}: FeedbackFormProps) => {
+const FeedbackForm = ({onSubmit, onClose, options, className}: FeedbackFormProps) => {
   const [selected, setSelected] = useState<string>()
   const [message, setMessage] = useState('')
   const [enabledSubmit, setEnabledSubmit] = useState(!options)
-  const [numClicks, setNumClicks] = useState(0)
   const clickCheckerRef = useOutsideOnClick(onClose)
 
-  useEffect(() => {
-    // Hide the form after 10 seconds if the user hasn't interacted with it
-    const timeoutId = setInterval(() => {
-      onClose && onClose()
-    }, 10000)
-
-    // Clear the timeout to prevent it from running if the component unmounts
-    return () => clearInterval(timeoutId)
-  }, [numClicks, onClose])
-
   const selectFeedback = (option: string) => {
     setSelected(option)
     setEnabledSubmit(true)
@@ -36,11 +26,7 @@ const FeedbackForm = ({onSubmit, onClose, options}: FeedbackFormProps) => {
   }
 
   return (
-    <div
-      ref={clickCheckerRef}
-      onClick={() => setNumClicks((current) => current + 1)}
-      className="col-5 feedback-form bordered"
-    >
+    <div ref={clickCheckerRef} className={'feedback-form bordered ' + (className ?? '')}>
       <span className="black small padding-bottom-32">What was the problem?</span>
       {options?.map((option) => (
         <Button
@@ -57,11 +43,11 @@ const FeedbackForm = ({onSubmit, onClose, options}: FeedbackFormProps) => {
 
       <textarea
         name="feedback-text"
-        className={['feedback-text bordered', !options ? 'no-options' : ''].join(' ')}
+        className={['feedback-text small bordered', !options ? 'no-options' : ''].join(' ')}
         placeholder="Leave a comment (optional)"
         onChange={(e) => setMessage(e.target.value)}
       />
-      <Button className="primary full-width" action={handleSubmit} disabled={!enabledSubmit}>
+      <Button className="primary full-width submit" action={handleSubmit} disabled={!enabledSubmit}>
         <p>Submit feedback</p>
       </Button>
     </div>

diff --git a/app/components/Feedback/feedback.css b/app/components/Feedback/feedback.css
@@ -1,23 +1,51 @@
-.feedback .composite-button {
-  width: fit-content;
+.feedback {
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+
+.thanks {
+  transition: opacity 200ms ease-in-out;
+  margin-left: 0.5rem;
+  pointer-events: none;
+}
+.show {
+  opacity: 1;
+}
+
+.hide {
+  opacity: 0;
 }
 
 .feedback-form {
-  position: relative;
-  z-index: 2;
-  max-width: 384px;
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  z-index: 200;
+  left: 0px;
+  bottom: calc(100% + 4px);
+  width: 384px;
   padding: var(--spacing-32);
-  margin-top: var(--spacing-8);
+  border-radius: var(--border-radius);
 }
 
 /* Comment to Nemo when he reviews: why didn't you just do this the way you did the settings buttons? */
 .select-option {
   height: var(--spacing-48);
-  padding: var(--spacing-8) var(--spacing-16);
+  border-radius: var(--border-radius);
   margin-bottom: var(--spacing-16);
   cursor: pointer;
   width: 100%;
 }
+
+.submit {
+  height: var(--spacing-48);
+  border-radius: var(--border-radius);
+  font-weight: 500 !important;
+  cursor: pointer;
+  width: 100%;
+}
+
 .select-option.selected {
   border: 1px solid var(--colors-teal-500);
 }
@@ -28,7 +56,6 @@
   padding: var(--spacing-12);
   margin: var(--spacing-40) 0;
   box-sizing: content-box;
-  background: pink;
 }
 .feedback-text.no-options {
   margin: var(--spacing-16) 0;