Skip to content
Open
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
15 changes: 15 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"presets": [
["@babel/preset-env", { "modules": "cjs" }],
"@babel/preset-react"],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime",
"@babel/plugin-syntax-export-default-from",
"@babel/plugin-transform-strict-mode",
"@babel/plugin-transform-react-jsx",
"babel-plugin-styled-components",
"./babel/moment_no_i18n"
],
"comments": false
}
1 change: 1 addition & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ rules:
- error
- single
no-ternary: off
prefer-template: error
parserOptions:
ecmaVersion: 2017
sourceType: module
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ build
/**/.DS_Store
dump/
wp-content/
.idea/
17 changes: 8 additions & 9 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

meteor-base@1.4.0 # Packages every Meteor app needs to have
mobile-experience@1.0.5 # Packages for a great mobile UX
mongo@1.6.0 # The database Meteor supports right now
mongo@1.6.2 # The database Meteor supports right now
blaze-html-templates # Compile .html files into Meteor Blaze views
session@1.2.0 # Client-side reactive dictionary for your app
jquery@1.11.10 # Helpful client-side library
Expand All @@ -23,9 +23,8 @@ todda00:friendly-slugs
email@1.2.3
meteorhacks:picker
themeteorchef:bert
momentjs:moment
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
standard-minifier-css@1.5.3
standard-minifier-js@2.4.1
summernote:standalone@=0.6.16
aldeed:autoform
tsega:bootstrap3-datetimepicker
Expand All @@ -50,18 +49,18 @@ scorpiusjs:materialize
blaze
templating
templating-runtime
kadira:blaze-layout
kadira:flow-router
scorpiusjs:s3
useraccounts:flow-routing
useraccounts:materialize
dynamic-import@0.5.0
meteor@1.9.2
dynamic-import@0.5.1
meteor@1.9.3
okgrow:analytics
aldeed:simple-schema
clinical:csv
raix:rssfeed
meteorhacks:ssr
react-meteor-data
kadira:react-layout
gadicc:blaze-react-component
kadira:flow-router
kadira:blaze-layout
kadira:react-layout
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.8.0.2
METEOR@1.8.1
56 changes: 28 additions & 28 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accounts-base@1.4.3
accounts-base@1.4.4
accounts-facebook@1.3.2
accounts-google@1.3.2
accounts-oauth@1.1.16
Expand All @@ -11,8 +11,8 @@ aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.4
allow-deny@1.1.0
anti:i18n@0.4.3
autoupdate@1.5.0
babel-compiler@7.2.4
autoupdate@1.6.0
babel-compiler@7.3.4
babel-runtime@1.3.0
base64@1.0.11
binary-heap@1.0.11
Expand All @@ -32,24 +32,24 @@ ddp@1.4.0
ddp-client@2.3.3
ddp-common@1.4.0
ddp-rate-limiter@1.0.7
ddp-server@2.2.0
ddp-server@2.3.0
deps@1.0.12
diff-sequence@1.1.1
dynamic-import@0.5.1
ecmascript@0.12.4
ecmascript@0.12.7
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
ejson@1.1.0
email@1.2.3
es5-shim@4.8.0
evaisse:csv@0.1.4
facebook-oauth@1.5.0
facebook-oauth@1.6.0
fastclick@1.0.13
fetch@0.1.0
fetch@0.1.1
fortawesome:fontawesome@4.7.0
fourseven:scss@4.5.4
gadicc:blaze-react-component@1.4.1
fourseven:scss@4.10.0
gadicc:blaze-react-component@1.4.2
geojson-utils@1.0.10
gildaspk:autoform-materialize@0.0.26
google-oauth@1.2.6
Expand All @@ -73,34 +73,34 @@ localstorage@1.2.0
logging@1.1.20
matb33:collection-hooks@0.8.4
mdg:validation-error@0.5.1
meteor@1.9.2
meteor@1.9.3
meteor-base@1.4.0
meteor-platform@1.2.6
meteorhacks:inject-initial@1.0.4
meteorhacks:picker@1.0.3
meteorhacks:ssr@2.2.0
minifier-css@1.4.1
minifier-js@2.4.0
minifier-css@1.4.2
minifier-js@2.4.1
minimongo@1.4.5
mobile-experience@1.0.5
mobile-status-bar@1.0.14
modern-browsers@0.1.3
modern-browsers@0.1.4
modules@0.13.0
modules-runtime@0.10.3
momentjs:moment@2.22.2
mongo@1.6.0
mongo-decimal@0.1.0
momentjs:moment@2.17.1
mongo@1.6.2
mongo-decimal@0.1.1
mongo-dev-server@1.1.0
mongo-id@1.0.7
mpowaga:autoform-summernote@0.4.2
nicolaslopezj:options@1.0.1
nicolaslopezj:reactive-templates@1.2.1
nicolaslopezj:roles@2.6.6
nicolaslopezj:router-layer@0.1.0
nicolaslopezj:router-layer@0.0.11
nicolaslopezj:tabular-materialize@1.4.1_4
npm-bcrypt@0.9.3
npm-mongo@3.1.1
oauth@1.2.7
npm-mongo@3.1.2
oauth@1.2.8
oauth2@1.2.1
observe-sequence@1.0.16
okgrow:analytics@3.0.5
Expand All @@ -114,9 +114,9 @@ rate-limit@1.0.9
react@16.0.0
react-meteor-data@0.2.16
react-runtime@16.0.0
reactive-dict@1.2.1
reactive-dict@1.3.0
reactive-var@1.0.11
reload@1.2.0
reload@1.3.0
retry@1.1.0
routepolicy@1.1.0
sacha:spin@2.3.1
Expand All @@ -130,7 +130,7 @@ scorpiusjs:dictionary@0.3.1
scorpiusjs:filesystem@0.3.1
scorpiusjs:image-attribute@0.3.1
scorpiusjs:lang-en@0.3.1
scorpiusjs:materialize@0.3.0
scorpiusjs:materialize@0.3.4
scorpiusjs:s3@0.3.1
scorpiusjs:summernote@0.3.0
service-configuration@1.0.11
Expand All @@ -141,15 +141,15 @@ softwarerero:accounts-t9n@1.3.11
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.12
standard-minifier-css@1.5.2
standard-minifier-js@2.4.0
standard-minifier-css@1.5.3
standard-minifier-js@2.4.1
standard-minifiers@1.1.0
summernote:standalone@0.6.16
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
themeteorchef:bert@2.1.3
themeteorchef:bert@2.2.0
tmeasday:check-npm-versions@0.3.2
todda00:friendly-slugs@0.6.0
tracker@1.2.0
Expand All @@ -159,7 +159,7 @@ ui@1.0.13
underscore@1.0.10
url@1.2.0
useraccounts:core@1.14.2
useraccounts:flow-routing@1.12.4
useraccounts:materialize@1.13.1
webapp@1.7.2
useraccounts:flow-routing@1.15.0
useraccounts:materialize@1.14.2
webapp@1.7.4
webapp-hashing@1.0.9
13 changes: 13 additions & 0 deletions babel/moment_no_i18n/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = function () {
return {
visitor: {
CallExpression(path) {
if (path.node.callee.property
&& path.node.callee.property.name === 'defineLocale'
&& !path.node.arguments[0].value !== 'en') {
path.parentPath.parentPath.remove();
}
}
}
};
};
4 changes: 3 additions & 1 deletion client/helpers/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import { Mongo } from 'meteor/mongo';
import { Bert } from 'meteor/themeteorchef:bert';

