+
+
{view === "org" ? communityInfo : memberInfo}
@@ -52,7 +70,7 @@ class Insight extends Component {
}
}
-// map state to props
+// map state to props
const mapStateToProps = (state) => ({
user: state.user
})
diff --git a/src/user/dashboard/insights/insight.scss b/src/user/dashboard/insights/insight.scss
index 636a4df0..90c0ab98 100644
--- a/src/user/dashboard/insights/insight.scss
+++ b/src/user/dashboard/insights/insight.scss
@@ -1,6 +1,8 @@
+@import "../../sidebarCommon";
+
.insight_main_container {
display: flex;
- .insight_left_nav {
+ /*.insight_left_nav {
border-right: solid 1px #dfe9f1;
position: fixed;
top: 0px;
@@ -8,10 +10,11 @@
left: 0px;
overflow-y: scroll;
background: #f5f5f5;
- }
+ }*/
+
.right_view_container {
.right_view {
- margin-left: 13vw;
+ //margin-left: 13vw;
margin-top: 10px;
.right_view_header {
font-family: Qanelas;
diff --git a/src/user/dashboard/navigation/navigation.scss b/src/user/dashboard/navigation/navigation.scss
index 3d8de512..bd3aac1a 100644
--- a/src/user/dashboard/navigation/navigation.scss
+++ b/src/user/dashboard/navigation/navigation.scss
@@ -1,5 +1,5 @@
.main-navigation {
- width: 13vw;
+ //width: 13vw;
.list-group {
background-color: #f5f5f5;
.list-group-item {
diff --git a/src/user/dashboard/settings/Settings.js b/src/user/dashboard/settings/Settings.js
index e75f3731..0bcc1bc6 100644
--- a/src/user/dashboard/settings/Settings.js
+++ b/src/user/dashboard/settings/Settings.js
@@ -7,21 +7,39 @@ class Settings extends Component {
constructor(props){
super(props);
this.state = {
- settings: true
- }
+ settings: true,
+ sideBarOpen: true,
+ };
}
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
-
-
-
-
-
+
+
+
+
+
+
+
)
}
}
export default Settings;
-
diff --git a/src/user/dashboard/settings/styles/settings.scss b/src/user/dashboard/settings/styles/settings.scss
index 284e9b3f..67408a65 100644
--- a/src/user/dashboard/settings/styles/settings.scss
+++ b/src/user/dashboard/settings/styles/settings.scss
@@ -1,10 +1,12 @@
+@import "../../../sidebarCommon";
+
.settings {
display: flex;
min-height: 100vh;
height: auto;
font-family: Muli, sans-serif;
- .navigation {
+ /*.navigation {
background: #f5f5f5;
flex-grow: 1;
border-right: solid 1px #dfe9f1;
@@ -13,14 +15,15 @@
bottom: 0px;
left: 0px;
overflow-y: scroll;
- }
+ }*/
+
.setting-sidebar {
border-left: solid 1px #dfe9f1;
}
.settings-content {
flex: 3;
- margin-left: 13vw;
+ //margin-left: 13vw;
}
.options {
color: rgba(0, 0, 0, 0.5);
diff --git a/src/user/events/events.js b/src/user/events/events.js
index 0689a436..328410d8 100644
--- a/src/user/events/events.js
+++ b/src/user/events/events.js
@@ -28,6 +28,7 @@ class Events extends Component {
singleEvent: {},
editAllowed: true,
editingLimit: "",
+ sideBarOpen: true,
};
}
@@ -63,10 +64,14 @@ class Events extends Component {
console.log("page number ", pageNumber);
this.props.getAllEvents(6, pageNumber);
};
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
const { allEvents, editingLimit } = this.state;
-
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
const handleToggle = (eventId, event) => {
console.log("-handletoggel", eventId);
this.setState({ modalShow: true, eventId: eventId, singleEvent: event });
@@ -273,9 +278,22 @@ class Events extends Component {
return (
-
+
+
All Events
diff --git a/src/user/events/events.scss b/src/user/events/events.scss
index 4f8c4ea8..89ef6879 100644
--- a/src/user/events/events.scss
+++ b/src/user/events/events.scss
@@ -1,9 +1,11 @@
+@import "../sidebarCommon";
+
.organization {
display: flex;
min-height: 100vh;
height: auto;
font-family: Muli, sans-serif;
- .navigation {
+ /*.navigation {
background: #f5f5f5;
flex-grow: 1;
border-right: solid 1px #dfe9f1;
@@ -12,7 +14,8 @@
bottom: 0px;
left: 0px;
overflow-y: scroll;
- }
+ }*/
+
.events {
padding: 20px;
margin-top: 2vh;
diff --git a/src/user/integrations/IntegrationsPage/IntegrationsPage.js b/src/user/integrations/IntegrationsPage/IntegrationsPage.js
index 485f7ee8..c25fde19 100644
--- a/src/user/integrations/IntegrationsPage/IntegrationsPage.js
+++ b/src/user/integrations/IntegrationsPage/IntegrationsPage.js
@@ -18,19 +18,39 @@ import Jitsi from '../../../assets/integrations/Jitsi.png'
import Trello from '../../../assets/integrations/Trello.png'
import SimplePoll from '../../../assets/integrations/SimplePoll.png'
+
class IntegrationsPage extends Component {
constructor(props) {
super(props);
this.state = {
integrations: true,
+ sideBarOpen: true,
};
}
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
+
+
Integrations
@@ -48,146 +68,145 @@ class IntegrationsPage extends Component {
+
+
+
+
+
+ Google Calendar
+
+
+ Communication
+
+
+
+
+
-
-
-
-
-
- Google Calendar
-
-
- Communication
-
-
-
-
-
-
-
-
-
-
-
- Google Drive
-
-
- File Management
-
-
-
-
-
+
+
+
+
+
+ Google Drive
+
+
+ File Management
+
+
+
+
+
-
-
-
-
-
- Github
-
-
- Source Control
-
-
-
-
-
-
-
-
-
-
- Jitsi Meet
-
-
- Communication
-
-
-
-
-
+
+
+
+
+
+ Github
+
+
+ Source Control
+
+
+
+
+
+
+
+
+
+
+ Jitsi Meet
+
+
+ Communication
+
+
+
+
+
-
-
-
-
-
- Simple Poll
-
-
- Productivity
-
-
-
-
-
-
-
-
-
-
- Trello
-
-
- Communication
-
-
-
-
-
+
+
+
+
+
+ Simple Poll
+
+
+ Productivity
+
+
+
+
+
+
+
+
+
+
+ Trello
+
+
+ Communication
+
+
+
+
+
diff --git a/src/user/integrations/IntegrationsPage/IntegrationsPage.scss b/src/user/integrations/IntegrationsPage/IntegrationsPage.scss
index 1eda3668..0e9e7630 100644
--- a/src/user/integrations/IntegrationsPage/IntegrationsPage.scss
+++ b/src/user/integrations/IntegrationsPage/IntegrationsPage.scss
@@ -3,11 +3,11 @@
min-height: 100vh;
height: auto;
font-family: "Inter";
- .navigation {
+ /*.navigation {
flex: 0.5;
border-right: solid 1px #dfe9f1;
- }
+ }*/
.integrations-content {
width: 100%;
flex: 3;
@@ -81,8 +81,8 @@
text-align: center;
border-radius: 25px;
font-size: 15px;
- color: #1A73E8;
- background-color: #FFFFFF;
+ color: #1a73e8;
+ background-color: #ffffff;
width: 60%;
}
}
diff --git a/src/user/integrations/UserIntegrations/UserIntegrations.js b/src/user/integrations/UserIntegrations/UserIntegrations.js
index 21040eb3..6d72527d 100644
--- a/src/user/integrations/UserIntegrations/UserIntegrations.js
+++ b/src/user/integrations/UserIntegrations/UserIntegrations.js
@@ -12,6 +12,7 @@ class UserIntegrations extends Component {
integrations: true,
integrationSelected: false,
selectedIntegration: {},
+ sideBarOpen: true,
};
}
@@ -28,15 +29,31 @@ class UserIntegrations extends Component {
integrationSelected: false,
});
};
-
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
const { integrationSelected, selectedIntegration } = this.state;
-
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
+
+
{integrationSelected ? (
{
- this.setState({ type: type })
- }
+ this.setState({ type: type });
+ };
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
const { orgProfile, type } = this.state;
@@ -52,11 +57,25 @@ class Organization extends Component {
description,
// contactInfo
} = orgProfile;
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
+
+
{this.state.isLoading ? (
topBarLoading()
diff --git a/src/user/organization/organization.scss b/src/user/organization/organization.scss
index 16bd730e..5cc0c256 100644
--- a/src/user/organization/organization.scss
+++ b/src/user/organization/organization.scss
@@ -3,7 +3,7 @@
min-height: 100vh;
height: auto;
font-family: "Inter";
- .navigation {
+ /*.navigation {
overflow-y: scroll;
background: #f5f5f5;
flex: 0.5;
@@ -12,14 +12,15 @@
top: 0px;
bottom: 0px;
left: 0px;
- }
+ }*/
+
h2 {
font-size: 20px;
font-weight: bold;
font-family: "Inter";
}
.news {
- margin-left: 2vw;
+ //margin-left: 2vw;
flex: 3;
.notify-user {
display: flex;
diff --git a/src/user/pinned-posts/pinned-posts.js b/src/user/pinned-posts/pinned-posts.js
index 1e1e48d6..f1d5221c 100644
--- a/src/user/pinned-posts/pinned-posts.js
+++ b/src/user/pinned-posts/pinned-posts.js
@@ -10,6 +10,7 @@ class PinnedPosts extends Component {
this.state = {
isLoading: true,
pinned_posts: true,
+ sideBarOpen: true,
};
}
@@ -18,13 +19,30 @@ class PinnedPosts extends Component {
this.setState({ isLoading: false });
}, 1000);
}
-
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
+
+
{this.state.isLoading ? pinnedPostsLoading() :
}
diff --git a/src/user/pinned-posts/pinned-posts.scss b/src/user/pinned-posts/pinned-posts.scss
index 6713d1f1..1ef83939 100644
--- a/src/user/pinned-posts/pinned-posts.scss
+++ b/src/user/pinned-posts/pinned-posts.scss
@@ -1,17 +1,20 @@
+@import "../sidebarCommon";
+
.pinned-posts {
display: flex;
min-height: 100vh;
height: auto;
font-family: Muli, sans-serif;
- h1{
+ h1 {
font-size: 26px;
font-weight: bold;
font-family: Muli, sans-serif;
}
- .navigation {
+ /*.navigation {
flex: 0.5;
border-right: solid 1px #dfe9f1;
- }
+ }*/
+
.news {
flex: 2;
.notify-user {
@@ -23,10 +26,10 @@
flex: 1;
margin: 20px 20px;
}
- .Pinned-post{
+ .Pinned-post {
padding: 20px 12px 0px 30px;
}
- .organization-update{
+ .organization-update {
padding: 20px 12px 0px 0px;
}
}
diff --git a/src/user/profile/profile.js b/src/user/profile/profile.js
index 82207167..ab60fbb2 100644
--- a/src/user/profile/profile.js
+++ b/src/user/profile/profile.js
@@ -26,6 +26,7 @@ class Profile extends Component {
userPosts: [],
pinnedPosts: [],
userId: "",
+ sideBarOpen: true,
};
}
@@ -71,7 +72,10 @@ class Profile extends Component {
}
);
}
-
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
const {
userProfile,
@@ -81,16 +85,30 @@ class Profile extends Component {
userPosts,
pinnedPosts,
} = this.state;
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
+
diff --git a/src/user/profile/profile.scss b/src/user/profile/profile.scss
index 94435f40..2c938c65 100644
--- a/src/user/profile/profile.scss
+++ b/src/user/profile/profile.scss
@@ -1,9 +1,11 @@
+@import "../sidebarCommon";
+
.profile {
display: flex;
min-height: 100vh;
height: auto;
font-family: Muli, sans-serif;
- .navigation {
+ /*.navigation {
flex: 0.5;
border-right: solid 1px #dfe9f1;
position: fixed;
@@ -11,13 +13,14 @@
bottom: 0px;
left: 0px;
overflow-y: scroll;
- }
+ }*/
+
h2 {
font-size: 22px;
font-weight: 650;
}
.news {
- margin-left: 13vw;
+ //margin-left: 13vw;
flex: 3;
.notify-user {
display: flex;
diff --git a/src/user/projects/proj-info/proj-info.js b/src/user/projects/proj-info/proj-info.js
index ab28b74b..05862160 100644
--- a/src/user/projects/proj-info/proj-info.js
+++ b/src/user/projects/proj-info/proj-info.js
@@ -15,7 +15,6 @@ import { getProjectById } from '../../../actions/projectAction'
import { checkDeleteRights } from '../../dashboard/utils/checkDeleteRights'
import Moment from 'react-moment'
-
class ProjInfo extends Component {
constructor(props) {
super(props);
@@ -26,13 +25,14 @@ class ProjInfo extends Component {
deleteProject: false,
githubLink: '',
bitBucketLink: '',
- techStacks: []
+ techStacks: [],
+ sideBarOpen: true,
};
}
componentDidMount() {
- console.log('project info mounted ',this.props)
- // fetch the data from db
+ console.log('project info mounted ', this.props)
+ // fetch the data from db
setTimeout(() => {
this.props.getProjectById(this.props.match.params.id)
})
@@ -47,7 +47,10 @@ class ProjInfo extends Component {
const { links } = singleProject
this.setState({ githubLink: links[0]?.githubLink, bitBucketLink: links[0]?.bitBucketLink })
}
-
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
const { projectInfo, editProject, proj, deleteProject, githubLink, bitBucketLink, techStacks } = this.state
@@ -100,18 +103,39 @@ class ProjInfo extends Component {
//
// ));
- let variant = ["primary", "secondary", "success", "danger", "warning", "light", "dark"]
+ let variant = [
+ "primary",
+ "secondary",
+ "success",
+ "danger",
+ "warning",
+ "light",
+ "dark",
+ ];
const techBadge = techStacks?.map((techs, index) => (
{techs}{" "}
))
-
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
return (
-
+
+
@@ -161,11 +185,11 @@ class ProjInfo extends Component {
) : null}
-
+
{techBadge}
@@ -174,10 +198,10 @@ class ProjInfo extends Component {
- Created At:
-
- {projectInfo?.createdAt}
-
+ Created At:
+
+ {projectInfo?.createdAt}
+
{" "}
Updated At:
@@ -187,7 +211,7 @@ class ProjInfo extends Component {
{projectInfo.description?.short || "Short description"}
-
+
@@ -224,7 +248,7 @@ class ProjInfo extends Component {
}
}
-// map state to props
+// map state to props
const mapStateToProps = (state) => ({
auth: state.auth,
error: state.error,
diff --git a/src/user/projects/proj-info/proj-info.scss b/src/user/projects/proj-info/proj-info.scss
index 376389dc..9a46a713 100644
--- a/src/user/projects/proj-info/proj-info.scss
+++ b/src/user/projects/proj-info/proj-info.scss
@@ -1,15 +1,15 @@
.container {
margin-top: 2vh;
- .back{
- position:fixed;
+ .back {
+ position: fixed;
z-index: 2;
- top:0;
- left:15%;
+ top: 0;
+ left: 15%;
}
}
-.proj_img{
- height:15rem;
+.proj_img {
+ height: 15rem;
margin-left: 1vw;
max-width: 23vw;
max-height: 42vh;
@@ -20,30 +20,30 @@
flex: 1;
padding: 10px 14px;
h1 {
- color: #2D2D2D;
+ color: #2d2d2d;
font-size: 40px;
font-weight: 500;
margin: 0;
padding: 0;
}
- .createAt{
+ .createAt {
font-family: Inter;
font-style: normal;
font-weight: normal;
- color: #2D2D2D;
+ color: #2d2d2d;
font-size: 12px;
margin: 4px 0;
padding: 0;
}
- .tech-stack{
+ .tech-stack {
margin-top: 3vh;
}
.short_des {
font-family: Inter;
font-style: normal;
font-weight: normal;
- color: #2D2D2D;
+ color: #2d2d2d;
font-size: 18px;
font-weight: 500;
margin: 4px 0;
@@ -56,7 +56,7 @@
font-family: Inter;
font-style: normal;
font-weight: normal;
- color: #2D2D2D;
+ color: #2d2d2d;
font-size: 12px;
margin: 4px 0;
padding: 0;
@@ -68,17 +68,17 @@
font-weight: normal;
font-size: 1.5em;
line-height: 1.3em;
- color: #2D2D2D;
+ color: #2d2d2d;
text-align: justify;
max-width: 83%;
}
}
-.description{
- h1{
+.description {
+ h1 {
font-family: Inter;
font-style: normal;
- color: #2D2D2D;
+ color: #2d2d2d;
font-size: 27px;
margin: 0;
font-weight: 500;
@@ -86,24 +86,23 @@
text-align: left;
margin-left: 2%;
}
-
+
.desc {
font-family: Inter;
font-style: normal;
font-weight: normal;
font-size: 1.2em;
line-height: 1.3em;
- color: #2D2D2D;
+ color: #2d2d2d;
margin-left: 2%;
max-width: 83%;
}
margin-top: 5vh;
}
-
-.maintainers{
- h1{
- color: #2D2D2D;
+.maintainers {
+ h1 {
+ color: #2d2d2d;
font-size: 30px;
font-weight: bold;
margin: 0;
@@ -113,4 +112,3 @@
margin-top: 2vh;
margin-bottom: 1vh;
}
-
diff --git a/src/user/projects/projects.js b/src/user/projects/projects.js
index ce995d1b..fe4d0ee1 100644
--- a/src/user/projects/projects.js
+++ b/src/user/projects/projects.js
@@ -15,7 +15,8 @@ class Projects extends Component {
this.state = {
proj: true,
deleteproject: false,
- allProjects: []
+ allProjects: [],
+ sideBarOpen: true,
};
}
componentDidMount() {
@@ -40,10 +41,14 @@ class Projects extends Component {
handlePagination = (pageNumber) => {
console.log('page number ', pageNumber);
this.props.getAllProjects(6, pageNumber)
- }
-
+ };
+ handleViewSidebar = () => {
+ console.log(this.state.sideBarOpen);
+ this.setState({ sideBarOpen: !this.state.sideBarOpen });
+ };
render() {
- const { allProjects } = this.state
+ const { allProjects } = this.state;
+ var sideBarClass = this.state.sideBarOpen ? "sidebar-open" : "sidebar";
const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
@@ -63,7 +68,7 @@ class Projects extends Component {
});
let Projects = allProjects.map((Item, index) => (
-
+
-