Permalink
Browse files

f

  • Loading branch information...
Adrian Altares Adrian Altares
Adrian Altares authored and Adrian Altares committed Dec 6, 2018
1 parent c6f0f8c commit 72401837f9750612f6478e61c819321e46b3538f
View
@@ -2,9 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9200bb63-493b-4d75-adcc-a2ce61f15cba" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tunr_react/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/tunr_react/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tunr_react/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/tunr_react/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tunr_react_wdi18" beforeDir="false" afterPath="$PROJECT_DIR$/tunr_react_wdi18" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -32,39 +31,44 @@
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/tunr_react/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="114" column="6" selection-start-line="114" selection-start-column="6" selection-end-line="114" selection-end-column="6" />
<state relative-caret-position="476">
<caret line="45" column="10" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/manage.py">
<entry file="file://$PROJECT_DIR$/main/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="15" selection-start-line="15" selection-end-line="15" />
<state relative-caret-position="90">
<caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Pipfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/main/fixtures/artists.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/main/fixtures/songs.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tunr_react/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
<entry file="file://$PROJECT_DIR$/main/apps.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main/tests.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
@@ -79,11 +83,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tunr_react/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="255">
<caret line="18" column="28" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#634#666#0" expanded="true" />
</folding>
@@ -92,31 +96,19 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/main/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
<state relative-caret-position="225">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Procfile">
<entry file="file://$PROJECT_DIR$/main/views.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="42" selection-start-column="42" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</first_editor>
<second_editor />
<state relative-caret-position="15">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
@@ -133,15 +125,17 @@
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/Procfile" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/tunr_react/settings.py" />
<option value="$PROJECT_DIR$/tunr_react/views.py" />
<option value="$PROJECT_DIR$/tunr_react/urls.py" />
<option value="$PROJECT_DIR$/main/models.py" />
<option value="$PROJECT_DIR$/tunr_react/settings.py" />
<option value="$PROJECT_DIR$/main/admin.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="67" />
<option name="y" value="45" />
<option name="x" value="70" />
<option name="y" value="47" />
<option name="width" value="1313" />
<option name="height" value="765" />
</component>
@@ -157,6 +151,11 @@
<item name="tunr_react" type="b2602c69:ProjectViewProjectNode" />
<item name="tunr_react" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="tunr_react" type="b2602c69:ProjectViewProjectNode" />
<item name="tunr_react" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="tunr_react" type="b2602c69:ProjectViewProjectNode" />
<item name="tunr_react" type="462c0819:PsiDirectoryNode" />
@@ -222,16 +221,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1544108340849</updated>
<workItem from="1544108344192" duration="5878000" />
<workItem from="1544108344192" duration="7741000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5878000" />
<option name="totallyTimeSpent" value="7741000" />
</component>
<component name="ToolWindowManager">
<frame x="67" y="45" width="1313" height="765" extended-state="0" />
<editor active="true" />
<frame x="70" y="47" width="1313" height="765" extended-state="0" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24940991" />
@@ -315,13 +313,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tunr_react/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" selection-start-line="20" selection-end-line="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tunr_react/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
@@ -332,15 +323,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tunr_react/models.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tunr_react/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
<state relative-caret-position="255">
<caret line="18" column="28" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#634#666#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tunr_react/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="45" column="10" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/tests.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/main/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/apps.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/main/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="28" lean-forward="true" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main/fixtures/artists.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</component>
</project>
View
No changes.
View
@@ -0,0 +1,7 @@
from django.contrib import admin
from .models import Artist, Song
admin.site.register([Artist, Song])
# Register your models here.
View
@@ -0,0 +1,5 @@
from django.apps import AppConfig
class MainConfig(AppConfig):
name = 'main'
View
@@ -0,0 +1,38 @@
[
{
"model": "main.artist",
"fk": 1,
"fields": {
"name": "Kishi Bashi",
"photo_url": "https://media.npr.org/assets/img/2016/09/06/kishi-bashi-pr-by-shervin-lainez_wide-d5ac9129be570d7546057c16359d403f78620b55-s1100-c15.jpg",
"nationality": "USA"
}
},
{
"model": "main.artist",
"fk": 2,
"fields": {
"name": "BROCKHAMPTON",
"photo_url": "https://ichef.bbci.co.uk/images/ic/960x540/p0611lld.jpg",
"nationality": "USA"
}
},
{
"model": "main.artist",
"fk": 3,
"fields": {
"name": "tricot",
"photo_url": "https://ksassets.timeincuk.net/wp/uploads/sites/55/2015/02/2015Tricot_Asha_Press_020215.jpg",
"nationality": "Japan"
}
},
{
"model": "main.artist",
"fk": 4,
"fields": {
"name": "jamie xx",
"photo_url": "https://cdn1.thr.com/sites/default/files/imagecache/scale_crop_768_433/2017/01/gettyimages-613803564-h_2017.jpg",
"nationality": "UK"
}
}
]
Oops, something went wrong.

0 comments on commit 7240183

Please sign in to comment.