export default Errors = new Mongo.Collection(null);
var Errors = new Mongo.Collection(null);

export default Errors;

export function throwError(message, type) {
var type = type || 'default';
Expand Down
2 changes: 2 additions & 0 deletions client/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<link rel="manifest" href="/manifest.json">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
<link rel="shortcut icon" href="/favicon.ico">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" />
<link rel="stylesheet" href="https://ktuh.org/main.css" />
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="/mstile-144x144.png">
<meta name="msapplication-config" content="/browserconfig.xml">
Expand Down
4 changes: 2 additions & 2 deletions client/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Session.setDefault(IGNORE_CONNECTION_ISSUE_KEY, true);

// Global audio player because it causes stack overflow when wrapped into a
// session variable.
player = null;
global.player = null;

Session.set('hashesOpen', false);
Session.set('isSearching', false);
Expand All @@ -38,7 +38,7 @@ Meteor.startup(function () {

AutoForm.addHooks(['partyForm'],{
onSuccess: function() {
FlowRouter.go('/event' + this.docId);
FlowRouter.go(`/events/${this.docId}`);
}
});

Expand Down
4 changes: 2 additions & 2 deletions imports/api/charts/charts_collection.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ChartsSchema from './charts_schema.js';
import { scorpius } from 'meteor/scorpiusjs:core';
import { moment } from 'meteor/momentjs:moment';
import { default as moment } from 'moment';

var Charts = new scorpius.collection('charts', {
singularName: 'chart',
Expand Down Expand Up @@ -37,4 +37,4 @@ Charts.friendlySlugs({

Charts.attachSchema(ChartsSchema);

export default Charts
export default Charts
22 changes: 11 additions & 11 deletions imports/api/comments/comments_methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@ Meteor.methods({
switch(commentAttributes.type) {
case 'partyPage':
var party = Parties.findOne({ _id: commentAttributes.postId });
url += 'events/' + post.slug;
url += `events/${post.slug}`;
recipient = Meteor.users.findOne({ _id: party.userId });

to = recipient.emails && recipient.emails[0].address;
// So we don't email if the party page's author is commenting.
if (party.userId === comment.userId)
break;
subject = 'New Comment on Your Event "' + party.title + '"';
subject = `New Comment on Your Event "${party.title}"`;
body = 'Hello,<br><br>You have a new comment on your event, ' +
party.title + '. User ' + comment.author + ' said: <br><br>"' +
comment.body + '".<br><br><a target="_blank" href="' + url +
`${party.title}. User ${comment.author} said: <br><br>"` +
`${comment.body}".<br><br><a target="_blank" href="${url}` +
'">Click here to view this comment in context.</a>';
Meteor.call('sendEmailNotification', to, subject, body, false);
break;
Expand All @@ -62,7 +62,7 @@ Meteor.methods({
// TODO: Sort out the issue with using FlowRouter.url() to generate the
// path dynamically. It was failing to substitute the route and params
// when given a route name. For now, we've hard-coded in the url.
url += 'playlist/' + playlist.spinPlaylistId;
url += `playlists/${playlist.spinPlaylistId}`;
var show = Shows.findOne({ showId: playlist.showId });
recipient = Meteor.users.findOne({ _id: show.userId });

Expand All @@ -71,22 +71,22 @@ Meteor.methods({
break;
subject = 'New Comment on Your Playlist';
body = 'Hello,<br><br>You have a new comment on a playlist for ' +
show.showName + '. User ' + comment.author + ' said: <br><br>"' +
comment.body + '".<br><br><a target="_blank" href="' + url +
`${show.showName}. User ${comment.author} said: <br><br>"` +
`${comment.body}".<br><br><a target="_blank" href="${url}` +
'">Click here to view this comment in context.</a>';
Meteor.call('sendEmailNotification', to, subject, body, false);
break;
case 'newsPage':
var post = Posts.findOne({ _id: commentAttributes.postId });
url += 'radioblog/' + post.slug;
url += `radioblog/${post.slug}`;
recipient = Meteor.users.findOne({ _id: post.userId });

to = recipient.emails && recipient.emails[0].address;
if (post.userId === comment.userId) break;
subject = 'New Comment on Your Post, "' + post.title + '"';
subject = `New Comment on Your Post, "${post.title}"`;
body = 'Hello,<br><br>You have a new comment on your post, ' +
post.title + '. User ' + comment.author + ' said: <br><br>"' +
comment.body + '".<br><br><a target="_blank" href="' + url +
`${post.title}. User ${comment.author} said: <br><br>"` +
`${comment.body}".<br><br><a target="_blank" href="${url}` +
'">Click here to view this comment in context.</a>';
Meteor.call('sendEmailNotification', to, subject, body, false);
break;
Expand Down
4 changes: 2 additions & 2 deletions imports/api/parties/parties_collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ var Parties = new scorpius.collection('parties', {
{
data: 'flyerFront',
title: 'Flyer',
render: function (val) {
return '<img src=' + val.url + '>';
render: function ({ url }) {
return `<img src=${url} />`;
}
}, {
data: 'title',
Expand Down
Loading