focallocal · AndyatFocallocal · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022 · Nov 7, 2022
diff --git a/.babelrc b/.babelrc
@@ -1,13 +1,6 @@
 {
-  "presets": [
-    "env",
-    "react",
-    "stage-2"
-  ],
-  "plugins": ["react-hot-loader/babel"],
-  "env": {
-    "test": {
-      "plugins": ["dynamic-import-node"]
-    }
-  }
+  "presets": ["@babel/preset-env"],
+  "plugins": [
+    ["@babel/plugin-transform-runtime", { "regenerator": true }]
+  ]
 }
diff --git a/deployment/.sops.yaml → .deployment/.sops.yaml b/deployment/.sops.yaml → .deployment/.sops.yaml
diff --git a/deployment/branch-to-dir.sh → .deployment/branch-to-dir.sh b/deployment/branch-to-dir.sh → .deployment/branch-to-dir.sh
diff --git a/.../brightertomorrowmap/mup-secrets.enc.json → .../brightertomorrowmap/mup-secrets.enc.json b/.../brightertomorrowmap/mup-secrets.enc.json → .../brightertomorrowmap/mup-secrets.enc.json
@@ -1,12 +1,14 @@
 {
-	"mongo_url": "ENC[AES256_GCM,data:VgzbSkR7Tli7jDdZOmQ0wKLPFegg9sx7BtnI7y8Xr8nQQ0s9sxmZxzfgeT89e9vjh7YxsQh9P+77y8qMavCzNnp7egyQ+AwLPJx5QsGxuuWJh81FrvkNPkZoltEjPb9cJ5le55As,iv:QEyl4R2fMPlqQSIqkes9UxqVNvZnLr99nlHdoqrC6LM=,tag:xLFyaXhAYSilUfHdIprE9w==,type:str]",
+	"mongo_url": "ENC[AES256_GCM,data:0AH/bsd8JOTjkuZcBNNg3Uu1POZXx14cxJoStgHn4TGwaBkbssALU/shmYOcxQW8GQoIePJvJkwrEupraZhrzqWHcBoWB1oRAd6bqF003wk1xvUOorLUXw7t5v0UDhdXPvCVAgtIdapGMV6J05RwyWO8zdT4OzvJSJhbOk1LIMY512i7YcKPXoLybg/phsnYvYYSaum/ruq9kD1gmZ3wscOIvrWMSLTCmW/YECTvRLnH34MS/OojWj6bSD7PAz+xI8yhL8bPHUYIQtw2tpzcKy8q2qznhilMpoLV1qEZhp0kYu51Dldu5Fm0KgL5jY1tYITThGCa2MrhRCwsZ7u9OMmkjecmB/ct+JCdCWDvTxOc0H5T110rSww+5Q==,iv:FlO1e5LTN94jC5eswFIMB0t7jTFH2RYcH4Ug31GCviI=,tag:8apFmmGzoIvdTZuEa1Bt5Q==,type:str]",
+	"password": "ENC[AES256_GCM,data:4qJt3l+w6YUtSVH+4CWpYyShtWZwtpihlw==,iv:L0tYyQyWJI3OjuNuyIURtw0OxyHLVmjQk8mKKP+iWds=,tag:A+S5DpMSy9kQbTQySpn8EA==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
 		"azure_kv": null,
 		"hc_vault": null,
-		"lastmodified": "2021-05-20T08:10:37Z",
-		"mac": "ENC[AES256_GCM,data:Ms9jbodWL67uBznRpXzEot/HojKsewMeQ54UO0yn1lrYkqlPMBGr1LzYKk0HniRSlrlKnAPmEq4/OGKu8gD3ypjTP/ljlaudojKJxi6L8VuiA3bDoL7IlQSpCoL5FnYsHQmgBEsqijCA7qT1AWKtR1j1JKOGER7SfokmLhLC1YI=,iv:qDjAFidnx6sCHcXIWWcdybuo2D5nQ59bn7ZbGs0ULQM=,tag:xkMcs/NVS9h99nLziAbBCQ==,type:str]",
+		"age": null,
+		"lastmodified": "2021-09-21T16:39:04Z",
+		"mac": "ENC[AES256_GCM,data:p7B803DfpiKCsbyxFn0rJbxCwFUlWEpfrDCQ4QxQ4eTWYBJsiUloDyaKpy25trO97pubrEUjJRnBKPQVRH0uBb8W3n/mgMoiGzwDvBptchG7S3hJR9tBMqtUo2evUbPQviEeyDxEYp9A2IYoLV/yUwLYA5aR2vY4Gh/Q2ulxRJo=,iv:e8Uhrya9GqlAxcQTXPZ3270Wmz1+33hvqo0d5sAqTb8=,tag:WPTyyFg5xbS+qbWZewA0pA==,type:str]",
 		"pgp": [
 			{
 				"created_at": "2021-05-20T08:10:35Z",
@@ -25,6 +27,6 @@
 			}
 		],
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.6.1"
+		"version": "3.7.1"
 	}
 }
