Feat: Show startnumber and improove style

package-lock.json

@@ -23,6 +23,7 @@
         "date-fns": "^2.29.1",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
+        "react-qrcode-logo": "^2.7.0",
         "react-router-dom": "^6.3.0",
         "react-scripts": "5.0.1",
         "typescript": "^4.7.4",
@@ -11972,6 +11973,11 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14238,6 +14244,11 @@
         "teleport": ">=0.2.0"
       }
     },
+    "node_modules/qrcode-generator": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
+      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
+    },
     "node_modules/qs": {
       "version": "6.10.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
@@ -14505,6 +14516,19 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "node_modules/react-qrcode-logo": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/react-qrcode-logo/-/react-qrcode-logo-2.7.0.tgz",
+      "integrity": "sha512-79Ce+1GlETAbu8fQGAoHczjvXjsm044+FeVAutu9lwJ/w0hRKRRPPHQRkPmXZK4aPi/H9Fqv+7P29VYQ9Yo2dA==",
+      "dependencies": {
+        "lodash.isequal": "^4.5.0",
+        "qrcode-generator": "^1.4.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.4.1",
+        "react-dom": ">=16.4.1"
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
@@ -25820,6 +25844,11 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
+    "lodash.isequal": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -27273,6 +27302,11 @@
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
     },
+    "qrcode-generator": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.4.4.tgz",
+      "integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw=="
+    },
     "qs": {
       "version": "6.10.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
@@ -27464,6 +27498,15 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
+    "react-qrcode-logo": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/react-qrcode-logo/-/react-qrcode-logo-2.7.0.tgz",
+      "integrity": "sha512-79Ce+1GlETAbu8fQGAoHczjvXjsm044+FeVAutu9lwJ/w0hRKRRPPHQRkPmXZK4aPi/H9Fqv+7P29VYQ9Yo2dA==",
+      "requires": {
+        "lodash.isequal": "^4.5.0",
+        "qrcode-generator": "^1.4.1"
+      }
+    },
     "react-refresh": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",

package.json

@@ -18,6 +18,7 @@
     "date-fns": "^2.29.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-qrcode-logo": "^2.7.0",
     "react-router-dom": "^6.3.0",
     "react-scripts": "5.0.1",
     "typescript": "^4.7.4",

src/components/Header.tsx

