diff options
8 files changed, 47 insertions, 37 deletions
diff --git a/animism-align/cli/app/sql/models/episode.py b/animism-align/cli/app/sql/models/episode.py index 34402b8..bbede50 100644 --- a/animism-align/cli/app/sql/models/episode.py +++ b/animism-align/cli/app/sql/models/episode.py @@ -12,9 +12,9 @@ class Episode(Base): """Table for storing episodes and their metadata""" __tablename__ = 'episode' id = Column(Integer, primary_key=True) - episode_number = Column(Integer, primary_key=True) + episode_number = Column(Integer) title = Column(String(256, convert_unicode=True), nullable=False) - release_date = Column(String(256, convert_unicode=True), primary_key=True) + release_date = Column(String(256, convert_unicode=True)) is_live = Column(Boolean, default=False) settings = Column(JSON, default={}, nullable=True) @@ -22,7 +22,7 @@ class Episode(Base): return { 'id': self.id, 'episode_number': self.episode_number, - 'title': self.type, + 'title': self.title, 'release_date': self.release_date, 'is_live': self.is_live, } @@ -31,7 +31,7 @@ class Episode(Base): return { 'id': self.id, 'episode_number': self.episode_number, - 'title': self.type, + 'title': self.title, 'release_date': self.release_date, 'is_live': self.is_live, 'settings': self.settings, diff --git a/animism-align/cli/app/sql/models/venue.py b/animism-align/cli/app/sql/models/venue.py index 992adea..74a928c 100644 --- a/animism-align/cli/app/sql/models/venue.py +++ b/animism-align/cli/app/sql/models/venue.py @@ -19,8 +19,8 @@ class Venue(Base): def toJSON(self): return { 'id': self.id, - 'title': self.type, - 'date': self.type, + 'title': self.title, + 'date': self.date, 'settings': self.settings, } diff --git a/animism-align/cli/app/sql/versions/202009301833_create_episodes_table.py b/animism-align/cli/app/sql/versions/202009301833_create_episodes_table.py index 46d626b..6a25e68 100644 --- a/animism-align/cli/app/sql/versions/202009301833_create_episodes_table.py +++ b/animism-align/cli/app/sql/versions/202009301833_create_episodes_table.py @@ -26,7 +26,7 @@ def upgrade(): sa.Column('release_date', sa.String(length=256, _expect_unicode=True), nullable=False), sa.Column('is_live', sa.Boolean(), nullable=True), sa.Column('settings', sa.JSON(), nullable=True), - sa.PrimaryKeyConstraint('id', 'episode_number', 'release_date') + sa.PrimaryKeyConstraint('id') ) # ### end Alembic commands ### diff --git a/animism-align/frontend/app/views/episode/components/episode.form.js b/animism-align/frontend/app/views/episode/components/episode.form.js index e2edc16..6efa6a4 100644 --- a/animism-align/frontend/app/views/episode/components/episode.form.js +++ b/animism-align/frontend/app/views/episode/components/episode.form.js @@ -6,16 +6,14 @@ import { capitalize } from 'app/utils' import { TextInput, NumberInput, LabelDescription, Select, TextArea, Checkbox, SubmitButton, Loader } from 'app/common' const newEpisode = () => ({ - episode_number: '', title: '', + episode_number: '', release_date: '', settings: { - about: { - curator: "", - author: "", - artists: "", - credits: "", - }, + curator: "", + author: "", + artists: "", + credits: "", }, }) @@ -92,7 +90,7 @@ export default class EpisodeForm extends Component { } handleSettingsChange(name, value) { - console.log(name, value) + // console.log(name, value) if (name !== 'multiple') { value = { [name]: value } } @@ -177,7 +175,7 @@ export default class EpisodeForm extends Component { <TextArea title="Curator" name="curator" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> @@ -185,7 +183,7 @@ export default class EpisodeForm extends Component { <TextArea title="Author" name="author" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> @@ -193,7 +191,7 @@ export default class EpisodeForm extends Component { <TextArea title="Artists" name="artists" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> @@ -202,7 +200,7 @@ export default class EpisodeForm extends Component { title="Credits" name="credits" className="credits" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> diff --git a/animism-align/frontend/app/views/episode/containers/episode.index.js b/animism-align/frontend/app/views/episode/containers/episode.index.js index 0cf3b6c..4bb17fe 100644 --- a/animism-align/frontend/app/views/episode/containers/episode.index.js +++ b/animism-align/frontend/app/views/episode/containers/episode.index.js @@ -52,7 +52,7 @@ class EpisodeIndex extends Component { <div key={id}> {'Episode '}{lookup[id].episode_number}{': '} <Link to={"/episode/" + id + "/edit/"}> - lookup[id].title + {lookup[id].title} </Link> </div> ))} diff --git a/animism-align/frontend/app/views/venue/components/venue.form.js b/animism-align/frontend/app/views/venue/components/venue.form.js index decd465..cfc3e94 100644 --- a/animism-align/frontend/app/views/venue/components/venue.form.js +++ b/animism-align/frontend/app/views/venue/components/venue.form.js @@ -9,12 +9,11 @@ const newVenue = () => ({ title: '', date: '', settings: { - about: { - curator: "", - author: "", - artists: "", - credits: "", - }, + curator: "", + artists: "", + publication_heading: "", + publication: "", + credits: "", }, }) @@ -91,7 +90,7 @@ export default class VenueForm extends Component { } handleSettingsChange(name, value) { - console.log(name, value) + // console.log(name, value) if (name !== 'multiple') { value = { [name]: value } } @@ -162,23 +161,32 @@ export default class VenueForm extends Component { <TextArea title="Curator" name="curator" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> <TextArea - title="Author" - name="author" - data={data.settings.about} + title="Artists" + name="artists" + data={data.settings} + onChange={this.handleSettingsChangeEvent} + autoComplete="off" + /> + + <TextInput + title="Publication Heading" + name="publication_heading" + required + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> <TextArea - title="Artists" - name="artists" - data={data.settings.about} + title="Publication" + name="publication" + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> @@ -187,7 +195,7 @@ export default class VenueForm extends Component { title="Credits" name="credits" className="credits" - data={data.settings.about} + data={data.settings} onChange={this.handleSettingsChangeEvent} autoComplete="off" /> diff --git a/animism-align/frontend/app/views/venue/containers/venue.index.js b/animism-align/frontend/app/views/venue/containers/venue.index.js index 66f7eb1..cd8d9f6 100644 --- a/animism-align/frontend/app/views/venue/containers/venue.index.js +++ b/animism-align/frontend/app/views/venue/containers/venue.index.js @@ -51,9 +51,10 @@ class VenueIndex extends Component { {order.map(id => ( <div key={id}> <Link to={"/venue/" + id + "/edit/"}> - lookup[id].title + {lookup[id].title} </Link> - lookup[id].date + <br /> + {lookup[id].date} </div> ))} </div> diff --git a/animism-align/frontend/app/views/venue/venue.css b/animism-align/frontend/app/views/venue/venue.css index ad54dc2..194bad2 100644 --- a/animism-align/frontend/app/views/venue/venue.css +++ b/animism-align/frontend/app/views/venue/venue.css @@ -7,3 +7,6 @@ .venue-index { margin-top: 1rem; } +.venue-list div { + margin-bottom: 1rem; +}
\ No newline at end of file |