Merge pull request #204 from Andres2D/feature-final-score

Feature final score
Andres2D · Feb 12, 2023 · db71c6f · db71c6f · vercel · Feb 12, 2023
2 parents 86164d6 + 9292108
commit db71c6f
Show file tree

Hide file tree

Showing 12 changed files with 356 additions and 116 deletions.
diff --git a/components/layout/modal-alert.tsx b/components/layout/modal-alert.tsx
@@ -8,7 +8,7 @@ import {
   Button
 } from '@chakra-ui/react';
 import type { NextPage } from 'next';
-import { MutableRefObject, useRef } from 'react';
+import { Children, MutableRefObject, useRef } from 'react';
 
 interface Props {
   isOpen: boolean;
@@ -18,6 +18,8 @@ interface Props {
   description?: string;
   cancelLabel?: string;
   continueLabel?: string;
+  actionColor?: string;
+  children?: JSX.Element;
 }
 
 const ModalAlert: NextPage<Props> = (
@@ -26,9 +28,11 @@ const ModalAlert: NextPage<Props> = (
     onClose, 
     onContinue,
     title = 'Delete',
-    description = 'Are you sure?',
+    description,
     cancelLabel = 'Cancel',
-    continueLabel = 'Delete'
+    continueLabel = 'Delete',
+    actionColor = 'red',
+    children
   }) => {
 
   const cancelRef = useRef() as MutableRefObject<HTMLButtonElement>;
@@ -47,13 +51,14 @@ const ModalAlert: NextPage<Props> = (
 
           <AlertDialogBody>
             { description }
+            { children }
           </AlertDialogBody>
 
           <AlertDialogFooter>
             <Button ref={cancelRef} onClick={onClose}>
               { cancelLabel }
             </Button>
-            <Button colorScheme='red' onClick={onContinue} ml={3}>
+            <Button colorScheme={actionColor} onClick={onContinue} ml={3}>
               { continueLabel }
             </Button>
           </AlertDialogFooter>

diff --git a/components/layout/navbar.tsx b/components/layout/navbar.tsx
@@ -99,7 +99,7 @@ const Navbar: NextPage = () => {
             >
               Log out
             </Button>
-            <p>Version 2.4.6</p>
+            <p>Version 2.5.0</p>
           </DrawerFooter>
         </DrawerContent>
       </Drawer>

diff --git a/components/matches/match-list.module.scss b/components/matches/match-list.module.scss
@@ -63,6 +63,18 @@
   }
 }
 
+.fullTime {
+  display: flex;
+  justify-content: space-around;
+
+  .formControl {
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    width: 30%;
+  }
+}
+
 
 @media (max-width: $medium-small-device) {
   .section {