Skip to content

Integrating discussion landing #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 12, 2020
Merged

Integrating discussion landing #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0699564
Integrating the Discussion with Landing
DevanshCodes Jun 27, 2020
12e499a
Merge branch 'development' into integrating-discussion-landing
DevanshCodes Jun 27, 2020
09e1ce8
fixed the issues
DevanshCodes Jul 12, 2020
93ff601
Merge branch 'integrating-discussion-landing' of https://github.com/D…
DevanshCodes Jul 12, 2020
b41f6f4
fixed errors
DevanshCodes Jul 12, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 133 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@
"@testing-library/user-event": "^7.1.2",
"@tinymce/tinymce-react": "^3.6.0",
"draft-js": "^0.11.6",
"html-react-parser": "^0.13.0",
"node-sass": "^4.14.1",
"react": "^16.13.1",
"react-beautiful-dnd": "^13.0.0",
"react-bootstrap": "^1.0.1",
"react-dom": "^16.13.1",
"react-html-parser": "^2.0.2",
"react-icons": "^3.10.0",
"react-markdown-renderer": "^1.4.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.1"
"react-scripts": "3.4.1",
"remarkable": "^2.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
9 changes: 5 additions & 4 deletions src/components/editor/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from "react";
import {Button } from "react-bootstrap";
import { Button } from "react-bootstrap";
import { Editor } from "@tinymce/tinymce-react";
import "./editor.scss"
import "./editor.scss";

class EditorChat extends Component {
constructor(props) {
Expand All @@ -16,7 +16,6 @@ class EditorChat extends Component {
}
handleEditorChange(content) {
this.setState({ content });
console.log(content);
}
handleSubmit(e) {
e.preventDefault();
Expand All @@ -32,9 +31,11 @@ class EditorChat extends Component {
<div className="discussionHeader">Write a New Discussion</div>
<Editor
initialValue="<p>Newb Content</p>"
id="uuid"
apiKey="8kftszxlfioswims1pl978knfa7p4qyoknx7afc7tvsvzruh"
outputFormat="html"
init={{
height: 600,
height: 400,
menubar: false,
branding: false,
plugins: [
Expand Down
26 changes: 16 additions & 10 deletions src/components/projects/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import projectInfo1 from "../../jsonData/projects";
import { IconContext } from "react-icons";
import { FiPlus } from "react-icons/fi";
import { Droppable, DragDropContext, Draggable } from "react-beautiful-dnd";
import TopicForm from '../../components/topicform/topicform';
import TopicForm from "../../components/topicform/topicform";


class Projects extends Component {
state = projectInfo1;
Expand All @@ -14,24 +15,23 @@ class Projects extends Component {
this.state = {
projectInfo1: projectInfo1,
showModal: false,
topic:"",
topicDescription:"",
projectID: ""
topic: "",
topicDescription: "",
projectID: "",
};
this.onDragEnd = this.onDragEnd.bind(this);
this.handleShow = this.handleShow.bind(this);
this.handleClose = this.handleClose.bind(this);
}
handleTopicSubmission(topic,topicDescription){
handleTopicSubmission(topic, topicDescription) {
this.setState({
topic:topic,
topicDescription:topicDescription
topic: topic,
topicDescription: topicDescription,
});

}
handleShow(projectID) {
// e.preventDefault();
this.setState({ showModal: true});
this.setState({ showModal: true });
}
handleClose() {
this.setState({ showModal: false });
Expand Down Expand Up @@ -106,7 +106,12 @@ class Projects extends Component {
<Modal show={this.state.showModal} onHide={this.handleClose} centered>
<div className="modalbody">
<Modal.Body>
<TopicForm topic={this.state.topic} topicDescription={this.state.topicDescription} projectID = {this.state.projectID} onTopicSubmission= {this.handleTopicSubmission}/>
<TopicForm
topic={this.state.topic}
topicDescription={this.state.topicDescription}
projectID={this.state.projectID}
onTopicSubmission={this.handleTopicSubmission}
/>
</Modal.Body>
</div>
</Modal>
Expand Down Expand Up @@ -138,6 +143,7 @@ class Projects extends Component {
<Draggable draggableId={topic.id} index={index}>
{(provided) => (
<Card
onClick={() => this.props.handleDiscussionTrue(topic.discussionID)}
key={topic.id}
className="topicscard"
{...provided.draggableProps}
Expand Down
6 changes: 3 additions & 3 deletions src/components/sidebar/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ const Side = (props) => {
</Nav.Item>
<Nav.Item>
<div className="category-items">
{props.DiscussionInfo.Discussion.chats.length} Discussion
{props.DiscussionInfo.chats.length} Discussion
</div>
<div className="category-items">0 Documents Shared</div>
<div className="category-items">
{props.UserInfo.UserEngaged.length} Users Participated
{props.UserInfo.length} Users Participated
</div>
</Nav.Item>
</div>
Expand All @@ -30,7 +30,7 @@ const Side = (props) => {
<div className="category">Users</div>
</Nav.Item>
<Nav.Item>
{props.UserInfo.UserEngaged.map((user) => {
{props.UserInfo.map((user) => {
return <div className="category-items">{user}</div>;
})}
</Nav.Item>
Expand Down
15 changes: 13 additions & 2 deletions src/components/sidebar/sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
@media (max-width: 1200px) {
.sidebar {
display: none;
}
}
.sidebar {
position: fixed;
top: 0;
bottom: 0;
left: 0;
min-height: 93.5vh;
min-height: 92.5vh;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. need to fix the hight issue the height of the navbar looks in appropriate.
    image

  2. Navbar content overlaps below 1050px. Responsiveness needs to be taken into handle.
    image
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool will work on that!
z-index: 100;
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
}
Expand All @@ -30,7 +35,7 @@
}
}
#sidebar-wrapper {
min-height: 93.5vh;
min-height: 92.6vh;
width: 100vw;
margin-left: -1rem;
-webkit-transition: margin 0.25s ease-out;
Expand All @@ -47,3 +52,9 @@
min-width: 0;
width: 100%;
}

@media (max-width: 1200px) {
.sidebar {
display: none;
}
}
Loading