Skip to content

Commit

Permalink
Merge branch 'main' of github.com:juspay/hyperswitch-control-center i…
Browse files Browse the repository at this point in the history
…nto HCC-928-connector-logo-changes-search-for-connector
  • Loading branch information
Riddhiagrawal001 committed Dec 6, 2023
2 parents fbf3bcb + 948a328 commit d886d4f
Show file tree
Hide file tree
Showing 43 changed files with 1,242 additions and 1,152 deletions.
15 changes: 5 additions & 10 deletions .githooks/commit-msg
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ commit_msg=$(cat "$commit_msg_file")
echo
echo "*****~~~~~ Formatting - Check for unformatted files ~~~~~~*****"

# Check for unformatted JavaScript, TypeScript, and JSON files using Prettier
unformatted_js_files=$(git ls-files | grep '\.js\|\.jsx\|\.ts\|\.tsx\|\.json' | xargs npx prettier --list-different)
# Check for unformatted JavaScript and JSON files using Prettier
unformatted_js_files=$(git ls-files | grep '\.js\|\.json' | xargs npx prettier --list-different)

# If there are unformatted JavaScript, TypeScript, or JSON files, print an error message and exit with a non-zero status code
if [ -n "$unformatted_js_files" ]; then
Expand All @@ -26,14 +26,6 @@ echo
echo "*****~~~~~ All files are formatted. ~~~~~~*****"
echo

# JS Code Check
echo "*****~~~~~ Checking ReScript Code ~~~~~~*****"
if (! npm run re:build)
then
echo "*****~~~~~ ReScript Code Compilation Failed! ~~~~~*****"
exit 1
fi

echo
echo "*****~~~~~ Commit message validation! ~~~~~*****"
echo
Expand All @@ -51,9 +43,12 @@ else
echo "~~~~**** Error: Commit Signature Missing. ****~~~~"
echo "Please make sure to sign your commits. You can sign your commit by using the '-S' option with 'git commit'."
echo "Example: git commit -S -m 'Your commit message'"
echo "Signing commits is crucial for verifying contributions. Consult GitHub's documentation on commit signature verification for guidance: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits"
exit 1
fi

