Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dscnitrourkela/project-raasan
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.0+1
Choose a base ref
...
head repository: dscnitrourkela/project-raasan
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref

Commits on Apr 19, 2020

  1. Copy the full SHA
    98c5854 View commit details
  2. Copy the full SHA
    98bddf7 View commit details
  3. Copy the full SHA
    0382853 View commit details
  4. responsive btoom navigation

    Thesmader committed Apr 19, 2020
    Copy the full SHA
    6381bab View commit details

Commits on Apr 24, 2020

  1. Login flow beta version

    Thesmader committed Apr 24, 2020
    Copy the full SHA
    e40abe3 View commit details
  2. Bug Fix: account validation

    Thesmader committed Apr 24, 2020
    Copy the full SHA
    cc80275 View commit details
  3. Copy the full SHA
    696b354 View commit details

Commits on Apr 25, 2020

  1. Login works sans cat1

    Thesmader committed Apr 25, 2020
    Copy the full SHA
    0da8a98 View commit details
  2. Merge commit

    Thesmader committed Apr 25, 2020
    Copy the full SHA
    b5cdc73 View commit details
  3. JWT expiration error

    Thesmader committed Apr 25, 2020
    Copy the full SHA
    df01545 View commit details

Commits on Apr 26, 2020

  1. Copy the full SHA
    991a065 View commit details
  2. Copy the full SHA
    ab64612 View commit details
  3. Copy the full SHA
    ef49afe View commit details
  4. Copy the full SHA
    8f6cce6 View commit details
  5. Add sign up arguments

    Thesmader committed Apr 26, 2020
    Copy the full SHA
    92f6097 View commit details
  6. Merge commit

    Thesmader committed Apr 26, 2020
    Copy the full SHA
    c78766b View commit details
  7. Orders api is broken

    Chinmay-KB committed Apr 26, 2020
    Copy the full SHA
    5441c37 View commit details
  8. Product Details Basic View

    Thesmader committed Apr 26, 2020
    Copy the full SHA
    c9cbce2 View commit details
  9. Merge remote-tracking branch 'smarak/development' into development

    # Conflicts:
    #	gogrocy/lib/core/services/api.dart
    #	gogrocy/lib/service_locator.dart
    #	gogrocy/lib/ui/views/view_carousel.dart
    Chinmay-KB committed Apr 26, 2020
    Copy the full SHA
    e5e7eff View commit details
  10. v0.20+2 commit

    Chinmay-KB committed Apr 26, 2020
    Copy the full SHA
    7fea8e6 View commit details
  11. Merge pull request #5 from Chinmay-KB/development

    v0.2.0+2 Commit
    DesignrKnight authored Apr 26, 2020
    Copy the full SHA
    eb1ade1 View commit details
  12. Onboarding overflow hotfix

    Modified onboarding widget to fix overflow.
    Thesmader authored Apr 26, 2020
    Copy the full SHA
    84a6fb2 View commit details
  13. Update Readme.MD

    Chinmay-KB authored Apr 26, 2020
    Copy the full SHA
    9f1a1ab View commit details
  14. Merge pull request #6 from developer-student-clubs-nitr/Onboarding-ov…

    …erflow-hotfix
    
    Onboarding overflow hotfix
    Chinmay-KB authored Apr 26, 2020
    Copy the full SHA
    d43b1c5 View commit details
  15. Merge pull request #7 from developer-student-clubs-nitr/Chinmay-KB-pa…

    …tch-1
    
    Update Readme.MD
    DesignrKnight authored Apr 26, 2020
    Copy the full SHA
    aa8d972 View commit details
  16. Update README.md

    DesignrKnight authored Apr 26, 2020
    Copy the full SHA
    81ad12b View commit details
  17. Copy the full SHA
    f0f4c74 View commit details
  18. Merge pull request #8 from developer-student-clubs-nitr/Update-readme

    Add notice, update hack:now submission release
    Chinmay-KB authored Apr 26, 2020
    Copy the full SHA
    1c802b1 View commit details
  19. Copy the full SHA
    53583d9 View commit details

