symphonia 4.0.1 → 4.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2322f8cb18f3e42a829515f52bdc92a2482526b0da5b53c0718306ecc5337193
4
- data.tar.gz: be02650248988af53b2b65742d574117b980e18887ab24993aab73ec545154bf
3
+ metadata.gz: eec90ba27010e7ef24336cca4a4294f7bd697c533adc5e46fa0a6454bfab0dba
4
+ data.tar.gz: f833fbdeea1516e4c1093beb95494a49db1c4aecea3dfd0f2a382164420677a1
5
5
  SHA512:
6
- metadata.gz: 794e07fb7ff554fae811519e79d2c01d1221a23ab76283d600af8ac35e92a37e9dcbbc3ebae39e735fa74a1c43ea57d761d33056ebbd1a0a82ae6929ed44ff2e
7
- data.tar.gz: 10afddd10e24493ea09a9a26e9e66322101e6be643ef8074fc8712cd826cb1f026b28d230ab0dd2a512a7caafc0146aea3746fec1f5f20e395d24fb4ed8def93
6
+ metadata.gz: 6c15251d18a8b59efd80c8c6b6d6c9c5739b2e35eba9a441658a07f4459902f822fb8337f096b7f0961a7bd0354ac78b5c4822f210bd6ec7a2ddf55d4086927c
7
+ data.tar.gz: d49ee80bfb5db3c3e1c84000278f139e001a73d3da136a2bef1e75085b439dbdf6fb404ad51b04dd59154db9a41cc14da992ad19da3e800066396ffe64a799df
data/CHANGELOG.md CHANGED
@@ -5,11 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5
5
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6
6
 
7
7
  ## [Unreleased]
8
+ ## [4.1.0] - 2021-10-23
9
+ ### Fixed
10
+ - missing default settings template in generator:setup
8
11
  ### Added
9
12
  - rubocop-rails
10
13
  - rubocop-rspec
11
14
  ### Removed
12
15
  - mini_racer
16
+ ### Changed
17
+ - split SASS files
13
18
 
14
19
  ## [4.0.0] - 2021-05-18
15
20
  ### Removed
@@ -0,0 +1,29 @@
1
+ @import 'font-awesome';
2
+ /* Font awesome aliases */
3
+ .fa-add {
4
+ @extend .fa-plus-circle !optional;
5
+ }
6
+ .fa-delete, .fa-del {
7
+ @extend .fa-trash-o !optional;
8
+ }
9
+ .fa-back {
10
+ @extend .fa-chevron-left !optional;
11
+ }
12
+ .fa-true {
13
+ @extend .fa-check !optional;
14
+ }
15
+ .fa-false {
16
+ @extend .fa-times !optional;
17
+ }
18
+ .fa-notice {
19
+ @extend .fa-check-circle !optional;
20
+ }
21
+ .fa-error {
22
+ @extend .fa-times-circle !optional;
23
+ }
24
+ .alert .fa-info {
25
+ @extend .fa-info-circle !optional;
26
+ }
27
+ [class^="fa-"]:before:hover, a[class*=" fa-"]:before:hover {
28
+ text-decoration: none
29
+ }
@@ -0,0 +1,40 @@
1
+ @import "bootstrap";
2
+
3
+ // fixed navbar
4
+ body > .container {
5
+ padding-top: 80px;
6
+ }
7
+
8
+ @media print {
9
+ body > .container {
10
+ padding-top: 0 !important;
11
+ }
12
+ }
13
+
14
+ footer.footer {
15
+ height: 40px;
16
+ line-height: 40px;
17
+ bottom: 0;
18
+ width: 100%;
19
+ }
20
+
21
+ @keyframes highlight {
22
+ from {
23
+ background-color: map-get($theme-colors, warning);
24
+ }
25
+ to {
26
+ background-color: inherit;
27
+ }
28
+ }
29
+
30
+ @media print {
31
+ .contextual {
32
+ @extend .d-print-none;
33
+ }
34
+ a[href]:after {
35
+ content: none
36
+ }
37
+ .btn {
38
+ @extend .d-print-none;
39
+ }
40
+ }
@@ -1,37 +1,5 @@
1
- @import 'font-awesome';
2
- /* Font awesome aliases */
3
- .fa-add {
4
- //@extend .fa-plus-circle:before;
5
- @extend .fa-plus-circle !optional;
6
- }
7
- .fa-delete, .fa-del {
8
- @extend .fa-trash-o !optional;
9
- }
10
- .fa-back {
11
- @extend .fa-chevron-left !optional;
12
- }
13
- .fa-true {
14
- @extend .fa-check !optional;
15
- }
16
- .fa-false {
17
- @extend .fa-times !optional;
18
- }
1
+ @import "_font_awesome";
19
2
 
20
- .fa-notice {
21
- @extend .fa-check-circle !optional;
22
- }
23
- .fa-error {
24
- @extend .fa-times-circle !optional;
25
- }
26
- .alert .fa-info {
27
- @extend .fa-info-circle !optional;
28
- }
29
- [class^="fa-"]:before, [class*=" fa-"]:before {
30
- //padding-right: 5px;
31
- }
32
- [class^="fa-"]:before:hover, a[class*=" fa-"]:before:hover {
33
- text-decoration: none
34
- }
35
3
  .page-header.title, .page-header.title h1 {
36
4
  margin-top: 0;
37
5
  }
@@ -40,7 +8,6 @@
40
8
  }
41
9
  .reorder, .reorder label {
42
10
  cursor: move;
43
- cursor: -webkit-grabbing;
44
11
  }
45
12
 
46
13
  .flash {
@@ -217,4 +184,4 @@ table.table {
217
184
  .sortable-ghost {
218
185
  //border: 2px solid black;
219
186
  box-shadow: inset 0 0 5px #000000;
220
- }
187
+ }
@@ -1,47 +1,2 @@
1
- // require _bootstrap
2
- // *= require rails_bootstrap_forms
3
- // *= require bootstrap-datepicker3
4
- //@import "bootstrap-sprockets";
5
-
6
- @import "bootstrap";
1
+ @import "layout";
7
2
  @import "bootstrap-datepicker3";
8
-
9
-
10
- // fixed navbar
11
- body > .container {
12
- padding-top: 80px;
13
- }
14
-
15
- @media print {
16
- body > .container {
17
- padding-top: 0 !important;
18
- }
19
- }
20
-
21
- footer.footer {
22
- height: 40px;
23
- line-height: 40px;
24
- bottom: 0;
25
- width: 100%;
26
- }
27
-
28
- @keyframes highlight {
29
- from {
30
- background-color: map-get($theme-colors, warning);
31
- }
32
- to {
33
- background-color: inherit;
34
- }
35
- }
36
-
37
- @media print {
38
- .contextual {
39
- @extend .d-print-none;
40
- }
41
- a[href]:after {
42
- content: none
43
- }
44
- .btn {
45
- @extend .d-print-none;
46
- }
47
- }
@@ -5,9 +5,9 @@
5
5
  <title><%= html_title %></title>
6
6
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
7
  <%= yield :meta_tags %>
8
- <%= stylesheet_link_tag 'application', :media => 'all', 'data-turbolinks-track' => true %>
8
+ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': true %>
9
9
  <%= yield :stylesheet_tags %>
10
- <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
10
+ <%= javascript_include_tag 'application', 'data-turbolinks-track': true %>
11
11
  <script type="text/javascript">
12
12
  Symphonia.routes.reorderImagesPath = '<%= symphonia.reorder_attachment_path %>';
13
13
  </script>
@@ -6,7 +6,7 @@ module Symphonia
6
6
  source_root File.expand_path('templates', __dir__)
7
7
 
8
8
  def create_settings
9
- template 'config/initializers/settings.rb'
9
+ template 'config/initializers/symphonia.rb'
10
10
  end
11
11
 
12
12
  def copy_static
@@ -47,7 +47,7 @@ module Symphonia
47
47
 
48
48
  def setup_gemfile
49
49
  append_to_file 'Gemfile' do
50
- "gem 'symphonia-spec', source: 'https://gems.luk4s.cz', group: %w[development test]"
50
+ "gem 'symphonia_spec', source: 'https://gems.luk4s.cz', group: %w[development test]"
51
51
  end
52
52
 
53
53
  end
@@ -0,0 +1,48 @@
1
+ Symphonia.configure do |config|
2
+ config.after_login_path = ->(h) { h.symphonia.user_current_path }
3
+ config.allow_registrations = false
4
+ config.default_locale = :cs
5
+ end
6
+
7
+ # Symphonia::MenuManager.map :top_menu do |m|
8
+ # m[:home] = {
9
+ # label: :label_home,
10
+ # icon: 'fa fa-home',
11
+ # url: '/'
12
+ # }
13
+ # m[:users] = {
14
+ # label: :label_users,
15
+ # icon: 'fa fa-user',
16
+ # url: ->(h) { h.symphonia.users_path },
17
+ # if: proc { Symphonia::User.current.admin? }
18
+ # }
19
+ # m[:roles] = {
20
+ # label: :label_roles,
21
+ # icon: 'fa fa-key',
22
+ # url: ->(h) { h.symphonia.roles_path },
23
+ # if: proc { Symphonia::User.current.admin? }
24
+ # }
25
+ #
26
+ # end
27
+ # Symphonia::MenuManager.map :top_menu_account do |m|
28
+ # # -----
29
+ # m[:my_account] = {
30
+ # label: :label_my_account,
31
+ # icon: 'fa fa-wrench',
32
+ # url: ->(h) { h.symphonia.account_path },
33
+ # if: proc { Symphonia::User.current.logged_in? }
34
+ # }
35
+ # m[:logout] = {
36
+ # label: :button_logout,
37
+ # icon: 'fa fa-sign-out',
38
+ # url: ->(h) { h.symphonia.logout_path },
39
+ # method: 'delete',
40
+ # if: proc { Symphonia::User.current.logged_in? }
41
+ # }
42
+ # m[:login] = {
43
+ # label: :button_login,
44
+ # icon: 'fa fa-signin',
45
+ # url: ->(h) { h.symphonia.login_path },
46
+ # if: proc { !Symphonia::User.current.logged_in? }
47
+ # }
48
+ # end
@@ -3,13 +3,13 @@
3
3
  <head>
4
4
  <meta charset="UTF-8">
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
- <title>404 STránka nenalezena</title>
6
+ <title>404 Stránka nenalezena</title>
7
7
  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
8
8
  <link rel="stylesheet" href="//stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
9
9
  </head>
10
10
 
11
11
  <body>
12
- <!-- This file lives in public/500.html -->
12
+ <!-- This file lives in public/404.html -->
13
13
  <br />
14
14
  <div class="rows">
15
15
  <p class="col-sm-6 col-md-3">
@@ -21,17 +21,6 @@
21
21
  <p>
22
22
  Při zpracování požadavku došlo k vnitřní chybě serveru. Kontaktujte prosím administrátora.
23
23
  </p>
24
- <ul class="fa-ul">
25
- <li>
26
- <h3>Lukáš Pokorný</h3>
27
- </li>
28
- <li>
29
- <i class="fa fa-li fa-envelope"></i>e-mail: <a href="mailto:admin@lagrace.cz">admin@luk4s.cz</a>
30
- </li>
31
- <li>
32
- <i class="fa fa-li fa-mobile-phone"></i>tel: 604484983
33
- </li>
34
- </ul>
35
24
  </div>
36
25
  </div>
37
26
  </div>
@@ -9,17 +9,15 @@ module Symphonia
9
9
 
10
10
  def connect
11
11
  self.current_user = find_verified_user_or_guest
12
- logger.add_tags 'ActionCable', self.current_user.login unless self.current_user.nil?
12
+ logger.add_tags 'ActionCable', current_user.login unless current_user.nil?
13
13
  end
14
14
 
15
15
  protected
16
16
 
17
17
  def find_verified_user_or_guest
18
- if (credentials = request.session["symphonia/user_credentials"]).present?
19
- ::Symphonia::User.find_by_persistence_token(credentials.split(':')[0])
20
- else
21
- nil
22
- end
18
+ return if (credentials = request.session["symphonia/user_credentials"]).blank?
19
+
20
+ ::Symphonia::User.find_by(persistence_token: credentials.split(':')[0])
23
21
  end
24
22
  end
25
23
 
@@ -28,4 +26,4 @@ module Symphonia
28
26
 
29
27
  end
30
28
  end
31
- end
29
+ end
@@ -1,5 +1,5 @@
1
1
  module Symphonia
2
2
 
3
- VERSION = '4.0.1'
3
+ VERSION = '4.1.0'
4
4
 
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: symphonia
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lukas Pokorny
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-11 00:00:00.000000000 Z
11
+ date: 2021-10-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: api-pagination
@@ -319,6 +319,8 @@ files:
319
319
  - app/assets/javascripts/symphonia/filters.js
320
320
  - app/assets/javascripts/symphonia/symphonia_bootstrap_dialog.js
321
321
  - app/assets/javascripts/symphonia/symphonia_ckeditor.js
322
+ - app/assets/stylesheets/symphonia/_font_awesome.scss
323
+ - app/assets/stylesheets/symphonia/_layout.scss
322
324
  - app/assets/stylesheets/symphonia/application.css
323
325
  - app/assets/stylesheets/symphonia/basic.scss
324
326
  - app/assets/stylesheets/symphonia/filters.scss
@@ -421,6 +423,7 @@ files:
421
423
  - lib/generators/symphonia/setup/templates/app/assets/javascripts/application.js.tt
422
424
  - lib/generators/symphonia/setup/templates/app/config/initializers/settings.rb.tt
423
425
  - lib/generators/symphonia/setup/templates/base_layout.html.erb
426
+ - lib/generators/symphonia/setup/templates/config/initializers/symphonia.rb.tt
424
427
  - lib/generators/symphonia/setup/templates/design.scss
425
428
  - lib/generators/symphonia/setup/templates/public/404.html.tt
426
429
  - lib/generators/symphonia/setup/templates/public/500.html.tt