Skip to content

Commit a2cc496

Browse files
bencooper222cktang88
bencooper222
authored and
cktang88
committed
More line ending changes
1 parent d313080 commit a2cc496

File tree

12 files changed

+836
-836
lines changed

12 files changed

+836
-836
lines changed

‎.editorconfig

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
root = true
2-
3-
[*]
4-
# Unix-style newlines with a newline ending every file
5-
end_of_line = lf
6-
insert_final_newline = true
7-
charset = utf-8 # it's 2019
1+
root = true
2+
3+
[*]
4+
# Unix-style newlines with a newline ending every file
5+
end_of_line = lf
6+
insert_final_newline = true
7+
charset = utf-8 # it's 2019
88
indent_style = tab # matches prettier

‎CONTRIBUTING.md

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
# Contributing
2-
3-
Guide for contributors
4-
5-
6-
### Setup
7-
8-
> TODO: put all this in an install.sh
9-
10-
```bash
11-
npm i
12-
npm i -g nodemon webpack webpack-cli typescript ts-node
13-
npm run dev-server // runs dev server
14-
npm t // runs tests
15-
```
16-
17-
### Folder Structure
18-
19-
20-
- `/src`
21-
- `/client`
22-
- `/assets`
23-
- `/components`
24-
- `/routes`
25-
- `/common`
26-
- `/server`
27-
- `/api`
28-
- `/models`
29-
- `/resolvers`
30-
- `/tests` - this contains all our tests
31-
- `// lots of config files here`
32-
33-
34-
35-
### Tooling
36-
37-
We use:
38-
- Jest for testing
39-
- Circle CI
40-
- Eslint
41-
- Prettier
1+
# Contributing
2+
3+
Guide for contributors
4+
5+
6+
### Setup
7+
8+
> TODO: put all this in an install.sh
9+
10+
```bash
11+
npm i
12+
npm i -g nodemon webpack webpack-cli typescript ts-node
13+
npm run dev-server // runs dev server
14+
npm t // runs tests
15+
```
16+
17+
### Folder Structure
18+
19+
20+
- `/src`
21+
- `/client`
22+
- `/assets`
23+
- `/components`
24+
- `/routes`
25+
- `/common`
26+
- `/server`
27+
- `/api`
28+
- `/models`
29+
- `/resolvers`
30+
- `/tests` - this contains all our tests
31+
- `// lots of config files here`
32+
33+
34+
35+
### Tooling
36+
37+
We use:
38+
- Jest for testing
39+
- Circle CI
40+
- Eslint
41+
- Prettier

