Skip to content

Commit

Permalink
Merge branch 'release/v0.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Luphia1984 committed Aug 9, 2024
2 parents f812d80 + 047d63b commit 82fbde9
Show file tree
Hide file tree
Showing 591 changed files with 43,036 additions and 33,553 deletions.
37 changes: 24 additions & 13 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
# google gmail api settings
GOOGLE_CLIENT_ID =
GOOGLE_CLIENT_PASSWORD =
GOOGLE_SERVICE =
# Mail api settings we use Gmail as an example
MAIL_CLIENT_ID =
MAIL_CLIENT_PASSWORD =
MAIL_SERVICE =

# recipient email address
# Google API
GOOGLE_PROJECT_ID =
GOOGLE_BUCKET_NAME =
GOOGLE_UPLOAD_FOLDER =
GOOGLE_CREDENTIALS_BASE64 =

# Google Analytics
NEXT_PUBLIC_GA_ID =

# Recipient Email Address
REACT_APP_RECEPIENT_EMAIL = contact@mermer.com.tw

# baifa info
# iSunFA Info
I_SUN_FA_ADDRESS_IN_ENGLISH = 13F.-6, No. 2, Ln. 150, Sec. 5, Xinyi Rd., Xinyi Dist., Taipei City 110416 , Taiwan
I_SUN_FA_ADDRESS_IN_CHINESE = 110台北市信義區信義路五段150巷2號13樓之6
I_SUN_FA_ADDRESS_ON_GOOGLE_MAP = https://www.google.com/maps/place/110%E5%8F%B0%E5%8C%97%E5%B8%82%E4%BF%A1%E7%BE%A9%E5%8D%80%E4%BF%A1%E7%BE%A9%E8%B7%AF%E4%BA%94%E6%AE%B5150%E5%B7%B72%E8%99%9F/@25.02829,121.5703209,18z/data=!3m1!4b1!4m6!3m5!1s0x3442abb2776b1f95:0x3b37fe4fc30eef7e!8m2!3d25.0282887!4d121.5709968!16s%2Fg%2F11c28dy7t3
I_SUN_FA_PHONE_NUMBER = +886-2-2700-1979

# social media links
# Social Media Links
REACT_APP_GITHUB_LINK = https://github.com/CAFECA-IO

# AICH
AICH_URI = http://127.0.0.1:3001
AICH_URI =

# Database
DATABASE_URL = postgresql://account@localhost:5432/database

# google api
GOOGLE_PROJECT_ID=
GOOGLE_BUCKET_NAME=
GOOGLE_UPLOAD_FOLDER=
GOOGLE_CREDENTIALS_BASE64=
# File storage path
BASE_STORAGE_PATH =

# Payment service settings we use OEN as an example
PAYMENT_TOKEN =
PAYMENT_ID =
PAYMENT_SERVICE =
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ module.exports = {
leadingUnderscore: 'allow',
},
],
'implicit-arrow-linebreak': 'off',
},
},
],
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/02-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ body:
attributes:
label: "Tasks"
description: "List the specific tasks to be completed."
render: markdown
placeholder: |
- [ ] Task 1...
- [ ] Task 2...
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/03-document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ body:
- [ ] Task 1...
- [ ] Task 2...
- [ ] Task 3...
render: markdown
validations:
required: true
- type: dropdown
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ next-env.d.ts

# backup
*.backup
pnpm-lock.yaml
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# iSunFA
歡迎來到 iSunFA 區塊鏈會計與人工智能審計技術的官方網站專案。iSunFA 陽光智能會計是一個融合區塊鏈技術和人工智能審計的先進會計解決方案,旨在提供更加透明、安全和高效的財務管理體驗。此份文件將說明如何完成 iSunFA 官方網站的環境準備與部署。
> 最後更新於 2024-05-03
> 最後更新於 2024-08-09
## 開發流程
- node 版本參考 `.nvmrc`
Expand Down Expand Up @@ -113,4 +113,4 @@ pm2 log iSunFA
```

## 聯繫我們
如果您對 iSunFA 感興趣或有任何疑問,請隨時聯繫我們的客戶支持團隊。我們期待著與您一起開啟更加先進、高效的財務管理體驗,讓您的企業在數字時代更上一層樓
如果您對 iSunFA 感興趣或有任何疑問,請隨時聯繫我們的客戶支持團隊。我們期待著與您一起開啟更加先進、高效的財務管理體驗,讓您的企業在 WEB3 時代更上一層樓
5 changes: 5 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ const nextConfig = {
I_SUN_FA_ADDRESS_ON_GOOGLE_MAP: process.env.I_SUN_FA_ADDRESS_ON_GOOGLE_MAP,
I_SUN_FA_PHONE_NUMBER: process.env.I_SUN_FA_PHONE_NUMBER,
GITHUB_LINK: process.env.REACT_APP_GITHUB_LINK,
NEXT_PUBLIC_GA_ID: process.env.NEXT_PUBLIC_GA_ID,
},
images: {
loader: 'custom',
loaderFile: '/src/lib/utils/image-loader.js',
},
webpack: (config) => {
const newConfig = cloneDeep(config);
Expand Down
21 changes: 14 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iSunFA",
"version": "0.1.8",
"version": "0.8.0",
"private": false,
"scripts": {
"dev": "next dev",
Expand All @@ -13,30 +13,36 @@
"format": "prettier --ignore-path .gitignore --write \"**/*.+(js|jsx|ts|tsx|json)\"",
"validate": "npm run test && npm run check-format && npm run lint",
"production": "next start -p 80",
"update-version": "ts-node -r tsconfig-paths/register --compiler-options '{\"module\":\"CommonJS\"}' scripts/update_version.ts && git add ."
"update-version": "ts-node -r tsconfig-paths/register --compiler-options '{\"module\":\"CommonJS\"}' scripts/update_version.ts && git add package.json"
},
"dependencies": {
"@google-cloud/storage": "^7.11.1",
"@next/third-parties": "^14.2.5",
"@passwordless-id/webauthn": "^1.5.0",
"@prisma/client": "^5.14.0",
"@types/formidable": "^3.4.5",
"@types/react-chartjs-2": "^2.5.7",
"apexcharts": "^3.48.0",
"bootstrap": "^5.3.3",
"bootstrap-icons": "^1.11.3",
"chart.js": "^4.4.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"cookie": "^0.6.0",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"eslint-config-airbnb": "^19.0.4",
"formidable": "^3.5.1",
"i18next": "^23.11.5",
"jest-mock-extended": "^3.0.7",
"lodash-es": "^4.17.21",
"next": "^14.2.3",
"next": "^14.2.5",
"next-i18next": "^15.2.0",
"next-session": "^4.0.5",
"nodemailer": "^6.9.8",
"prettier": "^3.1.1",
"react": "^18",
"react-apexcharts": "^1.4.1",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18",
"react-i18next": "^14.1.2",
"react-icons": "^5.0.1",
Expand Down Expand Up @@ -73,11 +79,12 @@
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.0",
"postcss": "^8.4.32",
"prettier-plugin-tailwindcss": "^0.5.9",
"prettier": "^3.3.2",
"prettier-plugin-tailwindcss": "^0.6.5",
"prisma": "^5.14.0",
"tailwindcss": "^3.4.0",
"ts-jest": "^29.1.4",
"typescript": "^5"
"typescript": "^5.3.3"
},
"husky": {
"hooks": {
Expand All @@ -90,4 +97,4 @@
"prisma": {
"seed": "ts-node -r tsconfig-paths/register --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
}
}
}
Loading

0 comments on commit 82fbde9

Please sign in to comment.