Commits on Apr 27, 2020

  1. Onboarding overflow fix

    Thesmader committed Apr 27, 2020
    Copy the full SHA
    61905a5 View commit details
  2. Copy the full SHA
    0d9cd6d View commit details

Commits on Apr 28, 2020

  1. Copy the full SHA
    f3c74f2 View commit details
  2. Order is broken

    Chinmay-KB committed Apr 28, 2020
    Copy the full SHA
    002f2d0 View commit details
  3. Copy the full SHA
    f8af2d4 View commit details
  4. Color refactoring

    Thesmader committed Apr 28, 2020
    Copy the full SHA
    0005c5e View commit details

Commits on Apr 29, 2020

  1. Copy the full SHA
    b0082f3 View commit details
  2. Copy the full SHA
    4b5aa00 View commit details
  3. Merge remote-tracking branch 'smarak/development' into products_v5

    # Conflicts:
    #	gogrocy/lib/service_locator.dart
    #	gogrocy/lib/ui/router.dart
    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    4d907e8 View commit details
  4. City locator works

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    13b7d38 View commit details
  5. City locator works

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    d27145c View commit details
  6. search is broken

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    2aa36ba View commit details
  7. Search is implemented

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    8f95fe5 View commit details
  8. Merge branch 'products_v5' into development

    # Conflicts:
    #	gogrocy/lib/core/services/api.dart
    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    18f548c View commit details
  9. Search is implemented

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    29b0706 View commit details
  10. Search is implemented

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    976c8e7 View commit details
  11. Back button in search

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    8033776 View commit details
  12. Minor changes

    Chinmay-KB committed Apr 29, 2020
    Copy the full SHA
    531f95c View commit details

Commits on Apr 30, 2020

  1. Profile screeen implemented

    Thesmader committed Apr 30, 2020
    Copy the full SHA
    2ff9710 View commit details
  2. profile started

    Thesmader committed Apr 30, 2020
    Copy the full SHA
    bb752ed View commit details
  3. profile merge commit

    Thesmader committed Apr 30, 2020
    Copy the full SHA
    25bbf5f View commit details
