Skip to content

Commit

Permalink
Merge branch 'master' into feat/scorelab#891-edit-contributing-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
umangutkarsh authored Nov 21, 2023
2 parents 0d0f8d1 + b1909de commit 01b152a
Show file tree
Hide file tree
Showing 247 changed files with 13,909 additions and 12,044 deletions.
21 changes: 21 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
env: {
browser: true,
es2021: true
},
extends: ["eslint:recommended", "plugin:react/recommended"],
parserOptions: {
ecmaFeatures: {
jsx: true
},
ecmaVersion: 2020,
sourceType: "module"
},
plugins: ["react"],
rules: {},
settings: {
react: {
version: "detect"
}
}
};
24 changes: 13 additions & 11 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,15 +24,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,41 @@
<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots or GIF (In case of UI changes):

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
Expand Down
6 changes: 6 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run lint
npm run format

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

> 📝**NOTE** : Above steps are enough for you to get started with the Codelabz app. If you want to access the database you need to start the emulators.

### Using Docker-Compose

You can also use docker-compose to setup your project. Simply create your `.env` file and run
Expand Down Expand Up @@ -131,7 +132,6 @@ firebase emulators:start --import=testdata
make emulator

```

11. If make command isn't installed then run

```shell
Expand Down
15 changes: 8 additions & 7 deletions ISSUE_TEMPLATE/Bug_Report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Device Information (please complete the following information):**
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
7 changes: 3 additions & 4 deletions ISSUE_TEMPLATE/Feature_Request.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

title: ""
labels: ""
assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
2 changes: 2 additions & 0 deletions TESTDATA.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# TESTDATA

Located at `./testdata`.

```mermaid
flowchart TB
sougatarmail("Email Pass Login \n \n sougatariju13@gmail.com \n\n Pass : 123456 ")
Expand Down
37 changes: 19 additions & 18 deletions code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue,
email or any other method with the owners of this repository before making a change.
email or any other method with the owners of this repository before making a change.
Please note we have a code of conduct, please follow it in all your interactions with the project.

## Pull Request Process

* Ensure any install or build dependencies are removed before the end of the layer when doing a build.
- Ensure any install or build dependencies are removed before the end of the layer when doing a build.

* ___Pull request message format: [Fixes done] #[issue number] [Description of the issue]___
* Wait for the maintainers to review your pull request and do the changes if requested.
- **_Pull request message format: [Fixes done] #[issue number] [Description of the issue]_**
- Wait for the maintainers to review your pull request and do the changes if requested.

## Best Contribution Practices

**Commits**
* Write clear meaningful git commit messages.
* Make sure your PR's description contains GitHub's special keyword references that automatically close the related issue when the PR is merged. (More info at https://github.com/blog/1506-closing-issues-via-pull-requests )
* When you're submitting a PR for a UI-related issue, it would be really awesome if you add a screenshot of your change or a link to a deployment where it can be tested out along with your PR. This makes it very easy for the reviewers and you'll also get reviews quicker.

- Write clear meaningful git commit messages.
- Make sure your PR's description contains GitHub's special keyword references that automatically close the related issue when the PR is merged. (More info at https://github.com/blog/1506-closing-issues-via-pull-requests )
- When you're submitting a PR for a UI-related issue, it would be really awesome if you add a screenshot of your change or a link to a deployment where it can be tested out along with your PR. This makes it very easy for the reviewers and you'll also get reviews quicker.

**Feature Requests and Bug Reports**
* When you file a feature request or when you are submitting a bug report, make sure you add steps to reproduce it. Especially if that bug is some weird/rare one.

* ___Please follow the templates when posting a issue.___
- When you file a feature request or when you are submitting a bug report, make sure you add steps to reproduce it. Especially if that bug is some weird/rare one.

* Feature_Request / Bug_Report - [includes in repository]
- **_Please follow the templates when posting a issue._**

* Would you like to work on the issue?
* [X] Yes
* [ ] No
* [ ] Other:
- Feature_Request / Bug_Report - [includes in repository]

- Would you like to work on the issue?
- [x] Yes
- [ ] No
- [ ] Other:

**Join the development**
* Before you join development, please set up the project on your local machine, run it and go through the application completely.
* If you would like to work on an issue, drop in a comment at the issue. If it is already assigned to someone, but there is no sign of any work being done, please free to drop in a comment so that the issue can be assigned to you if the previous assignee has dropped it entirely.
* Feel free to Ask Anything! 😎 [Gitter]:https://gitter.im/scorelab/
[homepage]:https://github.com/scorelab/

- Before you join development, please set up the project on your local machine, run it and go through the application completely.
- If you would like to work on an issue, drop in a comment at the issue. If it is already assigned to someone, but there is no sign of any work being done, please free to drop in a comment so that the issue can be assigned to you if the previous assignee has dropped it entirely.
- Feel free to Ask Anything! 😎 [Gitter]:https://gitter.im/scorelab/
[homepage]:https://github.com/scorelab/
7 changes: 3 additions & 4 deletions cypress.config.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { defineConfig } from 'cypress';

import { defineConfig } from "cypress";

export default defineConfig({
e2e: {
setupNodeEvents(on, config) {
// implement node event listeners here
},
baseUrl: 'http://localhost:5173',
testIsolation: false,
baseUrl: "http://localhost:5173",
testIsolation: false
},
projectId: process.env.CYPRESS_PROJECT_ID
});
20 changes: 10 additions & 10 deletions cypress/e2e/authed_tests/visit_routes.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}login`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}dashboard/my_feed`);
});
});
Expand All @@ -34,7 +34,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}signup`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}dashboard/my_feed`);
});
});
Expand All @@ -43,7 +43,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}forgotpassword`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}dashboard/my_feed`);
});
});
Expand All @@ -52,7 +52,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}manageusers`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}`);
});
});
Expand All @@ -61,7 +61,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}dashboard`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}dashboard/my_feed`);
});
});
Expand All @@ -70,7 +70,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}dashboard/my_feed`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}dashboard/my_feed`);
});
});
Expand All @@ -79,7 +79,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}profile`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}profile`);
});
});
Expand All @@ -88,7 +88,7 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}org/codelabzorg`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}org/codelabzorg`);
});
});
Expand All @@ -97,15 +97,15 @@ describe("Authenticated Route Access Test | CodeLabz", () => {
cy.visit(`${this.base_url}tutorials`);
cy.wait(5000);

cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}tutorials`);
});
});

it("Visit Home Page - Passing", function () {
cy.visit(`${this.base_url}`);
cy.wait(5000);
cy.location().should((loc) => {
cy.location().should(loc => {
expect(loc.href).to.eq(`${this.base_url}`);
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ describe("Forgot Password Page | CodeLabz", () => {
});
});


before(function () {
indexedDB.deleteDatabase("firebaseLocalStorageDb");
});
Expand All @@ -23,8 +22,7 @@ describe("Forgot Password Page | CodeLabz", () => {

it("empty email ", function () {
cy.visit(`${this.base_url}forgotpassword`);
cy.get("[data-testId=forgotPasswordButton]").should('be.disabled');

cy.get("[data-testId=forgotPasswordButton]").should("be.disabled");
});
it("successfull ", function () {
cy.visit(`${this.base_url}forgotpassword`);
Expand Down
Loading

0 comments on commit 01b152a

Please sign in to comment.