Skip to content

Commit

Permalink
269 upgrade tailwindcss to version 3
Browse files Browse the repository at this point in the history
  • Loading branch information
leesheppard authored Jan 25, 2025
1 parent 56614d3 commit 35fdd54
Show file tree
Hide file tree
Showing 4 changed files with 546 additions and 605 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ GEM
activesupport (>= 3.0)
nokogiri (>= 1.6)
io-console (0.8.0)
irb (1.15.0)
irb (1.15.1)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
Expand Down Expand Up @@ -520,4 +520,4 @@ RUBY VERSION
ruby 3.3.5p100

BUNDLED WITH
2.5.23
2.6.3
63 changes: 32 additions & 31 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,25 @@
ActiveRecord::Schema[8.0].define(version: 2024_12_15_005718) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_catalog.plpgsql"
enable_extension "pg_stat_statements"

create_table "access_requests", force: :cascade do |t|
t.string "name", null: false
t.text "reason"
t.date "requested_on", null: false
t.date "viewed_on"
t.bigint "recorder_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.index ["recorder_id"], name: "index_access_requests_on_recorder_id"
end

create_table "campaign_deliveries", force: :cascade do |t|
t.bigint "campaign_id"
t.bigint "membership_id"
t.datetime "delivered_at", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "delivered_at", precision: nil, null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.index ["campaign_id"], name: "index_campaign_deliveries_on_campaign_id"
t.index ["membership_id"], name: "index_campaign_deliveries_on_membership_id"
end
Expand All @@ -40,9 +41,9 @@
t.string "subject", null: false
t.string "preheader", null: false
t.text "content"
t.datetime "delivered_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "delivered_at", precision: nil
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.index ["rsvp_event_id"], name: "index_campaigns_on_rsvp_event_id"
end

Expand All @@ -64,11 +65,11 @@
t.string "full_name", null: false
t.string "email", null: false
t.json "data", default: {}, null: false
t.datetime "contacted_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "contacted_at", precision: nil
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.string "token", null: false
t.datetime "unsubscribed_at"
t.datetime "unsubscribed_at", precision: nil
t.index ["contacted_at"], name: "index_imported_members_on_contacted_at"
t.index ["email"], name: "index_imported_members_on_email"
t.index ["token"], name: "index_imported_members_on_token", unique: true
Expand All @@ -77,18 +78,18 @@

create_table "memberships", force: :cascade do |t|
t.bigint "user_id", null: false
t.datetime "joined_at", null: false
t.datetime "left_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "joined_at", precision: nil, null: false
t.datetime "left_at", precision: nil
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.index ["user_id"], name: "index_memberships_on_user_id"
end

create_table "rsvp_events", force: :cascade do |t|
t.string "title", null: false
t.datetime "happens_at", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "happens_at", precision: nil, null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.string "link"
end

Expand All @@ -97,20 +98,20 @@
t.bigint "membership_id", null: false
t.string "status", default: "unknown", null: false
t.string "token", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.string "proxy_name"
t.text "proxy_signature"
t.datetime "proxy_assigned_at"
t.datetime "proxy_assigned_at", precision: nil
t.index ["membership_id"], name: "index_rsvps_on_membership_id"
t.index ["rsvp_event_id"], name: "index_rsvps_on_rsvp_event_id"
t.index ["token"], name: "index_rsvps_on_token", unique: true
end

create_table "users", id: :serial, force: :cascade do |t|
t.string "email"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", precision: nil, null: false
t.datetime "updated_at", precision: nil, null: false
t.string "preferred_name"
t.string "full_name"
t.boolean "mailing_list", default: false, null: false
Expand All @@ -119,19 +120,19 @@
t.string "token"
t.boolean "email_confirmed", default: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.datetime "reset_password_sent_at", precision: nil
t.datetime "remember_created_at", precision: nil
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.datetime "current_sign_in_at", precision: nil
t.datetime "last_sign_in_at", precision: nil
t.inet "current_sign_in_ip"
t.inet "last_sign_in_ip"
t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.datetime "confirmed_at", precision: nil
t.datetime "confirmation_sent_at", precision: nil
t.string "unconfirmed_email"
t.text "address"
t.datetime "deactivated_at"
t.datetime "deactivated_at", precision: nil
t.boolean "committee", default: false, null: false
t.json "mailing_lists", default: {}, null: false
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
"@tailwindcss/postcss": "^4.0.0",
"jquery": "^3.7.1",
"sass": "^1.83.0",
"signature_pad": "^3.0.0-beta.4",
"tailwindcss": "^2.2.7",
"signature_pad": "^5.0.4",
"tailwindcss": "^3.4.17",
"vite-plugin-rails": "^0.5.0"
},
"devDependencies": {
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"postcss": "^8.5.1",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-preset-env": "^6.7.0",
"vite": "^6.0.0",
"vite": "^6.0.11",
"vite-plugin-ruby": "^5.1.0"
},
"engines": {
Expand Down
Loading

0 comments on commit 35fdd54

Please sign in to comment.