update production branch from main #172
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add delete and view buttons
* ops(cms): docker-compose volume mount declared volume instead of bind mount * feat(cms): add Orders payload collection * feat(cms): only disable local storage of media assets when s3 is enabled * feat(cms): add orderItems to Orders collection * refactor(cms): change order status to string format Current int format is not suitable for use as api
* Added merch products page * fix linting issues * Added merch products page * fix linting issues * Add delete and edit buttons for product page * Using type definition from merch.ts * Fix linting errors * Fix linting errors * import Product from types --------- Co-authored-by: LimIvan336 <[email protected]> Co-authored-by: Chung Zhi Xuan <[email protected]>
* refactor(types): redefine order types with zod to allow runtime reflection * feat(cms): add toPayloadZod() to convert zod objects into payload fields * refactor(cms)!: generate Order collection fields using toPayloadZod() * chore(cms): update autogen types from payload * refactor(cms): remove redundant assignment * chore: fix some of the lint issues * fix: lint suggested by iyzyman * fix(types): lint package.json main entry points to nonexistent file * fix(cms): lint unchecked on any by switching to concrete ZodFirstPartyTypeKind enum
* Revert "remove merch routes for launch (#130)" This reverts commit 6bb3c6d. * Disable merch store feature --------- Co-authored-by: LimIvan336 <[email protected]> Co-authored-by: Chung Zhi Xuan <[email protected]> Co-authored-by: iyzyman <[email protected]>
Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* refactor(cms): redirect payload to move generated types to cms directory * refactor: remove references to moved cms.ts generated types
* build(cms): downgrade payload-cloud-storage to 1.0.19 see payloadcms/payload#4952 * build: update yarn.lock
* Add merch promotions page * Add button to create promotion * Import Promotion class from types * Fix linting issue --------- Co-authored-by: limivann <[email protected]>
* build(cms): upgrade payload cms to v2.27.0 * build(cms): add payload packages for mongooseAdapter & slateEditor * chore(cms): regen types * chore: ignore eslint wrong inference any return from webpackBundler()
* feat(cms): Orders api config and edit function * Fix lint * Added toast for error messages, fix inconsistency issues
* feat(cms): add products collection to CMS * refactor(cms): change categories, colors, sizes to has many text fields
* changed SCSE to SCDS on frontend * changed links * update logos * committing files changed outside of web folder
* changed SCSE to SCDS on frontend * changed links * update logos * committing files changed outside of web folder
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.