Skip to content

Commit

Permalink
Merge branch 'develop' into skeleton_move_out
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaJ2305 authored Jan 21, 2025
2 parents 09ea473 + 317d9bd commit 6b0f5ba
Show file tree
Hide file tree
Showing 20 changed files with 564 additions and 392 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,3 @@ jobs:
- name: Notify release
run: |
echo "Release ${{ github.sha }} is ready to be deployed to production"
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: "20"

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Necessary to fetch all tags
fetch-depth: 0 # Necessary to fetch all tags

- name: Calculate next tag
id: calc_tag
Expand Down
20 changes: 17 additions & 3 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,25 @@
"useTabs": false,
"tabWidth": 2,
"semi": true,
"endOfLine": "lf",
"jsxSingleQuote": false,
"arrowParens": "always",
"tailwindFunctions": ["classNames"],
"importOrder": ["<THIRD_PARTY_MODULES>", "^@/lib/(.*)$", "^@/CAREUI/(.*)$", "^@/components/ui/(.*)$", "^@/components/(.*)$", "^@/hooks/(.*)$", "^@/common/(.*)$", "^@/(.*)$", "^[./]"],
"importOrder": [
"<THIRD_PARTY_MODULES>",
"^@/lib/(.*)$",
"^@/CAREUI/(.*)$",
"^@/components/ui/(.*)$",
"^@/components/(.*)$",
"^@/hooks/(.*)$",
"^@/common/(.*)$",
"^@/(.*)$",
"^[./]"
],
"importOrderSeparation": true,
"importOrderSortSpecifiers": true,
"plugins": ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"]
}
"plugins": [
"prettier-plugin-tailwindcss",
"@trivago/prettier-plugin-sort-imports"
]
}
39 changes: 17 additions & 22 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Run application",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"console": "integratedTerminal",
"runtimeExecutable": "npm",
"runtimeArgs": [
"run-script",
"dev"
],
"skipFiles": [
"<node_internals>/**"
]
}
]
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Run application",
"type": "node",
"request": "launch",
"cwd": "${workspaceFolder}",
"console": "integratedTerminal",
"runtimeExecutable": "npm",
"runtimeArgs": ["run-script", "dev"],
"skipFiles": ["<node_internals>/**"]
}
]
}
2 changes: 1 addition & 1 deletion crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ files:
- source: public/locale//{{lang}}.json
translation: /public/locale/%two_letters_code%.json
bundles:
- 2
- 2
5 changes: 5 additions & 0 deletions cypress/docs/cypress.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
# Cypress Testing Documentation

## Overview

This documentation covers the testing standards and patterns for our Cypress test suite.

## Quick Links

- [File Structure and Organization](./file-structure.md)
- [Testing Patterns](./patterns.md)
- [Best Practices](./best-practices.md)

## Core Principles

- Create and use reusable commands and functions
- Use data-cy attributes for element identification
- Follow Page Object Model pattern
- Write independent and isolated tests
- Use TypeScript for better type safety

## Getting Started

1. Familiarize yourself with the file structure
2. Review the testing patterns
3. Follow the best practices
4. Use the provided examples as templates

## Support

For questions or clarifications, refer to the specific documentation sections or reach out to the team.
6 changes: 6 additions & 0 deletions public/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,12 @@
"app_settings": "App Settings",
"apply": "Apply",
"appointment_booking_success": "Your appointment has been successfully booked!",
"appointment_cancelled": "Appointment has been cancelled!",
"appointment_created_success": "Appointment created successfully",
"appointment_details": "Appointment Details",
"appointment_not_found": "Appointment not found",
"appointment_rescheduled": "Appointment has been rescheduled!",
"appointment_rescheduled_successfully": "Appointment rescheduled successfully",
"appointment_type": "Appointment Type",
"appointments": "Appointments",
"approve": "Approve",
Expand Down Expand Up @@ -1758,6 +1761,9 @@
"required": "Required",
"required_quantity": "Required Quantity",
"reschedule": "Reschedule",
"reschedule_appointment": "Reschedule Appointment",
"rescheduled": "Rescheduled",
"rescheduling": "Rescheduling...",
"resend_otp": "Resend OTP",
"reset": "Reset",
"reset_password": "Reset Password",
Expand Down
Loading

0 comments on commit 6b0f5ba

Please sign in to comment.