Showing with 7,249 additions and 851 deletions.
  1. +63 −0 .all-contributorsrc
  2. +9 −0 .github/workflows/greet.yml
  3. +27 −16 .idea/workspace.xml
  4. +76 −0 CODE_OF_CONDUCT.md
  5. +81 −0 CONTRIBUTING.md
  6. +21 −0 LICENSE
  7. +88 −1 README.md
  8. +11 −0 gogrocy/android/app/build.gradle
  9. +11 −0 gogrocy/android/app/src/main/AndroidManifest.xml
  10. BIN gogrocy/android/app/src/main/ic_launcher-playstore.png
  11. +1 −1 gogrocy/android/app/src/main/kotlin/in/gogrocy/gogrocy/MainActivity.kt
  12. BIN gogrocy/android/app/src/main/res/drawable/ic_notification.png
  13. BIN gogrocy/android/app/src/main/res/mipmap-anydpi-v26/ic_notification.png
  14. BIN gogrocy/android/app/src/main/res/mipmap-hdpi/gogrocy.png
  15. BIN gogrocy/android/app/src/main/res/mipmap-mdpi/gogrocy.png
  16. BIN gogrocy/android/app/src/main/res/mipmap-xhdpi/gogrocy.png
  17. BIN gogrocy/android/app/src/main/res/mipmap-xxhdpi/gogrocy.png
  18. BIN gogrocy/android/app/src/main/res/mipmap-xxxhdpi/gogrocy.png
  19. +4 −0 gogrocy/android/app/src/main/res/values/color.xml
  20. +3 −2 gogrocy/android/build.gradle
  21. BIN gogrocy/assets/images/2.0x/awesome_woman.png
  22. BIN gogrocy/assets/images/2.0x/carousel_1.png
  23. BIN gogrocy/assets/images/2.0x/carousel_2.png
  24. BIN gogrocy/assets/images/2.0x/carousel_3.png
  25. BIN gogrocy/assets/images/2.0x/detergent.png
  26. BIN gogrocy/assets/images/2.0x/empty-cart.png
  27. BIN gogrocy/assets/images/2.0x/grocery.png
  28. BIN gogrocy/assets/images/2.0x/healthcare.png
  29. BIN gogrocy/assets/images/2.0x/masala.png
  30. BIN gogrocy/assets/images/2.0x/no_products.png
  31. BIN gogrocy/assets/images/2.0x/oil_ghee.png
  32. BIN gogrocy/assets/images/2.0x/orders.png
  33. BIN gogrocy/assets/images/2.0x/packed.png
  34. BIN gogrocy/assets/images/2.0x/pizza.png
  35. BIN gogrocy/assets/images/2.0x/pulses.png
  36. BIN gogrocy/assets/images/2.0x/rice.png
  37. BIN gogrocy/assets/images/2.0x/shopping_cart.png
  38. BIN gogrocy/assets/images/2.0x/snacks.png
  39. BIN gogrocy/assets/images/2.0x/toiletries.png
  40. BIN gogrocy/assets/images/2.0x/woman.png
  41. BIN gogrocy/assets/images/3.0x/awesome_woman.png
  42. BIN gogrocy/assets/images/3.0x/carousel_1.png
  43. BIN gogrocy/assets/images/3.0x/carousel_2.png
  44. BIN gogrocy/assets/images/3.0x/carousel_3.png
  45. BIN gogrocy/assets/images/3.0x/detergent.png
  46. BIN gogrocy/assets/images/3.0x/empty-cart.png
  47. BIN gogrocy/assets/images/3.0x/grocery.png
  48. BIN gogrocy/assets/images/3.0x/healthcare.png
  49. BIN gogrocy/assets/images/3.0x/masala.png
  50. BIN gogrocy/assets/images/3.0x/no_products.png
  51. BIN gogrocy/assets/images/3.0x/oil_ghee.png
  52. BIN gogrocy/assets/images/3.0x/orders.png
  53. BIN gogrocy/assets/images/3.0x/packed.png
  54. BIN gogrocy/assets/images/3.0x/pizza.png
  55. BIN gogrocy/assets/images/3.0x/pulses.png
  56. BIN gogrocy/assets/images/3.0x/rice.png
  57. BIN gogrocy/assets/images/3.0x/shopping_cart.png
  58. BIN gogrocy/assets/images/3.0x/snacks.png
  59. BIN gogrocy/assets/images/3.0x/toiletries.png
  60. BIN gogrocy/assets/images/3.0x/woman.png
  61. BIN gogrocy/assets/images/awesome_woman.png
  62. BIN gogrocy/assets/images/carousel_1.png
  63. BIN gogrocy/assets/images/carousel_2.png
  64. BIN gogrocy/assets/images/carousel_3.png
  65. BIN gogrocy/assets/images/cart_background.png
  66. BIN gogrocy/assets/images/detergent.png
  67. BIN gogrocy/assets/images/empty-cart.png
  68. BIN gogrocy/assets/images/grocery.png
  69. BIN gogrocy/assets/images/healthcare.png
  70. BIN gogrocy/assets/images/masala.png
  71. BIN gogrocy/assets/images/no_products.png
  72. BIN gogrocy/assets/images/oil_ghee.png
  73. BIN gogrocy/assets/images/orders.png
  74. BIN gogrocy/assets/images/packed.png
  75. BIN gogrocy/assets/images/pizza.png
  76. BIN gogrocy/assets/images/pulses.png
  77. BIN gogrocy/assets/images/rice.png
  78. BIN gogrocy/assets/images/shopping_cart.png
  79. BIN gogrocy/assets/images/snacks.png
  80. BIN gogrocy/assets/images/toiletries.png
  81. BIN gogrocy/assets/images/woman.png
  82. +1 −0 gogrocy/lib/core/enums/connectivity_status.dart
  83. +1 −1 gogrocy/lib/core/enums/viewstate.dart
  84. +70 −0 gogrocy/lib/core/models/ProductsByCity.dart
  85. +54 −0 gogrocy/lib/core/models/address.dart
  86. +119 −0 gogrocy/lib/core/models/cart_edit.dart
  87. +91 −0 gogrocy/lib/core/models/cart_list.dart
  88. +8 −0 gogrocy/lib/core/models/category_product_list_arguments.dart
  89. +8 −0 gogrocy/lib/core/models/order_details_arguments.dart
  90. +131 −0 gogrocy/lib/core/models/orders.dart
  91. +15 −0 gogrocy/lib/core/models/place_order.dart
  92. +43 −43 gogrocy/lib/core/models/product.dart
  93. +6 −0 gogrocy/lib/core/models/sign_up_arguments.dart
  94. +54 −0 gogrocy/lib/core/models/signup_model.dart
  95. +93 −1 gogrocy/lib/core/models/user.dart
  96. +22 −0 gogrocy/lib/core/models/user_status.dart
  97. +16 −0 gogrocy/lib/core/services/analytics_service.dart
  98. +392 −6 gogrocy/lib/core/services/api.dart
  99. +47 −14 gogrocy/lib/core/services/authentication_service.dart
  100. +17 −7 gogrocy/lib/core/services/bottom_appbar_provider.dart
  101. +1 −0 gogrocy/lib/core/services/checkout_button_callback.dart
  102. +37 −0 gogrocy/lib/core/services/connectivity_service.dart
  103. +15 −0 gogrocy/lib/core/services/fcm_subscribe_service.dart
  104. +48 −0 gogrocy/lib/core/services/firebase_messaging_service.dart
  105. +28 −0 gogrocy/lib/core/services/firestore_service.dart
  106. +9 −1 gogrocy/lib/core/services/navigation_service.dart
  107. +54 −11 gogrocy/lib/core/services/shared_prefs.dart
  108. +20 −0 gogrocy/lib/core/viewModels/address_view_model.dart
  109. +8 −9 gogrocy/lib/core/viewModels/allProducts_model.dart
  110. +0 −45 gogrocy/lib/core/viewModels/animations_model.dart
  111. +37 −0 gogrocy/lib/core/viewModels/base_model.dart
  112. +46 −0 gogrocy/lib/core/viewModels/cart_view_model.dart
  113. +16 −0 gogrocy/lib/core/viewModels/categoty_product_view_model.dart
  114. +75 −11 gogrocy/lib/core/viewModels/login_model.dart
  115. +17 −0 gogrocy/lib/core/viewModels/order_list_model.dart
  116. +13 −0 gogrocy/lib/core/viewModels/product_detail_model.dart
  117. +23 −0 gogrocy/lib/core/viewModels/search_view_model.dart
  118. +105 −0 gogrocy/lib/core/viewModels/signup_view_model.dart
  119. +3 −0 gogrocy/lib/core/viewModels/startup_view_model.dart
  120. +123 −3 gogrocy/lib/main.dart
  121. +26 −5 gogrocy/lib/service_locator.dart
  122. +59 −4 gogrocy/lib/ui/router.dart
  123. +24 −0 gogrocy/lib/ui/shared/colors.dart
  124. +46 −14 gogrocy/lib/ui/shared/constants.dart
  125. +28 −0 gogrocy/lib/ui/shared/routeTransitions/slide_left.dart
  126. +141 −0 gogrocy/lib/ui/views/about.dart
  127. +252 −0 gogrocy/lib/ui/views/address_form.dart
  128. +118 −0 gogrocy/lib/ui/views/address_view.dart
  129. +61 −0 gogrocy/lib/ui/views/all_products_list.dart
  130. +0 −163 gogrocy/lib/ui/views/awesome_animation_view.dart
  131. +38 −4 gogrocy/lib/ui/views/base_view.dart
  132. +230 −0 gogrocy/lib/ui/views/cart/cart.dart
  133. +109 −0 gogrocy/lib/ui/views/cart/cart_bill.dart
  134. +277 −0 gogrocy/lib/ui/views/cart/cart_footer.dart
  135. +92 −0 gogrocy/lib/ui/views/cart/cart_header.dart
  136. +127 −0 gogrocy/lib/ui/views/cart/cart_list.dart
  137. +67 −0 gogrocy/lib/ui/views/category/category_product_view.dart
  138. +106 −0 gogrocy/lib/ui/views/category/product_list.dart
  139. +121 −0 gogrocy/lib/ui/views/city_selection.dart
  140. +90 −37 gogrocy/lib/ui/views/home/category_list.dart
  141. +113 −51 gogrocy/lib/ui/views/home/grid_list.dart
  142. +99 −42 gogrocy/lib/ui/views/home/home.dart
  143. +100 −7 gogrocy/lib/ui/views/landing_page.dart
  144. +50 −55 gogrocy/lib/ui/views/login_view.dart
  145. +0 −8 gogrocy/lib/ui/views/main_screen_page.dart
  146. +127 −0 gogrocy/lib/ui/views/orders/order_bill.dart
  147. +170 −0 gogrocy/lib/ui/views/orders/order_details_view.dart
  148. +127 −0 gogrocy/lib/ui/views/orders/ordered_product_list.dart
  149. +225 −0 gogrocy/lib/ui/views/orders/orders.dart
  150. +30 −0 gogrocy/lib/ui/views/privacy_policy.dart
  151. +169 −0 gogrocy/lib/ui/views/product_detail_view.dart
  152. +116 −0 gogrocy/lib/ui/views/profile.dart
  153. +143 −0 gogrocy/lib/ui/views/search_view.dart
  154. +193 −0 gogrocy/lib/ui/views/signup_view.dart
  155. +19 −1 gogrocy/lib/ui/views/startup_view.dart
  156. +20 −18 gogrocy/lib/ui/views/view_carousel.dart
  157. +0 −78 gogrocy/lib/ui/widgets/appbar.dart
  158. +138 −0 gogrocy/lib/ui/widgets/appbars/main_appbar.dart
  159. +58 −0 gogrocy/lib/ui/widgets/appbars/secondary_appbar.dart
  160. +5 −0 gogrocy/lib/ui/widgets/bottom_navbar.dart
  161. +115 −0 gogrocy/lib/ui/widgets/cart_counter.dart
  162. +38 −0 gogrocy/lib/ui/widgets/custom_snackbar.dart
  163. +207 −98 gogrocy/lib/ui/widgets/details_form.dart
  164. +313 −72 gogrocy/lib/ui/widgets/login_text_field_widget.dart
  165. +184 −0 gogrocy/lib/ui/widgets/navbar/bottom_navbar.dart
  166. +38 −0 gogrocy/lib/ui/widgets/navbar/nav_button.dart
  167. +39 −0 gogrocy/lib/ui/widgets/navbar/nav_custom_painter.dart
  168. +7 −4 gogrocy/lib/ui/widgets/onboarding_widget.dart
  169. +8 −12 gogrocy/lib/ui/widgets/otp_field.dart
  170. +6 −0 gogrocy/lib/ui/widgets/snackbars.dart
  171. +92 −0 gogrocy/lib/ui/widgets/snackbars/custom_snackbar.dart
  172. +13 −4 gogrocy/lib/ui/widgets/vertical_spaces.dart
  173. +14 −2 gogrocy/pubspec.yaml
