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

509 meteor upgrade #524

Merged
merged 4 commits into from
Mar 23, 2020
Merged

509 meteor upgrade #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9be114d
upgraded to meteor 1.9 and updated all compatilble dependencies. Reve…
shailee-m Mar 12, 2020
e16b2ec
renaming files to .spec instread of .tests. Added date format when ch…
shailee-m Mar 15, 2020
85a3a31
509 removing servermethod changes. and adding all date fields as dates
shailee-m Mar 17, 2020
66eb0e1
509 hiding cllection related tests
shailee-m Mar 20, 2020
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
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@ This command will start a server on port 8000. It is better to run `npm i` if th
Server code must be tested on server using `Meteor.isServer` flag. Code running in the `if` constructs of `Meteor.isServer` will show results on the console. For the others, `Meteor.isClient` must be used and they can be evaluated in the browser on `http://localhost:8000`.

## Coverage
Coverage can be found at `http://localhost:8000/coverage`. This will show the coverage for server files. To get the coverage for client,
Coverage can be found at `http://localhost:8000/coverage` on the browser. This will show the coverage for server files.
<!-- To get the coverage for client,
1. Open the developer-tools console at `http://localhost:8000` in your preferred browser.
2. Run this command `Meteor.sendCoverage(function(stats,nbErr) {console.log(stats,nbErr);});`
3. Now if `http://localhost:8000/coverage` is reloaded the coverage for client is visible.
3. Now if `http://localhost:8000/coverage` is reloaded the coverage for client is visible. -->

Please note that the server for tests is started in watch mode so that client tests can be evaluated on the browser. These tests take 2 runs to get the correct results due to some issues with the underlying babel nyc module. Here's what can be done:
1. start the server.
Expand Down
1 change: 1 addition & 0 deletions app/.meteor/.finished-upgraders
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
1.8.3-split-jquery-from-blaze
24 changes: 10 additions & 14 deletions app/.meteor/packages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@

