Skip to content

Commit bab1fb1

Browse files
committed
[ADD] NEON HOT FIX
[why] why... [what] what... [etc] etc...
1 parent 4781098 commit bab1fb1

File tree

12 files changed

+139
-57
lines changed

12 files changed

+139
-57
lines changed

Backend/Passport/github.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = () => {
88
{
99
clientID: process.env.GITHUB_ACCESS_ID,
1010
clientSecret: process.env.GITHUB_ACCESS_SECRET,
11-
callbackURL: 'http://localhost:3000/auth/github/callback',
11+
callbackURL: `${process.env.PROD_API_SERVER}:3000/auth/github/callback`,
1212
},
1313

1414
async (accessToken, refreshToken, profile, done) => {

Backend/app.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ app.use('/api/v1', tokenCheck, router);
2323
app.get('/auth/github', passport.authenticate('github', { session: false }));
2424
app.get('/auth/github/callback', passport.authenticate('github', { session: false }), tokenAllocate);
2525

26+
console.log(process.env.NODE_ENV);
27+
2628
app.listen(3000);

Frontend/Views/Components/IssueList/ChoiceList.js

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
import React, { useContext } from 'react';
22
import { useHistory } from 'react-router-dom';
3+
import styled from 'styled-components';
34
import { ReloadContext } from '../../store/IssuesPageStore';
45
import { IsQueryContext } from '../../store/IssuesListStore';
5-
import styled from 'styled-components';
6+
import { randomRGB } from '../../../style/Neon';
67

78
const UserImg = styled.img`
89
src: ${(props) => props.src};
910
alt: ${(props) => props.alt};
10-
11+
margin-right: 5px;
1112
width: 20px;
1213
height: auto;
1314
border-radius: 10px;
1415
`;
1516
const UserItemWrapper = styled.div`
1617
display: flex;
18+
padding: 5px;
1719
`;
1820
const UserItem = ({ value }) => {
1921
return (
2022
<UserItemWrapper>
2123
<UserImg src={value.imageLink} alt={value.username} />
22-
<span>{value.username}</span>
24+
<span>
25+
<b>{value.username}</b>
26+
</span>
2327
</UserItemWrapper>
2428
);
2529
};
@@ -29,40 +33,56 @@ const LabelColor = styled.div`
2933
min-width: 20px;
3034
max-height: 20px;
3135
border-radius: 10px;
36+
margin-right: 5px;
3237
`;
3338

3439
const LabelItemWrapper = styled.div`
3540
display: flex;
41+
padding: 5px;
3642
`;
3743
const LabelItem = ({ value }) => {
3844
return (
3945
<LabelItemWrapper>
4046
<LabelColor color={value.color} />
4147
<div>
42-
<div>{value.name}</div>
48+
<div>
49+
<b>{value.name}</b>
50+
</div>
4351
<div>{value.description}</div>
4452
</div>
4553
</LabelItemWrapper>
4654
);
4755
};
4856

57+
const MilestoneItemWrapper = styled.div`
58+
padding: 5px;
59+
`;
60+
4961
const MilestoneItem = ({ value }) => {
5062
return (
51-
<>
52-
<span>{value.title}</span>
53-
</>
63+
<MilestoneItemWrapper>
64+
<span>
65+
<b>{value.title}</b>
66+
</span>
67+
</MilestoneItemWrapper>
5468
);
5569
};
5670

5771
const ChoiceListWrapper = styled.div`
72+
text-shadow: 0 0 1px #fff, 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #ff00de, 0 0 7px #ff00de, 0 0 8px #ff00de, 0 0 10px #ffffff, 0 0 15px #ffffff;
5873
position: absolute;
59-
background-color: wheat;
74+
background-color: ${randomRGB()};
75+
border: 4px solid white;
76+
color: black;
6077
border-radius: 5px;
6178
width: 200px;
6279
padding: 7px;
6380
top: 50px;
6481
right: 0px;
6582
z-index: 1;
83+
& :hover {
84+
color: white;
85+
}
6686
`;
6787
const ChoiceList = ({ name, values, onToggleDropdown }) => {
6888
const { reloadDispatch } = useContext(ReloadContext);

Frontend/Views/Components/IssueList/Dropdown.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
22
import styled from 'styled-components';
33
import useClickOutside from '../Modal';
44
import ChoiceList from './ChoiceList';
5-
5+
import { CustomButton } from '../../../style/Neon';
66
const DropdownWrapper = styled.div`
77
position: relative;
88
`;
@@ -20,9 +20,7 @@ const Dropdown = ({ name, values }) => {
2020
return (
2121
<DropdownWrapper>
2222
<div ref={domNode}>
23-
<button type="button" onClick={onToggleDropdown}>
24-
{name}
25-
</button>
23+
<CustomButton onClick={onToggleDropdown}>{name}</CustomButton>
2624
{isVisible && <ChoiceList name={name} values={values} onToggleDropdown={onToggleDropdown} />}
2725
</div>
2826
</DropdownWrapper>

Frontend/Views/Components/IssueList/IssueList.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useContext, useEffect, useReducer } from 'react';
22
import { useHistory } from 'react-router-dom';
3+
import styled from 'styled-components';
34
import IssueListItem from './IssueListItem';
45
import TopFilter from './TopFilter';
56
import MarkAs from './MarkAs';
@@ -18,8 +19,7 @@ import {
1819
AllCheckedContext,
1920
IsMarkAsContext,
2021
} from '../../store/IssuesListStore';
21-
import styled from 'styled-components';
22-
import { randomRGB } from '../../../style/randomNeonRGB';
22+
import { CustomButton, randomRGB } from '../../../style/Neon';
2323

2424
const Tab = styled.div`
2525
display: flex;
@@ -122,11 +122,7 @@ const IssueList = () => {
122122
{!isMarkAs && <Alma users={mappedUsers} labels={mappedLabels} milestones={mappedMilestones} />}
123123
</AlmaStyle>
124124
</Tab>
125-
{isQuery && (
126-
<button type="button" onClick={onClickReset}>
127-
Clear current search query, filters, and sorts
128-
</button>
129-
)}
125+
{isQuery && <CustomButton onClick={onClickReset}>Clear current search query, filters, and sorts</CustomButton>}
130126
{issues.map((issue) => (
131127
<IssueListItem key={issue.id} issueMetaData={getMetaData(issue)} />
132128
))}

Frontend/Views/Components/IssueList/IssueListItem.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ import React, { useEffect, useState, useContext } from 'react';
22
import { useHistory } from 'react-router-dom';
33
import styled from 'styled-components';
44
import { CheckedIssuesContext, IsCheckAllContext, AllCheckedContext, IsMarkAsContext } from '../../store/IssuesListStore';
5-
import { randomRGB } from '../../../style/randomNeonRGB';
5+
import { randomRGB } from '../../../style/Neon';
66

77
const TitleBox = styled.div`
88
width: 100%;
99
display: flex;
10+
text-shadow: 0 0 1px #fff, 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #ff00de, 0 0 7px #ff00de, 0 0 8px #ff00de, 0 0 10px #ffffff, 0 0 15px #ffffff;
11+
font-weight: bolder;
1012
`;
1113

1214
const LabelStyle = styled.div`
@@ -16,26 +18,27 @@ const LabelStyle = styled.div`
1618
font-size: 15px;
1719
`;
1820

21+
const bodyColor = randomRGB();
22+
1923
const IssueHeader = styled.div`
2024
position: relative;
2125
align-items: center;
2226
font-size: 18px;
2327
display: flex;
24-
background-color: pink;
28+
background-color: ${bodyColor};
2529
padding: 5px;
2630
border-top-left-radius: 5px;
2731
z-index: 0;
2832
border-top-right-radius: 5px;
2933
&:hover {
30-
background-color: ${randomRGB()};
3134
color: white;
3235
}
3336
`;
3437

3538
const IssueWrapper = styled.div`
3639
margin-top: 10px;
3740
padding: 5px;
38-
background-color: ${randomRGB()};
41+
background-color: ${bodyColor};
3942
border-radius: 10px;
4043
`;
4144

@@ -126,7 +129,7 @@ const IssueListItem = ({ issueMetaData }) => {
126129
<span>{issue.isOpen ? 'opened ' : 'closed '}</span>
127130
<span>{`${issue.createdAt} by `}</span>
128131
<span>{author.username}</span>
129-
<span>{milestone && '🍗' + milestone.title}</span>
132+
<span>{milestone && ` 🍗 ${milestone.title}`}</span>
130133
</DescriptionDiv>
131134
<AssingeeDiv>
132135
{assignees.map((assignee) => (

Frontend/Views/Components/IssueList/MarkAs.js

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,27 @@
11
import React, { useState, useContext } from 'react';
22
import axios from 'axios';
3+
import styled from 'styled-components';
34
import useClickOutside from '../Modal';
45
import { ReloadContext } from '../../store/IssuesPageStore';
56
import { CheckedIssuesContext, AllCheckedContext, IsMarkAsContext } from '../../store/IssuesListStore';
7+
import { CustomButton, randomRGB } from '../../../style/Neon';
8+
9+
const Wrapper = styled.div`
10+
text-shadow: 0 0 1px #fff, 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #ff00de, 0 0 7px #ff00de, 0 0 8px #ff00de, 0 0 10px #ffffff, 0 0 15px #ffffff;
11+
position: absolute;
12+
background-color: ${randomRGB()};
13+
border: 4px solid white;
14+
color: black;
15+
border-radius: 5px;
16+
width: 200px;
17+
padding: 7px;
18+
top: 50px;
19+
right: 0px;
20+
z-index: 1;
21+
& :hover {
22+
color: white;
23+
}
24+
`;
625

726
const MarkAs = () => {
827
const { reloadDispatch } = useContext(ReloadContext);
@@ -41,21 +60,21 @@ const MarkAs = () => {
4160
};
4261

4362
return (
44-
<>
63+
<Wrapper>
4564
<div>Actions</div>
4665
<div onClick={() => onChangeStatus(1)}>Open</div>
4766
<div onClick={() => onChangeStatus(0)}>Closed</div>
48-
</>
67+
</Wrapper>
4968
);
5069
};
5170

5271
return (
5372
<>
5473
<div ref={domNode}>
55-
<button type="button" onClick={onToggleDropdown}>
74+
<CustomButton onClick={onToggleDropdown} style={{ position: 'relative' }}>
5675
Mark as
57-
</button>
58-
{isVisible && <MarkAsList />}
76+
{isVisible && <MarkAsList />}
77+
</CustomButton>
5978
</div>
6079
</>
6180
);

Frontend/Views/Components/IssueList/TopFilter.js

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
import React, { useState, useContext } from 'react';
22
import { useHistory } from 'react-router-dom';
3+
import styled from 'styled-components';
34
import useClickOutside from '../Modal';
45
import { getUserId } from '../../../Sources/user';
56
import { ReloadContext } from '../../store/IssuesPageStore';
67
import { IsQueryContext } from '../../store/IssuesListStore';
7-
import styled from 'styled-components';
8+
import { randomRGB, CustomButton } from '../../../style/Neon';
89

910
const TopFilterWrapper = styled.div`
1011
position: relative;
1112
`;
1213

1314
const FilterWrapper = styled.div`
15+
text-shadow: 0 0 1px #fff, 0 0 2px #fff, 0 0 3px #fff, 0 0 4px #ff00de, 0 0 7px #ff00de, 0 0 8px #ff00de, 0 0 10px #ff00de, 0 0 15px #ff00de;
1416
position: absolute;
15-
background-color: wheat;
17+
background-color: ${randomRGB()};
18+
border: 4px solid white;
19+
color: black;
1620
border-radius: 5px;
1721
width: 250px;
1822
padding: 7px;
1923
top: 50px;
2024
right: 0px;
2125
z-index: 1;
26+
& :hover {
27+
color: white;
28+
}
2229
`;
2330

2431
const TopFilter = () => {
@@ -45,18 +52,26 @@ const TopFilter = () => {
4552
return (
4653
<TopFilterWrapper>
4754
<div ref={domNode}>
48-
<button type="button" onClick={onToggleDropdown}>
49-
Filters
50-
</button>
55+
<CustomButton onClick={onToggleDropdown}>Filters</CustomButton>
5156
<input type="text" />
5257
{isVisible && (
5358
<FilterWrapper>
5459
<div>Filter Issues</div>
55-
<div onClick={() => onClickFilter('open=1')}>Open Issues</div>
56-
<div onClick={() => onClickFilter(`author=${getUserId(document.cookie)}`)}>Your Issues</div>
57-
<div onClick={() => onClickFilter(`assignee=${getUserId(document.cookie)}`)}>Everything assigned to you</div>
58-
<div onClick={() => onClickFilter(`mentions=${getUserId(document.cookie)}`)}>Everything mentioning you</div>
59-
<div onClick={() => onClickFilter('open=0')}>Closed Issues</div>
60+
<div onClick={() => onClickFilter('open=1')}>
61+
<b>Open Issues</b>
62+
</div>
63+
<div onClick={() => onClickFilter(`author=${getUserId(document.cookie)}`)}>
64+
<b>Your Issues</b>
65+
</div>
66+
<div onClick={() => onClickFilter(`assignee=${getUserId(document.cookie)}`)}>
67+
<b>Everything assigned to you</b>
68+
</div>
69+
<div onClick={() => onClickFilter(`mentions=${getUserId(document.cookie)}`)}>
70+
<b>Everything mentioning you</b>
71+
</div>
72+
<div onClick={() => onClickFilter('open=0')}>
73+
<b>Closed Issues</b>
74+
</div>
6075
</FilterWrapper>
6176
)}
6277
</div>

0 commit comments

Comments
 (0)