Skip to content

Commit 20e6fa4

Browse files
committed
Comment font and searched user changes
1 parent 4b43800 commit 20e6fa4

File tree

6 files changed

+20
-38
lines changed

6 files changed

+20
-38
lines changed

client/src/App.tsx

+1-13
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,4 @@ function App() {
3131
);
3232
}
3333

34-
export default App;
35-
36-
// Profile Page Setup
37-
// Profile API
38-
// --> Name, Pic, Description, About, Social Links
39-
// Skills
40-
// Past Projects/Contracts
41-
42-
// Decide a coloe scheme
43-
// Work on Auth Pages
44-
// Post Pages
45-
// Profile Page
46-
// Chat Pages
34+
export default App;

client/src/Components/GeneralComp/SearchedUser.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const Section = styled.div`
1818
img {
1919
width: 2rem;
2020
height: 2rem;
21+
object-fit: cover;
2122
margin-right: 0.6rem;
2223
border-radius: 50%;
2324
-webkit-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);

client/src/Components/ProfileComp/profileModals/UpdateSkills.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ const UpdateSkills = ({ modalFunction, userSkills, userToken }: skillModalProps)
153153
}
154154
};
155155

156+
const removeSkill = (selectedSkill:string) => {
157+
setSkillArr(skillArr => skillArr.filter(skill => skill !== selectedSkill))
158+
}
159+
156160
const updateSkillHandler = async () => {
157161
const { data } = await axios.patch(`${BASE_URL}${userEnd}me/skills`, {
158162
skills: skillArr
@@ -171,7 +175,7 @@ const UpdateSkills = ({ modalFunction, userSkills, userToken }: skillModalProps)
171175
return (
172176
<SkillBadge key={index}>
173177
<h5>{skill}</h5>
174-
<div>
178+
<div onClick={() => removeSkill(skill)} >
175179
<GrFormClose />
176180
</div>
177181
</SkillBadge>

client/src/Components/commentComp/CommentFeed.tsx

+8-24
Original file line numberDiff line numberDiff line change
@@ -13,46 +13,39 @@ const Section = styled.div`
1313
padding: 0.4rem;
1414
margin: 0rem 0rem 1.2rem 1.2rem;
1515
box-sizing: border-box;
16-
/* border: 1px solid purple; */
1716
border-radius: 10px;
1817
-webkit-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
19-
-moz-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
20-
box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
21-
/* background-color: #fff; */
18+
-moz-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
19+
box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
20+
/* border: 1px solid purple; */
2221
`;
2322

2423
const CommentAuthor = styled.div`
2524
display: flex;
26-
/* align-items: center; */
27-
/* border: 1px solid yellow; */
28-
2925
img {
3026
width: 2.5rem;
3127
height: 2.5rem;
3228
border-radius: 50%;
3329
object-fit: cover;
3430
margin-right: 0.6rem;
35-
-webkit-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
31+
-webkit-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
3632
-moz-box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
3733
box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.22);
3834
}
3935
`;
4036

4137
const AboutAuthor = styled.div`
4238
43-
4439
h4{
45-
font-size: 0.8rem;
46-
font-weight: 600;
40+
font-size: 0.75rem;
41+
font-weight: 400;
4742
width: 93.5%;
4843
overflow: hidden;
4944
white-space: nowrap;
50-
/* border: 1px solid red; */
5145
}
5246
`;
5347

5448
const AuthorName = styled.div`
55-
/* border: 1px solid red; */
5649
display: flex;
5750
text-align: center;
5851
align-items: center;
@@ -62,31 +55,22 @@ width: calc(37vw - 4rem);
6255
h3{
6356
font-size: 1rem;
6457
}
65-
66-
svg{
67-
/* border: 1px solid red; */
68-
/* margin-right: 0; */
69-
}
7058
`
7159

7260
const CommentOptions = styled.div`
7361
position: relative;
7462
right: 0.5rem;
7563
top: 2px;
76-
/* margin: auto 0; */
7764
cursor: pointer;
78-
svg {
79-
/* width: 3vw; */
80-
}
8165
`;
8266

8367
const CommentContent = styled.div`
8468
margin-top: 0.5rem;
8569
padding-left: 0.5rem;
86-
/* border: 1px solid blue; */
8770
p{
88-
font-size: 0.9rem;
71+
font-size: 0.75rem;
8972
line-height: 150%;
73+
font-weight: 600;
9074
}
9175
9276
input{

client/src/Components/contractComp/ContractApproval.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ const ContractApproval = ({ selectedChat, user }: contractApprovalProps) => {
5959
}
6060
);
6161
console.log(data);
62+
window.location.reload();
6263
};
6364

6465
return (

controllers/contractController.js

+4
Original file line numberDiff line numberDiff line change
@@ -493,3 +493,7 @@ exports.leaveContract = catchAsync(async (req,res) => {
493493
})
494494

495495
})
496+
497+
exports.submitWorkToBrokenContract = catchAsync(async (req,res) => {
498+
499+
})

0 commit comments

Comments
 (0)