Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refac & feat: now there is only one item details view instead of two, also design adjusted #264

Closed
wants to merge 5 commits into from
Closed

refac & feat: now there is only one item details view instead of two, also design adjusted #264

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d155cf4
refac & feat: now there is only one item details view instead of two,…
navetis Jan 14, 2023
335c3ea
refac: liniting and remove unecessary item_bottow_butttons component
navetis Jan 14, 2023
f4901d8
update gemfile.lock
navetis Jan 14, 2023
4326906
Fix: Only show edit, delete and QR download buttons when rights exist
codingWhale13 Jan 16, 2023
bdd23e8
Revert: Undo updates to Gemfile.lock
codingWhale13 Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem "font-awesome-sass", "~> 6.2.1"

ruby "2.7.4"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
Expand Down
116 changes: 59 additions & 57 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ GEM
bcrypt (3.1.18)
bindata (2.4.14)
bindex (0.8.1)
bootsnap (1.13.0)
bootsnap (1.15.0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it necessary to update all these gems? It seems to me (and I could well be wrong :P) that this risks breaking things somewhere in the project.

Are there any new gems introduced?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've taken the liberty of undoing the effects of the bundle update command you probably executed. This way, checks pass again.

msgpack (~> 1.2)
bootstrap (5.2.2)
bootstrap (5.2.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.6, < 3)
sassc-rails (>= 2.0.0)
Expand All @@ -104,27 +104,27 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
childprocess (4.1.0)
chunky_png (1.4.0)
concurrent-ruby (1.1.10)
crass (1.0.6)
debug (1.6.3)
irb (>= 1.3.6)
date (3.3.3)
debug (1.7.1)
irb (>= 1.5.0)
reline (>= 0.3.1)
devise-bootstrap-views (1.1.0)
devise-i18n (1.10.2)
devise (>= 4.8.0)
devise-i18n-bootstrap (0.3.0.beta)
diff-lcs (1.5.0)
docile (1.4.0)
erubi (1.11.0)
erubi (1.12.0)
execjs (2.8.1)
factory_bot (6.2.1)
activesupport (>= 5.0.0)
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (2.7.1)
faraday (2.7.2)
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-follow_redirects (0.3.0)
Expand All @@ -133,6 +133,8 @@ GEM
ffi (1.15.5)
flag-icons-rails (3.4.6.1)
sass-rails
font-awesome-sass (6.2.1)
sassc (~> 2.0)
globalid (1.0.0)
activesupport (>= 5.0)
hashie (5.0.0)
Expand All @@ -142,8 +144,8 @@ GEM
importmap-rails (1.1.5)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.5.11)
irb (1.4.2)
io-console (0.6.0)
irb (1.6.2)
reline (>= 0.3.0)
jbuilder (2.11.5)
actionview (>= 5.0.0)
Expand All @@ -152,38 +154,40 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.6.2)
json (2.6.3)
json-jwt (1.16.1)
activesupport (>= 4.2)
aes_key_wrap
bindata
faraday (~> 2.0)
faraday-follow_redirects
loofah (2.19.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mail (2.8.0.1)
mini_mime (>= 0.1.1)
net-imap
net-pop
net-smtp
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.3)
minitest (5.17.0)
msgpack (1.6.0)
net-http (0.3.0)
net-http (0.3.2)
uri
net-imap (0.3.1)
net-imap (0.3.4)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.1.3)
net-protocol (0.2.1)
timeout
net-smtp (0.3.3)
net-protocol
nio4r (2.5.8)
nokogiri (1.13.9)
mini_portile2 (~> 2.8.0)
nokogiri (1.14.0-x86_64-linux)
racc (~> 1.4)
omniauth (2.1.0)
hashie (>= 3.4.6)
Expand All @@ -192,8 +196,7 @@ GEM
omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2)
omniauth (~> 2.0)
omniauth_openid_connect (0.4.0)
addressable (~> 2.5)
omniauth_openid_connect (0.5.0)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.1)
openid_connect (1.4.2)
Expand All @@ -209,29 +212,29 @@ GEM
webfinger (~> 1.2)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.2.1)
parser (3.2.0.0)
ast (~> 2.4.1)
pdf-core (0.9.0)
pg (1.4.4)
pg (1.4.5)
popper_js (2.11.6)
prawn (2.4.0)
pdf-core (~> 0.9.0)
ttfunk (~> 1.7)
prawn-qrcode (0.5.2)
prawn (>= 1)
rqrcode (>= 1.0.0)
public_suffix (5.0.0)
public_suffix (5.0.1)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.4)
racc (1.6.2)
rack (2.2.5)
rack-oauth2 (1.21.3)
activesupport
attr_required
httpclient
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (3.0.3)
rack-protection (3.0.5)
rack
rack-test (2.0.2)
rack (>= 1.3)
Expand All @@ -252,8 +255,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
rails-html-sanitizer (1.4.4)
loofah (~> 2.19, >= 2.19.1)
rails-i18n (7.0.6)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
Expand All @@ -270,8 +273,8 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
regexp_parser (2.6.0)
reline (0.3.1)
regexp_parser (2.6.1)
reline (0.3.2)
io-console (~> 0.5)
responders (3.0.1)
actionpack (>= 5.0)
Expand All @@ -283,12 +286,12 @@ GEM
rqrcode_core (1.2.0)
rspec-core (3.12.0)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.0)
rspec-expectations (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-github (2.4.0)
rspec-core (~> 3.0)
rspec-mocks (3.12.0)
rspec-mocks (3.12.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.1)
Expand All @@ -300,26 +303,26 @@ GEM
rspec-mocks (~> 3.11)
rspec-support (~> 3.11)
rspec-support (3.12.0)
rubocop (1.38.0)
rubocop (1.43.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.2.1)
parser (>= 3.2.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.23.0, < 2.0)
rubocop-ast (>= 1.24.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.23.0)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.24.1)
parser (>= 3.1.1.0)
rubocop-performance (1.15.0)
rubocop-performance (1.15.2)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.17.2)
rubocop-rails (2.17.4)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-rspec (2.15.0)
rubocop-rspec (2.17.0)
rubocop (~> 1.33)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
Expand All @@ -334,54 +337,52 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.6.1)
childprocess (>= 0.5, < 5.0)
selenium-webdriver (4.7.1)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
shoulda-matchers (5.2.0)
shoulda-matchers (5.3.0)
activesupport (>= 5.2.0)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
sprockets (4.1.1)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
rack (>= 2.2.4, < 4)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.5.3)
mini_portile2 (~> 2.8.0)
stimulus-rails (1.1.1)
sqlite3 (1.6.0-x86_64-linux)
stimulus-rails (1.2.1)
railties (>= 6.0.0)
swd (1.3.0)
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
thor (1.2.1)
tilt (2.0.11)
timeout (0.3.0)
timeout (0.3.1)
ttfunk (1.7.0)
turbo-rails (1.3.2)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.3.0)
uri (0.10.0)
unicode-display_width (2.4.2)
uri (0.12.0)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (1.0.15)
activemodel (>= 3.0.0)
public_suffix
view_component (2.78.0)
activesupport (>= 5.0.0, < 8.0)
view_component (2.82.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
warden (1.2.9)
Expand All @@ -407,7 +408,7 @@ GEM
zeitwerk (2.6.6)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
bootsnap
Expand All @@ -420,6 +421,7 @@ DEPENDENCIES
devise-i18n-bootstrap
factory_bot_rails
flag-icons-rails
font-awesome-sass (~> 6.2.1)
importmap-rails
jbuilder
jquery-rails
Expand Down Expand Up @@ -456,4 +458,4 @@ RUBY VERSION
ruby 2.7.4p191

BUNDLED WITH
2.1.4
2.3.24
6 changes: 4 additions & 2 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $warning: $hpi-orange;
$danger: $hpi-red;
$light: #BDBDBD;
$dark: black;
$lightGrey: rgb(211, 211, 211);
$lightGrey: #eee;

$btn-border-radius: 5px;
$btn-font-weight: 600; // semibold
Expand All @@ -52,6 +52,8 @@ $mobileDeviceCutoff: 992px;

@import "flag-icon";

@import "font-awesome";

@media (max-width: $mobileDeviceCutoff) {
.navbar-collapse {
position: fixed;
Expand Down Expand Up @@ -111,4 +113,4 @@ footer {
#navbarToggle {
width: auto;
padding-right: 30px;
}
}
Loading