Skip to content

Add contact & policy pages and fix footer links#46

Open
mjfxjas wants to merge 1 commit into1instinct:@aaron.smulktis/developfrom
mjfxjas:pr/contact-clean
Open

Add contact & policy pages and fix footer links#46
mjfxjas wants to merge 1 commit into1instinct:@aaron.smulktis/developfrom
mjfxjas:pr/contact-clean

Conversation

@mjfxjas
Copy link
Collaborator

@mjfxjas mjfxjas commented Dec 16, 2025

1: Adds pages:
/contact, /accessibility, /ca-privacy-right, /prop65, /rewards, /returns

2: Updates footer links to use Next.js and point to the new routes

3: Minor cleanup only; no unrelated refactors

@aaronsmulktis aaronsmulktis changed the base branch from main to @aaron.smulktis/develop December 17, 2025 03:23
Copy link
Member

@aaronsmulktis aaronsmulktis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of these changes are great... few requests to revert some things, which you can easily do by running:

git checkout ./path/to/file/to/revert.tsx

I didn't test this branch locally, didn't feel like cloning your repo... I'll most likely just approve & merge after you address these changes

Thank you!!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove these changes.. the loading component works again... you just need to run:

git pull upstream @aaron.smulktis/develop

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove these changes too.. they seem good (in theory)... check if the window object exists, but its currently working without all these changes... we just need to "lazy load" this everywhere (see useCart, useProducts, or any other hook in that folder)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is necessary either?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can prob remove this too

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the app may break using any newer version than 18... but we can try this

@aaronsmulktis
Copy link
Member

You can resolve these merge conflicts by doing something similar to what I was doing today...

While on your branch run:

  1. git pull upstream @aaron.smulktis/develop
  2. (Fix merge conflicts locally in VSCode)
  3. git add -p (stage changes in patch mode)
  4. git commit
  5. git rebase --continue OR git merge --continue (whichever you set your git pull.config to

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants