From 1672c868455841a5546c2a4e71622c2d03c23858 Mon Sep 17 00:00:00 2001 From: Anjaliavv51 <154777864+Anjaliavv51@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:32:56 +0530 Subject: [PATCH 1/8] Aligned #1107 --- Html-Files/appointment.html | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/Html-Files/appointment.html b/Html-Files/appointment.html index ad2833cc..0932926a 100644 --- a/Html-Files/appointment.html +++ b/Html-Files/appointment.html @@ -792,7 +792,6 @@ border: 1px solid #5a7f5a; border-radius: 5px; font-size: 14px; - width: 100%; box-sizing: border-box; background-color: #005253; color: #e0f7e4; @@ -938,7 +937,7 @@ }; -
+
Rate Us - -
  • - Sign in/Sign up -
    • -
    @@ -1162,13 +1152,9 @@

    RAPIDOC Newsletter

     -
    -
    +
    Date: Fri, 2 Aug 2024 15:03:24 +0530 Subject: [PATCH 2/8] auto #1107 --- .github/workflows/auto-label-pr.yml | 43 +++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml index e6cbe781..6176d636 100644 --- a/.github/workflows/auto-label-pr.yml +++ b/.github/workflows/auto-label-pr.yml @@ -1,26 +1,47 @@ -name: Auto Label PRs +name: Auto Label on: pull_request: - types: [opened, edited] + types: [opened, edited,reopened] jobs: - label_pr: + auto-label: runs-on: ubuntu-latest steps: - uses: actions/labeler@v4 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token: "${{ secrets.GITHUB_TOKEN }}" configuration-path: .github/labeler.yml - - name: Add GSSOC label + check-title: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Label PRs based on title uses: actions/github-script@v6 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - github.rest.issues.addLabels({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - labels: ['gssoc'] - }) \ No newline at end of file + const title = context.payload.pull_request.title.toLowerCase(); + const labelsToAdd = []; + + if (title.includes('gssoc')) { + labelsToAdd.push('gssoc'); + } + + if (title.includes('bug')) { + labelsToAdd.push('bug'); + } else if (title.includes('enhancement')) { + labelsToAdd.push('enhancement'); + } else if (title.includes('documentation')) { + labelsToAdd.push('documentation'); + } + + if (labelsToAdd.length > 0) { + await github.rest.issues.addLabels({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.name, + labels: labelsToAdd + }); + } \ No newline at end of file From d396b65c1d926e56074e91a1ea603361c36fd476 Mon Sep 17 00:00:00 2001 From: Anjaliavv51 <154777864+Anjaliavv51@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:32:20 +0530 Subject: [PATCH 3/8] Alignment #1107 --- Html-Files/appointment.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Html-Files/appointment.html b/Html-Files/appointment.html index 0932926a..e35e5625 100644 --- a/Html-Files/appointment.html +++ b/Html-Files/appointment.html @@ -895,6 +895,19 @@ #preview-section button { font-size: 14px; } +} +@media screen and (max-width: 767px) { + small { + font-size: 12px; + padding: 8px 0; + } +} + +@media screen and (max-width: 480px) { + small { + font-size: 10px; + padding: 6px 0; + } } From 3269fa17cbd9d77f8c01aa4bcff7ce28e507f3b8 Mon Sep 17 00:00:00 2001 From: Anjaliavv51 <154777864+Anjaliavv51@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:34:51 +0530 Subject: [PATCH 4/8] Navbar #1107 --- Html-Files/appointment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Html-Files/appointment.html b/Html-Files/appointment.html index e35e5625..92f3799e 100644 --- a/Html-Files/appointment.html +++ b/Html-Files/appointment.html @@ -950,7 +950,7 @@ }; -
    +
    Date: Fri, 2 Aug 2024 20:36:37 +0530 Subject: [PATCH 5/8] Navbar padding right adjusted to 160px #1107 --- Html-Files/appointment.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Html-Files/appointment.html b/Html-Files/appointment.html index 92f3799e..77acf83b 100644 --- a/Html-Files/appointment.html +++ b/Html-Files/appointment.html @@ -950,7 +950,7 @@ }; -
    +
    Date: Fri, 2 Aug 2024 20:42:53 +0530 Subject: [PATCH 6/8] updated PR label #1107 --- .github/workflows/auto-label-pr.yml | 51 ++++++++++++++++------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml index 6176d636..e6311732 100644 --- a/.github/workflows/auto-label-pr.yml +++ b/.github/workflows/auto-label-pr.yml @@ -2,46 +2,53 @@ name: Auto Label on: pull_request: - types: [opened, edited,reopened] + types: [opened, edited, synchronize,reopened] jobs: auto-label: - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: .github/labeler.yml - - check-title: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Label PRs based on title + - name: Label PRs uses: actions/github-script@v6 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - const title = context.payload.pull_request.title.toLowerCase(); - const labelsToAdd = []; + const { owner, repo } = context.repo; + const pr = context.payload.pull_request; - if (title.includes('gssoc')) { - labelsToAdd.push('gssoc'); + async function addLabels(labels) { + await github.rest.issues.addLabels({ + issue_number: pr.number, + owner: owner, + repo: repo, + labels: labels + }); } + await addLabels(['gssoc']); + + // Check PR title for other labels + const title = pr.title.toLowerCase(); + const labelsToAdd = []; + if (title.includes('bug')) { labelsToAdd.push('bug'); - } else if (title.includes('enhancement')) { + } + if (title.includes('enhancement')) { labelsToAdd.push('enhancement'); - } else if (title.includes('documentation')) { + } + if (title.includes('documentation')) { labelsToAdd.push('documentation'); } if (labelsToAdd.length > 0) { - await github.rest.issues.addLabels({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.name, - labels: labelsToAdd - }); + await addLabels(labelsToAdd); + } + + const body = pr.body; + const issueMatch = body.match(/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*:?\s*#(\d+)/i); + + if (!issueMatch) { + core.setFailed('No related issue mentioned in the PR description. Please use the PR template and mention the related issue.'); } \ No newline at end of file From 652f5c2ed62712d08c6918d60572cfd4cb79fc60 Mon Sep 17 00:00:00 2001 From: Anjaliavv51 <154777864+Anjaliavv51@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:45:26 +0530 Subject: [PATCH 7/8] after checks updation #1107 --- .github/workflows/auto-label-pr.yml | 39 +++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml index e6311732..7343bae1 100644 --- a/.github/workflows/auto-label-pr.yml +++ b/.github/workflows/auto-label-pr.yml @@ -2,13 +2,12 @@ name: Auto Label on: pull_request: - types: [opened, edited, synchronize,reopened] + types: [opened, edited, synchronize] jobs: auto-label: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - name: Label PRs uses: actions/github-script@v6 with: @@ -25,10 +24,9 @@ jobs: labels: labels }); } - + await addLabels(['gssoc']); - // Check PR title for other labels const title = pr.title.toLowerCase(); const labelsToAdd = []; @@ -46,9 +44,40 @@ jobs: await addLabels(labelsToAdd); } - const body = pr.body; + const body = pr.body || ''; const issueMatch = body.match(/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*:?\s*#(\d+)/i); if (!issueMatch) { core.setFailed('No related issue mentioned in the PR description. Please use the PR template and mention the related issue.'); + } else { + console.log('Related issue found:', issueMatch[1]); + } + + check-issue-assignment: + runs-on: ubuntu-latest + steps: + - name: Check Issue Assignment + uses: actions/github-script@v6 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + const pr = context.payload.pull_request; + const body = pr.body || ''; + const issueMatch = body.match(/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*:?\s*#(\d+)/i); + + if (issueMatch) { + const issueNumber = parseInt(issueMatch[1]); + const issue = await github.rest.issues.get({ + owner: context.repo.owner, + repo: context.repo.name, + issue_number: issueNumber + }); + + if (!issue.data.assignee) { + core.setFailed('The related issue is not assigned. Please assign the issue before submitting a PR.'); + } else { + console.log('Issue is properly assigned.'); + } + } else { + core.setFailed('No related issue mentioned in the PR description. Please use the PR template and mention the related issue.'); } \ No newline at end of file From c339ae496a76c0e2bc3eb2b81d9f190c38554faf Mon Sep 17 00:00:00 2001 From: Anjaliavv51 <154777864+Anjaliavv51@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:47:04 +0530 Subject: [PATCH 8/8] updated #1107 --- .github/workflows/auto-label-pr.yml | 61 ++++------------------------- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml index 7343bae1..c2297b74 100644 --- a/.github/workflows/auto-label-pr.yml +++ b/.github/workflows/auto-label-pr.yml @@ -1,14 +1,14 @@ -name: Auto Label +name: Auto Label and Issue Check on: pull_request: types: [opened, edited, synchronize] jobs: - auto-label: + auto-label-and-check: runs-on: ubuntu-latest steps: - - name: Label PRs + - name: Add GSSoC Label and Check Issue uses: actions/github-script@v6 with: github-token: ${{secrets.GITHUB_TOKEN}} @@ -16,32 +16,16 @@ jobs: const { owner, repo } = context.repo; const pr = context.payload.pull_request; - async function addLabels(labels) { + try { await github.rest.issues.addLabels({ issue_number: pr.number, owner: owner, repo: repo, - labels: labels + labels: ['gssoc'] }); - } - - await addLabels(['gssoc']); - - const title = pr.title.toLowerCase(); - const labelsToAdd = []; - - if (title.includes('bug')) { - labelsToAdd.push('bug'); - } - if (title.includes('enhancement')) { - labelsToAdd.push('enhancement'); - } - if (title.includes('documentation')) { - labelsToAdd.push('documentation'); - } - - if (labelsToAdd.length > 0) { - await addLabels(labelsToAdd); + console.log('Added gssoc label'); + } catch (error) { + console.error('Error adding gssoc label:', error); } const body = pr.body || ''; @@ -51,33 +35,4 @@ jobs: core.setFailed('No related issue mentioned in the PR description. Please use the PR template and mention the related issue.'); } else { console.log('Related issue found:', issueMatch[1]); - } - - check-issue-assignment: - runs-on: ubuntu-latest - steps: - - name: Check Issue Assignment - uses: actions/github-script@v6 - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const pr = context.payload.pull_request; - const body = pr.body || ''; - const issueMatch = body.match(/(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s*:?\s*#(\d+)/i); - - if (issueMatch) { - const issueNumber = parseInt(issueMatch[1]); - const issue = await github.rest.issues.get({ - owner: context.repo.owner, - repo: context.repo.name, - issue_number: issueNumber - }); - - if (!issue.data.assignee) { - core.setFailed('The related issue is not assigned. Please assign the issue before submitting a PR.'); - } else { - console.log('Issue is properly assigned.'); - } - } else { - core.setFailed('No related issue mentioned in the PR description. Please use the PR template and mention the related issue.'); } \ No newline at end of file