Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/ui-sidenav/client/sideNav.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
</div>
</div>
<div class="rooms-list sidebar--custom-colors" aria-label="{{_ "Channels"}}" role="region">
<div style="display: flex; flex: 1 1 auto;">
{{> sidebarChats }}
</div>
{{> sidebarChats }}
</div>
<div class="wrapper-unread">
<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden">
Expand Down
5 changes: 4 additions & 1 deletion client/templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ createTemplateForComponent('messageLocation', () => import('./views/location/Mes
createTemplateForComponent('sidebarHeader', () => import('./sidebar/header'));

createTemplateForComponent('sidebarChats', () => import('./sidebar/RoomList/index'), {
attachment: 'at-parent',
renderContainerView: () =>
HTML.DIV({
style: 'display: flex; flex: 1 1 100%;',
}),
});

createTemplateForComponent(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Session } from './Session';
import { Session } from '../Session';

export class ClientSession extends Session {
async init(): Promise<string> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Session } from './Session';
import { Session } from '../Session';

export type ProcessString = (text: string[]) => string;
export type ProcessBuffer = (text: Buffer) => Buffer[];
Expand Down
2 changes: 1 addition & 1 deletion ee/client/ecdh.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';

import { APIClient } from '../../app/utils/client';
import { ClientSession } from '../app/ecdh/ClientSession';
import { ClientSession } from '../app/ecdh/client/ClientSession';

let resolveSession: (value: ClientSession | void) => void;
const sessionPromise = new Promise<ClientSession | void>((resolve) => {
Expand Down
2 changes: 1 addition & 1 deletion ee/server/services/ecdh-proxy/lib/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import express, { Request, Response } from 'express';
import cookieParser from 'cookie-parser';
import mem from 'mem';

import { ServerSession } from '../../../../app/ecdh/ServerSession';
import { ServerSession } from '../../../../app/ecdh/server/ServerSession';

const app = express();
app.use(cookieParser());
Expand Down
1 change: 1 addition & 0 deletions imports/client/poly1305-js
1 change: 1 addition & 0 deletions imports/client/sodium-native
Empty file.
15 changes: 15 additions & 0 deletions packages/react-fast-refresh/package.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Package.describe({
name: 'react-fast-refresh',
version: '0.1.0',
summary: 'Removed -update React components with HMR',
documentation: 'README.md',
devOnly: true,
});

Package.onUse(function(api) {
api.export('ReactFastRefresh');
api.use('modules');
api.addFiles('server.js', 'server');
api.addFiles('client-runtime.js', 'web.browser');
api.use('hot-module-replacement', { weak: true });
});
Empty file.