Initial support for different build variants

initLab · Sep 8, 2023 · 58fbb5a · 58fbb5a
1 parent b0f8caf
commit 58fbb5a
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 23 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -37,6 +37,7 @@ jobs:
           cmd: build --base=/fauna-frontend/
         env:
           OAUTH_CLIENT_ID: ERBrlPWjf98L_nI8Moxr7Aqjy4no1eRU-zSOROc2RbU
+          VARIANT: initlab
 
       - name: Upload production-ready build files
         uses: actions/upload-artifact@v3

diff --git a/src/assets/logo.svg → src/assets/initlab/logo.svg b/src/assets/logo.svg → src/assets/initlab/logo.svg
diff --git a/src/hooks/useVariant.js b/src/hooks/useVariant.js
@@ -0,0 +1,3 @@
+export function useVariant() {
+    return import.meta.env.VARIANT;
+}
diff --git a/src/layout/NavBar.jsx b/src/layout/NavBar.jsx
@@ -1,6 +1,6 @@
 import { Container, Image, Nav, Navbar, NavDropdown } from 'react-bootstrap';
 import './NavBar.css';
-import logo from '../assets/logo.svg';
+import logo from '../assets/initlab/logo.svg';
 import { useTranslation } from 'react-i18next';
 import { NavLink } from 'react-router-dom';
 import { useSelector } from 'react-redux';
@@ -16,6 +16,7 @@ import DoorOpenIcon from '../widgets/icons/DoorOpenIcon.jsx';
 import { useGetCurrentUserQuery } from '../features/apiSlice.js';
 import { useEffect } from 'react';
 import i18n from '../i18n.js';
+import { useVariant } from '../hooks/useVariant.js';
 
 const NavBar = () => {
     const {t} = useTranslation();
@@ -29,6 +30,8 @@ const NavBar = () => {
     } = useGetCurrentUserQuery(undefined, {
         skip: !isLoggedIn,
     });
+    const variant = useVariant();
+    const isInitLab = variant === 'initlab';
     const isBoardMember = isSuccess && data.roles.includes('board_member');
 
     useEffect(function() {
@@ -67,35 +70,39 @@ const NavBar = () => {
                             <WarningIcon /> {t('views.doors.unknown')}
                         </>}
                     </Nav.Link>
-                    <Nav.Link as={NavLink} to="/users/present">
-                        <i className="fas fa-street-view" />{' '}
-                        {t('views.navigation.presence')}
-                    </Nav.Link>
-                    <Nav.Link as={NavLink} to="/sensors">
-                        <i className="fas fa-chart-line" />{' '}
-                        {t('views.navigation.sensors')}
-                    </Nav.Link>
-                    {isBoardMember && <Nav.Link href={backendUrl + 'fauna/users'}>
-                        <i className="fas fa-users" />{' '}
-                        {t('views.navigation.labbers')}
-                    </Nav.Link>}
+                    {isInitLab && <>
+                        <Nav.Link as={NavLink} to="/users/present">
+                            <i className="fas fa-street-view" />{' '}
+                            {t('views.navigation.presence')}
+                        </Nav.Link>
+                        <Nav.Link as={NavLink} to="/sensors">
+                            <i className="fas fa-chart-line" />{' '}
+                            {t('views.navigation.sensors')}
+                        </Nav.Link>
+                        {isBoardMember && <Nav.Link href={backendUrl + 'fauna/users'}>
+                            <i className="fas fa-users" />{' '}
+                            {t('views.navigation.labbers')}
+                        </Nav.Link>}
+                    </>}
                     {isLoggedIn ? <NavDropdown title={<>
                             <i className="fas fa-user" />{' '}
                             {t('views.navigation.account')}
                         </>} className="ms-0 ms-lg-auto">
                         <NavDropdown.Item href={backendUrl + 'users/edit'}>
                             {t('views.navigation.view_edit')}
                         </NavDropdown.Item>
-                        <NavDropdown.Item href={backendUrl + 'user/network_devices'}>
-                            {t('views.navigation.network_devices')}
-                        </NavDropdown.Item>
-                        <NavDropdown.Item href={backendUrl + 'oauth/applications'}>
-                            {t('views.navigation.oauth_application_management')}
-                        </NavDropdown.Item>
-                        <NavDropdown.Item href={backendUrl + 'oauth/authorized_applications'}>
-                            {t('views.navigation.oauth_token_management')}
-                        </NavDropdown.Item>
-                        <NavDropdown.Divider />
+                        {isInitLab && <>
+                            <NavDropdown.Item href={backendUrl + 'user/network_devices'}>
+                                {t('views.navigation.network_devices')}
+                            </NavDropdown.Item>
+                            <NavDropdown.Item href={backendUrl + 'oauth/applications'}>
+                                {t('views.navigation.oauth_application_management')}
+                            </NavDropdown.Item>
+                            <NavDropdown.Item href={backendUrl + 'oauth/authorized_applications'}>
+                                {t('views.navigation.oauth_token_management')}
+                            </NavDropdown.Item>
+                            <NavDropdown.Divider />
+                        </>}
                         <NavDropdown.Item as={NavLink} to="/logout">
                             {t('views.navigation.sign_out')}
                         </NavDropdown.Item>

diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx
@@ -1,7 +1,15 @@
 import PresentUsersWrapper from '../widgets/PresentUsersWrapper/PresentUsersWrapper';
 import SensorReadingsWrapper from '../widgets/SensorReadingsWrapper/SensorReadingsWrapper';
+import { useVariant } from '../hooks/useVariant.js';
+import { Navigate } from 'react-router-dom';
 
 const Dashboard = () => {
+    const variant = useVariant();
+
+    if (variant === 'colibri') {
+        return (<Navigate to="/doors" />);
+    }
+
     return (<>
         <PresentUsersWrapper />
         <SensorReadingsWrapper />

diff --git a/src/pages/Sensors.jsx b/src/pages/Sensors.jsx
@@ -2,10 +2,18 @@ import { Fragment } from 'react';
 import { Col, Row } from 'react-bootstrap';
 import { useTranslation } from 'react-i18next';
 import { grafana } from '../config';
+import { useVariant } from '../hooks/useVariant.js';
+import { Navigate } from 'react-router-dom';
 
 const Sensors = () => {
     const { t } = useTranslation();
 
+    const variant = useVariant();
+
+    if (variant === 'colibri') {
+        return (<Navigate to="/doors" />);
+    }
+
     return (<>
         <Row>
             <h2>{t('views.sensors.title')}</h2>

diff --git a/vite.config.js b/vite.config.js
@@ -13,6 +13,7 @@ export default defineConfig({
         'DOOR_BACKEND_URL',
         'MQTT_URL',
         'OAUTH_CLIENT_ID',
+        'VARIANT',
     ],
     plugins: [
         react(),