Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
JoinTheCity
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafal
JoinTheCity
Commits
ad0f8d46
Commit
ad0f8d46
authored
Jan 13, 2016
by
Rafal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add media root + change icon_www to icon -> using ImageField
parent
73af1f0a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
14 deletions
+20
-14
settings.py
JoinTheCityREST/JoinTheCityREST/settings.py
+4
-2
urls.py
JoinTheCityREST/JoinTheCityREST/urls.py
+3
-1
init_apis.py
JoinTheCityREST/app/API/management/commands/init_apis.py
+11
-9
models.py
JoinTheCityREST/app/API/models.py
+1
-1
serializers.py
JoinTheCityREST/app/API/serializers.py
+1
-1
No files found.
JoinTheCityREST/JoinTheCityREST/settings.py
View file @
ad0f8d46
...
...
@@ -13,7 +13,7 @@ import os
BASE_DIR
=
os
.
path
.
dirname
(
os
.
path
.
dirname
(
__file__
))
MEDIA_ROOT
=
os
.
path
.
join
(
BASE_DIR
,
'media'
)
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
...
...
@@ -130,4 +130,6 @@ TEMPLATES = [
],
},
},
]
\ No newline at end of file
]
MEDIA_URL
=
'/media/'
\ No newline at end of file
JoinTheCityREST/JoinTheCityREST/urls.py
View file @
ad0f8d46
...
...
@@ -2,9 +2,11 @@ from django.conf.urls import patterns, include, url
from
django.contrib
import
admin
from
rest_framework.authtoken
import
views
as
token_view
from
rest_framework
import
routers
from
JoinTheCityREST
import
settings
router
=
routers
.
DefaultRouter
()
from
django.conf.urls.static
import
static
from
app.API
import
views
as
api_views
from
app.Discussion
import
views
as
discussion_views
from
app.Event
import
views
as
event_views
...
...
@@ -39,4 +41,4 @@ urlpatterns = [
namespace
=
'rest_framework'
)),
url
(
r'^api-token-auth/'
,
token_view
.
obtain_auth_token
),
url
(
r'^admin/'
,
include
(
admin
.
site
.
urls
)),
]
]
+
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
JoinTheCityREST/app/API/management/commands/init_apis.py
View file @
ad0f8d46
from
django.core.files
import
File
from
app.API.models
import
API
,
APIType
from
app.Tag.models
import
Tag
...
...
@@ -10,20 +11,21 @@ class Command(BaseCommand):
def
handle
(
self
,
*
args
,
**
options
):
apis
=
[
[
'Apteki w Krakowie'
,
'Krakow'
,
'map'
,
'apteki'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Baseny w Krakowie'
,
'Krakow'
,
'map'
,
'baseny'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Hotele w Krakowie'
,
'Krakow'
,
'map'
,
' hotele'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'HotSpoty w Krakowie'
,
'Krakow'
,
'map'
,
' mapaHotSpotow'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Utrudnienia w Krakowie'
,
'Krakow'
,
'map'
,
' mapaUtrudnien'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Restauracje w Krakowie'
,
'Krakow'
,
'map'
,
' restauracje'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Szpitale w Krakowie'
,
'Krakow'
,
'map'
,
' szpitale'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Zdarzenia drogowe w Krakowie'
,
'Krakow'
,
'map'
,
' zdarzeniaDrogowe'
,
''
,
'Opis API o aptekach w Krakowie'
],
[
'Apteki w Krakowie'
,
'Krakow'
,
'map'
,
'apteki'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Baseny w Krakowie'
,
'Krakow'
,
'map'
,
'baseny'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Hotele w Krakowie'
,
'Krakow'
,
'map'
,
' hotele'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'HotSpoty w Krakowie'
,
'Krakow'
,
'map'
,
' mapaHotSpotow'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Utrudnienia w Krakowie'
,
'Krakow'
,
'map'
,
' mapaUtrudnien'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Restauracje w Krakowie'
,
'Krakow'
,
'map'
,
' restauracje'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Szpitale w Krakowie'
,
'Krakow'
,
'map'
,
' szpitale'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
[
'Zdarzenia drogowe w Krakowie'
,
'Krakow'
,
'map'
,
' zdarzeniaDrogowe'
,
'
image/icon.jpg
'
,
'Opis API o aptekach w Krakowie'
],
]
print
"Creating APIs"
for
api
in
apis
:
print
"Create {0}"
.
format
(
api
[
0
])
tag
=
Tag
.
objects
.
filter
(
name
=
api
[
1
])[
0
]
api_type
=
APIType
.
objects
.
filter
(
name
=
api
[
2
])[
0
]
new_api
=
API
.
objects
.
create
(
name
=
api
[
0
],
type
=
api_type
,
source
=
api
[
3
]
,
icon_www
=
api
[
4
]
,
description
=
api
[
5
])
new_api
=
API
.
objects
.
create
(
name
=
api
[
0
],
type
=
api_type
,
source
=
api
[
3
]
,
description
=
api
[
5
])
new_api
.
tag
=
[
tag
,
]
new_api
.
icon
=
api
[
4
]
new_api
.
save
()
\ No newline at end of file
JoinTheCityREST/app/API/models.py
View file @
ad0f8d46
...
...
@@ -18,7 +18,7 @@ class API(models.Model):
type
=
models
.
ForeignKey
(
APIType
,
related_name
=
'API_type'
,
blank
=
False
,
null
=
False
,
default
=
None
)
source
=
models
.
CharField
(
max_length
=
100
)
icon
_www
=
models
.
CharField
(
max_length
=
100
,
default
=
None
,
null
=
True
,
blank
=
True
)
icon
=
models
.
ImageField
(
null
=
True
,
blank
=
True
)
description
=
models
.
CharField
(
max_length
=
300
,
default
=
None
,
null
=
True
,
blank
=
True
)
...
...
JoinTheCityREST/app/API/serializers.py
View file @
ad0f8d46
...
...
@@ -6,7 +6,7 @@ class APISerializer(serializers.HyperlinkedModelSerializer):
class
Meta
:
model
=
API
fields
=
(
'url'
,
'name'
,
'tag'
,
'type'
,
'source'
,
'icon
_www
'
,
'description'
)
fields
=
(
'url'
,
'name'
,
'tag'
,
'type'
,
'source'
,
'icon'
,
'description'
)
class
APITypeSerializer
(
serializers
.
HyperlinkedModelSerializer
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment