Skip to content

Commit

Permalink
Merge branch 'main' into launchpad/hotwax#63
Browse files Browse the repository at this point in the history
  • Loading branch information
ymaheshwari1 committed Nov 7, 2024
2 parents 138b32c + fe10633 commit be9e280
Show file tree
Hide file tree
Showing 20 changed files with 574 additions and 304 deletions.
4 changes: 0 additions & 4 deletions .env

This file was deleted.

5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ VUE_APP_I18N_LOCALE=en
VUE_APP_I18N_FALLBACK_LOCALE=en
VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
VUE_APP_DEFAULT_ALIAS=
VUE_APP_DEFAULT_ALIAS=
VUE_APP_MAARG_LOGIN=["atp", "company", "order-routing", "inventorycount"]
VUE_APP_USERS_LOGIN_URL="http://users.hotwax.io/login"
VUE_APP_OMS_WITH_MAARG=["job-manager", "preorder", "users"]
7 changes: 2 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Related Issues
<!-- Put related issue number which this PR is closing. For example #123 -->

Closes #
#

### Short Description and Why It's Useful
<!-- Describe in a few words what is this Pull Request changing and why it's useful -->
Expand All @@ -11,10 +11,7 @@ Closes #
<!-- If you made any changes in the UI layer, please provide before/after screenshots -->


**IMPORTANT NOTICE** - Remember to add changelog entry


### Contribution and Currently Important Rules Acceptance
<!-- Please get familiar with following info -->

- [ ] I read and followed [contribution rules](https://github.com/hotwax/job-manager#contribution-guideline)
- [ ] I read and followed [contribution rules](https://github.com/hotwax/launchpad#contribution-guideline)
24 changes: 17 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
.DS_Store
node_modules
/dist


# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
Expand All @@ -21,5 +14,22 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
/.ionic
/.sass-cache
/.sourcemaps
/.versions
/coverage
/dist
/node_modules
/platforms
/plugins
/www
/lib
.firebase/*

.history

# env files except example env
.env
.env.*
!.env.example
Loading

0 comments on commit be9e280

Please sign in to comment.