Implement jam song submissions

diff --git a/src/littlesongplace/songs.py b/src/littlesongplace/songs.py
index 3478460ade3e876ca427869e56fd2c82bb66b051..22805ef25d897f9480262c94e867ccf8a47caccb 100644 (file)
--- a/src/littlesongplace/songs.py
+++ b/src/littlesongplace/songs.py
@@ -214,6 +214,7 @@ def edit_song():
     song = None
 
     song_colors = users.get_user_colors(session["userid"])
+    eventid = request.args.get("eventid", None)
 
     if "songid" in request.args:
         try:
@@ -240,7 +241,7 @@ def edit_song():
                 f"- song doesn't exist ({songid})")
             abort(404)
 
-    return render_template("edit-song.html", song=song, **song_colors)
+    return render_template("edit-song.html", song=song, **song_colors, eventid=eventid)
 
 @bp.post("/upload-song")
 def upload_song():

diff --git a/src/littlesongplace/templates/edit-song.html b/src/littlesongplace/templates/edit-song.html
index 552c1cf9877b7219d83b270b3f098926526b36a0..d360ef880c48eb2300dcd2dd790eddd91e7ca342 100644 (file)
--- a/src/littlesongplace/templates/edit-song.html
+++ b/src/littlesongplace/templates/edit-song.html
@@ -14,7 +14,7 @@ Most standard audio/video formats are supported - .wav, .mp3, .ogg, .mp4, etc.
 <form action="/upload-song?songid={{ song.songid }}" method="post" enctype="multipart/form-data" onsubmit="onUpload()">
     <h2>Edit Song</h2>
 {% else %}
-<form action="/upload-song" method="post" enctype="multipart/form-data" onsubmit="onUpload()">
+<form action="/upload-song{% if eventid %}?eventid={{ eventid }}{% endif %}" method="post" enctype="multipart/form-data" onsubmit="onUpload()">
     <h2>Upload a New Song</h2>
 {% endif %}
     <div class="upload-form">

diff --git a/src/littlesongplace/templates/jam-event.html b/src/littlesongplace/templates/jam-event.html
index b16250e7c94c912b06eeeab16dd714e69f6247bf..3b6fec466f013069b497fb642d571ce4f03a3aa1 100644 (file)
--- a/src/littlesongplace/templates/jam-event.html
+++ b/src/littlesongplace/templates/jam-event.html
@@ -39,7 +39,9 @@
     </div>
 
     <h2>Submissions</h2>
-    <button class="button">Submit a Song</button>
+    <a class="button" href="/edit-song?eventid={{ event.eventid }}">Submit a Song</a>
+    <br/>
+    <br/>
     {% include "song-list.html" %}
 
     <h2>Comments</h2>

diff --git a/src/littlesongplace/templates/song-list.html b/src/littlesongplace/templates/song-list.html
index c2a85b9958bbb0a8d1c5ca45bb7786cd1a6d4767..a733accd467c3935b042ad1f203f9e4062908a3a 100644 (file)
--- a/src/littlesongplace/templates/song-list.html
+++ b/src/littlesongplace/templates/song-list.html
@@ -9,7 +9,7 @@
 
     <div class="song-list-songs">
         {% for song in songs %}
-        {%- if not (song.hidden and session['uiserid'] != song.userid) -%}
+        {%- if not (song.hidden and session['userid'] != song.userid) -%}
         <div class="song" data-song="{{ song.json() }}">
             <div class="song-main">
                 <div class="song-list-pfp-container">

diff --git a/src/littlesongplace/templates/song-macros.html b/src/littlesongplace/templates/song-macros.html
index ad20a82fedda4c097000578afc4c6548074a8801..71db298b42970f73cf020b685114e4fad29e0111 100644 (file)
--- a/src/littlesongplace/templates/song-macros.html
+++ b/src/littlesongplace/templates/song-macros.html
@@ -18,8 +18,9 @@
 {% macro song_info(song) %}
 <div class="song-info">
     <!-- Song Title -->
-    <div class="song-title"><a href="/song/{{ song.userid }}/{{ song.songid }}?action=view">{{ song.title }}</a>
-    {%- if song.hidden %}<span class="visibility-indicator">[Hidden]</span>{% endif -%}
+    <div class="song-title">
+        {%- if song.hidden %}<span class="visibility-indicator" title="This song is not visible to others until the end of the event">[Hidden]</span>{% endif %}
+        <a href="/song/{{ song.userid }}/{{ song.songid }}?action=view">{{ song.title }}</a>
     </div>
 
     <!-- Separator -->