Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
38bd7f0
Updated SuperGreenLive2 link
NicolasFrecheMedina May 11, 2021
cf2c200
feature shop page with structure for widgets and layouts, only heade…
NicolasFrecheMedina May 14, 2021
a765d19
component banner and modal newsletter done with responsive missing li…
NicolasFrecheMedina May 18, 2021
82a9f36
bundle section done with responsive, refactoring others shops section…
NicolasFrecheMedina May 21, 2021
f0e12a7
shop page missing spotlight part with responsive and sgl addons part…
NicolasFrecheMedina May 24, 2021
160be8b
rework shop page
NicolasFrecheMedina May 29, 2021
8efdec1
NavBar defined
NicolasFrecheMedina May 29, 2021
0d371e6
enhancement shop page
NicolasFrecheMedina May 29, 2021
5577dc5
fetch widgets db
vitaminwater May 29, 2021
405a8db
wip - added airtable to DOM mapping
NicolasFrecheMedina Jun 2, 2021
baee7ad
wip - displaying widgets in containers
NicolasFrecheMedina Jun 2, 2021
a30ed41
linking shop page to airtable, carousel not working, missing link to …
NicolasFrecheMedina Jun 4, 2021
f956406
problem width slick
NicolasFrecheMedina Jun 8, 2021
332cd6c
enhancement shop page,problem with width fixed, widget working on eac…
NicolasFrecheMedina Jun 10, 2021
77d8a7b
shop page linked with airtbale, widgets and components working, miss…
NicolasFrecheMedina Jun 18, 2021
b31baef
shop page with responsive missing link navbar and pic product
NicolasFrecheMedina Jun 21, 2021
9ce2715
last changes shop page
NicolasFrecheMedina Jun 25, 2021
905ad04
shop page, fixing carousel margin
NicolasFrecheMedina Jun 29, 2021
a045a43
shop page carousel margin fixed
NicolasFrecheMedina Jun 29, 2021
e3a85c7
update package-lock
vitaminwater Jun 29, 2021
03bd6a0
renamed producttags to producttypes for product list widgets
vitaminwater Jun 29, 2021
7c87001
added guideslug field for widgets
vitaminwater Jun 29, 2021
bc34ff6
open social network links in new tab, shop header with tabs and compo…
NicolasFrecheMedina Jun 30, 2021
0994ab0
added plantspotlight, mino fixes
vitaminwater Jun 30, 2021
7827a8b
merged nico's work
vitaminwater Jun 30, 2021
f61757a
added plantspotlight
vitaminwater Jun 30, 2021
e43176f
select product with types
NicolasFrecheMedina Jun 30, 2021
672098b
productlist with tags
NicolasFrecheMedina Jun 30, 2021
dce0841
produclist modified
NicolasFrecheMedina Jun 30, 2021
e81d4f8
Product list widgets work with product tags
NicolasFrecheMedina Jul 1, 2021
0d0d2bd
productlist component with pic
NicolasFrecheMedina Jul 1, 2021
c6cce60
spotlight product component working
NicolasFrecheMedina Jul 5, 2021
867549b
product, plant sportlight and newletters components reworked
NicolasFrecheMedina Jul 5, 2021
5120e4e
Display cardguide for guide spotlight widget + get all required produ…
NicolasFrecheMedina Jul 6, 2021
1df11cd
component banner working with video
NicolasFrecheMedina Jul 7, 2021
b58fd39
component countdown working
NicolasFrecheMedina Jul 8, 2021
feda9b0
productlist no center in props, fix viedo height and loading widget
NicolasFrecheMedina Jul 12, 2021
de50b2c
link on banner, link product in productspotlight and countdown img sw…
NicolasFrecheMedina Jul 13, 2021
b61d0b4
filter widget by expiration date work
NicolasFrecheMedina Jul 15, 2021
afb05aa
column size fixed, addtocart and pricedrework on plantspotlight compo…
NicolasFrecheMedina Jul 16, 2021
6bef4f2
responsive shop page working en enhancement css done"
NicolasFrecheMedina Jul 20, 2021
7c0d8fd
responsive produclist modify, picture plantspotlight fixed, product i…
NicolasFrecheMedina Jul 23, 2021
67c6117
component productlistcomponent created for screen 900px, new componen…
NicolasFrecheMedina Jul 26, 2021
10bfb38
header fixed on normal screen, price on plantspotlight modified, colu…
NicolasFrecheMedina Jul 27, 2021
7498de2
shorten description on plantspotlight and widget search created
NicolasFrecheMedina Jul 28, 2021
4f3145d
popus search modified and moved on header, saty normal screen move on…
NicolasFrecheMedina Jul 30, 2021
9d25626
plantspotlight component modified with settings of plant
NicolasFrecheMedina Jul 30, 2021
46104a4
searchbar component moved, searchlist in fall screen div, responsive …
NicolasFrecheMedina Aug 2, 2021
8c2e8ee
trouble with vue fuse, not giving any results
NicolasFrecheMedina Aug 5, 2021
4a8c581
Fuse.js working on productlist, searchbar working, last css review, m…
NicolasFrecheMedina Aug 6, 2021
0225d0b
merged with new master
vitaminwater Aug 26, 2021
d652df7
better search result display, various UI fixes. dirty fix for Collect…
vitaminwater Aug 26, 2021
633d4ba
ccreate collection component, bug on product
NicolasFrecheMedina Aug 26, 2021
23d4296
merged naco branch
vitaminwater Aug 26, 2021
44dacf0
new shop
NicolasFrecheMedina Aug 26, 2021
9d3ced1
fixed productswithCollection
vitaminwater Aug 26, 2021
e44a679
Component collections working, missing front from index
NicolasFrecheMedina Sep 1, 2021
8b6a205
testshop created
NicolasFrecheMedina Sep 1, 2021
14c7748
index page clear, component titlestep rework missing strong elements
NicolasFrecheMedina Sep 1, 2021
42a064b
component intro done with responsive
NicolasFrecheMedina Sep 2, 2021
6d9712c
bundleblock component created
NicolasFrecheMedina Sep 3, 2021
384885a
changing main font to helvetica, keeping Roboto for titles, buttons e…
vitaminwater Sep 4, 2021
f9b514b
font fix in cardguide
vitaminwater Sep 4, 2021
b964d2d
Merge branch 'supergreenlab:master' into feature/homepage
NicolasFrecheMedina Sep 6, 2021
f3c799a
Questions section in bundle page should use Roboto
vitaminwater Sep 6, 2021
cec8a19
BlockApp + BlockExamples + BlockGuide + BlockDiscord + BlockShop + Bl…
NicolasFrecheMedina Sep 6, 2021
2953766
Merge branch 'supergreenlab:master' into feature/homepage
NicolasFrecheMedina Sep 6, 2021
2f601c6
Roboto fonts missing
vitaminwater Sep 7, 2021
cea2932
take test param into account, merged master changes
vitaminwater Sep 7, 2021
563ee2e
migrated all json access functions to lib/json_db.js. fixed collectio…
vitaminwater Sep 8, 2021
1772cdb
new API from json_db. OutOfOrder fix
vitaminwater Sep 9, 2021
96a0a5d
All components done, effects too, missing height problem in blockapp …
NicolasFrecheMedina Sep 9, 2021
737b17a
:wqMerge branch 'feature/homepage' of github.com:NicolasFrecheMedina/…
vitaminwater Sep 9, 2021
4782ecb
removed widgets assets
vitaminwater Sep 9, 2021
81dd724
fix blockexample trying heights with splice
NicolasFrecheMedina Sep 9, 2021
d6b43e5
blockdiscord and blockapp height working clean
NicolasFrecheMedina Sep 9, 2021
ab7401e
Merge branch 'feature/homepage' of github.com:NicolasFrecheMedina/Sup…
vitaminwater Sep 10, 2021
04d6aff
removed collection assets
vitaminwater Sep 10, 2021
acde3b7
center blockbundle title
vitaminwater Sep 10, 2021
9a526c4
homepage polishing
vitaminwater Sep 10, 2021
6ffcee0
roboto font for card headers
vitaminwater Sep 10, 2021
3c53d01
added card animation for discord and app
vitaminwater Sep 18, 2021
d353a0a
merged new homepage
vitaminwater Sep 18, 2021
e98f17e
merged new homepage code
vitaminwater Sep 18, 2021
bd62f89
app feature card corner radius
vitaminwater Sep 18, 2021
8eefe9f
corner radius animation
vitaminwater Sep 18, 2021
4f9cbce
re-done product spotlight widget
vitaminwater Sep 18, 2021
589fc6e
better product list widget
vitaminwater Sep 18, 2021
c6cdbea
removed useless files. added collection widget for shop
vitaminwater Sep 19, 2021
bd97bc2
UI fixes
vitaminwater Sep 19, 2021
90d24ed
ui fix
vitaminwater Sep 19, 2021
9f1eb10
product list animation
vitaminwater Sep 19, 2021
1d35295
ui fix
vitaminwater Sep 19, 2021
c6e1f91
guide product list crash
vitaminwater Sep 19, 2021
6125b67
align collection button
vitaminwater Sep 19, 2021
eed800f
ui fix
vitaminwater Sep 19, 2021
71e7146
index cleaned, featurecard right arrow side, productspotlight column …
NicolasFrecheMedina Sep 20, 2021
3bebcdf
edito component done
NicolasFrecheMedina Sep 20, 2021
bc74ec0
added container headers. ui fixes
vitaminwater Sep 20, 2021
4aa55ff
Roboto titles for shop widgets
vitaminwater Sep 20, 2021
00f34b7
option pics for containers
vitaminwater Sep 20, 2021
41693d3
add SectionTitle to containers
vitaminwater Sep 20, 2021
1d71ccb
fixed banner height for images, added menu items from container slugs.
vitaminwater Sep 20, 2021
3dd2332
responsive adjustments
vitaminwater Sep 20, 2021
aa974e8
responsive fixes
vitaminwater Sep 21, 2021
0c959cb
responsive
vitaminwater Sep 21, 2021
dafbd4a
guidespotlight components
vitaminwater Sep 21, 2021
25dab8b
ui fix
vitaminwater Sep 21, 2021
40eef4c
ui fix
vitaminwater Sep 21, 2021
2d683f4
searchbar rewrok, btn erase working
NicolasFrecheMedina Sep 21, 2021
9b7fc26
Merge branch 'feature/shop' of github.com:NicolasFrecheMedina/supergr…
NicolasFrecheMedina Sep 21, 2021
397f3a1
home page polish
vitaminwater Sep 21, 2021
a39c666
Merge branch 'feature/shop' of github.com:NicolasFrecheMedina/Supergr…
vitaminwater Sep 21, 2021
f780002
Homepage polish + added ctas. UI fix in shop page.
vitaminwater Sep 22, 2021
dd5afe4
Fixed search bar UI and bug when responsive
vitaminwater Sep 22, 2021
8c89b94
ui fixes
vitaminwater Sep 22, 2021
201f496
wip: switching to new promocode system
vitaminwater Sep 27, 2021
6f7ef86
ui fixes, and responsive banners for shop
vitaminwater Sep 28, 2021
3daa926
shop page footer
vitaminwater Sep 28, 2021
d4b4331
shop page footer
vitaminwater Sep 28, 2021
f12ccc4
context not defined error
vitaminwater Sep 28, 2021
891ebaf
price calculation with currency rate conversion
vitaminwater Sep 30, 2021
697381b
better price calculation and display.
vitaminwater Oct 1, 2021
ad726a5
UI fix
vitaminwater Oct 1, 2021
949274e
better newsletter widget UI. expandable tinyproductlist
vitaminwater Oct 2, 2021
762a115
remove propose when not expanded
vitaminwater Oct 2, 2021
8081478
edito widget cta
vitaminwater Oct 2, 2021
9206d3d
Newsletter widget title
vitaminwater Oct 2, 2021
8aecbda
hide "show more products" when maxItems is < then products.length
vitaminwater Oct 6, 2021
5d32b6f
router.push instead of open when internal link in banners
vitaminwater Oct 6, 2021
622effb
remove shutterstock watermark
vitaminwater Oct 6, 2021
9008a4f
exclude testshop from generate
vitaminwater Oct 6, 2021
aaf2f20
hide menu when scrolling on the shop page
vitaminwater Oct 6, 2021
1690642
header white background, scrollToTop when searching
vitaminwater Oct 7, 2021
b955fbb
fixed checkout process
vitaminwater Oct 7, 2021
344e0dd
added checkout page currency conversion notice
vitaminwater Oct 7, 2021
21d39c0
fixed broken scroll on page change
vitaminwater Oct 7, 2021
d5d3064
use raw image for banners
vitaminwater Oct 7, 2021
34bf07d
added region selector for shop widgets
vitaminwater Oct 8, 2021
0d7fdcf
check link defined for banners
vitaminwater Oct 8, 2021
c65af8d
fixing matomo
vitaminwater Oct 8, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,21 @@ dist
sw.*

