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

Jump to bottom

Fix: Allow custom types (fixes #103) #104

Merged
merged 17 commits into from
Jun 14, 2023
Merged

Fix: Allow custom types (fixes #103) #104

merged 17 commits into from
Jun 14, 2023

Conversation

swashbuck
Copy link
Contributor

@swashbuck swashbuck commented Apr 21, 2023 •
edited
Loading

Fixes #103

Fix

  • Adds the ability for custom types
  • When using more than the default 4 types, a class of has-extra-types is added
  • Schema updates

Testing

  1. Add custom categories according to example.json
  2. Open the Resources drawer and behold the custom type buttons

Potential additional enhancements

Suggested changes to the Vanilla theme (will require a new ticket / PR):

  1. Reduce font size and padding when using extra custom types.
.resources__filter.has-extra-types {
  .resources__filter-btn {
    font-size: 0.75rem;
    padding: (@item-padding / 2) (@item-padding / 2);
  }
}
  1. Remove style that removes the border from the last item.

Screenshots

These screenshots show the maximum number of categories including the default ones.

With Vanilla changes to font size and padding:

@swashbuck swashbuck self-assigned this Apr 21, 2023
@swashbuck swashbuck marked this pull request as ready for review April 27, 2023 19:33
StuartNicholls
StuartNicholls approved these changes May 26, 2023
View reviewed changes
js/adapt-contrib-resources.js Outdated Show resolved Hide resolved
js/adapt-contrib-resources.js Outdated Show resolved Hide resolved
@StuartNicholls StuartNicholls self-requested a review May 26, 2023 10:50
joe-replin
joe-replin approved these changes May 26, 2023
View reviewed changes
Copy link
Contributor

@joe-replin joe-replin left a comment

Choose a reason for hiding this comment

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

👀

@swashbuck swashbuck changed the title Fix: Allow custom categories (fixes #103) Fix: Allow custom types (fixes #103) Jun 7, 2023
oliverfoster
oliverfoster approved these changes Jun 12, 2023
View reviewed changes
Copy link
Member

@oliverfoster oliverfoster left a comment

Choose a reason for hiding this comment

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

Works beautifully, pending code simplification changes.

swashbuck and others added 2 commits June 14, 2023 10:19
@swashbuck @oliverfoster
Simplify setupTypes()
7714987 
Co-authored-by: Oliver Foster <oliver.foster@kineo.com>
@swashbuck
Fix missing space
abf637b
@swashbuck
Copy link
Contributor Author

Works beautifully, pending code simplification changes.

Thanks, @oliverfoster . I've committed your changes.

@oliverfoster oliverfoster merged commit bfaef6e into master Jun 14, 2023
@oliverfoster oliverfoster deleted the issue/103 branch June 14, 2023 17:40
github-actions bot pushed a commit that referenced this pull request Jun 14, 2023
@semantic-release-bot
Chore(release): 5.4.1 [skip ci]
638efa4 
## [5.4.1](v5.4.0...v5.4.1) (2023-06-14)

### Fix

* Allow custom types (fixes #103) (#104) ([bfaef6e](bfaef6e)), closes [#103](#103) [#104](#104)
@github-actions
Copy link

🎉 This PR is included in version 5.4.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

github-actions bot pushed a commit to redwoodperforms/adapt-contrib-resources that referenced this pull request Jul 10, 2023
@semantic-release-bot
Chore(release): 5.1.0 [skip ci]
94b40be 
# [5.1.0](v5.0.0...v5.1.0) (2023-07-10)

### Fix

* _globals schema nesting (adaptlearning#102) ([6343b0d](6343b0d)), closes [adaptlearning#102](https://github.com/redwoodperforms/adapt-contrib-resources/issues/102)
* Add custom types to readme, change 'category' references to 'type' for consistency (fixes adaptlearning#108) ([bbf57a8](bbf57a8)), closes [adaptlearning#108](https://github.com/redwoodperforms/adapt-contrib-resources/issues/108)
* Added gitignore for release automation (adaptlearning#81) ([7c6694c](7c6694c)), closes [adaptlearning#81](https://github.com/redwoodperforms/adapt-contrib-resources/issues/81)
* Added release automation (adaptlearning#80) ([e9b6923](e9b6923)), closes [adaptlearning#80](https://github.com/redwoodperforms/adapt-contrib-resources/issues/80)
* Allow custom types (fixes adaptlearning#103) (adaptlearning#104) ([bfaef6e](bfaef6e)), closes [adaptlearning#103](https://github.com/redwoodperforms/adapt-contrib-resources/issues/103) [adaptlearning#104](https://github.com/redwoodperforms/adapt-contrib-resources/issues/104)
* Bump http-cache-semantics from 4.1.0 to 4.1.1 (adaptlearning#95) ([5ae1de4](5ae1de4)), closes [adaptlearning#95](https://github.com/redwoodperforms/adapt-contrib-resources/issues/95)
* Convert template to JSX (fixes adaptlearning#89) (adaptlearning#90) ([e4e426e](e4e426e)), closes [adaptlearning#89](https://github.com/redwoodperforms/adapt-contrib-resources/issues/89) [adaptlearning#90](https://github.com/redwoodperforms/adapt-contrib-resources/issues/90)
* Header template does not work (fixes adaptlearning#99) (adaptlearning#100) ([55fae85](55fae85)), closes [adaptlearning#99](https://github.com/redwoodperforms/adapt-contrib-resources/issues/99) [adaptlearning#100](https://github.com/redwoodperforms/adapt-contrib-resources/issues/100)
* Labels for resources items are unnecessarily verbose ([6b51bbc](6b51bbc))
* Remove required title from contentobject schema (adaptlearning#98) ([6e27c74](6e27c74)), closes [adaptlearning#98](https://github.com/redwoodperforms/adapt-contrib-resources/issues/98)
* Remove unnecessary 'this' from currentTarget, remove component__inner class (fixes adaptlearning#91) ([835befc](835befc)), closes [adaptlearning#91](https://github.com/redwoodperforms/adapt-contrib-resources/issues/91)
* Semantic release action package versions ([e7d02d4](e7d02d4))
* Typo in template ([d90bd43](d90bd43))
* Update schema $anchor to reference resources (fixes adaptlearning#87) ([930034f](930034f)), closes [adaptlearning#87](https://github.com/redwoodperforms/adapt-contrib-resources/issues/87)
* Version numbers removed from Readme files ([292dd99](292dd99))

### New

* Add click event trigger (solves: adaptlearning#106) (adaptlearning#107) ([0d27f68](0d27f68)), closes [adaptlearning#106](https://github.com/redwoodperforms/adapt-contrib-resources/issues/106) [adaptlearning#107](https://github.com/redwoodperforms/adapt-contrib-resources/issues/107)
* Added contentObject specific resources (fixes adaptlearning#84) (adaptlearning#85) ([4df42fd](4df42fd)), closes [adaptlearning#84](https://github.com/redwoodperforms/adapt-contrib-resources/issues/84) [adaptlearning#85](https://github.com/redwoodperforms/adapt-contrib-resources/issues/85)
* Issue and pr project addition automation (refs adaptlearning/adapt_framework#3315) (adaptlearning#79) ([3657367](3657367)), closes [adaptlearning#79](https://github.com/redwoodperforms/adapt-contrib-resources/issues/79)

### Update

* Add missing aria attribution for tabs (adaptlearning#78) ([f3e3e1b](f3e3e1b)), closes [adaptlearning#78](https://github.com/redwoodperforms/adapt-contrib-resources/issues/78)

### Upgrade

* Bump yaml and semantic-release (adaptlearning#105) ([28b3873](28b3873)), closes [adaptlearning#105](https://github.com/redwoodperforms/adapt-contrib-resources/issues/105)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StuartNicholls StuartNicholls StuartNicholls approved these changes

@joe-replin joe-replin joe-replin approved these changes

@oliverfoster oliverfoster oliverfoster approved these changes

@guywillis guywillis Awaiting requested review from guywillis

@cahirodoherty-learningpool cahirodoherty-learningpool Awaiting requested review from cahirodoherty-learningpool

@eleanor-heath eleanor-heath Awaiting requested review from eleanor-heath

Assignees

@swashbuck swashbuck

Labels
enhancement released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Allow custom categories
4 participants
@swashbuck @StuartNicholls @joe-replin @oliverfoster