From f3c728f0ef1e72afcb53e66bda4fc3e731364d35 Mon Sep 17 00:00:00 2001 From: Kapil Garg Date: Thu, 4 Nov 2021 18:00:13 -0500 Subject: [PATCH 1/6] upgrading to meteor 1.12.2 - remove poetic:materialize-scss and use materialize-css from NPM instead --- .idea/jsLibraryMappings.xml | 1 + .idea/pair-research-meteor.iml | 1 + .meteor/packages | 23 +- .meteor/release | 2 +- .meteor/versions | 79 +- client/main.js | 1 + client/main.scss | 2 +- imports/ui/components/pairings.html | 30 +- imports/ui/components/pairings.js | 3 +- imports/ui/components/pairings.scss | 6 +- imports/ui/layout/header.html | 8 +- imports/ui/layout/header.js | 6 +- imports/ui/pages/groups_create.js | 2 +- imports/ui/pages/groups_settings.html | 4 +- imports/ui/pages/groups_settings.js | 4 +- imports/ui/pages/groups_settings.scss | 2 +- imports/ui/pages/home.html | 6 + imports/ui/pages/signup.html | 8 +- imports/ui/pages/signup.js | 2 +- imports/ui/partials/groups_home_group.js | 2 +- imports/ui/partials/groups_home_invite.js | 4 +- imports/ui/partials/groups_settings_member.js | 2 +- imports/ui/partials/pairings_task.html | 30 +- imports/ui/stylesheets/util.scss | 6 + package-lock.json | 1008 ++++++++++------- package.json | 10 +- yarn.lock | 427 ------- 27 files changed, 726 insertions(+), 953 deletions(-) delete mode 100644 yarn.lock diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index 9a1795f..949e2f3 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/.idea/pair-research-meteor.iml b/.idea/pair-research-meteor.iml index 7aa96ab..d1f4a06 100644 --- a/.idea/pair-research-meteor.iml +++ b/.idea/pair-research-meteor.iml @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/.meteor/packages b/.meteor/packages index bbd5c55..14a2d99 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -5,39 +5,38 @@ # but you can also edit it by hand. 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.7.0 # The database Meteor supports right now +mobile-experience@1.1.0 # Packages for a great mobile UX +mongo@1.10.1 # The database Meteor supports right now blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views reactive-var@1.0.11 # Reactive variable for tracker jquery@1.11.10 # Helpful client-side library tracker@1.2.0 # Meteor's client-side reactive programming library -standard-minifier-css@1.5.4 # CSS minifier run for production mode -standard-minifier-js@2.5.2 # JS minifier run for production mode +standard-minifier-js@2.6.0 # JS minifier run for production mode es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers. -ecmascript@0.13.2 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.14.4 # Enable ECMAScript2015+ syntax in app code aldeed:collection2 -accounts-base@1.4.5 -accounts-password@1.5.2 +accounts-base@1.7.1 +accounts-password@1.6.3 kadira:flow-router kadira:blaze-layout -fourseven:scss mdg:validated-method nooitaf:colors dburles:collection-helpers -poetic:materialize-scss practicalmeteor:mocha dburles:factory momentjs:moment natestrauser:animate-css check@1.3.1 -email@1.2.3 +email@2.0.0 arillo:flow-router-helpers archive:jquery-dotdotdot -shell-server@0.4.0 +shell-server@0.5.0 practicalmeteor:chai -dynamic-import@0.5.1 +dynamic-import@0.5.5 underscore@1.0.10 meteorhacks:ssr montiapm:agent +fourseven:scss +seba:minifiers-autoprefixer diff --git a/.meteor/release b/.meteor/release index bfccdc2..9c98b85 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.8.3 +METEOR@1.12.2 diff --git a/.meteor/versions b/.meteor/versions index 8885af2..2391409 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,5 +1,5 @@ -accounts-base@1.4.5 -accounts-password@1.5.2 +accounts-base@1.7.1 +accounts-password@1.6.3 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 @@ -9,17 +9,17 @@ allow-deny@1.1.0 archive:jquery-dotdotdot@1.6.15 arillo:flow-router-helpers@0.5.2 autoupdate@1.6.0 -babel-compiler@7.4.2 -babel-runtime@1.4.0 +babel-compiler@7.5.5 +babel-runtime@1.5.0 base64@1.0.12 binary-heap@1.0.11 -blaze@2.3.3 +blaze@2.3.4 blaze-html-templates@1.1.2 blaze-tools@1.0.10 -boilerplate-generator@1.6.0 -caching-compiler@1.2.1 +boilerplate-generator@1.7.1 +caching-compiler@1.2.2 caching-html-compiler@1.1.3 -callback-hook@1.2.0 +callback-hook@1.3.0 check@1.3.1 coffeescript@1.0.17 dburles:collection-helpers@1.1.0 @@ -27,31 +27,31 @@ dburles:factory@0.4.2 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 -ddp-rate-limiter@1.0.7 -ddp-server@2.3.0 +ddp-rate-limiter@1.0.9 +ddp-server@2.3.2 deps@1.0.12 diff-sequence@1.1.1 -dynamic-import@0.5.1 -ecmascript@0.13.2 +dynamic-import@0.5.5 +ecmascript@0.14.4 ecmascript-runtime@0.7.0 -ecmascript-runtime-client@0.9.0 -ecmascript-runtime-server@0.8.0 -ejson@1.1.0 -email@1.2.3 +ecmascript-runtime-client@0.11.0 +ecmascript-runtime-server@0.10.0 +ejson@1.1.1 +email@2.0.0 es5-shim@4.8.0 fetch@0.1.1 -fourseven:scss@3.13.0 +fourseven:scss@4.14.2 geojson-utils@1.0.10 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 http@1.4.2 id-map@1.1.0 -inter-process-messaging@0.1.0 +inter-process-messaging@0.1.1 jquery@1.11.11 kadira:blaze-layout@2.3.0 kadira:flow-router@2.12.1 -launch-screen@1.1.1 +launch-screen@1.2.0 livedata@1.0.18 localstorage@1.2.0 logging@1.1.20 @@ -60,17 +60,17 @@ mdg:validation-error@0.5.1 meteor@1.9.3 meteor-base@1.4.0 meteorhacks:ssr@2.2.0 -minifier-css@1.4.3 -minifier-js@2.5.1 -minimongo@1.4.5 -mobile-experience@1.0.5 -mobile-status-bar@1.0.14 -modern-browsers@0.1.4 -modules@0.14.0 -modules-runtime@0.11.0 +minifier-css@1.5.3 +minifier-js@2.6.0 +minimongo@1.6.1 +mobile-experience@1.1.0 +mobile-status-bar@1.1.0 +modern-browsers@0.1.5 +modules@0.15.0 +modules-runtime@0.12.0 momentjs:moment@2.24.0 -mongo@1.7.0 -mongo-decimal@0.1.1 +mongo@1.10.1 +mongo-decimal@0.1.2 mongo-dev-server@1.1.0 mongo-id@1.0.7 mongo-livedata@1.0.12 @@ -79,10 +79,9 @@ montiapm:meteorx@2.2.0 natestrauser:animate-css@3.5.1 nooitaf:colors@1.1.2_1 npm-bcrypt@0.9.3 -npm-mongo@3.2.0 +npm-mongo@3.8.1 observe-sequence@1.0.16 ordered-dict@1.1.0 -poetic:materialize-scss@1.97.6_1 practicalmeteor:chai@2.1.0_1 practicalmeteor:loglevel@1.2.0_2 practicalmeteor:mocha@2.4.5_6 @@ -90,22 +89,22 @@ practicalmeteor:mocha-core@1.0.1 practicalmeteor:sinon@1.14.1_2 promise@0.11.2 raix:eventemitter@0.1.3 -random@1.1.0 +random@1.2.0 rate-limit@1.0.9 reactive-dict@1.3.0 reactive-var@1.0.11 -reload@1.3.0 +reload@1.3.1 retry@1.1.0 routepolicy@1.1.0 +seba:minifiers-autoprefixer@1.1.2 service-configuration@1.0.11 sha@1.0.9 -shell-server@0.4.0 -socket-stream-client@0.2.2 +shell-server@0.5.0 +socket-stream-client@0.3.1 spacebars@1.0.15 spacebars-compiler@1.1.3 -srp@1.0.12 -standard-minifier-css@1.5.4 -standard-minifier-js@2.5.2 +srp@1.1.0 +standard-minifier-js@2.6.0 templating@1.3.2 templating-compiler@1.3.3 templating-runtime@1.3.2 @@ -114,8 +113,8 @@ tmeasday:test-reporter-helpers@0.2.1 tracker@1.2.0 ui@1.0.13 underscore@1.0.10 -url@1.2.0 -webapp@1.7.5 +url@1.3.1 +webapp@1.9.1 webapp-hashing@1.0.9 zimme:active-route@2.3.2 zodern:meteor-package-versions@0.2.1 diff --git a/client/main.js b/client/main.js index 6c08dd5..2e64b17 100644 --- a/client/main.js +++ b/client/main.js @@ -1,4 +1,5 @@ import '/imports/startup/client'; +import '../node_modules/materialize-css/dist/js/materialize.min'; if (Meteor.isDevelopment) { Affinities = require('../imports/api/affinities/affinities.js').Affinities; diff --git a/client/main.scss b/client/main.scss index 5afc4ce..00b0169 100644 --- a/client/main.scss +++ b/client/main.scss @@ -1,4 +1,4 @@ -@import "{poetic:materialize-scss}/sass/materialize.scss"; +@import "{}/node_modules/materialize-css/sass/materialize.scss"; @import '{}/imports/ui/stylesheets/global.scss'; @import '{}/imports/ui/stylesheets/collections.scss'; diff --git a/imports/ui/components/pairings.html b/imports/ui/components/pairings.html index d6511f8..a78c06d 100644 --- a/imports/ui/components/pairings.html +++ b/imports/ui/components/pairings.html @@ -37,20 +37,30 @@

- - + - - + - - + - - + - - +

diff --git a/imports/ui/components/pairings.js b/imports/ui/components/pairings.js index 1b0619b..f844f52 100644 --- a/imports/ui/components/pairings.js +++ b/imports/ui/components/pairings.js @@ -255,7 +255,8 @@ Template.pairings.events({ }); }, + // TODO: this gets deinitialized before the tooltip is destroyed 'click a.tooltipped'(event, instance) { - $('.tooltipped').tooltip('remove'); + $('.tooltipped').tooltip('destroy'); } }); diff --git a/imports/ui/components/pairings.scss b/imports/ui/components/pairings.scss index 0dbb34d..01cc07c 100644 --- a/imports/ui/components/pairings.scss +++ b/imports/ui/components/pairings.scss @@ -104,9 +104,13 @@ .range-field { label { - padding-left: 25px; + padding-left: 0.25rem; margin-right: 5px; } + + span { + padding-left: 1.6rem; + } } // Keeps page height constant diff --git a/imports/ui/layout/header.html b/imports/ui/layout/header.html index ad1f2c7..adbcc8f 100644 --- a/imports/ui/layout/header.html +++ b/imports/ui/layout/header.html @@ -18,7 +18,7 @@