Merge branch 'main' into improve-stories

Author: Roshanjossey

src/components/Button.tsx

@@ -3,13 +3,31 @@ import { ReactNode } from 'react'
 type ButtonProps = {
   children: ReactNode
   onClick?: () => void
+  color?: 'primary' | 'secondary' | 'transparent'
+  variant?: 'contained' | 'outlined' | 'text'
 }
 
-const Button = ({ children, onClick: onClick }: ButtonProps) => {
+const Button = ({
+  children,
+  onClick: onClick,
+  color = 'primary',
+  variant = 'contained',
+}: ButtonProps) => {
+  const getColorStyles = (color: string) => {
+    if (color === 'primary') {
+      return 'text-white bg-blue-700 hover:bg-blue-800 focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800'
+    }
+    if (color === 'transparent') {
+      return 'focus:ring-transparent'
+    }
+    return ''
+  }
   return (
     <button
       type="button"
-      className="text-white font-bold bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300  rounded-lg text-sm px-5 py-2.5 text-center mr-2 mb-2 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
+      className={` focus:ring-4 rounded-lg text-sm px-5 py-2.5 text-center mr-2 mb-2 ${getColorStyles(
+        color
+      )}  `}
       onClick={onClick}
     >
       {children}

src/components/UserDetails/Badges/Hexagon.tsx

@@ -15,22 +15,10 @@ export enum hexagonBackground {
 
 export default function Hexagon({ children, size, color }: any) {
   return (
-    <div className="border-container">
-      <div className={`hexagon-container ${color}`}>
-        <div className="content">{children}</div>
-      </div>
+    <div className={`hexagon-container ${color}`}>
+      <div className="content">{children}</div>
       <style jsx>
         {`
-          .border-container {
-            position: relative;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            width: ${size * 0.645 * 1.1}rem;
-            height: ${size * 1.1}rem;
-            background: #ddd;
-            border-radius: ${size / 8}rem;
-          }
           .hexagon-container {
             position: relative;
             width: ${size * 0.645}rem;
@@ -39,14 +27,13 @@ export default function Hexagon({ children, size, color }: any) {
             display: flex;
             justify-content: center;
             align-items: center;
+            filter: drop-shadow(0.25rem 0.25rem 0.25rem rgba(0, 0, 0, 0.5));
           }
           .hexagon-container,
           .hexagon-container:before,
           .hexagon-container:after {
             z-index: 1;
           }
-          .border-container:before,
-          .border-container:after,
           .hexagon-container:before,
           .hexagon-container:after {
             position: absolute;
@@ -61,11 +48,9 @@ export default function Hexagon({ children, size, color }: any) {
             bottom: 0;
             margin: auto;
           }
-          .border-container:before,
           .hexagon-container:before {
             transform: rotate(60deg);
           }
-          .border-container:after,
           .hexagon-container:after {
             transform: rotate(-60deg);
           }

src/components/comment/Comments.tsx

@@ -1,10 +1,9 @@
 import { graphql, usePaginationFragment } from 'react-relay'
-import { Comments_story$key } from '../../queries/__generated__/Comments_story.graphql'
 import NewComment from './NewComment'
 import Comment from './Comment'
 
 type CommentsProps = {
-  story: Comments_story$key
+  story: any
 }
 
 const Comments = ({ story }: CommentsProps) => {

src/components/navbar/ThemeButton.tsx

@@ -21,5 +21,33 @@ export default function ThemeButton() {
     setDarkMode(!darkMode)
   }
 
-  return <Button onClick={onClick}>toggle dark mode</Button>
+  return (
+    <Button onClick={onClick} color="transparent">
+      {darkMode ? (
+        <svg
+          id="day"
+          xmlns="http://www.w3.org/2000/svg"
+          width="24"
+          height="24"
+          style={{ fill: '#fff' }}
+        >
+          <path d="M18.1 5.1c0 .3-.1.6-.3.9l-1.4 1.4-.9-.8 2.2-2.2c.3.1.4.4.4.7zm-.5 5.3h3.2c0 .3-.1.6-.4.9s-.5.4-.8.4h-2v-1.3zm-6.2-5V2.2c.3 0 .6.1.9.4s.4.5.4.8v2h-1.3zm6.4 11.7c-.3 0-.6-.1-.8-.3l-1.4-1.4.8-.8 2.2 2.2c-.2.2-.5.3-.8.3zM6.2 4.9c.3 0 .6.1.8.3l1.4 1.4-.8.9-2.2-2.3c.2-.2.5-.3.8-.3zm5.2 11.7h1.2v3.2c-.3 0-.6-.1-.9-.4s-.4-.5-.4-.8l.1-2zm-7-6.2h2v1.2H3.2c0-.3.1-.6.4-.9s.5-.3.8-.3zM6.2 16l1.4-1.4.8.8-2.2 2.2c-.2-.2-.3-.5-.3-.8s.1-.6.3-.8z" />
+          <circle cx="12" cy="11" r="4" />
+        </svg>
+      ) : (
+        <svg
+          id="night"
+          xmlns="http://www.w3.org/2000/svg"
+          width="24"
+          height="24"
+          viewBox="0 0 24 24"
+        >
+          <path
+            d="M19.1 17.5c-3.3 1.4-7.1-.2-8.5-3.5-1.4-3.3.2-7.1 3.5-8.5.2-.1.5-.2.7-.3-1.6-.4-3.2-.3-4.8.4C6 7.3 4 12 5.7 16c1.7 4.1 6.4 6 10.5 4.3 1.7-.7 3-1.9 3.8-3.4-.3.3-.6.4-.9.6z"
+            fill="#444;"
+          />
+        </svg>
+      )}
+    </Button>
+  )
 }