From afb60b9061109d06fa678c730a3b0716d5718777 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Thu, 2 Feb 2017 15:02:32 -0800 Subject: modification of notices. --- README.md | 11 +++++++++++ development/notice-generator.js | 36 ------------------------------------ development/notices.json | 1 - development/states/first-time.json | 2 +- notices/notice-delete.js | 27 +++++++++++++++++++++++++++ notices/notice-generator.js | 36 ++++++++++++++++++++++++++++++++++++ notices/notices.json | 1 + package.json | 3 ++- 8 files changed, 78 insertions(+), 39 deletions(-) delete mode 100644 development/notice-generator.js delete mode 100644 development/notices.json create mode 100644 notices/notice-delete.js create mode 100644 notices/notice-generator.js create mode 100644 notices/notices.json diff --git a/README.md b/README.md index 3a7277f3f..aa79f4564 100644 --- a/README.md +++ b/README.md @@ -153,3 +153,14 @@ gource \ --output-framerate 30 \ | ffmpeg -y -r 30 -f image2pipe -vcodec ppm -i - -b 65536K metamask-dev-history.mp4 ``` + +## Generating Notices + +To add a notice: +``` +npm run generateNotice +``` +To delete a notice: +``` +npm run deleteNotice +``` diff --git a/development/notice-generator.js b/development/notice-generator.js deleted file mode 100644 index 08b0c9843..000000000 --- a/development/notice-generator.js +++ /dev/null @@ -1,36 +0,0 @@ -var fsp = require('fs-promise') -var path = require('path') -var prompt = require('prompt') -var open = require('open') -var extend = require('extend') -var notices = require('./notices.json') - -var id = 0 -var date = new Date().toDateString() - -var notice = { - read: false, - date: date, -} - -fsp.readdir('notices') - .then((files) => { - files.forEach(file => { id ++ }) - Promise.resolve() - }).then(() => { - fsp.writeFile(`notices/notice_${id}.md`,'Message goes here. Please write out your notice and save before proceeding at the command line.') - .then(() => { - open(`notices/notice_${id}.md`) - prompt.start() - prompt.get(['title'], (err, result) => { - notice.title = result.title - fsp.readFile(`notices/notice_${id}.md`) - .then((body) => { - notice.body = body.toString() - notice.id = id - notices.push(notice) - return fsp.writeFile(`development/notices.json`, JSON.stringify(notices)) - }) - }) - }) - }) diff --git a/development/notices.json b/development/notices.json deleted file mode 100644 index ffe67097a..000000000 --- a/development/notices.json +++ /dev/null @@ -1 +0,0 @@ -[{"read":false,"date":"Fri Dec 16 2016","title":"Ending Morden Support","body":"Due to [recent events](https://blog.ethereum.org/2016/11/20/from-morden-to-ropsten/), MetaMask is now deprecating support for the Morden Test Network.\n\nUsers will still be able to access Morden through a locally hosted node, but we will no longer be providing hosted access to this network through [Infura](http://infura.io/).\n\nPlease use the new Ropsten Network as your new default test network.\n\nYou can fund your Ropsten account using the buy button on your account page.\n\nBest wishes!\nThe MetaMask Team\n\n","id":0}] diff --git a/development/states/first-time.json b/development/states/first-time.json index d6d95fe06..598adc4cb 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -11,7 +11,7 @@ "network": null, "accounts": {}, "transactions": [], - "isDisclaimerConfirmed": true, + "isDisclaimerConfirmed": false, "unconfMsgs": {}, "messages": [], "shapeShiftTxList": [], diff --git a/notices/notice-delete.js b/notices/notice-delete.js new file mode 100644 index 000000000..652f96159 --- /dev/null +++ b/notices/notice-delete.js @@ -0,0 +1,27 @@ +var fs = require('fs') +var path = require('path') +var prompt = require('prompt') +var open = require('open') +var extend = require('extend') +var notices = require('./notices.json') + + +console.log('List of Notices') +console.log(`ID \t DATE \t\t\t TITLE`) +notices.forEach((notice) => { + console.log(`${(' ' + notice.id).slice(-2)} \t ${notice.date} \t ${notice.title}`) +}) +prompt.get(['id'], (error, res) => { +prompt.start() + if (error) { + console.log("Exiting...") + process.exit() + } + var index = notices.findIndex((notice) => { return notice.id == res.id}) + if (index === -1) { + console.log('Notice not found. Exiting...') + } + notices.splice(index, 1) + fs.unlink(`notices/archive/notice_${res.id}.md`) + fs.writeFile(`notices/notices.json`, JSON.stringify(notices)) +}) diff --git a/notices/notice-generator.js b/notices/notice-generator.js new file mode 100644 index 000000000..a691bca15 --- /dev/null +++ b/notices/notice-generator.js @@ -0,0 +1,36 @@ +var fsp = require('fs-promise') +var path = require('path') +var prompt = require('prompt') +var open = require('open') +var extend = require('extend') +var notices = require('./notices.json') + +var id = 0 +var date = new Date().toDateString() + +var notice = { + read: false, + date: date, +} + +fsp.readdir('notices/archive') + .then((files) => { + files.forEach(file => { id ++ }) + Promise.resolve() + }).then(() => { + fsp.writeFile(`notices/archive/notice_${id}.md`,'Message goes here. Please write out your notice and save before proceeding at the command line.') + .then(() => { + open(`notices/archive/notice_${id}.md`) + prompt.start() + prompt.get(['title'], (err, result) => { + notice.title = result.title + fsp.readFile(`notices/archive/notice_${id}.md`) + .then((body) => { + notice.body = body.toString() + notice.id = id + notices.push(notice) + return fsp.writeFile(`notices/notices.json`, JSON.stringify(notices)) + }) + }) + }) + }) diff --git a/notices/notices.json b/notices/notices.json new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/notices/notices.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/package.json b/package.json index 770318214..ecf906684 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "testem": "npm run buildMock && testem", "ci": "npm run buildMock && npm run buildCiUnits && testem ci -P 2", "announce": "node development/announcer.js", - "generateNotice": "node development/notice-generator.js" + "generateNotice": "node notices/notice-generator.js", + "deleteNotice": "node notices/notice-delete.js" }, "browserify": { "transform": [ -- cgit