assets/img/guides/
assets/img/widgets/
assets/img/products/
assets/img/brands
assets/img/brandproducts
assets/img/sellers
assets/img/regions
assets/img/links
assets/img/widgets
assets/img/collections
static/guides/
config/products.json
config/guides.json
config/widgets.json
config/guide-*.json
config/widgets.json
assets/img/tmp/

*Zone.Identifier
6 changes: 5 additions & 1 deletion assets/css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ html {
}

body {
font-family: Roboto, "Helvetica Neue", Arial, sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
overflow-x: hidden;
background-color: white;
}
Expand All @@ -32,6 +32,10 @@ body {
}
}

strong, b {
font-weight: 600
}

*, *:before, *:after {
box-sizing: border-box;
margin: 0;
Expand Down
Binary file added assets/img/app.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/app2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/app_controller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/alerts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/life.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/log.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/measure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/nutrients.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/remote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/schedule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/timelapse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/training.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/ventilation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appicons/watering.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/appstore2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/blower_sensor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/discord-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/discord.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/3d-printing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/autoflowers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/breeding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/carbon-filter-builds.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/deals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/edibles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/emojis/feature-polling.png
Binary file added assets/img/emojis/gaming.png
Binary file added assets/img/emojis/grow-box-builds.png
Binary file added assets/img/emojis/growers-discussion.png
Binary file added assets/img/emojis/harvesting-curing.png
Binary file added assets/img/emojis/is-my-plant-ok.png
Binary file added assets/img/emojis/nutrients.png
Binary file added assets/img/emojis/plant-training.png
Binary file added assets/img/emojis/puff-puff-pass.png
Binary file added assets/img/emojis/seeds-germination.png
Binary file added assets/img/emojis/tech-support.png
Binary file added assets/img/emojis/timelapse.png
9 changes: 9 additions & 0 deletions assets/img/icon-veg.svg
3 changes: 3 additions & 0 deletions assets/img/icon_clear.svg
4 changes: 4 additions & 0 deletions assets/img/icon_search.svg
11 changes: 11 additions & 0 deletions assets/img/icon_seeds.svg
Binary file added assets/img/ledpanel.png
15 changes: 15 additions & 0 deletions assets/img/logo.svg
Binary file added assets/img/playstore2.png
Binary file added assets/img/searchlogo.png
Binary file added assets/img/shopicon.png
Loading