Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

smokey:@aaron/dev > upstream #40

Open
wants to merge 298 commits into
base: @aaron.smulktis/develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
298 commits
Select commit Hold shift + click to select a range
395274f
remove unnecessary button
aaronsmulktis Jul 2, 2021
263d016
merge in latest
aaronsmulktis Jul 2, 2021
89a1e42
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 2, 2021
f388c2f
cleanup comment and run linter
aaronsmulktis Jul 2, 2021
be39625
Merge pull request #13 from 1instinct/@aaron.smulktis/search
aaronsmulktis Jul 2, 2021
c1d5593
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 2, 2021
f3d5064
update
zionhjs Jul 2, 2021
9093f16
update
zionhjs Jul 2, 2021
23963a3
Merge pull request #14 from 1instinct/zion@huang
zionhjs Jul 2, 2021
96f0808
Merge branch 'main' of github.com:1instinct/dna-frontend
zionhjs Jul 2, 2021
d5ff967
update
zionhjs Jul 3, 2021
232feaf
add type for emotion theme, fix a bunch of TS errs
aaronsmulktis Jul 3, 2021
5598f60
add type for emotion theme, fix a bunch of TS errs
aaronsmulktis Jul 3, 2021
eac4873
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 3, 2021
637225b
fix filename
aaronsmulktis Jul 3, 2021
133e553
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 3, 2021
2a3fcf9
remove cross-env from start script (breaks heroku deploy), use `yarn …
aaronsmulktis Jul 3, 2021
2bafc6b
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 3, 2021
133ffbb
update
zionhjs Jul 3, 2021
a711546
update
zionhjs Jul 11, 2021
3bd04ff
update
zionhjs Jul 11, 2021
9b5d25f
Merge pull request #15 from 1instinct/zion@huang
zionhjs Jul 11, 2021
8ad4cc4
update
zionhjs Jul 11, 2021
0163039
Merge branch 'main' of github.com:1instinct/dna-frontend
zionhjs Jul 11, 2021
7913a2e
update
zionhjs Jul 11, 2021
b4e55bd
update
zionhjs Jul 11, 2021
3821128
update
zionhjs Jul 11, 2021
aafa624
update
zionhjs Jul 12, 2021
7c7bae5
remove Layout wrapper from AuthForm, rename MobileMenu > MainMenu (di…
aaronsmulktis Jul 14, 2021
53c343b
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Jul 14, 2021
94488fd
fix readme merge
aaronsmulktis Jul 14, 2021
b8564f0
tweak readme
aaronsmulktis Jul 15, 2021
c154a99
Merge branch 'main' into @aaron.smulktis/home
aaronsmulktis Jul 16, 2021
b355644
add SearchBar to PageHeader
aaronsmulktis Jul 16, 2021
c46a254
linter tweaks
aaronsmulktis Jul 16, 2021
cfdc70e
Merge pull request #1 from POL-Clothing/@aaron.smulktis/home
aaronsmulktis Jul 16, 2021
9566352
move Home component to components directory
aaronsmulktis Jul 16, 2021
c94fe37
reorganize files
aaronsmulktis Jul 23, 2021
c6bf6cd
merge latest main
aaronsmulktis Jul 23, 2021
d8df60e
merge in latest main and coming-soon
aaronsmulktis Jul 23, 2021
e2d92cd
tweak README, add SITE_TITLE
aaronsmulktis Jul 23, 2021
4d6a684
update
zionhjs Jul 23, 2021
24bcfc7
update
zionhjs Jul 23, 2021
158d88a
update
zionhjs Jul 23, 2021
00c0fae
update
zionhjs Jul 24, 2021
2bc9452
update
zionhjs Jul 24, 2021
b4170c4
tweak README
aaronsmulktis Jul 24, 2021
e19c512
update
zionhjs Jul 25, 2021
5416dae
Enable showing cart contents and adding items to cart
gitstud Jul 26, 2021
e04382c
update
zionhjs Jul 26, 2021
ab00cc6
update
zionhjs Jul 27, 2021
9ced8a1
Merge pull request #18 from 1instinct/max/cart
aaronsmulktis Jul 28, 2021
9d8ba48
Merge pull request #17 from 1instinct/zion@huang
aaronsmulktis Jul 28, 2021
54c5570
squelch linter error for possible nulls, fix theme
aaronsmulktis Jul 29, 2021
8e92937
merge in latest @aaron.smulktis/develop, fix merge conflicts
aaronsmulktis Jul 30, 2021
c357345
Merge pull request #22 from 1instinct/@aaron.smulktis/develop
gitstud Aug 2, 2021
45dfcda
added note about local API env var
ddombrowsky Aug 2, 2021
1abd50f
regen lock files
ddombrowsky Aug 2, 2021
01b3637
fixed incorrect case in css file
ddombrowsky Aug 2, 2021
1477714
added a few more notes about build
ddombrowsky Aug 2, 2021
7877102
a few more lockfile version updates
ddombrowsky Aug 2, 2021
b676d64
added package-lock.json
ddombrowsky Aug 2, 2021
9060c7b
merge in @aaron.smulktis/home, fix some typos, rename MobileMenu >> M…
aaronsmulktis Aug 2, 2021
7371afa
bring back the MobileMenu close icon, finish merge
aaronsmulktis Aug 2, 2021
0d76fc0
linter cleanup
aaronsmulktis Aug 2, 2021
09e2e6a
fix font typo
aaronsmulktis Aug 2, 2021
eb17450
move all files from pages/Home >> components/Home for Next build & de…
aaronsmulktis Aug 3, 2021
45e05ba
linter cleanup
aaronsmulktis Aug 3, 2021
2a4f7ce
move MainMenu into PageHeader
aaronsmulktis Aug 3, 2021
0c3e02b
linter cleanup
aaronsmulktis Aug 3, 2021
b0ad834
update
zionhjs Aug 4, 2021
c38330a
added local build of spree SDK, 4.5.1003
ddombrowsky Aug 4, 2021
6cec88d
regen yarn.lock
ddombrowsky Aug 4, 2021
1e008ac
fixed build error after products API change
ddombrowsky Aug 4, 2021
95e334a
updated main product list pages to use bearer token
ddombrowsky Aug 4, 2021
1652710
Merge remote-tracking branch 'origin/main' into davidd/develop
ddombrowsky Aug 6, 2021
6a22bd2
regen lockfile to include spree SDK changes
ddombrowsky Aug 6, 2021
08dc1df
update
zionhjs Aug 7, 2021
516e9a3
update
zionhjs Aug 7, 2021
537ce71
update
zionhjs Aug 7, 2021
703672e
Merge pull request #23 from 1instinct/davidd/develop
aaronsmulktis Aug 9, 2021
21a4f7d
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Aug 9, 2021
27f8003
Merge remote-tracking branch 'upstream/main' into main
ddombrowsky Aug 10, 2021
4e9d460
yarn and npm lockfiles cannot co-exist on heroku
ddombrowsky Aug 10, 2021
38f0b41
npm build didn't work, trying yarn
ddombrowsky Aug 10, 2021
11483b0
Merge remote-tracking branch 'upstream/davidd/wholesale-user' into main
ddombrowsky Aug 10, 2021
fb03422
npm and yarn lockfiles cannot co-exist
ddombrowsky Aug 10, 2021
e8809c9
Merge commit 'upstream/main' into main
ddombrowsky Aug 10, 2021
f9203c3
Setup Analytics & event tracking - initial version
leob Aug 11, 2021
542920c
Setup Analytics & event tracking - initial version
leob Aug 11, 2021
b582a0d
Setup Analytics & event tracking - code review feedback
leob Aug 20, 2021
69bcb39
Setup Analytics & event tracking - 'prettier' reformatting
leob Aug 20, 2021
f3d7d4d
Merge pull request #25 from 1instinct/event-tracking
gitstud Aug 20, 2021
0a62b44
add about page and account page
zionhjs Aug 21, 2021
b663ac4
change getSubMenuOrItems to getSubMenuItem for better naming
zionhjs Aug 22, 2021
d5f714a
changed let to const
zionhjs Aug 22, 2021
654fd35
change the expression to assign to a variable
zionhjs Aug 22, 2021
9fc6d8c
remove menuFooter from Mainmenu Props
zionhjs Aug 22, 2021
3536c6c
remove something unused and rename pl to paddingLeft
zionhjs Aug 22, 2021
7222532
merge main
zionhjs Aug 22, 2021
24c5427
merge main
zionhjs Aug 22, 2021
450360e
change showMenuHeader={true} to showMenuHeader
zionhjs Aug 22, 2021
c7baab2
modified MenuItem to avoid pass uninvalid element attribute to html
zionhjs Aug 22, 2021
b4a9fff
delete the old unused footer
zionhjs Aug 22, 2021
8475e06
merge in latest main
aaronsmulktis Aug 22, 2021
0f976eb
Merge branch 'main' of github.com:POL-Clothing/pol-frontend
aaronsmulktis Aug 22, 2021
cdbe754
Merge branch 'main' of github.com:1instinct/dna-frontend
aaronsmulktis Aug 22, 2021
cbe85bc
merge in upstream/main
aaronsmulktis Aug 22, 2021
f5b0fdd
merge in upstream/main
aaronsmulktis Aug 22, 2021
67563d9
cleanup
aaronsmulktis Aug 22, 2021
407fa0e
add line break
aaronsmulktis Aug 22, 2021
83fac5b
add .babelrc & @emotion/babel-plugin
aaronsmulktis Aug 22, 2021
63b7c36
fix Z-index (3d translate) sort order of <Header/> items
aaronsmulktis Aug 22, 2021
51a7e26
Merge pull request #4 from POL-Clothing/@aaron.smulktis/develop
aaronsmulktis Aug 22, 2021
a0767f6
merge main
zionhjs Aug 25, 2021
7e22237
Merge branch 'main' of github.com:POL-Clothing/pol-frontend
zionhjs Aug 25, 2021
e9091d0
resolve conflict
zionhjs Aug 25, 2021
a86a88a
Go to prev/next product using cursor keys - WIP
leob Aug 27, 2021
93ee584
tweak readme
aaronsmulktis Aug 28, 2021
e6c84c2
move silly lowercase in mobileLatest >> (uppercase) MobileLatest.styl…
aaronsmulktis Aug 28, 2021
e662e73
Merge branch 'main' into @aaron.smulktis/develop
aaronsmulktis Aug 28, 2021
1c9e61c
remove unrelated files, improve search styles, add BlackTie icons, up…
aaronsmulktis Aug 28, 2021
5b4d993
Merge branch 'main' into @aaron.smulktis/develop
aaronsmulktis Aug 29, 2021
ff33e3b
Merge pull request #26 from POL-Clothing/@aaron.smulktis/develop
aaronsmulktis Aug 29, 2021
5a44f52
merge in latest main
aaronsmulktis Aug 29, 2021
313e96c
move SignupForm into separate file + component
aaronsmulktis Aug 29, 2021
f9b5440
move SignupForm into separate file + component
aaronsmulktis Aug 29, 2021
6977b8c
get signup screens started
aaronsmulktis Aug 30, 2021
74d2c84
get signup screens started
aaronsmulktis Aug 30, 2021
c8982f3
remove unused imports cleanup
aaronsmulktis Aug 30, 2021
acc801c
remove unused imports cleanup
aaronsmulktis Aug 30, 2021
280ac8d
Merge pull request #27 from 1instinct/@aaron.smulktis/develop
leob Aug 30, 2021
390b1c0
tweak gitignore, tweak Header conditional
aaronsmulktis Aug 31, 2021
1a88716
fix coming-soon conditional
aaronsmulktis Aug 31, 2021
7c6edd5
remove console logs
aaronsmulktis Aug 31, 2021
cac7815
Merge branch 'main' into @aaron.smulktis/develop
aaronsmulktis Aug 31, 2021
0905b89
merge in latest
aaronsmulktis Aug 31, 2021
d75fcc2
more signup question flow stuff
aaronsmulktis Aug 31, 2021
b1c22e9
more signup question flow stuff
aaronsmulktis Aug 31, 2021
00b70db
merge in latest upstream main
aaronsmulktis Aug 31, 2021
b113edb
merge in latest upstream main
aaronsmulktis Aug 31, 2021
4e01031
Merge pull request #24 from POL-Clothing/zion@huang
aaronsmulktis Aug 31, 2021
a1ff842
linter cleanup
aaronsmulktis Aug 31, 2021
dcaa852
merge in latest main
aaronsmulktis Aug 31, 2021
1207767
get a nice intelligent multi-use dry logo thingy
aaronsmulktis Aug 31, 2021
335ded3
get a nice intelligent multi-use dry logo thingy, finish merging Head…
aaronsmulktis Aug 31, 2021
d83afea
Merge branch '@aaron.smulktis/develop' into @aaron.smulktis/signup
aaronsmulktis Aug 31, 2021
62786ea
add SignupForm with multi-page formik wizard, add breakpoints, add te…
aaronsmulktis Sep 1, 2021
6701151
add SignupForm with multi-page formik wizard, add breakpoints, add te…
aaronsmulktis Sep 1, 2021
8ef4c43
mask the passwords, fix the button display logic, fix income input, t…
aaronsmulktis Sep 1, 2021
0dea35b
add some pkg @types
aaronsmulktis Sep 1, 2021
85fdf27
cleanup the Ts & Cs
aaronsmulktis Sep 1, 2021
3a61979
Merge branch 'main' into next-prev-product-nav
leob Sep 1, 2021
7e0d476
Go to prev/next product using cursor keys - first working version
leob Sep 13, 2021
3f74caf
tweak cart (add icon), remove memberList (influencers), tweak search …
aaronsmulktis Sep 16, 2021
7e5f95d
linter tweaks
aaronsmulktis Sep 16, 2021
d951355
Merge pull request #28 from 1instinct/@aaron.smulktis/develop
aaronsmulktis Sep 16, 2021
fd33bf5
Merge pull request #29 from 1instinct/@aaron.smulktis/signup
aaronsmulktis Sep 16, 2021
5e82d2d
Merge pull request #30 from 1instinct/next-prev-product-nav
aaronsmulktis Sep 16, 2021
293040d
get some basics in, add Soundcloud pkg
aaronsmulktis Nov 21, 2021
1e1858f
update Alerts, add explicit Any typings everywhere, fix some useCallb…
aaronsmulktis Nov 23, 2021
0567e58
fix some linter errors
aaronsmulktis Nov 23, 2021
5704903
convert to ES6 func comps, rename some files, add cockpit, fix some s…
aaronsmulktis Nov 23, 2021
ef40870
merge in latest main
aaronsmulktis Nov 23, 2021
7c174f9
fix linter error
aaronsmulktis Nov 23, 2021
563b590
new logo, add places scripts, OG img, env vars
aaronsmulktis Nov 23, 2021
bb4d772
new logo, add places scripts, OG img, env vars
aaronsmulktis Nov 23, 2021
50c13d2
update gitignore
aaronsmulktis Nov 28, 2021
ed3b8af
merge in latest after PR
aaronsmulktis Nov 28, 2021
df3fc01
bump version in pkg.json
aaronsmulktis Nov 28, 2021
c741013
fiddling around
aaronsmulktis Apr 28, 2022
f48858c
add stuff
aaronsmulktis Aug 26, 2022
4333939
add stuff
aaronsmulktis Aug 26, 2022
9edba6d
add stuff
aaronsmulktis Aug 26, 2022
e6b107c
add stuff
aaronsmulktis Aug 26, 2022
cac5efd
add stuff
aaronsmulktis Aug 26, 2022
ab0b6e9
add stuff
aaronsmulktis Aug 26, 2022
ad5053a
add stuff
aaronsmulktis Aug 26, 2022
ef7ad7b
add stuff
aaronsmulktis Aug 26, 2022
941fc94
add stuff
aaronsmulktis Aug 26, 2022
66669a9
add stuff
aaronsmulktis Aug 26, 2022
b0e07be
add stuff
aaronsmulktis Aug 26, 2022
bb9b450
add stuff
aaronsmulktis Aug 26, 2022
db2b993
add stuff
aaronsmulktis Aug 26, 2022
be817ca
add stuff
aaronsmulktis Aug 26, 2022
dca0691
tweak for social transactions
aaronsmulktis Dec 26, 2021
53829a1
cleanup
aaronsmulktis Nov 28, 2021
8905052
add Google places scripts
aaronsmulktis Nov 28, 2021
ebcc895
add Google places script
aaronsmulktis Nov 28, 2021
968fe57
fix page title error
aaronsmulktis Nov 28, 2021
b50c95a
merge in latest main
aaronsmulktis Nov 28, 2021
f7aef80
fix some errors, add some missing index files after a tough merge
aaronsmulktis Nov 28, 2021
c9434f0
fix some errors, add some missing index files after a tough merge
aaronsmulktis Sep 2, 2023
acb5c68
two small additions to gitignore
aaronsmulktis Nov 29, 2021
32f0024
remove unnecessary react-burger-menu code, get 2nd burger/sidebar men…
aaronsmulktis Sep 2, 2023
15792ab
remove more dead burger code, get it building
aaronsmulktis Nov 29, 2021
f97d315
tweak footer
aaronsmulktis Dec 7, 2021
0bfa11d
merge in latest main, fix carousel slide height
aaronsmulktis Sep 2, 2023
dcaa40a
some linter fixes
aaronsmulktis Sep 2, 2023
143b3aa
tweak README, moved ProductDetails into components, log some data
aaronsmulktis Jul 27, 2021
2bbe88f
tweak README, moved ProductDetails into components, log some data
aaronsmulktis Jul 27, 2021
5666297
add a bunch of temp typings
aaronsmulktis Sep 2, 2023
a98ad78
tweak some types
aaronsmulktis Sep 2, 2023
2b1da2d
linter tweaks
aaronsmulktis Sep 2, 2023
6a8734c
LOTS: add env example, add some envs, update meta tags with envs, ren…
aaronsmulktis Sep 2, 2023
18e0ecd
get Spree product images linked up
aaronsmulktis Dec 21, 2021
60cfdc4
get Spree product images linked up
aaronsmulktis Dec 21, 2021
60ad3c6
tweak mobile styles, add input border anim
aaronsmulktis Dec 27, 2021
a29a7d1
get an awesome multi-step newsletter subscribe widget/component
aaronsmulktis Sep 2, 2023
1df7edf
cleanup & move Login & ResetPassword components, add new root routes
aaronsmulktis Sep 2, 2023
bac21f0
cleanup & move Login & ResetPassword components, add new root routes
aaronsmulktis Dec 28, 2021
0b0b846
get mobile menu dynamic
aaronsmulktis Dec 29, 2021
81c2d0d
get mobile menu dynamic
aaronsmulktis Dec 29, 2021
ebb14bc
get mobile menu dynamic, linter fixes
aaronsmulktis Dec 29, 2021
2fe4138
delete unnecessary env file
aaronsmulktis Dec 29, 2021
1ecd396
tons of Product details upgrades, tons of stuff, terms & conditions, …
aaronsmulktis Sep 2, 2023
6b2ad76
tons of Product details upgrades, tons of stuff, terms & conditions, …
aaronsmulktis Sep 2, 2023
a8e0c81
lots of style changes, footer & menu changes, product & stream card c…
aaronsmulktis Sep 2, 2023
a696d43
get variants displaying in product details table
aaronsmulktis Sep 2, 2023
5629838
tweak social links
aaronsmulktis Jan 31, 2022
dcecb61
add dark mode, tweak social links
aaronsmulktis Sep 2, 2023
29fcf82
linter fixes
aaronsmulktis Jan 31, 2022
469dd5f
update layout
aaronsmulktis Jan 31, 2022
a5e416d
update theme again
aaronsmulktis Sep 2, 2023
20ce709
linter
aaronsmulktis Jan 31, 2022
66a33f2
add dark mode to theme, many things using it now, update logo, tweak …
aaronsmulktis Sep 2, 2023
aea2f40
more style tweaks, linter fixes
aaronsmulktis Feb 2, 2022
ab38375
more style tweaks, linter fixes
aaronsmulktis Feb 2, 2022
7a4bf42
remove some dead env vars, add some
aaronsmulktis Sep 2, 2023
733358c
handle product errors better, add product 404 animation, add video to…
aaronsmulktis Sep 2, 2023
a07be59
update env vars, update mobile hero
aaronsmulktis Feb 5, 2022
b9e1af8
real images in carousel
aaronsmulktis Sep 2, 2023
9233df6
add variants to product details, fix imgs
aaronsmulktis Feb 5, 2022
d8d8780
add variants to product details, fix imgs, linter fixes
aaronsmulktis Feb 5, 2022
2961f65
tons of stuff... fix cart queries, add-to-cart works, show real color…
aaronsmulktis Sep 2, 2023
600ccbe
linter fix
aaronsmulktis Feb 6, 2022
296d2f1
cleanup some cart/search loading states, fix linter errors
aaronsmulktis Apr 28, 2022
56aca41
linter fixes
aaronsmulktis Apr 28, 2022
6c68dfc
rebase buncha stuff, bump yarn
aaronsmulktis Sep 2, 2023
3ee57c5
add stuff
aaronsmulktis Sep 2, 2023
6667148
add stuff
aaronsmulktis Aug 26, 2022
9700f65
bump yarn, add API url
aaronsmulktis Sep 2, 2023
256ab0a
tracking env vars, fix linter errors, add three-fiber
aaronsmulktis Sep 2, 2023
8bd5290
strip ip stuff out
aaronsmulktis Jun 15, 2023
c4ab11b
_app / _document
aaronsmulktis Sep 2, 2023
3e95867
remove dupe
aaronsmulktis Sep 2, 2023
fc2fadd
clean a bunch of stuff up and add missing stuff after messy rebase
aaronsmulktis Sep 2, 2023
8bd249e
cleanup _app
aaronsmulktis Sep 2, 2023
f9521d9
update example envs, tweak bad commas, add NotifyForm to MediaPlayer
aaronsmulktis Sep 2, 2023
819a284
update example envs, tweak bad commas, add NotifyForm to MediaPlayer
aaronsmulktis Sep 2, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["next/babel"],
"plugins": ["@emotion"]
}
40 changes: 40 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
NEXT_PUBLIC_IS_MAINT_MODE=
NEXT_PUBLIC_SHORT_TITLE=
NEXT_PUBLIC_ENTITY_NAME=
NEXT_PUBLIC_SITE_TITLE=
NEXT_PUBLIC_SITE_URL=
NEXT_PUBLIC_SITE_SUBTITLE=
NEXT_PUBLIC_PAGE_TITLE=
NEXT_PUBLIC_PAGE_DESC=
NEXT_PUBLIC_LOGO_PATH=
NEXT_PUBLIC_COMPANY_EMAIL=
NEXT_PUBLIC_COMPANY_PHONE=
NEXT_PUBLIC_COMPANY_LEGAL_URL=
NEXT_PUBLIC_COMING_SOON_COPY=
NEXT_PUBLIC_VIDEO_URL=
NEXT_PUBLIC_APP_URL=
NEXT_PUBLIC_SPREE_API_URL=
NEXT_PUBLIC_SPREE_ACCESS_TOKEN=
NEXT_PUBLIC_MUX_ACCESS_TOKEN_ID=
NEXT_PUBLIC_MUX_SECRET_KEY=
NEXT_PUBLIC_SC_CLIENT_ID=
NEXT_PUBLIC_SC_CLIENT_SECRET=
NEXT_PUBLIC_TRACKING=
NEXT_PUBLIC_TRACKING_VERBOSE=
NEXT_PUBLIC_TRACKING_GA_ON=
NEXT_PUBLIC_TRACKING_PROVIDER_GA=
NEXT_PUBLIC_GA_TRACKING_CODE=
NEXT_PUBLIC_GA_DEBUG_MODE=
NEXT_PUBLIC_TRACKING_KM_ON=
NEXT_PUBLIC_TRACKING_PROVIDER_KM=
NEXT_PUBLIC_TRACKING_VERBOSE=
NEXT_PUBLIC_MAILCHIMP_URL=
NEXT_PUBLIC_MAILCHIMP_CLIENT_KEY=
NEXT_PUBLIC_MAILCHIMP_API_KEY=
NEXT_PUBLIC_MAILCHIMP_USERNAME=
NEXT_PUBLIC_MAILCHIMP_U=
NEXT_PUBLIC_MAILCHIMP_ID=
NEXT_PUBLIC_MAILCHIMP_AUDIENCE_ID=
NEXT_PUBLIC_INSTAGRAM_URL=
NEXT_PUBLIC_FACEBOOK_URL=
NEXT_PUBLIC_TWITTER_URL=
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,21 @@ yarn-debug.log*
yarn-error.log*

# local env files
.env
.env.local
.env.dev
.env.development
.env.development.local
.env.staging
.env.staging.local
.env.test
.env.test.local
.env.prod
.env.production
.env.production.local
envvars.txt

.env.DNA.development
.env.DNA.production
.env.DNA.staging
.env.DNA.test
108 changes: 80 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next

## Getting Started

First, run the development server:
### Running Locally:

```bash
npm run dev
# or
yarn dev
```
- `cp .env.example .env.development`
- Replace `.env.development` with variables from Aaron
- `yarn dev`
- Open [http://localhost:3000](http://localhost:3000) in your browser.

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `pages/index.js`. The page auto-updates as you edit the file.

## Learn More
## NextJS

To learn more about Next.js, take a look at the following resources:

Expand All @@ -23,38 +18,95 @@ To learn more about Next.js, take a look at the following resources:

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel
## Styles

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/import?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
Always use `@emotion/styled` wherever possible. If regular CSS is required, use one of the following style files.
We manage our global styles in several files:

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
- `./styles/global-styles.tsx` (global stylesheet)
- `./styles/fonts.css` (global @font-face rules)
- `./styles/all.css` (global styles injected in at app root)
- `./styles/theme.tsx` (global theme variables)
- `./emotion.d.ts` (theme typings)

## Gotchas:

- App only loads using http://0.0.0.0:3000, using "localhost" does not work right now
- The app has a "Maintenance Mode" (branded fullscreen takeover), simply set `IS_MAINT_MODE=true`, and the `<Header/>` will disappear and `<Home/>` gets taken over by `<ComingSoon/>`. It's fun, try it!
- All the data for the app comes in from our staging server on Heroku, but you can also run the dna-admin CMS+API locally (hint: login only works with a localhost API)
- To run against the local API, set the `SPREE_API_URL` environment
variable to the local API host/port
- Complains about missing `.next/build-manifest.json` are usually indications
of a `next` build error. Try running `$(npm bin)/next build` to see the
exact error.

## Deploy URLS:

POL Admin Interface & API
http://dna-admin-dev.instinct.is/
http://dna-admin-staging.instinct.is/

POL Frontend Interface
https://dna-frontend-dev.instinct.is/
https://dna-frontend-staging.instinct.is/

## Keeping Your Code Updated:

When there are lots of active changes occuring on this repo, make sure to regularly:

1. Commit (or stash) your local changes on your branch
1. `git fetch origin`
1. `git checkout main`
1. `git pull origin main`
1. `git checkout <your_branch>`
1. `git merge main`
1. Fix merge conflicts (if any)
1. `git add .`
1. `git commit -m 'merge in latest main'`

Done!
…now you will be up-to-date with latest code. Do this before you submit your PR, and you can be sure it will be a clean merge.

## Testing API Endpoints

https://localhost:8080/apidocs/swagger_ui#/

## Updating a fork:

- `git remote add upstream [email protected]:1instinct/dna-frontend.git`
- `git fetch upstream`
- `git checkout main`
- `git pull upstream main`

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/import?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.

TODO:
# TODO:

- Flow / Type Checking
- React
- Express (SSR)
- Redux (project specific data mgmt)
- ~~React~~
- ~~SSR~~ (NextJS)
- ~~State Mgmt~~ (hooks/useContext... no Redux, yet)
- ~~Request Mgmt~~ (React Query)
- ~~Search~~ (Fuse.js)
- Pusher / API Integration
- Styled Components
- ~~Styled Components~~ (@emotion/styled)
- Moving Letters
- UI Sounds (proprietary: "npm install beeper")
- Maps
- File upload
- Form validation (Formik / React Final Form / YUP / Blitz inspo)
- Animations / Transitions
- File upload (ReactDropzone)
- ~~Form validation (Formik)~~
- Animations / Transitions (ReactSpring, GSAP)
- Gestures
- UI Alerts
- Uptime Monitoring
- Twilio
- Unit Testing
- Chat widget
- Chatbot
- Feature Detection
- Benchmarking
- Header tag injection (Helmet)
- Secrets management
- Chatbot (Rasa)
- Browser Feature Detection
- Speed/Performance Benchmarking (GTMetrix.com API?)
- Header tags customization (NextJS: `next/header`)
- ~~Secrets management / Environment variables~~ (`dot-env`)
21 changes: 21 additions & 0 deletions components/404/FourOhFour.styles.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import styled from "@emotion/styled";

export const NotFoundContainer = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: space-around;
min-height: 80vh;
font-family: ${(p) => p.theme.typography.titleSM.fontFamily};
`;

export const NotFoundTitle = styled.h1`
width: 100%;

text-align: center;
`;

export const NotFoundSubtitle = styled.h2`
width: 100%;
text-align: center;
`;
30 changes: 30 additions & 0 deletions components/404/FourOhFour.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import Lottie from "react-lottie";
import { Layout } from "../components";
import girlAnimation from "../../data/girl.json";
import { NotFoundContainer, NotFoundTitle, NotFoundSubtitle } from "./FourOhFour.styles";

const animationOptions = {
loop: true,
autoplay: true,
animationData: girlAnimation,
rendererSettings: {
preserveAspectRatio: "xMidYMid slice"
}
};

export const FourOhFour = () => {
return (
<Layout>
<NotFoundContainer>
<Lottie
options={animationOptions}
width={300}
height={300}
style={{ pointerEvents: "none" }}
/>
<NotFoundTitle>404</NotFoundTitle>
<NotFoundSubtitle>Whoops, keep looking...</NotFoundSubtitle>
</NotFoundContainer>
</Layout>
);
};
1 change: 1 addition & 0 deletions components/404/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { FourOhFour } from "./FourOhFour";
20 changes: 20 additions & 0 deletions components/Alerts/Alert.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import Swal from "sweetalert2";

export const Alert = Swal.mixin({
customClass: {
// container: 'container-class',
// popup: 'popup-class',
// header: 'header-class',
// title: 'title-class',
// closeButton: 'close-button-class',
icon: "alert-icon",
// image: 'image-class',
// content: 'content-class',
// input: 'input-class',
// actions: 'actions-class',
confirmButton: "alert-confirm"
// cancelButton: 'cancel-button-class',
// footer: 'footer-class'
},
buttonsStyling: false
});
1 change: 1 addition & 0 deletions components/Alerts/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Alert } from "./Alert";
45 changes: 45 additions & 0 deletions components/Animations/Animations.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import { fadeIn, slideInRight, slideOutLeft } from "react-animations";
import { useSpring, animated } from "react-spring";
import { keyframes } from "@emotion/react";
import styled from "@emotion/styled";

