did about and start on forms (index)
This commit is contained in:
parent
a99b33d236
commit
4c4b660d58
1
Gemfile
1
Gemfile
@ -33,6 +33,7 @@ group :development do
|
|||||||
# Use console on exceptions pages [https://github.com/rails/web-console]
|
# Use console on exceptions pages [https://github.com/rails/web-console]
|
||||||
gem "web-console"
|
gem "web-console"
|
||||||
gem "puma", "~> 5.0"
|
gem "puma", "~> 5.0"
|
||||||
|
gem 'guard-rspec', require: false
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
53
Gemfile.lock
53
Gemfile.lock
@ -1,11 +1,11 @@
|
|||||||
GIT
|
PATH
|
||||||
remote: https://github.com/HubFeenixMakers/merged
|
remote: ../merged
|
||||||
revision: c83558f8d59a30db8516b75549c0a623e804332b
|
|
||||||
specs:
|
specs:
|
||||||
merged (0.1.0)
|
merged (0.1.0)
|
||||||
git
|
git
|
||||||
haml-rails
|
haml-rails
|
||||||
rails (>= 7.0.4)
|
rails (>= 7.0.4)
|
||||||
|
redcarpet
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
@ -91,18 +91,35 @@ GEM
|
|||||||
regexp_parser (>= 1.5, < 3.0)
|
regexp_parser (>= 1.5, < 3.0)
|
||||||
xpath (~> 3.2)
|
xpath (~> 3.2)
|
||||||
childprocess (4.1.0)
|
childprocess (4.1.0)
|
||||||
|
coderay (1.1.3)
|
||||||
concurrent-ruby (1.1.10)
|
concurrent-ruby (1.1.10)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
debug (1.6.3)
|
debug (1.6.3)
|
||||||
irb (>= 1.3.6)
|
irb (>= 1.3.6)
|
||||||
reline (>= 0.3.1)
|
reline (>= 0.3.1)
|
||||||
|
diff-lcs (1.5.0)
|
||||||
erubi (1.11.0)
|
erubi (1.11.0)
|
||||||
ffi (1.15.5)
|
ffi (1.15.5)
|
||||||
|
formatador (1.1.0)
|
||||||
git (1.12.0)
|
git (1.12.0)
|
||||||
addressable (~> 2.8)
|
addressable (~> 2.8)
|
||||||
rchardet (~> 1.8)
|
rchardet (~> 1.8)
|
||||||
globalid (1.0.0)
|
globalid (1.0.0)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
|
guard (2.18.0)
|
||||||
|
formatador (>= 0.2.4)
|
||||||
|
listen (>= 2.7, < 4.0)
|
||||||
|
lumberjack (>= 1.0.12, < 2.0)
|
||||||
|
nenv (~> 0.1)
|
||||||
|
notiffany (~> 0.0)
|
||||||
|
pry (>= 0.13.0)
|
||||||
|
shellany (~> 0.0)
|
||||||
|
thor (>= 0.18.1)
|
||||||
|
guard-compat (1.2.1)
|
||||||
|
guard-rspec (4.7.3)
|
||||||
|
guard (~> 2.1)
|
||||||
|
guard-compat (~> 1.1)
|
||||||
|
rspec (>= 2.99.0, < 4.0)
|
||||||
haml (6.0.12)
|
haml (6.0.12)
|
||||||
temple (>= 0.8.2)
|
temple (>= 0.8.2)
|
||||||
thor
|
thor
|
||||||
@ -120,9 +137,13 @@ GEM
|
|||||||
io-console (0.5.11)
|
io-console (0.5.11)
|
||||||
irb (1.5.0)
|
irb (1.5.0)
|
||||||
reline (>= 0.3.0)
|
reline (>= 0.3.0)
|
||||||
|
listen (3.7.1)
|
||||||
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||||
|
rb-inotify (~> 0.9, >= 0.9.10)
|
||||||
loofah (2.19.0)
|
loofah (2.19.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
|
lumberjack (1.2.8)
|
||||||
mail (2.8.0)
|
mail (2.8.0)
|
||||||
mini_mime (>= 0.1.1)
|
mini_mime (>= 0.1.1)
|
||||||
net-imap
|
net-imap
|
||||||
@ -134,6 +155,7 @@ GEM
|
|||||||
mini_mime (1.1.2)
|
mini_mime (1.1.2)
|
||||||
minitest (5.16.3)
|
minitest (5.16.3)
|
||||||
msgpack (1.6.0)
|
msgpack (1.6.0)
|
||||||
|
nenv (0.3.0)
|
||||||
net-imap (0.3.1)
|
net-imap (0.3.1)
|
||||||
net-protocol
|
net-protocol
|
||||||
net-pop (0.1.2)
|
net-pop (0.1.2)
|
||||||
@ -145,10 +167,16 @@ GEM
|
|||||||
nio4r (2.5.8)
|
nio4r (2.5.8)
|
||||||
nokogiri (1.13.9-x86_64-linux)
|
nokogiri (1.13.9-x86_64-linux)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
|
notiffany (0.1.3)
|
||||||
|
nenv (~> 0.1)
|
||||||
|
shellany (~> 0.0)
|
||||||
passenger (6.0.15)
|
passenger (6.0.15)
|
||||||
rack
|
rack
|
||||||
rake (>= 0.8.1)
|
rake (>= 0.8.1)
|
||||||
pg (1.4.5)
|
pg (1.4.5)
|
||||||
|
pry (0.14.1)
|
||||||
|
coderay (~> 1.1)
|
||||||
|
method_source (~> 1.0)
|
||||||
public_suffix (5.0.1)
|
public_suffix (5.0.1)
|
||||||
puma (5.6.5)
|
puma (5.6.5)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
@ -183,11 +211,28 @@ GEM
|
|||||||
thor (~> 1.0)
|
thor (~> 1.0)
|
||||||
zeitwerk (~> 2.5)
|
zeitwerk (~> 2.5)
|
||||||
rake (13.0.6)
|
rake (13.0.6)
|
||||||
|
rb-fsevent (0.11.2)
|
||||||
|
rb-inotify (0.10.1)
|
||||||
|
ffi (~> 1.0)
|
||||||
rchardet (1.8.0)
|
rchardet (1.8.0)
|
||||||
|
redcarpet (3.5.1)
|
||||||
regexp_parser (2.6.1)
|
regexp_parser (2.6.1)
|
||||||
reline (0.3.1)
|
reline (0.3.1)
|
||||||
io-console (~> 0.5)
|
io-console (~> 0.5)
|
||||||
rexml (3.2.5)
|
rexml (3.2.5)
|
||||||
|
rspec (3.12.0)
|
||||||
|
rspec-core (~> 3.12.0)
|
||||||
|
rspec-expectations (~> 3.12.0)
|
||||||
|
rspec-mocks (~> 3.12.0)
|
||||||
|
rspec-core (3.12.0)
|
||||||
|
rspec-support (~> 3.12.0)
|
||||||
|
rspec-expectations (3.12.0)
|
||||||
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
|
rspec-support (~> 3.12.0)
|
||||||
|
rspec-mocks (3.12.0)
|
||||||
|
diff-lcs (>= 1.2.0, < 2.0)
|
||||||
|
rspec-support (~> 3.12.0)
|
||||||
|
rspec-support (3.12.0)
|
||||||
rubyzip (2.3.2)
|
rubyzip (2.3.2)
|
||||||
sassc (2.4.0)
|
sassc (2.4.0)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.9)
|
||||||
@ -202,6 +247,7 @@ GEM
|
|||||||
rexml (~> 3.2, >= 3.2.5)
|
rexml (~> 3.2, >= 3.2.5)
|
||||||
rubyzip (>= 1.2.2, < 3.0)
|
rubyzip (>= 1.2.2, < 3.0)
|
||||||
websocket (~> 1.0)
|
websocket (~> 1.0)
|
||||||
|
shellany (0.0.1)
|
||||||
sprockets (4.1.1)
|
sprockets (4.1.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
@ -241,6 +287,7 @@ DEPENDENCIES
|
|||||||
bootsnap
|
bootsnap
|
||||||
capybara
|
capybara
|
||||||
debug
|
debug
|
||||||
|
guard-rspec
|
||||||
haml-rails
|
haml-rails
|
||||||
importmap-rails
|
importmap-rails
|
||||||
merged!
|
merged!
|
||||||
|
70
Guardfile
Normal file
70
Guardfile
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
# A sample Guardfile
|
||||||
|
# More info at https://github.com/guard/guard#readme
|
||||||
|
|
||||||
|
## Uncomment and set this to only include directories you want to watch
|
||||||
|
# directories %w(app lib config test spec features) \
|
||||||
|
# .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
|
||||||
|
|
||||||
|
## Note: if you are using the `directories` clause above and you are not
|
||||||
|
## watching the project directory ('.'), then you will want to move
|
||||||
|
## the Guardfile to a watched dir and symlink it back, e.g.
|
||||||
|
#
|
||||||
|
# $ mkdir config
|
||||||
|
# $ mv Guardfile config/
|
||||||
|
# $ ln -s config/Guardfile .
|
||||||
|
#
|
||||||
|
# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
|
||||||
|
|
||||||
|
# Note: The cmd option is now required due to the increasing number of ways
|
||||||
|
# rspec may be run, below are examples of the most common uses.
|
||||||
|
# * bundler: 'bundle exec rspec'
|
||||||
|
# * bundler binstubs: 'bin/rspec'
|
||||||
|
# * spring: 'bin/rspec' (This will use spring if running and you have
|
||||||
|
# installed the spring binstubs per the docs)
|
||||||
|
# * zeus: 'zeus rspec' (requires the server to be started separately)
|
||||||
|
# * 'just' rspec: 'rspec'
|
||||||
|
|
||||||
|
guard :rspec, cmd: "bundle exec rspec" do
|
||||||
|
require "guard/rspec/dsl"
|
||||||
|
dsl = Guard::RSpec::Dsl.new(self)
|
||||||
|
|
||||||
|
# Feel free to open issues for suggestions and improvements
|
||||||
|
|
||||||
|
# RSpec files
|
||||||
|
rspec = dsl.rspec
|
||||||
|
watch(rspec.spec_helper) { rspec.spec_dir }
|
||||||
|
watch(rspec.spec_support) { rspec.spec_dir }
|
||||||
|
watch(rspec.spec_files)
|
||||||
|
|
||||||
|
# Ruby files
|
||||||
|
ruby = dsl.ruby
|
||||||
|
dsl.watch_spec_files_for(ruby.lib_files)
|
||||||
|
|
||||||
|
# Rails files
|
||||||
|
rails = dsl.rails(view_extensions: %w(erb haml slim))
|
||||||
|
dsl.watch_spec_files_for(rails.app_files)
|
||||||
|
dsl.watch_spec_files_for(rails.views)
|
||||||
|
|
||||||
|
watch(rails.controllers) do |m|
|
||||||
|
[
|
||||||
|
rspec.spec.call("routing/#{m[1]}_routing"),
|
||||||
|
rspec.spec.call("controllers/#{m[1]}_controller"),
|
||||||
|
rspec.spec.call("acceptance/#{m[1]}")
|
||||||
|
]
|
||||||
|
end
|
||||||
|
|
||||||
|
# Rails config changes
|
||||||
|
watch(rails.spec_helper) { rspec.spec_dir }
|
||||||
|
watch(rails.routes) { "#{rspec.spec_dir}/routing" }
|
||||||
|
watch(rails.app_controller) { "#{rspec.spec_dir}/controllers" }
|
||||||
|
|
||||||
|
# Capybara features specs
|
||||||
|
watch(rails.view_dirs) { |m| rspec.spec.call("features/#{m[1]}") }
|
||||||
|
watch(rails.layouts) { |m| rspec.spec.call("features/#{m[1]}") }
|
||||||
|
|
||||||
|
# Turnip features and steps
|
||||||
|
watch(%r{^spec/acceptance/(.+)\.feature$})
|
||||||
|
watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
|
||||||
|
Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
|
||||||
|
end
|
||||||
|
end
|
BIN
app/assets/images/cms/cafe_about.webp
Normal file
BIN
app/assets/images/cms/cafe_about.webp
Normal file
Binary file not shown.
After Width: | Height: | Size: 216 KiB |
BIN
app/assets/images/cms/map_wide.png
Normal file
BIN
app/assets/images/cms/map_wide.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1021 KiB |
42
cms/about.yaml
Normal file
42
cms/about.yaml
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
---
|
||||||
|
- template: section_full_image
|
||||||
|
id: c6dbabd4e44257f3e04b
|
||||||
|
header: Hub Feenix
|
||||||
|
text: "Our Vision:\r\n\r\nArt, craft, music, yoga, dance, meditation, nature, and
|
||||||
|
creatives of every kind come together under our roof in an atmosphere of openness
|
||||||
|
and learning. \r\n\r\n \r\n\r\nWe are very much just starting, so make contact,
|
||||||
|
check later, or follow us on facebook."
|
||||||
|
options:
|
||||||
|
fixed: 'off'
|
||||||
|
color: white
|
||||||
|
align: left
|
||||||
|
shade_color: solid_blue_25
|
||||||
|
image: cafe_about
|
||||||
|
- template: section_full_up
|
||||||
|
id: 37c68220ab0ad519ac37
|
||||||
|
header: About Us
|
||||||
|
text: "Hub Feenix is a community space that fosters creativity, healing, and connection.
|
||||||
|
\r\nArt, craft, music, yoga, dance, meditation, nature, and creative people of
|
||||||
|
all kinds come together under our roof in an atmosphere of openness and learning.
|
||||||
|
\r\n\r\nHub Feenix provides opportunities for creative people to live, work, learn,
|
||||||
|
create, exhibit, and perform in a healing natural setting in the tranquil southeastern
|
||||||
|
Finland forest. \r\n\r\nAs part of our commitment to ongoing connection and learning,
|
||||||
|
Hub Feenix provides space for retreats, workshops, conferences, short- and long-term
|
||||||
|
residencies, and other gatherings."
|
||||||
|
options:
|
||||||
|
background: light_orange
|
||||||
|
color: solid_blue
|
||||||
|
margin: '0'
|
||||||
|
subheader: ''
|
||||||
|
button_link: ''
|
||||||
|
button_text: ''
|
||||||
|
- template: section_full_image
|
||||||
|
id: cda4571c02aaa68d5841
|
||||||
|
header: ''
|
||||||
|
text: "[Click here to open](https://duckduckgo.com/?t=ffab&q=H%C3%B6gbenintie+30%2C+10350+Meltola%2C+Raasepori&atb=v283-1&ia=web&iaxm=directions&end=what%3AH%25C3%25B6gbensv%25C3%25A4gen%252030%252C%252010350%2520Meltola%252C%2520Finland&transport=drive)"
|
||||||
|
image: map_wide
|
||||||
|
options:
|
||||||
|
fixed: 'on'
|
||||||
|
color: black
|
||||||
|
align: center
|
||||||
|
shade_color: none
|
@ -136,3 +136,24 @@
|
|||||||
background: solid_blue
|
background: solid_blue
|
||||||
columns: '3'
|
columns: '3'
|
||||||
color: none
|
color: none
|
||||||
|
- template: form_section
|
||||||
|
id: 63b79d0330c870f98184
|
||||||
|
card_template: form_field
|
||||||
|
cards:
|
||||||
|
- id: fa2d781cf5cb644cbef4
|
||||||
|
header: Name
|
||||||
|
text: ''
|
||||||
|
- id: af5208d13d06f0581f4e
|
||||||
|
header: Email
|
||||||
|
text: ''
|
||||||
|
- id: 8295ec1642215c275eb2
|
||||||
|
header: Message
|
||||||
|
text: ''
|
||||||
|
options:
|
||||||
|
compulsory: 'on'
|
||||||
|
form_type: message
|
||||||
|
header: Contact
|
||||||
|
text: "Högbenintie 30, 10350 Meltola, Raasepori\r\n\r\ninfo@hubfeenix.fi\r\n\r\n0505337881\r\n"
|
||||||
|
options:
|
||||||
|
background: white
|
||||||
|
color: solid_blue
|
||||||
|
Loading…
Reference in New Issue
Block a user