diff --git a/deployment/brightertomorrowmap/mup.js → .deployment/brightertomorrowmap/mup.js b/deployment/brightertomorrowmap/mup.js → .deployment/brightertomorrowmap/mup.js
@@ -1,18 +1,18 @@
-var secret = require('./mup-secrets.json');
+var secret = require('./mup-secrets.json')
 
 module.exports = {
   servers: {
     one: {
       host: '178.62.233.44',
       username: 'deploy',
-      pem: './travis-ssh-key',
+      pem: './travis-ssh-key'
     }
   },
   app: {
     name: 'brightertomorrowmap',
     path: '../../.',
     docker: {
-      image: 'abernix/meteord:node-8.4.0-base'
+      image: 'zodern/meteor:root'
     },
     servers: {
       one: {}
@@ -22,7 +22,7 @@ module.exports = {
     },
     env: {
       ROOT_URL: 'https://fl-maps.brightertomorrowmap.com',
-      MONGO_URL: secret.mongo_url,
+      MONGO_URL: secret.mongo_url
     }
   },
   proxy: {
@@ -31,4 +31,4 @@ module.exports = {
       letsEncryptEmail: 'contact@focallocal.org'
     }
   }
-};
+}
diff --git a/...ent/brightertomorrowmap/settings.enc.json → ...ent/brightertomorrowmap/settings.enc.json b/...ent/brightertomorrowmap/settings.enc.json → ...ent/brightertomorrowmap/settings.enc.json
diff --git a/...nt/brightertomorrowmap/travis-ssh-key.enc → ...nt/brightertomorrowmap/travis-ssh-key.enc b/...nt/brightertomorrowmap/travis-ssh-key.enc → ...nt/brightertomorrowmap/travis-ssh-key.enc
diff --git a/deployment/deploying.md → .deployment/deploying.md b/deployment/deploying.md → .deployment/deploying.md
diff --git a/...lichappinessmovement/mup-secrets.enc.json → ...lichappinessmovement/mup-secrets.enc.json b/...lichappinessmovement/mup-secrets.enc.json → ...lichappinessmovement/mup-secrets.enc.json
@@ -28,4 +28,4 @@
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.7.1"
 	}
-}
+}
diff --git a/deployment/publichappinessmovement/mup.js → .deployment/publichappinessmovement/mup.js b/deployment/publichappinessmovement/mup.js → .deployment/publichappinessmovement/mup.js
@@ -1,18 +1,18 @@
-var secret = require('./mup-secrets.json');
+var secret = require('./mup-secrets.json')
 
 module.exports = {
   servers: {
     one: {
       host: '167.71.2.39',
       username: 'deploy',
-      password: secret.password,
+      password: secret.password
     }
   },
   app: {
     name: 'publichappinessmovement',
     path: '../../.',
     docker: {
-      image: 'abernix/meteord:node-8.4.0-base'
+      image: 'zodern/meteor:root'
     },
     servers: {
       one: {}
@@ -23,7 +23,7 @@ module.exports = {
     env: {
       ROOT_URL: 'https://fl-maps.publichappinessmovement.com',
       MONGO_URL: secret.mongo_url,
-      PORT: 8095,
+      PORT: 8095
     }
-  },
-};
+  }
+}
diff --git a/...publichappinessmovement/settings.enc.json → ...publichappinessmovement/settings.enc.json b/...publichappinessmovement/settings.enc.json → ...publichappinessmovement/settings.enc.json
diff --git a/deployment/secrets.md → .deployment/secrets.md b/deployment/secrets.md → .deployment/secrets.md
diff --git a/deployment/servers.md → .deployment/servers.md b/deployment/servers.md → .deployment/servers.md
diff --git a/deployment/testing/mup.js → .deployment/testing/mup.js b/deployment/testing/mup.js → .deployment/testing/mup.js
@@ -3,14 +3,14 @@ module.exports = {
     one: {
       host: '134.122.58.242',
       username: 'deploy',
-      pem: './travis-ssh-key',
+      pem: './travis-ssh-key'
     }
   },
   app: {
-    name: 'testing-happiness.ga',
+    name: 'testing.publichappinessmovement.com',
     path: '../../.',
     docker: {
-      image: 'abernix/meteord:node-8.4.0-base'
+      image: 'zodern/meteor:root'
     },
     servers: {
       one: {}
@@ -19,7 +19,7 @@ module.exports = {
       serverOnly: true
     },
     env: {
-      ROOT_URL: 'https://fl-maps.testing-happiness.ga',
+      ROOT_URL: 'https://testing-maps.publichappinessmovement.com/'
     }
   },
   mongo: {
@@ -29,9 +29,9 @@ module.exports = {
     }
   },
   proxy: {
-    domains: 'fl-maps.testing-happiness.ga',
+    domains: 'testing-maps.publichappinessmovement.com',
     ssl: {
       letsEncryptEmail: 'contact@focallocal.org'
     }
   }
-};
+}
diff --git a/deployment/testing/settings.enc.json → .deployment/testing/settings.enc.json b/deployment/testing/settings.enc.json → .deployment/testing/settings.enc.json
@@ -25,7 +25,7 @@
 	"private": {
 		"google_api_key": "ENC[AES256_GCM,data:H4yUJn0VU5O+bSkuWDGp5131AlHTK12IGpD/1yCAhB6Ou1aa+p22,iv:0sFAs0gRIfB53/X90AJSGZzHdyTp4bwESU3gA9kkh9Y=,tag:lDJqgdPM7kIsWQwZkOV5iA==,type:str]",
 		"discourse": {
-			"url": "https://testing-happiness.ga/",
+			"url": "https://testing.publichappinessmovement.com/",
 			"secret": ""
 		}
 	},
