chore: reworks

Signed-off-by: Antonio Sonis <anthonysonis@gmail.com>

Author: tonysnowboardunderthebridge

src/components/Button.jsx

@@ -7,7 +7,7 @@ import PlatformaticIcon from './PlatformaticIcon'
 import { SIZES, COLORS_BUTTON, BOX_SHADOW, UNDERLINE, HOVER_EFFECTS_BUTTONS, BACKGROUND_COLOR_OPAQUE, MAIN_DARK_BLUE, LARGE } from './constants'
 
 function Button ({
-  icon,
+  classes,
   label,
   color,
   backgroundColor,
@@ -21,30 +21,31 @@ function Button ({
   selected,
   ...rest
 }) {
-  let className = `${styles.button} ${commonStyles['background-color-' + backgroundColor]} ${styles['color-' + color]} ${styles['button-' + size]}`
-  if (!bordered) className += ` ${styles['no-border']}`
+  let buttonClassName = classes
+  buttonClassName += ` ${styles.button} ${commonStyles['background-color-' + backgroundColor]} ${styles['color-' + color]} ${styles['button-' + size]}`
+  if (!bordered) buttonClassName += ` ${styles['no-border']}`
   if (disabled) {
-    className += ` ${styles.disabled}`
+    buttonClassName += ` ${styles.disabled}`
   } else {
     switch (hoverEffect) {
       case BACKGROUND_COLOR_OPAQUE:
-        className += ' ' + commonStyles[`hover-${BACKGROUND_COLOR_OPAQUE}-${color}`]
+        buttonClassName += ' ' + commonStyles[`hover-${BACKGROUND_COLOR_OPAQUE}-${color}`]
         break
       case BOX_SHADOW:
-        className += ' ' + styles[`hover-${BOX_SHADOW}-${backgroundColor}`]
+        buttonClassName += ' ' + styles[`hover-${BOX_SHADOW}-${backgroundColor}`]
         break
       case UNDERLINE:
-        className += ` ${styles['underline-effect']}`
+        buttonClassName += ` ${styles['underline-effect']}`
         break
       default:
         break
     }
   }
-  if (bold) className += ` ${styles.fontBold}`
-  if (fullWidth) className += ` ${styles.fullWidth}`
-  if (selected) className += ' ' + commonStyles[`selected-background-color-${color}`]
+  if (bold) buttonClassName += ` ${styles.fontBold}`
+  if (fullWidth) buttonClassName += ` ${styles.fullWidth}`
+  if (selected) buttonClassName += ' ' + commonStyles[`selected-background-color-${color}`]
   return (
-    <button className={className} disabled={disabled} alt={label} {...rest}>
+    <button className={buttonClassName} disabled={disabled} alt={label} {...rest}>
       {platformaticIcon ? <PlatformaticIcon iconName={platformaticIcon.iconName} color={platformaticIcon.color} data-testid='button-icon' onClick={null} /> : null}
       <span className={styles.label}>{label}</span>
     </button>
@@ -53,9 +54,9 @@ function Button ({
 
 Button.propTypes = {
   /**
-   * Icon
+   * classes
    */
-  icon: PropTypes.object,
+  classes: PropTypes.string,
   /**
    * label
    */
@@ -106,6 +107,7 @@ Button.propTypes = {
 }
 
 Button.defaultProps = {
+  classes: '',
   label: '',
   color: MAIN_DARK_BLUE,
   backgroundColor: 'transparent',

src/components/Checkbox.jsx

@@ -1,11 +1,31 @@
 'use strict'
 import React from 'react'
+import PropTypes from 'prop-types'
 import styles from './Checkbox.module.css'
-export default function Checkbox (props) {
-  const { disabled, ...rest } = props
-  let className = `${styles.checkbox}`
+import { MAIN_DARK_BLUE, WHITE } from './constants'
+function Checkbox ({ disabled, color, ...rest }) {
+  let className = `${styles.checkbox} `
+  className += styles[`checkbox--${color}`]
   if (disabled) className += ` ${styles.disabled}`
   return (
     <input type='checkbox' className={className} disabled={disabled} {...rest} />
   )
 }
+
+Checkbox.propTypes = {
+  /**
+   * disabled
+   */
+  disabled: PropTypes.bool,
+  /**
+   * color
+   */
+  color: PropTypes.oneOf([WHITE, MAIN_DARK_BLUE])
+}
+
+Checkbox.defaultProps = {
+  disabled: false,
+  color: MAIN_DARK_BLUE
+}
+
+export default Checkbox

src/components/Checkbox.module.css

@@ -1,9 +1,21 @@
 .checkbox {
-  @apply border border-light-green p-2 rounded-sm bg-main-dark-blue relative inline-block h-2 w-2;
+  @apply border p-2 rounded-sm relative inline-block h-2 w-2;
   -webkit-appearance: none;
 }
 
-.checkbox:checked {
+.checkbox--main-dark-blue {
+  @apply border-light-green bg-main-dark-blue
+}
+
+.checkbox--white {
+  @apply border-main-dark-blue bg-white
+}
+
+.checkbox--white:checked {
+  @apply bg-main-dark-blue text-white;
+}
+
+.checkbox--main-dark-blue:checked {
 	@apply bg-light-green text-main-dark-blue;
 }
 

src/components/Common.module.css

@@ -34,13 +34,23 @@
 .text--white {
   @apply text-white
 }
+.text--dark-green {
+  @apply text-dark-green;
+}
 .text--main-green {
-  @apply text-main-green
+  @apply text-main-green;
 }
 .text--main-dark-blue {
   @apply text-main-dark-blue;
 }
 
+.text--base {
+  @apply text-base
+}
+.text--xs {
+  @apply text-xs
+}
+
 .background-color-main-green {
   @apply bg-main-green !important;
 }

src/components/HorizontalSeparator.jsx

@@ -1,9 +1,12 @@
 'use strict'
 import React from 'react'
+import PropTypes from 'prop-types'
+import commonStyles from './Common.module.css'
+import { DARK_GREEN, MAIN_DARK_BLUE } from './constants'
 import styles from './HorizontalSeparator.module.css'
-export default function HorizontalSeparator ({ marginTop = 4, marginBottom = 4, color = 'dark-green', opacity = 1 }) {
+function HorizontalSeparator ({ marginTop, marginBottom, color, opacity }) {
   function getClassName () {
-    let className = `text-${color} `
+    let className = commonStyles[`text--${color}`] + ' '
     // margin
     className += (marginTop === marginBottom ? `${styles['marginY-' + marginTop]}` : `${styles['marginT-' + marginTop]} ${styles['marginB-' + marginBottom]}`)
     // opacity
@@ -13,3 +16,31 @@ export default function HorizontalSeparator ({ marginTop = 4, marginBottom = 4,
 
   return <hr className={getClassName()} />
 }
+
+HorizontalSeparator.propTypes = {
+  /**
+   * marginTop
+   */
+  marginTop: PropTypes.number,
+  /**
+   * marginBottom
+   */
+  marginBottom: PropTypes.number,
+  /**
+   * color
+   */
+  color: PropTypes.oneOf([DARK_GREEN, MAIN_DARK_BLUE]),
+  /**
+   * opacity
+   */
+  opacity: PropTypes.number
+}
+
+HorizontalSeparator.defaultProps = {
+  marginTop: 4,
+  marginBottom: 4,
+  color: DARK_GREEN,
+  opacity: 1
+}
+
+export default HorizontalSeparator

src/components/Sidebar.jsx

@@ -111,7 +111,7 @@ function Sidebar (props) {
                 {!collapsed && <span className={styles.item}>{addTitle}</span>}
               </button>
             </div>
-            <HorizontalSeparator marginBottom='2' marginTop='2' />
+            <HorizontalSeparator marginBottom={2} marginTop={2} />
 
             <div className={styles.bottom}>
               <Button label={labelButtonSettings} color={WHITE} onClick={onClickSettings} platformaticIcon={{ iconName: 'GearIcon', color: WHITE }} fullWidth bold size={MEDIUM} hoverEffect={BACKGROUND_COLOR_OPAQUE} />

src/components/TextWithLabel.jsx

@@ -1,11 +1,48 @@
 import React from 'react'
+import PropTypes from 'prop-types'
+import { FONT_BASE, FONT_XS, MAIN_DARK_BLUE, WHITE } from './constants'
+import commonStyles from './Common.module.css'
 import styles from './TextWithLabel.module.css'
-export default function TextWithLabel ({ label, text, children }) {
+function TextWithLabel ({ label, text, children, color, fontSize }) {
+  const className = commonStyles[`text--${color}`] + ' ' + commonStyles[`text--${fontSize}`]
   return (
-    <div className={styles.container}>
+    <div className={className}>
       <span className={styles.label}>{label}:</span>
       {text && <span className={styles.text}>{text}</span>}
       {children && <span>{children}</span>}
     </div>
   )
 }
+
+TextWithLabel.propTypes = {
+  /**
+   * label
+   */
+  label: PropTypes.string,
+  /**
+   * text
+   */
+  text: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  /**
+   * children
+   */
+  children: PropTypes.node,
+  /**
+   * white
+   */
+  color: PropTypes.oneOf([WHITE, MAIN_DARK_BLUE]),
+  /**
+   * Font Size
+   */
+  fontSize: PropTypes.oneOf([FONT_BASE, FONT_XS])
+}
+
+TextWithLabel.defaultProps = {
+  label: '',
+  text: '',
+  children: null,
+  color: WHITE,
+  fontSize: FONT_BASE
+}
+
+export default TextWithLabel

src/components/TextWithLabel.module.css

@@ -1,6 +1,3 @@
-.container {
-  @apply text-white
-}
 .label {
   @apply font-thin mr-2;
 }

src/components/VerticalSeparator.jsx

@@ -1,5 +1,23 @@
 'use strict'
 import React from 'react'
-export default function VerticalSeparator () {
-  return <span className='text-dark-green my-auto mx-5'> | </span>
+import PropTypes from 'prop-types'
+import { DARK_GREEN, MAIN_DARK_BLUE } from './constants'
+import commonStyles from './Common.module.css'
+
+function VerticalSeparator ({ color }) {
+  const className = commonStyles[`text--${color}`] + ' my-auto mx-5'
+  return <span className={className}> | </span>
 }
+
+VerticalSeparator.propTypes = {
+  /**
+   * color
+   */
+  color: PropTypes.oneOf([DARK_GREEN, MAIN_DARK_BLUE])
+}
+
+VerticalSeparator.defaultProps = {
+  color: DARK_GREEN
+}
+
+export default VerticalSeparator

src/components/constants.js

@@ -1,5 +1,6 @@
 export const WHITE = 'white'
 export const MAIN_DARK_BLUE = 'main-dark-blue'
+export const DARK_GREEN = 'dark-green'
 export const MAIN_GREEN = 'main-green'
 export const ERROR_RED = 'error-red'
 export const WARNING_YELLOW = 'warning-yellow'
@@ -20,7 +21,7 @@ export const MODAL_SIZES = [SMALL, MEDIUM, FULL_WIDTH]
 
 export const COLORS_ICON = [MAIN_GREEN, WHITE, MAIN_DARK_BLUE, ERROR_RED, WARNING_YELLOW]
 export const COLORS_BUTTON = [MAIN_GREEN, 'dark-green', 'light-green', MAIN_DARK_BLUE, 'dark-blue', 'light-blue', WHITE, ERROR_RED, 'tertiary-blue', 'transparent']
-export const COLORS_BORDERED_BOX = [MAIN_GREEN, ERROR_RED, WHITE, 'dark-blue', WARNING_YELLOW, 'transparent']
+export const COLORS_BORDERED_BOX = [MAIN_GREEN, ERROR_RED, WHITE, 'dark-blue', MAIN_DARK_BLUE, WARNING_YELLOW, 'transparent']
 
 export const MODAL_POPUP = 'popup'
 export const MODAL_COVER = 'cover'
@@ -29,3 +30,10 @@ export const MODAL_LAYOUTS = [MODAL_POPUP, MODAL_COVER]
 export const FREE = 'free'
 export const BASIC = 'basic'
 export const PROFILE = ['', FREE, BASIC]
+
+export const FONT_BASE = 'base'
+export const FONT_XS = 'xs'
+
+export const ROLE_ADMIN = 'admin'
+export const ROLE_USER = 'user'
+export const ROLE_OWNER = 'owner'