export const fadeInKeyframes = keyframes`
0% { opacity: 0; }
100% { opacity: 1; }
`;

export const fadeInOutKeyframes = keyframes`
0% { opacity: 1; }
50% { opacity: 0.25; }
100% { opacity: 1; }
`;

export const SlideInLeftKeyframes = keyframes`
0% { transform: translateX(-5rem); opacity: 0; }
100% { transform: translateX(0); opacity: 1; }
`;

export const SlideOutLeftKeyframes = keyframes`
0% { transform: translateX(0rem); opacity: 1; }
100% { transform: translateX(-5rem); opacity: 0; }
`;

// export const slideInLeftKeyframes = keyframes`${slideInLeft}`;

// export const slideOutLeftKeyframes = keyframes`${slideOutLeft}`;

export const FadeIn = styled.div`
animation: 0.33s ${fadeInKeyframes} ease-in-out infinite;
`;

export const FadeInOut = styled.div`
animation: 0.33s ${fadeInOutKeyframes} linear infinite;
`;

export const SlideOutLeft = styled.div`
animation: 0.33s ${SlideOutLeftKeyframes} cubic-bezier(0.215, 0.61, 0.355, 1);
`;

export const SlideInLeft = styled.div`
animation: 0.33s ${SlideInLeftKeyframes} cubic-bezier(0.215, 0.61, 0.355, 1);
`;
1 change: 1 addition & 0 deletions components/Animations/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from "./Animations";
36 changes: 36 additions & 0 deletions components/AuthForm/AuthForm.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import * as React from "react";
import Link from "next/link";
import { useRouter } from "next/router";
import { Formik, Form, Field, ErrorMessage } from "formik";
import styled from "@emotion/styled";
import { SignupForm } from "../SignupForm";
import { Login } from "../Login";
import { ResetPassword } from "../ResetPassword";

import { AuthFormType } from "./constants";
import { useAuth } from "../../config/auth";

const FieldContainer = styled.div`
margin: 15px 0px;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
`;

interface Props {
formType: AuthFormType;
}

export const AuthForm = ({ formType }: Props) => {
switch (formType) {
case AuthFormType.login:
return <Login />;
case AuthFormType.signup:
return <SignupForm />;
case AuthFormType.reset_password:
return <ResetPassword />;
default:
return null;
}
};
Loading