Skip to content
This repository was archived by the owner on Dec 17, 2023. It is now read-only.

Commit 6cdb439

Browse files
committed
created temporary landing page
1 parent 9cff390 commit 6cdb439

File tree

27 files changed

+1639
-128
lines changed

27 files changed

+1639
-128
lines changed

.github/workflows/firebase.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: Deploy to Firebase Hosting on PR
2-
'on': pull_request
2+
"on": pull_request
33
jobs:
44
build_and_preview:
5-
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
5+
if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
66
runs-on: ubuntu-latest
77
steps:
88
- uses: actions/checkout@v3
99
- run: npm ci && npm run build
1010
- uses: FirebaseExtended/action-hosting-deploy@v0
1111
with:
12-
repoToken: '${{ secrets.GITHUB_TOKEN }}'
13-
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_EVENTBADGING }}'
12+
repoToken: "${{ secrets.GITHUB_TOKEN }}"
13+
firebaseServiceAccount: "${{ secrets.FIREBASE_SERVICE_ACCOUNT_EVENTBADGING }}"
1414
projectId: eventbadging

.lintstagedrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"*.js": [
3-
"eslint --fix",
4-
"git add"
5-
]
2+
"*.js": ["eslint --fix", "git add"]
63
}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This project has issues that are organized on [this github project board](https:
66

77
We are currently working with on [figma designs](https://www.figma.com/file/7tiuJbwakgDu15mOjzKTDK/Badging-Website) for this website that are being translated into the code. Most of the Design contributions are made on request to access the file. Issues that are related to Designing the UI/UX will be labelled with the `design` label in the issues tab.
88

9-
**NB**: _Unless otherwise, all Frontend UI/UX visual modifications and new features should align with the figma design. Also, all assets (anything that is no-code and is a resource), should be under the [assets folder](assets)
9+
**NB**: \_Unless otherwise, all Frontend UI/UX visual modifications and new features should align with the figma design. Also, all assets (anything that is no-code and is a resource), should be under the [assets folder](assets)
1010

1111
## Code Contribution
1212

NON-CODE_ACTIVITY-LOG.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ You can make a pull request to this file by adding:
1111
**Please remember to Sign-off all commits befor pushing it**
1212
**To learn how to Sign-off commits read the [CONTRIBUTION.md](CONTRIBUTION.md)**
1313

14-
| Author Name | Contribution Type | Link to Contribution |
15-
| -------------- | --------------------------------------- | -------------------- |
16-
| Victoria Ottah | Landing page and about us mobile design | https://www.figma.com/file/7tiuJbwakgDu15mOjzKTDK/Badging-Website?type=design&node-id=1289-2903&t=V2yaQ9V1yeQ0bgD1-0 |
17-
| Kingsley Mkpandiok | Badging Desktop Design | https://www.figma.com/file/7tiuJbwakgDu15mOjzKTDK/Badging-Website?type=design&node-id=243-994&t=V2yaQ9V1yeQ0bgD1-0 |
18-
| | | |
19-
| | | |
20-
| | | |
21-
| | | |
22-
| | | |
23-
| | | |
24-
| | | |
25-
| | | |
26-
| | | |
27-
| | | |
28-
| | | |
14+
| Author Name | Contribution Type | Link to Contribution |
15+
| ------------------ | --------------------------------------- | -------------------------------------------------------------------------------------------------------------------- |
16+
| Victoria Ottah | Landing page and about us mobile design | https://www.figma.com/file/7tiuJbwakgDu15mOjzKTDK/Badging-Website?type=design&node-id=1289-2903&t=V2yaQ9V1yeQ0bgD1-0 |
17+
| Kingsley Mkpandiok | Badging Desktop Design | https://www.figma.com/file/7tiuJbwakgDu15mOjzKTDK/Badging-Website?type=design&node-id=243-994&t=V2yaQ9V1yeQ0bgD1-0 |
18+
| | | |
19+
| | | |
20+
| | | |
21+
| | | |
22+
| | | |
23+
| | | |
24+
| | | |
25+
| | | |
26+
| | | |
27+
| | | |
28+
| | | |

firebase.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"hosting": {
33
"public": "build",
4-
"ignore": [
5-
"firebase.json",
6-
"**/.*",
7-
"**/node_modules/**"
8-
]
4+
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"]
95
}
106
}

src/App.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Route, Routes } from "react-router-dom";
22
import {
3+
Landing,
34
Home,
45
About,
56
EventBadging,
@@ -12,7 +13,8 @@ const App = () => {
1213
return (
1314
<>
1415
<Routes>
15-
<Route exact path="/" element={<Home />} />
16+
<Route exact path="/" element={<Landing />} />
17+
<Route exact path="/home" element={<Home />} />
1618
<Route path="/apply" element={<ApplyForBadge />} />
1719
<Route path="/event" element={<EventBadging />} />
1820
<Route path="/about" element={<About />} />

src/assets/styles/footer.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@
2020
}
2121

2222
.top h2 {
23-
font-family: "Poppins", sans-serif;
23+
font-family: Poppins, sans-serif;
2424
padding: 10px;
2525
font-style: normal;
2626
font-weight: 600;
2727
font-size: 32px;
2828
line-height: 48px;
29-
color: #000000;
29+
color: #000;
3030
}
3131

3232
.top p {
33-
font-family: "Poppins", sans-serif;
33+
font-family: Poppins, sans-serif;
3434
font-style: normal;
3535
font-weight: 400;
3636
font-size: 16px;
3737
line-height: 30px;
3838
padding: 10px;
3939
padding-bottom: 50px;
4040
text-align: center;
41-
color: #000000;
41+
color: #000;
4242
}
4343

4444
.top button {

src/components/BadgeLevels.js

Lines changed: 109 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,146 @@
1-
import { Box, Img, Table, TableContainer, Tbody, Td, Text, Th, Thead, Tr } from '@chakra-ui/react'
2-
import { goldBadgeSVG, silverBadgeSVG, passingBadgeSVG, pendingBadgeSVG } from '../assets/images'
1+
import {
2+
Box,
3+
Img,
4+
Table,
5+
TableContainer,
6+
Tbody,
7+
Td,
8+
Text,
9+
Th,
10+
Thead,
11+
Tr,
12+
} from "@chakra-ui/react";
13+
import {
14+
goldBadgeSVG,
15+
silverBadgeSVG,
16+
passingBadgeSVG,
17+
pendingBadgeSVG,
18+
} from "../assets/images";
319

420
const BadgeLevels = () => {
5-
return (
6-
<Box
7-
as='section'
8-
py={{base: "27px", md: "72px"}}
9-
px={{base: "15px", md: "100px"}}
10-
mx={{base: '16px', md: "0"}}
11-
shadow={{base: "md", md: "none"}}
12-
rounded={{base: "2xl", md: 'none'}}
21+
return (
22+
<Box
23+
as="section"
24+
py={{ base: "27px", md: "72px" }}
25+
px={{ base: "15px", md: "100px" }}
26+
mx={{ base: "16px", md: "0" }}
27+
shadow={{ base: "md", md: "none" }}
28+
rounded={{ base: "2xl", md: "none" }}
1329
>
14-
<Box as='article' maxWidth={"1074px"}>
15-
<Text as={'h1'} fontSize={{ base: '24px', md: '48px' }} fontWeight={500}>
16-
Motivation to apply
17-
</Text>
18-
<Box as='section'>
19-
<Text as={'p'} fontSize={{ base: '14px', md: '16px' }}>
20-
The primary motivation to apply for a CHAOSS D&I Badge is the badge itself! The awarded
21-
event can show the open source community that they foster healthy D&I practices with a
22-
CHAOSS badge.
23-
</Text>
24-
<Img src={passingBadgeSVG} alt='Passing Badge' width={"203px"} height={"40px"} my={"16px"}/>
25-
<Text as={'p'} fontSize={{ base: '14px', md: '16px' }}>
26-
Applying for a badge supports D&I efforts within an open source community by expressing
27-
that your event is willing to improve the ways the work. These efforts can have affects
28-
to D&I practices in your event and even outside of your project space.
29-
</Text>
30-
</Box>
31-
</Box>
32-
<Box as='article' maxW={"1053px"} mt={{base: "24px", md: "42px"}}>
33-
<Text as={'h1'} fontWeight={{ base: 500, md: 600 }} fontSize={{ base: '24px', md: '34px' }}>
34-
Badge Levels
35-
</Text>
36-
<Text as={'p'} fontSize={{ base: '14px', md: '16px' }}>
37-
Badges are assigned according to how the Reviewers mark out the review checklist according
38-
to the the information initially filled in by the Applicant. The percentages are
39-
calculated excluding the initial checks, based of the average of checklists of at least
40-
two reviewers.
41-
</Text>
42-
</Box>
43-
<TableContainer mt={{base: "24px", md: "73px"}}>
44-
<Table variant={"unstyled"} size={{base: "md", md: "lg"}} maxW={"1130px"}>
30+
<Box as="article" maxWidth={"1074px"}>
31+
<Text
32+
as={"h1"}
33+
fontSize={{ base: "24px", md: "48px" }}
34+
fontWeight={500}
35+
>
36+
Motivation to apply
37+
</Text>
38+
<Box as="section">
39+
<Text as={"p"} fontSize={{ base: "14px", md: "16px" }}>
40+
The primary motivation to apply for a CHAOSS D&I Badge is the badge
41+
itself! The awarded event can show the open source community that
42+
they foster healthy D&I practices with a CHAOSS badge.
43+
</Text>
44+
<Img
45+
src={passingBadgeSVG}
46+
alt="Passing Badge"
47+
width={"203px"}
48+
height={"40px"}
49+
my={"16px"}
50+
/>
51+
<Text as={"p"} fontSize={{ base: "14px", md: "16px" }}>
52+
Applying for a badge supports D&I efforts within an open source
53+
community by expressing that your event is willing to improve the
54+
ways the work. These efforts can have affects to D&I practices in
55+
your event and even outside of your project space.
56+
</Text>
57+
</Box>
58+
</Box>
59+
<Box as="article" maxW={"1053px"} mt={{ base: "24px", md: "42px" }}>
60+
<Text
61+
as={"h1"}
62+
fontWeight={{ base: 500, md: 600 }}
63+
fontSize={{ base: "24px", md: "34px" }}
64+
>
65+
Badge Levels
66+
</Text>
67+
<Text as={"p"} fontSize={{ base: "14px", md: "16px" }}>
68+
Badges are assigned according to how the Reviewers mark out the review
69+
checklist according to the the information initially filled in by the
70+
Applicant. The percentages are calculated excluding the initial
71+
checks, based of the average of checklists of at least two reviewers.
72+
</Text>
73+
</Box>
74+
<TableContainer mt={{ base: "24px", md: "73px" }}>
75+
<Table
76+
variant={"unstyled"}
77+
size={{ base: "md", md: "lg" }}
78+
maxW={"1130px"}
79+
>
4580
<Thead>
4681
<Tr>
47-
<Th fontWeight={700}>Level</Th>
48-
<Th fontWeight={700}>Badge</Th>
49-
<Th fontWeight={700}>Percentage of Requirements Met</Th>
82+
<Th fontWeight={700}>Level</Th>
83+
<Th fontWeight={700}>Badge</Th>
84+
<Th fontWeight={700}>Percentage of Requirements Met</Th>
5085
</Tr>
5186
</Thead>
5287
<Tbody>
5388
<Tr>
5489
<Td>Pending</Td>
5590
<Td>
56-
<Img src={pendingBadgeSVG} width={"162px"} height={"32px"} alt='Pending Badge' />
91+
<Img
92+
src={pendingBadgeSVG}
93+
width={"162px"}
94+
height={"32px"}
95+
alt="Pending Badge"
96+
/>
5797
</Td>
5898
<Td>Less than 40%</Td>
5999
</Tr>
60-
100+
61101
<Tr>
62102
<Td>Passing</Td>
63103
<Td>
64-
<Img src={passingBadgeSVG} width={"158px"} height={"32px"} alt='Passing Badge' />
104+
<Img
105+
src={passingBadgeSVG}
106+
width={"158px"}
107+
height={"32px"}
108+
alt="Passing Badge"
109+
/>
65110
</Td>
66111
<Td>Greater than or equal to 40% and less than 60%</Td>
67112
</Tr>
68113

69114
<Tr>
70115
<Td>Silver</Td>
71116
<Td>
72-
<Img src={silverBadgeSVG} width={"142px"} height={"32px"} alt='Silver Badge' />
117+
<Img
118+
src={silverBadgeSVG}
119+
width={"142px"}
120+
height={"32px"}
121+
alt="Silver Badge"
122+
/>
73123
</Td>
74124
<Td>Greater than 60% or less than 80%</Td>
75125
</Tr>
76126

77127
<Tr>
78128
<Td>Gold</Td>
79129
<Td>
80-
<Img src={goldBadgeSVG} width={"133px"} height={"32px"} alt='Gold Badge' />
130+
<Img
131+
src={goldBadgeSVG}
132+
width={"133px"}
133+
height={"32px"}
134+
alt="Gold Badge"
135+
/>
81136
</Td>
82137
<Td>Greater than 80%</Td>
83138
</Tr>
84139
</Tbody>
85140
</Table>
86-
</TableContainer>
87-
</Box>
88-
)
89-
}
141+
</TableContainer>
142+
</Box>
143+
);
144+
};
90145

91-
export default BadgeLevels
146+
export default BadgeLevels;

src/components/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ import BadgeLevels from "./badge/BadgeLevels";
44
import SubmitEvent from "./SubmitEvent/SubmitEvent";
55
import PathTracker from "./pathTracker/PathTracker";
66

7-
87
export { Faq, Testimonial, BadgeLevels, SubmitEvent, PathTracker };

src/index.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
<head>
44
<meta charset="utf-8" />
55
<!-- boxicons -->
6-
<link href="https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css" rel="stylesheet" />
6+
<link
7+
href="https://unpkg.com/boxicons@2.1.4/css/boxicons.min.css"
8+
rel="stylesheet"
9+
/>
710
<!-- Added tag to enable @media <css> query for chrome browsers -->
811
<meta name="viewport" content="width=device-width,initial-scale=1" />
912
<title>Badging by CHAOSS</title>

0 commit comments

Comments
 (0)