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
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015", "react"]
}
21 changes: 21 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
136 changes: 136 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env


### OSX ###

# Icon must end with two \r

# Thumbnails

# Files that might appear in the root of a volume

# Directories potentially created on remote AFP share

### Vim ###
# swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
.netrwhist
*~
# auto-generated tag files
tags

### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.gitignore.io/api/osx,vim,node,macos,windows
51 changes: 0 additions & 51 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,51 +0,0 @@
![cf](https://i.imgur.com/7v5ASc8.png) 24: Component Composition
======

## Submission Instructions
* continue working on the fork you created from lab 23
* open a **new branch** for today's assignment
* upon completion, create a **new pull request** in github
* submit a link to your PR in canvas

## Learning Objectives
* students will be able to utilize proper component composition constructs
* students will be able to compose react components through the use of props

#### Configuration
* `README.md`
* `.babelrc`
* `.gitignore`
* `package.json`
* `webpack.config.js`
* `src/**`
* `src/main.js`
* `src/style`
* `src/style/main.scss`

## Requirements
#### Feature Tasks
refactor and add the following components:

###### NoteUpdateForm
* create a `NoteUpdateForm` component that inherits a note through props
* on submit, this should update the App's state with an updated note

###### Refactor the NoteItem Component
* include the following behavior:
* if the user double clicks on the notes content, it should switch to the edit view
* default view
* display the note content and a delete button
* the delete button should remove the note from the application's state
* edit view
* show the `NoteUpdateForm` and a cancel button
* `onNoteUpdateForm` submit (or click of the cancel button) should switch back to the default view

###### App Component Tree
your components should be nested in the following layout
```
App
NoteCreateForm
NoteList
NoteItem
NoteUpdateForm
```
38 changes: 38 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "24-component-composition",
"version": "1.0.0",
"description": "",
"main": "webpack.config.js",
"scripts": {
"build": "webpack",
"watch": "webpack-dev-server --inline --hot"
},
"repository": {
"type": "git",
"url": "git+https://github.com/nickjaz/24-component-composition.git"
},
"keywords": [],
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/nickjaz/24-component-composition/issues"
},
"homepage": "https://github.com/nickjaz/24-component-composition#readme",
"dependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"css-loader": "^0.28.5",
"extract-text-webpack-plugin": "^3.0.0",
"html-webpack-plugin": "^2.30.1",
"node-sass": "^4.5.3",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-router-dom": "^4.2.0",
"sass-loader": "^6.0.6",
"uuid": "^3.1.0",
"webpack": "^3.5.5",
"webpack-dev-server": "^2.7.1"
}
}
12 changes: 12 additions & 0 deletions src/component/note-container/_note-container.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@import '../../style/_vars.scss';

.note-container {
padding: $lrg-gutter;

h1 {
display: inline-block;
margin-bottom: $lrg-gutter;
padding: $sml-gutter;
border-bottom: solid 2px $white;
}
}
61 changes: 61 additions & 0 deletions src/component/note-container/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import './_note-container.scss'

import React from 'react';
import uuid from 'uuid/v1';

import NoteCreateForm from '../note-create-form';
import NoteList from '../note-list';

class NoteContainer extends React.Component {
constructor(props) {
super(props);

this.noteCreate = this.noteCreate.bind(this);
this.noteRemove = this.noteRemove.bind(this);
this.noteUpdate = this.noteUpdate.bind(this);
}

noteCreate(note) {
note.id = uuid();
let {app} = this.props;
app.setState(prevState => ({
notes: prevState.notes.concat([note])
}));
}

noteRemove(note) {
let {app} = this.props;
app.setState(prevState => ({
notes: prevState.notes.filter((item) => {
return item.id !== note.id;
})
}));
}

noteUpdate(note) {
let {app} = this.props;
app.setState(prevState => ({
notes: prevState.notes.map((item) => {
return item.id === note.id ? note : item;
})
}))
}

render() {
let {app} = this.props;

return (
<div className='note-container'>
<h1>Note Maker</h1>
<NoteCreateForm handleSubmit={this.noteCreate} />
<NoteList
notes={app.state.notes}
noteRemove={this.noteRemove}
noteUpdate={this.noteUpdate}
/>
</div>
)
}
}

export default NoteContainer;
23 changes: 23 additions & 0 deletions src/component/note-create-form/_note-create-form.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import '../../style/_vars.scss';

.note-create-form {
padding: $sml-gutter;
border-bottom: solid 2px $white;

input {
display: block;
margin-bottom: $sml-gutter;
}

textarea {
display: block;
width: 50%;
max-width: 50%;

}

button {
display: inline;
margin: $sml-gutter 0;
}
}
Loading