Skip to content

Commit

Permalink
Merge to master: Release 2.7.0.2 - Adds all the view components, with…
Browse files Browse the repository at this point in the history
… previews in the lookbook (#336)

* Merge pull request #234 from ontoportal-lirmm/feature/update-footer-design

Feature: Update footer design

* Merge pull request #249 from ontoportal-lirmm/feature/update-account-page-submited-onto

Feature: Update account page submitted ontologies

* Merge pull request #236 from ontoportal-lirmm/feature/lookbook

Feature: Add Lookbook to preview components

* Merge pull request #242 from ontoportal-lirmm/feature/lookbook

Feature: Add Lookbook to preview view components - fix the new version release

* Merge pull request #262 from ontoportal-lirmm/feature/add-rounded-button-component-to-lookbook

Feature: Add rounded button to lookbook

* Merge pull request #248 from ontoportal-lirmm/feature/add-notification-message-component

Feature: Add notification message component

* Merge pull request #268 from ontoportal-lirmm/feature/add-submission-fields-components

Feature: Add submission fields components

* Merge pull request #288 from ontoportal-lirmm/feature/add-upload-ontology-components-to-lookbook

Feature: Add form inputs components to lookbook

* Merge pull request #284 from ontoportal-lirmm/feature/update-nested-from-input-component-design

Feature: Update nested form input component design

* Merge pull request #282 from ontoportal-lirmm/feature/extract-search-input-component

Feature: Extract search input component

* Merge pull request #296 from ontoportal-lirmm/feature/re-organize-lookbook

Feature: Re organize lookbook previews

* Merge pull request #305 from ontoportal-lirmm/feature/add-table-component

Feature: Add table component & Migrate the views to use it

* Merge pull request #312 from ontoportal-lirmm/feature/extract-search-input-component

Feature: Extract search input component - follow up

* Merge pull request #313 from ontoportal-lirmm/fix/nested-from-component-empty-state

Fix: Nested form component empty state

* Merge pull request #301 from ontoportal-lirmm/feature/add-switch-input-preview

Feature: Add switch input preview

* Merge pull request #304 from ontoportal-lirmm/feature/add-link-text-components

Feature: Add link text components

* Merge pull request #310 from ontoportal-lirmm/feature/update-select-component

Feature: update select component

* Merge pull request #300 from ontoportal-lirmm/feature/add-modal-link-component

Feature: Add modal component preview and helpers

* Merge pull request #303 from ontoportal-lirmm/feature/add-pill-button

Feature: Add pill button

* Merge pull request #297 from ontoportal-lirmm/feature/add-tabs-component

Feature: Add tabs component

* Merge pull request #306 from ontoportal-lirmm/feature/add-circle-progress-bar-component

Feature: Add circle progress bar component (style, JS, code and preview)

* Merge pull request #247 from ontoportal-lirmm/feature/update-agroportal-primary-color

Feature: Update AgroPortal primary color

* Merge pull request #319 from ontoportal-lirmm/feature/extract-form-input-components

Feature: Extract form input components

* Merge pull request #324 from ontoportal-lirmm/feature/add-summary-page-components

Feature: Extract summary page components

* Merge pull request #314 from ontoportal-lirmm/add-buttons-components-to-lookbook

Feature: Add buttons components to lookbook

* Feature: Add progress pages component (#328)

* add progress pages component

* put again the type argument for button component

* fix progress pages item not center if test is long

* make progress pages container take full width by default

* Fix progress item position (first & last one) to be aligned with the content

* fix progress item checked state to show the icon and the good background

* make the progress page component preview width bigger

---------

Co-authored-by: Bilel Kihal <[email protected]>

* Merge pull request #259 from ontoportal-lirmm/feature/add-other-states-to-card-message-component

Feature: Add warning state to card message component

* Merge pull request #238 from ontoportal-lirmm/feature/update-nav-bar-design

Feature: Update nav bar design

* Merge pull request #331 from ontoportal-lirmm/feature/update-404-error-design

Feature: Update 404 error design

* Merge pull request #263 from ontoportal-lirmm/feature/update-nav-bar-design

Fix: replace nav_bar  css nav-link to top-nav-nav-link to prevent conflicts

---------

Co-authored-by: Bilel Kihal <[email protected]>
  • Loading branch information
syphax-bouazzouni and Bilelkihal committed Dec 5, 2023
1 parent 33ccfaf commit ba6ee8d
Show file tree
Hide file tree
Showing 402 changed files with 7,826 additions and 1,452 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ group :staging, :production, :appliance do
end

group :development do
# Capistrano Deployment
# Capistrano Deployment
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0', require: false # https://github.com/miloserdow/capistrano-deploy/issues/42
gem 'capistrano', '~> 3.11', require: false
gem 'capistrano-bundler', require: false
Expand All @@ -104,6 +104,7 @@ group :development do

# Use console on exceptions pages [https://github.com/rails/web-console]
gem 'web-console'
gem "lookbook", '~> 1.5.5'
end

group :test, :development do
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,8 @@ GEM
zeitwerk (2.6.12)

PLATFORMS
ruby
x86_64-darwin-21
x86_64-linux

DEPENDENCIES
Expand Down
3 changes: 3 additions & 0 deletions app/assets/images/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/arrow-right-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/check-outlined.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/danger.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions app/assets/images/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ba6ee8d

Please sign in to comment.