It looks like you're drinking something right now! Help us create a Thanksgiving break
+ collage and take a picture of your drink.
+ {{else}}
+ Oops something went wrong here. Ignore this experience please!
+ {{/if}}
+
{{#each info in activeUserAssigment}}
@@ -47,10 +46,14 @@
Available experiences
{{/if}}
{{else}}
- Loading...
+
+
π€π²
+
Trying to fetch data...
+
You may have to close and restart the app if this takes too long π
+
{{/if}}
{{else}}
-
Welcome to CE π
-
Sign in to participate in experiences!
+
Welcome to Collective Narrative π
+
Sign in to participate in collaborative stories!
{{/if}}
diff --git a/imports/ui/pages/home.js b/imports/ui/pages/home.js
index c6680bac..f9fd0c67 100644
--- a/imports/ui/pages/home.js
+++ b/imports/ui/pages/home.js
@@ -1,6 +1,6 @@
import './home.html';
-import { Meteor } from 'meteor/meteor';
+// import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Router } from 'meteor/iron:router';
import { ReactiveDict } from 'meteor/reactive-dict';
@@ -9,6 +9,9 @@ import { Experiences, Incidents } from '../../api/OCEManager/OCEs/experiences';
import { Assignments } from '../../api/OpportunisticCoordinator/databaseHelpers';
import '../components/active_experience.js';
+import {needAggregator} from "../../api/OpportunisticCoordinator/strategizer";
+import {setIntersection} from "../../api/custom/arrayHelpers";
+import {getUserActiveIncidents} from "../../api/UserMonitor/users/methods";
Template.home.onCreated(function () {
this.state = new ReactiveDict();
@@ -32,32 +35,59 @@ Template.home.events({
Template.home.helpers({
activeUserAssigment() {
- // create [{iid: incident_id, eid: experience_id, needName: assigned_need_name}]
- let activeAssignments = Assignments.find().fetch();
- let output = [];
+ if (Template.instance().subscriptionsReady()) {
+ // create [{iid: incident_id, experience: experience, detectorId: detector_id}]
+ let activeAssignments = Assignments.find().fetch();
+ let output = [];
- _.forEach(activeAssignments, (assignment) => {
- _.forEach(assignment.needUserMaps, (currNeedUserMap) => {
- if (currNeedUserMap.users.find(user => user.uid === Meteor.userId())) {
+ _.forEach(activeAssignments, (assignment) => {
+
+ let iid = assignment._id;
+ let incident = Incidents.findOne(iid);
+
+ // TODO(rlouie): errors on refresh? try the competing resource test garret/barrett
+ let needNamesBinnedByDetector = needAggregator(incident);
+
+ // gah I wish the assignments had its own interface
+ let assignedNeedNames = assignment.needUserMaps.map(currNeedUserMap => {
+ if (currNeedUserMap.users.find(user => user.uid === Meteor.userId())) {
+ return currNeedUserMap.needName;
+ }
+ });
+
+ _.forEach(needNamesBinnedByDetector, (needNamesForDetector, detectorId) => {
+ let assignedNeedNamesForDetector = setIntersection(assignedNeedNames, needNamesForDetector);
+ if (assignedNeedNamesForDetector.length === 0) {
+ // user not assigned to any needs for this detector
+ return;
+ }
// get experience
- let experience = Experiences.findOne(Incidents.findOne(assignment._id).eid);
+ let experience = Experiences.findOne(Incidents.findOne(iid).eid);
+
+ // instead of knowing the specific need at the home screen,
+ // we only know the associated iid/detector; dynamic routing to the need will happen
output.push({
'iid': assignment._id,
'experience': experience,
- 'needName': currNeedUserMap.needName
+ 'detectorId': detectorId
});
- // user can only be assigned to one need in each assignment object
- return false;
- }
+ });
+
});
- });
- return output;
+ return output;
+ }
},
noActiveIncidents() {
- let currActiveIncidents = Meteor.users.findOne(Meteor.userId()).profile.activeIncidents;
- return currActiveIncidents === null || currActiveIncidents.length === 0;
+ let user = Meteor.users.findOne(Meteor.userId());
+
+ // note(rlouie): was forced to use getUserActiveIncidents rather than user.activeIncidents collection helper
+ let currActiveIncidents = getUserActiveIncidents(user._id);
+
+ return (typeof currActiveIncidents === 'undefined' ||
+ currActiveIncidents === null ||
+ currActiveIncidents.length === 0);
},
getCurrentExperience(iid) {
Template.instance().state.get('render');
diff --git a/imports/ui/pages/oldtc.js b/imports/ui/pages/oldtc.js
new file mode 100644
index 00000000..98c67566
--- /dev/null
+++ b/imports/ui/pages/oldtc.js
@@ -0,0 +1,572 @@
+// import { Meteor } from "meteor/meteor";
+
+import { Submissions } from "../OCEManager/currentNeeds";
+
+import { addContribution } from '../OCEManager/OCEs/methods';
+import {Detectors} from "../UserMonitor/detectors/detectors";
+import {notify, notifyUsersInIncident, notifyUsersInNeed} from "../OpportunisticCoordinator/server/noticationMethods";
+import {Incidents} from "../OCEManager/OCEs/experiences";
+import {Schema} from "../schema";
+import {serverLog} from "../logs";
+import { log } from "util";
+import { Messages } from '../../api/messages/messages.js';
+
+let LOCATIONS = {
+ 'park': {
+ lat: 42.056838,
+ lng: -87.675940
+ },
+ 'lakefill': {
+ lat: 42.054902,
+ lng: -87.670197
+ },
+ 'burgers': {
+ lat: 42.046131,
+ lng: -87.681559
+ },
+ 'grocery': {
+ lat: 42.047621,
+ lng: -87.679488
+ },
+ 'sushi': { // sashimi sashimi near whole foods
+ lat: 42.048068,
+ lng: -87.6811262
+ },
+ 'grocery2': {
+ lat: 42.039818,
+ lng: -87.680088
+ }
+};
+
+let USERS = {
+ meg: {
+ username: 'meg',
+ email: 'meg@email.com',
+ password: 'password',
+ profile: {
+ firstName: 'Meg',
+ lastName: 'Grasse'
+ }
+ },
+ andrew: {
+ username: 'andrew',
+ email: 'andrew@email.com',
+ password: 'password',
+ profile: {
+ firstName: 'Andrew',
+ lastName: 'Finke'
+ }
+ },
+ josh: {
+ username: 'josh',
+ email: 'josh@email.com',
+ password: 'password',
+ profile: {
+ firstName: 'Josh',
+ lastName: 'Shi'
+ }
+ }
+};
+
+let DETECTORS = {
+ night: {
+ _id: 'Wth3TB9Lcf6me6vgy',
+ description: 'places where it\'s nighttime,',
+ variables: ['var nighttime;'],
+ rules: ['(nighttime);']
+ },
+ daytime: {
+ _id: 'tyZMZvPKkkSPR4FpG',
+ description: 'places where it\'s daytime,',
+ variables: ['var daytime;'],
+ rules: ['daytime;']
+ },
+ coffee: {
+ _id: 'saxQsfSaBiHHoSEYK',
+ description: 'coffee',
+ variables: ['var coffeeroasteries;',
+ 'var coffee;',
+ 'var cafes;',
+ 'var coffeeshops;',
+ 'var coffeeteasupplies;'
+ ],
+ rules: ['(coffeeroasteries || coffee) || ((coffeeshops || coffeeteasupplies) || cafes)']
+ },
+ busy: {
+ _id: 'saxQsfSaBiHHoSEZX',
+ description: 'user reports to be busy',
+ variables: ['var busy;'],
+ rules: ['busy;']
+ },
+ train: {
+ _id: '2wH5bFr77ceho5BgF',
+ description: 'trains',
+ variables: ['var publictransport;', 'var trainstations;', 'var trains;'],
+ rules: ['(trainstations || trains) || publictransport;']
+ },
+ rainy: {
+ _id: 'puLHKiGkLCJWpKc62',
+ description: 'rainy',
+ variables: ['var rain;'],
+ rules: ['(rain);']
+ },
+ sunny: {
+ _id: '6vyrBtdDAyRArMasj',
+ description: 'clear',
+ variables: ['var clear;', 'var daytime;'],
+ rules: ['(clear && daytime);']
+ },
+ cloudy: {
+ _id: 'sorCvK53fyi5orAmj',
+ description: 'clouds',
+ variables: ['var clouds;', 'var daytime;'],
+ rules: ['(clouds && daytime);']
+ },
+ hour0: {
+ _id: "v2ANTJr1I7wle3Ek8",
+ description: "during 00:00",
+ variables: ["var hour;"],
+ rules: ["hour == 0"]
+ }
+};
+
+export const getDetectorId = (detector) => {
+ let db_detector = Detectors.findOne({description: detector.description});
+ if (db_detector) {
+ console.log('getting db detector for', detector.description, 'which is', db_detector._id);
+ console.log(db_detector)
+ return db_detector._id;
+ } else {
+ console.log('getting detector for', detector.description, 'which is', detector._id);
+
+ return detector._id;
+ }
+};
+
+Meteor.methods({
+ getDetectorId({name}) {
+ new SimpleSchema({
+ name: { type: String }
+ }).validate({name});
+
+ if (!(name in CONSTANTS.DETECTORS)) {
+ throw new Meteor.Error('getDetectorId.keynotfound',
+ `Detector by the name '${name}' was not found in CONSTANTS.DETECTORS`);
+ }
+ }
+});
+
+// this is the code that will eventually be generated by the CN compiler!
+const createMurderMystery = function() {
+ let values = [
+ 'not busy at all',
+ 'a little busy',
+ 'somewhat busy',
+ 'pretty busy',
+ 'very busy'
+ ];
+ // console.log(DETECTORS);
+ /*
+ let places = ["coffee", "coffee", "coffee", "coffee", "coffee",];
+ let detectorIds = places.map((x) => { return Random.id(); });
+ let detectorNames = [];
+ */
+ let dropdownText = [
+ 'not busy at all',
+ 'a little busy',
+ 'somewhat busy',
+ 'pretty busy',
+ 'busy'
+ ];
+ /*
+ let questions = [
+ "How busy is the coffee shop right now?",
+ "Name an interesting option on the menu",
+ "What did you order?"
+ ]
+ */
+ let question1 = "How busy is the coffee shop right now?"
+ let question2 = "Name an interesting option on the menu"
+ let question3 = "What did you order?"
+
+ let DROPDOWN_OPTIONS = _.zip(dropdownText);
+
+ const MurderMysteryCallback = function (sub) {
+ let submissions = Submissions.find({
+ iid: sub.iid,
+ needName: sub.needName
+ }).fetch();
+
+ console.log("in callback")
+ console.log(submissions.length)
+
+ experience = Experiences.update({
+ "_id": sub.eid
+ }, {
+ "$set": {
+ "participateTemplate": "murderMysteryChat"
+ }
+ })
+
+
+
+ for (let i = 0; i < submissions.length; i++) {
+ console.log("busyness: " + submissions[i].content.busy)
+ var key = submissions[i].content.busy;
+ var affordances = {}
+ affordances[key] = true;
+ console.log("staticAffordances: " + affordances.key)
+ Meteor.users.update({
+ _id: submissions[i].uid
+ }, {
+ $set: {
+ ['profile.staticAffordances.' + key]: true
+
+ }
+ });
+
+ //find instance of CN that the submission came from
+ let instance = Incidents.findOne(submissions[i].iid);
+ console.log("detector ID: " + instance.contributionTypes[0].situation.detector)
+ let detector_id = instance.contributionTypes[0].situation.detector
+ console.log("detector rules: " + Detectors.findOne(detector_id).rules)
+ let rules = Detectors.findOne(detector_id).rules;
+
+ let participant = Meteor.users.findOne(submissions[i].uid);
+
+ let others = Meteor.users.find({
+ "profile.pastIncidents": submissions[i].iid
+ }).fetch()
+
+ let other_participants = []
+
+ console.log("others length: " + others.length)
+
+ for (let i = 0; i < others.length; i++) {
+ let other = others[i]
+ console.log("other: " + other.profile.firstName)
+ console.log("participant: " + participant.profile.firstName)
+ //in the future, need to account for when participants have the same first name (use UID instead)
+ if (other.profile.firstName != participant.profile.firstName) {
+ other_participants.push(other.profile.firstName)
+ console.log("other: " + other.profile.firstName + " " + other_participants.length)
+ }
+ }
+
+ console.log("participants: " + participant);
+
+ //need to figure out a way to get other users in same experience
+ //let others = ""
+
+ //check to see how busy the user is
+ let character = []
+ if (participant.profile.staticAffordances.busy) {
+ console.log("casting a murderer")
+ rules = submissions[i].content.busy + " && " + rules
+ //rules += " && " + submissions[i].content.busy + ";"
+ //rules = addStaticAffordanceToDetector(submissions[i].content.busy, instance.contributionTypes[0].situation.detector)
+ character.push([rules, "murderer", "murderMysteryChat", "Try to avoid being caught and weasel your way out of the clues!", participant._id, other_participants])
+ } else {
+ console.log("casting an innocent")
+ rules = submissions[i].content.busy + " && " + rules
+ //rules += " && " + submissions[i].content.busy + ";"
+ //rules = addStaticAffordanceToDetector(submissions[i].content.busy, instance.contributionTypes[0].situation.detector)
+ character.push([rules, "innocent", "murderMysteryChat", "Try to prove your innocence and find the real murderer!", participant._id, other_participants])
+ }
+
+ console.log("character length" + character.length)
+
+ let extraAffordances = []
+
+ extraAffordances.push(submissions[i].content.busy)
+
+ _.forEach(character, (charac) => {
+
+ let [detectorName, role, template, instruction, user, others] = charac;
+
+ var need = {
+ needName: "Murder Mystery" + role,
+ situation: {
+ detector: detectorName,
+ number: 2
+ },
+ participateTemplate: template,
+ toPass: {
+ role: role,
+ instruction: instruction,
+ user: user,
+ dropdownChoices: {
+ name: others,
+ options: others
+ }
+ },
+ numberNeeded: 2
+ };
+ //next_experience.contributionTypes.push(need)
+ addContribution(sub.iid, need);
+ console.log("more needs" + instance.contributionTypes.length)
+
+ Meteor.call("sendWhisper", role, user, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })
+
+ let info = "We have our first clue. The murderer is in a busy coffee shop!"
+
+ Meteor.setTimeout(function() {Meteor.call("sendPrompt", info, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })}, 3000)
+
+ let theOrder = "";
+ let theMenu = "";
+ let theUser = "";
+
+ if (submissions[i].content.busy == "busy") {
+ theOrder = submissions[i].content.order;
+ theMenu = submissions[i].content.menu;
+ theUser = Meteor.users.findOne(submissions[i].uid).profile.firstName;
+ }
+
+ let info2 = "Here's the second clue. The murderer ordered " + theOrder + "!";
+
+ Meteor.setTimeout(function() {Meteor.call("sendPrompt", info2, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })}, 6000)
+
+ let info3 = "Here's the last clue. The murderer is in a coffee shop that sells " + theMenu + "!";
+
+ Meteor.setTimeout(function() {Meteor.call("sendPrompt", info3, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })}, 9000)
+
+ let info4 = "Now it's time to cast your vote! Who do you think the murderer is?";
+
+ Meteor.setTimeout(function() {Meteor.call("sendPrompt", info4, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })}, 12000)
+
+ let info5 = "Now that your votes are cast, let's find out who's right. The murderer is " + theUser + "!";
+
+ Meteor.setTimeout(function() {Meteor.call("sendPrompt", info5, (error, response) => {
+ if (error) {
+ alert(error.reason);
+ } else {
+ //Cookie.set("name", response.name);
+ $input.val("");
+ }
+ })}, 15000)
+
+ });
+
+ }
+
+ //which way to find participants and set this.toPass.characterName?
+ // let participants = submissions.map((submission) => { return submission.uid; });
+
+ // let participant = Meteor.users.findOne({
+ // "_id": sub.uid,
+ // })
+
+
+
+ // let max = submissions[0]
+
+ // for (let i = 0; i < submissions.length; i++) {
+
+ // if (submissions[i].content.busy >= max.content.busy) {
+ // max = submissions[i]
+ // }
+ // }
+
+
+
+ }
+
+ let experience = {
+ name: 'Murder Mystery',
+ participateTemplate: 'murderMysteryInitial',
+ resultsTemplate: 'murderMysteryChat',
+ contributionTypes: [
+ ],
+ description: "You've been invited to participate in a murder mystery!",
+ notificationText: "You've been invited to participate in a murder mystery!",
+ callbacks: [{
+ trigger: 'cb.newSubmission() && (cb.numberOfSubmissions() == 1)',
+ // substitute any variables used outside of the callback function scope
+ function: eval('`' + MurderMysteryCallback.toString() + '`'),
+ }]
+ };
+
+
+ const staticAffordances = ['cn'];
+ const places = [
+ ["coffee", "at a coffee shop", "Please help us build the story by answering some initial questions about your situation!"],
+ ];
+
+ // const needs = places.map(place => {
+ // const [detectorName, situationDescription, instruction] = place;
+ // return {
+ // needName: `Bumped Three ${detectorName}`,
+ // situation: {
+ // detector: getDetectorId(DETECTORS[detectorName]),
+ // number: '1'
+ // },
+ // toPass: {
+ // situationDescription: `Having a good time ${situationDescription}?`,
+ // instruction: `${instruction}`
+ // },
+ // numberNeeded: 3,
+ // // notificationDelay: 90 uncomment for testing
+ // }
+ // });
+
+
+staticAffordances.forEach(affordance => {
+ experience.contributionTypes = [...experience.contributionTypes, ...addStaticAffordanceToNeeds(affordance, ((places) =>
+ places.map(place => {
+ const [detectorName, situationDescription, instruction] = place;
+ return {
+ needName: `Murder Mystery ${detectorName}`,
+ situation: {
+ detector: getDetectorId(DETECTORS[detectorName]),
+ number: 3
+ },
+ participateTemplate: 'murderMysteryInitial',
+ toPass: {
+ situationDescription: `Having a good time ${situationDescription}?`,
+ instruction: `${instruction}`,
+ question1: `${question1}`,
+ question2: `${question2}`,
+ question3: `${question3}`,
+ dropdownChoices: {
+ name: values,
+ options: DROPDOWN_OPTIONS
+ }
+ },
+ numberNeeded: 3,
+ // notificationDelay: 90 uncomment for testing
+ }
+ })
+ )(places))];
+});
+
+return experience;
+}
+
+
+/**
+ * Side effect: Changes the global DETECTORS object, adding another detector with key "detectorKey_staticAffordance"
+ *
+ * @param staticAffordance
+ * @param detectorKey
+ * @returns newDetectorKey
+ */
+
+ const addStaticAffordanceToDetector = function(staticAffordance, detectorKey) {
+ let newVars = JSON.parse(JSON.stringify(DETECTORS[detectorKey]['variables']));
+ newVars.push(`var ${staticAffordance};`);
+ let newRules = JSON.parse(JSON.stringify(DETECTORS[detectorKey]['rules']));
+ // modify last detector rule
+ // when rules has a flat structure where rules.length == 1, last rule is the predicate
+ // i.e. ['(diners || restaurants || cafeteria || food_court);']
+ // when rules have a nested structure where rules.length > 1, last rule is the predicate
+ // i.e. ['worship_places = (buddhist_temples || churches);', '(worship_places || landmarks);']
+ let lastRule = newRules.pop();
+ // each rule has a `;` at end, i.e. (rain && park);
+ // in order to modify the rule, must add predicate preceding the rule
+ let lastRuleNoSemicolon = lastRule.split(';')[0];
+ lastRule = `(${staticAffordance} && (${lastRuleNoSemicolon}));`;
+ newRules.push(lastRule);
+
+ let newDetectorKey = `${detectorKey}_${staticAffordance}`;
+ // Change DETECTORS if newDetectorKey does not already exist (some experiences might have already created coffee_mechanismRich, for example)
+ if (!(newDetectorKey in DETECTORS)) {
+ DETECTORS[newDetectorKey] = {
+ '_id': Random.id(),
+ 'description': `${DETECTORS[detectorKey].description} ${staticAffordance}`,
+ 'variables': newVars,
+ 'rules': newRules
+ };
+ }
+ console.log( DETECTORS[newDetectorKey].description, DETECTORS[newDetectorKey]._id);
+ return newDetectorKey;
+};
+
+/**
+ *
+ * @param staticAffordances [String] the affordance to add
+ * i.e. 'mechanismRich'
+ * @param contributionTypes [Array] list of all the needs by which to modify
+ * @return
+ */
+ const addStaticAffordanceToNeeds = function(staticAffordance, contributionTypes) {
+ return _.map(contributionTypes, (need) => {
+ let detectorKey;
+ _.forEach(_.keys(DETECTORS), (key) => {
+ if (DETECTORS[key]._id === need.situation.detector) {
+ detectorKey = key;
+ }
+ });
+ // WILL THROW ERROR if we don't find the matching detector id
+
+ let newDetectorKey = addStaticAffordanceToDetector(staticAffordance, detectorKey);
+ need.situation.detector = DETECTORS[newDetectorKey]._id;
+ console.log('adding to need', newDetectorKey, DETECTORS[newDetectorKey]._id);
+ return need;
+ });
+};
+
+/**
+ *
+ * @param contributionTypes
+ * @param triggerTemplate [String] should be written as a string, with ES6 templating syntax
+ * i.e. "cb.newSubmission(\"${need.needName}\")"
+ * If using templating syntax, you have access to the each individual need object
+ * @param sendNotificationFn
+ */
+ const notifCbForMultiNeeds = function(contributionTypes, triggerTemplate, sendNotificationFn) {
+ return contributionTypes.map((need) => {
+ return {
+ trigger: eval('`' + triggerTemplate + '`'),
+ function: sendNotificationFn.toString()
+ };
+ });
+};
+
+let EXPERIENCES = {
+ murder: createMurderMystery()
+};
+
+export const CONSTANTS = {
+ 'LOCATIONS': LOCATIONS,
+ 'USERS': USERS,
+ // Comment out if you would like to only test specific experiences
+ // 'EXPERIENCES': (({ halfhalfEmbodiedMimicry }) => ({ halfhalfEmbodiedMimicry }))(EXPERIENCES),
+ 'EXPERIENCES': EXPERIENCES,
+ // 'EXPERIENCES': TRIADIC_EXPERIENCES,
+ 'DETECTORS': DETECTORS
+};
diff --git a/imports/ui/pages/profile.html b/imports/ui/pages/profile.html
index 1472f63e..89fb18e4 100644
--- a/imports/ui/pages/profile.html
+++ b/imports/ui/pages/profile.html
@@ -1,16 +1,16 @@
{{#if currentUser}}
- Results from experiences
+ Current Stories
{{#if noIncidents}}
-
You haven't participated in any experiences yet. Once you participate, the experiences will appear here.
+
You haven't participated in any stories yet. Once you participate, the stories will appear here.
{{/if}}
{{#each incident in this.incidents}}
{{> resultLink (infoForLink incident)}}
{{/each}}
Welcome to CE π
- Sign in to see available experiences!
+ Welcome to CN π
+ Sign in to see your stories!
{{/if}}
diff --git a/imports/ui/pages/profile.js b/imports/ui/pages/profile.js
index 79358418..63b919c4 100644
--- a/imports/ui/pages/profile.js
+++ b/imports/ui/pages/profile.js
@@ -1,6 +1,6 @@
import './profile.html';
-import { Meteor } from 'meteor/meteor';
+// import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { Experiences, Incidents } from '../../api/OCEManager/OCEs/experiences.js';
diff --git a/mobile-config.js b/mobile-config.js
index d42bc8aa..233c0f55 100644
--- a/mobile-config.js
+++ b/mobile-config.js
@@ -1,6 +1,6 @@
App.info({
// id: "edu.northwestern.delta.ce-platform",
- id: "edu.northwestern.delta.A",
+ id: "edu.northwestern.delta.D",
name: "Cerebro"
});
diff --git a/package-lock.json b/package-lock.json
index ef2fdcb5..34127ebf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,13 +5,23 @@
"requires": true,
"dependencies": {
"@babel/runtime": {
- "version": "7.4.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz",
- "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==",
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz",
+ "integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==",
"requires": {
"regenerator-runtime": "^0.13.2"
}
},
+ "array-parallel": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz",
+ "integrity": "sha1-j3hTCJJu1apHjEfmTRszS2wMlH0="
+ },
+ "array-series": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz",
+ "integrity": "sha1-3103v8XC7wdV4qpPkv6ufUtaly8="
+ },
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -509,6 +519,23 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
},
+ "cross-spawn": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+ "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+ "requires": {
+ "lru-cache": "^4.0.1",
+ "which": "^1.2.9"
+ }
+ },
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "requires": {
+ "ms": "^2.1.1"
+ }
+ },
"elementtree": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
@@ -523,9 +550,9 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"glob": {
- "version": "7.1.3",
- "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
- "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+ "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -535,6 +562,17 @@
"path-is-absolute": "^1.0.0"
}
},
+ "gm": {
+ "version": "1.23.1",
+ "resolved": "https://registry.npmjs.org/gm/-/gm-1.23.1.tgz",
+ "integrity": "sha1-Lt7rlYCE0PjqeYjl2ZWxx9/BR3c=",
+ "requires": {
+ "array-parallel": "~0.1.3",
+ "array-series": "~0.1.5",
+ "cross-spawn": "^4.0.0",
+ "debug": "^3.1.0"
+ }
+ },
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -549,16 +587,35 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
+ "interop-require": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/interop-require/-/interop-require-1.0.0.tgz",
+ "integrity": "sha1-5TEDZ5lEyI1+YQW2Kp9EdceDlx4="
+ },
"interpret": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
"integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
},
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+ },
"lodash": {
"version": "4.17.11",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
},
+ "lru-cache": {
+ "version": "4.1.5",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+ "requires": {
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
+ }
+ },
"meteor-node-stubs": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-0.4.1.tgz",
@@ -1094,6 +1151,16 @@
"brace-expansion": "^1.1.7"
}
},
+ "moment": {
+ "version": "2.24.0",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+ },
"nan": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
@@ -1132,6 +1199,11 @@
"xmldom": "0.1.x"
}
},
+ "pseudomap": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+ },
"q": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@@ -1151,9 +1223,9 @@
"integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA=="
},
"resolve": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz",
- "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+ "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
"requires": {
"path-parse": "^1.0.6"
}
@@ -1220,6 +1292,14 @@
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
},
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -1243,6 +1323,11 @@
"version": "0.1.27",
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
+ },
+ "yallist": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+ "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
}
}
}
diff --git a/package.json b/package.json
index b7d13243..e4be9175 100644
--- a/package.json
+++ b/package.json
@@ -11,12 +11,15 @@
"buffer-shims": "^1.0.0",
"cordova-custom-config": "^5.0.2",
"core-util-is": "^1.0.2",
+ "gm": "^1.23.1",
+ "interop-require": "^1.0.0",
"meteor-node-stubs": "^0.4.1",
+ "moment": "^2.22.2",
"photoswipe": "^4.1.1"
},
"devDependencies": {},
"scripts": {
- "build": "meteor build ../ce-platform-ios --server=ce-platform.herokuapp.com",
+ "build": "meteor build ../ce-platform-ios --server=staging-ce-platform.herokuapp.com/",
"build-dev": "run(){ meteor run ios-device -p $1 --mobile-server=http://$2:$1; }; run",
"test": "TEST_WATCH=1 meteor test --driver-package meteortesting:mocha",
"unittest": "meteor test --once --driver-package meteortesting:mocha",
diff --git a/private/ios/cc.pem b/private/ios/cc.pem
index acee84f5..66816b7f 100644
--- a/private/ios/cc.pem
+++ b/private/ios/cc.pem
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
-MIIGQjCCBSqgAwIBAgIIZGjaWnSSZSIwDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
+MIIGQjCCBSqgAwIBAgIIV8pZuyTGWJ4wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTgxMDExMjAyNzU4WhcNMTkxMTEwMjAyNzU4WjCBpjEoMCYGCgmSJomT8ixk
-AQEMGGVkdS5ub3J0aHdlc3Rlcm4uZGVsdGEuQTE2MDQGA1UEAwwtQXBwbGUgUHVz
-aCBTZXJ2aWNlczogZWR1Lm5vcnRod2VzdGVybi5kZWx0YS5BMRMwEQYDVQQLDAo4
+HhcNMTkxMDA3MjExMDQ3WhcNMjAxMTA1MjExMDQ3WjCBpjEoMCYGCgmSJomT8ixk
+AQEMGGVkdS5ub3J0aHdlc3Rlcm4uZGVsdGEuRDE2MDQGA1UEAwwtQXBwbGUgUHVz
+aCBTZXJ2aWNlczogZWR1Lm5vcnRod2VzdGVybi5kZWx0YS5EMRMwEQYDVQQLDAo4
MjNTNTdXUUszMSAwHgYDVQQKDBdOb3J0aHdlc3Rlcm4gVW5pdmVyc2l0eTELMAkG
-A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCveBncGiNS
-QZShXdmMe+PqDLOIfc39KqSdRsf1xLrbxBIFOLY/yXDWwte3FeT1ziin9GEJURn1
-ZDcvEPf9tnFQqN5nlIyWFfKjrSg7rVhucPa6lFyp7B5zWAHyRDch7BwbFr6KfKOR
-IodxSsi1c+u4I7/xgmwRFycB6GSYAAfapfx8hUje8NxTzqVOAacKo7GoMPal83h5
-sj40s11jXVa79beljSKBiQdfT0+UyVv8aPlMPs7XmCoTvvCo6hEzeAZmQUr2V8+h
-fekvQqQawtlBamSeVTeewaMgJ0hfFmAD+x2c1Jd0dpW2Cc8oWwM31W0T6pTBbfkb
-XoxplPtA79t7AgMBAAGjggKAMIICfDAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaA
+A1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDsV1BWQs14
+HJcOj1GaPlAmeZG6wNIQHVYrHLZDo/4vKysECVvjQyliZnaxNh+jHMcS4mb9eI6L
+LQXP2sFOX/npL6KadO0N0+HrQr79/WXfNHCIybn9ZCSEJ7oI+Lo82Lsdi/oRm2j7
+cwas464bUbcQ20MFSZpzXhs0Wygsgc9F24Zf1oD8Qpx/b6fd64oSFqRyzYbQxcY/
+Vrn/KUhT48gAExT+Zb+xV2xk8DhIEsYTHp9edOh7SjnYcIlJ4rZY+9X6v/LsbzuC
+hlItWrPCnMAY7bDBPXvr0b5/ZZ57lDI8m2FRWgK33Wtdxvzm3SC6kR4bUUS6loXY
+SwuPRaavj2kVAgMBAAGjggKAMIICfDAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaA
FIgnFwmpthhgi+zruvZHWcVSVKO3MIIBHAYDVR0gBIIBEzCCAQ8wggELBgkqhkiG
92NkBQEwgf0wgcMGCCsGAQUFBwICMIG2DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0
aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNzdW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0
@@ -22,15 +22,15 @@ dXNlLCBjZXJ0aWZpY2F0ZSBwb2xpY3kgYW5kIGNlcnRpZmljYXRpb24gcHJhY3Rp
Y2Ugc3RhdGVtZW50cy4wNQYIKwYBBQUHAgEWKWh0dHA6Ly93d3cuYXBwbGUuY29t
L2NlcnRpZmljYXRlYXV0aG9yaXR5MBMGA1UdJQQMMAoGCCsGAQUFBwMCMDAGA1Ud
HwQpMCcwJaAjoCGGH2h0dHA6Ly9jcmwuYXBwbGUuY29tL3d3ZHJjYS5jcmwwHQYD
-VR0OBBYEFIqgZb/iNSHEIKcQJOMAHXUfdRS+MA4GA1UdDwEB/wQEAwIHgDAQBgoq
+VR0OBBYEFNscYL53Uakb7lY99fLDwE6XP6kgMA4GA1UdDwEB/wQEAwIHgDAQBgoq
hkiG92NkBgMBBAIFADAQBgoqhkiG92NkBgMCBAIFADCBkAYKKoZIhvdjZAYDBgSB
-gTB/DBhlZHUubm9ydGh3ZXN0ZXJuLmRlbHRhLkEwBQwDYXBwDB1lZHUubm9ydGh3
-ZXN0ZXJuLmRlbHRhLkEudm9pcDAGDAR2b2lwDCVlZHUubm9ydGh3ZXN0ZXJuLmRl
-bHRhLkEuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNhdGlvbjANBgkqhkiG9w0BAQsF
-AAOCAQEAldH4116BftTefriCwkVHD6XeGv9XbcEgGcNRLbdM+VTNZAjrAtkr7iS1
-SS1lK1V8+ij36vllLT3adH34en8vEADYIuuahlcBGM7AZm3bJvXEdhbGnf+LRuzT
-iaRhbaWQshsUZhRIPWpv9lF07nYlIgltF5eMrLHp56thtGb/Q8h7YBa6L2dVBoiX
-CPO1+yH2StffW+9AF9A5c2dxgCxNKyLurMSmEP2ZJxEHkLETSwOeXuL4KPFBhvFj
-aq5VwWb5n+TrY+Yvf8Z/P8cE+aRLGXUQOCq9scPoyW0ClZI7KvrH5FIArqjYetsf
-amM6KZ+hlAAVFQUh7be4uR8m0sXftw==
+gTB/DBhlZHUubm9ydGh3ZXN0ZXJuLmRlbHRhLkQwBQwDYXBwDB1lZHUubm9ydGh3
+ZXN0ZXJuLmRlbHRhLkQudm9pcDAGDAR2b2lwDCVlZHUubm9ydGh3ZXN0ZXJuLmRl
+bHRhLkQuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNhdGlvbjANBgkqhkiG9w0BAQsF
+AAOCAQEAVp2o5zywt4io+pppMuXaSEjkxnUVcLHTwd5yFvo/d7KdWPF1tXPp8GFb
++d40W10Ux2mRHugE94TP4CpmOp/dR7CFWjD/mMN8kB3bp2AGQnarQbXg8rkVs9pN
+DUCL9PrX/YAX1WmCtDakuOJBw/Te6AdqASiEZgd9/PoZOCp5lFL9WWdet3BeWPej
+0IUnWaGswL3VPchdhNBZHqshc+CXRQCUWXDKMv+j+nvfOWHKlNMfdlAcLI9vWSqx
+w448RoOXQRrlWtLmhLbFtMdX6AsW+9GF02+w0MrVtL7F0vZB1n74NfZOXROvH34u
+YI8etGD8XAlrI3lx9QrMDh8+BcPVog==
-----END CERTIFICATE-----
diff --git a/private/ios/pp.pem b/private/ios/pp.pem
index 3dc16b71..c0154fc3 100644
--- a/private/ios/pp.pem
+++ b/private/ios/pp.pem
@@ -1,32 +1,32 @@
Bag Attributes
- friendlyName: Northwestern iOS Enterprise
- localKeyID: 8A A0 65 BF E2 35 21 C4 20 A7 10 24 E3 00 1D 75 1F 75 14 BE
+ friendlyName: Yongsung Kim
+ localKeyID: DB 1C 60 BE 77 51 A9 1B EE 56 3D F5 F2 C3 C0 4E 97 3F A9 20
Key Attributes:
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCveBncGiNSQZSh
-XdmMe+PqDLOIfc39KqSdRsf1xLrbxBIFOLY/yXDWwte3FeT1ziin9GEJURn1ZDcv
-EPf9tnFQqN5nlIyWFfKjrSg7rVhucPa6lFyp7B5zWAHyRDch7BwbFr6KfKORIodx
-Ssi1c+u4I7/xgmwRFycB6GSYAAfapfx8hUje8NxTzqVOAacKo7GoMPal83h5sj40
-s11jXVa79beljSKBiQdfT0+UyVv8aPlMPs7XmCoTvvCo6hEzeAZmQUr2V8+hfekv
-QqQawtlBamSeVTeewaMgJ0hfFmAD+x2c1Jd0dpW2Cc8oWwM31W0T6pTBbfkbXoxp
-lPtA79t7AgMBAAECggEARXRfoAzEkGmfAGSamQ3tABa49bz+TUiU0iBTRAf0AstQ
-arqxAPymaovDQRgsgdNxqlGEG2D7ynM5mKq5zrZpkgjVx+A36ayUV49RzpVl3Ilg
-UCgrqaLpxrQ+SPwRap7/3QUatMxzHh6xx/lXCuPwmPmln14Fkpo8eXfYYYYZlcTX
-uKOwWlIdUizQbRNjmgVRKDkEZ/3hNoocc2ZKXQdeOhw3/kfxl36scQpZerIqBGL4
-uPU0IPZAqRLtTDWfxpb2jZGXBcI2CmP6S03jZAguBXnL4GZmyR81GRcxJyib/vfC
-MUjmtv9U0jgViN3YFcR8x12qHDa+d2tZwfs8Ra4heQKBgQDkChPyFKolrgU5Q7Hq
-m0M34xTLTQeKhmiOeVJETeJLrB1eqgUCWiandKXnsaxomL3SL4z7HwNx2yTrswhS
-klmb8n+ZdxhXyQvkMOUroLg9eDMGWpU9/xrRPRGgZb/oiDOrLHQ5A56d8SgX+t2X
-vjBhMfH/kiN/TgW9+Y1034+a1QKBgQDE++XOxZgLMEfaGGzhjnatmqdg9AXSkiN+
-ye2WxsWRZdDEfE6aZCb07z4ov2wMy5+72f5tBHTZEf12CG96FJBMJoYhfeTEr5lq
-+O+ErM86nSKhhFErUQTlAmUGxxRgI4HhzhtjRHvqc3KHbyRCCn1XAOeQjr2vMwEu
-i0vXphElDwKBgBNNExEbVKdpykFljGqKB690Re9LLsc3xyO/+wmS+gNjpvy7MT9Y
-uArWYbBxpmEYBIEEy075+gWqAb79YUfz4SfE563qmaHcf2gqB0uhB9cUFGWGRzl/
-HRr2q0ZDNnINDSqA0bl9p/BAWB9neVf9ngSsAIqcKOr+hJfmxmVNAs+dAoGAa0Rg
-2EBxk2YvOmyinhFePxtAmmNH6Gr8OUbswnZrj8nJ7bVjeF+hdy/wwW+7/xvDWCBV
-lDghCTPquiPN0MTx7wXrdMGBmjmlacM1ayJPlrOK8DmFmfj8mVi8evxd9Bxh1fzO
-nTfl4r4LWAUF0ZC0wHQVpXqVgJpdwmLIYh5kp7ECgYBbtVHXLMRnisBFlkgeTbY0
-L9Myrmh5Zr+bFYpDRV2Qb34J15/F2ssh2ry8O25b8bw0lFsBANnBg88s0CHJ3YB0
-in3yBVlEs12tJkqiPEqrgNBWdn0ekfeZzMQtsdaR5xzODAOrf3X/MEsjLSjlWRI5
-Olk/h0L0HZYYA62Svo9QTA==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDsV1BWQs14HJcO
+j1GaPlAmeZG6wNIQHVYrHLZDo/4vKysECVvjQyliZnaxNh+jHMcS4mb9eI6LLQXP
+2sFOX/npL6KadO0N0+HrQr79/WXfNHCIybn9ZCSEJ7oI+Lo82Lsdi/oRm2j7cwas
+464bUbcQ20MFSZpzXhs0Wygsgc9F24Zf1oD8Qpx/b6fd64oSFqRyzYbQxcY/Vrn/
+KUhT48gAExT+Zb+xV2xk8DhIEsYTHp9edOh7SjnYcIlJ4rZY+9X6v/LsbzuChlIt
+WrPCnMAY7bDBPXvr0b5/ZZ57lDI8m2FRWgK33Wtdxvzm3SC6kR4bUUS6loXYSwuP
+Raavj2kVAgMBAAECggEAanAMOz0MohpmIWWEP63ulNVNP0kVkbJUm0fsAdx6Xi3X
+ypKYcmpN2gYBUF/qsaAFO8kAzwibUayuIGUJh82LlGwik+My23ZgGX7O2z5iwbox
+MDmBbM/L7kSh8OZroXmOE4l1zrYp+oxcJkLHp4AOrSXCMkBqsahhIhwnpJu1iGSu
+sujWt3VK9MlAYjzAMht3EMgvwzdgvhHCnBR3FcgcDDNmutDUspy/Ms+FAUt6MizX
+RHPi8A1gCfl157r5mbaO9m4K4C0JHS/8wQyilaUVROTtBY9JdrkgVJr6ji4eREZs
+C5ISSEAWWi4EelX175SeGpcAZZRXOnpb6lYgJHnegQKBgQD6CvwVQCqrqzseViQ5
+iJ3VPM+RUbp/jNNTr6XSbW45nnZV0Ni+wmNG7kCwDf9gSrdPQzMjvSlz6b9CuWLy
+j/6Du8Nu33HCH6kJX1Q8DsizTu1XkHkJhSKpf1mFeQYmfz5K8RFz80qZkWbu6GPU
+Dz5j8IUZUFLEAsI76A+6qwOvNQKBgQDx+MLrMuC2bd9wgvjlxoK6/9dAuilqyLsG
+pIW7SVp4W0AsrgBU2tpsFmlhy8Lk4SPl8InOxRTdFD6hLyF6+St1b0xNHEy7CM5U
+6aodX6VKo/Cq1tHmPIIKL8Q38noXwgG1bozoFdmmtuerLowruO1aeozKwrhJvdvz
+0xTEeESuYQKBgQDogQZejEghURur3dXZWdvJyL4KFsEgkcZ/7rh2ryLrmRnYOlcR
+Kpg+AJVOH/XziAZkQcxv0xmUmyop1VDY1GSKAjJ8CnIxXFdGS8p7/hNKCH5SChlC
+bPYKPkzz+9FoQrGd5gOgmf4oRjg8twL80R/mtmRNYY9UjGwoYGUf4p2OcQKBgCM8
+3uXxmtf2WDvCVwzfQ9qHt4ktkyqB4PququsDW7F7WHUpQdMZrAVhnicnzVIXl2q9
+BNSfztIDSLugaXfHIZUQiEQSgvoZ5jJndOaiLygXh8zZS+gDl8xz+FdNcIpVLnqF
+hu+lfvTQXhyHwtH7NFWg0zAT+1KB264+Zx/Vg+sBAoGAEvAXnFEsM9vMrwscLW1A
+uNI6eXdZCkYUoQX3iUekgVK6PQnd9jNlAcb93AbJRH/NPJ6n3qxfbCH5OkFWeWbZ
+Ylj8f2b+TFpOlKv1zUFIxDvbxZXjyWqSrKamESf8EC+KVhkN5xHTp6ezdLer7+rL
+jWIem+371Zb/uNVuQuFZ0NE=
-----END PRIVATE KEY-----
diff --git a/server/main.js b/server/main.js
index 497d20e5..fa428bf6 100644
--- a/server/main.js
+++ b/server/main.js
@@ -1,6 +1,7 @@
import '/imports/startup/server';
Schema = require('../imports/api/schema.js').Schema;
+Messages = require('../imports/api/messages/messages.js').Messages;
Experiences = require('../imports/api/OCEManager/OCEs/experiences.js').Experiences;
Images = require('../imports/api/ImageUpload/images.js').Images;
Avatars = require('../imports/api/ImageUpload/images.js').Avatars;
diff --git a/simulatelocations.py b/simulatelocations.py
index 03839c05..56eb3b57 100644
--- a/simulatelocations.py
+++ b/simulatelocations.py
@@ -4,7 +4,7 @@
path1 = [(43, -87), (32, -120)]
-park = (42.056838, -87.675940)
+park = (42.056838, -87.675940)
burgers = (42.046131, -87.681559)
grocery = (42.047621, -87.679488)
grocery2 = (42.039818,-87.680088)
@@ -13,7 +13,7 @@
sydney = (-33, 151)
train = (42.053872,-87.683748)
brisbane = (-37.822464, 144.966146)
-
+library = (42.058141, -87.674490)
def followPath(path, uid):
for stop in path:
@@ -21,7 +21,10 @@ def followPath(path, uid):
time.sleep(1)
def setLocation(location, uid):
- r = requests.post("http://localhost:3000/api/geolocation", json={
+ # host = "http://localhost:3000"
+ # host = "https://ce-platform.herokuapp.com"
+ host = "https://staging-ce-platform.herokuapp.com"
+ r = requests.post(host + "/api/geolocation", json={
"userId": uid,
"location": {
"coords": {
@@ -31,6 +34,8 @@ def setLocation(location, uid):
"activity": {"type": "unknown", "confidence": 100}
}
})
+ ## uid + "at location " + str(location[0]) + " " + str(location[1])
+
#print(uid + "at location " + str(location[0]) + " " + str(location[1]))
@@ -90,6 +95,7 @@ def userWaitsBetweenNotifications():
time.sleep(50)
setLocation(park, sys.argv[1])
+
print("User should regain experience!")
def threeUsersParticipateInExperiences():
@@ -102,6 +108,16 @@ def threeUsersParticipateInExperiences():
# time.sleep(20)
# setLocation(park, sys.argv[3])
+ # # "User C should now have one experiences"
+ # time.sleep(10)
+
+ # setLocation(park, sys.argv[1])
+ # # "User A should have one experiences"
+ # # "Participate in restaurant"
+ # time.sleep(10)
+
+ # setLocation(burgers, sys.argv[2])
+ # # "User B should have no experiences"
# print("User C should now have one experiences")
# time.sleep(10)
@@ -172,6 +188,7 @@ def test5():
setLocation(train, sys.argv[4])
time.sleep(15)
+
print("garrett goes to a park")
setLocation(park, sys.argv[1])
time.sleep(15)
@@ -186,7 +203,8 @@ def allUsersAtPark():
setLocation(park, sys.argv[3])
setLocation(park, sys.argv[4])
setLocation(park, sys.argv[5])
- print("all usrs at parks")
+ # "all usrs at parks"
+
def allUsersAtCastle():
setLocation((42.050538,-87.677355), sys.argv[1])
@@ -228,8 +246,10 @@ def allUsersAtTrain():
setLocation(train, sys.argv[4])
setLocation(train, sys.argv[5])
+
print("all users at train")
+
def userAatCoffee():
setLocation(coffee, sys.argv[1])
@@ -255,8 +275,10 @@ def allUsersSyd():
setLocation(sydney, sys.argv[4])
setLocation(sydney, sys.argv[5])
+
print("all users in sydney")
+
def allUsersLakefill():
setLocation((42.052460,-87.669876), sys.argv[1])
setLocation((42.052460,-87.669876), sys.argv[2])
@@ -264,8 +286,10 @@ def allUsersLakefill():
setLocation((42.052460,-87.669876), sys.argv[4])
setLocation((42.052460,-87.669876), sys.argv[5])
+
print("all users in lakefill")
+
def onlyGarretAtLake():
setLocation((42.052460,-87.669876), sys.argv[1])
setLocation(train, sys.argv[2])
@@ -278,8 +302,8 @@ def onlyGarretAtLake():
def garrettAndMegBump():
setLocation(grocery, sys.argv[1])
setLocation(grocery, sys.argv[3])
- setLocation(train, sys.argv[2])
- setLocation(train, sys.argv[4])
+ setLocation(grocery, sys.argv[5])
+ setLocation(grocery, sys.argv[4])
setLocation(train, sys.argv[5])
print("meg and garret at grocery")
@@ -293,8 +317,24 @@ def allUsersGrocery():
print("all users at grocery")
+def allUsersCoffee():
+ for i in sys.argv:
+ setLocation(coffee, i)
+ print("all users at coffee")
+
if __name__ == "__main__":
- allUsersGrocery()
+
+ #allUsersGrocery()
#garrettAndMegBump()
+
+ # allUsersGrocery()
+ allUsersCoffee()
+ #allUsersAtPark()
+ # garrettAndMegBump()
+ # single user movement
+ # setLocation(burgers, sys.argv[1])
+ # allUsersGrocery()
+ #garrettAndMegBump()
+
#time.sleep(2)
#onlyGarretAtLake()