63 changes: 63 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"contributors": [
{
"login": "DesignrKnight",
"name": "Abel Mathew",
"avatar_url": "https://avatars0.githubusercontent.com/u/27865704?v=4",
"profile": "https://designrknight-website.web.app/",
"contributions": [
"code",
"projectManagement"
]
},
{
"login": "Thesmader",
"name": "Smarak Das",
"avatar_url": "https://avatars2.githubusercontent.com/u/34758667?v=4",
"profile": "https://github.com/Thesmader",
"contributions": [
"code",
"projectManagement"
]
},
{
"login": "all-contributors",
"name": "All Contributors",
"avatar_url": "https://avatars1.githubusercontent.com/u/46410174?v=4",
"profile": "https://allcontributors.org",
"contributions": [
"tool"
]
},
{
"login": "Chinmay-KB",
"name": "Chinmay Kabi",
"avatar_url": "https://avatars0.githubusercontent.com/u/13520364?v=4",
"profile": "https://github.com/Chinmay-KB",
"contributions": [
"code",
"projectManagement"
]
},
{
"login": "ImgBotApp",
"name": "Imgbot",
"avatar_url": "https://avatars1.githubusercontent.com/u/31427850?v=4",
"profile": "https://imgbot.net",
"contributions": [
"tool"
]
}
],
"contributorsPerLine": 7,
"projectName": "project-raasan",
"projectOwner": "dscnitrourkela",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
}
9 changes: 9 additions & 0 deletions .github/workflows/greet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Woofy
on: pull_request_target
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: HarishTeens/hacktoberfest-greet@v1.1.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43 changes: 27 additions & 16 deletions .idea/workspace.xml

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

