Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
58257b8
新增 router 和 pages 目錄,修改 App.tsx 和 main.tsx
Zhong220 Dec 15, 2024
57dfb5f
create DB directory and upload schema.sql
lgyeee Dec 17, 2024
a93a55e
Merge pull request #1 from lgyeee/main
Zhong220 Dec 22, 2024
d4fc3c5
images and login
syushen92 Dec 27, 2024
103fb81
新增 Accounting Page 分帳功能
shiningtang Dec 29, 2024
2c16a19
Update ScorePage to display leaderboard and update App.tsx for routing
lgyeee Dec 29, 2024
7ab242b
新增ScorePage button 到HomPage頁面
lgyeee Dec 29, 2024
43d62f8
白白:新增好友功能(輸入username & nickname)、刪除好友(&確認刪除)、新增後顯示好友清單
Ireneliuuu Dec 29, 2024
c46c617
database
SiomnX Jan 1, 2025
e962a42
database2
SiomnX Jan 1, 2025
6e9c450
Merge pull request #2 from shiningtang/feature/new-feature
Zhong220 Jan 3, 2025
b42c188
modify Homepage
Zhong220 Jan 3, 2025
cce7430
Resolved conflicts in App.tsx
Zhong220 Jan 3, 2025
533ee34
Merge PR#4
Zhong220 Jan 3, 2025
0180ff5
Merge branch 'pr-5'
Zhong220 Jan 3, 2025
19f6289
add test-function about Login & SignUP
Zhong220 Jan 3, 2025
0167fb0
[HomePage]Optimize front-end interface
Zhong220 Jan 6, 2025
34766ce
[HomePage]Optimize front-end interface
Zhong220 Jan 6, 2025
25f25df
update compose.yaml
SiomnX Jan 11, 2025
26674b7
update app.py
SiomnX Jan 11, 2025
1655bd3
Merge pull request #6 from Zhong220/dev
Zhong220 Jan 11, 2025
0791e38
Merge pull request #7 from SiomnX/dev
Zhong220 Jan 11, 2025
37c93ee
test
Zhong220 Jan 11, 2025
62c1e94
updatefiles
SiomnX Jan 11, 2025
81b10d4
Rong - Modify transaction_routes and app.py
Zhong220 Jan 11, 2025
e378efd
Merge PR#9 by Monkey
Zhong220 Jan 11, 2025
831f0e6
密碼加密、使用者驗證、創建帳號至資料庫
syushen92 Jan 11, 2025
1f43609
build Leaderboard API and connect it with redis and db
lgyeee Jan 11, 2025
933de7e
Merge branch 'main' into main
lgyeee Jan 11, 2025
e64a0fb
test
Zhong220 Jan 11, 2025
0cdfd45
merge branch-newFriendList
Zhong220 Jan 11, 2025
4abb32e
merge branch-newFriendList
Zhong220 Jan 11, 2025
e191b0e
Update app.py
lgyeee Jan 12, 2025
b7c13f2
Merge branch with resolved conflicts
Zhong220 Jan 12, 2025
8a4f861
Merge PR#11
Zhong220 Jan 12, 2025
a402253
The latest version after pull merge
Zhong220 Jan 12, 2025
dc66627
ScorePage前端串好後端API 新增後端查詢使用者信用積分API
lgyeee Jan 12, 2025
572883e
signup
SiomnX Jan 12, 2025
b2ee040
Merge pull request #13 from SiomnX/dev
Zhong220 Jan 13, 2025
c4d3bed
暫存Rong的修改
Zhong220 Jan 13, 2025
796506e
Merge remote-tracking branch 'origin/dev' into dev
Zhong220 Jan 13, 2025
ebab3dd
暫存Rong的修改
Zhong220 Jan 13, 2025
ab510d7
Modify Homepage 5:21AM 1/14/2025
Zhong220 Jan 13, 2025
6e880ca
Modify Homepage 6:53AM 1/14/2025
Zhong220 Jan 13, 2025
72dc56d
Modify Homepage 7:31AM 1/14/2025
Zhong220 Jan 13, 2025
154abdf
Modify Homepage 8:03AM 1/14/2025
Zhong220 Jan 14, 2025
6b2716a
Rong HomePage&split Final
Zhong220 Jan 17, 2025
2e735ca
read.me
Zhong220 Jan 17, 2025
0c4db09
pdf
Zhong220 Jan 17, 2025
9ade841
Update readme.md
SiomnX Jan 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# .env example

