Skip to content

Working #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samuelhe83 wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Working #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b403c4a
Remove git ignores
samuelhe83 Dec 12, 2016
b3a89ba
Edit npm start
samuelhe83 Dec 12, 2016
8b5ecca
Change npm start
samuelhe83 Dec 12, 2016
fee671b
Change npm start
samuelhe83 Dec 12, 2016
9092e17
Fix routing
samuelhe83 Dec 12, 2016
3fc200e
Remove compiled from gitignore
samuelhe83 Dec 12, 2016
8858f03
Merge branch 'master' of https://github.com/PersistentPoplars/persist…
samuelhe83 Dec 12, 2016
15568aa
Add css to new proposal view and add compiled to git ignore
samuelhe83 Dec 12, 2016
1934d43
Fix git ignore
samuelhe83 Dec 12, 2016
fdcc16b
Remove cached filed
samuelhe83 Dec 13, 2016
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
1 change: 0 additions & 1 deletion .bowerrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ node_modules/

## Compiled files ##
client/compiled/
client/lib/bower_components
client/lib/bower_components
1 change: 0 additions & 1 deletion client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="UTF-8">
<title>persistentPoplars</title>
<link rel="stylesheet" href="styles/styles.css">

<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/cosmo/bootstrap.min.css" rel="stylesheet" integrity="sha384-h21C2fcDk/eFsW9sC9h0dhokq5pDinLNklTKoxIZRUn3+hvmgQSffLLQ4G4l2eEr" crossorigin="anonymous">
</head>
<body>
Expand Down
22 changes: 14 additions & 8 deletions client/src/components/NewProposal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,24 @@ class NewProposal extends React.Component {
});
}

//HOW TO LINK COMPANY.

render() {
return (
<div>
<form onSubmit={this.newProposalAjax}>
<input onChange={this.changeForm} name="title" type="text" placeholder="Title" /> <br/>
<textarea onChange={this.changeForm} name="description" type="text" placeholder="Description" id="description"></textarea><br/>
<button>Create New Proposal</button>
</form>
</div>
);
<form onSubmit={this.newProposalAjax}>
<div className="form-group">
<label for="title">Title</label>
<input onChange={this.changeForm} name="title" type="text" placeholder="Title" className="form-control"/> <br/>
</div>

<div className="form-group">
<label for="description">Description</label>
<input onChange={this.changeForm} name="description" type="text" placeholder="Description" className="form-control"></input><br/>
</div>
<button type="submit" className="btn btn-default">Create New Proposal</button>
</form>
</div>
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "",
"main": "server/server.js",
"scripts": {
"start": "babel ./client --out-dir client/compiled --presets=es2015,react --ignore=node_modules,client/compiled,client/lib --source-maps inline --watch & nodemon server/server.js",
"start": "node server/server.js",
"test": "echo \"Error: no test specified\" && exit 1",
"dev": "webpack -d --watch",
"build": "webpack -p"
Expand Down
Loading