Skip to content

Commit

Permalink
refactor(sync): sync stage and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
jomarmontuya committed Jan 25, 2024
2 parents 0de59d1 + e28e6db commit 0edf274
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 55 deletions.
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/BUG-REPORTS.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: "\U0001F41B Bug Report"
title: "\U0001F41B [Bug]: "
description: Create a bug report to help us fix it.
labels: ["☢️ Bug"]
labels: ['☢️ Bug']
body:
- type: textarea
id: description
attributes:
label: "Description"
label: 'Description'
description: Please enter an explicit description of your issue
placeholder: Short and explicit description of your incident...
validations:
required: true
required: true
- type: textarea
id: reprod
attributes:
Expand Down Expand Up @@ -47,4 +47,4 @@ body:
Any extra information that might help us investigate. For example, where are you deploying your application (Vercel, Docker, other platform)? Is it only reproducible on that platform, or locally too? Is the issue only happening in a specific browser? etc.
placeholder: |
I am hosting via Docker with the recommended `output: "standalone"` option", and if I remove that option or try a different hosting option, I cannot reproduce the same issue.
render: bash
render: bash
15 changes: 7 additions & 8 deletions .github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "\U0001F680 Feature Request"
title: "\U0001F680 [Feature]: "
description: Suggest an idea to improve this project.
labels: ["✏️ Feature"]
labels: ['✏️ Feature']
body:
- type: markdown
attributes:
Expand All @@ -12,17 +12,16 @@ body:
- type: textarea
id: description
attributes:
label: "Feature Description"
description: "A clear and detailed description of the feature you would like to see added."
placeholder: "Explain your feature clearly, and in detail."
label: 'Feature Description'
description: 'A clear and detailed description of the feature you would like to see added.'
placeholder: 'Explain your feature clearly, and in detail.'
render: bash
validations:
required: true
- type: textarea
id: additional-context
attributes:
label: "Additional Context (optional)"
description: "If you have something else to describe, write them here."
placeholder: "Write here what you can describe differently."
label: 'Additional Context (optional)'
description: 'If you have something else to describe, write them here.'
placeholder: 'Write here what you can describe differently.'
render: bash

12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/QUESTIONS.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: "🤔 Question"
name: '🤔 Question'
title: "\U0001F917 [Question]: "
description: Ask a question so we can help you easily.
labels: ["🤔 Question"]
labels: ['🤔 Question']

body:
- type: markdown
Expand All @@ -14,9 +14,9 @@ body:
- type: textarea
id: description
attributes:
label: "Question Description"
description: "A clear and detailed description of the question."
placeholder: "Explain your question clearly, and in detail."
label: 'Question Description'
description: 'A clear and detailed description of the question.'
placeholder: 'Explain your question clearly, and in detail.'
render: bash
validations:
required: true
required: true
24 changes: 12 additions & 12 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ middleware:
- src/middleware.js

accounts:
- any: ["src/*/accounts/**/*"]
- any: ['src/*/accounts/**/*']

accounts-page:
- any: ["src/pages/instances/**/*"]
- any: ['src/pages/instances/**/*']
accounts-pages:
- any: ["src/pages/profile/**/*"]
- any: ['src/pages/profile/**/*']
marketplace-page:
- any: ["src/pages/marketplace/**/*"]
- any: ['src/pages/marketplace/**/*']
docs-page:
- any: ["src/pages/docs/**/*"]
- any: ['src/pages/docs/**/*']

marketplace:
- any: ["src/*/marketplace/**/*"]
- any: ['src/*/marketplace/**/*']

docs:
- any: ["src/*/docs/**/*"]
- any: ['src/*/docs/**/*']
cta:
- any: ["src/*/cta/**/*"]
- any: ['src/*/cta/**/*']
globals:
- any: ["src/*/globals/**/*"]
- any: ['src/*/globals/**/*']

hooks:
- any: ["src/*/hooks/**/*"]
- any: ['src/*/hooks/**/*']

lib:
- any: ["src/lib/**/*"]
- any: ['src/lib/**/*']

marketing:
- any: ["src/*/marketing/**/*"]
- any: ['src/*/marketing/**/*']

zustand:
- any: ['src/store/*.js']
Expand Down
3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ Please delete options that are not relevant.

# How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.

- [ ] Manual Test
- [ ] Unit Test
- [ ] E2E Test

# Screenshots / Screen recording

Please add screenshots or recording if applicable
18 changes: 9 additions & 9 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ daysUntilStale: 90
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- "Partner"
- "Zesty Core Team"
- "Resolution: Backlog"
- "Type: Bug"
- "Type: ☢️ Bug"
- "Type: Needs Investigation"
- "Type: High Priority"
- 'Partner'
- 'Zesty Core Team'
- 'Resolution: Backlog'
- 'Type: Bug'
- 'Type: ☢️ Bug'
- 'Type: Needs Investigation'
- 'Type: High Priority'
# Label to use when marking an issue as stale
staleLabel: "Resolution: Stale"
staleLabel: 'Resolution: Stale'
issues:
# Comment to post when marking an issue as stale.
markComment: >
Expand All @@ -31,4 +31,4 @@ pulls:
We are sorry that we haven't been able to prioritize reviewing it yet. Your contribution is very much appreciated.
# Comment to post when closing a stale pull request.
closeComment: >
Closing this pull request after a prolonged period of inactivity. If this issue is still present in the latest release, please ask for this pull request to be reopened. Thank you!
Closing this pull request after a prolonged period of inactivity. If this issue is still present in the latest release, please ask for this pull request to be reopened. Thank you!
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
path: ./*
key: ${{ github.sha }}

- name: Setup Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
Expand All @@ -45,7 +45,7 @@ jobs:
- name: ✅ Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -72,7 +72,7 @@ jobs:
- name: ✅ Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
Expand All @@ -99,7 +99,7 @@ jobs:
- name: ✅ Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
- name: ✅ Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/pr_lint.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@

name: Zesty Website CI Dev

on:
pull_request:
types: [opened, synchronize,edited]
types: [opened, synchronize, edited]
branches: [stage, accounts, production, dev]
workflow_dispatch:


jobs:
pr_lint:
name: Check PR Title
name: Check PR Title
runs-on: ubuntu-latest
steps:
- uses: amannn/[email protected]
Expand Down
8 changes: 5 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@
.next
.vscode
.husky
.github

# testing
/coverage
cloudbuild-accounts.yaml
cloudbuild.yaml
cloudbuildProduction.yaml


# production
/build
/public
/src/blocks
*.yaml

# misc
.DS_Store
Expand All @@ -33,4 +35,4 @@ Dockerfile

# instance app

/src/views/InstancesApp
/src/views/InstancesApp
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "zesty-website",
"author": "Zesty.io Platform Inc.",
"email": "[email protected]",
"version": "1.0.10",
"version": "1.0.11",
"private": true,
"scripts": {
"dev": "NODE_OPTIONS='--inspect' next dev",
Expand Down
7 changes: 7 additions & 0 deletions src/views/zesty/Article.js
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,13 @@ function CtaComponent({ title, description, ctaText, ctaLink }) {
color: '#D0D5DD',
},
},
span: {
component: Typography,
props: {
variant: 'body1',
color: '#D0D5DD',
},
},
},
}}
>
Expand Down

0 comments on commit 0edf274

Please sign in to comment.