76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at team@dscnitrourkela.tech. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
81 changes: 81 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Contributing

When contributing to this repository, please first discuss the change you wish to make via issue with the maintainers 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

1. Ensure any install or build dependencies are removed before the end of the layer when doing a
build. Add only relevant files to commit and ignore the rest to keep the repo clean.
2. Update the README.md with details of changes to the interface, this includes new environment
variables, exposed ports, useful file locations and container parameters.
3. You should request review from the maintainers once you submit the Pull Request.

## Instructions

- Git Workflow

```bash
## Step 1: Fork Repository

## Step 2: Git Set Up & Download
# Clone the repo
$ git clone https://github.com/<User-Name>/<Repo-Name>.git
# Add upstream remote
$ git remote add upstream https://github.com/dscnitrourkela/project-raasan.git
# Fetch and merge with upstream/development
$ git fetch upstream
$ git merge upstream/development

## Step 2: Create and Publish Working Branch
$ git checkout -b <type>/<issue|issue-number>/{<additional-fixes>}
$ git push origin <type>/<issue|issue-number>/{<additional-fixes>}

## Types:
# wip - Work in Progress; long term work; mainstream changes;
# feat - New Feature; future planned; non-mainstream changes;
# bug - Bug Fixes
# exp - Experimental; random experiemntal features;
```

