Skip to content

Commit

Permalink
Merge pull request #1 from disha1202/#22c8vaw
Browse files Browse the repository at this point in the history
Renamed: ionic sdk to import(#22c8vaw)
  • Loading branch information
adityasharma7 authored Feb 22, 2022
2 parents bfc1e07 + 6dd85c5 commit 5cc88d0
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 23 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Contribution Guideline

1. Fork the repository and clone it locally from the `main` branch. Before starting your work make sure it's up to date with current `main` branch.
2. Pick an issue from [here](https://github.com/hotwax/ionic-sdk/issues). Write in the issue comment that you want to pick it, if you can't assign yourself. **Please stay assigned to one issue at a time to not block others**.
3. Create a branch for your edits. Use the following branch naming conventions: **ionicsdk/issue-number**.
2. Pick an issue from [here](https://github.com/hotwax/import/issues). Write in the issue comment that you want to pick it, if you can't assign yourself. **Please stay assigned to one issue at a time to not block others**.
3. Create a branch for your edits. Use the following branch naming conventions: **import/issue-number**.
4. Please add issue number to your commit message.
5. Propose a Pull Request to `main` branch containing issue number and issue title.
6. Use [Pull Request template](https://github.com/hotwax/ionic-sdk/blob/main/.github/PULL_REQUEST_TEMPLATE.md) (it's automatically added to each PR) and fill as much fields as possible to describe your solution.
6. Use [Pull Request template](https://github.com/hotwax/import/blob/main/.github/PULL_REQUEST_TEMPLATE.md) (it's automatically added to each PR) and fill as much fields as possible to describe your solution.
7. Reference any relevant issues or other information in your PR.
8. Wait for review and adjust your PR according to it.
9. Congrats! Your PR should now me merged in!
Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# IonicSDK for Ionic 5.x/ Vue applications
# Import for Ionic 5.x/ Vue applications

## How to use?

- Clone your repository
`git clone <your repository url>`

- Create a new branch
- Add IonicSDK repo URL to remote
`git remote add ionicSDK https://github.com/hotwax/ionic-sdk.git`
- Add Import repo URL to remote
`git remote add import https://github.com/hotwax/import.git`

- Fetch IonicSDK branches
`git fetch ionicSDK`
- Fetch Import branches
`git fetch import`

- Merge IonicSDK master to your branch with [--allow-unrelated-histories](https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---allow-unrelated-histories) flag
`git merge ionicSDK/main --allow-unrelated-histories`
- Merge Import master to your branch with [--allow-unrelated-histories](https://git-scm.com/docs/git-merge#Documentation/git-merge.txt---allow-unrelated-histories) flag
`git merge import/main --allow-unrelated-histories`

- Resolve conflicts
- Resolve conflicts
- Push your branch and create a PR

# Prerequisite
Expand All @@ -24,7 +24,7 @@ Ionic CLI - If you don't have the ionic CLI installed refer [official documentat

# Build Notes (Users)

1. Download the app from [release](https://github.com/hotwax/ionic-sdk/releases) page and extract it.
1. Download the app from [release](https://github.com/hotwax/import/releases) page and extract it.
2. Go to the app directory.
3. Run following command to download dependencies
`npm i`
Expand All @@ -35,7 +35,7 @@ Ionic CLI - If you don't have the ionic CLI installed refer [official documentat
# Build Notes (Contributors)

1. Open a Terminal window
2. Clone app using the command: `git clone https://github.com/hotwax/ionic-sdk.git <repository-name>`
2. Clone app using the command: `git clone https://github.com/hotwax/import.git <repository-name>`
3. Go to the <repository-name> directory using command: `cd <repository-name>`
4. Run following command to download dependencies
`npm i`
Expand All @@ -44,7 +44,7 @@ Ionic CLI - If you don't have the ionic CLI installed refer [official documentat

# Firebase Hosting

We are using firebase hosting for the Ionic SDK app deployment
We are using firebase hosting for the Import app deployment
Here are the steps to deploy app on firebase hosting

## Prerequisite
Expand Down Expand Up @@ -85,11 +85,11 @@ Follow following instructions:
# Contribution Guideline

1. Fork the repository and clone it locally from the `main` branch. Before starting your work make sure it's up to date with current `main` branch.
2. Pick an issue from [here](https://github.com/hotwax/ionic-sdk/issues). Write in the issue comment that you want to pick it, if you can't assign yourself. **Please stay assigned to one issue at a time to not block others**.
3. Create a branch for your edits. Use the following branch naming conventions: **ionic-sdk/issue-number**.
2. Pick an issue from [here](https://github.com/hotwax/import/issues). Write in the issue comment that you want to pick it, if you can't assign yourself. **Please stay assigned to one issue at a time to not block others**.
3. Create a branch for your edits. Use the following branch naming conventions: **import/issue-number**.
4. Please add issue number to your commit message.
5. Propose a Pull Request to `main` branch containing issue number and issue title.
6. Use [Pull Request template](https://github.com/hotwax/ionic-sdk/blob/main/.github/PULL_REQUEST_TEMPLATE.md) (it's automatically added to each PR) and fill as much fields as possible to describe your solution.
6. Use [Pull Request template](https://github.com/hotwax/import/blob/main/.github/PULL_REQUEST_TEMPLATE.md) (it's automatically added to each PR) and fill as much fields as possible to describe your solution.
7. Reference any relevant issues or other information in your PR.
8. Wait for review and adjust your PR according to it.
9. Congrats! Your PR should now me merged in!
Expand All @@ -113,4 +113,4 @@ If you have any questions or ideas feel free to join our <a href="https://discor

# The license

Ionic SDK app is completely free and released under the Apache v2.0 License. Check <a href="https://github.com/hotwax/ionic-sdk/blob/main/LICENSE" target="_blank">LICENSE</a> for more details.
Import app is completely free and released under the Apache v2.0 License. Check <a href="https://github.com/hotwax/import/blob/main/LICENSE" target="_blank">LICENSE</a> for more details.
4 changes: 2 additions & 2 deletions capacitor.config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"appId": "co.hotwax.ionic.sdk",
"appName": "ionic-sdk",
"appId": "co.hotwax.import",
"appName": "import",
"bundledWebRuntime": false,
"npmClient": "npm",
"webDir": "dist",
Expand Down
6 changes: 6 additions & 0 deletions changelogs/unreleased/-22c8vaw.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Updated Import to lowercase
ticket_id: "#22c8vaw"
merge_request: 1
author: Disha Talreja
type: performance
2 changes: 1 addition & 1 deletion ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ionicSDK",
"name": "import",
"integrations": {
"capacitor": {}
},
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ionic-sdk",
"name": "import",
"version": "1.0.0",
"private": true,
"description": "An Ionic project",
Expand Down

0 comments on commit 5cc88d0

Please sign in to comment.