Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Implement stage6 #8

Merged
merged 12 commits into from
Mar 17, 2015
Merged

Implement stage6 #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4a068ff
Implement stage6
Mar 16, 2015
b8120d1
Improve README
Mar 17, 2015
c8e4c13
A name of the directory has stages should not "test", it is "public"
Mar 17, 2015
3ac2d6b
Switch to bower from npm
Mar 17, 2015
31aa63a
User can understand the input is not column
Mar 17, 2015
dcff792
We can setup by exec "npm run setup"
Mar 17, 2015
ab1baa4
User can understand why the server did not start
Mar 17, 2015
9955d61
Cosmetic change
Mar 17, 2015
ccdaad9
nodemon can watch server.js changes
Mar 17, 2015
bddaa77
Remove unexpected file
Mar 17, 2015
119c6cd
Hello, CSSLint
Mar 17, 2015
9124b06
Improve stage6
Mar 17, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Switch to bower from npm
  • Loading branch information
Kuniwak committed Mar 17, 2015
commit 3ac2d6bfb37efa024a4dd7f40328f37ae036277a
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
bower_components
9 changes: 1 addition & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,16 @@
"homepage": "https://github.com/mixi-inc/JavaScriptTraining",
"devDependencies": {
"body-parser": "^1.12.0",
"chai": "^2.1.1",
"chai-as-promised": "^4.3.0",
"express": "^4.12.2",
"gulp": "^3.8.11",
"gulp-eslint": "^0.6.0",
"gulp-help": "^1.3.3",
"gulp-nodemon": "^1.0.5",
"gulp-run": "^1.6.6",
"gulp-util": "^3.0.4",
"mocha": "^2.2.0",
"mocha-phantomjs": "^3.5.3"
},
"dependencies": {
"bootstrap": "^3.3.2",
"bower": "^1.3.12",
"chai-jquery": "^2.0.0",
"jquery": "^2.1.3",
"whatwg-fetch": "^0.7.0"
"bower": "^1.3.12"
}
}
35 changes: 35 additions & 0 deletions public/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "mixi-js-training-client",
"version": "0.0.0",
"homepage": "https://github.com/mixi-inc/JavaScriptTraining",
"authors": [
"Kuniwak <yuki.kokubun@mixi.co.jp>"
],
"description": "Training course repositry for JavaScript by mixi",
"main": "index.html",
"moduleType": [
"globals"
],
"keywords": [
"training"
],
"license": "MIT",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"chai": "~2.1.2",
"chai-as-promised": "~4.3.0",
"mocha": "~2.2.1",
"bootstrap": "~3.3.4",
"chai-jquery": "~2.0.0",
"jquery": "~2.1.3",
"fetch": "~0.7.0",
"github-fork-ribbon-css": "~0.1.1"
}
}
4 changes: 2 additions & 2 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>mixi JS Training</title>
<link rel="stylesheet" href="modules/bootstrap/dist/css/bootstrap.css" media="all">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.min.css" />
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.css" media="all">
<link rel="stylesheet" href="/bower_components/github-fork-ribbon-css/gh-fork-ribbon.css" />
<style>
.github-fork-ribbon {
background-color: #f80;
Expand Down
12 changes: 6 additions & 6 deletions public/stage1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css" />
<link rel="stylesheet" href="../common/mocha-patch.css" />
<link rel="stylesheet" href="/bower_components/mocha/mocha.css" />
<link rel="stylesheet" href="/common/mocha-patch.css" />
<link rel="stylesheet" href="style.css" />
</head>
<body>
Expand All @@ -30,10 +30,10 @@
<li data-js-training="darkorchid">12</li>
</ul>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
12 changes: 6 additions & 6 deletions public/stage2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css">
<link rel="stylesheet" href="../common/mocha-patch.css">
<link rel="stylesheet" href="/bower_components/mocha/mocha.css">
<link rel="stylesheet" href="/common/mocha-patch.css">
<link rel="stylesheet" href="style.css">
</head>
<body>
Expand All @@ -34,10 +34,10 @@
<div class="js-training-trick">&#x1f420;&#x1f420;</div>
</div>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
12 changes: 6 additions & 6 deletions public/stage3/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css">
<link rel="stylesheet" href="../common/mocha-patch.css">
<link rel="stylesheet" href="/bower_components/mocha/mocha.css">
<link rel="stylesheet" href="/common/mocha-patch.css">
<link rel="stylesheet" href="style.css">
</head>
<body>
Expand All @@ -32,10 +32,10 @@
<div class="js-training-trick">&#x1f420;&#x1f420;</div>
</div>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
12 changes: 6 additions & 6 deletions public/stage4/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css">
<link rel="stylesheet" href="../common/mocha-patch.css">
<link rel="stylesheet" href="/bower_components/mocha/mocha.css">
<link rel="stylesheet" href="/common/mocha-patch.css">
<link rel="stylesheet" href="style.css">
</head>
<body>
Expand All @@ -20,10 +20,10 @@
</ul>
</div>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
16 changes: 8 additions & 8 deletions public/stage5/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css">
<link rel="stylesheet" href="../common/mocha-patch.css">
<link rel="stylesheet" href="/bower_components/mocha/mocha.css">
<link rel="stylesheet" href="/common/mocha-patch.css">
</head>
<body>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/modules/chai-as-promised/lib/chai-as-promised.js"></script>
<script src="/modules/whatwg-fetch/fetch.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/chai-as-promised/lib/chai-as-promised.js"></script>
<script src="/bower_components/whatwg-fetch/fetch.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
16 changes: 8 additions & 8 deletions public/stage6/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="icon">
<link href="http://img.mixi.net/img/basic/favicon.ico" type="image/vnd.microsoft.icon" rel="shortcut icon">
<link rel="stylesheet" href="/modules/mocha/mocha.css">
<link rel="stylesheet" href="../common/mocha-patch.css">
<link rel="stylesheet" href="/bower_components/mocha/mocha.css">
<link rel="stylesheet" href="/common/mocha-patch.css">
</head>
<body>
<div id="mocha"></div>
<script src="/modules/jquery/dist/jquery.js"></script>
<script src="/modules/mocha/mocha.js"></script>
<script src="/modules/chai/chai.js"></script>
<script src="/modules/chai-jquery/chai-jquery.js"></script>
<script src="/modules/chai-as-promised/lib/chai-as-promised.js"></script>
<script src="/modules/whatwg-fetch/fetch.js"></script>
<script src="/bower_components/jquery/dist/jquery.js"></script>
<script src="/bower_components/mocha/mocha.js"></script>
<script src="/bower_components/chai/chai.js"></script>
<script src="/bower_components/chai-jquery/chai-jquery.js"></script>
<script src="/bower_components/chai-as-promised/lib/chai-as-promised.js"></script>
<script src="/bower_components/whatwg-fetch/fetch.js"></script>
<script>
mocha.ui('bdd');
mocha.reporter('html');
Expand Down
2 changes: 0 additions & 2 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ app.use(bodyParser.json({limit: '50mb'}));
app.use(bodyParser.urlencoded({extended: true, limit: '50mb' }));

var PUBLIC_DIR = path.join(__dirname, 'public');
var MODULE_DIR = path.join(__dirname, 'node_modules');
app.use(express.static(PUBLIC_DIR));
app.use('/modules', express.static(MODULE_DIR));


app.get('/api/heavy', function(req, res) {
Expand Down