- On Task Completion:

```bash
## Committing and pushing your work
# Ensure branch
$ git branch
# Fetch and merge with upstream/development
$ git fetch upstream
$ git merge upstream/development
# Add untracked files
$ git add .
# Commit all changes with appropriate commit message and description
$ git commit -m "your-commit-message" -m "your-commit-description"
# Fetch and merge with upstream/development again
$ git fetch upstream
$ git merge upstream/development
# Push changes to your forked repository
$ git push origin <type>/<issue|issue-number>/{<additional-fixes>}

## Creating the PR using GitHub Website
# Create Pull Request from <type>/<issue|issue-number>/{<additional-fixes>} branch in your forked repository to the development branch in the upstream repository
# After creating PR, add a Reviewer (Any Admin) and yourself as the assignee
# Link Pull Request to appropriate Issue, or Project+Milestone (if no issue created)
# IMPORTANT: Do Not Merge the PR unless specifically asked to by an admin.
```

- After PR Merge

```bash
# Delete branch from forked repo
$ git branch -d <type>/<issue|issue-number>/{<additional-fixes>}
$ git push --delete origin <type>/<issue|issue-number>/{<additional-fixes>}
# Fetch and merge with upstream/development
$ git checkout development
$ git pull upstream
$ git push origin
```

- Always follow [commit message standards](https://chris.beams.io/posts/git-commit/)
- About the [fork-and-branch workflow](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 DSC NIT Rourkela

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading