From 4417df86a2dc409f388bf030bae46e075d0fcf6b Mon Sep 17 00:00:00 2001 From: SnippetsX Date: Tue, 19 Nov 2024 20:08:06 +0300 Subject: [PATCH] fixed ci/cd added config.json --- .gitea/workflows/build.yaml | 8 ++++---- src/Settings/SettingsMain.js | 12 +++++++----- src/config.json | 5 +++++ src/metadata.json | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 src/config.json diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 26004ab..6a337c7 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -24,14 +24,14 @@ jobs: - name: Install dependencies run: npm install - - name: Build app - run: npm run build - - - name: Export version from metadata.json + name: Export version from metadata.json run: | VERSION=$(jq -r '"\(.buildMajor).\(.buildMinor).\(.buildRevision)-\(.buildTag)"' src/metadata.json) echo "VERSION=$VERSION" >> $GITHUB_ENV + - name: Build app + run: npm run build + - name: Upload artifact uses: actions/upload-artifact@v3 with: diff --git a/src/Settings/SettingsMain.js b/src/Settings/SettingsMain.js index eaa1b92..0b569af 100644 --- a/src/Settings/SettingsMain.js +++ b/src/Settings/SettingsMain.js @@ -23,11 +23,11 @@ import AccountCircleIcon from '@mui/icons-material/AccountCircleOutlined'; import { ThemeProvider } from '@mui/material/styles'; import theme from '../theme'; import deleteToken from '../core/deleteToken'; +import config from '../config.json'; const drawerWidth = 240; export default function SettingsMain() { - const [open, setOpen] = useState(false); const [anchorEl, setAnchorEl] = useState(null); const openMenu = Boolean(anchorEl); @@ -112,10 +112,12 @@ export default function SettingsMain() { - - - - + {config.developerMode && ( + + + + + )} diff --git a/src/config.json b/src/config.json new file mode 100644 index 0000000..4807186 --- /dev/null +++ b/src/config.json @@ -0,0 +1,5 @@ +{ + "developerMode": false, + "backendUrl": "https://api.example.com" + +} diff --git a/src/metadata.json b/src/metadata.json index 8eac8d9..b89c8d0 100644 --- a/src/metadata.json +++ b/src/metadata.json @@ -1 +1 @@ -{"buildMajor":1,"buildMinor":0,"buildRevision":10,"buildTag":"DEV"} \ No newline at end of file +{"buildMajor":1,"buildMinor":0,"buildRevision":11,"buildTag":"DEV"} \ No newline at end of file