@@ -76,4 +76,4 @@
 		"encrypted_regex": "([kK][eE][yY]|[sS][eE][cC][rR][eE][tT])$",
 		"version": "3.5.0"
 	}
-}
+}
diff --git a/deployment/testing/travis-ssh-key.enc → .deployment/testing/travis-ssh-key.enc b/deployment/testing/travis-ssh-key.enc → .deployment/testing/travis-ssh-key.enc
diff --git a/deployment/travis.gpg → .deployment/travis.gpg b/deployment/travis.gpg → .deployment/travis.gpg
diff --git a/deployment/update-keys.sh → .deployment/update-keys.sh b/deployment/update-keys.sh → .deployment/update-keys.sh
diff --git a/.eslintrc b/.eslintrc
@@ -1,29 +1,30 @@
 {
   "extends": [
-    "standard",
+    "eslint:recommended",
     "plugin:react/recommended"
   ],
-  "parser": "babel-eslint",
   "env": {
     "browser": true,
     "mocha": true,
     "jest": true
   },
   "plugins": [
     "react",
-    "import",
-    "babel"
+    "import"
   ],
   "rules": {
     "react/prop-types": 0,
-    "babel/semi": 0,
     "no-return-assign": 0,
     "no-multi-spaces": ["error", { "exceptions": { "ImportDeclaration": true, "Property": true } }],
-    "camelcase": 0
-  },
-  "globals": {
-    "google": 1,
-    "NProgress": 1,
-    "jest": 1
+    "camelcase": 0,
+    "template-curly-spacing" : "off",
+    "indent": ["error", 2, {
+      "ignoredNodes": ["TemplateLiteral"]
+    }]
   }
+  // "globals": {
+  //   "google": 1,
+  //   "NProgress": 1,
+  //   "jest": 1
+  // }
 }
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ deployment.tar
 .idea/
 *.tar
 travis-ssh-key
+.DS_Store
 
 node_modules
 *.log
@@ -17,3 +18,5 @@ node_modules
 
 coverage
 .vscode
+
+.codegpt
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
@@ -15,3 +15,5 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 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
diff --git a/.meteor/packages b/.meteor/packages
@@ -1,27 +1,37 @@
 # Meteor packages used by this project, one per line.
+
 # Check this file (and the other files in this directory) into your repository.
+
 #
+
 # 'meteor add' and 'meteor remove' will edit this file for you,
+
 # but you can also edit it by hand.
 
-meteor-base@1.3.0             # Packages every Meteor app needs to have
-mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.4.2                   # The database Meteor supports right now
-reactive-var@1.0.11            # Reactive variable for tracker
-tracker@1.1.3                 # Meteor's client-side reactive programming library
-
-standard-minifier-css@1.4.0   # CSS minifier run for production mode
-standard-minifier-js@2.3.1    # JS minifier run for production mode
-shell-server@0.3.1            # Server-side component of the `meteor shell` command
-ardatan:webpack
-ardatan:webpack-dev-middleware
+meteor-base@1.5.1 # Packages every Meteor app needs to have
+mobile-experience@1.1.0 # Packages for a great mobile UX
+mongo@1.16.6 # The database Meteor supports right now
+reactive-var@1.0.12 # Reactive variable for tracker
+tracker@1.3.2 # Meteor's client-side reactive programming library
+
+standard-minifier-css@1.9.2 # CSS minifier run for production mode
+standard-minifier-js@2.8.1 # JS minifier run for production mode
+shell-server@0.5.0 # Server-side component of the `meteor shell` command
+
+es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
+ecmascript@0.16.7 # Enable ECMAScript2015+ syntax in app code
+
+react-meteor-data # React higher-order component for reactively tracking Meteor data
+
 meteoreact:fix-unsupported-properties
 
-react-meteor-data
-service-configuration
+service-configuration@1.3.1
 aldeed:collection2@3.0.0
 mdg:validated-method
-ddp-rate-limiter
+ddp-rate-limiter@1.2.0
 alanning:roles
 sylque:dcs-simple-route-matcher
 sylque:accounts-discourse
+underscore@1.0.13
+http
+fourseven:scss
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.6.1.1
+METEOR@2.12
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ @@
     		"unencrypted_suffix": "_unencrypted",
     		"version": "3.7.1"
     	}
-    }
+    }