Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/frontend/sac-mobile/…
Browse files Browse the repository at this point in the history
…prettier-3.2.5
  • Loading branch information
garrettladley authored Feb 12, 2024
2 parents d61d59c + 755a82d commit c5677e4
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 88 deletions.
8 changes: 4 additions & 4 deletions backend/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22.0

require (
github.com/garrettladley/mattress v0.2.2
github.com/go-playground/validator/v10 v10.17.0
github.com/go-playground/validator/v10 v10.18.0
github.com/goccy/go-json v0.10.2
github.com/gofiber/fiber/v2 v2.52.0
github.com/gofiber/swagger v1.0.0
Expand All @@ -30,7 +30,7 @@ require (
github.com/awnumar/memguard v0.22.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.6 // indirect
github.com/go-openapi/spec v0.20.4 // indirect
Expand All @@ -45,7 +45,7 @@ require (
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
Expand All @@ -67,7 +67,7 @@ require (
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/tools v0.13.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
17 changes: 8 additions & 9 deletions backend/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
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/mattress v0.2.2 h1:kL/AvDmas6DaAweHwdsm3IosY9zJIGj2uO+byxzhyrU=
github.com/garrettladley/mattress v0.2.2/go.mod h1:OWKIRc9wC3gtD3Ng/nUuNEiR1TJvRYLmn/KZYw9nl5Q=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
Expand All @@ -39,8 +39,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.17.0 h1:SmVVlfAOtlZncTxRuinDPomC2DkXJ4E5T9gDA0AIH74=
github.com/go-playground/validator/v10 v10.17.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
github.com/go-playground/validator/v10 v10.18.0 h1:BvolUXjp4zuvkZ5YN5t7ebzbhlUtPsPm2S9NAZ5nl9U=
github.com/go-playground/validator/v10 v10.18.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/gofiber/fiber/v2 v2.52.0 h1:S+qXi7y+/Pgvqq4DrSmREGiFwtB7Bu6+QFLuIHYw/UE=
Expand Down Expand Up @@ -78,8 +78,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down Expand Up @@ -129,7 +129,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
Expand All @@ -156,8 +155,8 @@ golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand Down
6 changes: 3 additions & 3 deletions frontend/sac-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"preset": "jest-expo"
},
"dependencies": {
"@clerk/clerk-expo": "^0.20.1",
"@clerk/clerk-expo": "^0.20.5",
"@expo/vector-icons": "^13.0.0",
"@react-navigation/native": "^6.0.2",
"@tanstack/react-query": "^5.17.9",
Expand All @@ -25,7 +25,7 @@
"expo-auth-session": "~5.4.0",
"expo-font": "~11.10.2",
"expo-linking": "~6.2.2",
"expo-router": "^3.4.6",
"expo-router": "^3.4.7",
"expo-splash-screen": "~0.26.4",
"expo-status-bar": "~1.11.1",
"expo-system-ui": "~2.9.3",
Expand All @@ -51,7 +51,7 @@
"eslint": "^8.56.0",
"eslint-plugin-prettier": "^5.1.3",
"jest": "^29.2.1",
"jest-expo": "~50.0.1",
"jest-expo": "~50.0.2",
"postcss": "^8.4.33",
"prettier": "^3.2.5",
"react-test-renderer": "18.2.0",
Expand Down
78 changes: 39 additions & 39 deletions frontend/sac-mobile/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1268,25 +1268,25 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@clerk/clerk-expo@^0.20.1":
version "0.20.1"
resolved "https://registry.yarnpkg.com/@clerk/clerk-expo/-/clerk-expo-0.20.1.tgz#27804da7c14b1b466b80db6d90b7e326cc35643c"
integrity sha512-tvuoiOz1VCYQw4X9oWdcOXQLmAsKNC1cUlZgT+Kw3C3rM1Z5/+5sMlJakKvJICsfyT/9zHZYXVXkVO4eEP4XQA==
"@clerk/clerk-expo@^0.20.5":
version "0.20.5"
resolved "https://registry.yarnpkg.com/@clerk/clerk-expo/-/clerk-expo-0.20.5.tgz#f2cc7c36b92467aadf84e7c5d0bb3a105128c706"
integrity sha512-TmPoyReI6+2kTI3x0xee96/vkD77weuiWzZ+oM4rBLcOEstL63qfoUESFQOFJwU7mrAs3gylgrrV+TbjX2ykEg==
dependencies:
"@clerk/clerk-js" "4.68.5"
"@clerk/clerk-react" "4.30.3"
"@clerk/clerk-js" "4.70.0"
"@clerk/clerk-react" "4.30.5"
"@clerk/shared" "1.3.1"
base-64 "1.0.0"
react-native-url-polyfill "2.0.0"

"@clerk/clerk-js@4.68.5":
version "4.68.5"
resolved "https://registry.yarnpkg.com/@clerk/clerk-js/-/clerk-js-4.68.5.tgz#b5e4508ae528ef7fc81e28f5a94c6a19b7258079"
integrity sha512-8wrU4RKt3YZNmaYpqouRVA3/LNfJhpbPI5UoDLE6GeNA/l0z6H2YsiEfX9eiOuIiCF8kJxwv5pbJgzzLrXS6QQ==
"@clerk/clerk-js@4.70.0":
version "4.70.0"
resolved "https://registry.yarnpkg.com/@clerk/clerk-js/-/clerk-js-4.70.0.tgz#5d39741e3403a72a7affd73ae53ff850f0b458e2"
integrity sha512-zwcBY56Y+ns4Ca8q5rZ9uyeHUo1xjoaOCl4vVmoj5SQSghasl+WMfPmth8qTt/2L+niaivuKmXuEQoq2X/9XjQ==
dependencies:
"@clerk/localizations" "1.26.13"
"@clerk/localizations" "1.26.15"
"@clerk/shared" "1.3.1"
"@clerk/types" "3.60.0"
"@clerk/types" "3.62.0"
"@emotion/cache" "11.11.0"
"@emotion/react" "11.11.1"
"@floating-ui/react" "0.25.4"
Expand All @@ -1300,21 +1300,21 @@
qs "6.11.0"
regenerator-runtime "0.13.11"

"@clerk/[email protected].3":
version "4.30.3"
resolved "https://registry.yarnpkg.com/@clerk/clerk-react/-/clerk-react-4.30.3.tgz#5b2fcbd773a8cbe4e1dfa3eafa1c878b3d45102f"
integrity sha512-bX4fUxGXUrMl8A50TpeUM8PHFKbMHmt7UfJ/NnUQMBN54h9N/NF2eSE2omY1+lDxBJmh/V9EiJZV8S6MwDflzw==
"@clerk/[email protected].5":
version "4.30.5"
resolved "https://registry.yarnpkg.com/@clerk/clerk-react/-/clerk-react-4.30.5.tgz#350484a996c80a9c3b91211df596481468a64757"
integrity sha512-jWSbgjWW3ny+ctQKpz/c8CwascliDtaa/8FyHX7tqKlV7vFeR9N/AjaZIUKHrbeGpRk+b/RM2xHLoZS4nZ4V6A==
dependencies:
"@clerk/shared" "1.3.1"
"@clerk/types" "3.60.0"
"@clerk/types" "3.62.0"
tslib "2.4.1"

"@clerk/[email protected].13":
version "1.26.13"
resolved "https://registry.yarnpkg.com/@clerk/localizations/-/localizations-1.26.13.tgz#d0a3ebdfd144d8c93c9309de179a9bcab3dc445d"
integrity sha512-YsH9WVqkZYJ3ffCP1wce3KWrQo8C3BUS5b7grOpwt/H15sK0Y3KyeS3py1QqcfMcYj+gqjcbW9Az8MpdUeP8Rg==
"@clerk/[email protected].15":
version "1.26.15"
resolved "https://registry.yarnpkg.com/@clerk/localizations/-/localizations-1.26.15.tgz#1d74993f157c30be8545b24ba979f410bf7607bb"
integrity sha512-n9ysUFDEvQqSMuc6QP5BS7YAAhg+6Gpd/mfTEvQdXqlhURCxVlDmg8H29oDNyZGOakwcerFcJiVx8dzrs50YFg==
dependencies:
"@clerk/types" "3.60.0"
"@clerk/types" "3.62.0"

"@clerk/[email protected]":
version "1.3.1"
Expand All @@ -1325,10 +1325,10 @@
js-cookie "3.0.1"
swr "2.2.0"

"@clerk/types@3.60.0":
version "3.60.0"
resolved "https://registry.yarnpkg.com/@clerk/types/-/types-3.60.0.tgz#d0d369f5cb4558127e279f994057a616a6b4dab0"
integrity sha512-f1A16wFh5MtikxEo7o6vAVX7FxpqC1YmzA6c4ugwq5MH8J2mvIM/LwNVIHgNpZkn/s/G+BUhBcJJmUXqajDK2Q==
"@clerk/types@3.62.0":
version "3.62.0"
resolved "https://registry.yarnpkg.com/@clerk/types/-/types-3.62.0.tgz#5c40cc8f5888ce4ad4eaf818353f4901edccfd0a"
integrity sha512-rjtdPqNJtfayCrqOCi20i46rw7X5yzAiOoh0Dzl7KX8kdBWQn06UxpgREPEp/3gFS2imVFRyXtx+fUGRwOGjaw==
dependencies:
csstype "3.1.1"

Expand Down Expand Up @@ -1697,10 +1697,10 @@
resolve-from "^5.0.0"
sucrase "3.34.0"

"@expo/[email protected].2":
version "3.1.2"
resolved "https://registry.yarnpkg.com/@expo/metro-runtime/-/metro-runtime-3.1.2.tgz#4cc4fe53aa8f716307f584c67db76268d38c2ed7"
integrity sha512-Wekv2AZ3HY0NG9Im8AMB1KHGyHjmALg6xekVK34724I/DLtcocLKtQEP04oI9GcAZBotAhROHH5E4ADhJAEgYg==
"@expo/[email protected].3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@expo/metro-runtime/-/metro-runtime-3.1.3.tgz#e29503808bd8ffeb706ef9a17b644230a379f298"
integrity sha512-u1CaQJJlSgvxBB5NJ6YMVvSDTTRzjT71dHpEBnKPZhpFv5ebVry52FZ2sEeEEA6mHG5zGxWXmHImW3hNKHh8EA==

"@expo/osascript@^2.0.31":
version "2.0.33"
Expand Down Expand Up @@ -5054,12 +5054,12 @@ [email protected]:
dependencies:
invariant "^2.2.4"

expo-router@^3.4.6:
version "3.4.6"
resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-3.4.6.tgz#ef0c8b06e7e0e370ca8d0a1c4564996f788feb38"
integrity sha512-yxl0QE4KAqLmLyH8AxWsGSV3M34jsAE8X75cOB2oaK0+Pu9VHSUf6w3iRi93IiJ0rOUXm8jKrjhfhZOrrNh7EA==
expo-router@^3.4.7:
version "3.4.7"
resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-3.4.7.tgz#04c1eb50f089da5f3d42c2c56f42e90d3c29d62c"
integrity sha512-B1VLols+ErUqWtRHi9j/sQhxxwlsM7AJN+jEkvrPIfvhG7qpb1Usq13893ORcHvz/UhSHeEc9nKh7qx9hS6urw==
dependencies:
"@expo/metro-runtime" "3.1.2"
"@expo/metro-runtime" "3.1.3"
"@expo/server" "^0.3.0"
"@radix-ui/react-slot" "1.0.1"
"@react-navigation/bottom-tabs" "~6.5.7"
Expand Down Expand Up @@ -6426,10 +6426,10 @@ jest-environment-node@^29.6.3, jest-environment-node@^29.7.0:
jest-mock "^29.7.0"
jest-util "^29.7.0"

jest-expo@~50.0.1:
version "50.0.1"
resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-50.0.1.tgz#4b180b2a06a2cad49c5c74cf8cbbd4387bb30621"
integrity sha512-osvA63UDLJ/v7MG9UHjU7WJ0oZ0Krq9UhXxm2s6rdOlnt85ARocyMU57RC0T0yzPN47C9Ref45sEeOIxoV4Mzg==
jest-expo@~50.0.2:
version "50.0.2"
resolved "https://registry.yarnpkg.com/jest-expo/-/jest-expo-50.0.2.tgz#cbf5b4c2dd40bac646d6b08f2c575a0e1e0d9bd9"
integrity sha512-g9Vq4Cpndp6M+bWGNJfyxw+iiZm7o1XpaOEHgtyC1evdy4B9IsEWql1Y2xBH7uD79FwSKhaIz+xCQHZNhnSlAg==
dependencies:
"@expo/config" "~8.5.0"
"@expo/json-file" "^8.2.37"
Expand Down
47 changes: 31 additions & 16 deletions frontend/sac-web/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 frontend/sac-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"next": "14.1.0",
"react": "^18",
"react-dom": "^18",
"semver": "7.5.4"
"semver": "7.6.0"
},
"devDependencies": {
"@types/node": "^20",
Expand Down
Loading

0 comments on commit c5677e4

Please sign in to comment.