‎README.md

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
# Vaken
2-
[![CircleCI](https://circleci.com/gh/VandyHacks/vaken.svg?style=svg)](https://circleci.com/gh/VandyHacks/vaken)
3-
4-
A next-gen hackathon registration system.
5-
6-
### Why
7-
8-
Quill sucks. We rewrote it using modern tools.
9-
10-
### Tooling
11-
12-
- TypeScript
13-
- GraphQL via Apollo
14-
- React
15-
- React-Router
16-
- Styled Components
17-
- Immer
18-
- Passport
19-
- Mongo with Mongoose and Typegoose
20-
- Koa
21-
22-
23-
### Screenshots
24-
25-
:)
26-
27-
### Contributing
28-
29-
See [CONTRIBUTING.md](./CONTRIBUTING.md)
1+
# Vaken
2+
[![CircleCI](https://circleci.com/gh/VandyHacks/vaken.svg?style=svg)](https://circleci.com/gh/VandyHacks/vaken)
3+
4+
A next-gen hackathon registration system.
5+
6+
### Why
7+
8+
Quill sucks. We rewrote it using modern tools.
9+
10+
### Tooling
11+
12+
- TypeScript
13+
- GraphQL via Apollo
14+
- React
15+
- React-Router
16+
- Styled Components
17+
- Immer
18+
- Passport
19+
- Mongo with Mongoose and Typegoose
20+
- Koa
21+
22+
23+
### Screenshots
24+
25+
:)
26+
27+
### Contributing
28+
29+
See [CONTRIBUTING.md](./CONTRIBUTING.md)

‎src/client/components/Buttons/LeftImgButton.tsx

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import React from 'react';
2-
import { Button, ButtonProps, RightPaddedImg, CenterButtonText } from './Buttons';
3-
import { FlexRow } from '../Containers/FlexContainers';
4-
5-
interface Props extends ButtonProps {
6-
img: string;
7-
imgAlt: string;
8-
text: string;
9-
color?: string;
10-
background?: string;
11-
glowColor?: string;
12-
onClick?: () => void;
13-
}
14-
15-
const LeftImgButton = (props: Props): JSX.Element => {
16-
const { img, imgAlt, color, text, onClick, ...ButtonProps } = props;
17-
return (
18-
<Button {...ButtonProps} onClick={onClick}>
19-
{/* Edge case of centering icons */}
20-
<FlexRow height="min-content" width="min-content">
21-
<RightPaddedImg src={img} alt={imgAlt} />
22-
</FlexRow>
23-
<CenterButtonText color={color}>{text}</CenterButtonText>
24-
</Button>
25-
);
26-
};
27-
28-
export default LeftImgButton;
29-
// {/* Edge case of centering icons*/}
1+
import React from 'react';
2+
import { Button, ButtonProps, RightPaddedImg, CenterButtonText } from './Buttons';
3+
import { FlexRow } from '../Containers/FlexContainers';
4+
5+
interface Props extends ButtonProps {
6+
img: string;
7+
imgAlt: string;
8+
text: string;
9+
color?: string;
10+
background?: string;
11+
glowColor?: string;
12+
onClick?: () => void;
13+
}
14+
15+
const LeftImgButton = (props: Props): JSX.Element => {
16+
const { img, imgAlt, color, text, onClick, ...ButtonProps } = props;
17+
return (
18+
<Button {...ButtonProps} onClick={onClick}>
19+
{/* Edge case of centering icons */}
20+
<FlexRow height="min-content" width="min-content">
21+
<RightPaddedImg src={img} alt={imgAlt} />
22+
</FlexRow>
23+
<CenterButtonText color={color}>{text}</CenterButtonText>
24+
</Button>
25+
);
26+
};
27+
28+
export default LeftImgButton;
29+
// {/* Edge case of centering icons*/}

‎src/client/components/Text/ErrorMessage.tsx

+60-60
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
import React, { FunctionComponent } from 'react';
2-
import { Link } from 'react-router-dom';
3-
import styled from 'styled-components';
4-
import STRINGS from '../../assets/strings.json';
5-
// @ts-ignore
6-
import SadFace from '../../assets/img/sad_face.svg?inline';
7-
import TextButton from '../Buttons/TextButton';
8-
9-
const Rectangle = styled.div`
10-
border: 0.1rem solid ${STRINGS.WARNING_COLOR};
11-
border-radius: 1rem;
12-
display: inline-block;
13-
text-align: center;
14-
color: ${STRINGS.WARNING_COLOR};
15-
font-family: 'Roboto', sans-serif;
16-
font-weight: 500;
17-
font-size: 1.5rem;
18-
display: inline-block;
19-
padding: 1rem;
20-
`;
21-
22-
const StyledP = styled.p`
23-
white-space: pre-line;
24-
`;
25-
26-
interface ErrorMessageProps {
27-
children?: JSX.Element;
28-
}
29-
30-
export const ErrorMessage: FunctionComponent<ErrorMessageProps> = (
31-
props: ErrorMessageProps
32-
): JSX.Element => {
33-
const { children } = props;
34-
return (
35-
<Rectangle>
36-
<SadFace />
37-
{children}
38-
</Rectangle>
39-
);
40-
};
41-
42-
interface GraphQLErrorMessage {
43-
text?: string;
44-
}
45-
46-
export const GraphQLErrorMessage: FunctionComponent<GraphQLErrorMessage> = (
47-
props: GraphQLErrorMessage
48-
): JSX.Element => {
49-
const { text } = props;
50-
return (
51-
<ErrorMessage>
52-
<>
53-
<StyledP>{text}</StyledP>
54-
<Link style={{ textDecoration: 'none' }} to="/dashboard">
55-
<TextButton text="Return to Dashboard" background={STRINGS.WARNING_COLOR} color="white" />
56-
</Link>
57-
</>
58-
</ErrorMessage>
59-
);
60-
};
1+
import React, { FunctionComponent } from 'react';
2+
import { Link } from 'react-router-dom';
3+
import styled from 'styled-components';
4+
import STRINGS from '../../assets/strings.json';
5+
// @ts-ignore
6+
import SadFace from '../../assets/img/sad_face.svg?inline';
7+
import TextButton from '../Buttons/TextButton';
8+
9+
const Rectangle = styled.div`
10+
border: 0.1rem solid ${STRINGS.WARNING_COLOR};
11+
border-radius: 1rem;
12+
display: inline-block;
13+
text-align: center;
14+
color: ${STRINGS.WARNING_COLOR};
15+
font-family: 'Roboto', sans-serif;
16+
font-weight: 500;
17+
font-size: 1.5rem;
18+
display: inline-block;
19+
padding: 1rem;
20+
`;
21+
22+
const StyledP = styled.p`
23+
white-space: pre-line;
24+
`;
25+
26+
interface ErrorMessageProps {
27+
children?: JSX.Element;
28+
}
29+
30+
export const ErrorMessage: FunctionComponent<ErrorMessageProps> = (
31+
props: ErrorMessageProps
32+
): JSX.Element => {
33+
const { children } = props;
34+
return (
35+
<Rectangle>
36+
<SadFace />
37+
{children}
38+
</Rectangle>
39+
);
40+
};
41+
42+
interface GraphQLErrorMessage {
43+
text?: string;
44+
}
45+
46+
export const GraphQLErrorMessage: FunctionComponent<GraphQLErrorMessage> = (
47+
props: GraphQLErrorMessage
48+
): JSX.Element => {
49+
const { text } = props;
50+
return (
51+
<ErrorMessage>
52+
<>
53+
<StyledP>{text}</StyledP>
54+
<Link style={{ textDecoration: 'none' }} to="/dashboard">
55+
<TextButton text="Return to Dashboard" background={STRINGS.WARNING_COLOR} color="white" />
56+
</Link>
57+
</>
58+
</ErrorMessage>
59+
);
60+
};

‎src/client/components/Text/Title.tsx

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
import styled from 'styled-components';
2-
3-
interface Props {
4-
color?: string;
5-
margin?: string;
6-
fontSize?: string;
7-
fontFamily?: string;
8-
fontWeight?: string;
9-
textAlign?: string;
10-
}
11-
12-
/**
13-
* Title is a set of defaults used for titles.
14-
* @param {Props} props - color, margin, fontSize, fontFamily, fontWeight
15-
* @return {JSX.Element} HOC styling child text
16-
*/
17-
export const Title = styled.h1`
18-
font-family: ${(props: Props) => props.fontFamily || "'Roboto', sans-serif"};
19-
font-weight: ${(props: Props) => props.fontWeight || 500};
20-
font-size: ${(props: Props) => props.fontSize || '2.5rem'};
21-
color: ${(props: Props) => props.color || 'black'};
22-
margin: ${(props: Props) => props.margin || '1.5rem'};
23-
margin-top: 0;
24-
${(props: Props) => (props.textAlign ? `text-align: ${props.textAlign};` : null)};
25-
`;
26-
27-
export default Title;
1+
import styled from 'styled-components';
2+
3+
interface Props {
4+
color?: string;
5+
margin?: string;
6+
fontSize?: string;
7+
fontFamily?: string;
8+
fontWeight?: string;
9+
textAlign?: string;
10+
}
11+
12+
/**
13+
* Title is a set of defaults used for titles.
14+
* @param {Props} props - color, margin, fontSize, fontFamily, fontWeight
15+
* @return {JSX.Element} HOC styling child text
16+
*/
17+
export const Title = styled.h1`
18+
font-family: ${(props: Props) => props.fontFamily || "'Roboto', sans-serif"};
19+
font-weight: ${(props: Props) => props.fontWeight || 500};
20+
font-size: ${(props: Props) => props.fontSize || '2.5rem'};
21+
color: ${(props: Props) => props.color || 'black'};
22+
margin: ${(props: Props) => props.margin || '1.5rem'};
23+
margin-top: 0;
24+
${(props: Props) => (props.textAlign ? `text-align: ${props.textAlign};` : null)};
25+
`;
26+
27+
export default Title;

0 commit comments

Comments
 (0)