From ca55614ef7b3e1e516a45198001a45ee4f73754a Mon Sep 17 00:00:00 2001 From: pollseed Date: Wed, 25 Nov 2015 00:20:54 +0900 Subject: [PATCH 1/4] #50 rm bak && version up 0.1.0 => package --- README.md.bak | 45 ------------------------------------ app.js.bak | 17 -------------- model.bak/sample.js | 19 --------------- package.json | 2 +- package.json.bak | 34 --------------------------- public.bak/js/app.jsx | 32 ------------------------- public.bak/js/client.js | 16 ------------- public.bak/js/helloworld.jsx | 14 ----------- public.bak/js/main.js | 5 ---- 9 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 README.md.bak delete mode 100644 app.js.bak delete mode 100644 model.bak/sample.js delete mode 100644 package.json.bak delete mode 100644 public.bak/js/app.jsx delete mode 100644 public.bak/js/client.js delete mode 100644 public.bak/js/helloworld.jsx delete mode 100644 public.bak/js/main.js diff --git a/README.md.bak b/README.md.bak deleted file mode 100644 index 8b97c9e..0000000 --- a/README.md.bak +++ /dev/null @@ -1,45 +0,0 @@ -# fx-future-forecast -必勝！FX未来予想チャート徹底比較についてのリポジトリです - -# Develop - -## 事前に必要なもの -* node.js v5系 (nvmとかで管理してください) -* npm - -## 初期設定・インストール -```.sh -git clone git@github.com:DreamHackers/fx-future-forecast.git -cd fx-future-forecast -./setup.sh -``` - -## 起動 -```.sh -node app.js -``` -[こちら](http://localhost:9000/)にアクセスしてください - -## 初期中身 -``` -. -├── README.md -├── app.js → サーバサイドの処理を書いて下さい -├── gulpfile.js → 触らないでください -├── index.html → UIはこちらに書いて下さい -├── node_modules → npm install後生成されます -├── package.json → 触らないでください -├── public -│ ├── css → cssファイルを突っ込んで下さい -│ ├── img → imageファイルを突っ込んで下さい -│ └── js -│ ├── app.jsx → メインJSXファイル -│ ├── client.js → クライアントサイドJSファイル -│ ├── dest -│ │ ├── bundle-js.js → JSプリコンパイル済み → gulp後に生成 -│ │ └── bundle-jsx.js → JSXプリコンパイル済み → gulp後に生成 -│ ├── helloworld.jsx → サブJSXファイル -│ └── main.js → JSXヘッダファイル -└── setup.sh → セットアップ用のスクリプトです - -``` diff --git a/app.js.bak b/app.js.bak deleted file mode 100644 index cdeeddf..0000000 --- a/app.js.bak +++ /dev/null @@ -1,17 +0,0 @@ -'use strict' - -const PORT = 9000; - -var http = require('http'), - request = require('request'), - express = require('express'), - app = express(), - server = http.Server(app); -server.listen(PORT, () => {console.log(`server listening ... ${PORT}`)}); - -app.get('/', (req,res) => res.sendFile(__dirname + '/index.html')); -app.use(express.static('public')); - -var mongoose = require('mongoose'); -var model = require('./model/sample'); -var Sample = model.Sample; diff --git a/model.bak/sample.js b/model.bak/sample.js deleted file mode 100644 index 6c263c6..0000000 --- a/model.bak/sample.js +++ /dev/null @@ -1,19 +0,0 @@ -var mongoose = require('mongoose'); -var db = mongoose.connect('mongodb://localhost/fx-dev'); - -function validator(v) { - return v.length > 0; -} - -var Sample = new mongoose.Schema({ - name: { - type: String, validate: [validator, "Empty Error"] - }, - created: { - type: Date, - default: Date.now - } - -}); - -exports.Sample = db.model('Sample', Sample); diff --git a/package.json b/package.json index 774ba8e..a647442 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "forex-future-forecast", - "version": "0.0.0", + "version": "0.1.0", "private": true, "scripts": { "start": "node ./bin/www" diff --git a/package.json.bak b/package.json.bak deleted file mode 100644 index d705232..0000000 --- a/package.json.bak +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "fx-future-forecast", - "version": "0.0.1", - "description": "必勝！FX未来予想チャート徹底比較", - "main": "app.js", - "scripts": { - "test": "node app.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/DreamHackers/fx-future-forecast.git" - }, - "author": "DreamHackers", - "license": "MIT", - "bugs": { - "url": "https://github.com/DreamHackers/fx-future-forecast/issues" - }, - "homepage": "https://github.com/DreamHackers/fx-future-forecast#readme", - "devDependencies": { - "babelify": "6.1.1", - "browserify": "10.2.1", - "express": "^4.13.3", - "express-session": "^1.12.1", - "gulp": "^3.9.0", - "http": "0.0.0", - "jquery": "^2.1.4", - "log4js": "^0.6.27", - "mongoose": "^4.2.5", - "react": "^0.14.2", - "react-dom": "^0.14.2", - "request": "^2.65.0", - "vinyl-source-stream": "^1.1.0" - } -} diff --git a/public.bak/js/app.jsx b/public.bak/js/app.jsx deleted file mode 100644 index 32ee36f..0000000 --- a/public.bak/js/app.jsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react'; -import ReactDom from 'react-dom'; -import Message from './helloworld.jsx'; - -class App extends React.Component { - constructor(props) { - super(props); - this.state = { - name: 'hogehoge san', - age: 28 - } - } - handleChange(e) { - this.setState({ - name: e.target.value, - age: this.state.age - }) - } - render() { - return ( -
- - -
- ); - } -}; - -ReactDom.render( - , - document.getElementById('container') -); diff --git a/public.bak/js/client.js b/public.bak/js/client.js deleted file mode 100644 index 05d5456..0000000 --- a/public.bak/js/client.js +++ /dev/null @@ -1,16 +0,0 @@ -import $ from 'jquery'; - -(function() { - "use strict"; - - $(function() { - $('p').click(function() { - $(this).fadeOut('slow'); - }); - }); - - function load() { - console.log("index test"); - } - document.addEventListener('DOMContentLoaded', load, false); -}()); diff --git a/public.bak/js/helloworld.jsx b/public.bak/js/helloworld.jsx deleted file mode 100644 index e3e0f80..0000000 --- a/public.bak/js/helloworld.jsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react'; - -export default class HelloWorld extends React.Component { - constructor(props) { - super(props); - } - render() { - return ( -

