Removed react files and put angular. New getmembers file

members/static/js/getmember.jsx

@@ -1,53 +0,0 @@
-/*This code gets certain member from djangoo*/
-//ajax request!!
-//$.get(url, callback)
-//url /members/api/member/:id
-// :id -> members id
-//fetch!! no get!
-
-var Member = React.createClass({
-	getInitialState: function() {
-		return {
-			id: 0,
-			first_name: '',
-			last_name: '',
-			email: '',
-			AYY: 0,
-			jas: 0,
-			POR: ''
-		};
-	},
-
-	componentDidMount: function() {
-		this.serverRequest = $.get(this.props.source, function(response){
-			var mem = response;
-			this.setState({
-				id = mem.id,
-				first_name: mem.first_name,
-				last_name: mem.last_name,
-				email: mem.email,
-				AYY: mem.AYY,
-				jas: mem.jas,
-				POR: mem.POR
-			});
-		}.bind(this));
-	},
-	
-	componentWillUnmount: function() {
-		this.serverRequest.abort();
-	},
-	
-	render: function() {
-		return (
-			<div>
-			{this.state.id}'s name is
-				{this.state.firstname} {this.state.last_name}
-			</div>
-			);
-	}
-});
-
-ReactDOM.render(
-	<Member source =  "/members/api/member/id" />,
-	mountNode
-);

members/static/js/getmembers.js

@@ -9,6 +9,29 @@
 https://docs.angularjs.org/api/ng/directive/ngRepeat check this
 
 */
+/*
+Hae koko datapaketti serveriltä. Näytä lista kokonaan.
+Typeeminen hakukenttään -> datapaketin filteröintiä
+interaktiivinen, reaaliaikainen setti
+*/
+
+//var app = angular.module("memberApp", []);
+
+function getAll() {
+	return $http.get('/members/api/members');
+}
+
+function createUser(user) {
+	return $http.post('members/api/members', user);
+}
+
+function updateUser(user) {
+	return $http.put('/members/api/members', user.id, user);
+}
+
+function deleteUser(user) {
+	return $http.delete('/members/api/members', user);
+}
 
 
 /*

members/static/js/getmembers.jsx

@@ -1,64 +0,0 @@
-/*	function getAllMembers(){
-		$.get(/members/api/members, result);
-	}*/
-
-var MembersGridRow = React.createClass({
-	render: function(){
-		return (
-			<tr>
-				<td>{this.props.item.id}</td>
-				<td>{this.props.item.first_name}</td>
-				<td>{this.props.item.last_name}</td>
-				<td>{this.props.item.email}</td>
-				<td>{this.props.item.AYY}</td>
-				<td>{this.props.item.jas}</td>
-				<td>{this.props.item.POR}</td>
-			</tr>
-		);
-	}
-});
-
-var MembersGridTable = React.createClass({
-	getInitialState: function(){
-		return {
-			items:[]
-		}
-	},
-	componentDidMount: function(){
-		//Fetch data via ajax
-		$.get(this.props.dataURL, function(data){
-			if(this.isMounted()){
-				this.setState({
-					items: data
-				});
-			}
-		}.bind(this));
-	},
-	render: function(){
-		var rows = [];
-		this.state.item.forEach(function(item){
-			rows.push(<MembersGridRow key = {item.MemberID} item={item}/>);
-		});
-		return(<table className="table table-bordered table-responsive">
-			<thead>
-				<tr>
-					<th>ID</th>
-					<th>First Name</th>
-					<th>Last Name</th>
-					<th>Email</th>
-					<th>AYY</th>
-					<th>jas</th>
-					<th>POR</th>
-				</tr>
-			</thead>
-			<tbody>
-			{rows}
-			</tbody>
-		</table>);
-	}
-});
-
-ReactDOM.render(
-	<MembersGridTable dataURL = "/members/api/members"/>,
-	document.getElementById('griddata')
-);

members/templates/index.html

@@ -24,11 +24,10 @@
 	<![endif]-->
 
 	<!--ReactJS-->
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.1.0/react.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.1.0/react-dom.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.23/browser.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/remarkable/1.6.2/remarkable.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.6/angular.min.js.map"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.map"></script>
 
 	{%load staticfiles %}
 
@@ -73,6 +72,7 @@
 		<!-- Page Content -->
 		<div id="page-content-wrapper">
 			<div id="react-test"></div>
+			<div id = "griddata"></div>
 			<div class="container-fluid">
 				<div class="row">
 					<div class="col-lg-12">
@@ -105,10 +105,10 @@
 	<script src = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 
 	<!--
-	This is where you link to your React code. Can be .js or .jsx 
-	extension, doesn't really matter.
+	This is where you link to your Angular code. Only .js extension!
 	-->
 	<script src="../static/js/tutorial.js" type="text/babel"></script>
+	<script src="../static/js/getmembers.js"></script>
 
 </body>
 </html>