Compare commits

..

No commits in common. "master" and "fix-flaky-tests" have entirely different histories.

10 changed files with 6910 additions and 7313 deletions

View file

@ -84,7 +84,7 @@ jobs:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
if: matrix.version == 'stable' && (github.repository == 'mcapthca/survey') if: matrix.version == 'stable' && (github.repository == 'mcapthca/survey')
uses: JamesIves/github-pages-deploy-action@v4.6.4 uses: JamesIves/github-pages-deploy-action@3.7.1
with: with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages BRANCH: gh-pages

1230
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -24,10 +24,10 @@ path = "./src/tests-migrate.rs"
[dependencies] [dependencies]
actix-web = "4.3" actix-web = "4.3"
actix-identity = "0.4.0" actix-identity = "0.4.0"
actix-session = { version = "0.10.0", features = ["cookie-session"]} actix-session = { version = "0.6.1", features = ["cookie-session"]}
actix-http = "3.0.4" actix-http = "3.0.4"
actix-rt = "2" actix-rt = "2"
actix-cors = "0.7.0" actix-cors = "0.6.1"
actix-files = "0.6.0" actix-files = "0.6.0"
actix-service = "2.0.0" actix-service = "2.0.0"
#actix = "0.12" #actix = "0.12"
@ -37,16 +37,16 @@ actix-web-codegen-const-routes = "0.2.0"
futures = "0.3.15" futures = "0.3.15"
sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "postgres", "time", "uuid" ] } sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "postgres", "time", "uuid" ] }
#argon2-creds = "0.2.3" #argon2-creds = "0.2.3"
argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"} argon2-creds = { branch = "master", git = "https://github.com/realaravinth/argon2-creds"}
derive_builder = "0.20" derive_builder = "0.11"
validator = { version = "0.18", features = ["derive"]} validator = { version = "0.14", features = ["derive"]}
derive_more = "0.99" derive_more = "0.99"
config = "0.14" config = "0.13"
serde = "1" serde = "1"
serde_json = "1" serde_json = "1"
@ -62,7 +62,7 @@ rand = "0.8"
uuid = { version = "1.4.1", features = ["v4", "serde"] } uuid = { version = "1.4.1", features = ["v4", "serde"] }
mime_guess = "2.0.3" mime_guess = "2.0.3"
rust-embed = "8.0.0" rust-embed = "6.0.0"
#libcachebust = "0.3.0" #libcachebust = "0.3.0"
cache-buster = { git = "https://github.com/realaravinth/cache-buster" } cache-buster = { git = "https://github.com/realaravinth/cache-buster" }
mime = "0.3.16" mime = "0.3.16"
@ -73,7 +73,7 @@ tera = { version="1.17.1", features=["builtins"]}
tokio = { version = "1.25.0", features = ["fs", "macros"] } tokio = { version = "1.25.0", features = ["fs", "macros"] }
csv-async = { version = "1.2.5", features = ["serde", "tokio"] } csv-async = { version = "1.2.5", features = ["serde", "tokio"] }
async-trait = "0.1.68" async-trait = "0.1.68"
reqwest = { version = "0.12.0", features = ["json", "gzip", "native-tls-vendored"] } reqwest = { version = "0.11.18", features = ["json", "gzip", "native-tls-vendored"] }
#tokio = "1.11.0" #tokio = "1.11.0"
@ -86,7 +86,7 @@ version = "0.2"
[build-dependencies] [build-dependencies]
#serde_yaml = "0.8.17" #serde_yaml = "0.8.17"
sqlx = { version = "0.8", features = [ "runtime-tokio-rustls", "uuid", "postgres", "time"] } sqlx = { version = "0.7", features = [ "runtime-tokio-rustls", "uuid", "postgres", "time"] }
serde_json = "1" serde_json = "1"
cache-buster = { version = "0.2.0", git = "https://github.com/realaravinth/cache-buster" } cache-buster = { version = "0.2.0", git = "https://github.com/realaravinth/cache-buster" }
mime = "0.3.16" mime = "0.3.16"

View file

