Master should be what's in production #6

yaboi · 2018-09-15T01:59:09Z

- Create a branch called scaffold that is what is currently in master
- Rebase landing-page from master, fix issues, test.
- Update deploy branch for www.organicman.eco from landing-page to master on Netlify

…nd what's inside.

…ation. Update logo. Add 'mission' section. Update 'how it works' section. add 'quote' section.

…nest guidance', 'better products', 'embark on your journey', and 'faq' sections (as placeholders to be built out). Update navigation to reflect hot topic sections.

…tion and temp bg image to subscription. levitate hero image and how it works icons

…ection. Add 'personal path', 'guided journey', and 'safe community' sections. Update 'embark' cta section. Updated FAQ section (wip)

…e a little darker so it can stand on it's own. Add instagram feed below community section. Move embark section below FAQ. Updated FAQ questions (need responses). Update color of hero button to accent, from white.

…ng. Update navigation button to be outlined when top and secondary when scrolling. Update styling (and content) of 'how it works'. Update 'subscribe' section to include more benefits of joining the tribe. Add 'powerful gathering section. Update 4-up content for content/kit/community/gathering. Add emojies to Q&A secion :)

…trigger listbuilders for joining om tribe and signing up early for gatherings. Add terms and privacy modals w/ content ported over from Shopify. Update all links to make sure they either point back to the landing page (scrollto) or a proper destination.

…gram feed. Intended to hook up to a prepay option in Shopify/Paypal/Stripe then add to CrateJoy later

…ection cta about zafu.

… because it's free version which doesn't work on https, which means on load function never fires and loader doesn't deactivate.

…ightwidget or implement another option)

…ate header and footer links to remove '/om' from links

…tton if one is designated. Best option is to just hide for now so we still get the 'toggle' and 'cart' functionality

…cludes folder

…lick triggers to use include, also update with new click trigger form from sumo. remove 'api documentation' from footer and added 'pre-order your box' link. update instagram section with new hashtag and handle.

…be-button' to 'om-click-trigger' and replace occurences.

… similar (anything tagged with the class '.is-kayako-click-trigger') is clicked, the kayako messenger is toggled.

… desk/support. Consolidated into drop downs for about (mission / how it works / testimonials), discover (what we offer, like personal path, guided journey, etc.), blog (featured articles and each category), and support (live chat, faq, and help desk)

…d categories.

…ode snippet a bit.

…on enter' method to show results and clean up show/hide effects of results.

…eed better hero image.

…ey exist). add some basic styling to mock searching on search page. Update hero image and tagline.

…til it's finished.

Introduce new navigation schema (w/ option for blog and search)

Clean up gulp file through 'compile-scss-om' Comment out js and css that is no longer needed in gulp file (will delete comments and resources after testing)

… file that were placeholders for testing before removing. Removing a ton of never used images and svgs (working on copy-images in gulp file)

trim gulp compile-html in gulp file. Remove commented lines from gulp file that were placeholders for testing before removing. Removing a ton of never used images and svgs (working on copy-images in gulp file)

…aker

refactor gulpfile and remove extra, unused code. tree shake /assets/ and remove a ton of unused code.

Refactor the way js files are being loaded. Moved all blocking scripts (jQuery, jQueryUI, and Lodash) to app.js and all non-blocking vendor files to a new file vendors.js Move vendor scripts to assets/js folder and out of /js folder.

clean up core and custom javascript files.

Rename all includes to remove 'om' prefix

Remove a few unused scss files Rmove a few packages not used in package.json, left most in place becasue removing some causes issues with lodash and it's not worth figuring out right now.

Remove lodash and debounce from search because it was only there for an example and is throwing errors when pushed to netlify.

Move 'vendors' script above 'om' scripts so vendors are instantiated before they're utilized

Moved app.js to scripts include to try and improve Google page speed

Re-implement cssnano to reduce compiled sass file sizes

Complete #2: Remove excess files and resources

yaboi added 30 commits July 23, 2018 22:02

Create OM landing page; Update some content for hero, how it works, a…

ac1a4f5

…nd what's inside.

Update color palette. Upate hero, add placeholder 'kit'. Update navig…

4e24054

…ation. Update logo. Add 'mission' section. Update 'how it works' section. add 'quote' section.

Update 'what to expect' section. Add 'social proof', 'subscribe', 'ho…

f3fda0c

…nest guidance', 'better products', 'embark on your journey', and 'faq' sections (as placeholders to be built out). Update navigation to reflect hot topic sections.

Update hero image w/ example from logopony. Add bg image to quote sec…

3129cce

…tion and temp bg image to subscription. levitate hero image and how it works icons

Update hero bg gradient to include accent color. Update 'subscribe' s…

07237a8

…ection. Add 'personal path', 'guided journey', and 'safe community' sections. Update 'embark' cta section. Updated FAQ section (wip)

Add pre-order page w/ pricing, what to expect, quote, faqs, and insta…

a717e2c

…gram feed. Intended to hook up to a prepay option in Shopify/Paypal/Stripe then add to CrateJoy later

Rearrange pre order page. Add new drawing, not using it.

32ad2e0

udpate quote on pre order page.

6d99d43

add Shopify buy button so pre-orders can actually be purchased.

5effa87

