Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/npm package audit #392

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
b6d0f3d
add test for HandleHTTPError
j4qfrost Aug 26, 2024
d123995
more verbose http codes
j4qfrost Aug 26, 2024
d56d930
Update Dockerfile
astrosnat Aug 26, 2024
47cb345
Update compose_dev.sh
astrosnat Aug 26, 2024
18e7b49
add failure condition test
j4qfrost Aug 26, 2024
c7690d1
Merge branch 'upstream/main'
j4qfrost Aug 27, 2024
de31424
Merge remote-tracking branch 'upstream/golang123'
j4qfrost Aug 27, 2024
3646abe
formatting and test standards
j4qfrost Aug 28, 2024
0a7fcf0
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 7, 2024
df26051
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 7, 2024
6cbb97c
add frontend file polling for wsl2
j4qfrost Sep 7, 2024
8f86e23
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 9, 2024
564ad6b
Add test for HandleHTTPError (#278)
j4qfrost Aug 28, 2024
88b4854
add failure condition test (#282)
j4qfrost Aug 29, 2024
a2ccc58
Creation of Market Price Projection API (#277)
pwdel Aug 30, 2024
a1e039c
Create SECURITY.md
pwdel Sep 4, 2024
17e26a5
Adding Fees to Buying and Selling Bets (#287)
pwdel Sep 7, 2024
327e906
Frontend fixes (#286)
markokovac16 Sep 7, 2024
f10fdde
Attempting toa ddress cors related security concern. (#298)
pwdel Sep 7, 2024
f1b4d43
Drafting out reporting stats.
pwdel Sep 7, 2024
4cc882e
Add support for dependency injection to setup (#301)
ajlacey Sep 8, 2024
29eaddf
Merge branch 'upstream/main'
j4qfrost Sep 9, 2024
9692361
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 12, 2024
5b93d90
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict…
j4qfrost Sep 20, 2024
61827a6
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 23, 2024
df4f062
revert
j4qfrost Sep 23, 2024
2da9247
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 26, 2024
f6fea8b
Fix/remove wsl check (#337)
j4qfrost Sep 23, 2024
f74ebd2
Feature/frontend vite build (#341)
j4qfrost Sep 25, 2024
454fa34
feat(ci): Add docker creation workflow
j4qfrost Sep 26, 2024
402bf2d
separate builds
j4qfrost Sep 26, 2024
7becd22
on branch up
j4qfrost Sep 27, 2024
31a03d5
main
j4qfrost Sep 27, 2024
95ecf5b
Merge branch 'feature/ci-container-build-publish'
j4qfrost Sep 27, 2024
4717a79
correct files
j4qfrost Sep 27, 2024
00857a6
remove syntax check
j4qfrost Sep 27, 2024
47896f6
fix metas
j4qfrost Sep 27, 2024
353d97d
meta access
j4qfrost Sep 27, 2024
0af2995
attestation
j4qfrost Sep 27, 2024
f3aeba1
separate attestations
j4qfrost Sep 27, 2024
c99fbbc
Merge branch 'openpredictionmarkets:main' into main
j4qfrost Sep 27, 2024
51c7a6a
latest tag
j4qfrost Sep 27, 2024
813e8c3
Merge branch 'main' of github.com:j4qfrost/socialpredict
j4qfrost Sep 27, 2024
7f822b1
tag change
j4qfrost Sep 27, 2024
4bd777c
caching
j4qfrost Sep 27, 2024
8ec1d21
buildx and tagging
j4qfrost Sep 27, 2024
1c37224
retag and test cache
j4qfrost Sep 27, 2024
d310deb
tagging
j4qfrost Sep 28, 2024
307a83d
automate on tags
j4qfrost Sep 28, 2024
87a41ef
added back for security
j4qfrost Sep 28, 2024
ae069c7
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Sep 29, 2024
686fcc9
feat(ci): Deploy workflow to staging
j4qfrost Oct 1, 2024
13c172c
up version
j4qfrost Oct 4, 2024
c308efb
fingerprint check
j4qfrost Oct 4, 2024
0870969
fingerprint remove
j4qfrost Oct 4, 2024
cb37945
fingerprint
j4qfrost Oct 4, 2024
cee47be
fingerprint
j4qfrost Oct 4, 2024
30ca530
version
j4qfrost Oct 4, 2024
544df4f
compose cmd
j4qfrost Oct 4, 2024
42e3a31
input file
j4qfrost Oct 4, 2024
d65dff4
go to source
j4qfrost Oct 4, 2024
0e28e3e
other dir
j4qfrost Oct 4, 2024
188b15f
other dir
j4qfrost Oct 4, 2024
b8a3451
other dir
j4qfrost Oct 4, 2024
d08981e
var names
j4qfrost Oct 4, 2024
1e16f7f
check
j4qfrost Oct 4, 2024
fd1a287
env file
j4qfrost Oct 5, 2024
bc03d33
env file
j4qfrost Oct 5, 2024
43722d5
env file
j4qfrost Oct 5, 2024
33dfec4
Merge branch 'main' into feature/ci_deploy_digital_ocean
j4qfrost Oct 5, 2024
31dea91
args
j4qfrost Oct 5, 2024
29d0c8d
Merge branch 'main' into feature/ci_deploy_digital_ocean
j4qfrost Oct 5, 2024
e2c3e0a
args
j4qfrost Oct 5, 2024
4e09693
Merge branch 'main' into feature/ci_deploy_digital_ocean
j4qfrost Oct 5, 2024
fe2aed9
args
j4qfrost Oct 5, 2024
06408f4
args
j4qfrost Oct 5, 2024
630d6dd
args
j4qfrost Oct 5, 2024
573ead7
args
j4qfrost Oct 5, 2024
8369107
check
j4qfrost Oct 5, 2024
b054a97
backend
j4qfrost Oct 5, 2024
575398f
backend
j4qfrost Oct 5, 2024
ffc284b
docker login
j4qfrost Oct 5, 2024
82a1481
args
j4qfrost Oct 5, 2024
9380a21
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict…
j4qfrost Oct 23, 2024
cf543b4
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Nov 4, 2024
a393659
refactor(frontend): Ran npm audit in frontend
j4qfrost Nov 4, 2024
ffe7f11
fix(ci): Staging workflow not setting domain correctly
j4qfrost Nov 4, 2024
6c3a50d
refactor(nginx): Whitelist paths
j4qfrost Nov 4, 2024
4043fec
Merge branch 'fix/staging-workflow-domain'
j4qfrost Nov 4, 2024
b071d5c
remove file
j4qfrost Nov 4, 2024
8ad9678
Merge branch 'main' of github.com:openpredictionmarkets/socialpredict
j4qfrost Nov 9, 2024
20d52e4
Merge branch 'main' into refactor/npm_package_audit
j4qfrost Nov 9, 2024
62fd898
revert nginx change
j4qfrost Nov 9, 2024
e5bb79b
Merge branch 'upstream/main' into refactor/npm_package_audit
j4qfrost Nov 9, 2024
dc06e84
pulled file from upstream
j4qfrost Nov 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
args
  • Loading branch information
j4qfrost committed Oct 5, 2024
commit 573ead7ec461202a12d06b459ffd32bc92a4cf8c
1 change: 1 addition & 0 deletions .github/workflows/deploy-digital-ocean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
temp_env_file=$(mktemp)

echo ${{secrets.COMPOSE_ENV}} >> $temp_env_file
echo "ENV_PATH=$temp_env_file" >> $temp_env_file
if [ ! -d socialpredict-deploy ]
then
git clone ${{ github.server_url }}/${{ github.repository }} socialpredict-deploy
Expand Down
2 changes: 1 addition & 1 deletion scripts/dev/env_writer_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ init_env() {

# Update APP_ENV
sed -i -e "s/APP_ENV=.*/APP_ENV='development'/g" "$SCRIPT_DIR/.env"

echo "ENV_PATH=$SCRIPT_DIR/.env" >> "$SCRIPT_DIR/.env"
}

if [[ ! -f "$SCRIPT_DIR/.env" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-compose-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
- "${BACKEND_HOSTPORT}:${BACKEND_PORT}"
volumes:
- ../backend:/backend
- ../.env:/backend/.env.dev
- ${ENV_PATH}:/backend/.env.dev
command: reflex -r '\.go$' -s -- sh -c './supervisor.sh'
tty: true
networks:
Expand Down
Loading