@@ -22,7 +22,7 @@ export default function Header() {
       <Container maxWidth={containerMaxWidth} className='header-container'>
         <Toolbar className='header-container'>
           <Link to='/' style={{ textDecoration: 'none', color: 'inherit' }}>
-            <img src='/logo192.png' className='header-icon'></img>
+            <img src='/badge-white.png' className='header-icon'></img>
           </Link>
           <Typography variant='h6'>{title}</Typography>
           {title === '' && <Skeleton height={20} width={200}></Skeleton>}

src/models/Participant.tsx

@@ -5,6 +5,7 @@ export interface ParticipantFromApi {
   PerId: string;
   firstname: string;
   lastname: string;
+  start_number: string;
   result_rank?: number;
   ['result_rank0']?: string;
   ['result_rank1']?: string;
@@ -21,6 +22,7 @@ export interface Participant {
   lastName: string;
   results: Result[];
   overallRank?: number;
+  startNumber: number;
 }
 
 export interface Result {
@@ -73,5 +75,6 @@ export function participantFromApiParticipant(
     lastName: fromApi.lastname,
     results: results,
     overallRank: fromApi.result_rank,
+    startNumber: parseInt(fromApi.start_number),
   };
 }

src/pages/SpeedFlowchartPage.tsx

@@ -4,11 +4,19 @@ import { useParams } from 'react-router-dom';
 import {
   convertResultsToSpeedFlowchartResult,
   SpeedFlowchartResult,
+  SpeedLane,
   SpeedRoundPair,
 } from '../data/SpeedFlowchart';
-import { Card, CardContent, Grid, Skeleton, Typography } from '@mui/material';
+import {
+  Card,
+  CardContent,
+  Chip,
+  Grid,
+  Skeleton,
+  Typography,
+} from '@mui/material';
 import { theme } from '../utils/Theme';
-
+import { QRCode } from 'react-qrcode-logo';
 interface SpeedRoundPairDummy extends SpeedRoundPair {
   dummy: boolean;
 }
@@ -90,9 +98,36 @@ export default function SpeedFlowchartPage() {
             <Grid
               container
               spacing={2}
-              sx={{ height: '100%', justifyContent: 'space-around' }}
+              sx={{
+                height: '100%',
+                justifyContent: 'space-around',
+                position: 'relative',
+              }}
               direction={'column'}
             >
+              {round.pairs.length === 2 && (
+                <div
+                  style={{
+                    position: 'absolute',
+                    width: '100%',
+                    display: 'flex',
+                    justifyContent: 'center',
+                  }}
+                >
+                  <QRCode
+                    value={`https://l.bluerock.dev/?comp=${competitionId}&cat=${categoryId}`}
+                    logoImage={'/logo192.png'}
+                    logoWidth={100}
+                    logoHeight={100}
+                    bgColor={theme.palette.background.default}
+                    fgColor={theme.palette.text.secondary}
+                    size={250}
+                    ecLevel={'H'}
+                    eyeRadius={5}
+                    qrStyle={'dots'}
+                  />
+                </div>
+              )}
               {round.pairs.map((pair, pairKey) => (
                 <Grid key={`flowchart-column-${roundKey}-pair-${pairKey}`} item>
                   <Card
@@ -107,27 +142,81 @@ export default function SpeedFlowchartPage() {
                         : undefined,
                     }}
                   >
-                    <CardContent>
+                    <CardContent
-                      <Typography
                       sx={{
-                          fontWeight: pair.winner === 'A' ? 'bold' : 'plain',
+                        padding: '10px !important',
-                          color: pair.winner === 'A' ? '#4CAF50' : '',
                       }}
                     >
-                        A: {pair.laneA?.participant.firstName}{' '}
+                      <Grid container spacing={2}>
-                        {pair.laneA?.participant.lastName}:{' '}
+                        {[
-                        {pair.laneA?.result?.result}
+                          ['A', pair.laneA],
+                          ['B', pair.laneB],
+                        ].map(([letter, lane]) => {
+                          lane = lane as SpeedLane;
+                          const textStyle = {
+                            fontWeight:
+                              pair.winner === letter ? 'bold' : 'plain',
+                            color: pair.winner === letter ? '#4CAF50' : '',
+                            fontSize: '25px',
+                          };
+
+                          const gridItemStyle = {
+                            paddingTop:
+                              letter === 'B' ? '0 !important' : undefined,
+                          };
+                          return (
+                            <>
+                              <Grid sx={gridItemStyle} xs={1} item>
+                                <Typography sx={textStyle}>
+                                  {lane?.participant.results[0].rank}{' '}
                                 </Typography>
+                              </Grid>
+
+                              <Grid
+                                sx={{ ...gridItemStyle, display: 'flex' }}
+                                xs={8.5}
+                                item
+                              >
                                 <Typography
                                   sx={{
-                          fontWeight: pair.winner === 'B' ? 'bold' : 'plain',
+                                    ...textStyle,
-                          color: pair.winner === 'B' ? '#4CAF50' : '',
+                                    overflow: 'clip',
+                                    whiteSpace: 'nowrap',
+                                    maxWidth: '80%',
+                                    textOverflow: 'ellipsis',
                                   }}
                                 >
-                        B: {pair.laneB?.participant.firstName}{' '}
+                                  {lane?.participant.firstName}{' '}
-                        {pair.laneB?.participant.lastName}:{' '}
+                                  {lane?.participant.lastName}
-                        {pair.laneB?.result?.result}
                                 </Typography>
+                                <Chip
+                                  label={lane?.participant.startNumber}
+                                  sx={{
+                                    height: '26px',
+                                    marginLeft: '10px',
+                                  }}
+                                  variant='outlined'
+                                />
+                              </Grid>
+
+                              <Grid sx={gridItemStyle} xs={2} item>
+                                <Typography sx={textStyle}>
+                                  {' '}
+                                  {lane?.result?.result}
+                                </Typography>
+                              </Grid>
+
+                              {letter === 'A' && (
+                                <Grid
+                                  xs={12}
+                                  item
+                                  sx={{ height: 0, paddingTop: '0 !important' }}
+                                ></Grid>
+                              )}
+                            </>
+                          );
+                        })}
+                      </Grid>
                     </CardContent>
                   </Card>
                 </Grid>