Skip to content
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

Jump to bottom

Convert rocketchat-custom-sounds to main module structure #12599

Merged
merged 6 commits into from
Nov 16, 2018
Merged

Convert rocketchat-custom-sounds to main module structure #12599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6179da1
Exposing SideNav variable from rocketchat-ui
MarcosSpessatto Nov 12, 2018
924ed70
Convert rocketchat-custom-sounds to main module structure
MarcosSpessatto Nov 12, 2018
bc80e05
Merge branch 'develop' into imports/main-module-custom-sounds
rodrigok Nov 16, 2018
2a6c55b
Fix RocketChatFileCustomSoundsInstance export
MarcosSpessatto Nov 16, 2018
b97f17f
Merge branch 'develop' into imports/main-module-custom-sounds
MarcosSpessatto Nov 16, 2018
ad40a83
Revert wrong settings in custom-sounds
MarcosSpessatto Nov 16, 2018
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
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/client/admin/adminSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { RocketChatTabBar } from 'meteor/rocketchat:lib';
import { Tracker } from 'meteor/tracker';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
import { RocketChat } from 'meteor/rocketchat:lib';
import { SideNav } from 'meteor/rocketchat:ui';
import s from 'underscore.string';

Template.adminSounds.helpers({
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/client/admin/soundEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import { t } from 'meteor/rocketchat:ui';
import { handleError } from 'meteor/rocketchat:lib';
import toastr from 'toastr';
import s from 'underscore.string';

Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/client/admin/soundInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
import { t, modal } from 'meteor/rocketchat:ui';
import { handleError } from 'meteor/rocketchat:lib';

Template.soundInfo.helpers({
name() {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/client/admin/startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

RocketChat.AdminBox.addOption({
href: 'custom-sounds',
i18nLabel: 'Custom_Sounds',
Expand Down
15 changes: 15 additions & 0 deletions packages/rocketchat-custom-sounds/client/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import '../assets/stylesheets/customSoundsAdmin.css';
import './lib/CustomSounds';
import './models/CustomSounds';
import './notifications/deleteCustomSound';
import './notifications/updateCustomSound';
import './admin/adminSoundEdit.html';
import './admin/adminSoundInfo.html';
import './admin/adminSounds.html';
import './admin/adminSounds';
import './admin/soundEdit.html';
import './admin/soundEdit';
import './admin/soundInfo.html';
import './admin/soundInfo';
import './admin/route';
import './admin/startup';
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/client/lib/CustomSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { RocketChat } from 'meteor/rocketchat:lib';
import _ from 'underscore';

class CustomSounds {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/client/models/CustomSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

class CustomSounds extends RocketChat.models._Base {
constructor() {
super();
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/client/notifications/deleteCustomSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(() =>
RocketChat.CachedCollectionManager.onLogin(() =>
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/client/notifications/updateCustomSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(() =>
RocketChat.CachedCollectionManager.onLogin(() =>
Expand Down
38 changes: 4 additions & 34 deletions packages/rocketchat-custom-sounds/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,10 @@ Package.onUse(function(api) {
'templating',
'reactive-var',
'webapp',
'kadira:flow-router',
'kadira:blaze-layout',
]);

api.use('kadira:flow-router', 'client');
api.use('kadira:blaze-layout', 'client');

api.addFiles('server/startup/custom-sounds.js', 'server');
api.addFiles('server/startup/permissions.js', 'server');
api.addFiles('server/startup/settings.js', 'server');

api.addFiles('server/models/CustomSounds.js', 'server');
api.addFiles('server/publications/customSounds.js', 'server');

api.addFiles([
'server/methods/deleteCustomSound.js',
'server/methods/insertOrUpdateSound.js',
'server/methods/listCustomSounds.js',
'server/methods/uploadCustomSound.js',
], 'server');

api.addFiles('assets/stylesheets/customSoundsAdmin.css', 'client');

api.addFiles('client/admin/startup.js', 'client');
api.addFiles('client/admin/adminSounds.html', 'client');
api.addFiles('client/admin/adminSounds.js', 'client');
api.addFiles('client/admin/adminSoundEdit.html', 'client');
api.addFiles('client/admin/adminSoundInfo.html', 'client');
api.addFiles('client/admin/soundEdit.html', 'client');
api.addFiles('client/admin/soundEdit.js', 'client');
api.addFiles('client/admin/soundInfo.html', 'client');
api.addFiles('client/admin/soundInfo.js', 'client');
api.addFiles('client/admin/route.js', 'client');

api.addFiles('client/lib/CustomSounds.js', 'client');
api.addFiles('client/models/CustomSounds.js', 'client');
api.addFiles('client/notifications/updateCustomSound.js', 'client');
api.addFiles('client/notifications/deleteCustomSound.js', 'client');
api.mainModule('client/index.js', 'client');
api.mainModule('server/index.js', 'server');
});
9 changes: 9 additions & 0 deletions packages/rocketchat-custom-sounds/server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import './startup/custom-sounds';
import './startup/permissions';
import './startup/settings';
import './models/CustomSounds';
import './methods/deleteCustomSound';
import './methods/insertOrUpdateSound';
import './methods/listCustomSounds';
import './methods/uploadCustomSound';
import './publications/customSounds';
3 changes: 2 additions & 1 deletion packages/rocketchat-custom-sounds/server/methods/deleteCustomSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* globals RocketChatFileCustomSoundsInstance */
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';

Meteor.methods({
deleteCustomSound(_id) {
Expand Down
3 changes: 2 additions & 1 deletion packages/rocketchat-custom-sounds/server/methods/insertOrUpdateSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* globals RocketChatFileCustomSoundsInstance */
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';
import s from 'underscore.string';

Meteor.methods({
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/server/methods/listCustomSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.methods({
listCustomSounds() {
Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-custom-sounds/server/methods/uploadCustomSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* globals RocketChatFileCustomSoundsInstance */
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import { RocketChatFile } from 'meteor/rocketchat:file';
import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';

Meteor.methods({
uploadCustomSound(binaryContent, contentType, soundData) {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/server/models/CustomSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

class CustomSounds extends RocketChat.models._Base {
constructor() {
super('custom_sounds');
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/server/publications/customSounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';
import s from 'underscore.string';

Meteor.publish('customSounds', function(filter, limit) {
Expand Down
9 changes: 5 additions & 4 deletions packages/rocketchat-custom-sounds/server/startup/custom-sounds.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
/* globals RocketChatFileCustomSoundsInstance */
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
import { RocketChatFile } from 'meteor/rocketchat:file';
import { RocketChat } from 'meteor/rocketchat:lib';
import _ from 'underscore';

export let RocketChatFileCustomSoundsInstance;

Meteor.startup(function() {
let storeType = 'GridFS';

Expand All @@ -25,13 +28,11 @@ Meteor.startup(function() {
}
}

this.RocketChatFileCustomSoundsInstance = new RocketChatStore({
RocketChatFileCustomSoundsInstance = new RocketChatStore({
name: 'custom_sounds',
absolutePath: path,
});

self = this;

return WebApp.connectHandlers.use('/custom-sounds/', Meteor.bindEnvironment(function(req, res/* , next*/) {
const params =
{ sound: decodeURIComponent(req.url.replace(/^\//, '').replace(/\?.*$/, '')) };
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-custom-sounds/server/startup/permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meteor } from 'meteor/meteor';
import { RocketChat } from 'meteor/rocketchat:lib';

Meteor.startup(() => {
if (RocketChat.models && RocketChat.models.Permissions) {
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-custom-sounds/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { RocketChat } from 'meteor/rocketchat:lib';

RocketChat.settings.addGroup('CustomSoundsFilesystem', function() {
this.add('CustomSounds_Storage_Type', 'GridFS', {
type: 'select',
Expand Down