Skip to content

Commit

Permalink
Merge branch 'hotwire' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
spohlenz committed Jul 3, 2024
2 parents 64cc013 + 7540610 commit 9833b19
Show file tree
Hide file tree
Showing 425 changed files with 8,076 additions and 14,021 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
ruby: '2.7'
- gemfile: rails-7.0
ruby: '3.0'
- gemfile: rails-7.1
ruby: '3.2'
- gemfile: rails-7.0-propshaft
ruby: '3.0'
- gemfile: rails-7.1
ruby: '3.3'
- gemfile: rails-7.2
ruby: '3.2'
- gemfile: rails-7.1-propshaft
ruby: '3.3'
- gemfile: rails-7.2
ruby: '3.3'
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@
/spec/dummy/config/master.key
/spec/dummy/public/assets/
/node_modules
/i18n/locale/*.json
*.sqlite3-shm
*.sqlite3-wal
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
source 'https://rubygems.org'

group :development, :test do
gem 'sprockets-rails'
# gem 'propshaft'
end

group :development do
gem 'bcrypt'
gem 'faker'
Expand All @@ -20,7 +25,6 @@ group :test do
end

gem 'haml'
gem 'sassc-rails'
gem 'sqlite3', '~> 1.4'

# Specify your gem's dependencies in trestle.gemspec
Expand Down
23 changes: 23 additions & 0 deletions app/assets/bundle/trestle/admin.css

Large diffs are not rendered by default.

83 changes: 83 additions & 0 deletions app/assets/bundle/trestle/admin.js

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions app/assets/bundle/trestle/bundle.css

This file was deleted.

89 changes: 0 additions & 89 deletions app/assets/bundle/trestle/bundle.js

This file was deleted.

Binary file removed app/assets/bundle/trestle/fa-brands-400.eot
Binary file not shown.
3,717 changes: 0 additions & 3,717 deletions app/assets/bundle/trestle/fa-brands-400.svg

This file was deleted.

Binary file modified app/assets/bundle/trestle/fa-brands-400.ttf
Binary file not shown.
Binary file removed app/assets/bundle/trestle/fa-brands-400.woff
Binary file not shown.
Binary file modified app/assets/bundle/trestle/fa-brands-400.woff2
Binary file not shown.
Binary file removed app/assets/bundle/trestle/fa-regular-400.eot
Binary file not shown.
801 changes: 0 additions & 801 deletions app/assets/bundle/trestle/fa-regular-400.svg

This file was deleted.

Binary file modified app/assets/bundle/trestle/fa-regular-400.ttf
Binary file not shown.
Binary file removed app/assets/bundle/trestle/fa-regular-400.woff
Binary file not shown.
Binary file modified app/assets/bundle/trestle/fa-regular-400.woff2
Binary file not shown.
Binary file removed app/assets/bundle/trestle/fa-solid-900.eot
Binary file not shown.
5,034 changes: 0 additions & 5,034 deletions app/assets/bundle/trestle/fa-solid-900.svg

This file was deleted.

Binary file modified app/assets/bundle/trestle/fa-solid-900.ttf
Binary file not shown.
Binary file removed app/assets/bundle/trestle/fa-solid-900.woff
Binary file not shown.
Binary file modified app/assets/bundle/trestle/fa-solid-900.woff2
Binary file not shown.
110 changes: 110 additions & 0 deletions app/assets/bundle/trestle/locale/cs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
Trestle.i18n.store({
"cs": {
"admin": {
"breadcrumbs": {
"home": "Úvod"
},
"buttons": {
"delete": "Smazat",
"new": "Přidat",
"ok": "OK",
"save": "Uložit"
},
"datepicker": {
"formats": {
"date": "d/m/Y",
"datetime": "d/m/Y H:i",
"time": "H:i"
}
},
"flash": {
"create": {
"failure": {
"message": "Prosím opravte chyby zvýrazněné níže.",
"title": "Nastala chyba!"
},
"success": {
"message": "Položka byla vytvořena.",
"title": "Akce úspěšně dokončena!"
}
},
"destroy": {
"failure": {
"message": "Položku nebylo možné smazat.",
"title": "Nastala chyba!"
},
"success": {
"message": "Položka byla smazána.",
"title": "Akce úspěšně dokončena!"
}
},
"update": {
"failure": {
"message": "Prosím opravte chyby zvýrazněné níže.",
"title": "Nastala chyba!"
},
"success": {
"message": "Položka byla aktualizováná.",
"title": "Akce úspěšně dokončena!"
}
}
},
"form": {
"select": {
"prompt": "- Prosím vyberte -"
}
},
"format": {
"blank": "-"
},
"table": {
"headers": {
"id": "ID"
}
},
"titles": {
"edit": "Upravit položku",
"index": "Přehled",
"new": "Nová položka"
}
},
"trestle": {
"confirmation": {
"cancel": "Nemazat",
"delete": "Ano",
"title": "Jste si jisti?"
},
"dialog": {
"error": "Požadavek nemohl být dokončen."
},
"footer": "Poháněno systémem Trestle",
"helpers": {
"page_entries_info": {
"more_pages": {
"display_entries": "Zobrazeny položky <strong>%{first}</strong> až <strong>%{last}</strong> z celkem <b>%{total}</b>"
},
"one_page": {
"display_entries": {
"few": "Zobrazeny <strong>%{count}</strong> položky",
"one": "Zobrazena <strong>1</strong> položka",
"other": "Zobrazeno <strong>%{count}</strong> položek",
"zero": "Nezobrazeny žádné položky"
}
}
}
},
"onboarding": {
"no_admins": "Začněte přidáním souboru do <code>app/admin</code>.",
"no_form": "Pro přidání formuláře nadefinujte form blok, nebo vytvořte soubor <code>_form.html</code>.",
"no_template": "Pro přizpůsobení šablony vytvořte <code>%{path}</code>.",
"welcome": "Vítejte v administraci Trestle"
},
"title": "Administrace Trestle",
"ui": {
"toggle_navigation": "Přepnout navigaci",
"toggle_sidebar": "Přepnout boční panel"
},
"version": "Verze"
}
}
});
116 changes: 116 additions & 0 deletions app/assets/bundle/trestle/locale/de.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
Trestle.i18n.store({
"de": {
"admin": {
"breadcrumbs": {
"home": "Home"
},
"buttons": {
"delete": "Löschen",
"edit": "Bearbeiten",
"new": "Neu",
"ok": "OK",
"save": "Speichern",
"show": "Details"
},
"datepicker": {
"formats": {
"date": "d.m.Y",
"datetime": "d.m.Y H:i",
"time": "H:i"
}
},
"flash": {
"create": {
"failure": {
"message": "Bitte korrigieren Sie die unten angezeigten Fehler.",
"title": "Warnung: %{model_name} nicht erstellt"
},
"success": {
"message": "%{model_name} wurde erfolgreich erstellt.",
"title": "Erfolgreich erstellt"
}
},
"destroy": {
"failure": {
"message": "%{model_name} konnte nicht gelöscht werden.",
"title": "Warnung: Nicht gelöscht"
},
"success": {
"message": "%{model_name} wurde erfolgreich gelöscht.",
"title": "Erfolgreich gelöscht"
}
},
"update": {
"failure": {
"message": "Bitte korrigieren Sie die unten angezeigten Fehler.",
"title": "Warnung: %{model_name} nicht gespeichert"
},
"success": {
"message": "%{model_name} wurde erfolgreich gespeichert.",
"title": "Erfolgreich bearbeitet"
}
}
},
"form": {
"select": {
"prompt": "- %{attribute_name} auswählen -"
}
},
"format": {
"blank": "n. a."
},
"table": {
"headers": {
"id": "ID"
}
},
"titles": {
"edit": "%{model_name} (bearbeiten)",
"index": "Liste von %{pluralized_model_name}",
"new": "%{model_name} (neu)"
}
},
"trestle": {
"confirmation": {
"cancel": "Abbrechen",
"delete": "Löschen",
"title": "Sind Sie sicher?"
},
"dialog": {
"error": "Fehler: Die Aktion konnte nicht erfolgreich ausgeführt werden."
},
"file": {
"browse": "Durchsuchen",
"choose_file": "Datei wählen..."
},
"footer": "Powered by Trestle",
"helpers": {
"page_entries_info": {
"more_pages": {
"display_entries": "%{entry_name} <strong>%{first}&nbsp;-&nbsp;%{last}</strong> von <b>%{total}</b>"
},
"one_page": {
"display_entries": {
"one": "<strong>1</strong> %{entry_name}",
"other": "<strong>%{count}</strong> %{entry_name}",
"zero": "Kein %{entry_name} vorhanden"
}
}
}
},
"onboarding": {
"no_admins": "Um zu beginnen, erstelle eine Trestle.resource in <code>app/admin</code>.",
"no_form": "Definiere einen form block oder erstelle ein Partial <code>_form.html</code>.",
"no_template": "Um dieses Tempalte anzupassen, erstelle <code>%{path}</code>.",
"welcome": "Willkommen bei Trestle"
},
"title": "Trestle Admin",
"ui": {
"toggle_dropdown": "Menü ein-/ausblenden",
"toggle_navigation": "Navigation ein-/ausblenden",
"toggle_sidebar": "Seitenleiste ein-/ausblenden"
},
"version": "Version"
}
}
});
Loading

0 comments on commit 9833b19

Please sign in to comment.