merge feature flag and new beta

Author: wbglaeser

public/assets/data/requirement-profiles/requirement-profiles.json

@@ -108,23 +108,28 @@
     },
     {
       "fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/schwerbehindertenausweis.ttl",
-      "rpUri": "https://foerderfunke.org/default#schwerbehindertenausweis"
+      "rpUri": "https://foerderfunke.org/default#schwerbehindertenausweis",
+      "behindFeatureFlag": "bielefunke"
     },
     {
       "fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/erwerbsminderungsrente-voll.ttl",
-      "rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-voll"
+      "rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-voll",
+      "behindFeatureFlag": "bielefunke"
     },
     {
       "fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/erwerbsminderungsrente-teilweise.ttl",
-      "rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-teilweise"
+      "rpUri": "https://foerderfunke.org/default#erwerbsminderungsrente-teilweise",
+      "behindFeatureFlag": "bielefunke"
     },
     {
       "fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/substitutionstherapie-regulaer.ttl",
-      "rpUri": "https://foerderfunke.org/default#substitutionstherapie-regulaer"
+      "rpUri": "https://foerderfunke.org/default#substitutionstherapie-regulaer",
+      "behindFeatureFlag": "bielefunke"
     },
     {
       "fileUrl": "https://raw.githubusercontent.com/Citizen-Knowledge-Graph/knowledge-base/main/bielefeld/shacl/substitutionstherapie-diamorphin.ttl",
-      "rpUri": "https://foerderfunke.org/default#substitutionstherapie-diamorphin"
+      "rpUri": "https://foerderfunke.org/default#substitutionstherapie-diamorphin",
+      "behindFeatureFlag": "bielefunke"
     }
   ]
 }

src/AppRoutes.js

@@ -34,8 +34,8 @@ const AppRoutes = () => (
         <Route path="/questions" element={<QuestionPageRouter/>}/>
         <Route path="/impressum" element={<ImpressumPage/>}/>
         <Route path="/data-protection" element={<DataProtection/>}/>
-        <Route path="/bielefeld" element={<LandingPage runway="bielefeld" />}/>
-        <Route path="/bielefunke" element={<LandingPage runway="bielefeld" />}/>
+        <Route path="/bielefeld" element={<LandingPage runway="bielefunke" />}/>
+        <Route path="/bielefunke" element={<LandingPage runway="bielefunke" />}/>
     </Routes>
 );
 

src/featureFlags.js

@@ -1,7 +1,6 @@
 const defaultFlags = {
-    showNearestCounselingCentre: false,
     showMermaidRuleGraph: false,
-    runwaysActive: false
+    bielefunke: false
 };
 
 const getFeatureFlag = (flag) => {
@@ -10,9 +9,8 @@ const getFeatureFlag = (flag) => {
 };
 
 const featureFlags = {
-    showNearestCounselingCentre: getFeatureFlag('showNearestCounselingCentre'),
     showMermaidRuleGraph: getFeatureFlag('showMermaidRuleGraph'),
-    runwaysActive: getFeatureFlag('runwaysActive')
+    bielefunke: getFeatureFlag('bielefunke')
 };
 
 export const setFeatureFlag = (flag, value) => {

src/ui/screens/benefit-page/components/BenefitPageLinksList.js

@@ -6,13 +6,13 @@ import Collapse from "@mui/material/Collapse";
 import { HBox, VBox } from "@/ui/shared-components/LayoutBoxes";
 import theme from '@/theme';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
-import featureFlags from "@/featureFlags";
 import haversine from "haversine-distance"
 
 const BenefitPageLinksList = ({ listTitle, data }) => {
     const [showAdditionalSupport, setShowAdditionalSupport] = useState(false);
     const [userCoordinates, setUserCoordinates] = useState(null);
     const [nearestCounselingCenters, setNearestCounselingCenters] = useState([]);
+    const showNearestCounselingCentre = false;
 
     const convertAddressToCoordinates = async () => {
         const address = prompt("Enter your address:");
@@ -122,7 +122,7 @@ const BenefitPageLinksList = ({ listTitle, data }) => {
                                 )
                             }
                         </VBox>
-                        {featureFlags.showNearestCounselingCentre &&
+                        {showNearestCounselingCentre &&
                             <VBox sx={{ gap: 4, maxWidth: '800px' }}>
                                 <Typography variant="h3" sx={{ fontWeight: '600', wordBreak: "break-word", paddingTop: '32px' }}>
                                     Finde die nächste Caritas-Sozialberatungsstelle

src/ui/screens/landing-page/sections/top-section/LandingPageTopSection.js

@@ -5,6 +5,8 @@ import RegularButton from "@/ui/shared-components/buttons/RegularButton";
 import LandingPageSectionWrapper from "../../components/LandingPageSectionWrapper";
 import LandingPageTopSectionShared from "./components/LandingPageTopSectionShared";
 import featureFlags from "@/featureFlags";
+import { Typography } from "@mui/material";
+import { Link } from 'react-router-dom';
 
 const LandingPageTopSection = ({ runway }) => {
     const isDesktop = useStore((state) => state.isDesktop);
@@ -19,15 +21,14 @@ const LandingPageTopSection = ({ runway }) => {
                     <VBox sx={{ width: "50%", alignItems: "center" }}>
                         <VBox sx={{ maxWidth: "600px", gap: 8 }}>
                             <LandingPageTopSectionShared />
-                            {runway === "bielefeld" && featureFlags.runwaysActive && (
+                            {runway === "bielefunke" && featureFlags.bielefunke && (
                                 <>
-                                    <div>
-                                        Willkommen beim Pilotprojekt Bielefeld!
-                                        <br/>
-                                        Gebt uns gerne Feedback. TODO: dedicated Email address?
-                                        <br/>
-                                        TODO: Link zum Katalog mit Vorauswahl & Anspruch prüfen für Vorauswahl
-                                    </div>
+                                    <Typography variant="h2">Willkommen beim Pilotprojekt Bielefeld!</Typography>
+                                    <Typography variant="body1" sx={{ textAlign: 'left' }}>
+                                        Gebt uns gerne Feedback: (dedicated email address?)
+                                        <br/><br/>
+                                        Siehe <Link to={"/eligibility-overview"}>hier</Link> die Leistungen die wir im Rahmen des Pilotprojekts bis jetzt eingepflegt haben.
+                                    </Typography>
                                 </>
                             )}
                             <RegularButton variant={'yellowContained'} link='/user-routing' />