Skip to content

Commit

Permalink
Merge pull request #29 from meese-enterprises/new-direction
Browse files Browse the repository at this point in the history
Minimalist site appearance
  • Loading branch information
ajmeese7 authored Nov 8, 2024
2 parents 77674a2 + 7d1786a commit fbcb29f
Show file tree
Hide file tree
Showing 14 changed files with 7,377 additions and 8,448 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,17 @@ GraphQL allows our site to request only the data that it needs and only when it
- Support Drupal and display badge: https://www.drupal.org/association/campaign/become-a-member-2021
-->

## Development

```sh
# Use the correct Node version
nvm install
nvm use

# Install dependencies
yarn install

# Run the development server
yarn run start
```
4 changes: 2 additions & 2 deletions gatsby-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import "./src/styles/scramble.css";
import "./src/styles/modal.css";
import "./src/styles/imageGlitch.css";

// @ts-ignores
import wrapPageElement from "./src/utils/wrapPageElement";
import { wrapPageElement } from "./src/utils/wrapPageElement";

const onClientEntry = (_args) => {
Modal.setAppElement("#___gatsby");
};
Expand Down
69 changes: 36 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "meese.enterprises",
"name": "@meese-enterprises/website",
"private": true,
"version": "0.0.0",
"license": "MIT",
Expand All @@ -13,44 +13,47 @@
"check-types": "tsc -p . --noEmit"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.15",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@rebass/preset": "^4.0.5",
"@tippy.js/react": "^3.1.1",
"assert": "^2.0.0",
"babel-plugin-styled-components": "^2.0.6",
"gatsby": "^4.10.1",
"gatsby-plugin-image": "^2.10.0",
"gatsby-plugin-manifest": "^4.10.1",
"gatsby-plugin-react-helmet": "^5.10.0",
"gatsby-plugin-sharp": "^4.10.1",
"gatsby-plugin-styled-components": "^5.10.0",
"gatsby-plugin-typescript": "^4.10.0",
"gatsby-source-contentful": "^7.8.1",
"gatsby-source-medium": "^4.10.0",
"gatsby-transformer-remark": "^5.10.1",
"react": "^17.0.2",
"react-awesome-reveal": "^3.8.1",
"react-dom": "^17.0.2",
"react-headroom": "^3.2.0",
"assert": "^2.1.0",
"babel-plugin-styled-components": "^2.1.4",
"gatsby": "^5.14.0",
"gatsby-plugin-image": "^3.14.0",
"gatsby-plugin-manifest": "^5.14.0",
"gatsby-plugin-react-helmet": "^6.14.0",
"gatsby-plugin-sharp": "^5.14.0",
"gatsby-plugin-styled-components": "^6.14.0",
"gatsby-plugin-typescript": "^5.14.0",
"gatsby-source-contentful": "^8.14.0",
"gatsby-source-medium": "^5.14.0",
"gatsby-transformer-remark": "^6.14.0",
"react": "^18.3.1",
"react-awesome-reveal": "^4.2.14",
"react-dom": "^18.3.1",
"react-headroom": "^3.2.1",
"react-helmet": "^6.1.0",
"react-markdown": "^7.0.0",
"react-modal": "^3.14.4",
"react-markdown": "^9.0.1",
"react-modal": "^3.16.1",
"rebass": "^4.0.7",
"styled-components": "^5.3.3"
"styled-components": "^6.1.13"
},
"devDependencies": {
"@types/react-headroom": "^2.2.2",
"@types/react-helmet": "^6.1.2",
"@types/react-modal": "^3.13.1",
"@types/rebass": "^4.0.9",
"chalk": "^5.0.1",
"contentful-import": "^8.2.28",
"@types/node": "^20",
"@types/react-headroom": "^3.2.3",
"@types/react-helmet": "^6.1.11",
"@types/react-modal": "^3.16.3",
"@types/rebass": "^4.0.15",
"chalk": "^5.3.0",
"contentful-import": "^9.4.69",
"env-cmd": "^10.1.0",
"inquirer": "^8.2.1",
"start-server-and-test": "^1.14.0",
"typescript": "^4.6.2"
"inquirer": "^12.0.1",
"start-server-and-test": "^2.0.8",
"typescript": "^5.6.3"
}
}
45 changes: 23 additions & 22 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
import React from "react";
import SocialLink from "./SocialLink";
import styled from "styled-components";
import { Text, Box, Flex } from "rebass/styled-components";
import { Box } from "rebass/styled-components";
import { Fade } from "react-awesome-reveal";
import SocialLink from "./SocialLink";
import Link from "./Link";
import { useSiteQuery } from "../queries/useSiteQuery";

const Footer = () => {
const { companyName, socialLinks } = useSiteQuery();
const { socialLinks } = useSiteQuery();

return (
<Box p={[2, 3]} backgroundColor="secondaryAccent" id="footer" as="footer">
<Box
p={[2, 3]}
backgroundColor="darkPrimary"
id="footer"
as="footer"
style={{
position: "absolute",
bottom: 0,
left: 0,
right: 0,
width: "fit-content",
margin: "auto",
}}
>
<FooterContainer>
<Fade direction="left" triggerOnce>
<Text fontSize={[2, 3]} color="lightPrimary">
<span>{${companyName} - Powered by `}</span>
<Link href="https://github.com/meese-enterprises" dark>Open Source</Link>{" "}
<span role="img" aria-label="heart">
❤️
</span>
</Text>
<Fade direction="right" triggerOnce cascade damping={0.5}>
{socialLinks.map((sl) => (
<Box mx={[2, 3]} fontSize={[4, 5]} key={sl.name}>
<SocialLink {...sl} />
</Box>
))}
</Fade>
<Flex>
<Fade direction="right" triggerOnce cascade damping={0.5}>
{socialLinks.map((sl) => (
<Box mx={[2, 3]} fontSize={[4, 5]} key={sl.name}>
<SocialLink {...sl} />
</Box>
))}
</Fade>
</Flex>
</FooterContainer>
</Box>
);
Expand Down
15 changes: 1 addition & 14 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import React from "react";
import Headroom from "react-headroom";
import { Box, Link as RebassLink, Flex, Image } from "rebass/styled-components";
import { Link as RebassLink, Flex, Image } from "rebass/styled-components";
import styled from "styled-components";
import Link from "./Link";
import { useHelmetQuery } from "../queries/useHelmetQuery";
import { useSiteQuery } from "../queries/useSiteQuery";
import { SECTION } from "../utils/constants";
import { getSectionHref } from "../utils/helpers";

// TODO: Add a light/dark mode toggle
const Header = () => {
const { logo } = useHelmetQuery();
const { companyName } = useSiteQuery();
Expand All @@ -33,17 +31,6 @@ const Header = () => {
/>
</Flex>
</RebassLink>
<Flex mr={[0, 3, 5]}>
{(Object.keys(SECTION) as Array<keyof typeof SECTION>)
.filter((id) => id !== "home")
.map((id) => (
<Box key={id} ml={[2, 3]} fontSize={[2, 3]}>
<Link href={`#${id}`} tabIndex={0} className="navSection">
{SECTION[id]}
</Link>
</Box>
))}
</Flex>
</Flex>
</StyledHeadroom>
);
Expand Down
90 changes: 0 additions & 90 deletions src/sections/About.tsx

This file was deleted.

94 changes: 0 additions & 94 deletions src/sections/Employees.tsx

This file was deleted.

Loading

0 comments on commit fbcb29f

Please sign in to comment.