Beta conflicts (#27)

* conflict

* conflicts

* resolved issue with imports

* terminal header

Author: luckmer

src/App.tsx

@@ -3,7 +3,7 @@ import { lazy, onMount, Suspense } from 'solid-js'
 import { useAppContextMain } from './store/context/main'
 
 const ToastNotificationWindow = lazy(() => import('@components/Notifications'))
-const Modals = lazy(() => import('@containers/Modals/Index'))
+const Modals = lazy(() => import('@containers/Modals'))
 const AppRoutes = lazy(() => import('@routes/Routes'))
 
 const App = () => {

src/components/Board/Board/index.tsx …/components/Board/DefaultBoard/index.tsxsrc/components/Board/Board/index.tsx renamed to src/components/Board/DefaultBoard/index.tsx src/components/Board/Board/index.tsx renamed to src/components/Board/DefaultBoard/index.tsx

@@ -8,7 +8,7 @@ export interface IProps {
     isActive?: boolean
 }
 
-export const Board: Component<IProps> = (props) => {
+export const DefaultBoard: Component<IProps> = (props) => {
     return (
         <button
             classList={{
@@ -34,4 +34,4 @@ export const Board: Component<IProps> = (props) => {
     )
 }
 
-export default Board
+export default DefaultBoard

…mponents/Buttons/DefaultButton/index.tsx src/components/Buttons/Button/index.tsxsrc/components/Buttons/DefaultButton/index.tsx renamed to src/components/Buttons/Button/index.tsx src/components/Buttons/DefaultButton/index.tsx renamed to src/components/Buttons/Button/index.tsx

@@ -1,4 +1,4 @@
-import { Board } from '@components/Board/Board'
+import { DefaultBoard } from '@components/Board/DefaultBoard'
 import Typography from '@components/Typography'
 import { IDropdownList } from '@interfaces/interfaces'
 import { classNames } from '@src/utils'
@@ -41,7 +41,7 @@ const DropdownList: Component<IProps> = (props) => {
                     }>
                     <For each={props.data}>
                         {(data) => (
-                            <Board
+                            <DefaultBoard
                                 {...data}
                                 isActive={data.label === props.activeElement}
                                 onClick={() => {

…ponents/Buttons/CheckboxButton/Index.tsx src/components/Buttons/Checkbox/index.tsxsrc/components/Buttons/CheckboxButton/Index.tsx renamed to src/components/Buttons/Checkbox/index.tsx src/components/Buttons/CheckboxButton/Index.tsx renamed to src/components/Buttons/Checkbox/index.tsx

@@ -1,4 +1,4 @@
-import { Button } from '@components/Buttons/DefaultButton'
+import { Button } from '@components/Buttons/Button'
 import { classNames } from '@src/utils'
 import { Component, Show } from 'solid-js'