diff --git a/.gitignore b/.gitignore
index 9badb78bee8c0e9e13a1aff41ad71a323ff3c00a..d3e8485e3b79dd99abd4439e324f526335a71036 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ node_modules
.pyc
venv
assets/bundles/*
-.idea
\ No newline at end of file
+.idea
+webpack-stats.json
diff --git a/README.md b/README.md
index ef00f49a58aa14cfd8a074d26f4b96566384f37a..ded5146342688ab250697fa6fe3139c155d3b8ab 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,11 @@
# How To Build
-##Requirements
+## Requirements
-* Node + Npm
-* Python + Pip
+* Node + Npm (https://nodejs.org/dist/v6.9.5/node-v6.9.5-x64.msi)
+* Python + Pip (https://www.python.org/ftp/python/3.6.0/python-3.6.0-embed-amd64.zip and https://pip.pypa.io/en/stable/installing/)
-
-##Installation
-
-####In two commands
-
-
-`git clone https://gitlab.com/PPL2017csui/PPLA1.git kape && cd kape && rm -drf .git && git init && npm install && pip install -r requirements.txt && npm run webpack`
-
-`python manage.py runserver`
-
-Detailed :
+## Installation
* `git clone https://gitlab.com/PPL2017csui/PPLA1.git kape`
* `cd kape`
@@ -26,10 +16,16 @@ Detailed :
For Windows you need to run `npm run webpack` and `python manage.py runserver` in different terminal.
-###Migrate the database
+## Migrating the database
`python manage.py migrate`
Now go to localhost:8000 and you'll see the App running!
+## Database
+
+Install postgreSQL
+Run this quert `create user kape password 'kape' createdb` to create database and user.
+Run `python manage.py migrate`
+
This project uses [Django Webpack Loader](https://github.com/owais/django-webpack-loader).
diff --git a/assets/js/app.jsx b/assets/js/app.jsx
deleted file mode 100644
index 2d8b48481382756a265f1c4dd8d7e794c719b556..0000000000000000000000000000000000000000
--- a/assets/js/app.jsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react'
-
-function Home() {
- return (
- <div className="container">
- <div className="row">
- <div className="col-md-2"></div>
- <div className="well col-md-8">
- <h1 className="center">Yuk develop KaPe :)</h1>
- </div>
- <div className="col-md-2"></div>
- </div>
- </div>
- )
-}
-
-export default Home
diff --git a/assets/js/index.js b/assets/js/index.js
index b4e124d7158119a49812749dba553363d7f7d3de..ea1d1398172fe3c0beca96f3d325f5e5d51ea865 100644
--- a/assets/js/index.js
+++ b/assets/js/index.js
@@ -1,13 +1,23 @@
import React from 'react';
-import Home from './app';
+import Dashboard from './dashboard';
import ReactDOM from 'react-dom';
+import {Router, Route, browserHistory} from 'react-router';
-import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
+import {Segment} from 'semantic-ui-react';
-const App = () => (
- <MuiThemeProvider>
- <Home />
- </MuiThemeProvider>
+export const Profile = () => (
+ <Segment>
+ <img src='http://semantic-ui.com/images/wireframe/media-paragraph.png' />
+ </Segment>
+);
+
+export const App = () => (
+ <Router history={browserHistory}>
+ <Route path="/" component={Dashboard}>
+ <Route path="profile" component={Profile} />
+ <Route path="users" component={Profile} />
+ </Route>
+ </Router>
);
ReactDOM.render( <App />, document.getElementById('react-app'))
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index b4d89ec61b1d20046a41dd60fd0553ab52c384ba..0edccb07e9690488ce9118ea7b185f65d3d04471 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -4,9 +4,10 @@
<html>
<head>
<meta charset="UTF-8">
- <title>Django React Awesome App</title>
- <link rel="stylesheet" href="{% static 'css/custom.css' %}">
- <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
+ <title>Yuk Cari Tempat Kape :)</title>
+ <link rel="stylesheet" href="{% static 'css/custom.css' %}">
+ <link rel="stylesheet" href="{% static 'css/semantic-ui/semantic.min.css' %}">
+ <link rel="icon" type="image/png" href="{% static 'img/logo-sm.png'%}" sizes="32x32" />
</head>
<body>
diff --git a/kape/settings.py b/kape/settings.py
index 25848ce28d3ce78abf362e34345b0b0760f9efe4..490f77b852c65ab8048c1b0ef4bac35d939ab6c6 100644
--- a/kape/settings.py
+++ b/kape/settings.py
@@ -33,6 +33,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'webpack_loader',
'core',
+ 'rest_framework'
]
MIDDLEWARE = [
@@ -71,8 +72,12 @@ WSGI_APPLICATION = 'kape.wsgi.application'
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ 'ENGINE': 'django.db.backends.postgresql_psycopg2',
+ 'NAME': 'kape',
+ 'USER': 'postgres',
+ 'PASSWORD': 'hue',
+ 'HOST': 'localhost',
+ 'PORT': '',
}
}
@@ -114,3 +119,11 @@ USE_TZ = True
# https://docs.djangoproject.com/en/1.10/howto/static-files/
STATIC_URL = '/static/'
+
+REST_FRAMEWORK = {
+ # Use Django's standard `django.contrib.auth` permissions,
+ # or allow read-only access for unauthenticated users.
+ 'DEFAULT_PERMISSION_CLASSES': [
+ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
+ ]
+}
\ No newline at end of file
diff --git a/kape/urls.py b/kape/urls.py
index f84d55309ac1cf50387cd7c2eea322171ddcd664..600d3a4d31f039dc6d8a2bcab5ac54ee40b21f48 100644
--- a/kape/urls.py
+++ b/kape/urls.py
@@ -15,9 +15,15 @@ Including another URLconf
"""
from django.conf.urls import url, include
from django.contrib import admin
+from rest_framework import routers
+from kape.views.user import UserViewSet
+router = routers.DefaultRouter()
+router.register(r'users', UserViewSet)
urlpatterns = [
+ url(r"^api/", include(router.urls)),
url(r'^admin/', admin.site.urls),
url(r'', include('core.urls')),
+ url(r'^api/api-auth/', include('rest_framework.urls', namespace='rest_framework'))
]
diff --git a/kape/views/user.py b/kape/views/user.py
new file mode 100644
index 0000000000000000000000000000000000000000..d8f829943f580213346f3b44546bfc3dde7eb6a0
--- /dev/null
+++ b/kape/views/user.py
@@ -0,0 +1,15 @@
+from django.contrib.auth.models import User
+from rest_framework import serializers, viewsets
+
+
+# Serializers define the API representation.
+class UserSerializer(serializers.HyperlinkedModelSerializer):
+ class Meta:
+ model = User
+ fields = ('url', 'username', 'email', 'is_staff')
+
+
+# ViewSets define the view behavior.
+class UserViewSet(viewsets.ModelViewSet):
+ queryset = User.objects.all()
+ serializer_class = UserSerializer
diff --git a/package.json b/package.json
index 5fcf06d599e4cf93b08c5a14ccc01c70eb75bbc5..48846c4ce54be0af5e7bfc56178384da72ced9d3 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,10 @@
"axios": "^0.14.0",
"babel-core": "^6.17.0",
"babel-preset-react": "^6.16.0",
- "react-tap-event-plugin": "^2.0.1",
"material-ui": "^0.16.0",
- "react-dom": "^15.3.2"
+ "react-dom": "^15.3.2",
+ "react-router": "^3.0.2",
+ "react-tap-event-plugin": "^2.0.1",
+ "semantic-ui-react": "^0.65.0"
}
}
diff --git a/requirements.txt b/requirements.txt
index 549b7997c1d252fef6f6a57e515fc9b208dcadaf..bc8cadb5d5c07b8fddbd526aa0e9724f0ee20335 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,6 @@ Django==1.10.5
django-webpack-loader==0.4.1
djangorestframework==3.5.4
packaging==16.8
+psycopg2==2.6.2
pyparsing==2.1.10
six==1.10.0
\ No newline at end of file
diff --git a/webpack-stats.json b/webpack-stats.json
deleted file mode 100644
index 1d540f09e531c43b010c7ca4353c5a50343d96dd..0000000000000000000000000000000000000000
--- a/webpack-stats.json
+++ /dev/null
@@ -1 +0,0 @@
-{"status":"done","chunks":{"main":[{"name":"main-9c374636943b76722727.js","path":"C:\\Users\\zmajd\\Documents\\code\\djangoreact\\assets\\bundles\\main-9c374636943b76722727.js"}]}}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index bc8676501eaa4fc56d943da81683ca37d188913f..23701902d2f029d9a25395b6f1c9a5847e9f9130 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -13,6 +13,7 @@ module.exports = {
},
plugins: [
+ new webpack.HotModuleReplacementPlugin(),
new BundleTracker({filename: './webpack-stats.json'}),
],