From d72a6be009e23c4811e5dcc8b43ad99c2a20f5db Mon Sep 17 00:00:00 2001 From: mathuramg Date: Tue, 12 Jul 2016 10:16:19 -0400 Subject: [PATCH 1/6] add table scope --- client/modules/Sketch/pages/SketchListView.js | 8 ++++---- package.json | 2 +- server/server.js | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/modules/Sketch/pages/SketchListView.js b/client/modules/Sketch/pages/SketchListView.js index fec25baf..f38c806a 100644 --- a/client/modules/Sketch/pages/SketchListView.js +++ b/client/modules/Sketch/pages/SketchListView.js @@ -22,14 +22,14 @@ class SketchListView extends React.Component { /> - - - + + + {this.props.sketches.map(sketch => - + diff --git a/package.json b/package.json index dca229de..9fc1ef6b 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "bson-objectid": "^1.1.4", "classnames": "^2.2.5", "codemirror": "^5.14.2", - "connect-mongo": "^1.2.0", + "connect-mongo": "^1.0.0", "cookie-parser": "^1.4.1", "dotenv": "^2.0.0", "escape-string-regexp": "^1.0.5", diff --git a/server/server.js b/server/server.js index e0e97fe2..d9a8ea9d 100644 --- a/server/server.js +++ b/server/server.js @@ -3,7 +3,7 @@ import mongoose from 'mongoose'; import bodyParser from 'body-parser'; import cookieParser from 'cookie-parser'; import session from 'express-session'; -const MongoStore = require('connect-mongo')(session); +const MongoStore = require('connect-mongo/es5')(session); import passport from 'passport'; import path from 'path'; @@ -83,4 +83,3 @@ app.listen(serverConfig.port, (error) => { }); export default app; - From 22ac7214bdd7b85d12f369175f9f349ab43c2f17 Mon Sep 17 00:00:00 2001 From: mathuramg Date: Tue, 12 Jul 2016 11:22:27 -0400 Subject: [PATCH 2/6] make sidebar accessible --- client/modules/IDE/components/Sidebar.js | 13 ++++++++----- client/styles/abstracts/_variables.scss | 3 ++- client/styles/components/_sidebar.scss | 14 +++++++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/client/modules/IDE/components/Sidebar.js b/client/modules/IDE/components/Sidebar.js index cd75d0a7..3f82a2cc 100644 --- a/client/modules/IDE/components/Sidebar.js +++ b/client/modules/IDE/components/Sidebar.js @@ -11,11 +11,14 @@ function Sidebar(props) { 'sidebar__file-item--selected': file.id === props.selectedFile.id }); return ( -
  • props.setSelectedFile(file.id)} - >{file.name}
    • +
  • + +
    • ); })} diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index e07d9e55..0a70ada0 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -9,6 +9,7 @@ $light-primary-text-color: #333; $light-secondary-text-color: #6b6b6b; $light-inactive-text-color: #b5b5b5; $light-background-color: #fdfdfd; +$light-sidebar-background: $white; $light-button-background-color: #f4f4f4; $light-button-color: $black; @@ -18,7 +19,7 @@ $light-button-background-hover-color: $p5js-pink; $light-button-background-active-color: #f10046; $light-button-hover-color: $white; $light-button-active-color: $white; -$light-modal-button-background-color: #e6e6e6; +$light-modal-button-background-color: #e6e6e6; $light-icon-color: #8b8b8b; $light-icon-hover-color: $light-primary-text-color; diff --git a/client/styles/components/_sidebar.scss b/client/styles/components/_sidebar.scss index f7fb4ff8..02513754 100644 --- a/client/styles/components/_sidebar.scss +++ b/client/styles/components/_sidebar.scss @@ -1,12 +1,16 @@ .sidebar__file-list { - border-top: 1px solid $ide-border-color; + border-top: 1px solid $ide-border-color; } .sidebar__file-item { padding: #{8 / $base-font-size}rem #{20 / $base-font-size}rem; color: $light-inactive-text-color; + background-color: $light-sidebar-background; + border: none; + width: 100%; + outline: none; + cursor: pointer; + &--selected { + background-color: $ide-border-color; + } } - -.sidebar__file-item--selected { - background-color: $ide-border-color; -} \ No newline at end of file From 624d79075a913880edf26d1fcea34bcaaf0b41a6 Mon Sep 17 00:00:00 2001 From: mathuramg Date: Tue, 12 Jul 2016 12:25:48 -0400 Subject: [PATCH 3/6] make links accessible --- client/components/Nav.js | 8 ++++---- client/modules/IDE/components/Sidebar.js | 12 +++++++----- client/modules/IDE/components/Toolbar.js | 2 +- client/styles/abstracts/_variables.scss | 2 +- client/styles/components/_sidebar.scss | 10 +++++----- client/styles/components/_signup.scss | 6 +++--- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/client/components/Nav.js b/client/components/Nav.js index ddccbc1a..85c82bb2 100644 --- a/client/components/Nav.js +++ b/client/components/Nav.js @@ -6,20 +6,20 @@ function Nav(props) {
    NameCreatedLast UpdatedNameCreatedLast Updated
    {sketch.name}{sketch.name} {moment(sketch.createdAt).format('MMM D, YYYY')} {moment(sketch.updatedAt).format('MMM D, YYYY')}
    +
    From da493e401402ac8ddf8b64b06af71b030083a541 Mon Sep 17 00:00:00 2001 From: mathuramg Date: Tue, 12 Jul 2016 14:50:54 -0400 Subject: [PATCH 5/6] remove dev changes --- client/styles/abstracts/_variables.scss | 1 - package.json | 2 +- server/server.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/styles/abstracts/_variables.scss b/client/styles/abstracts/_variables.scss index 0a70ada0..a41a2097 100644 --- a/client/styles/abstracts/_variables.scss +++ b/client/styles/abstracts/_variables.scss @@ -9,7 +9,6 @@ $light-primary-text-color: #333; $light-secondary-text-color: #6b6b6b; $light-inactive-text-color: #b5b5b5; $light-background-color: #fdfdfd; -$light-sidebar-background: $white; $light-button-background-color: #f4f4f4; $light-button-color: $black; diff --git a/package.json b/package.json index 9fc1ef6b..dca229de 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "bson-objectid": "^1.1.4", "classnames": "^2.2.5", "codemirror": "^5.14.2", - "connect-mongo": "^1.0.0", + "connect-mongo": "^1.2.0", "cookie-parser": "^1.4.1", "dotenv": "^2.0.0", "escape-string-regexp": "^1.0.5", diff --git a/server/server.js b/server/server.js index d9a8ea9d..99879244 100644 --- a/server/server.js +++ b/server/server.js @@ -3,7 +3,7 @@ import mongoose from 'mongoose'; import bodyParser from 'body-parser'; import cookieParser from 'cookie-parser'; import session from 'express-session'; -const MongoStore = require('connect-mongo/es5')(session); +const MongoStore = require('connect-mongo')(session); import passport from 'passport'; import path from 'path'; From 70f5638a478ffb15ba75c6d05a1ea7c28584347f Mon Sep 17 00:00:00 2001 From: mathuramg Date: Tue, 12 Jul 2016 15:11:45 -0400 Subject: [PATCH 6/6] move keyCode --- client/modules/IDE/components/Sidebar.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/modules/IDE/components/Sidebar.js b/client/modules/IDE/components/Sidebar.js index 701e5887..cb8c276f 100644 --- a/client/modules/IDE/components/Sidebar.js +++ b/client/modules/IDE/components/Sidebar.js @@ -11,12 +11,13 @@ function Sidebar(props) { 'sidebar__file-item--selected': file.id === props.selectedFile.id }); return ( -
  • +
  • props.setSelectedFile(file.id)} - >{file.name} - + >{file.name}
    • ); })}
    Name Created