Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f375d54
fix reactAxe ts error
LoTerence Feb 24, 2025
2ca56d9
Added Tailwind Button Components (#641)
bzzz-coding Feb 25, 2025
6cc026d
rm children prop
LoTerence Feb 25, 2025
6a3a1c1
proxy dev api calls to django server
LoTerence Feb 25, 2025
ae7a233
add django:8000 host
LoTerence Feb 25, 2025
a34e2ad
Merge pull request #643 from hackforla/feat/proxy-api
LoTerence Feb 25, 2025
9a52cd5
fix eslint error
LoTerence Mar 3, 2025
79382f9
created tw CircleCard component
LoTerence Mar 3, 2025
85ecf7d
convert CircleCard to tw
LoTerence Mar 3, 2025
dfb2405
delete old CircleCard
LoTerence Mar 3, 2025
387eabb
convert Card to tw
LoTerence Mar 4, 2025
04ea072
rm Card scss
LoTerence Mar 4, 2025
e8bcb97
change className order
LoTerence Mar 4, 2025
316b7d3
move creditsPage card to credits folder
LoTerence Mar 4, 2025
1258a7a
update tw dependencies
LoTerence Mar 4, 2025
16741fc
migrate Card component to TW
LoTerence Mar 4, 2025
219e246
fix Card shadow
LoTerence Mar 4, 2025
6ed8519
migrate sass to tw
LoTerence Mar 4, 2025
a865641
Merge pull request #647 from hackforla/feat/tw-card
LoTerence Mar 4, 2025
6d0ea33
Merge branch 'main' into develop
LoTerence Mar 4, 2025
60efb74
push stage Dockerfile image to ECR
LoTerence Mar 5, 2025
70d2325
Merge pull request #648 from hackforla/feat/deploy-stage
LoTerence Mar 5, 2025
51746d8
Refactor Typography Components (#644)
bzzz-coding Mar 10, 2025
87a7483
Merge branch 'main' into develop
LoTerence Mar 12, 2025
d7a0a34
Feature: Design system, FooterNav (#653)
LoTerence Mar 12, 2025
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
5 changes: 2 additions & 3 deletions .github/workflows/deploy-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:
ECR_REPOSITORY: civic-tech-jobs-fullstack
IMAGE_TAG: dev
run: |
docker pull nmatsui/hello-world-api
docker tag nmatsui/hello-world-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
docker build -f ./stage/Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG

2 changes: 1 addition & 1 deletion dev/dev.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ POSTGRES_PASSWORD=<same as SQL_PASSWORD>
ENVIRON=dev
DEBUG=True
SECRET_KEY=<random string of length 50>
DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1] django
SQL_ENGINE=django.db.backends.postgresql
SQL_DATABASE=<same as POSTGRES_DB>
SQL_USER=postgres
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ services:
container_name: vite
env_file:
- dev/dev.env
environment:
- VITE_APP_SERVER_URL=django://django:8000
- VITE_APP_CLIENT_URL=vite://vite:5175
ports:
- "5175:5175"
develop:
Expand Down
7 changes: 6 additions & 1 deletion frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ export default [
"no-console": "warn",
indent: ["error", 2],
"no-irregular-whitespace": "error",
"prettier/prettier": "error",
"prettier/prettier": [
"error",
{
endOfLine: "auto",
},
],
"react/no-unescaped-entities": "off",
"@typescript-eslint/no-unused-vars": ["error"],
"tailwindcss/no-contradicting-classname": "error",
Expand Down
Loading