Skip to content

Cleanup2025 2 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mathiasekstedt merged 3 commits into from
Dec 12, 2025
Merged

Cleanup2025 2 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bd023e
cleanup2025-heading
mathiasekstedt Dec 11, 2025
da78524
more cleaning
mathiasekstedt Dec 11, 2025
6a175f7
Merge branch 'react-src' into cleanup2025-2
mathiasekstedt Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions src/components/desktopcontainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import React, { useState } from 'react';
import { Link, useLocation } from 'react-router-dom';
import Heading from './heading';
import {
Button,
Container,
Menu,
Segment,
Visibility,
} from 'semantic-ui-react';
Expand Down Expand Up @@ -51,43 +48,6 @@ const DesktopContainer = ({ children }) => {
}}
vertical
>
<Menu
fixed={fixed ? 'top' : null}
inverted
pointing={!fixed}
secondary={!fixed}
size="large"
>
<Container>
<Menu.Item active={location.hash === ''}>
<Link to="/">Home</Link>
</Menu.Item>
<Menu.Item active={location.hash === '#what'}>
<Link to="/#what">About</Link>
</Menu.Item>
<Menu.Item active={location.hash === '#learnmore'}>
<Link to="/#learnmore">Learn more</Link>
</Menu.Item>
<Menu.Item active={location.hash === '#who'}>
<Link to="/#who">Who uses MAL?</Link>
</Menu.Item>
<Menu.Item active={location.hash === '#resources'}>
<Link to="/#resources">Resources</Link>
</Menu.Item>
<Menu.Item>
<Button
as="a"
href="https://github.com/mal-lang/exampleLang/blob/master/README.md"
target="_blank"
primary
size="large"
>
Get Started
</Button>
</Menu.Item>
</Container>
</Menu>
<Heading />
</Segment>
</Visibility>

Expand Down
11 changes: 5 additions & 6 deletions src/components/heading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,12 @@ const HeaderContent = () => (
<img
alt="MAL logo"
style={{
width: '2em',
height: '2em',
width: '4em',
height: '4em',
marginRight: '0.3em',
}}
src="/helmet.svg"
/>
<p style={{ marginTop: '0.5em' }}>M A L</p>
</div>
);
const Heading = ({ mobile }) => (
Expand All @@ -49,7 +48,7 @@ const Heading = ({ mobile }) => (
/>
<Header
as="h2"
content="Meta Attack Language"
content="Meta Attack Language - M A L"
inverted
style={{
fontSize: mobile ? '1.5em' : '1.7em',
Expand All @@ -59,15 +58,15 @@ const Heading = ({ mobile }) => (
/>
<Header
as="h3"
content="The open source platform for creation of cyber threat modeling systems"
content="The open source platform cyber threat modeling and attack simulations"
inverted
style={{
fontStyle: 'italic',
}}
/>
<Button
as="a"
href="https://github.com/mal-lang/exampleLang/blob/master/README.md"
href="https://github.com/mal-lang"
target="_blank"
primary
size="huge"
Expand Down
21 changes: 0 additions & 21 deletions src/components/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import React from 'react';
import ResponsiveContainer from './responsivecontainer';
import {
Button,
Container,
Divider,
Icon,
Expand All @@ -33,26 +32,6 @@ const referenceButtonStyle = {
const Layout = () => (
<ResponsiveContainer>
<Segment style={{ paddingBottom: '8em' }} textAlign="center" basic>
<Divider id="resources" horizontal>
Resources
</Divider>
<Container text>
<List link>
<List.Item>
<Button
as="a"
style={referenceButtonStyle}
href="https://github.com/mal-lang"
target="_blank"
primary
size="huge"
>
Get Started!
<Icon name="right arrow" />
</Button>
</List.Item>
</List>
</Container>
</Segment>
<Segment style={{ paddingBottom: '8em' }} textAlign="center" basic>
<Divider id="acknowledgements" horizontal>
Expand Down
57 changes: 0 additions & 57 deletions src/components/mobilecontainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import React, { useState } from 'react';
import Heading from './heading';
import { Link, useLocation } from 'react-router-dom';
import {
Button,
Container,
Icon,
Menu,
Expand Down Expand Up @@ -50,62 +49,6 @@ const MobileContainer = ({ children }) => {
vertical
visible={sidebarIsOpen}
>
<Menu.Item
fitted={true}
onClick={handleSidebarHide}
active={location.hash === ''}
>
<Link to="/">
<div style={menuItemStyle}>Home</div>
</Link>
</Menu.Item>
<Menu.Item
fitted={true}
onClick={handleSidebarHide}
active={location.hash === '#what'}
>
<Link to="/#what">
<div style={menuItemStyle}>About</div>
</Link>
</Menu.Item>
<Menu.Item
fitted={true}
onClick={handleSidebarHide}
active={location.hash === '#learnmore'}
>
<Link to="/#learnmore">
<div style={menuItemStyle}>Learn more</div>
</Link>
</Menu.Item>
<Menu.Item
fitted={true}
onClick={handleSidebarHide}
active={location.hash === '#who'}
>
<Link to="/#who">
<div style={menuItemStyle}>Who uses MAL?</div>
</Link>
</Menu.Item>
<Menu.Item
fitted={true}
onClick={handleSidebarHide}
active={location.hash === '#resources'}
>
<Link to="/#resources">
<div style={menuItemStyle}>Resources</div>
</Link>
</Menu.Item>
<Menu.Item>
<Button
as="a"
href="https://github.com/mal-lang/exampleLang/blob/master/README.md"
target="_blank"
primary
size="large"
>
Get Started
</Button>
</Menu.Item>
</Sidebar>

<Sidebar.Pusher dimmed={sidebarIsOpen}>
Expand Down