Skip to content

Commit ec41811

Browse files
committed
Include sidebar in fullscreen chat
1 parent ca09327 commit ec41811

File tree

4 files changed

+29
-18
lines changed

4 files changed

+29
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "notabug",
3-
"version": "0.3.3",
3+
"version": "0.3.3.1",
44
"private": true,
55
"dependencies": {
66
"babel-cli": "^6.26.0",

src/components/notabug/Chat.js

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import Promise from "promise";
2-
import React, { PureComponent, Fragment } from "react";
2+
import React, { PureComponent } from "react";
33
import debounce from "lodash/debounce";
4+
import { Subreddit } from "snew-classic-ui";
45
import { withRouter } from "react-router-dom";
5-
import { Header } from "snew-classic-ui";
6+
import { SidebarTitlebox } from "./SidebarTitlebox";
7+
import { LoginFormSide } from "./LoginSignupPage";
68
import { NavTab } from "./NavTab";
79
import { UserInfo } from "./UserInfo";
810
import { Link } from "./Link";
@@ -123,18 +125,27 @@ export class Chat extends PureComponent {
123125

124126
}
125127

126-
export const ChatPage = withRouter(({
128+
export const ChatPage = withRouter(injectState(({
129+
state: { notabugUser },
127130
match: { params: { topic } },
128131
}) => (
129-
<Fragment>
130-
<Header
131-
UserInfo={UserInfo}
132-
SrHeaderArea={() => null}
133-
NavTab={NavTab}
134-
Link={Link}
135-
siteprefix="t"
136-
subreddit={topic}
137-
/>
132+
<Subreddit
133+
Link={Link}
134+
SidebarTitlebox={SidebarTitlebox}
135+
FooterParent={() => null}
136+
SidebarSearch={() => null}
137+
LoginFormSide={LoginFormSide}
138+
RecentlyViewedLinks={() => null}
139+
AccountActivityBox={() => null}
140+
Timestamp={() => null}
141+
SrHeaderArea={() => null}
142+
UserInfo={UserInfo}
143+
NavTab={NavTab}
144+
username={notabugUser}
145+
subreddit={topic || ""}
146+
siteprefix="t"
147+
isShowingCustomStyleOption={false}
148+
>
138149
<Chat className="fullscreen-chat" isOpen />
139-
</Fragment>
140-
));
150+
</Subreddit>
151+
)));

src/index.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body > .content .link .midcol, .midcol-spacer { width: 6ex; }
1515

1616
.fullscreen-chat {
1717
background-color: white;
18-
right: 0;
18+
right: 310px;
1919
left: 0;
2020
width: auto;
2121
height: auto;

src/state/notabug/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ const initialState = ({ history }) => {
1919
countVotes: COUNT_VOTES,
2020
disableValidation: true,
2121
peers: [
22-
window.location.origin + "/gun",
23-
//"https://notabug.io/gun",
22+
//window.location.origin + "/gun",
23+
"https://notabug.io/gun",
2424
]
2525
});
2626

0 commit comments

Comments
 (0)