Update images for 4-up (prongs). Add incentive below 'growth tools' s…

4b8c9da

…ection cta about zafu.

Replace temp image with real image for 'growth tools' section.

5ef129a

moved common sections (index / pre-order) to include files

148da19

move om landing page to 'root' directory

75c7c2f

test why loader isn't working in prod

d9c559e

add another console log to try and test page loader

bfe2ac8

remove loader testing. Found issue with instagram widget not loading,…

318f7e7

… because it's free version which doesn't work on https, which means on load function never fires and loader doesn't deactivate.

disable instagram feeds for now while finding a solution (pay 0 for l…

4b76422

…ightwidget or implement another option)

add instagram feeds back to page

abf737e

remove loader for now because it's not working in production

3a68980

update messaging across landing page, pre-order page, and footer. Upd…

ffdaf3b

…ate header and footer links to remove '/om' from links

add temp fix for buy button on home page. script auto adds buy now bu…

d4443ae

…tton if one is designated. Best option is to just hide for now so we still get the 'toggle' and 'cart' functionality

update social proof (testimonials) and faqs. Move more sections to in…

9d7fec3

…cludes folder

create include for 'sumo click trigger'. Update all 'join om tribe' c…

3d31b84

…lick triggers to use include, also update with new click trigger form from sumo. remove 'api documentation' from footer and added 'pre-order your box' link. update instagram section with new hashtag and handle.

update link in footer from 'pre-order your kit' to 'pre-order your box'

94c2bc6

add click trigger update for powerful gatherings. rename 'om-join-tri…

8c2973a

…be-button' to 'om-click-trigger' and replace occurences.

update content based on feedback from Joel.

78dc93e

add kayako click trigger functionality so when 'send us a message' or…

124e1ad

… similar (anything tagged with the class '.is-kayako-click-trigger') is clicked, the kayako messenger is toggled.

yaboi added 29 commits August 28, 2018 18:30

Add search icon + modal to navigation

5a3fa9a

move search icon to includes. Add search icon to scrollnav on blog an…

b9487d2

…d categories.

auto focus first input of modal content. refacrotr modal open/close c…

c30d176

…ode snippet a bit.

add mock search results after user enters 3 characters. Need to add '…

ab21a79

…on enter' method to show results and clean up show/hide effects of results.

add search results page based on help desk hero from scaffold four. N…

455abf6

…eed better hero image.

add lodash. auto populate search input from querystring params (if th…

4ff7dac

…ey exist). add some basic styling to mock searching on search page. Update hero image and tagline.

check for null param on search page so 'undefined' doesn't show in input

f9ec766

code clean up

299f8ba

comment out 'blog' navigation for now so user can't navigate to it un…

c976b2d

…til it's finished.

add pr template

fcddf8e

comment out 'search' from navigation for now, too.

65f8832

comment out search modal from layout page

573ff21

Merge pull request #1 from OrganicMan/blog-navigation

d3412cc

Introduce new navigation schema (w/ option for blog and search)

Update #2

b602e88

Clean up gulp file through 'compile-scss-om' Comment out js and css that is no longer needed in gulp file (will delete comments and resources after testing)

trim gulp compile-html in gulp file. Remove commented lines from gulp…

7d31a10

… file that were placeholders for testing before removing. Removing a ton of never used images and svgs (working on copy-images in gulp file)

Update #2:

ba305a1

trim gulp compile-html in gulp file. Remove commented lines from gulp file that were placeholders for testing before removing. Removing a ton of never used images and svgs (working on copy-images in gulp file)

Merge branch 'tree-shaker' of github.com:OrganicMan/mani into tree-sh…

105015c

…aker

update #2:

f811dc8

refactor gulpfile and remove extra, unused code. tree shake /assets/ and remove a ton of unused code.

Update #2:

511c50b

Refactor the way js files are being loaded. Moved all blocking scripts (jQuery, jQueryUI, and Lodash) to app.js and all non-blocking vendor files to a new file vendors.js Move vendor scripts to assets/js folder and out of /js folder.

Update #2:

28f9082

clean up core and custom javascript files.

Update #2.

3a5a414

Rename all includes to remove 'om' prefix

Update #2.

2927d25

Remove a few unused scss files Rmove a few packages not used in package.json, left most in place becasue removing some causes issues with lodash and it's not worth figuring out right now.

Update #2.

7e9575d

Remove lodash and debounce from search because it was only there for an example and is throwing errors when pushed to netlify.

Update #2.

ddf16ee

Move 'vendors' script above 'om' scripts so vendors are instantiated before they're utilized

Update #2.

bb545e8

Moved app.js to scripts include to try and improve Google page speed

Update #2.

0d8aa4d

Re-implement cssnano to reduce compiled sass file sizes

Merge pull request #3 from OrganicMan/tree-shaker

d07447b

Complete #2: Remove excess files and resources

Remove white background from container on pre-order page 3-up

0cd078a

yaboi self-assigned this Sep 15, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master should be what's in production #6

Master should be what's in production #6

yaboi commented Sep 15, 2018 •

edited

Loading

Master should be what's in production #6

Are you sure you want to change the base?

Master should be what's in production #6

Conversation

yaboi commented Sep 15, 2018 • edited Loading

yaboi commented Sep 15, 2018 •

edited

Loading