Skip to content

Commit 69587b4

Browse files
Merge branch 'master' into add_core_component_tests
2 parents 4be51db + d5dba9f commit 69587b4

28 files changed

+3501
-126
lines changed

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
vendor/* linguist-vendored
2+
3+
docs/* linguist-documentation
4+
coverage/* linguist-documentation

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ matestack can progressively replace the classic Rails-View-Layer. You are able t
1919
it alongside your classic views and incrementally turn your Rails-App into a
2020
dynamic Web-App.
2121

22+
### Installation:
23+
24+
Click here to see how you can add Matestack UI to your existing Rails application: [Installation Guide](./docs/install)
25+
2226
### Features:
2327

2428
#### Define your UI in a Ruby Class
@@ -53,10 +57,10 @@ class Apps::MyApp < App::Cell::App
5357
end
5458
nav do
5559
transition path: :my_first_page_path do
56-
button "Page 1"
60+
button text: "Page 1"
5761
end
5862
transition path: :my_second_page_path do
59-
button "Page 2"
63+
button text: "Page 2"
6064
end
6165
end
6266
main do
@@ -210,6 +214,7 @@ Changelog can be found [here](./CHANGELOG.md)
210214
### Roadmap
211215

212216
Scheduled for 0.7.0:
217+
- Better naming conventions
213218
- Webpacker/Yarn Integration
214219
- Advanced Websockets Integration
215220
- 1:n Relations in Form components
@@ -218,7 +223,6 @@ Scheduled for 0.7.0:
218223
- Rails View Integration
219224
- Dockerized Core Development
220225

221-
222226
### Community
223227

224228
As a low-barrier feedback channel for our early users, we have set up a Gitter chat that can be found [here](https://gitter.im/basemate/community). You are very welcome to ask questions and send us feedback there!

app/concepts/action/view/action.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
%a{"@click.prevent": "perform", "href": action_path}
1+
%a{@tag_attributes, "@click.prevent": "perform", "href": action_path}
22
- if block_given?
33
= yield

app/concepts/hr/cell/hr.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Hr::Cell
2+
class Hr < Component::Cell::Static
3+
4+
end
5+
end

app/concepts/hr/view/hr.haml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
%hr{@tag_attributes}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Paragraph::Cell
2+
class Paragraph < Component::Cell::Static
3+
4+
end
5+
end
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
- if options[:text].nil?
2+
%p{@tag_attributes}
3+
- if block_given?
4+
= yield
5+
6+
- else
7+
%p{@tag_attributes}
8+
= options[:text]

docs/components/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ You can build your [own components](../extend/custom_components.md) as well, eit
1212
- [nav](./nav,md)
1313
- [section](./section.md)
1414
- [br](./br.md)
15+
- [hr](./hr.md)
1516
- [heading](./heading.md)
1617
- [plain](./plain.md)
1718
- [pg](./pg.md)

0 commit comments

Comments
 (0)