@ -1,4 +1,4 @@
FROM node:20-bookworm-slim as frontend FROM node:18-bookworm-slim as frontend
LABEL org.opencontainers.image.source https://github.com/mCaptcha/survey LABEL org.opencontainers.image.source https://github.com/mCaptcha/survey
RUN apt-get update && apt-get install -y make RUN apt-get update && apt-get install -y make
COPY package.json yarn.lock /src/ COPY package.json yarn.lock /src/
@ -8,14 +8,14 @@ RUN yarn install
COPY . . COPY . .
RUN make frontend RUN make frontend
FROM rust:latest as rust FROM rust:1-slim-bookworm as rust
WORKDIR /src WORKDIR /src
RUN apt-get update && apt-get install -y git libssl-dev RUN apt-get update && apt-get install -y git
COPY . /src COPY . /src
COPY --from=frontend /src/static/cache/bundle /src/static/cache/bundle COPY --from=frontend /src/static/cache/bundle /src/static/cache/bundle
RUN cargo build --release RUN cargo build --release
FROM debian:bookworm FROM debian:bookworm-slim
RUN useradd -ms /bin/bash -u 1001 mcaptcha-survey RUN useradd -ms /bin/bash -u 1001 mcaptcha-survey
WORKDIR /home/mcaptcha-survey WORKDIR /home/mcaptcha-survey
COPY --from=rust /src/target/release/survey /usr/local/bin/ COPY --from=rust /src/target/release/survey /usr/local/bin/

View file

@ -49,7 +49,7 @@ doc: ## Prepare documentation
cargo doc --no-deps --workspace --all-features cargo doc --no-deps --workspace --all-features
docker: ## Build docker images docker: ## Build docker images
docker buildx build -t mcaptcha/survey:master -t mcaptcha/survey:latest . --load docker build -t mcaptcha/survey:master -t mcaptcha/survey:latest .
docker-publish: docker ## Build and publish docker images docker-publish: docker ## Build and publish docker images
docker push mcaptcha/survey:master docker push mcaptcha/survey:master

View file

@ -10,7 +10,7 @@ services:
RUST_LOG: debug RUST_LOG: debug
postgres: postgres:
image: postgres:16.4 image: postgres:13.2
volumes: volumes:
- mcaptcha-survey-data:/var/lib/postgresql/ - mcaptcha-survey-data:/var/lib/postgresql/
environment: environment:

8948
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -10,26 +10,26 @@
"test": "jest" "test": "jest"
}, },
"devDependencies": { "devDependencies": {
"@types/jest": "^29.0.0", "@types/jest": "^27.0.2",
"@types/jsdom": "^21.0.0", "@types/jsdom": "^16.2.10",
"@types/node": "^20.0.0", "@types/node": "^16.10.5",
"@types/sinon": "^17.0.0", "@types/sinon": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/eslint-plugin": "^5.0.0",
"@typescript-eslint/parser": "^8.0.0", "@typescript-eslint/parser": "^5.0.0",
"@wasm-tool/wasm-pack-plugin": "^1.6.0", "@wasm-tool/wasm-pack-plugin": "^1.6.0",
"dart-sass": "^1.25.0", "dart-sass": "^1.25.0",
"eslint": "^9.0.0", "eslint": "^8.0.1",
"jest": "^29.0.0", "jest": "^27.2.5",
"jest-fetch-mock": "^3.0.3", "jest-fetch-mock": "^3.0.3",
"jsdom": "^25.0.0", "jsdom": "^18.0.0",
"sinon": "^19.0.0", "sinon": "^11.1.2",
"ts-jest": "^29.0.0", "ts-jest": "^27.0.5",
"ts-loader": "^9.2.6", "ts-loader": "^9.2.6",
"ts-node": "^10.3.0", "ts-node": "^10.3.0",
"typescript": "^5.0.0", "typescript": "^4.4.4",
"webpack": "^5.0.0", "webpack": "^5.0.0",
"webpack-cli": "^5.0.0", "webpack-cli": "^4.6.0",
"webpack-dev-server": "^5.0.0" "webpack-dev-server": "^4.3.1"
}, },
"dependencies": { "dependencies": {
"@mcaptcha/vanilla-glue": "^0.1.0-alpha-3", "@mcaptcha/vanilla-glue": "^0.1.0-alpha-3",

View file

@ -1,21 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":dependencyDashboard"
],
"labels": [
"renovate-bot"
],
"prHourlyLimit": 0,
"timezone": "Asia/kolkata",
"prCreation": "immediate",
"vulnerabilityAlerts": {
"enabled": true,
"labels": [
"renovate-bot",
"renovate-security",
"security"
]
}
}

3964
yarn.lock

File diff suppressed because it is too large Load diff