# If the commit message matches the convention, the script exits successfully.
echo
echo "*****~~~~~ Commit hook completed ~~~~~~*****"
echo
exit 0
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ Or did you test this change manually (provide relevant screenshots)?
- [ ] I ran `npm run re:build`
- [ ] I reviewed submitted code
- [ ] I added unit tests for my changes where possible
- [ ] I added a [CHANGELOG](/CHANGELOG.md) entry if applicable
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ env-config.js
yarn.lock
#package-lock.json
user_data.sh
*.pem
*.pem
.bsb.lock
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
CHANGELOG.md
CHANGELOG.md
*euclid*
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [conven

- - -

## 1.2.0 (2023-12-06)

### Features

- Bankofamerica addition in prod ([#69](https://github.com/juspay/hyperswitch-control-center/pull/69)) ([`bf6bde8`](https://github.com/juspay/hyperswitch-control-center/commit/bf6bde89eaaf3c443e07c191b42d2a9293377130))
- Support oss auth flow ([#64](https://github.com/juspay/hyperswitch-control-center/pull/64)) ([`59601ec`](https://github.com/juspay/hyperswitch-control-center/commit/59601ec4449505ff4fcd1e048d6ced78997062a9))

### Bug Fixes

- 3ds code refactor and bugfixes ([#61](https://github.com/juspay/hyperswitch-control-center/pull/61)) ([`9d4f503`](https://github.com/juspay/hyperswitch-control-center/commit/9d4f5036b458b671f4f1899619d891f74e936b8f))
- Commit-msg file changes & README.md file updated. ([#65](https://github.com/juspay/hyperswitch-control-center/pull/65)) ([`96a81e0`](https://github.com/juspay/hyperswitch-control-center/commit/96a81e0363ade432fb288cc59a5dfb64ad029e48))
- Update README.md ([#66](https://github.com/juspay/hyperswitch-control-center/pull/66)) ([`1930bd2`](https://github.com/juspay/hyperswitch-control-center/commit/1930bd294de22a962304c4389426b741429fd1dc))
- Live Mode SDK Fixes. ([#67](https://github.com/juspay/hyperswitch-control-center/pull/67)) ([`844920b`](https://github.com/juspay/hyperswitch-control-center/commit/844920b6fd09aa07edbf33ba83ff2aaa394c7a78))

**Full Changelog:** [`v1.1.0...v1.2.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.1.0...v1.2.0)

- - -


## 1.1.0 (2023-12-05)

### Features
Expand Down
80 changes: 74 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ The `home_page` feature flag controls whether the dashboard home page is enabled

The `test_live_toggle` feature flag enables users to toggle between test and live modes when signing in. When enabled, users will see an option during sign-in to actively switch between test and live environments.

#### Test Live Mode
#### Is Live Mode

The `test_live_mode` feature flag enables displaying the current mode - test or live - that the user is accessing. When enabled, it will show a visual indicator within the dashboard signaling whether the user is currently in a test environment or live production environment.
The `is_live_mode` feature flag enables the live mode - that the user is accessing. When enabled, it will show a visual indicator within the dashboard signaling whether the user is currently in a test environment or live production environment.

#### Magic Link

Expand All @@ -152,10 +152,6 @@ The `production_access` feature flag enables a flow for users to request live pr

The `quick_start` feature flag enables the simplified onboarding flow for new users, where he connects to processors, configure payment routing and testing a payment, all in one flow.

#### Open SDK

The `open_sdk` feature flag enables access to the Checkout Page web SDK from within the dashboard. When enabled, developers can preview the SDK from within the dashboard and make payments.

---

## Deployment
Expand Down Expand Up @@ -267,10 +263,82 @@ curl https://raw.githubusercontent.com/juspay/hyperswitch-control-center/main/aw

---

## Versioning

For a detailed list of changes made in each version, please refer to the [CHANGELOG](./CHANGELOG.md) file.

---

## Contributing

We welcome contributions from the community! If you would like to contribute to Hyperswitch, please follow our contribution guidelines.

### Commit Conventions

We follow the [Conventional Commits](https://www.conventionalcommits.org/) specification for our commit messages. Each commit message should have a structured format:

`<type>(<subject>): <description>`

The commit message should begin with one of the following keywords followed by a colon: 'feat', 'fix', 'chore', 'refactor', 'docs', 'test' or 'style'. For example, it should be formatted like this: `feat: <subject> - <description>`

### Signing Commits

All commits should be signed to verify the authenticity of contributors. Follow the steps below to sign your commits:

1. Generate a GPG key if you haven't already:

```bash
gpg --gen-key
```

2. List your GPG keys and copy the GPG key ID::

```bash
gpg --list-secret-keys --keyid-format LONG
```

#### Identify the GPG key you want to add to your GitHub account.

a. Run the following command to export your GPG public key in ASCII-armored format:

```bash
gpg --armor --export <GPG_KEY_ID>
Replace <GPG_KEY_ID> with the actual key ID.
```

b. Copy the entire output, including the lines that start with "-----BEGIN PGP PUBLIC KEY BLOCK-----" and "-----END PGP PUBLIC KEY BLOCK-----".

c. Go to your GitHub Settings.

d. Click on "SSH and GPG keys" in the left sidebar.

e. Click the "New GPG key" button.

f. Paste your GPG public key into the provided text box.

g. Click the "Add GPG key" button.

h. Now your GPG public key is associated with your GitHub account, and you can sign your commits for added security.

3. Configure Git to use your GPG key:

```bash
git config --global user.signingkey <GPG_KEY_ID>
```

4. Set Git to sign all your commits by default:

```bash
git config --global commit.gpgSign true
```

5. Commit your changes with the -S option to sign the commit:
```bash
git commit -S -m "your commit message"
```

For further assistance, please refer to the [GitHub documentation on signing commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).

---

## License
Expand Down
6 changes: 3 additions & 3 deletions config/FeatureFlag.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"test_live_toggle": false,
"test_live_mode": false,
"is_live_mode": false,
"magic_link": false,
"production_access": false,
"quick_start": false,
"open_sdk": false,
"switch_merchant": false,
"audit_trail": false,
"system_metrics": false,
Expand All @@ -19,5 +18,6 @@
"mixpanel": false,
"business_profile": false,
"generate_report": false,
"forgot_password": false
"forgot_password": false,
"oss_build": true
}
2 changes: 1 addition & 1 deletion public/hyperswitch/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ function getVariantValues(str) {
} else {
return [];
}
}
}
Loading

0 comments on commit d886d4f

Please sign in to comment.