Skip to content

Egor Iuganov / website

Go to a project
Commit d3bc83a1 by Егор Юганов
Options

lessons 1-20

1 parent 646fe444
Inline Side-by-side
Showing with 59 additions and 67 deletions
.idea/workspace.xml
......@@ -3,11 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="1205db3d-1d9f-4461-8852-53a7931d6ea3" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/admin.py" afterPath="$PROJECT_DIR$/music/admin.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/models.py" afterPath="$PROJECT_DIR$/music/models.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/detail.html" afterPath="$PROJECT_DIR$/music/templates/music/detail.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/templates/music/index.html" afterPath="$PROJECT_DIR$/music/templates/music/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/music/views.py" afterPath="$PROJECT_DIR$/music/views.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -19,7 +16,7 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<file leaf-file-name="views.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/music/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
......@@ -34,8 +31,8 @@
<file leaf-file-name="detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="11" lean-forward="true" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
<state relative-caret-position="45">
<caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<folding />
</state>
</provider>
......@@ -44,8 +41,8 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="11" lean-forward="false" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
<state relative-caret-position="75">
<caret line="5" column="20" lean-forward="true" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
<folding />
</state>
</provider>
......@@ -63,7 +60,7 @@
</provider>
</entry>
</file>
<file leaf-file-name="admin.py" pinned="false" current-in-tab="true">
<file leaf-file-name="admin.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
......@@ -75,6 +72,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/music/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -94,11 +101,11 @@
<option value="$PROJECT_DIR$/website/urls.py" />
<option value="$PROJECT_DIR$/website/settings.py" />
<option value="$PROJECT_DIR$/music/urls.py" />
<option value="$PROJECT_DIR$/music/templates/music/index.html" />
<option value="$PROJECT_DIR$/music/views.py" />
<option value="$PROJECT_DIR$/music/templates/music/detail.html" />
<option value="$PROJECT_DIR$/music/models.py" />
<option value="$PROJECT_DIR$/music/admin.py" />
<option value="$PROJECT_DIR$/music/templates/music/detail.html" />
<option value="$PROJECT_DIR$/music/templates/music/index.html" />
</list>
</option>
</component>
......@@ -163,28 +170,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="website" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="website" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="music" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="templates" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="music" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
......@@ -572,56 +557,54 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/website/urls.py">
<entry file="file://$PROJECT_DIR$/music/apps.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="39" lean-forward="false" selection-start-line="20" selection-start-column="39" selection-end-line="20" selection-end-column="39" />
<folding>
<element signature="e#641#682#0" expanded="false" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/urls.py">
<entry file="file://$PROJECT_DIR$/music/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<state relative-caret-position="105">
<caret line="7" column="25" lean-forward="true" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<folding>
<element signature="e#0#32#0" expanded="false" />
<element signature="e#24#63#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/apps.py">
<entry file="file://$PROJECT_DIR$/website/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<state relative-caret-position="225">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#641#682#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/views.py">
<entry file="file://$PROJECT_DIR$/music/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="40" lean-forward="false" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
<state relative-caret-position="105">
<caret line="8" column="32" lean-forward="false" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="11" lean-forward="false" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
<state relative-caret-position="45">
<caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/templates/music/detail.html">
<entry file="file://$PROJECT_DIR$/music/templates/music/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="11" lean-forward="true" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
<state relative-caret-position="75">
<caret line="5" column="20" lean-forward="true" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
<folding />
</state>
</provider>
......@@ -636,12 +619,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/music/admin.py">
<entry file="file://$PROJECT_DIR$/music/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="25" lean-forward="true" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
<state relative-caret-position="210">
<caret line="14" column="40" lean-forward="false" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
<folding>
<element signature="e#24#63#0" expanded="true" />
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
......
db.sqlite3
No preview for this file type
music/templates/music/detail.html
{{ album }}
\ No newline at end of file
<img src="{{ album.album_logo }}">
<h1>{{ album.album_title }}</h1>
<h3>{{ album.artist }}</h3>
<ul>
{% for song in album.song_set.all %}
<li>{{ song.song_title }} - {{ song.file_type }}</li>
{% endfor %}
</ul>
\ No newline at end of file
music/templates/music/index.html
......@@ -2,7 +2,7 @@
<h3>Here are all my Albums</h3>
<ul>
{% for album in all_albums %}
<li><a href="/music/{{ album.id }}">{{ album.album_title }}</a></li>
<li><a href="{% url 'detail' album.id %}">{{ album.album_title }}</a></li>
{% endfor %}
</ul>
{% else %}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!