dburles:collection-helpers
iron:router
[email protected].1
[email protected].2
useraccounts:bootstrap
alanning:roles
fortawesome:fontawesome
mrt:flash-messages
[email protected]
Expand All @@ -18,41 +17,38 @@ peppelg:bootstrap-3-modal
brylie:first-user-admin
[email protected]
[email protected]
mongo@1.6.2
mongo@1.8.0
blaze-html-templates
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
spacebars
[email protected]
simple:reactive-method
percolate:[email protected]
reywood:publish-composite
ecmascript@0.12.4
ecmascript@0.14.2
[email protected]
useraccounts:iron-routing
erikpel:wellbeing-mock-data
tap:i18n
tap:i18n-ui
standard-minifier-css@1.5.3
standard-minifier-js@2.4.1
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
[email protected]
[email protected]
tmeasday:publish-counts
aldeed:[email protected]
aldeed:autoform
nvd3:nvd3
matb33:collection-hooks
akryum:vue
akryum:vue-component
akryum:vue-blaze-template
underscore
vuejs:blaze-integration
akryum:vue-sass
[email protected]
meteortesting:mocha
hwillson:stub-collections
xolvio:cleaner
alanning:roles
jquery
lmieulet:meteor-coverage
matb33:collection-hooks
2 changes: 1 addition & 1 deletion app/.meteor/release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.8.1
METEOR@1.9.3
70 changes: 30 additions & 40 deletions app/.meteor/versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
[email protected]
[email protected]
akryum:[email protected]
akryum:[email protected]
akryum:[email protected]
akryum:[email protected]
akryum:[email protected]
akryum:[email protected]
akryum:[email protected]
alanning:[email protected]
[email protected]
[email protected]
alanning:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
Expand All @@ -16,19 +9,19 @@ [email protected]
anti:[email protected]
aslagle:[email protected]
[email protected]
babel-compiler@7.3.4
babel-runtime@1.3.0
[email protected].11
babel-compiler@7.5.2
babel-runtime@1.5.0
[email protected].12
[email protected]
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected]
brylie:[email protected]
brylie:[email protected]
[email protected]
[email protected]
callback-hook@1.1.0
callback-hook@1.3.0
cfs:[email protected]
[email protected]
[email protected]
Expand All @@ -38,16 +31,16 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
digilord:[email protected]
[email protected]
ecmascript@0.12.7
ecmascript@0.14.2
[email protected]
ecmascript-runtime-client@0.8.0
ecmascript-runtime-server@0.7.1
[email protected].0
ecmascript-runtime-client@0.10.0
ecmascript-runtime-server@0.9.0
[email protected].1
[email protected]
erikpel:[email protected]
[email protected]
Expand All @@ -60,7 +53,7 @@ [email protected]
[email protected]
hwillson:[email protected]
[email protected]
[email protected].0
[email protected].1
iron:[email protected]
iron:[email protected]
iron:[email protected]
Expand All @@ -75,37 +68,35 @@ [email protected]
lmieulet:[email protected]
[email protected]
[email protected]
matb33:collection-hooks@0.8.4
matb33:collection-hooks@1.0.1
mdg:[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteorspark:[email protected]
meteortesting:browser-tests@1.0.0
meteortesting:[email protected].3
meteortesting:[email protected].1
minifier-css@1.4.2
minifier-js@2.4.1
meteortesting:browser-tests@1.3.3
meteortesting:[email protected].5
meteortesting:mocha-core@7.1.0
minifier-css@1.5.0
minifier-js@2.6.0
[email protected]
[email protected]
[email protected]
[email protected].4
modules@0.13.0
modules-runtime@0.10.3
[email protected].5
modules@0.15.0
modules-runtime@0.12.0
momentjs:[email protected]
mongo@1.6.2
mongo@1.8.1
[email protected]
[email protected]
[email protected]
[email protected]
mrt:[email protected]
[email protected]
npm-mongo@3.1.2
npm-mongo@3.6.0
nvd3:[email protected]
[email protected]
[email protected]
peerlibrary:[email protected]
peerlibrary:[email protected]
peppelg:[email protected]
percolate:[email protected]
[email protected]
Expand All @@ -116,21 +107,21 @@ [email protected]
[email protected]
[email protected]
[email protected]
reywood:[email protected].0
reywood:[email protected].3
[email protected]
sacha:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
simple:[email protected]
[email protected].2
[email protected].3
softwarerero:[email protected]
[email protected]
[email protected]
[email protected]
standard-minifier-css@1.5.3
standard-minifier-js@2.4.1
standard-minifier-css@1.6.0
standard-minifier-js@2.6.0
tap:[email protected]
tap:[email protected]
[email protected]
Expand All @@ -146,7 +137,6 @@ [email protected]
useraccounts:[email protected]
useraccounts:[email protected]
useraccounts:[email protected]
vuejs:[email protected]
[email protected]
[email protected]
[email protected]
xolvio:[email protected]
1 change: 0 additions & 1 deletion app/client/mixins/localizationMixin.js
View file
Open in desktop

This file was deleted.

82 changes: 81 additions & 1 deletion app/client/views/front/front.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,83 @@
<template name="front">
{{> VueComponent component="front" props=props}}
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{_ "front-quickAddPanel-title" }}
</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12 col-md-12">
<button
id="add-activity"
class="btn btn-success btn-lg"
role="button"
>
<i class="fa fa-heartbeat"></i>
<br />
{{_ "front-quickAddPanel-activityButton" }}
</button>
<button
id="add-feeling"
class="btn btn-success btn-lg"
role="button"
>
<i class="fa fa-stethoscope"></i>
<br />
{{_ "front-quickAddPanel-feelingButton" }}
</button>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{_ "front-quickNavigationPanel-title" }}
</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-xs-12 col-md-12">
<a
href="/residents"
class="btn btn-primary btn-lg"
role="button"
>
<i class="fa fa-users"></i>
<br />
{{_ "front-quickNavigationPanel-residentsButton" }}
</a>
<a
href="/homes"
class="btn btn-primary btn-lg"
role="button"
>
<i class="fa fa-home"></i>
<br />
{{_ "front-quickNavigationPanel-homesButton" }}
</a>
<a
href="/activities"
class="btn btn-primary btn-lg"
role="button"
>
<i class="fa fa-heartbeat"></i>
<br />
{{_ "front-quickNavigationPanel-activitiesButton" }}
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
15 changes: 9 additions & 6 deletions app/client/views/front/front.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
Template.front.helpers({
props() {
return {
Modal
};
}
Template.front.events({
'click #add-activity'() {
// Show the add activity modal
Modal.show('activityFormModal');
},
'click #add-feeling'() {
// Show the feeling modal
Modal.show('newFeeling');
},
});
Loading