diff --git a/README.md b/README.md index fbc704b..1b1fe13 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ Choose any project and start fixing the issues. Every issue you fix will fetch y So, if you want to contribute to a particular project by either fixing an issue or adding a feature, all you have to do is -- Fork the project -- Create a new branch -- Add a fix to the issue -- Create a Pull Request -- Submit the link to your Pull Request [here](https://sac.mnnit.ac.in/contrihub) -- Wait for it to accept and grab your points :smiley: +- Fork the project +- Create a new branch +- Add a fix to the issue +- Create a Pull Request +- Submit the link to your Pull Request [here](https://sac.mnnit.ac.in/contrihub) +- Wait for it to accept and grab your points :smiley: Also, please make sure to follow the proper formatting such as @@ -40,27 +40,27 @@ We will not be accepting more PR's until the formatting of the current files is Here is a quick and painless way to contribute to this project: -- Add your name to the `Getting_Started_CONTRIBUTORS.md` file. +- Add your name to the `Getting_Started_CONTRIBUTORS.md` file. Choose one or both, make a pull request for your work and wait for it to be merged! ## Getting Started -- Fork this repository (click the Fork button in the top right of this page, click your Profile Image) -- Clone your fork down to your local machine +- Fork this repository (click the Fork button in the top right of this page, click your Profile Image) +- Clone your fork down to your local machine ```markdown git clone https://github.com/your-username/XXXXX.git ``` -- Create a branch +- Create a branch ```markdown git checkout -b branch-name ``` -- Make your changes (choose from any task below) -- Commit and push +- Make your changes (choose from any task below) +- Commit and push ```markdown git add . @@ -68,9 +68,9 @@ git commit -m 'Commit message' git push origin branch-name ``` -- Create a new pull request from your forked repository (click the `New Pull Request` button located at the top of your repo) -- Wait for your PR review and merge approval! -- **Star this repository** :star: if you had fun! +- Create a new pull request from your forked repository (click the `New Pull Request` button located at the top of your repo) +- Wait for your PR review and merge approval! +- **Star this repository** :star: if you had fun! ## Choose from these tasks @@ -81,9 +81,9 @@ Add your name to the `Getting_Started_CONTRIBUTORS.md` file using the below conv ```markdown #### Name: [YOUR NAME](Your Profile Link) -- Place: City, State, Country -- Bio: Who are you? -- GitHub: [Github account link](GitHub link) +- Place: City, State, Country +- Bio: Who are you? +- GitHub: [Github account link](GitHub link) ``` ## Reference links @@ -105,9 +105,10 @@ Github-Flavored Markdown [https://guides.github.com/features/mastering-markdown/ If you still have more doubts then feel free to ping any of the student co-ordinator. -Team-2023 - +Team-2024 - -- [Priyav K Kaneria](https://github.com/PriyavKaneria) -- [Shashank Verma](https://github.com/shank03) -- [Amit Kumar](https://github.com/hackeramitkumar) -- [Sanskar Omar](https://github.com/sanskaromar) +- [Abhishek Patel](https://github.com/meisabhishekpatel) +- [Pranav Sanand Puligandla](https://github.com/Pra-San) +- [Sai Dheeraj Peketi](https://github.com/SaiDheerajPeketi) +- [Nandika Agarwal](https://github.com/Nandika-A) +- [Eleena Sarah Mathew](https://github.com/eleensmathew) diff --git a/home/templates/dashboard/mail_template_issue_action.html b/home/templates/dashboard/mail_template_issue_action.html index d39229f..22d6cf2 100644 --- a/home/templates/dashboard/mail_template_issue_action.html +++ b/home/templates/dashboard/mail_template_issue_action.html @@ -1,25 +1,19 @@ -{% comment %} - context = { - 'mentor': email_context.mentor.username, - 'user': email_context.user.username, - 'url': url, - 'protocol': , - 'issue': email_context.issue, - 'action': email_context.action, - 'host': email_context.host - } -{% endcomment %} -{% autoescape off %} -
-Hi there! {{ user }},

+{% comment %} context = { 'mentor': email_context.mentor.username, 'user': +email_context.user.username, 'url': url, 'protocol': , 'issue': +email_context.issue, 'action': email_context.action, 'host': email_context.host +} {% endcomment %} {% autoescape off %} +
+Hi there! {{ user }},

-{{ mentor }} has {{ action }} your requested issue assignment of {{ issue.project.name }}.

-Your Profile: {{ protocol }}://{{ host }}profile/user/{{ user }}

-See your issue on Github: {{ url }}

+{{ mentor }} has {{ action }} your requested issue assignment of {{ +issue.project.name }}.

+Your Profile: {{ protocol }}://{{ host }}profile/user/{{ user }}
+
+See your issue on Github: {{ url }}

-If clicking on any of the link above doesn't work, please copy and paste the URL in a new browser -window instead.

+If clicking on any of the link above doesn't work, please copy and paste the URL +in a new browser window instead.

-Sincerely,
-ContriHUB-23 Team
-{% endautoescape %} \ No newline at end of file +Sincerely,
+ContriHUB-24 Team
+{% endautoescape %} diff --git a/home/templates/dashboard/mail_template_pr_action.html b/home/templates/dashboard/mail_template_pr_action.html index b976361..91c3cb4 100644 --- a/home/templates/dashboard/mail_template_pr_action.html +++ b/home/templates/dashboard/mail_template_pr_action.html @@ -1,22 +1,15 @@ -{% comment %} - context = { - 'contributor': contributor, - 'url': url, - 'issue': issue, - 'action': 'accepted/rejected', - 'mentor': mentor.username, - 'subject': "PR Accepted/Rejected under ContriHUB-23.", - } -{% endcomment %} -{% autoescape off %} -
-Hi there! {{ user }},

+{% comment %} context = { 'contributor': contributor, 'url': url, 'issue': +issue, 'action': 'accepted/rejected', 'mentor': mentor.username, 'subject': "PR +Accepted/Rejected under ContriHUB-23.", } {% endcomment %} {% autoescape off %} +
+Hi there! {{ user }},

-Your Pull Request for Issue - {{ issue.number }} of Project {{ issue.project.name }} - has been {{ action }} by mentor, {{ mentor }}. -
-
-Sincerely,
-ContriHUB-23 Team
-{% endautoescape %} \ No newline at end of file +Your Pull Request for Issue + {{ issue.number }} of Project +{{ issue.project.name }} +has been {{ action }} by mentor, {{ mentor }}. +
+
+Sincerely,
+ContriHUB-24 Team
+{% endautoescape %} diff --git a/home/templates/dashboard/mail_template_request_issue_assignment.html b/home/templates/dashboard/mail_template_request_issue_assignment.html index 65bb4e3..60ebfcd 100644 --- a/home/templates/dashboard/mail_template_request_issue_assignment.html +++ b/home/templates/dashboard/mail_template_request_issue_assignment.html @@ -1,24 +1,20 @@ -{% comment %} - context = { - 'mentor': email_context.mentor.username, - 'user': email_context.user.username, - 'url': email_context.url, - 'protocol': , - 'host': email_context.host - } -{% endcomment %} -{% autoescape off %} -
-Hi there! {{ mentor }},

+{% comment %} context = { 'mentor': email_context.mentor.username, 'user': +email_context.user.username, 'url': email_context.url, 'protocol': , 'host': +email_context.host } {% endcomment %} {% autoescape off %} +
+Hi there! {{ mentor }},

-PFB the details of the issue requested for assignment.

-Your Profile: {{ protocol }}://{{ host }}profile/user/{{ mentor }}

-Requester's Profile: {{ protocol }}://{{ host }}profile/user/{{ user }}

-See Issue on Github: {{ url }}

+PFB the details of the issue requested for assignment.

+Your Profile: {{ protocol }}://{{ host }}profile/user/{{ mentor }}
+
+Requester's Profile: {{ protocol }}://{{ host }}profile/user/{{ user }} +
+
+See Issue on Github: {{ url }}

-If clicking on any of the link above doesn't work, please copy and paste the URL in a new browser -window instead.

+If clicking on any of the link above doesn't work, please copy and paste the URL +in a new browser window instead.

-Sincerely,
-ContriHUB-23 Team
-{% endautoescape %} \ No newline at end of file +Sincerely,
+ContriHUB-24 Team
+{% endautoescape %} diff --git a/home/templates/dashboard/mail_template_submit_pr_request.html b/home/templates/dashboard/mail_template_submit_pr_request.html index ba9f36c..eaca767 100644 --- a/home/templates/dashboard/mail_template_submit_pr_request.html +++ b/home/templates/dashboard/mail_template_submit_pr_request.html @@ -1,24 +1,21 @@ -{% comment %} - context = { - 'mentor': email_context.mentor.username, - 'user': email_context.user.username, - 'url': url, - 'protocol': , - 'host': email_context.host - } -{% endcomment %} -{% autoescape off %} -
-Hi there! {{ mentor }},

+{% comment %} context = { 'mentor': email_context.mentor.username, 'user': +email_context.user.username, 'url': url, 'protocol': , 'host': +email_context.host } {% endcomment %} {% autoescape off %} +
+Hi there! {{ mentor }},

-{{ user }} has requested for approval of the PR on a issue that you are mentoring.

-Your Profile: {{ protocol }}://{{ host }}profile/user/{{ mentor }}

-Contributor's Profile: {{ protocol }}://{{ host }}profile/user/{{ user }}

-See PR on Github: {{ url }}

+{{ user }} has requested for approval of the PR on a issue that you are +mentoring.

+Your Profile: {{ protocol }}://{{ host }}profile/user/{{ mentor }}
+
+Contributor's Profile: {{ protocol }}://{{ host }}profile/user/{{ user }} +
+
+See PR on Github: {{ url }}

-If clicking on any of the link above doesn't work, please copy and paste the URL in a new browser -window instead.

+If clicking on any of the link above doesn't work, please copy and paste the URL +in a new browser window instead.

-Sincerely,
-ContriHUB-23 Team
-{% endautoescape %} \ No newline at end of file +Sincerely,
+ContriHUB-24 Team
+{% endautoescape %} diff --git a/home/templates/footer.html b/home/templates/footer.html index dde0de7..596e004 100644 --- a/home/templates/footer.html +++ b/home/templates/footer.html @@ -1,8 +1,15 @@ -