Skip to content

Commit

Permalink
Merge branch 'main' into oauth-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
garrettladley authored May 24, 2024
2 parents daefa31 + 0d64721 commit a6ee639
Show file tree
Hide file tree
Showing 6 changed files with 70 additions and 33 deletions.
28 changes: 24 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,47 @@ updates:
directory: ./backend/
schedule:
interval: weekly
groups:
backend:
patterns:
- "*"
- package-ecosystem: gomod
directory: ./cli/
schedule:
interval: weekly
groups:
cli:
patterns:
- "*"
- package-ecosystem: npm
directory: ./frontend/mobile/
schedule:
interval: weekly
groups:
mobile:
patterns:
- "*"
- package-ecosystem: npm
directory: ./frontend/web/
schedule:
interval: weekly
groups:
web:
patterns:
- "*"
- package-ecosystem: npm
directory: ./frontend/dashboard/
schedule:
interval: weekly
groups:
dashboard:
patterns:
- "*"
- package-ecosystem: npm
directory: ./frontend/lib/
schedule:
interval: weekly
- package-ecosystem: cargo
directory: ./scraper/clubs/
schedule:
interval: weekly
groups:
lib:
patterns:
- "*"
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/a-h/templ v0.2.697
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5
github.com/aws/aws-sdk-go v1.53.5
github.com/garrettladley/fiberpaginate v1.0.1
github.com/garrettladley/fiberpaginate v1.0.5
github.com/garrettladley/mattress v0.4.0
github.com/go-playground/validator/v10 v10.20.0
github.com/goccy/go-json v0.10.2
Expand Down
4 changes: 2 additions & 2 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
github.com/garrettladley/fiberpaginate v1.0.1 h1:Ren6wx8L8KLcPvCKUkgRuaZaxX7CjCCoPhCUytnrGyk=
github.com/garrettladley/fiberpaginate v1.0.1/go.mod h1:MHVWGQkhtnt2kE8F0wkTF5iUQOyqZlRktfcGgBLRBv0=
github.com/garrettladley/fiberpaginate v1.0.5 h1:H1Kj7UQBhaBxbCcDeSY3wlW9Hutq/hJ8NSEM86T9vAs=
github.com/garrettladley/fiberpaginate v1.0.5/go.mod h1:MHVWGQkhtnt2kE8F0wkTF5iUQOyqZlRktfcGgBLRBv0=
github.com/garrettladley/mattress v0.4.0 h1:ZB3iqyc5q6bqIryNfsh2FMcbMdnV1XEryvqivouceQE=
github.com/garrettladley/mattress v0.4.0/go.mod h1:OWKIRc9wC3gtD3Ng/nUuNEiR1TJvRYLmn/KZYw9nl5Q=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
Expand Down
6 changes: 3 additions & 3 deletions frontend/lib/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,9 @@
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==

"@types/node@^20.12.10":
version "20.12.10"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76"
integrity sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==
version "20.12.12"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
dependencies:
undici-types "~5.26.4"

Expand Down
8 changes: 4 additions & 4 deletions frontend/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"@expo/vector-icons": "^14.0.2",
"@generatesac/lib": "^0.0.1",
"@react-navigation/native": "^6.0.2",
"@reduxjs/toolkit": "^2.2.4",
"@reduxjs/toolkit": "^2.2.5",
"@shopify/restyle": "^2.4.4",
"expo": "~51.0.2",
"expo-font": "~12.0.4",
"expo-font": "~12.0.5",
"expo-linking": "~6.3.1",
"expo-router": "~3.5.11",
"expo-router": "~3.5.14",
"expo-secure-store": "~13.0.1",
"expo-splash-screen": "~0.27.4",
"expo-status-bar": "~1.12.1",
Expand All @@ -47,7 +47,7 @@
"eslint": "8.57.0",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.2.1",
"jest-expo": "~51.0.1",
"jest-expo": "~51.0.2",
"prettier": "^3.2.4",
"react-native-svg-transformer": "^1.4.0",
"react-test-renderer": "18.2.0",
Expand Down
55 changes: 36 additions & 19 deletions frontend/mobile/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@
node-forge "^1.2.1"
nullthrows "^1.1.1"

"@expo/[email protected]", "@expo/config-plugins@~8.0.0-beta.0":
"@expo/[email protected]", "@expo/config-plugins@~8.0.0", "@expo/config-plugins@~8.0.0-beta.0":
version "8.0.4"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-8.0.4.tgz#1e781cd971fab27409ed2f8d621db6d29cce3036"
integrity sha512-Hi+xuyNWE2LT4LVbGttHJgl9brnsdWAhEB42gWKb5+8ae86Nr/KwUBQJsJppirBYTeLjj5ZlY0glYnAkDa2jqw==
Expand All @@ -1113,7 +1113,7 @@
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-51.0.0.tgz#f5df238cd1237d7e4d9cc8217cdef3383c2a00cf"
integrity sha512-acn03/u8mQvBhdTQtA7CNhevMltUhbSrpI01FYBJwpVntufkU++ncQujWKlgY/OwIajcfygk1AY4xcNZ5ImkRA==

"@expo/[email protected]", "@expo/config@~9.0.0-beta.0":
"@expo/[email protected]":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-9.0.1.tgz#e7b79de5af29d5ab2a98a62c3cda31f03bd75827"
integrity sha512-0tjaXBstTbXmD4z+UMFBkh2SZFwilizSQhW6DlaTMnPG5ezuw93zSFEWAuEC3YzkpVtNQTmYzxAYjxwh6seOGg==
Expand All @@ -1130,6 +1130,23 @@
slugify "^1.3.4"
sucrase "3.34.0"

"@expo/config@~9.0.0", "@expo/config@~9.0.0-beta.0":
version "9.0.2"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-9.0.2.tgz#112b93436dbca8aa3da73a46329e5b58fdd435d2"
integrity sha512-BKQ4/qBf3OLT8hHp5kjObk2vxwoRQ1yYQBbG/OM9Jdz32yYtrU8opTbKRAxfZEWH5i3ZHdLrPdC1rO0I6WxtTw==
dependencies:
"@babel/code-frame" "~7.10.4"
"@expo/config-plugins" "~8.0.0"
"@expo/config-types" "^51.0.0-unreleased"
"@expo/json-file" "^8.3.0"
getenv "^1.0.0"
glob "7.1.6"
require-from-string "^2.0.2"
resolve-from "^5.0.0"
semver "^7.6.0"
slugify "^1.3.4"
sucrase "3.34.0"

"@expo/devcert@^1.0.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@expo/devcert/-/devcert-1.1.0.tgz#d148eb9180db6753c438192e73a123fb13b662ac"
Expand Down Expand Up @@ -2151,10 +2168,10 @@
dependencies:
nanoid "^3.1.23"

"@reduxjs/toolkit@^2.2.3", "@reduxjs/toolkit@^2.2.4":
version "2.2.4"
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.4.tgz#d9c25c2811d5aa92ff18f9483fe2223b0dbd33d5"
integrity sha512-EoIC9iC2V/DLRBVMXRHrO/oM3QBT7RuJNeBRx8Cpnz/NHINeZBEqgI8YOxAYUjLp+KYxGgc4Wd6KoAKsaUBGhg==
"@reduxjs/toolkit@^2.2.3", "@reduxjs/toolkit@^2.2.5":
version "2.2.5"
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.2.5.tgz#c0d2d8482ef80722bebe015ff05b06c34bfb6e0d"
integrity sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==
dependencies:
immer "^10.0.3"
redux "^5.0.1"
Expand Down Expand Up @@ -4819,10 +4836,10 @@ expo-file-system@~17.0.1:
resolved "https://registry.yarnpkg.com/expo-file-system/-/expo-file-system-17.0.1.tgz#b9f8af8c1c06ec71d96fd7a0d2567fa9e1c88f15"
integrity sha512-dYpnZJqTGj6HCYJyXAgpFkQWsiCH3HY1ek2cFZVHFoEc5tLz9gmdEgTF6nFHurvmvfmXqxi7a5CXyVm0aFYJBw==

expo-font@~12.0.4:
version "12.0.4"
resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-12.0.4.tgz#c3d9b7fc152286c1e2beae80f97b94ca4622db34"
integrity sha512-VtOQB7MEeFMVwo46/9/ntqzrgraTE7gAsnfi2NukFcCpDmyAU3G1R7m287LUXltE46SmGkMgAvM6+fflXFjaJA==
expo-font@~12.0.4, expo-font@~12.0.5:
version "12.0.5"
resolved "https://registry.yarnpkg.com/expo-font/-/expo-font-12.0.5.tgz#3451c2bd3f98859b127a6484d3474a292889b93f"
integrity sha512-h/VkN4jlHYDJ6T6pPgOYTVoDEfBY0CTKQe4pxnPDGQiE6H+DFdDgk+qWVABGpRMH0+zXoHB+AEi3OoQjXIynFA==
dependencies:
fontfaceobserver "^2.1.0"

Expand Down Expand Up @@ -4857,10 +4874,10 @@ [email protected]:
dependencies:
invariant "^2.2.4"

expo-router@~3.5.11:
version "3.5.11"
resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-3.5.11.tgz#5e66aaea954f6e5e4e23b5047138f424d9a2d0ca"
integrity sha512-6N6G4w+xsI3jVn4RoNDHyLmbEfoXvXKGzPOhuBicoblU8Utoa5hFI/tnEjxXfhlqz+zjAs6lCv3Ff0wzv/KYoQ==
expo-router@~3.5.14:
version "3.5.14"
resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-3.5.14.tgz#5ca0e861271fa716b94a6149d696f7ac1258aad4"
integrity sha512-RVsyJLosZSq89ebA5qfPToRcFZJoTTb+6nwPHk6iESD6KON/Q7ZODt5fvCwXkY86tLNEMGo160QvBPfBZmglaA==
dependencies:
"@expo/metro-runtime" "3.2.1"
"@expo/server" "^0.4.0"
Expand Down Expand Up @@ -6406,12 +6423,12 @@ jest-environment-node@^29.6.3, jest-environment-node@^29.7.0:
jest-mock "^29.7.0"
jest-util "^29.7.0"

jest-expo@~51.0.1:
version "51.0.1"
resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-51.0.1.tgz#d47a9ec67fb3245c9849f686253e36bc16d981c9"
integrity sha512-dnLditgU4RXeQnz5XmyMm1EoOn8k1i7F1DSxA3edjIqK5lydzjfeUHwef7Bs0ToOMIIqm5Bs37i7tsHYpMNLCw==
jest-expo@~51.0.2:
version "51.0.2"
resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-51.0.2.tgz#9c06ed5e890acf835a84200deb0969738e9f8721"
integrity sha512-ijIcjEASh2uORA3DBubOiIJTrPZXp8J3FedaEdnZPT09FkyTH8tZXp/ZRv37LKUomGA5XEHDYR2FY3UMfdIa7g==
dependencies:
"@expo/config" "~9.0.0-beta.0"
"@expo/config" "~9.0.0"
"@expo/json-file" "^8.3.0"
"@jest/create-cache-key-function" "^29.2.1"
babel-jest "^29.2.1"
Expand Down

0 comments on commit a6ee639

Please sign in to comment.