Skip to content

Commit fb20260

Browse files
AuraOfDivinityAuraOfDivinity
authored
GSoC frontend - Proposal dashboard page implementation (#474)
* GSoC frontend - Proposal dashboard page implementation * refactoring components-modals (#468) * Inconsistency fix and backend integration, worked on events client side (#470) * fixed some client side issues and integrated backend * Make build.sh executable
1 parent 67247c3 commit fb20260

37 files changed

+2067
-33
lines changed

‎src/css/components/_modals.scss‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.modal {
22
border-radius: 20px;
33
.modal-content {
4-
border-radius: 10px;
5-
max-height: 70vh;
6-
width: 66%;
7-
border: 0px;
8-
overflow-y: scroll;
9-
overflow-x: hidden;
4+
border-radius: 10px;
5+
max-height: 70vh;
6+
width: 66%;
7+
border: 0px;
8+
overflow-y: scroll;
9+
overflow-x: hidden;
1010
}
1111
.modal__header {
1212
.modal__title {
@@ -33,7 +33,7 @@
3333
}
3434
.modal__search {
3535
width: 100%;
36-
border: 1px solid #CCCCCC;
36+
border: 1px solid #cccccc;
3737
box-sizing: border-box;
3838
border-radius: 5px;
3939
padding-left: 5px;
@@ -44,23 +44,23 @@
4444
font-weight: normal;
4545
font-size: 15px;
4646
line-height: 5px;
47-
color: #90949C;
47+
color: #90949c;
4848
padding-top: 5px;
4949
padding-bottom: 5px;
5050
}
5151
}
5252
.modal__body {
5353
overflow-y: scroll;
54-
.modal__mini-title {
55-
font-family: $font-family-Inter;
56-
font-style: normal;
57-
font-weight: $font-weight-normal;
58-
font-size: 12px;
59-
line-height: 19px;
60-
color: $color-modal-miniheader;
61-
letter-spacing: 0.2em;
62-
padding-top: 5px;
63-
}
54+
.modal__mini-title {
55+
font-family: $font-family-Inter;
56+
font-style: normal;
57+
font-weight: $font-weight-normal;
58+
font-size: 12px;
59+
line-height: 19px;
60+
color: $color-modal-miniheader;
61+
letter-spacing: 0.2em;
62+
padding-top: 5px;
63+
}
6464
.modal__form {
6565
.modal__row {
6666
.modal__group {
@@ -94,10 +94,15 @@
9494
margin-left: 0px;
9595
margin-top: -0.3em;
9696
border-radius: 50%;
97-
border: 1px solid #CCCCCC;
97+
border: 1px solid #cccccc;
9898
box-sizing: border-box;
9999
border-radius: 5px;
100100
}
101+
.modal__textSelection {
102+
font-style: italic;
103+
display: block;
104+
color: #6c757d;
105+
}
101106
}
102107
}
103108
.modal__secondary-title {
@@ -119,7 +124,7 @@
119124
justify-content: center;
120125
align-items: center;
121126
.follower__image {
122-
border: 1px solid #E6E6E5;
127+
border: 1px solid #e6e6e5;
123128
border-radius: 5px;
124129
min-width: 56px;
125130
margin-left: 10px;
@@ -181,7 +186,7 @@
181186
justify-content: center;
182187
align-items: center;
183188
.member__image {
184-
border: 1px solid #E6E6E5;
189+
border: 1px solid #e6e6e5;
185190
border-radius: 5px;
186191
min-width: 56px;
187192
margin-left: 10px;
@@ -222,7 +227,7 @@
222227
display: block;
223228
}
224229
.modal__remove__followButton {
225-
border: 1px solid #EB5757;
230+
border: 1px solid #eb5757;
226231
box-sizing: border-box;
227232
box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
228233
border-radius: 34px;
@@ -238,7 +243,7 @@
238243
font-weight: 500;
239244
font-size: 12px;
240245
line-height: 15px;
241-
color: #EB5757;
246+
color: #eb5757;
242247
}
243248
}
244249
}
@@ -256,7 +261,7 @@
256261
display: flex;
257262
.invite__btn {
258263
margin-left: 3px;
259-
background: #1A73E8;
264+
background: #1a73e8;
260265
box-shadow: 1.26667px 2.53333px 6.33333px rgba(0, 0, 0, 0.1);
261266
border-radius: 43.0667px;
262267
width: 83px;
@@ -269,7 +274,7 @@
269274
flex-wrap: wrap;
270275
.invite__btn {
271276
margin-right: 10px;
272-
background: #1A73E8;
277+
background: #1a73e8;
273278
box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
274279
border-radius: 20px;
275280
width: 83px;
@@ -282,7 +287,7 @@
282287
font-weight: normal;
283288
font-size: 13px;
284289
line-height: 16px;
285-
color: #90949C;
290+
color: #90949c;
286291
width: 100%;
287292
padding-top: 1em;
288293
}

‎src/images/userIcon2.jpg‎

28.3 KB
Loading

‎src/router.js‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ import ProjInfo from "./user/projects/proj-info/proj-info";
1212
import PrivateRoute from "./common/PrivateRoute";
1313
import Maintenance from "./maintenance/maintenance";
1414
import Events from "./user/events/events";
15+
import UserProposalDashboard from "./user/proposals/UserProposalDashboard/UserProposalDashboard";
16+
import AdminProposalDashboard from "./user/proposals/AdminProposalDashboard/AdminProposalDashboard";
17+
import ProposalDiscussion from "./user/proposals/ProposalDiscussion/ProposalDiscussion";
18+
import ProposalEditor from "./user/proposals/ProposalEditor/ProposalEditor";
1519
import Admin from "./user/Admin/Admin";
1620
import Setup from "./user/setup/Setup";
1721
import CommunitySetting from "./user/dashboard/Community/CommunitySetting";
1822
import Insight from "./user/dashboard/insights/Insight";
1923

20-
2124
const Router = () => (
2225
<BrowserRouter>
2326
<Switch>
@@ -29,13 +32,30 @@ const Router = () => (
2932
<PrivateRoute exact path="/profile" component={Profile} />
3033
<PrivateRoute exact path="/:id/proj-info" component={ProjInfo} />
3134
<PrivateRoute exact path="/organization" component={Organization} />
32-
<PrivateRoute exact path="/settings" component={Settings}/>
35+
<PrivateRoute exact path="/settings" component={Settings} />
3336
<PrivateRoute exact path="/projects" component={Projects} />
3437
<PrivateRoute exact path="/events" component={Events} />
38+
<PrivateRoute exact path="/proposal" component={UserProposalDashboard} />
39+
<PrivateRoute
40+
exact
41+
path="/adminproposal"
42+
component={AdminProposalDashboard}
43+
/>
44+
<PrivateRoute
45+
exact
46+
path="/proposalDiscussion"
47+
component={ProposalDiscussion}
48+
/>
49+
<PrivateRoute
50+
exact
51+
path="/adminproposal"
52+
component={AdminProposalDashboard}
53+
/>
54+
<PrivateRoute exact path="/proposaleditor" component={ProposalEditor} />
3555
<PrivateRoute exact path="/setup" component={Setup} />
3656
<PrivateRoute exact path="/org-settings" component={CommunitySetting} />
3757
<PrivateRoute exact path="/insight" component={Insight} />
38-
<PrivateRoute exact path="/admin" component={Admin}/>
58+
<PrivateRoute exact path="/admin" component={Admin} />
3959
<Route component={NotFound} />
4060
</Switch>
4161
</BrowserRouter>

‎src/svgs/luke_1.jpg‎

28.3 KB
Loading

‎src/user/dashboard/dashboard.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
height: auto;
55
font-family: Muli, sans-serif;
66
.navigation {
7-
flex: 1;
7+
flex-grow: 1;
88
border-right: solid 1px #dfe9f1;
99
}
1010
.news {
11-
flex: 4;
11+
flex-grow: 4;
1212
.notify-user {
1313
display: flex;
1414
padding: 20px 0px 20px 30px;
1515
}
1616
}
1717
.promotions {
18-
flex: 2;
18+
flex-grow: 2;
1919
padding: 20px 12px 20px 0px;
2020
}
2121
}

‎src/user/pinned-posts/posts/posts.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { Component } from "react";
22
import "./posts.scss";
3-
import gsoc from "../../../images/gsoc.png";
3+
import userIcon2 from "../../../images/gsoc.png";
44

55
class Posts extends Component {
66
state = { date: new Date() };

‎src/user/proposals/AdminProposalDashboard/AdminProposalDashboard.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import React, { Component } from "react";
2+
import "./AdminProposalDashboard.scss";
3+
import Navigation from "../../dashboard/navigation/navigation";
4+
import DashboardContent from "./DashboardContent/DashboardContent";
5+
import DashboardRightPanel from "./DashboardRightPanel/DashboardRightPanel";
6+
7+
class UserProposalDashboard extends Component {
8+
constructor(props) {
9+
super(props);
10+
this.state = {
11+
dashboard: true,
12+
isLoading: true,
13+
};
14+
}
15+
render() {
16+
return (
17+
<div className="dashboard">
18+
<div className="dashboard__navigation">
19+
<Navigation dashboard={this.state.dashboard} />
20+
</div>
21+
<div className="dashboard__content">
22+
<DashboardContent />
23+
</div>
24+
<div className="dashboard__rightpanel">
25+
<DashboardRightPanel />
26+
</div>
27+
</div>
28+
);
29+
}
30+
}
31+
32+
export default UserProposalDashboard;

‎src/user/proposals/AdminProposalDashboard/AdminProposalDashboard.scss‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.dashboard {
2+
display: flex;
3+
min-height: 100vh;
4+
height: auto;
5+
font-family: Muli, sans-serif;
6+
.dashboard__navigation {
7+
flex: 1;
8+
border-right: solid 1px #dfe9f1;
9+
}
10+
.dashboard__content {
11+
flex: 4;
12+
}
13+
.dashboard__rightpanel {
14+
flex: 1.5;
15+
}
16+
}

0 commit comments

Comments
 (0)