# 資料庫配置
DATABASE_URL=postgresql://:@user:password5432/mydatabase

# Flask 設定
FLASK_APP=app.py
FLASK_ENV=development
SECRET_KEY=

# API 密鑰
API_KEY=

# React 專案配置 (如果有使用 React)
REACT_APP_API_URL=http://localhost:5000

POSTGRES_USER=postgres
POSTGRES_PASSWORD=
POSTGRES_DB=
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@

node_modules

/dist
/dist

__pycache__/
*.pyc
Binary file added 1131資料庫期末專案ppt.pdf
Binary file not shown.
Binary file added client - Shortcut.lnk
Binary file not shown.
38 changes: 24 additions & 14 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,49 +1,56 @@
services:
client:
container_name: client
container_name: client_new
build:
context: ./src/client
dockerfile: dockerfile
ports:
- 3000:3000
- "3001:3000"
env_file:
- ./src/client/.env
- .env
depends_on:
- server
networks:
- DBMSFP_network

server:
container_name: server
build:
context: ./src/server
dockerfile: dockerfile
ports:
- 5000:5000
- "5005:5005"
env_file:
- ./src/server/.env
- .env
environment:
- FLASK_APP=app.py
- FLASK_ENV=development
- DATABASE_URL=postgresql://postgres:postgres@db:5432/mydatabase
- REDIS_HOST=redis_new
depends_on:
- db
- redis
working_dir: /app # 確保這個設置是正確的,應該指向專案的根目錄
networks:
- DBMSFP_network

redis:
container_name: redis
container_name: redis_new
image: redis:alpine
ports:
- 7000:6379
- "7000:6379"
volumes:
- redis_data:/data
restart: always
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
test: ["CMD", "redis-cli", "ping"]
interval: 1m30s
timeout: 30s
retries: 5
start_period: 30s
networks:
- DBMSFP_network

# PostgreSQL Database
db:
container_name: db
image: postgres:14-alpine
Expand All @@ -56,31 +63,34 @@ services:
POSTGRES_DB: mydatabase
volumes:
- pg_data:/var/lib/postgresql/data
- ./src/server/database/schema.sql:/docker-entrypoint-initdb.d/schema.sql # 將 schema.sql 掛載到容器
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 1m30s
timeout: 30s
retries: 5
start_period: 30s
networks:
- DBMSFP_network

# pgAdmin Service
pgadmin:
container_name: pgadmin
container_name: pgadmin_new
image: dpage/pgadmin4:8
restart: always
ports:
- "8080:80"
- "8081:80"
environment:
PGADMIN_DEFAULT_EMAIL: admin@admin.com
PGADMIN_DEFAULT_PASSWORD: admin
depends_on:
- db
networks:
- DBMSFP_network

volumes:
pg_data:
redis_data:


networks:
DBMSFP_network:
driver: bridge
4 changes: 3 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Readme
ER-model、relational schema皆在PPT裡

## RUN
```bash
Expand All @@ -7,4 +8,5 @@ docker compose up -d --build

# stop and remove all container which relate to compose.yaml
docker compose down -v --rmi all
```

```
Binary file added server - Shortcut.lnk
Binary file not shown.
15 changes: 15 additions & 0 deletions src/client/.expo/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
> Why do I have a folder named ".expo" in my project?

The ".expo" folder is created when an Expo project is started using "expo start" command.

> What do the files contain?

- "devices.json": contains information about devices that have recently opened this project. This is used to populate the "Development sessions" list in your development builds.
- "packager-info.json": contains port numbers and process PIDs that are used to serve the application to the mobile device/simulator.
- "settings.json": contains the server configuration that is used to serve the application manifest.

> Should I commit the ".expo" folder?

No, you should not share the ".expo" folder. It does not contain any information that is relevant for other developers working on the project, it is specific to your machine.

Upon project creation, the ".expo" folder is already added to your ".gitignore" file.
8 changes: 8 additions & 0 deletions src/client/.expo/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"hostType": "lan",
"lanType": "ip",
"dev": true,
"minify": false,
"urlRandomness": null,
"https": false
}
Loading