Merge pull request #2508 from andrewbaldwin44/feature/about-section

Update the About Section
locustio · Dec 8, 2023 · f2cd9ab · f2cd9ab
2 parents 59cf6a8 + be754be
commit f2cd9ab
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 20 deletions.
diff --git a/docs/developing-locust.rst b/docs/developing-locust.rst
@@ -184,7 +184,7 @@ The frontend can additionally be built using make:
 Linting
 -------
 
-Run ``yarn lint`` to detect lint failures in the frontend project. Running ``yarn lint --fix`` will resolve any issues that are automatically resolvable. Your IDE can aditionally be configured with ESLint to resolve these issues on save.
+Run ``yarn lint`` to detect lint failures in the frontend project. Running ``yarn lint --fix`` will resolve any issues that are automatically resolvable. Your IDE can additionally be configured with ESLint to resolve these issues on save.
 
 Formatting
 ----------

diff --git a/locust/webui/dist/assets/index-e50b96a2.js → locust/webui/dist/assets/index-86565e29.js b/locust/webui/dist/assets/index-e50b96a2.js → locust/webui/dist/assets/index-86565e29.js
diff --git a/locust/webui/dist/index.html b/locust/webui/dist/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
 
     <title>Locust</title>
-    <script type="module" crossorigin src="/assets/index-e50b96a2.js"></script>
+    <script type="module" crossorigin src="/assets/index-86565e29.js"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/locust/webui/src/components/Layout/Footer/About.tsx b/locust/webui/src/components/Layout/Footer/About.tsx
@@ -25,6 +25,10 @@ const authors = [
     name: 'Hugo Heyman',
     social: { handle: '@hugoheyman', link: 'https://twitter.com/hugoheyman/' },
   },
+  {
+    name: 'Lars Holmberg',
+    social: { handle: '@cyberw', link: 'https://github.com/cyberw' },
+  },
 ];
 
 export default function About() {
@@ -40,7 +44,7 @@ export default function About() {
       </Box>
       <Modal onClose={() => setOpen(false)} open={open}>
         <div>
-          <Typography component='h2' variant='h4'>
+          <Typography component='h2' mb={1} variant='h4'>
             About
           </Typography>
           <Typography component='p' variant='subtitle1'>
@@ -49,13 +53,21 @@ export default function About() {
             concept of Locust classes and made it work distributed across multiple machines.
           </Typography>
           <Typography component='p' sx={{ mt: 2 }} variant='subtitle1'>
-            Jonatan, Carl and Joakim Hamrén has continued the development of Locust at their job,
-            ESN Social Software, who have adopted Locust as an inhouse Open Source project.
+            Jonatan, Carl and Joakim Hamrén then continued the development of Locust at their job,
+            ESN Social Software, who adopted Locust as an inhouse Open Source project.
+          </Typography>
+          <Typography component='p' sx={{ mt: 2 }} variant='subtitle1'>
+            In 2019, the project changed ownership and has since been picked up and maintained by
+            Lars Holmberg.
+          </Typography>
+          <Typography component='p' sx={{ mt: 2 }} variant='subtitle1'>
+            Locust is now used by millions of users around the world and hundreds of developers
+            contribute to its development.
           </Typography>
         </div>
 
         <div>
-          <Typography component='h2' variant='h4'>
+          <Typography component='h2' mb={1} variant='h4'>
             Authors and Copyright
           </Typography>
           <Box sx={{ display: 'flex', flexDirection: 'column', rowGap: 0.5 }}>
@@ -73,7 +85,7 @@ export default function About() {
         </div>
 
         <div>
-          <Typography component='h2' variant='h4'>
+          <Typography component='h2' mb={1} variant='h4'>
             License
           </Typography>
           <Typography component='p' variant='subtitle1'>
@@ -82,14 +94,14 @@ export default function About() {
         </div>
 
         <div>
-          <Typography component='h2' variant='h4'>
+          <Typography component='h2' mb={1} variant='h4'>
             Version
           </Typography>
           <Link href={`https://github.com/locustio/locust/releases/tag/${version}`}>{version}</Link>
         </div>
 
         <div>
-          <Typography component='h2' variant='h4'>
+          <Typography component='h2' mb={1} variant='h4'>
             Website
           </Typography>
           <Link href='https://locust.io/'>https://locust.io</Link>

diff --git a/locust/webui/src/components/Modal/Modal.tsx b/locust/webui/src/components/Modal/Modal.tsx
@@ -22,7 +22,8 @@ export default function Modal({ open, onClose, children }: IModal) {
           rowGap: 2,
           bgcolor: 'background.paper',
           boxShadow: 24,
-          borderRadius: 2,
+          borderRadius: 4,
+          border: '3px solid black',
           p: 4,
         }}
       >