Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions sheyna_and_marissa/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so

# Packages #
############
# it's better to unpack these files and commit the raw source
# git has its own built in compression methods
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

# Logs and databases #
######################
*.log
*.sql
*.sqlite

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

node_modules
24 changes: 24 additions & 0 deletions sheyna_and_marissa/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = function(grunt) {
grunt.initConfig({
sass: {
dist: {
files: {
'public/stylesheets/style.css': 'sass/style.scss'
}
}
},
watch: {
source: {
files: ['sass/**/*.scss', 'sass/**/*.sass', 'views/**/*.jade'],
tasks: ['sass'],
options: {
livereload: true
}
}
}
});

grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-sass');
grunt.registerTask('default', ['sass']);
};
11 changes: 11 additions & 0 deletions sheyna_and_marissa/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#Marissa and Sheyna
## Build Node Project from Scratch
### Week 7
#### To Install After Cloning from Repo:
1. Run `npm install` in terminal
2. Run `npm start` in terminal
3. Run localhost:3000 in broswer

We created a Shopping Application in node.js using sass and jade which was then deployed by using heroku

[View the live project here](https://murmuring-fortress-8684.herokuapp.com/)
62 changes: 62 additions & 0 deletions sheyna_and_marissa/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
var express = require('express');
var path = require('path');
var favicon = require('serve-favicon');
var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');

var routes = require('./routes/index');
var users = require('./routes/users');
var shop = require('./routes/shop');

var app = express();

// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'jade');

// uncomment after placing your favicon in /public
//app.use(favicon(__dirname + '/public/favicon.ico'));
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));

app.use('/', routes);
app.use('/users', users);
app.use('/shop', shop);

// catch 404 and forward to error handler
app.use(function(req, res, next) {
var err = new Error('Not Found');
err.status = 404;
next(err);
});

// error handlers

// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: err
});
});
}

// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: {}
});
});


module.exports = app;
9 changes: 9 additions & 0 deletions sheyna_and_marissa/bin/www
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env node
var debug = require('debug')('lola');
var app = require('../app');

app.set('port', process.env.PORT || 3000);

var server = app.listen(app.get('port'), function() {
debug('Express server listening on port ' + server.address().port);
});
25 changes: 25 additions & 0 deletions sheyna_and_marissa/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "lola",
"version": "0.0.0",
"private": true,
"scripts": {
"start": "node ./bin/www"
},
"dependencies": {
"body-parser": "~1.8.1",
"cookie-parser": "~1.3.3",
"debug": "~2.0.0",
"express": "~4.9.0",
"grunt": "^0.4.5",
"grunt-sass": "^0.17.0",
"jade": "~1.6.0",
"morgan": "~1.3.0",
"node-sass": "^1.2.3",
"serve-favicon": "~2.1.3"
},
"devDependencies": {
"grunt": "^0.4.5",
"grunt-contrib-watch": "^0.6.1",
"grunt-libsass": "^0.2.0"
}
}
Binary file added sheyna_and_marissa/public/images/clothing1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/clothing2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/clothing3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/iuiu.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions sheyna_and_marissa/public/images/lola.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/lola1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/lola2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/lola3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/lolapattern.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/plug-casual.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/plug-dress.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added sheyna_and_marissa/public/images/plug-shoes.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
148 changes: 148 additions & 0 deletions sheyna_and_marissa/public/stylesheets/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain) */
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline; }

/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
display: block; }

body {
line-height: 1; }

ol, ul {
list-style: none; }

blockquote, q {
quotes: none; }

blockquote:before, blockquote:after, q:before, q:after {
content: '';
content: none; }

table {
border-collapse: collapse;
border-spacing: 0; }

@font-face {
font-family: 'Lato', sans-serif;
src: url('http://fonts.googleapis.com/css?family=Lato'); }

body {
background-color: #f8f0e1; }

p {
font-family: 'Lato', sans-serif; }

.logo {
width: 4em; }

.logoText {
color: #5d8780;
font-family: 'Lato', sans-serif;
font-size: 6em;
display: inline-block;
margin: 0 0 0 0.2em; }

nav {
display: inline-block;
margin-top: 1em; }
nav ul li {
list-style: none;
display: inline-block;
padding: 0 1.6em 0 1.6em; }
nav a {
color: #5d8780;
font-family: 'Lato', sans-serif;
font-size: 1.5em;
text-decoration: none; }
nav a:hover {
color: #adc6c6; }

.main-content {
max-width: 900px;
margin: 2em auto 0 auto;
padding: 0 6px 0 6px; }

footer {
margin-top: 4em;
padding: 2em; }
footer p {
color: #545454;
font-size: 0.8em;
text-align: center; }

.hero {
background-color: #5d8780;
background-image: url('/images/lolapattern.jpg');
background-size: contain;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
max-width: 897px;
margin: 1.5em auto 1.5em auto;
clear: both; }

.panel1 {
flex-shrink: 1;
flex-basis: 317px; }

.panel2 {
flex-shrink: 1;
flex-basis: 333px; }

.panel3 {
flex-shrink: 1;
flex-basis: 247px; }

.panelImage {
margin: 0 0 -0.2em 0;
max-width: 100%; }
.panelImage:hover {
opacity: 0.1; }

.box {
flex-shrink: 1;
flex-basis: 33%;
padding: 0 5% 0 5%; }
.box img {
width: 100%;
display: block;
margin-bottom: 1em; }
.box p {
color: #545454;
font-size: 0.8em; }

.plugs {
display: flex;
flex-direction: row;
flex-wrap: nowrap;
margin: 4em 0 2em 0; }

.shop-main {
display: block;
width: 40em;
margin: 1.5em auto; }

.shop-main--images {
display: block;
width: 90%;
margin: 0 5%;
overflow: hidden; }

.clothing {
width: 28.5%;
margin: 2%;
border: 0.2em solid #5d8780; }

.clothing--float-left {
float: left; }

.clothing--float-right {
float: right; }
9 changes: 9 additions & 0 deletions sheyna_and_marissa/routes/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var express = require('express');
var router = express.Router();

/* GET home page. */
router.get('/', function(req, res) {
res.render('index', { title: 'Lola' });
});

module.exports = router;
9 changes: 9 additions & 0 deletions sheyna_and_marissa/routes/shop.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var express = require('express');
var router = express.Router();

/* GET shop page. */
router.get('/', function(req, res) {
res.render('shop', { title: 'Lola' });
});

module.exports = router;
9 changes: 9 additions & 0 deletions sheyna_and_marissa/routes/users.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var express = require('express');
var router = express.Router();

/* GET users listing. */
router.get('/', function(req, res) {
res.send('respond with a resource');
});

module.exports = router;
Loading