From 6eb94957c0f47b89dbbbbeb0db84cdb476e54eea Mon Sep 17 00:00:00 2001 From: Maximo Mussini Date: Fri, 23 Aug 2024 11:56:49 -0300 Subject: [PATCH] chore: cleanup after #20 --- .eslintrc.js | 1 + .../app/frontend/types/serializers/Song.ts | 4 +++- .../types/serializers/SongWithVideos.ts | 4 +++- playground/vanilla/app/models/song.rb | 2 +- .../20240227112250_add_enums_to_composers.rb | 6 ----- .../20240227112250_add_enums_to_songs.rb | 6 +++++ playground/vanilla/db/schema.rb | 5 ++--- playground/vanilla/db/seeds.rb | 22 +++++++++---------- 8 files changed, 27 insertions(+), 23 deletions(-) delete mode 100644 playground/vanilla/db/migrate/20240227112250_add_enums_to_composers.rb create mode 100644 playground/vanilla/db/migrate/20240227112250_add_enums_to_songs.rb diff --git a/.eslintrc.js b/.eslintrc.js index 4728ae2..3478670 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,6 +5,7 @@ module.exports = { extends: ['@antfu/eslint-config'], rules: { '@typescript-eslint/space-before-function-paren': ['warn', 'always'], + '@typescript-eslint/quotes': 'off', 'vue/attribute-hyphenation': ['warn', 'never'], 'vue/html-closing-bracket-spacing': ['warn', { startTag: 'never', diff --git a/playground/vanilla/app/frontend/types/serializers/Song.ts b/playground/vanilla/app/frontend/types/serializers/Song.ts index 283a9b4..28e7de8 100644 --- a/playground/vanilla/app/frontend/types/serializers/Song.ts +++ b/playground/vanilla/app/frontend/types/serializers/Song.ts @@ -1,4 +1,4 @@ -// TypesFromSerializers CacheKey c3af64a41d21e71dfae56644517994e1 +// TypesFromSerializers CacheKey 460b4a83a2e81c9d693ac5490f9e0b76 // // DO NOT MODIFY: This file was automatically generated by TypesFromSerializers. import type Composer from './Composer' @@ -6,5 +6,7 @@ import type Composer from './Composer' export default interface Song { id: number composer: Composer + genre: "disco" | "rock" | "classical" + tempo: "slow" | "medium" | "fast" title?: string } diff --git a/playground/vanilla/app/frontend/types/serializers/SongWithVideos.ts b/playground/vanilla/app/frontend/types/serializers/SongWithVideos.ts index 9ee0a0f..c587ad9 100644 --- a/playground/vanilla/app/frontend/types/serializers/SongWithVideos.ts +++ b/playground/vanilla/app/frontend/types/serializers/SongWithVideos.ts @@ -1,4 +1,4 @@ -// TypesFromSerializers CacheKey 6774f7cbf07614cf9b4136fbd0c8b441 +// TypesFromSerializers CacheKey 3aa811bd4673913bbd09f2967979b304 // // DO NOT MODIFY: This file was automatically generated by TypesFromSerializers. import type Composer from './Composer' @@ -7,6 +7,8 @@ import type Video from './Video' export default interface SongWithVideos { id: number composer: Composer + genre: "disco" | "rock" | "classical" + tempo: "slow" | "medium" | "fast" title?: string videos: Video[] } diff --git a/playground/vanilla/app/models/song.rb b/playground/vanilla/app/models/song.rb index 41471c9..2e26e68 100644 --- a/playground/vanilla/app/models/song.rb +++ b/playground/vanilla/app/models/song.rb @@ -2,6 +2,6 @@ class Song < ApplicationRecord belongs_to :composer has_many :video_clips - enum genre: { disco: "disco", rock: "rock", classical: "classical" } + enum genre: {fingerstyle: "fingerstyle", rock: "rock", classical: "classical"} enum tempo: %w[slow medium fast] end diff --git a/playground/vanilla/db/migrate/20240227112250_add_enums_to_composers.rb b/playground/vanilla/db/migrate/20240227112250_add_enums_to_composers.rb deleted file mode 100644 index 9a74243..0000000 --- a/playground/vanilla/db/migrate/20240227112250_add_enums_to_composers.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddEnumsToComposers < ActiveRecord::Migration[6.0] - def change - add_column :composers, :genre, :string, null: false - add_column :composers, :tempo, :integer, null: true - end -end diff --git a/playground/vanilla/db/migrate/20240227112250_add_enums_to_songs.rb b/playground/vanilla/db/migrate/20240227112250_add_enums_to_songs.rb new file mode 100644 index 0000000..c9544bb --- /dev/null +++ b/playground/vanilla/db/migrate/20240227112250_add_enums_to_songs.rb @@ -0,0 +1,6 @@ +class AddEnumsToSongs < ActiveRecord::Migration[6.0] + def change + add_column :songs, :genre, :string, null: false + add_column :songs, :tempo, :integer, null: true + end +end diff --git a/playground/vanilla/db/schema.rb b/playground/vanilla/db/schema.rb index 6cb2c05..0ef78e1 100644 --- a/playground/vanilla/db/schema.rb +++ b/playground/vanilla/db/schema.rb @@ -11,14 +11,11 @@ # It's strongly recommended that you check this file into your version control system. ActiveRecord::Schema.define(version: 2024_02_27_112250) do - create_table "composers", force: :cascade do |t| t.text "first_name" t.text "last_name" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false - t.string "genre", null: false - t.integer "tempo" end create_table "songs", force: :cascade do |t| @@ -26,6 +23,8 @@ t.integer "composer_id" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "genre", null: false + t.integer "tempo" t.index ["composer_id"], name: "index_songs_on_composer_id" end diff --git a/playground/vanilla/db/seeds.rb b/playground/vanilla/db/seeds.rb index a07e7c1..947b84e 100644 --- a/playground/vanilla/db/seeds.rb +++ b/playground/vanilla/db/seeds.rb @@ -10,17 +10,17 @@ jorge_cardoso = Composer.create!(first_name: "Jorge", last_name: "Cardoso") domingos_semenzato = Composer.create!(first_name: "Domingos", last_name: "Semenzato") -smoke_signals = Song.create(title: "Smoke Signals", composer: dylan_ryche) -camino_libre = Song.create(title: "Camino Libre", composer: maximo_mussini) -sin_querer = Song.create(title: "Sin Querer", composer: leon_gieco) -tabula_rasa = Song.create(title: "Tabula Rasa", composer: calum_graham) -raindance = Song.create(title: "Raindance", composer: matteo_brenci) -ragamuffin = Song.create(title: "Ragamuffin", composer: michael_hedges) -vals_venezolano_n_2 = Song.create(title: "Vals Venezolano Nº 2", composer: antonio_lauro) -xaranga_do_vovo = Song.create(title: "Xaranga do Vovô", composer: celso_machado) -cafe_1930 = Song.create(title: "Café 1930", composer: astor_piazzolla) -milonga_uruguay = Song.create(title: "Milonga (Uruguay)", composer: jorge_cardoso) -divagando = Song.create(title: "Divagando", composer: domingos_semenzato) +smoke_signals = Song.create(title: "Smoke Signals", composer: dylan_ryche, genre: "fingerstyle") +camino_libre = Song.create(title: "Camino Libre", composer: maximo_mussini, genre: "fingerstyle") +sin_querer = Song.create(title: "Sin Querer", composer: leon_gieco, genre: "fingerstyle") +tabula_rasa = Song.create(title: "Tabula Rasa", composer: calum_graham, genre: "fingerstyle") +raindance = Song.create(title: "Raindance", composer: matteo_brenci, genre: "fingerstyle") +ragamuffin = Song.create(title: "Ragamuffin", composer: michael_hedges, genre: "fingerstyle") +vals_venezolano_n_2 = Song.create(title: "Vals Venezolano Nº 2", composer: antonio_lauro, genre: "classical") +xaranga_do_vovo = Song.create(title: "Xaranga do Vovô", composer: celso_machado, genre: "classical") +cafe_1930 = Song.create(title: "Café 1930", composer: astor_piazzolla, genre: "classical") +milonga_uruguay = Song.create(title: "Milonga (Uruguay)", composer: jorge_cardoso, genre: "classical") +divagando = Song.create(title: "Divagando", composer: domingos_semenzato, genre: "classical") VideoClip.create!(id: 11, song: smoke_signals, youtube_id: "3glhadBFKGc", title: "Máximo Mussini interpreta \"Smoke Signals\" por Dylan Ryche") VideoClip.create!(id: 10, song: camino_libre, youtube_id: "7cUCxXuBk_8", title: "\"Camino Libre\" by Máximo Mussini")