Compare commits
16 Commits
140ece8080
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 2b7ed3e451 | |||
| a631cd6b3e | |||
| cef0f73dbb | |||
|
|
9e15afc1c2 | ||
|
|
36dc42239a | ||
|
|
decc72c554 | ||
|
|
e086a919c3 | ||
|
|
da43860c61 | ||
|
|
5441e280e0 | ||
|
|
8fd8a79d75 | ||
|
|
04174fff3b | ||
|
|
27433d1bd5 | ||
|
|
bc3a76b82b | ||
|
|
41c18590d8 | ||
|
|
1be0866c69 | ||
|
|
730eb6c3b7 |
@@ -1,63 +0,0 @@
|
|||||||
# Build artifacts
|
|
||||||
**/bin/
|
|
||||||
**/obj/
|
|
||||||
**/out/
|
|
||||||
**/publish/
|
|
||||||
|
|
||||||
# IDE and editor files
|
|
||||||
**/.vs/
|
|
||||||
**/.vscode/
|
|
||||||
**/.idea/
|
|
||||||
**/.DS_Store
|
|
||||||
**/*.user
|
|
||||||
**/*.suo
|
|
||||||
**/*.userosscache
|
|
||||||
**/*.sln.docstates
|
|
||||||
**/*.userprefs
|
|
||||||
**/.fleet/
|
|
||||||
|
|
||||||
# Database files
|
|
||||||
**/*.dbmdl
|
|
||||||
**/*.jfm
|
|
||||||
**/*.mdf
|
|
||||||
**/*.ldf
|
|
||||||
|
|
||||||
# Temp and swap files
|
|
||||||
**/*.swp
|
|
||||||
**/*.swo
|
|
||||||
**/*~
|
|
||||||
**/*.tmp
|
|
||||||
**/*.temp
|
|
||||||
|
|
||||||
# Logs
|
|
||||||
**/*.log
|
|
||||||
|
|
||||||
# Node modules (if any frontend dependencies)
|
|
||||||
**/node_modules/
|
|
||||||
|
|
||||||
# Git files
|
|
||||||
.git/
|
|
||||||
.gitignore
|
|
||||||
.gitattributes
|
|
||||||
.git-crypt/
|
|
||||||
|
|
||||||
# Documentation
|
|
||||||
README.md
|
|
||||||
**/*.md
|
|
||||||
LICENSE
|
|
||||||
|
|
||||||
# Docker files
|
|
||||||
docker-compose.yml
|
|
||||||
docker-compose.*.yml
|
|
||||||
**/Dockerfile
|
|
||||||
**/.dockerignore
|
|
||||||
|
|
||||||
# Development databases
|
|
||||||
docker/
|
|
||||||
|
|
||||||
# Test results
|
|
||||||
**/TestResults/
|
|
||||||
**/*.trx
|
|
||||||
|
|
||||||
# macOS
|
|
||||||
.DS_Store
|
|
||||||
4
.git-crypt/.gitattributes
vendored
4
.git-crypt/.gitattributes
vendored
@@ -1,4 +0,0 @@
|
|||||||
# Do not edit this file. To specify the files to encrypt, create your own
|
|
||||||
# .gitattributes file in the directory where your files are.
|
|
||||||
* !filter !diff
|
|
||||||
*.gpg binary
|
|
||||||
Binary file not shown.
3
.gitattributes
vendored
3
.gitattributes
vendored
@@ -1,3 +0,0 @@
|
|||||||
BimAI.API/appsettings.Development.json filter=git-crypt diff=git-crypt
|
|
||||||
BimAI.UI.Web/appsettings.Development.json filter=git-crypt diff=git-crypt
|
|
||||||
BimAI.UI.Mobile/appsettings.Development.json filter=git-crypt diff=git-crypt
|
|
||||||
72
.gitea/scripts/replaceTokens.js
Normal file
72
.gitea/scripts/replaceTokens.js
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
// .gitea/scripts/replaceTokens.js
|
||||||
|
// Skanuje:
|
||||||
|
// - artifacts/api/appsettings.Production.json (jeśli jest)
|
||||||
|
// - artifacts/ui/appsettings.Production.json (jeśli jest)
|
||||||
|
// Tokeny: #{NAME}# -> wartość z VARIABLES/SECRETS (NAME: uppercased, '-'->'_')
|
||||||
|
// Dodatkowo: #{BUILDID}# -> RUN_ID (z ENV)
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
function replaceInFile(file, mapToken) {
|
||||||
|
let data = fs.readFileSync(file, 'utf8');
|
||||||
|
const re = /#\{(.*?)\}#/g;
|
||||||
|
let changed = false;
|
||||||
|
data = data.replace(re, (_, raw) => {
|
||||||
|
const token = (raw || '').replace(/-/g, '_').toUpperCase();
|
||||||
|
const val = mapToken(token);
|
||||||
|
if (val == null || val === '') return `#{${raw}}#`; // zostaw bez zmian, podbijemy błąd później
|
||||||
|
changed = true;
|
||||||
|
return String(val);
|
||||||
|
});
|
||||||
|
fs.writeFileSync(file, data, 'utf8');
|
||||||
|
return changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
(async () => {
|
||||||
|
const secrets = JSON.parse(process.env.SECRETS || '{}');
|
||||||
|
const variables = JSON.parse(process.env.VARIABLES || '{}');
|
||||||
|
const RUN_ID = process.env.RUN_ID || process.env.GITHUB_RUN_ID || '';
|
||||||
|
|
||||||
|
const mapToken = (token) => {
|
||||||
|
if (token === 'BUILDID') return RUN_ID;
|
||||||
|
return (variables[token] != null ? variables[token] : secrets[token]);
|
||||||
|
};
|
||||||
|
|
||||||
|
const beRoot = path.resolve('artifacts');
|
||||||
|
const beFiles = [];
|
||||||
|
['api/appsettings.Production.json', 'ui/appsettings.Production.json'].forEach((name) => {
|
||||||
|
const p = path.join(beRoot, name);
|
||||||
|
if (fs.existsSync(p)) beFiles.push(p);
|
||||||
|
});
|
||||||
|
|
||||||
|
const files = beFiles;
|
||||||
|
|
||||||
|
if (files.length === 0) {
|
||||||
|
console.error('❌ No candidate files found to tokenize (artifacts/api or artifacts/ui appsettings.Production.json).');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`🔎 Tokenizing ${files.length} file(s)`);
|
||||||
|
const missing = new Set();
|
||||||
|
|
||||||
|
for (const file of files) {
|
||||||
|
replaceInFile(file, mapToken);
|
||||||
|
}
|
||||||
|
for (const file of files) {
|
||||||
|
const content = fs.readFileSync(file, 'utf8');
|
||||||
|
const reLeft = /#\{(.*?)\}#/g;
|
||||||
|
let m;
|
||||||
|
while ((m = reLeft.exec(content))) {
|
||||||
|
const token = (m[1] || '').replace(/-/g, '_').toUpperCase();
|
||||||
|
missing.add(token);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (missing.size > 0) {
|
||||||
|
console.error(`❌ Missing values for tokens: ${Array.from(missing).join(', ')}`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('✅ Tokenization complete.');
|
||||||
|
})();
|
||||||
@@ -24,30 +24,42 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
|
||||||
- name: Build and push API image (build artifacts)
|
- name: Build and push API image
|
||||||
run: |
|
run: |
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
|
--label "org.opencontainers.image.source=https://code.bim-it.pl/mz/BimAI" \
|
||||||
-f BimAI.API/Dockerfile \
|
-f BimAI.API/Dockerfile \
|
||||||
-t code.bim-it.pl/bimai/bimai-api:build-${{ github.run_id }} \
|
-t code.bim-it.pl/mz/bimai-api:latest \
|
||||||
|
-t code.bim-it.pl/mz/bimai-api:build-${{ github.run_id }} \
|
||||||
--push \
|
--push \
|
||||||
.
|
.
|
||||||
|
|
||||||
- name: Build and push UI image (build artifacts)
|
- name: Build and push UI image
|
||||||
run: |
|
run: |
|
||||||
docker buildx build \
|
docker buildx build \
|
||||||
--platform linux/amd64 \
|
--platform linux/amd64 \
|
||||||
|
--label "org.opencontainers.image.source=https://code.bim-it.pl/mz/BimAI" \
|
||||||
-f BimAI.UI.Web/Dockerfile \
|
-f BimAI.UI.Web/Dockerfile \
|
||||||
-t code.bim-it.pl/bimai/bimai-ui:build-${{ github.run_id }} \
|
-t code.bim-it.pl/mz/bimai-ui:latest \
|
||||||
|
-t code.bim-it.pl/mz/bimai-ui:build-${{ github.run_id }} \
|
||||||
--push \
|
--push \
|
||||||
.
|
.
|
||||||
|
|
||||||
- name: Output build info
|
- name: Output build info
|
||||||
run: |
|
run: |
|
||||||
echo "## 🏗️ Docker Images Built" >> $GITHUB_STEP_SUMMARY
|
echo "## ️ Docker Images Built" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
echo "**Build ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "Images pushed with tag: \`build-${{ github.run_id }}\`" >> $GITHUB_STEP_SUMMARY
|
echo "### Images pushed:" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo '```bash' >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "# Latest (for release)" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-api:latest" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-ui:latest" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "" >> $GITHUB_STEP_SUMMARY
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "Use **Release** workflow to tokenize and tag as \`:prod\`" >> $GITHUB_STEP_SUMMARY
|
echo "# Specific build (for rollback)" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-api:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-ui:build-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo '```' >> $GITHUB_STEP_SUMMARY
|
||||||
116
.gitea/workflows/release.yml
Normal file
116
.gitea/workflows/release.yml
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
name: Release Docker Images
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch: {}
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: https://github.com/actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: https://github.com/actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: 20
|
||||||
|
|
||||||
|
- name: Log in to Gitea Container Registry
|
||||||
|
run: |
|
||||||
|
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login code.bim-it.pl -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
|
||||||
|
- name: Pull latest build artifacts (images)
|
||||||
|
run: |
|
||||||
|
echo "Pulling latest build images..."
|
||||||
|
docker pull code.bim-it.pl/mz/bimai-api:latest
|
||||||
|
docker pull code.bim-it.pl/mz/bimai-ui:latest
|
||||||
|
|
||||||
|
- name: Extract appsettings from images
|
||||||
|
run: |
|
||||||
|
mkdir -p artifacts/api artifacts/ui
|
||||||
|
|
||||||
|
# Extract from API image
|
||||||
|
docker create --name temp-api code.bim-it.pl/mz/bimai-api:latest
|
||||||
|
docker cp temp-api:/app/appsettings.Production.json artifacts/api/
|
||||||
|
docker rm temp-api
|
||||||
|
|
||||||
|
# Extract from UI image
|
||||||
|
docker create --name temp-ui code.bim-it.pl/mz/bimai-ui:latest
|
||||||
|
docker cp temp-ui:/app/appsettings.Production.json artifacts/ui/
|
||||||
|
docker rm temp-ui
|
||||||
|
|
||||||
|
- name: Show extracted configs (before tokenization)
|
||||||
|
run: |
|
||||||
|
echo "::group::API appsettings.Production.json (with placeholders)"
|
||||||
|
cat artifacts/api/appsettings.Production.json
|
||||||
|
echo "::endgroup::"
|
||||||
|
echo "::group::UI appsettings.Production.json (with placeholders)"
|
||||||
|
cat artifacts/ui/appsettings.Production.json
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
- name: Tokenize appsettings
|
||||||
|
env:
|
||||||
|
SECRETS: ${{ toJson(secrets) }}
|
||||||
|
VARIABLES: ${{ toJson(vars) }}
|
||||||
|
RUN_ID: ${{ github.run_id }}
|
||||||
|
run: |
|
||||||
|
node .gitea/scripts/replaceTokens.js
|
||||||
|
|
||||||
|
- name: Show tokenized configs (after tokenization)
|
||||||
|
run: |
|
||||||
|
echo "::group::API appsettings.Production.json (tokenized, passwords hidden)"
|
||||||
|
cat artifacts/api/appsettings.Production.json | sed 's/Password=[^;]*/Password=***/g' | sed 's/"SecretKey":"[^"]*"/"SecretKey":"***"/g'
|
||||||
|
echo "::endgroup::"
|
||||||
|
echo "::group::UI appsettings.Production.json (tokenized)"
|
||||||
|
cat artifacts/ui/appsettings.Production.json
|
||||||
|
echo "::endgroup::"
|
||||||
|
|
||||||
|
- name: Rebuild images with tokenized configs
|
||||||
|
run: |
|
||||||
|
# API
|
||||||
|
cat > Dockerfile.release.api <<'EOF'
|
||||||
|
FROM code.bim-it.pl/mz/bimai-api:latest
|
||||||
|
LABEL org.opencontainers.image.source=https://code.bim-it.pl/mz/BimAI
|
||||||
|
COPY artifacts/api/appsettings.Production.json /app/
|
||||||
|
EOF
|
||||||
|
docker build -f Dockerfile.release.api \
|
||||||
|
-t code.bim-it.pl/mz/bimai-api:prod \
|
||||||
|
-t code.bim-it.pl/mz/bimai-api:release-${{ github.run_id }} \
|
||||||
|
.
|
||||||
|
|
||||||
|
# UI
|
||||||
|
cat > Dockerfile.release.ui <<'EOF'
|
||||||
|
FROM code.bim-it.pl/mz/bimai-ui:latest
|
||||||
|
LABEL org.opencontainers.image.source=https://code.bim-it.pl/mz/BimAI
|
||||||
|
COPY artifacts/ui/appsettings.Production.json /app/
|
||||||
|
EOF
|
||||||
|
docker build -f Dockerfile.release.ui \
|
||||||
|
-t code.bim-it.pl/mz/bimai-ui:prod \
|
||||||
|
-t code.bim-it.pl/mz/bimai-ui:release-${{ github.run_id }} \
|
||||||
|
.
|
||||||
|
|
||||||
|
- name: Push final images
|
||||||
|
run: |
|
||||||
|
docker push code.bim-it.pl/mz/bimai-api:prod
|
||||||
|
docker push code.bim-it.pl/mz/bimai-api:release-${{ github.run_id }}
|
||||||
|
docker push code.bim-it.pl/mz/bimai-ui:prod
|
||||||
|
docker push code.bim-it.pl/mz/bimai-ui:release-${{ github.run_id }}
|
||||||
|
|
||||||
|
- name: Output release info
|
||||||
|
run: |
|
||||||
|
echo "## Docker Images Released" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "**Release ID:** ${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "**Commit:** ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "### 🚀 Production images ready to deploy:" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo '```bash' >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "# Production (latest release)" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-api:prod" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-ui:prod" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "# Specific release (for rollback)" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-api:release-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "docker pull code.bim-it.pl/mz/bimai-ui:release-${{ github.run_id }}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo '```' >> $GITHUB_STEP_SUMMARY
|
||||||
9
.gitignore
vendored
9
.gitignore
vendored
@@ -24,10 +24,6 @@ Generated/
|
|||||||
*.db-shm
|
*.db-shm
|
||||||
*.db-wal
|
*.db-wal
|
||||||
|
|
||||||
# Visual Studio Code
|
|
||||||
.vscode/
|
|
||||||
.vscode/*
|
|
||||||
|
|
||||||
# MAUI / Mobile (Xcode/iOS)
|
# MAUI / Mobile (Xcode/iOS)
|
||||||
**/bin/
|
**/bin/
|
||||||
**/obj/
|
**/obj/
|
||||||
@@ -86,3 +82,8 @@ nunit-*.xml
|
|||||||
.idea/indexLayout.xml
|
.idea/indexLayout.xml
|
||||||
.idea/tasks.xml
|
.idea/tasks.xml
|
||||||
.idea/.idea_modules
|
.idea/.idea_modules
|
||||||
|
|
||||||
|
# VSCode - ignore personal settings but keep shared configs
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/launch.json
|
||||||
|
!.vscode/tasks.json
|
||||||
47
.vscode/launch.json
vendored
Normal file
47
.vscode/launch.json
vendored
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
{
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "API",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"preLaunchTask": "build-api",
|
||||||
|
"program": "${workspaceFolder}/BimAI.API/bin/Debug/net10.0/BimAI.API.dll",
|
||||||
|
"args": [],
|
||||||
|
"cwd": "${workspaceFolder}/BimAI.API",
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"env": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Web",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"preLaunchTask": "build-web",
|
||||||
|
"program": "${workspaceFolder}/BimAI.UI.Web/bin/Debug/net10.0/BimAI.UI.Web.dll",
|
||||||
|
"args": [],
|
||||||
|
"cwd": "${workspaceFolder}/BimAI.UI.Web",
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"serverReadyAction": {
|
||||||
|
"action": "openExternally",
|
||||||
|
"pattern": "\\bNow listening on:\\s+(https?://\\S+)",
|
||||||
|
"uriFormat": "%s"
|
||||||
|
},
|
||||||
|
"env": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
},
|
||||||
|
"launchBrowser": {
|
||||||
|
"enabled": true,
|
||||||
|
"args": "${auto-detect-url}",
|
||||||
|
"browser": [
|
||||||
|
{
|
||||||
|
"osx": "Google Chrome",
|
||||||
|
"linux": "chrome",
|
||||||
|
"windows": "chrome"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
77
.vscode/tasks.json
vendored
Normal file
77
.vscode/tasks.json
vendored
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"label": "build-api",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"build",
|
||||||
|
"${workspaceFolder}/BimAI.API/BimAI.API.csproj",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "build-web",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"build",
|
||||||
|
"${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "publish-api",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"publish",
|
||||||
|
"${workspaceFolder}/BimAI.API/BimAI.API.csproj",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "publish-web",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"publish",
|
||||||
|
"${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj",
|
||||||
|
"/property:GenerateFullPaths=true",
|
||||||
|
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "watch-api",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"watch",
|
||||||
|
"run",
|
||||||
|
"--project",
|
||||||
|
"${workspaceFolder}/BimAI.API/BimAI.API.csproj"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "watch-web",
|
||||||
|
"command": "dotnet",
|
||||||
|
"type": "process",
|
||||||
|
"args": [
|
||||||
|
"watch",
|
||||||
|
"run",
|
||||||
|
"--project",
|
||||||
|
"${workspaceFolder}/BimAI.UI.Web/BimAI.UI.Web.csproj"
|
||||||
|
],
|
||||||
|
"problemMatcher": "$msCompile"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -11,14 +11,12 @@
|
|||||||
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.21" />
|
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.21" />
|
||||||
<PackageReference Include="Hangfire.Core" Version="1.8.21" />
|
<PackageReference Include="Hangfire.Core" Version="1.8.21" />
|
||||||
<PackageReference Include="Hangfire.SqlServer" Version="1.8.21" />
|
<PackageReference Include="Hangfire.SqlServer" Version="1.8.21" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.17" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107">
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.17">
|
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
|
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
|
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0-rc.1.25451.107" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Stage 1: Build
|
# Stage 1: Build
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
# Copy solution and all project files for restore
|
# Copy solution and all project files for restore
|
||||||
@@ -20,9 +20,12 @@ WORKDIR /src/BimAI.API
|
|||||||
RUN dotnet publish -c Release -o /app/publish --no-restore
|
RUN dotnet publish -c Release -o /app/publish --no-restore
|
||||||
|
|
||||||
# Stage 2: Runtime
|
# Stage 2: Runtime
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Install wget for health checks
|
||||||
|
RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Set timezone
|
# Set timezone
|
||||||
ENV TZ=Europe/Warsaw
|
ENV TZ=Europe/Warsaw
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|||||||
@@ -18,8 +18,6 @@ builder.Services.AddScoped<ProductSyncService>();
|
|||||||
|
|
||||||
builder.Services.AddHttpClient();
|
builder.Services.AddHttpClient();
|
||||||
builder.Services.AddControllers();
|
builder.Services.AddControllers();
|
||||||
builder.Services.AddEndpointsApiExplorer();
|
|
||||||
builder.Services.AddSwaggerGen();
|
|
||||||
|
|
||||||
// Start Hangfire section
|
// Start Hangfire section
|
||||||
builder.Services.AddHangfire(configuration => configuration
|
builder.Services.AddHangfire(configuration => configuration
|
||||||
@@ -83,12 +81,34 @@ builder.Services.AddCors(options =>
|
|||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
if (app.Environment.IsDevelopment())
|
// Auto-apply migrations on startup
|
||||||
|
using (var scope = app.Services.CreateScope())
|
||||||
{
|
{
|
||||||
app.UseSwagger();
|
var db = scope.ServiceProvider.GetRequiredService<BimAIDbContext>();
|
||||||
app.UseSwaggerUI();
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var pending = await db.Database.GetPendingMigrationsAsync();
|
||||||
|
if (pending.Any())
|
||||||
|
{
|
||||||
|
app.Logger.LogWarning("Applying {Count} pending migrations: {List}",
|
||||||
|
pending.Count(), string.Join(", ", pending));
|
||||||
|
await db.Database.MigrateAsync();
|
||||||
|
app.Logger.LogInformation("Migrations applied successfully.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
app.Logger.LogInformation("No pending migrations.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
app.Logger.LogCritical(ex, "Migration failed - application will not start.");
|
||||||
|
throw; // stop startup
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
app.UseHttpsRedirection();
|
||||||
app.UseCors("AllowAll");
|
app.UseCors("AllowAll");
|
||||||
app.UseHangfireDashboard(builder.Configuration["Hangfire:DashboardPath"] ?? "/hangfire", new DashboardOptions
|
app.UseHangfireDashboard(builder.Configuration["Hangfire:DashboardPath"] ?? "/hangfire", new DashboardOptions
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ public class HangfireAuthorizationFilter: IDashboardAsyncAuthorizationFilter
|
|||||||
var httpContext = context.GetHttpContext();
|
var httpContext = context.GetHttpContext();
|
||||||
|
|
||||||
var env = httpContext.RequestServices.GetService<IWebHostEnvironment>();
|
var env = httpContext.RequestServices.GetService<IWebHostEnvironment>();
|
||||||
if (env.IsDevelopment())
|
if (env != null && env.IsDevelopment())
|
||||||
{
|
{
|
||||||
return Task.FromResult(true);
|
return Task.FromResult(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
var isAuthenticated = httpContext.User.Identity?.IsAuthenticated ?? false;
|
var isAuthenticated = httpContext.User.Identity?.IsAuthenticated ?? false;
|
||||||
return Task.FromResult(isAuthenticated);
|
return Task.FromResult(isAuthenticated);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Binary file not shown.
@@ -1,32 +1,19 @@
|
|||||||
{
|
{
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning",
|
|
||||||
"Microsoft.EntityFrameworkCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*",
|
|
||||||
"ConnectionStrings": {
|
"ConnectionStrings": {
|
||||||
"DefaultConnection": "#{db-connection-string}#",
|
"DefaultConnection": "",
|
||||||
"HangfireConnection": "#{hangfire-connection-string}#"
|
"HangfireConnection": ""
|
||||||
},
|
},
|
||||||
"E5_CRM": {
|
"E5_CRM": {
|
||||||
"ApiKey": "#{e5-crm-api-key}#"
|
"ApiKey": ""
|
||||||
},
|
},
|
||||||
"GoogleAuth": {
|
"GoogleAuth": {
|
||||||
"ClientId": "#{google-auth-client-id}#"
|
"ClientId": ""
|
||||||
},
|
},
|
||||||
"JwtSettings": {
|
"JwtSettings": {
|
||||||
"SecretKey": "#{jwt-secret-key}#",
|
"SecretKey": ""
|
||||||
"Issuer": "#{jwt-issuer}#",
|
|
||||||
"Audience": "#{jwt-audience}#",
|
|
||||||
"ExpiryDays": 7
|
|
||||||
},
|
},
|
||||||
"Hangfire": {
|
"Hangfire": {
|
||||||
"ServerName": "#{hangfire-server-name}#",
|
"ServerName": "BimAI-Production"
|
||||||
"WorkerCount": 5,
|
|
||||||
"DashboardPath": "/hangfire"
|
|
||||||
},
|
},
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
|
|||||||
21
BimAI.API/appsettings.json
Normal file
21
BimAI.API/appsettings.json
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"AllowedHosts": "*",
|
||||||
|
"JwtSettings": {
|
||||||
|
"Issuer": "BimAI.API",
|
||||||
|
"Audience": "BimAI.Clients",
|
||||||
|
"ExpiryDays": 7
|
||||||
|
},
|
||||||
|
"Hangfire": {
|
||||||
|
"WorkerCount": 5,
|
||||||
|
"DashboardPath": "/hangfire"
|
||||||
|
},
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning",
|
||||||
|
"Microsoft.EntityFrameworkCore": "Warning",
|
||||||
|
"Microsoft.EntityFrameworkCore.Database.Command": "Warning",
|
||||||
|
"Microsoft.EntityFrameworkCore.Infrastructure": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -6,16 +6,16 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.17" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.17" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.17">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0-rc.1.25451.107">
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0-ios</TargetFramework>
|
<TargetFramework>net10.0-ios</TargetFramework>
|
||||||
<GenerateXcodeProject>true</GenerateXcodeProject>
|
<GenerateXcodeProject>true</GenerateXcodeProject>
|
||||||
|
|
||||||
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
|
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
|
||||||
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
|
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
|
||||||
|
|
||||||
<!-- Note for MacCatalyst:
|
<!-- Note for MacCatalyst:
|
||||||
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
|
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
|
||||||
@@ -70,14 +70,14 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9"/>
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0"/>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9"/>
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0"/>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9"/>
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0"/>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9"/>
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0"/>
|
||||||
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
|
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
|
||||||
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
|
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)"/>
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)"/>
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1"/>
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0"/>
|
||||||
<PackageReference Include="MudBlazor" Version="8.8.0"/>
|
<PackageReference Include="MudBlazor" Version="8.8.0"/>
|
||||||
<PackageReference Include="ZXing.Net.MAUI" Version="0.4.0"/>
|
<PackageReference Include="ZXing.Net.MAUI" Version="0.4.0"/>
|
||||||
<PackageReference Include="ZXing.Net.MAUI.Controls" Version="0.4.0"/>
|
<PackageReference Include="ZXing.Net.MAUI.Controls" Version="0.4.0"/>
|
||||||
|
|||||||
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
<Project Sdk="Microsoft.NET.Sdk.Razor">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
@@ -12,10 +12,10 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.17" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-rc.1.25451.107" />
|
||||||
<PackageReference Include="MudBlazor" Version="8.8.0" />
|
<PackageReference Include="MudBlazor" Version="8.8.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
|
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.0-rc.1.25451.107" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ async function handleAuthError(error, context = '') {
|
|||||||
const errorMessage = error?.message || error?.type || error?.toString() || 'Unknown error';
|
const errorMessage = error?.message || error?.type || error?.toString() || 'Unknown error';
|
||||||
const fullError = `${context}: ${errorMessage}`;
|
const fullError = `${context}: ${errorMessage}`;
|
||||||
console.error('Google Auth Error:', { context, error, fullError });
|
console.error('Google Auth Error:', { context, error, fullError });
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError', fullError);
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError', fullError);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchUserInfo(accessToken) {
|
async function fetchUserInfo(accessToken) {
|
||||||
@@ -39,7 +39,7 @@ async function fetchUserInfo(accessToken) {
|
|||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const errorText = await response.text();
|
const errorText = await response.text();
|
||||||
console.error('Failed to fetch user info:', errorText);
|
console.error('Failed to fetch user info:', errorText);
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
`Failed to fetch user info: HTTP ${response.status}`);
|
`Failed to fetch user info: HTTP ${response.status}`);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -62,7 +62,7 @@ window.initGoogleSignIn = async function(clientId) {
|
|||||||
try {
|
try {
|
||||||
if (tokenResponse.error) {
|
if (tokenResponse.error) {
|
||||||
console.error('Token response error:', tokenResponse.error);
|
console.error('Token response error:', tokenResponse.error);
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
tokenResponse.error);
|
tokenResponse.error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -70,7 +70,7 @@ window.initGoogleSignIn = async function(clientId) {
|
|||||||
const userInfo = await fetchUserInfo(tokenResponse.access_token);
|
const userInfo = await fetchUserInfo(tokenResponse.access_token);
|
||||||
if (!userInfo) return;
|
if (!userInfo) return;
|
||||||
|
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInSuccess',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInSuccess',
|
||||||
tokenResponse.access_token,
|
tokenResponse.access_token,
|
||||||
userInfo.name || '',
|
userInfo.name || '',
|
||||||
userInfo.email || '',
|
userInfo.email || '',
|
||||||
@@ -78,7 +78,7 @@ window.initGoogleSignIn = async function(clientId) {
|
|||||||
);
|
);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Callback error:', error);
|
console.error('Callback error:', error);
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
error.message || 'Unknown callback error');
|
error.message || 'Unknown callback error');
|
||||||
} finally {
|
} finally {
|
||||||
isSigningIn = false;
|
isSigningIn = false;
|
||||||
@@ -86,7 +86,7 @@ window.initGoogleSignIn = async function(clientId) {
|
|||||||
},
|
},
|
||||||
error_callback: async (error) => {
|
error_callback: async (error) => {
|
||||||
console.error('OAuth flow error:', error);
|
console.error('OAuth flow error:', error);
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
error.type || 'OAuth flow error');
|
error.type || 'OAuth flow error');
|
||||||
isSigningIn = false;
|
isSigningIn = false;
|
||||||
}
|
}
|
||||||
@@ -95,7 +95,7 @@ window.initGoogleSignIn = async function(clientId) {
|
|||||||
return googleClient;
|
return googleClient;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Initiaxcrun xctrace list deviceslization error:', error);
|
console.error('Initiaxcrun xctrace list deviceslization error:', error);
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
error.message || 'Failed to initialize Google Sign-In');
|
error.message || 'Failed to initialize Google Sign-In');
|
||||||
isSigningIn = false;
|
isSigningIn = false;
|
||||||
}
|
}
|
||||||
@@ -109,7 +109,7 @@ window.requestGoogleSignIn = async function() {
|
|||||||
|
|
||||||
if (!googleClient) {
|
if (!googleClient) {
|
||||||
console.error('Google Sign-In not initialized');
|
console.error('Google Sign-In not initialized');
|
||||||
await DotNet.invokeMethodAsync('Bimai.UI.Shared', 'OnGoogleSignInError',
|
await DotNet.invokeMethodAsync('BimAI.UI.Shared', 'OnGoogleSignInError',
|
||||||
'Google Sign-In not initialized. Call initGoogleSignIn first.');
|
'Google Sign-In not initialized. Call initGoogleSignIn first.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Stage 1: Build
|
# Stage 1: Build
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
# Copy solution and all project files for restore
|
# Copy solution and all project files for restore
|
||||||
@@ -20,9 +20,12 @@ WORKDIR /src/BimAI.UI.Web
|
|||||||
RUN dotnet publish -c Release -o /app/publish --no-restore
|
RUN dotnet publish -c Release -o /app/publish --no-restore
|
||||||
|
|
||||||
# Stage 2: Runtime
|
# Stage 2: Runtime
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Install wget for health checks
|
||||||
|
RUN apt-get update && apt-get install -y wget && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Set timezone
|
# Set timezone
|
||||||
ENV TZ=Europe/Warsaw
|
ENV TZ=Europe/Warsaw
|
||||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|||||||
@@ -11,13 +11,14 @@ builder.Services.AddRazorComponents()
|
|||||||
.AddInteractiveServerComponents();
|
.AddInteractiveServerComponents();
|
||||||
builder.Services.AddMudServices();
|
builder.Services.AddMudServices();
|
||||||
|
|
||||||
builder.Services.AddSharedServices("http://localhost:7142");
|
var apiBaseUrl = builder.Configuration["ApiSettings:BaseUrl"]
|
||||||
|
?? throw new InvalidOperationException("ApiSettings:BaseUrl is not configured");
|
||||||
|
builder.Services.AddSharedServices(apiBaseUrl);
|
||||||
|
|
||||||
builder.Services.AddSingleton<IScannerService, NoOpScannerService>();
|
builder.Services.AddSingleton<IScannerService, NoOpScannerService>();
|
||||||
builder.Services.AddScoped<AuthService>();
|
builder.Services.AddScoped<AuthService>();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|
||||||
if (!app.Environment.IsDevelopment())
|
if (!app.Environment.IsDevelopment())
|
||||||
|
|||||||
Binary file not shown.
@@ -1,16 +1,9 @@
|
|||||||
{
|
{
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*",
|
|
||||||
"ApiSettings": {
|
|
||||||
"BaseUrl": "#{api-base-url}#"
|
|
||||||
},
|
|
||||||
"GoogleAuth": {
|
"GoogleAuth": {
|
||||||
"ClientId": "#{google-auth-client-id}#"
|
"ClientId": ""
|
||||||
|
},
|
||||||
|
"ApiSettings": {
|
||||||
|
"BaseUrl": ""
|
||||||
},
|
},
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
"Endpoints": {
|
||||||
|
|||||||
9
BimAI.UI.Web/appsettings.json
Normal file
9
BimAI.UI.Web/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"AllowedHosts": "*",
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,8 +51,6 @@ Global
|
|||||||
{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.Build.0 = Release|Any CPU
|
{7ACBFE74-E72C-4033-9172-30512233A518}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{12FB8E56-08C1-47CF-B0FC-4BE9F01F020A}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
@@ -1,57 +0,0 @@
|
|||||||
services:
|
|
||||||
mssql:
|
|
||||||
image: mcr.microsoft.com/mssql/server:2022-latest
|
|
||||||
container_name: bimai-mssql
|
|
||||||
hostname: bimai-mssql
|
|
||||||
environment:
|
|
||||||
- ACCEPT_EULA=Y
|
|
||||||
- SA_PASSWORD=BimAI_Dev_Pass_2024!
|
|
||||||
- MSSQL_PID=Developer
|
|
||||||
ports:
|
|
||||||
- "1433:1433"
|
|
||||||
volumes:
|
|
||||||
- mssql-data:/var/opt/mssql
|
|
||||||
- ./docker/mssql/init:/docker-entrypoint-initdb.d
|
|
||||||
networks:
|
|
||||||
- bimai-network
|
|
||||||
healthcheck:
|
|
||||||
test: /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P "BimAI_Dev_Pass_2024!" -Q "SELECT 1" || exit 1
|
|
||||||
interval: 10s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 10
|
|
||||||
start_period: 10s
|
|
||||||
|
|
||||||
mongodb:
|
|
||||||
image: mongo:7.0
|
|
||||||
container_name: bimai-mongodb
|
|
||||||
hostname: bimai-mongodb
|
|
||||||
environment:
|
|
||||||
- MONGO_INITDB_ROOT_USERNAME=admin
|
|
||||||
- MONGO_INITDB_ROOT_PASSWORD=BimAI_Mongo_2024!
|
|
||||||
- MONGO_INITDB_DATABASE=bimai
|
|
||||||
ports:
|
|
||||||
- "27017:27017"
|
|
||||||
volumes:
|
|
||||||
- mongodb-data:/data/db
|
|
||||||
- mongodb-config:/data/configdb
|
|
||||||
- ./docker/mongodb/init:/docker-entrypoint-initdb.d
|
|
||||||
networks:
|
|
||||||
- bimai-network
|
|
||||||
healthcheck:
|
|
||||||
test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 5
|
|
||||||
start_period: 10s
|
|
||||||
|
|
||||||
networks:
|
|
||||||
bimai-network:
|
|
||||||
driver: bridge
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
mssql-data:
|
|
||||||
name: bimai-mssql-data
|
|
||||||
mongodb-data:
|
|
||||||
name: bimai-mongodb-data
|
|
||||||
mongodb-config:
|
|
||||||
name: bimai-mongodb-config
|
|
||||||
Reference in New Issue
Block a user