Skip to content

Commit

Permalink
Merge branch 'main' into overlap-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
varshith257 authored Jul 31, 2024
2 parents 7de6080 + 03a8f8f commit cb4a43e
Show file tree
Hide file tree
Showing 12 changed files with 2,062 additions and 405 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- ISSUE & PR TITLE SHOULD BE SAME-->
## Description
<!--Please include a brief description of the changes or features added-->
<!--Please include a brief description of the changes-->


## Related Issues
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/assignlabel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Assign Issue to Creator

on:
issue_comment:
types: [created]

jobs:
assign-issue:
runs-on: ubuntu-latest
if: contains(github.event.comment.body, '/assign')
steps:
- name: Check commenter permissions
id: check-permissions
uses: actions/github-script@v6
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const { owner, repo } = context.repo;
const commenter = context.payload.comment.user.login;
const { data: repoPermission } = await github.rest.repos.getCollaboratorPermissionLevel({
owner,
repo,
username: commenter,
});
const allowedPermissions = ['admin', 'maintain', 'write'];
const hasPermission = allowedPermissions.includes(repoPermission.permission);
return hasPermission;
- name: Assign issue to creator
if: steps.check-permissions.outputs.result == 'true'
uses: actions/github-script@v6
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const { owner, repo } = context.repo;
const issue_number = context.issue.number;
const { data: issue } = await github.rest.issues.get({
owner,
repo,
issue_number,
});
const creator = issue.user.login;
await github.rest.issues.addAssignees({
owner,
repo,
issue_number,
assignees: [creator],
});
console.log(`Assigned issue #${issue_number} to creator ${creator}`);
62 changes: 32 additions & 30 deletions .github/workflows/auto-label-pr.yml
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@

name: Auto Label PR
name: Auto Label PRs

on:
pull_request:
types: [opened, reopened, edited,synchronize]
types: [opened, edited]

jobs:
label_pr:
runs-on: ubuntu-latest
permissions:
pull-requests: write
steps:
- name: Label PR
- uses: actions/labeler@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/labeler.yml

- name: Add GSSOC label
uses: actions/github-script@v6
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const pr = context.payload.pull_request;
// Add gssoc label to all PRs
await github.rest.issues.addLabels({
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
labels: ['gssoc']
});
})
- name: Add additional labels based on title
uses: actions/github-script@v6
with:
github-token: ${{secrets.GITHUB_TOKEN}}
script: |
const title = context.payload.pull_request.title.toLowerCase();
const labelsToAdd = [];
const prBody = pr.body ? pr.body.toLowerCase() : '';
const prTitle = pr.title.toLowerCase();
if (title.includes('documentation')) {
labelsToAdd.push('documentation');
}
if (title.includes('feature')) {
labelsToAdd.push('feature');
}
if (title.includes('bug')) {
labelsToAdd.push('bug');
}
const addLabel = async (label) => {
await github.rest.issues.addLabels({
if (labelsToAdd.length > 0) {
github.rest.issues.addLabels({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
labels: [label]
labels: labelsToAdd
});
};
if (prBody.includes('documentation') || prTitle.includes('doc') || prBody.includes('readme')) {
await addLabel('documentation');
}
if (prBody.includes('feature') || prBody.includes('enhancement') || prTitle.includes('add') || prTitle.includes('implement')) {
await addLabel('enhancement');
}
if (prBody.includes('bug') || prBody.includes('fix') || prTitle.includes('fix') || prTitle.includes('resolve')) {
await addLabel('bug');
}
63 changes: 60 additions & 3 deletions Html-Files/Css-Files/Experiencestyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ body {
align-items: center;
height: 60px;
margin: auto;
position: fixed;
width: 100vw;
height: 4.8rem;
}
.h{
margin-top: 90px;
}
*,*::after,*::before{
/*padding: 0;
Expand All @@ -147,6 +153,7 @@ margin-bottom: 20px;
.filter-sort {
display: flex;
align-items: center;
flex-wrap: wrap;
}

.filter-sort label {
Expand Down Expand Up @@ -356,6 +363,7 @@ align-items: center;
/*? socials */
.social-wrapper {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
margin: 0 auto;
}
Expand Down Expand Up @@ -390,7 +398,51 @@ align-items: center;
}



@media (max-width:768px){
.footer-bottom-wrapper{
position: relative;
right: 200px;
width: 68%;
}
#doctor-list li{
width: 56%;
}
.min,#fee-filter,#fee-value{
position: relative;
right: 416px;
top: 39px;
}
.img img {
position: relative;
left: 300px;
bottom: 12px;
}
#sort-btn{
position: relative;
right: 494px;
top: 75px;
}
.filter-sort{
height: 117px;
}
}
@media (max-width:576px) {
.footer-bottom-wrapper{
position: relative;
right: 140px;
}
}
@media screen and (max-width:620px) {
.min,#fee-filter,#fee-value{
right: 420px;
top: 75px;
}
#sort-btn{
right: 112px;
top: 42px;
}

}
@media (min-width: 600px) {
.other-columns {
display: grid;
Expand All @@ -407,7 +459,7 @@ align-items: center;
margin-left: 1.5rem;
}
}

@media (max-width: 800px) {
.footer-top {
display: flex;
Expand All @@ -421,6 +473,8 @@ align-items: center;
font-size: 1.5rem
}
#ss{
display: flex;
flex-wrap: wrap;
font-size: 1.3rem;
}
.social-links #insta:hover {
Expand Down Expand Up @@ -526,6 +580,8 @@ align-items: center;
#back-to-top:hover {
transform: scale(1.1);
}
<<<<<<< HEAD
=======
#subscribeBanner {
display: none;
position: fixed;
Expand Down Expand Up @@ -655,4 +711,5 @@ align-items: center;
#doctor-list li .content:hover {
color: aliceblue;
font-size: 30px;
}
}
>>>>>>> c95240aabf081bcd1831deb17d34a642e1974c6b
Loading

0 comments on commit cb4a43e

Please sign in to comment.