diff --git a/app/assets/javascripts/templates/product_modal.html.haml b/app/assets/javascripts/templates/product_modal.html.haml index bf66bd4aea..96ca3c4c53 100644 --- a/app/assets/javascripts/templates/product_modal.html.haml +++ b/app/assets/javascripts/templates/product_modal.html.haml @@ -4,7 +4,7 @@ %h3 {{product.name}} %span %em from - %span.avenir {{ enterprise.name }} + %span {{ enterprise.name }} %br diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass b/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass index 17b68a3e46..54e3aa3b93 100644 --- a/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass +++ b/app/assets/stylesheets/darkswarm/_shop-navigation.css.sass @@ -1,3 +1,4 @@ +@import typography .darkswarm @@ -20,7 +21,7 @@ margin-right: 12px location - font-family: "AvenirBla_IE", "AvenirBla" + @include headingFont @media all and (max-width: 768px) location, location + small display: block diff --git a/app/assets/stylesheets/darkswarm/big-input.sass b/app/assets/stylesheets/darkswarm/big-input.sass index 165404fff3..d5f7360bb9 100644 --- a/app/assets/stylesheets/darkswarm/big-input.sass +++ b/app/assets/stylesheets/darkswarm/big-input.sass @@ -6,7 +6,7 @@ //Big search used in active table search \\ @mixin big-input($input, $inputhvr, $inputactv) - @include avenir + @include headingFont @include csstrans @include border-radius(0.5rem) background: rgba(255,255,255,0.1) @@ -44,7 +44,7 @@ letter-spacing: 0 @mixin medium-input($input, $inputhvr, $inputactv) - @include avenir + @include headingFont @include csstrans @include border-radius(0.5rem) background: rgba(255,255,255,0.1) diff --git a/app/assets/stylesheets/darkswarm/branding.css.sass b/app/assets/stylesheets/darkswarm/branding.css.sass index da2600818e..aae280a187 100644 --- a/app/assets/stylesheets/darkswarm/branding.css.sass +++ b/app/assets/stylesheets/darkswarm/branding.css.sass @@ -1,3 +1,11 @@ +$ofn-brand: #f27052 +// e.g. australia, uk, norway specific color + +$ofn-grey: #808184 + + +// + $clr-brick: #c1122b $clr-brick-light: #f5e6e7 $clr-brick-light-trans: rgba(245, 230, 231, 0.9) diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass index 7f70bf7211..3a74412711 100644 --- a/app/assets/stylesheets/darkswarm/groups.css.sass +++ b/app/assets/stylesheets/darkswarm/groups.css.sass @@ -1,5 +1,6 @@ @import branding @import mixins +@import typography // Search page #groups @@ -65,7 +66,7 @@ margin-bottom: -2px margin-right: 2px text-transform: capitalize - @include avenir + @include headingFont @include border-radius(1em 0.25em 0 0) @include gradient($disabled-light, $disabled-bright) @media screen and (min-width: 768px) diff --git a/app/assets/stylesheets/darkswarm/home_tagline.css.sass b/app/assets/stylesheets/darkswarm/home_tagline.css.sass index ed85e07d60..f485c7963d 100644 --- a/app/assets/stylesheets/darkswarm/home_tagline.css.sass +++ b/app/assets/stylesheets/darkswarm/home_tagline.css.sass @@ -4,18 +4,18 @@ // Styling for brand intro / tagline on homepage #tagline - background-color: black - background-image: url("/assets/home/ofn_bg_1.jpg") + background-color: $dark-grey + background-image: url("/assets/home/home.jpg") @include fullbg height: 400px padding: 40px 0px h1, h2, p color: white h1 - margin-bottom: 1em + margin-bottom: 3rem + margin-top: 1rem h2 - font-size: 1.6875rem - max-width: 610px + font-size: 3.75rem margin: 0 auto a diff --git a/app/assets/stylesheets/darkswarm/hubs.css.sass b/app/assets/stylesheets/darkswarm/hubs.css.sass index 43f2b8cbea..364c8ee645 100644 --- a/app/assets/stylesheets/darkswarm/hubs.css.sass +++ b/app/assets/stylesheets/darkswarm/hubs.css.sass @@ -2,8 +2,5 @@ @import mixins #hubs - background-repeat: repeat - background-image: url("/assets/subtle_white_feathers.png") - // background: $clr-brick-ultra-light url("/assets/home/shopping-bg.jpg") - // @include fullwidthbg + background-color: lighten($ofn-grey, 43%) @include panepadding diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index b256c6165c..94664ac2b9 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -2,10 +2,6 @@ @import mixins @import typography - -.fixed .top-bar - @include box-shadow(0 2px 3px 0 rgba(0,0,0,0.25)) - nav @include textpress .joyride-tip-guide .button @@ -38,8 +34,11 @@ nav span font-size: 13px .nav-primary - @include avenir + @include headingFont font-size: 0.875rem + font-weight: 300 + .left .nav-primary + text-transform: uppercase // Mobile Menu @@ -59,7 +58,7 @@ nav font-size: 0.875rem .li-menu - @include avenir + @include headingFont font-size: 1rem a color: rgba(255, 255, 255, 0.9) diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index 6925e84f72..3a69d804fb 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -53,9 +53,6 @@ // Typography \\ -@mixin avenir - font-family: "AvenirBla_IE", "AvenirBla" - @mixin textpress text-shadow: 0 -1px 1px #111111, 0 1px 2px #222222 diff --git a/app/assets/stylesheets/darkswarm/tabs.css.sass b/app/assets/stylesheets/darkswarm/tabs.css.sass index 0c911eb66a..12134a19e1 100644 --- a/app/assets/stylesheets/darkswarm/tabs.css.sass +++ b/app/assets/stylesheets/darkswarm/tabs.css.sass @@ -37,7 +37,7 @@ text-align: left a - @include avenir + @include headingFont background: transparent text-transform: uppercase line-height: 1 diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index f549420d83..13741fe259 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -1,24 +1,17 @@ @import branding -//@import mixins -@font-face - font-family: 'AvenirBla_IE' - src: url("/AveniBla.eot") format("opentype") +@mixin headingFont + font-family: 'Oswald', sans-serif -@font-face - font-family: 'AvenirBla' - src: url("/AvenirLTStd-Black.otf") format("opentype") +@mixin bodyFont + font-family: 'Roboto', Arial, sans-serif -@font-face - font-family: 'AvenirMed_IE' - src: url("/AveniMed.eot") format("opentype") +$headingFont: 'Oswald' +$bodyFont: 'Roboto' -@font-face - font-family: 'AvenirMed' - src: url("/AvenirLTStd-Medium.otf") format("opentype") - -$font-helvetica: "Helvetica Neue", "HelveticaNeue", "Helvetica", Helvetica, Arial, sans-serif - +body + @include bodyFont + font-weight: 400 a color: $clr-brick &:hover, &:focus, &:active @@ -35,17 +28,17 @@ small, .small .text-small font-size: 0.875rem margin-bottom: 0.5rem - font-family: $font-helvetica + font-family: $bodyFont &, & * font-size: 0.875rem .text-normal font-weight: 400 - font-family: $font-helvetica + font-family: $bodyFont .text-skinny font-weight: 300 - font-family: $font-helvetica + font-family: $bodyFont .word-wrap word-wrap: break-word @@ -69,11 +62,10 @@ small, .small .brick color: $clr-brick -@mixin avenir - font-family: "AvenirBla_IE", "AvenirBla" -h1, h2, h3, h4, h5, h6, .avenir - @include avenir + +h1, h2, h3, h4, h5, h6 + @include headingFont padding: 0px ul.bullet-list, ul.check-list @@ -108,9 +100,6 @@ ul.check-list .not-bold font-weight: normal -strong.avenir - font-weight: normal // Avenir is basically bold anyway - // These selectors match the default Foundation selectors // For clean overriden magic diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index d18adae1b4..201c08f653 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -1,13 +1,14 @@ @import foundation/components/buttons @import branding @import mixins +@import typography // Button class extensions .neutral-btn @include button @include border-radius(0.5em) - font-family: 'Open Sans', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + font-family: $bodyFont background-color: transparent border: 2px solid rgba(200, 200, 200, 1) color: #999 @@ -49,7 +50,7 @@ outline: none // Turn off blue highlight on chrome .button.primary, button.primary - font-family: 'Open Sans', Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + font-family: $bodyFont background: $clr-brick color: white diff --git a/app/controllers/shops_controller.rb b/app/controllers/shops_controller.rb new file mode 100644 index 0000000000..9a7a94523d --- /dev/null +++ b/app/controllers/shops_controller.rb @@ -0,0 +1,7 @@ +class ShopsController < BaseController + layout 'darkswarm' + before_filter :load_active_distributors + + def index + end +end diff --git a/app/views/home/_beta.en-GB.html.haml b/app/views/home/_beta.en-GB.html.haml deleted file mode 100644 index 2badc7c826..0000000000 --- a/app/views/home/_beta.en-GB.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -#beta.pane - - .row - .small-12.columns.text-center - %h2 S'cuse us - %h5 while we get (more) awesome - %p Open Food Network UK is a new service that’s being piloted right now! - %p Want to help? Or find out when OFN is coming to you? - %strong We’d love to hear from you: - %p - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} Food buyers - | - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} Food producers & farmers diff --git a/app/views/home/_beta.html.haml b/app/views/home/_beta.html.haml deleted file mode 100644 index af72211862..0000000000 --- a/app/views/home/_beta.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -#beta.pane - - .row - .small-12.columns.text-center - %h2 S'cuse us - %h5 while we get (more) awesome - %p Open Food Network (beta) is a new service that’s being built right now! Our food producers are currently based around Melbourne and Victoria, and we hope to expand OFN nationally very soon. - %p Want to help? Or find out when OFN is coming to you? - %strong We’d love to hear from you: - %p - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} Food buyers - | - %a{href: "hello@openfoodnetwork.org".reverse, target: '_blank', mailto: true} Food producers & farmers \ No newline at end of file diff --git a/app/views/home/_brandstory.html.haml b/app/views/home/_brandstory.html.haml new file mode 100644 index 0000000000..3b2418d424 --- /dev/null +++ b/app/views/home/_brandstory.html.haml @@ -0,0 +1,6 @@ +#brand-story.pane + + .row + .small-12.columns.text-center + %p Sometimes in order to change a system... + %hr \ No newline at end of file diff --git a/app/views/home/_cta1.html.haml b/app/views/home/_cta1.html.haml new file mode 100644 index 0000000000..2cb260be28 --- /dev/null +++ b/app/views/home/_cta1.html.haml @@ -0,0 +1,8 @@ +#cta.pane + .row + .small-12.columns.text-center + %h2 Ready to change the world? + %a.neutral-btn.turquoise{href: "/producers"} + %i.ofn-i_036-producers + Shop now + %hr \ No newline at end of file diff --git a/app/views/home/_cta2.html.haml b/app/views/home/_cta2.html.haml new file mode 100644 index 0000000000..adf4c6465a --- /dev/null +++ b/app/views/home/_cta2.html.haml @@ -0,0 +1,8 @@ +#cta.pane + .row + .small-12.columns.text-center + %h2 It's fun and super easy + %a.neutral-btn.turquoise{href: "/producers"} + %i.ofn-i_036-producers + Shop now + %hr \ No newline at end of file diff --git a/app/views/home/_groups.html.haml b/app/views/home/_groups.html.haml deleted file mode 100644 index 5d76dd1e2d..0000000000 --- a/app/views/home/_groups.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -#groups.pane - - .row - .small-12.columns.text-center - %h2 Groups / Regions - %h5 See all the groups & regions on the Open Food Network - %p - %a.neutral-btn.light{href: "/groups"} - %i.ofn-i_035-groups - View groups & regions \ No newline at end of file diff --git a/app/views/home/_map.html.haml b/app/views/home/_map.html.haml deleted file mode 100644 index 5a89dd181e..0000000000 --- a/app/views/home/_map.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -#map.pane - - .row - .small-12.columns.text-center - %h2 Map - %h5 of all our food hubs and producers - %p - %a.neutral-btn.light{href: "/map"} - %i.ofn-i_037-map - View map \ No newline at end of file diff --git a/app/views/home/_producer-register.html.haml b/app/views/home/_producer-register.html.haml deleted file mode 100644 index 62845bd9ea..0000000000 --- a/app/views/home/_producer-register.html.haml +++ /dev/null @@ -1,75 +0,0 @@ -#producers.pane - - .row - .small-12.columns.text-center - %h2 - = t :producers - %h5 Want to join the Open Food Network? - %br - %a.neutral-btn.turquoise{href: "/register"} - Register now - %i.ofn-i_007-caret-right - / .row - / .small-12.medium-4.columns.text-center - / %ul.pricing-table - / %li.title Profile - / %li.price Always free - / %li.description Help people find and contact you on OFN - / %li.bullet-item - / %i.ofn-i_019-map-pin - / Pin on OFN Map - / %li.bullet-item - / %i.ofn-i_044-facebook - / Share your contact and social info - / %li.cta-button - / %a.neutral-btn.turquoise{:href => "/register"} - / Register now - / %i.ofn-i_007-caret-right - - / .small-12.medium-4.columns.text-center - / %ul.pricing-table - / %li.title Supplier - / %li.price Always free - / %li.description Sell your products through existing OFN shopfronts - / %li.bullet-item - / %i.ofn-i_019-map-pin - / Pin on OFN Map - / %li.bullet-item - / %i.ofn-i_044-facebook - / Share your contact and social info - / %li.bullet-item - / %i.ofn-i_067-shop - / Create and manage products - / %li.cta-button - / %a.neutral-btn.turquoise{:href => "/register"} - / Register now - / %i.ofn-i_007-caret-right - - / .small-12.medium-4.columns.text-center - / %ul.pricing-table - / %li.title Shopfront - / %li.price $200 setup fee - / %li.description + Sliding monthly fee of $5-$50/month - / %li.bullet-item - / %i.ofn-i_019-map-pin - / Pin on OFN Map - / %li.bullet-item - / %i.ofn-i_044-facebook - / Share your contact and social info - / %li.bullet-item - / %i.ofn-i_067-shop - / Create and manage products - / %li.bullet-item - / %i.ofn-i_051-check-big - / Create and manage order cycles - / %li.bullet-item - / %i.ofn-i_051-check-big - / Sell your products on Shopfront - / %li.cta-button - / %a.neutral-btn.turquoise{:href => "/register"} - / Register now - / %i.ofn-i_007-caret-right - - - - \ No newline at end of file diff --git a/app/views/home/_producers.html.haml b/app/views/home/_producers.html.haml deleted file mode 100644 index 3d4fcfbd68..0000000000 --- a/app/views/home/_producers.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -#producers.pane - - .row - .small-12.columns.text-center - %h2 Producers - %h5 Looking for a specific producer or farmer? - %p - %a.neutral-btn.turquoise{href: "/producers"} - %i.ofn-i_036-producers - View all producers \ No newline at end of file diff --git a/app/views/home/_system.html.haml b/app/views/home/_system.html.haml new file mode 100644 index 0000000000..8b257b3f7e --- /dev/null +++ b/app/views/home/_system.html.haml @@ -0,0 +1,7 @@ +#brand-story.pane + + .row + .small-12.columns.text-center + %h2 How does it work? + %p sexy graphics go here + %hr \ No newline at end of file diff --git a/app/views/home/about_us.html.haml b/app/views/home/about_us.html.haml deleted file mode 100644 index 79e4a657a7..0000000000 --- a/app/views/home/about_us.html.haml +++ /dev/null @@ -1,8 +0,0 @@ -.row - .large-12.columns - %h2 What is open food network - %p - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna - aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. - Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint - occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum \ No newline at end of file diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index a15442e794..99f39b5fd3 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -2,23 +2,21 @@ .row .small-12.text-center.columns %h1 - %img{src: "/assets/open-food-network-beta.png", srcset: "/assets/open-food-network-beta.svg", width: "550", height: "134", title: "Open Food Network (beta)"} - %h2 An open marketplace that makes it easy to find, buy, sell and move sustainable local food. + %img{src: "/assets/logo-color.png", srcset: "/assets/logo-color.svg", width: "300", height: "104", title: "Open Food Network Australia"} + %h2 Food, unincorporated. + / %h2 An open marketplace that makes it easy to find, buy, sell and move sustainable local food. - %ofn-modal{title: "Learn more", "ng-cloak" => true} - = render partial: "modals/learn_more" + / %ofn-modal{title: "Learn more", "ng-cloak" => true} + / = render partial: "modals/learn_more" .ng-cloak - = render partial: "home/hubs" - / = render partial: "home/map" += render partial: "home/brandstory" - / = render partial: "home/producers" += render partial: "home/cta1" - / = render partial: "home/groups" += render partial: "home/system" -= render partial: "home/producer-register" - -= render partial: "home/beta" += render partial: "home/cta2" = render partial: "shared/footer" diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index e1976ab167..505ba93a49 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -8,7 +8,7 @@ = favicon_link_tag - else = favicon_link_tag "/favicon-staging.ico" - %link{href: "https://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/ + %link{href: "http://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald", rel: "stylesheet", type: "text/css"} = yield :scripts %script{src: "//maps.googleapis.com/maps/api/js?libraries=places&sensor=false"} diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml index d6122cdc3b..a3cf979c8a 100644 --- a/app/views/layouts/registration.html.haml +++ b/app/views/layouts/registration.html.haml @@ -8,7 +8,7 @@ = favicon_link_tag - else = favicon_link_tag "/favicon-staging.ico" - %link{href: "https://fonts.googleapis.com/css?family=Open+Sans:400,700", rel: "stylesheet", type: "text/css"}/ + %link{href: "http://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald", rel: "stylesheet", type: "text/css"} = yield :scripts %script{src: "//maps.googleapis.com/maps/api/js?libraries=places&sensor=false"} diff --git a/app/views/producers/signup.html.haml b/app/views/producers/signup.html.haml new file mode 100644 index 0000000000..7e078215f8 --- /dev/null +++ b/app/views/producers/signup.html.haml @@ -0,0 +1,12 @@ + + +.row + .small-12.columns.text-center + %h1 Producers Signup + %h2 + = t :producers + %h5 Want to join the Open Food Network? + %br + %a.neutral-btn.turquoise{href: "/register"} + Register now + %i.ofn-i_007-caret-right \ No newline at end of file diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index a12d0030e0..c917edf184 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -3,16 +3,11 @@ %ul.left{} %li.ofn-logo %a{href: root_path} - %img{src: "/assets/open-food-network-beta.png", srcset: "/assets/open-food-network-beta.svg", width: "110", height: "26"} - %li.divider - - if current_page? root_path - %li - %a{"ofn-scroll-to" => "hubs"} - %span.nav-primary Hubs - - else - %li - %a{href: root_path + "#/#hubs"} - %span.nav-primary Hubs + %img{src: "/assets/logo-white.png", srcset: "/assets/logo-white.svg", width: "75", height: "26"} + %li.divider + %li + %a{href: main_app.shops_path} + %span.nav-primary Shops %li.divider %li %a{href: main_app.map_path} @@ -26,6 +21,11 @@ %a{href: main_app.groups_path} %span.nav-primary Groups %li.divider + %li + // TODO: LAURA - About path + %a{href: main_app.groups_path} + %span.nav-primary About + %li.divider %section.top-bar-section %ul.right %li.divider diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 5ed57917fd..ce1ee9a58a 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -11,21 +11,13 @@ %aside.left-off-canvas-menu.show-for-medium-down %ul.off-canvas-list %li.ofn-logo - %a{href: root_path} - %img{src: "/assets/open-food-network-beta.png", srcset: "/assets/open-food-network-beta.svg", width: "110", height: "26"} - - - if current_page? root_path - %li.li-menu - %a{"ofn-scroll-to" => "hubs"} - %span.nav-primary - %i.ofn-i_040-hub - Hubs - - else - %li.li-menu - %a{href: root_path + "#/#hubs"} - %span.nav-primary - %i.ofn-i_040-hub - Hubs + %a{href: root_path} + %img{src: "/assets/logo-white.png", srcset: "/assets/logo-white.svg", width: "75", height: "26"} + %li.li-menu + %a{href: main_app.shops_path} + %span.nav-primary + %i.ofn-i_019-map-pin + Shops %li.li-menu %a{href: main_app.map_path} %span.nav-primary @@ -41,6 +33,12 @@ %span.nav-primary %i.ofn-i_035-groups Groups + %li.li-menu + %a{href: main_app.groups_path} + // TODO: LAURA - About path + %span.nav-primary + %i.ofn-i_013-help + About %li - if spree_current_user.nil? diff --git a/app/views/shops/index.html.haml b/app/views/shops/index.html.haml new file mode 100644 index 0000000000..c48c82d639 --- /dev/null +++ b/app/views/shops/index.html.haml @@ -0,0 +1 @@ += render partial: "home/hubs" \ No newline at end of file diff --git a/app/views/shops/signup.html.haml b/app/views/shops/signup.html.haml new file mode 100644 index 0000000000..df0ac18655 --- /dev/null +++ b/app/views/shops/signup.html.haml @@ -0,0 +1,12 @@ + + +.row + .small-12.columns.text-center + %h1 Shops / Hubs Signup + %h2 + = t :producers + %h5 Want to join the Open Food Network? + %br + %a.neutral-btn.turquoise{href: "/register"} + Register now + %i.ofn-i_007-caret-right \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4621ee4a35..2a6af985f8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,17 @@ Openfoodnetwork::Application.routes.draw do end resources :groups - resources :producers + resources :producers, only: [:index] do + collection do + get :signup + end + end + + resources :shops, only: [:index] do + collection do + get :signup + end + end get '/checkout', :to => 'checkout#edit' , :as => :checkout put '/checkout', :to => 'checkout#update' , :as => :update_checkout