Skip to content

Commit

Permalink
Merge branch 'main' into nearby-loops-#301
Browse files Browse the repository at this point in the history
  • Loading branch information
lil5 committed Nov 3, 2023
2 parents e59c041 + ab0be65 commit 1ff6cba
Show file tree
Hide file tree
Showing 65 changed files with 1,151 additions and 169 deletions.
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
33 changes: 33 additions & 0 deletions .husky/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Husky

> Modern native git hooks made easy
Hooks are programs you can place in a hooks directory to trigger actions at certain points in git’s execution.

https://git-scm.com/docs/githooks

## Installation

This will install husky and will change git hooks directory to here (`.husky`).

This should _only_ be used on a developers machine.

```
npm run install
```

## Scripts

### Pre Push

Runs the linter on `server`, `frontend` & `app`.

`npm install` needs to be run on `frontend` and `app` for this to work.

## Removal

This resets the git hooks configuration to the default directory (`.git/hooks`).

```
npm run remove-husky
```
28 changes: 28 additions & 0 deletions .husky/package-lock.json

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

10 changes: 10 additions & 0 deletions .husky/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"scripts": {
"postinstall": "npm run prepare",
"remove-husky": "git config --unset core.hooksPath",
"prepare": "cd .. && husky install"
},
"devDependencies": {
"husky": "^8.0.3"
}
}
5 changes: 5 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env sh

cd server && make lint-test && \
cd ../frontend && npm run lint:test && \
cd ../app && npm run lint:test
159 changes: 108 additions & 51 deletions app/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 app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"ionicons": "^7.1.2",
"nlf": "^2.1.1",
"onesignal-cordova-plugin": "^3.3.1",
"postcss": "^8.4.27",
"postcss": "^8.4.31",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^13.0.2",
Expand Down
14 changes: 14 additions & 0 deletions bruno/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false

[Makefile]
indent_style = tab

[*.{bru,json}]
indent_style = space
indent_size = 2
4 changes: 4 additions & 0 deletions bruno/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/environments/*.bru
/environments/Example.bru
/_ignored_/
!.gitkeep
Empty file added bruno/_ignored_/.gitkeep
Empty file.
22 changes: 22 additions & 0 deletions bruno/bag/create or update.bru
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
meta {
name: create or update
type: http
seq: 3
}

put {
url: {{base}}/v2/bag
body: json
auth: none
}

body:json {
{
"user_uid": "{{userUID}}",
"chain_uid": "{{chainUID}}",
"holder_uid": "{{userUID}}",
"bag_id": 1,
"number": "Bag 1",
"color": "#ccff00"
}
}
Loading

0 comments on commit 1ff6cba

Please sign in to comment.