From 5b6023218d8298a714a81f0f282a70dca4697a8a Mon Sep 17 00:00:00 2001 From: Ron Rise Date: Wed, 16 Apr 2025 13:49:52 -0400 Subject: [PATCH] Todo!!! (#1) Reviewed-on: https://gitea.siteworxpro.com/rrise/reloading-manager/pulls/1 Co-authored-by: Ron Rise Co-committed-by: Ron Rise --- .gitea/workflows/tests.yml | 60 ++++++++++++++++++++++++ backend/Dockerfile | 2 +- backend/database/conn.go | 12 ++--- backend/go.mod | 5 +- backend/go.sum | 40 ++-------------- backend/handlers/bullets/handler.go | 6 +-- backend/handlers/cartridge/handler.go | 6 +-- backend/handlers/loads/handler.go | 10 ++-- backend/handlers/manufacturer/handler.go | 6 +-- backend/handlers/powder/handler.go | 6 +-- backend/handlers/primers/handler.go | 6 +-- backend/main.go | 16 +++---- frontend/src/pages/bullets/Add.vue | 5 -- frontend/src/pages/loads/Search.vue | 3 +- 14 files changed, 103 insertions(+), 80 deletions(-) create mode 100644 .gitea/workflows/tests.yml diff --git a/.gitea/workflows/tests.yml b/.gitea/workflows/tests.yml new file mode 100644 index 0000000..7c9ae44 --- /dev/null +++ b/.gitea/workflows/tests.yml @@ -0,0 +1,60 @@ +on: + - push + +name: Unit Tests + +jobs: + build-javascript: + name: Run JavaScript Unit Tests + runs-on: ubuntu-latest + steps: + - name: Add Siteworx CA + run: | + apt update && apt install -yq ca-certificates curl + curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt + update-ca-certificates + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: '22.14.0' + - name: Install dependencies + run: | + cd frontend + npm install + - name: Run tests + run: | + cd frontend + npm run build + test-go: + env: + GOPRIVATE: 'git.siteworxpro.com' + GOPROXY: 'direct' + name: Run Goland Unit Tests + runs-on: ubuntu-latest + steps: + - name: Add Siteworx CA + run: | + apt update && apt install -yq ca-certificates curl + curl -Ls https://siteworxpro.com/hosted/Siteworx+Root+CA.pem -o /usr/local/share/ca-certificates/sw.crt + update-ca-certificates + - name: Set up Go + uses: actions/setup-go@v2 + with: + go-version: '1.24.0' + cache: true + - name: Checkout code + uses: actions/checkout@v2 + with: + fetch-depth: 1 + - name: Install dependencies + run: | + cd backend + go mod download + - name: Run tests + run: | + cd backend + go test -v ./... -coverprofile=coverage.out diff --git a/backend/Dockerfile b/backend/Dockerfile index 8d1f661..16fd9bc 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app ARG CGO_ENABLED=0 ARG GOOS=linux ARG GOPROXY=direct -ARG GOPRIVATE=git.s.int +ARG GOPRIVATE=git.siteworxpro.com ADD . . diff --git a/backend/database/conn.go b/backend/database/conn.go index c6fc78a..72172bc 100644 --- a/backend/database/conn.go +++ b/backend/database/conn.go @@ -3,12 +3,12 @@ package database import ( "context" "fmt" - "git.s.int/packages/go/utilities/Env" - "git.s.int/reloading-manager/backend/models/bullets" - "git.s.int/reloading-manager/backend/models/loads" - "git.s.int/reloading-manager/backend/models/manufacturer" - "git.s.int/reloading-manager/backend/models/powder" - "git.s.int/reloading-manager/backend/models/primers" + "git.siteworxpro.com/packages/go/utilities/Env" + "git.siteworxpro.com/reloading-manager/backend/models/bullets" + "git.siteworxpro.com/reloading-manager/backend/models/loads" + "git.siteworxpro.com/reloading-manager/backend/models/manufacturer" + "git.siteworxpro.com/reloading-manager/backend/models/powder" + "git.siteworxpro.com/reloading-manager/backend/models/primers" "github.com/jackc/pgx/v5" "log" ) diff --git a/backend/go.mod b/backend/go.mod index 8e1902b..f37bda3 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,9 +1,9 @@ -module git.s.int/reloading-manager/backend +module git.siteworxpro.com/reloading-manager/backend go 1.24.0 require ( - git.s.int/packages/go/utilities v1.2.2 + git.siteworxpro.com/packages/go/utilities v1.3.0 github.com/go-playground/validator v9.31.0+incompatible github.com/go-sql-driver/mysql v1.9.1 github.com/golang-migrate/migrate v3.5.4+incompatible @@ -24,7 +24,6 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/leodido/go-urn v1.4.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index 4c9db21..ab79374 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -1,7 +1,7 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.s.int/packages/go/utilities v1.2.2 h1:IXKdrTgRc7tnDUB4sOWD/kjwgw9luUzvsaPzX+Dhm7Y= -git.s.int/packages/go/utilities v1.2.2/go.mod h1:1nIS3PzUaLiNBBkyme408XbI725PiureeTV7iBXfUI0= +git.siteworxpro.com/packages/go/utilities v1.3.0 h1:931q66COBJATgIQksPDSZlWMIwENJhhfC/GVf22ER5s= +git.siteworxpro.com/packages/go/utilities v1.3.0/go.mod h1:iWhICNrMnB03PY9dM9eCNs9uQPEsPwae5pJDG+HHUPI= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -23,14 +23,10 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator v9.31.0+incompatible h1:UA72EPEogEnq76ehGdEDp4Mit+3FDh548oRqwVgNsHA= github.com/go-playground/validator v9.31.0+incompatible/go.mod h1:yrEkQXlcI+PugkyDjY2bRrL/UBU4f3rvrgkN3V8JEig= -github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= -github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-sql-driver/mysql v1.9.1 h1:FrjNGn/BsJQjVRuSa8CBrM5BWA9BWoXXat3KrtSb/iI= github.com/go-sql-driver/mysql v1.9.1/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA= github.com/golang-migrate/migrate v3.5.4+incompatible/go.mod h1:IsVUlFN5puWOmXrqjgGUfIRIbU7mr8oNBE2tyERd9Wk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -39,31 +35,22 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.7.3 h1:PO1wNKj/bTAwxSJnO1Z4Ai8j4magtqg2SLNjEDzcXQo= -github.com/jackc/pgx/v5 v5.7.3/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg= github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= -github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= -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/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -75,15 +62,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= 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/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= @@ -93,8 +75,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -105,33 +85,23 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/backend/handlers/bullets/handler.go b/backend/handlers/bullets/handler.go index 366b606..67d0a69 100644 --- a/backend/handlers/bullets/handler.go +++ b/backend/handlers/bullets/handler.go @@ -3,9 +3,9 @@ package bullets import ( "context" "encoding/json" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/models/bullets" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/models/bullets" "github.com/labstack/echo/v4" "net/http" "strconv" diff --git a/backend/handlers/cartridge/handler.go b/backend/handlers/cartridge/handler.go index 1289a38..5043940 100644 --- a/backend/handlers/cartridge/handler.go +++ b/backend/handlers/cartridge/handler.go @@ -3,9 +3,9 @@ package cartridge import ( "context" "encoding/json" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/models/loads" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/models/loads" "github.com/labstack/echo/v4" "net/http" ) diff --git a/backend/handlers/loads/handler.go b/backend/handlers/loads/handler.go index d4d3168..6108a8c 100644 --- a/backend/handlers/loads/handler.go +++ b/backend/handlers/loads/handler.go @@ -2,11 +2,11 @@ package loads import ( "context" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/handlers/bullets" - "git.s.int/reloading-manager/backend/handlers/primers" - "git.s.int/reloading-manager/backend/models/loads" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/handlers/bullets" + "git.siteworxpro.com/reloading-manager/backend/handlers/primers" + "git.siteworxpro.com/reloading-manager/backend/models/loads" "github.com/labstack/echo/v4" "net/http" ) diff --git a/backend/handlers/manufacturer/handler.go b/backend/handlers/manufacturer/handler.go index 86e15e3..b4fe176 100644 --- a/backend/handlers/manufacturer/handler.go +++ b/backend/handlers/manufacturer/handler.go @@ -3,9 +3,9 @@ package manufacturer import ( "context" "encoding/json" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/models/manufacturer" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/models/manufacturer" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" "github.com/labstack/echo/v4" diff --git a/backend/handlers/powder/handler.go b/backend/handlers/powder/handler.go index 26105d2..e698a6f 100644 --- a/backend/handlers/powder/handler.go +++ b/backend/handlers/powder/handler.go @@ -3,9 +3,9 @@ package powder import ( "context" "encoding/json" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/models/powder" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/models/powder" "github.com/google/uuid" "github.com/labstack/echo/v4" "net/http" diff --git a/backend/handlers/primers/handler.go b/backend/handlers/primers/handler.go index 58fc033..fbb7676 100644 --- a/backend/handlers/primers/handler.go +++ b/backend/handlers/primers/handler.go @@ -3,9 +3,9 @@ package primers import ( "context" "encoding/json" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers" - "git.s.int/reloading-manager/backend/models/primers" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers" + "git.siteworxpro.com/reloading-manager/backend/models/primers" "github.com/google/uuid" "github.com/labstack/echo/v4" "net/http" diff --git a/backend/main.go b/backend/main.go index 1ea560b..46117f2 100644 --- a/backend/main.go +++ b/backend/main.go @@ -3,14 +3,14 @@ package main import ( "context" "fmt" - "git.s.int/packages/go/utilities/Env" - "git.s.int/reloading-manager/backend/database" - "git.s.int/reloading-manager/backend/handlers/bullets" - "git.s.int/reloading-manager/backend/handlers/cartridge" - "git.s.int/reloading-manager/backend/handlers/loads" - "git.s.int/reloading-manager/backend/handlers/manufacturer" - "git.s.int/reloading-manager/backend/handlers/powder" - "git.s.int/reloading-manager/backend/handlers/primers" + "git.siteworxpro.com/packages/go/utilities/Env" + "git.siteworxpro.com/reloading-manager/backend/database" + "git.siteworxpro.com/reloading-manager/backend/handlers/bullets" + "git.siteworxpro.com/reloading-manager/backend/handlers/cartridge" + "git.siteworxpro.com/reloading-manager/backend/handlers/loads" + "git.siteworxpro.com/reloading-manager/backend/handlers/manufacturer" + "git.siteworxpro.com/reloading-manager/backend/handlers/powder" + "git.siteworxpro.com/reloading-manager/backend/handlers/primers" "github.com/go-playground/validator" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" diff --git a/frontend/src/pages/bullets/Add.vue b/frontend/src/pages/bullets/Add.vue index cf92919..9cdd7f7 100644 --- a/frontend/src/pages/bullets/Add.vue +++ b/frontend/src/pages/bullets/Add.vue @@ -51,7 +51,6 @@ import axios, { AxiosError } from 'axios' import { Manufacturer } from '../../types/manufacturer' import { Response } from '../../types/Response' import { FileUploadSelectEvent } from 'primevue/fileupload' -import { Bullet } from '../../types/bullet' import { ToastMessageOptions } from 'primevue/toast' import { useToast } from 'primevue/usetoast' import { useRouter } from 'vue-router' @@ -109,10 +108,6 @@ const createManufacturer = async () => { return axios.post(`${import.meta.env.VITE_API}/manufacturer`, { name: add.value.name, url: add.value.url, - }, { - headers: { - Authorization: `Bearer ${jwt}`, - }, }).then((r: Response) => { manufacturers.value.push(r.data.payload) bullet.value.manufacturer_id = r.data.payload.id diff --git a/frontend/src/pages/loads/Search.vue b/frontend/src/pages/loads/Search.vue index 3084d7c..5374f30 100644 --- a/frontend/src/pages/loads/Search.vue +++ b/frontend/src/pages/loads/Search.vue @@ -77,7 +77,7 @@ -