- hello, {this.props.name} , {this.props.age} years old! -

- ); - } -} diff --git a/public.bak/js/main.js b/public.bak/js/main.js deleted file mode 100644 index c780259..0000000 --- a/public.bak/js/main.js +++ /dev/null @@ -1,5 +0,0 @@ -// all lib -import React from 'react'; -import $ from 'jquery'; - -import Client from './client.js'; From f63513eb847970b7abdb5c455fd04d206cb3f443 Mon Sep 17 00:00:00 2001 From: pollseed Date: Wed, 25 Nov 2015 00:40:38 +0900 Subject: [PATCH 2/4] #54 ref --- README.md | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f2a4271..6f8dd9f 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,18 @@ +# forex-future-forecast + +![logo](public/images/logo.png) + +必勝！FX未来予想チャート徹底比較についてのリポジトリです + # Summary -[![Circle CI](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master.svg?style=svg)](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master) + +[![Circle CI](https://circleci.com/gh/DreamHackers/forex-future-forecast/tree/master.svg?style=svg)](https://circleci.com/gh/DreamHackers/fx-future-forecast/tree/master) [![Join the chat at https://gitter.im/DreamHackers/fx-future-forecast](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/DreamHackers/fx-future-forecast?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) https://pollseed.gitbooks.io/fx-future-forecast-doc/content/index.html -# fx-future-forecast -必勝！FX未来予想チャート徹底比較についてのリポジトリです # Develop @@ -18,13 +23,14 @@ https://pollseed.gitbooks.io/fx-future-forecast-doc/content/index.html ## 初期設定・インストール ```.sh -git clone git@github.com:DreamHackers/fx-future-forecast.git -cd fx-future-forecast +git clone git@github.com:DreamHackers/forex-future-forecast.git +cd forex-future-forecast +git checkout develop ./setup.sh ``` ## mongo セッティング -https://github.com/DreamHackers/fx-future-forecast/wiki/mongodb%E7%96%8E%E9%80%9A +https://github.com/DreamHackers/forex-future-forecast/wiki/mongodb%E7%96%8E%E9%80%9A ## 起動 & 開発 ```.sh @@ -42,4 +48,6 @@ pm2 start bin/www --watch ``` [こちら](http://localhost:3000/)にアクセスしてください -``` +## [wiki](https://github.com/DreamHackers/forex-future-forecast/wiki) +* [gitフロー && リリース](https://github.com/DreamHackers/forex-future-forecast/wiki/git-%E3%83%95%E3%83%AD%E3%83%BC-&&-%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9) +* [version管理](https://github.com/DreamHackers/forex-future-forecast/wiki/version%E7%AE%A1%E7%90%86%E3%81%AB%E3%81%A4%E3%81%84%E3%81%A6) From cbe82fd6d768a90a7c5cd9030a6d2bddab462b2a Mon Sep 17 00:00:00 2001 From: pollseed Date: Wed, 25 Nov 2015 00:52:09 +0900 Subject: [PATCH 3/4] #54 ref --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6f8dd9f..a907c9b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![logo](public/images/logo.png) -必勝！FX未来予想チャート徹底比較についてのリポジトリです +必勝！FX未来予想チャート徹底比較についてのリポジトリです。 # Summary From 6391687d38ea52227995d23398b61658c2dfc4de Mon Sep 17 00:00:00 2001 From: pollseed Date: Thu, 26 Nov 2015 20:53:05 +0900 Subject: [PATCH 4/4] Add env-id/pass && setting heroku #47 --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 7152df5..fc7fc1f 100644 --- a/app.js +++ b/app.js @@ -14,7 +14,7 @@ var users = require('./routes/users'); var app = express(); app.use(helmet()); app.use(helmet.noCache()); -app.use(basicAuth('dream', 'hackers')); +app.use(basicAuth(process.env.BASIC_AUTH_ID, process.env.BASIC_AUTH_PASSWORD)); var mongoose = require('mongoose'); var uristring = process.env.MONGOLAB_URI || 'mongodb://localhost/fx-dev';