diff --git a/.meteor/packages b/.meteor/packages index dc7487e..5932c1c 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -19,6 +19,11 @@ ecmascript@0.14.3 # Enable ECMAScript2015+ syntax in app code typescript@3.7.6 # Enable TypeScript syntax in .ts and .tsx modules shell-server@0.5.0 # Server-side component of the `meteor shell` command -insecure@1.0.7 # Allow all DB writes from clients (for prototyping) iron:router -sacha:spin +accounts-password +msavin:mongol +useraccounts:bootstrap +useraccounts:iron-routing +twbs:bootstrap +stylus +ian:accounts-ui-bootstrap-3 diff --git a/.meteor/versions b/.meteor/versions index 0bdc45c..383ce19 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,4 +1,7 @@ +accounts-base@1.7.0 +accounts-password@1.6.2 allow-deny@1.1.0 +anti:i18n@0.4.3 autoupdate@1.6.0 babel-compiler@7.5.3 babel-runtime@1.5.0 @@ -12,9 +15,11 @@ caching-compiler@1.2.2 caching-html-compiler@1.1.3 callback-hook@1.3.0 check@1.3.1 +coffeescript@1.0.17 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 +ddp-rate-limiter@1.0.9 ddp-server@2.3.2 deps@1.0.12 diff-sequence@1.1.1 @@ -24,14 +29,16 @@ ecmascript-runtime@0.7.0 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 geojson-utils@1.0.10 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 +http@1.4.2 +ian:accounts-ui-bootstrap-3@1.2.89 id-map@1.1.0 -insecure@1.0.7 inter-process-messaging@0.1.1 iron:controller@1.0.12 iron:core@1.0.11 @@ -44,9 +51,11 @@ iron:url@1.1.0 jquery@1.11.11 launch-screen@1.2.0 livedata@1.0.18 +localstorage@1.2.0 logging@1.1.20 meteor@1.9.3 meteor-base@1.4.0 +meteortoys:toykit@10.0.0 minifier-css@1.5.3 minifier-js@2.6.0 minimongo@1.6.0 @@ -59,30 +68,43 @@ mongo@1.10.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 mongo-id@1.0.7 +msavin:mongol@10.0.1 +npm-bcrypt@0.9.3 npm-mongo@3.8.1 observe-sequence@1.0.16 ordered-dict@1.1.0 promise@0.11.2 random@1.2.0 +rate-limit@1.0.9 reactive-dict@1.3.0 reactive-var@1.0.11 reload@1.3.0 retry@1.1.0 routepolicy@1.1.0 -sacha:spin@2.3.1 +service-configuration@1.0.11 +session@1.2.0 +sha@1.0.9 shell-server@0.5.0 socket-stream-client@0.3.1 +softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 spacebars-compiler@1.1.3 +srp@1.1.0 standard-minifier-css@1.6.1 standard-minifier-js@2.6.0 +stylus@2.513.14 templating@1.3.2 templating-compiler@1.3.3 templating-runtime@1.3.2 templating-tools@1.1.2 tracker@1.2.0 +twbs:bootstrap@3.3.6 typescript@3.7.6 ui@1.0.13 underscore@1.0.10 +url@1.3.1 +useraccounts:bootstrap@1.14.2 +useraccounts:core@1.14.2 +useraccounts:iron-routing@1.14.2 webapp@1.9.1 webapp-hashing@1.0.9 diff --git a/client/mainLayout.html b/client/mainLayout.html index 2f900e2..a1cb017 100644 --- a/client/mainLayout.html +++ b/client/mainLayout.html @@ -4,6 +4,8 @@
+ + {{> atNavButton}}loading
\ No newline at end of file diff --git a/lib/MyRes.js b/lib/MyRes.js index 72a6316..67aaa67 100644 --- a/lib/MyRes.js +++ b/lib/MyRes.js @@ -1,3 +1,9 @@ UrlRes = new Mongo.Collection('url_res') User = new Mongo.Collection('t_user') -// User.insert({username: 'nelson'}) \ No newline at end of file +// User.insert({username: 'nelson'}) + +User.allow({ + insert(userId,doc){ + return !!userId + } +}) \ No newline at end of file diff --git a/lib/router.js b/lib/router.js index 4f6f857..fad3210 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1,6 +1,7 @@ import "/client/templates/loading.html" import "/client/templates/user_page.html" import "/client/templates/not_found.html" +import "/client/templates/account/login.html" Router.configure({ layoutTemplate: 'mainLayout', @@ -16,7 +17,9 @@ Router.configure({ Router.route("/") Router.route("/nelson", {name: 'mainItem'}) - +// Router.route("/login", {name: 'loginPage'}) +AccountsTemplates.configureRoute('signIn'); +AccountsTemplates.configureRoute('signUp'); Router.route("/user/:_id", { name: 'userPage' }) diff --git a/package.json b/package.json index 158e63f..872fb2a 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@babel/runtime": "^7.11.2", + "bcrypt": "^5.0.0", "jquery": "^3.5.1", "meteor-node-stubs": "^1.0.1" },