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

Fix: CD-Staging #117

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Fix: CD-Staging #117

merged 1 commit into from
Jul 10, 2023

Conversation

RealDyllon
Copy link
Member

update cd-staging.yml and staging/docker-compose.yml

@vercel
Copy link

vercel bot commented Jul 10, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
website-ui-storybook ✅ Ready (Inspect) Visit Preview Jul 10, 2023 10:26am

@RealDyllon RealDyllon merged commit 613a60a into main Jul 10, 2023
3 checks passed
@github-actions github-actions bot temporarily deployed to Preview - website July 10, 2023 10:31 Inactive
@github-actions
Copy link

Deployment preview link: https://website-lk8mjjqij-cse-it.vercel.app

@RealDyllon RealDyllon deleted the other/fix-merch-deployment branch July 12, 2023 11:23
RealDyllon added a commit that referenced this pull request Oct 9, 2023
* [SCSE-145] Set up payloadcms for admin and cms teams (#39)

* install payload cms app

* bump deps

* initialize payloadcms

* add basic customization

* add nav links and custom routes

* refactor, fix css

* Add scse logo, update styles

* Fix cms dev docker-compose.yml (#41)

* Fix cms dev docker-compose.yml

* Fix cms dev docker-compose.yml

* Fix cms dev docker-compose.yml (#42)

* Deploy cms to staging docker in aws (#43)

* add cd staging deploy via ssh workflow job

* rename vars

* update deployments/staging/docker-compose.yml (#44)

* Deploy cms to staging docker in aws - fix ssh key perms (#45)

* update deployments/staging/docker-compose.yml

* fix staging ssh key permissions

Co-authored-by: Aryan <[email protected]>

* fix staging ssh key permissions (#46)

* Deploy cms to staging docker in aws - add nginx reverse proxy (#47)

* update staging deployment config

* fix staging deployment

* add nginx.conf

* update payload config serverURL

* update docker-compose.yml

* Deploy cms to staging docker in aws - fix payloadcms serverUrl (#48)

* fix staging deployment

* update payload config serverURL

* staging docker compose: replace nginx build action with image

* fix cms staging deployment

* fix cms staging deployment

* update nginx staging

* update staging docker-compose.yml

* fix: remove references to dotenv (#50)

* Setup chakra ui theming folders and files (#51)

* [SCSE-151] Deploy cms to staging docker in aws - Fix docker image build + Add traefik reverse proxy (#49)

* fix payloadcms docker

* fix payloadcms docker

* add traefik

* add traefik ssl + basic auth

* update deployment script (staging) (#55)

* add csrf (#56)

* [SCSE-218] Updated to new SCSE logo (#59)

* Change SCSE logo to new logo

* Change all 3 existing SCSE logo PNG files to new logo PNG file

---------

Co-authored-by: venusnmj <[email protected]>

* Enable Dynamic Image Support (#54)

* dynamic image support for nextjs and reactjs

* update test snapshot

* [SCSE-188] Implement Chakra UI custom colors (#60)

* Added custom colors to chakra ui theming files and use them in the ui package

* update test snapshot

---------

Co-authored-by: Jing Qiang <[email protected]>

* [SCSE-230] Fix prettier + eslint (#62)

* add prettier, fix eslint config

* add .prettierignore

* run prettier

* upgrade turbo

* fix cms types

* generate payload types

* add support for generating payloadcms types

* add prettier check to ci

* fix prettier script

* [SCSE-227] Init merch nodejs app in monorepo (#61)

* Init merch nodejs app in monorepo

* Create nodelogger package, add it to merch

* fix lint errors

* [SCSE-148] Added feature for Blog CMS upload image to AWS S3 (#52)

* cms: Added new feature to upload images to s3

[SCSE-148]

* fix: import alias

* [SCSE-231] Add types package (#63)

* fix lint errors

* fix lint errors

* update merch types

* add cms types

* remove old cms types file

* add cms graphql

* [SCSE-245] Add CODEOWNERS files (#65)

* Add CODEOWNERS file

* Add .github folder to CODEOWNERS

* fix typo

* Update github cd staging workflow and docker-compose.yml (#58)

* feat: added pull request validation workflow (#66)

* fix json5 vuln (#67)

Co-authored-by: Dyllon <[email protected]>

* Update jsonwebtoken dependency (#69)

* add color to turbo logs in gh actions, fix lint errors

* fix prettier ignore

* Fix CD Staging Script (#70)

* fix cd

* fix cd

* fix cd - remove debugging trigger (#71)

* feat: add filter blogs by name via nextjs dynamic routing (#68)

* [SCSE-224] Add navigation to sponsors' homepage on click in the carousel (#72)

* change sponsors carousel to static grid + add links to sponsors' pages

* restore carousel component

---------

Co-authored-by: Jing Qiang <[email protected]>

* [SCSE-142] Fix Mobile margins + favicon logo (#73)

* Sponsor page edits, mobile padding alignment and favicon changed

* yarn test -u

---------

Co-authored-by: venusnmj <[email protected]>

* [SCSE-244] Update all readme files (#64)

* Add README.md files

* fix a glaring typo

* update README.md

* update README.md

* [deploy] Fix CD Staging script  (#75)

* try fixing cd-staging script

* try fixing cd-staging script

* reset branches

* Override Chakra UI Button base styles (#76)

* [SCSE-147] Update the Post schema (#74)

* fix docker-compose.yml

* add slug property to Posts.ts

* Update Posts.ts

* add previews

* fix lint (obviously on my own)

* [SCSE-149] Import data from Wordpress (#57)

* SCSE-149 added python script to import blogs onto payload CMS

* SCSE-149 added python script to import blogs onto payload CMS

* removed variable and put them in a .env file

* Update .env.example

* added readme on how to use the script

* edited .env.example

* edited readme

* removed .env.example and requirements.txt

* Update docker-compose.yml (#78)

* Update docker-compose.yml

* Update docker-compose.yml

* Add uptime kuma to staging deployment (#82)

* add uptime kuma

* fix typo

* prettify file

* Update docker-compose.yml (#79)

* [SCSE-251] Refactor Web Structure (#83)

* refactor done

* refactored blogs api + web layout

* update contact email (#86)

* [SCSE-262] Implement v2 Navbar (#89)

* style: update colors to v2 design

* style: update fonts to v2 design

* feat: implement navbar v2

* [FIX] free up space in github actions runner (#91)

* [SCSE-266] Implement v2 Footer Component (#92)

* chore: remove FooterContentButton and FooterContentText components from ui

* add new scse logos

* feat: footer v2

* update test snapshot

---------

Co-authored-by: Jing Qiang <[email protected]>

* [SCSE-265] Implement v2 Hero Component (#94)

* update scse-logo asset for storybook

* Implement v2 Home Hero component

* add empty join page

* add image of scse students in the home hero component background

* update jest test

* [other] Upgrade storybook to v7 (#98)

* upgrade storybook to v7

* bump min node version to 16

* fix storybook bugs

* replace storybook/react with storybook/nextjs

* [SCSE-264] Implement Memories Section (#101)

* [SCSE-264] Implement Memories Section

* [SCSE-264] Implement Memories Section

* style: enhance ui

* fix: unique key for footer social links

* update jest test

* fix linting errors

* fixed home memories carousel autoscroll bug

---------

Co-authored-by: Jing Qiang <[email protected]>

* [SCSE-77] Implement Merch Sales Page (#103)

* [SCSE-77] Implement Merch Sales Page

* fix useHistory hook missing types

---------

Co-authored-by: BryanLeow <[email protected]>
Co-authored-by: Dyllon <[email protected]>

* [SCSE-263] Implement web v2 "Who Are We" and Upcoming Event sections (#104)

* [SCSE-263] Implement Who Are We section

* minor ui fixes

* add FooterSeparator and UpcomingEventRibbon

* update snapshot

---------

Co-authored-by: Jing Qiang <[email protected]>

* [SCSE-247] Build merch app as docker image (#100)

* Added Dockerfile, fixed package.lock and tsconfig

* Fixed CD pipeline for merch image build

* Fixed docker compose merch image

* Updated Dockerfile

* Directory clean up

* bump turbo version

* update gitignore

* temp fix build errors

* fix merch docker image

* add color to turbo build step in dockerfile

* update merch deps in package.json

---------

Co-authored-by: Dyllon <[email protected]>

* Merch docker v1 (#105)

* move merch Dockerfile

* fix refactoring error

* add @swc/core (tsup dep) (#106)

* Speed up CD Staging Workflows (#107)

* speed up cd staging workflow

* fix cd deployment traefik config

* fix cd deployment merch dockerfile port (#108)

* [other] replace next-transpile-modules with built-in transpiling (#112)

* replace next-transpile-modules with built-in transpiling

* fix typo

* update snapshots

* fix turbo dep order - remove parallel (#113)

* feat: Merch (#114)

* feat: Implement orders and products endpoint

[SCSE-236]
[SCSE-237]

* task: Port home page (product listing) (#77)

* feat(merch): Add CORS

* fix: Add CORS types

* feat: Add pricing calculator

* feat(merch): Implement product page

* chore: Run prettier on all merch files

* cleanup: Merge Cart and CartItem

* fix: Use state.cart.items instead of state.items

* update CODEOWNERS

* update CODEOWNERS

* feat(cart): Add cart button component (#95)

* Port thank you page (#99)

* fix: Handle 404 in orders

* feat: Init checkout feature (#102)

* cleanup: Rework merch backend

* chore: Move swiper dependency to web

[SCSE-275]

* fix: Add key to grid item

* chore: Rename JSONResponse to Response

* feat: Add name and image to quotation

* fix: Merch top padding

* feat: add cart page (#96)

[SCSE-271]

* cleanup: Remove quotation HTTP request

* feat: Add merch payment

* fix: Enable product selection by default

* chore: Fix yarn.lock

* fix web build

* update ci to use build:ci scripts for inter-app builds

* fix lint

* fix ci

* add missing env var for web#build

* disable vercel auto preview deployment

* add manual vercel preview deployments

* update turbo.json

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* bump next.js to latest

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update ci.yml

* update cd-staging.yml

---------

Co-authored-by: Guo Yong <[email protected]>
Co-authored-by: nicolelst <[email protected]>
Co-authored-by: Dyllon <[email protected]>
Co-authored-by: YoNG-Zaii <[email protected]>
Co-authored-by: kingsmil <[email protected]>
Co-authored-by: ykcyberarts <[email protected]>
Co-authored-by: dyllon <[email protected]>

* update cd-staging.yml (#115)

* FIx CD-Staging web build (#116)

* update cd-staging.yml

* refactor merch-helpers and nodelogger tsconfig.json

* fix merch build cjs errors

* suppress eslint issues

* add missing dependency to merch-helpers' package.json

* fix build errors

* fix import errors

* fix import errors

* fix ci

* update cd-staging.yml and staging/docker-compose.yml (#117)

* fix web deployment (Staging) (#119)

* [Other] Optimise CD-Staging deployment (#121)

* optimise web deployment (Staging)

* fix cd script error (missing http scheme in github_deployment creation url)

* update ci.yml

* update ci.yml

* update cd-staging.yml

* Update deployment config (#123)

* change dirs

* make deployment urls dynamic

* fix ci

* Create ci-production.yml

* Update ci-production.yml

* Merge pull request #124

* Update ci.yml

* [Other] Fix CD staging job Dependency order (#122)

* update cd-staging.yml

* update ci.yml

* update cd-staging.yml

* update ci.yml

* update ci.yml

* update cd-staging

* Fix ci.yml

* Update cd-staging.yml

* web: disable blog endpoints temporarily until image cdn is back online (#127)

* web: disabled blog endpoints temporarily until image cdn is back online

* web: disable blog ssg

* remove blog and events routes

* web: update lorem ipsum with copy (#128)

* update lorem ipsum with copy, temporarily hide image carousel until image cdn is back online

* hide events link in top web: nav bar

* remove routes for launch (#129)

* Update README.md

Co-authored-by: Chan Wen Xu <[email protected]>

---------

Co-authored-by: Aryan <[email protected]>
Co-authored-by: csbhlim222 <[email protected]>
Co-authored-by: Jing Qiang <[email protected]>
Co-authored-by: Jamie Goh <[email protected]>
Co-authored-by: Venus Ng <[email protected]>
Co-authored-by: venusnmj <[email protected]>
Co-authored-by: brandonlokemk <[email protected]>
Co-authored-by: Jing Qiang <[email protected]>
Co-authored-by: Jing Hua <[email protected]>
Co-authored-by: Guo Yong <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Thant Htoo Aung <[email protected]>
Co-authored-by: keykey117 <[email protected]>
Co-authored-by: Bryan Leow <[email protected]>
Co-authored-by: BryanLeow <[email protected]>
Co-authored-by: Chan Wen Xu <[email protected]>
Co-authored-by: nicolelst <[email protected]>
Co-authored-by: YoNG-Zaii <[email protected]>
Co-authored-by: kingsmil <[email protected]>
Co-authored-by: ykcyberarts <[email protected]>
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.

1 participant