diff --git a/gulpfile.js b/gulpfile.js index d6cedcfb..95645e18 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,28 +6,23 @@ var imageMin = require("gulp-imagemin"); // var pub = "~/Dropbox/Dev/Hud school/public/"; var pub = "./public/"; -var list = []; -task("sass", function () { +gulp.task("sass", function () { gulp.src("./view/*.scss") .pipe(sass()) - .pipe(minifyCSS()) + // .pipe(minifyCSS()) .pipe(gulp.dest(pub+"s")); }); -task("imagemin", function(){ +gulp.task("copy", function(){ + gulp.src("./assets/fonts/*") + .pipe(gulp.dest(pub+"fonts")); +}); + +gulp.task("imagemin", function(){ gulp.src("./assets/img/**/*") .pipe(imageMin()) .pipe(gulp.dest(pub+"img")); }); -task("copy", function(){ - gulp.src("./assets/fonts/*") - .pipe(gulp.dest(pub+"fonts")); -}); - -function task(name, f){ - list.push(name); - gulp.task(name, f); -} - -gulp.task("default", list); \ No newline at end of file +gulp.task("compile", ["sass", "copy"]); +gulp.task("default", ["compile", "imagemin"]); \ No newline at end of file diff --git a/package.json b/package.json index f5ec0134..78fc3562 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "main.js", "scripts": { "start": "node ./server.js", - "install": "gulp", + "install": "gulp compile", "test": "mocha" }, "repository": { diff --git a/pages/docs/docs.jade b/pages/docs/docs.jade index 72bd0a30..5de59c1c 100644 --- a/pages/docs/docs.jade +++ b/pages/docs/docs.jade @@ -3,10 +3,8 @@ extends ../layout block custom_head link(rel="stylesheet", href="/s/docs.css") -block menu - include ../menu - block content + include ../menu .main for group in blocks .docblock diff --git a/pages/layout.jade b/pages/layout.jade index da0e71dd..e10f543b 100644 --- a/pages/layout.jade +++ b/pages/layout.jade @@ -6,6 +6,4 @@ html link(rel="stylesheet", href="/fonts/stylesheet.css") block custom_head body - block menu - block content - block end \ No newline at end of file + block content \ No newline at end of file diff --git a/pages/main/main.jade b/pages/main/main.jade index f3c9519d..7009bc7b 100644 --- a/pages/main/main.jade +++ b/pages/main/main.jade @@ -1,4 +1,4 @@ extends ../layout -block menu +block content include ../menu \ No newline at end of file diff --git a/pages/team/team.jade b/pages/team/team.jade new file mode 100644 index 00000000..86dc3822 --- /dev/null +++ b/pages/team/team.jade @@ -0,0 +1,19 @@ +extends ../layout + +block custom_head + link(rel="stylesheet", href="/s/team.css") + +block content + img.main-picture(src='/img/team/team.jpg') + include ../menu + .main + ul.team-list + for member in team + li.team-member + img(src='#{member.picture}') + .info + h3 #{member.firstName} #{member.middleName} + span #{member.lastName} + p #{member.position} + p #{member.status} + p #{member.edu} \ No newline at end of file diff --git a/routers/team.router.js b/routers/team.router.js new file mode 100644 index 00000000..a8e4ba01 --- /dev/null +++ b/routers/team.router.js @@ -0,0 +1,20 @@ +var Router = require("express").Router; +var route = require("./route"); + +// var router = Object.create(Router); +var router = new Router(); +router.get("/team", function(req, res){ + var url = "/team"; + + res.render("team/team", { + menu: route.menu(url), + team: route.team(route.nameProcessor()) + }); +}); + +router.get("/teachers/:name", function(req, res){ + var name = req.param("name"); + res.error(404); +}); + +module.exports = router; \ No newline at end of file diff --git a/server.js b/server.js index 9e038fad..92c10e49 100644 --- a/server.js +++ b/server.js @@ -22,6 +22,7 @@ server.get("/", function(req, res){ }); }); +server.use(require("./routers/team.router").middleware); server.use(require("./routers/doc.router").middleware); server.listen(18010); diff --git a/view/team.scss b/view/team.scss new file mode 100644 index 00000000..cd58dfbb --- /dev/null +++ b/view/team.scss @@ -0,0 +1,47 @@ +.main-picture{ + width: 100%; + position: fixed; + margin: 0; + left: 0; + z-index: -999; +} + +ul{ + display: block; +} + +.team-list{ + list-style:none; + background-color: white; + width:100%; + min-height: 100px; + padding-top: 100px; + margin-top: 63%; +} + +.team-member{ + margin: 0 auto 50px auto; + width: 70%; + + img{ + width: 40%; + max-width: 600px; + min-width: 200px; + display: inline-block; + } + + .info{ + display: inline-block; + float: right; + width: 55%; + line-height: 2em; + + h3{ + font-weight: 100; + + span{ + font-weight: 600; + } + } + } +} \ No newline at end of file